Sync do no merge or delete

ci.yml

@@ -7,7 +7,7 @@ prepare:
     - name: Change node version
       command: sudo -u admin n 18.18.0   
     - name: Install Dependencies
-      command: npm install @vscode/vsce
+      command: npm i
     - name: Compile project
       command: npm run compile      
     - name: bundle project

package.json

@@ -182,7 +182,7 @@
     "ws": "^8.16.0"
   },
   "dependencies": {
-    "@vscode/vsce": "^2.26.1",
+    "@vscode/vsce": "^2.32.0",
     "ansi-to-html": "^0.7.2",
     "axios": "^1.6.8",
     "bufferutil": "^4.0.8",

src/CiPipelineProvider.ts

@@ -58,6 +58,7 @@ export class CiPipelineProvider implements vscode.WebviewViewProvider {
                 const ciPipelineCheck = checkCiPipelineStructure(uaSocket, 324);
                 ciPipelineCheck.then((ci: any) => {
                     ciStructure = ci;
+                    console.log("ciStructure: ", JSON.stringify(ciStructure));
                     this._view?.webview.postMessage({ 
                         type: "CIPipelineStages", 
                         value: {   

src/SidebarProvider.ts

@@ -55,7 +55,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
 
       }
 
-    if (cache.get("codesphere.isLoggedIn") === true) {
+    if (cache.get("codesphere.isLoggedIn") === true && cache.get('codesphere.currentWorkspace') === '') {
       vscode.commands.executeCommand('setContext', 'codesphere.isLoggedIn', true);
       cache.update("codesphere.isLoggedIn", true);
       webviewView.webview.html = this._getHtmlForWebviewAfterSignIn(webviewView.webview);
@@ -66,9 +66,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
       vscode.commands.executeCommand('setContext', 'codesphere.isLoggedIn', true);
       cache.update("codesphere.isLoggedIn", true);
       webviewView.webview.html = this._getHtmlWebviewOverview(webviewView.webview);
-      cache.update('codesphere.workspaceOverview', cache.get('codesphere.currentWorkspace'));
-      vscode.commands.executeCommand('setContext', 'codesphere.workspaceOverview', cache.get('codesphere.currentWorkspace'));
-      console.log('Congratulations, your extension "codesphere" is now active! You are logged in.');
+      // todo: instead of passing just the workspace id we need to pass the whole workspace object
 
       let currentWorkspace = parseInt(cache.get('codesphere.currentWorkspace') as string);
       const workspacesInTeam: any = cache.get("codesphere.workspaces");
@@ -86,7 +84,9 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
           break; 
         }
       }
-      cache.update("codesphere.currentconnectedWorkspace", matchingObject);
+
+      console.log('matchingObject', matchingObject);
+      cache.update("codesphere.workspaceOverview", matchingObject);
 
       if (matchingObject) {
         this._view?.webview.postMessage({
@@ -96,6 +96,10 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
           },
         });
       } 
+
+      // cache.update('codesphere.workspaceOverview', cache.get('codesphere.currentWorkspace'));
+      vscode.commands.executeCommand('setContext', 'codesphere.workspaceOverview', cache.get('codesphere.currentWorkspace'));
+      console.log('Congratulations, your extension "codesphere" is now active! You are logged in.');
     }
 
     if (!cache.get("codesphere.isLoggedIn")) {

src/extension.ts

@@ -25,14 +25,16 @@ export function activate(context: vscode.ExtensionContext) {
 	const fileTreeProvider = new FileTreeProvider(rootPath);
 	const ciPipelineProvider = new CiPipelineProvider(context.extensionUri, context);
 
-	//TODO: the line below disables vscode to remember the last opened windows.
-	// change it that it only disables it inside remote tunnels
-	vscode.workspace.getConfiguration('window').update('restoreWindows', 'none', vscode.ConfigurationTarget.Global);
 
 	context.subscriptions.push(
 		vscode.window.registerWebviewViewProvider(
 		"codesphere-sidebar",
-		sidebarProvider
+		sidebarProvider,
+		{
+			webviewOptions: {
+				retainContextWhenHidden: true
+			}
+		}
 		)
 	);
 
@@ -100,7 +102,10 @@ export function activate(context: vscode.ExtensionContext) {
 
 		if (workspaceId !== "" && workspaceId !== "$WORKSPACE_ID") {
 			const pwdUri = vscode.Uri.parse('home/user/app');
+			vscode.workspace.getConfiguration('window').update('restoreWindows', 'none', vscode.ConfigurationTarget.Global);
 			vscode.commands.executeCommand('vscode.openFolder', pwdUri);
+		} else {
+			vscode.workspace.getConfiguration('window').update('restoreWindows', 'all', vscode.ConfigurationTarget.Global);
 		}
 	});
 

webviews/components/CiPipeline.svelte

@@ -45,21 +45,30 @@
                 }
                 step.open = false
             });
-            prepareStageSteps[0].open = true;
+
+            if (stagelength > 0) {
+                prepareStageSteps[0].open = true
+            }
         }
         if (stage == "test") {
             stageRunning = [...stageRunning, stage]
             testStageSate = true;
             testStageSuccess = '';
             stagelength = testStageSteps.length
-            testStageSteps[0].open = true
+
+            if (stagelength > 0) {
+                testStageSteps[0].open = true
+            }
         }
         if (stage == "run") {
             stageRunning = [...stageRunning, stage]
             runStageSate = true;
             runStageSuccess = '';
             stagelength = runStageSteps.length
-            runStageSteps[0].open = true
+
+            if (stagelength > 0) {
+                runStageSteps[0].open = true
+            }
         }
         vscode.postMessage({
             type: 'startCiStage',
@@ -120,6 +129,10 @@
                     currentWorkspace = message.value.currentWorkspace;
                     teamId = message.value.teamId;
                     dcId = message.value.dcId;
+
+                    console.log("currentWorkspace", currentWorkspace);
+                    console.log("teamId", teamId);
+                    console.log("dcId", dcId);
 
                     vscode.postMessage({
                         type: 'getCiPipelineStages',
@@ -174,6 +187,7 @@
                     break;
                 case 'ciPipelineStatus':
                     if (message.value.dynamic) {
+                        console.log("dynamic", message.value.dynamic);
                         switch (message.value.dynamic) {
                             case 'prepare':
                                 prepareStageSuccess = message.value.prepare.state;
@@ -182,6 +196,8 @@
                                 });
                                 if (prepareStageSuccess === 'running') {
                                     prepareStageSate = true;
+                                    stageRunning = [...stageRunning, 'prepare']
+
                                 }
                                 if (prepareStageSuccess === 'success' || prepareStageSuccess === 'failure') {
                                     prepareStageSate = false;
@@ -194,6 +210,8 @@
                                 });
                                 if (testStageSuccess === 'running') {
                                     testStageSate = true;
+                                    stageRunning = [...stageRunning, 'test']
+
                                 }
                                 if (testStageSuccess === 'success' || testStageSuccess === 'failure') {
                                     testStageSate = false;
@@ -206,6 +224,7 @@
                                 });
                                 if (runStageSuccess === 'running') {
                                     runStageSate = true;
+                                    stageRunning = [...stageRunning, 'run']
                                 }
                                 if (runStageSuccess === 'success' || runStageSuccess === 'failure') {
                                     runStageSate = false;
@@ -216,38 +235,46 @@
                     }
 
                     if (message.value.dynamic === false && message.value.prepare.state){
+                        console.log("prepare dynamic false", message.value.prepare.state);
                         prepareStageSuccess = message.value.prepare.state;
                         prepareStageSteps.forEach(( step, index) => {
                             Object.assign(step, message.value.prepare.steps[index]);
                         });
                         if (prepareStageSuccess === 'running') {
                             prepareStageSate = true;
+                            stageRunning = [...stageRunning, 'prepare']
+
                         }
                         if (prepareStageSuccess === 'success' || prepareStageSuccess === 'failure') {
                             prepareStageSate = false;
                         }
                     }
 
                     if (message.value.dynamic === false && message.value.test.state){
+                        console.log("test dynamic false", message.value.test.state);
                         testStageSuccess = message.value.test.state;
                         testStageSteps.forEach(( step, index) => {
                             Object.assign(step, message.value.test.steps[index]);
                         });
                         if (testStageSuccess === 'running') {
                             testStageSate = true;
+                            stageRunning = [...stageRunning, 'test']
+
                         }
                         if (testStageSuccess === 'success' || testStageSuccess === 'failure') {
                             testStageSate = false;
                         }
                     }
 
                     if (message.value.dynamic === false && message.value.run.state){
+                        console.log("run dynamic false", message.value.run.state);
                         runStageSuccess = message.value.run.state;
                         runStageSteps.forEach(( step, index) => {
                             Object.assign(step, message.value.run.steps[index]);
                         });
                         if (runStageSuccess === 'running') {
                             runStageSate = true;
+                            stageRunning = [...stageRunning, 'run']
                         }
                         if (runStageSuccess === 'success' || runStageSuccess === 'failure') {
                             runStageSate = false;