Experimental build selector fixes

Author: rijesha

src/extension.ts

@@ -586,7 +586,10 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand("zephyr-ide.add-build", async () => {
       if (wsConfig.activeSetupState && wsConfig.activeSetupState.westUpdated) {
         let result = await project.addBuild(wsConfig, context);
+        console.log("Updating web view");
+        console.log(result);
         vscode.commands.executeCommand("zephyr-ide.update-web-view");
+        console.log("returning from adding build");
         return result;
       } else {
         vscode.window.showErrorMessage("Run `Zephyr IDE: West Update` first.");

src/project_utilities/build_selector.ts

@@ -75,24 +75,43 @@ async function getBoardlistWest(setupState: SetupState, folder: vscode.Uri | und
   }
 
   let prevError: any;
-  if (setupState.zephyrVersion === undefined) { return; }
+  console.log("zephyrVersion");
+  console.log(setupState.zephyrVersion);
+
+  if (setupState.zephyrVersion === undefined) {
+    console.log("Returning because zephyrVersion is not set");
+    return;
+  }
   let res;
   let has_qualifiers = false;
   let has_revisions = false;
+  console.log("Getting board list");
+
   if (isVersionNumberGreater(setupState.zephyrVersion, 4, 1, 0)) {
+
+    console.log("Getting board list1");
     res = await executeShellCommandInPythonEnv("west boards -f '{name};{dir};{qualifiers};{revisions};{revision_default}'" + boardRootString, setupState.setupPath, setupState, false);
     has_qualifiers = true;
     has_revisions = true;
   } else if (isVersionNumberGreaterEqual(setupState.zephyrVersion, 3, 7, 0)) {
+    console.log("Getting board list2");
     res = await executeShellCommandInPythonEnv("west boards -f '{name};{dir};{qualifiers}'" + boardRootString, setupState.setupPath, setupState, false);
     has_qualifiers = true;
   } else {
+
+    console.log("Getting board list3");
     res = await executeShellCommandInPythonEnv("west boards -f '{name};{dir}'" + boardRootString, setupState.setupPath, setupState, false);
   }
+  console.log("Got board list");
+
+  console.log(res);
+  console.log(res.stdout);
 
   if (!res.stdout) {
-    output.append(prevError);
-    output.append(res.stderr);
+    console.log("error");
+
+    console.log(prevError);
+    console.log(res.stderr);
     vscode.window.showErrorMessage("Failed to run west boards command. See Zephyr IDE Output for error message");
     return;
   }
@@ -154,8 +173,8 @@ export async function pickBoard(setupState: SetupState, rootPath: string) {
   boardDirectories.push("Select Other Folder");
   const boardDirectoriesQpItems: QuickPickItem[] = boardDirectories.map(label => ({ label }));
 
-  const title = "Board Picker";
-
+  const title = "Board Dir Picker";
+  console.log("picking directories");
   let pickPromise = showQuickPick({
     title,
     step: 1,
@@ -173,9 +192,11 @@ export async function pickBoard(setupState: SetupState, rootPath: string) {
   if (!pick) {
     return;
   };
+  console.log("Did not");
 
   let relBoardDir: string | undefined = path.relative(rootPath, (pick.label));
   if (pick.label === "Select Other Folder") {
+    console.log("selecting other folder");
     const boarddir = await vscode.window.showOpenDialog({
       canSelectFiles: false,
       canSelectFolders: true,
@@ -192,13 +213,19 @@ export async function pickBoard(setupState: SetupState, rootPath: string) {
   }
 
   let boardList;
+  console.log("getting board list");
+  console.log(relBoardDir);
+
   if (relBoardDir) {
     boardList = await getBoardlistWest(setupState, vscode.Uri.file(path.join(rootPath, relBoardDir)));
   } else {
     boardList = await getBoardlistWest(setupState, undefined);
   }
+  console.log("finished getting boar lsit");
 
   if (!boardList) {
+    console.log("empty board list");
+
     return;
   }
 
@@ -213,12 +240,17 @@ export async function pickBoard(setupState: SetupState, rootPath: string) {
     activeItem: undefined
   }).catch((error) => {
     console.error(error);
+
+    console.log("Pick Board error");
     return undefined;
   });
   pick = (await pickPromise as QuickPickItem);
   if (!pick) {
+    console.log("Pick error");
+
     return;
   };
+  console.log(pick);
 
   let pick_data = (pick as BoardItem);
 
@@ -256,17 +288,20 @@ export async function pickBoard(setupState: SetupState, rootPath: string) {
       activeItem: revisionQPItems[revisionIndex]
     }).catch((error) => {
       console.error(error);
+
+      console.log("pick rev error");
       return undefined;
     });
     let pick = (await pickPromise as QuickPickItem);
     if (!pick) {
+
+      console.log("pick error");
       return;
     };
     revision = pick.label;
   }
 
-
-
+  console.log("returning board config");
   let boardConfig = {
     board: board,
     relBoardDir: relBoardDir,
@@ -280,6 +315,7 @@ export async function buildSelector(context: ExtensionContext, setupState: Setup
   const title = 'Add Build Configuration';
 
   async function pickBoardStep(input: MultiStepInput, state: Partial<BuildConfig>) {
+    console.log("picking board");
     let boardData = await pickBoard(setupState, rootPath);
     if (boardData) {
       state.relBoardDir = boardData.relBoardDir;

src/project_utilities/project.ts

@@ -505,9 +505,13 @@ export async function addProject(wsConfig: WorkspaceConfig, context: vscode.Exte
 
 export async function addBuildToProject(wsConfig: WorkspaceConfig, context: vscode.ExtensionContext, projectName: string) {
 
+  console.log(`Startign build1`);
   if (wsConfig.activeSetupState) {
 
+    console.log(`Startign build2`);
     let result = await buildSelector(context, wsConfig.activeSetupState, wsConfig.rootPath);
+
+    console.log(`build selector returned`);
     if (result && result.name !== undefined) {
       result.runnerConfigs = {};
       if (wsConfig.projects[projectName].buildConfigs[result.name]) {
@@ -517,7 +521,7 @@ export async function addBuildToProject(wsConfig: WorkspaceConfig, context: vsco
           return;
         }
       }
-
+      console.log(`Creating Build Configuration: ${result.name}`);
       vscode.window.showInformationMessage(`Creating Build Configuration: ${result.name}`);
       wsConfig.projects[projectName].buildConfigs[result.name] = result;
       wsConfig.projectStates[projectName].buildStates[result.name] = { runnerStates: {}, viewOpen: true };

src/test/workflow-integration.test.ts

@@ -234,7 +234,7 @@ suite("Workflow Integration Test Suite", () => {
                             if (mockQuickPick._onDidAcceptCallback) {
                                 mockQuickPick._onDidAcceptCallback();
                             }
-                        }, 8000);
+                        }, 30000);
                     },
                     onDidTriggerButton: () => ({ dispose: () => { } }),
                     onDidChangeSelection: (callback: any) => {
@@ -292,7 +292,7 @@ suite("Workflow Integration Test Suite", () => {
                             if (mockInputBox._onDidAcceptCallback) {
                                 mockInputBox._onDidAcceptCallback();
                             }
-                        }, 8000);
+                        }, 30000);
                     },
                     onDidAccept: (callback: any) => {
                         mockInputBox._onDidAcceptCallback = callback;
@@ -445,6 +445,15 @@ suite("Workflow Integration Test Suite", () => {
             globalQuickPickCallCount = 0;
             globalInputBoxCallCount = 0;
             currentStep = "build-config";
+            
+            // Check if west is available before attempting build config
+            const ext = vscode.extensions.getExtension("mylonics.zephyr-ide");
+            const wsConfig = ext?.exports?.getWorkspaceConfig();
+            if (!wsConfig?.initialSetupComplete) {
+                console.log("⚠️ Setup not complete, retrying in 10 seconds...");
+                await new Promise((resolve) => setTimeout(resolve, 10000));
+            }
+            
             result = await vscode.commands.executeCommand("zephyr-ide.add-build");
             assert.ok(result, "Build configuration should succeed");