Merge branch 'master' into release

nrwl · Nov 13, 2024 · b7f620c · b7f620c
2 parents 70b4dc2 + 30d621c
commit b7f620c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 51 deletions.
diff --git a/libs/vscode/nx-cloud-view/src/lib/cloud-onboarding-view.ts b/libs/vscode/nx-cloud-view/src/lib/cloud-onboarding-view.ts
@@ -15,6 +15,7 @@ import {
 import {
   CancellationToken,
   commands,
+  Disposable,
   ExtensionContext,
   tasks,
   Uri,
@@ -37,18 +38,18 @@ export class CloudOnboardingViewProvider implements WebviewViewProvider {
   private _view: WebviewView | undefined;
   private _webviewSourceUri: Uri;
 
+  private _refreshSubscription: Disposable;
+
   constructor(private extensionContext: ExtensionContext) {
     this._webviewSourceUri = Uri.joinPath(
       this.extensionContext.extensionUri,
       'nx-cloud-onboarding-webview'
     );
 
-    const sub = onWorkspaceRefreshed(async () => {
+    this._refreshSubscription = onWorkspaceRefreshed(async () => {
       await this.refresh();
     });
-    if (sub) {
-      extensionContext.subscriptions.push(sub);
-    }
+    extensionContext.subscriptions.push(this._refreshSubscription);
   }
 
   async resolveWebviewView(
@@ -73,6 +74,10 @@ export class CloudOnboardingViewProvider implements WebviewViewProvider {
     webviewView.webview.onDidReceiveMessage((event) => {
       this.handleWebviewMessage(event);
     });
+
+    webviewView.onDidDispose(() => {
+      this._refreshSubscription.dispose();
+    });
   }
 
   async refresh() {

diff --git a/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts b/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts
@@ -1,5 +1,8 @@
 import { GlobalConfigurationStore } from '@nx-console/vscode/configuration';
-import { onWorkspaceRefreshed } from '@nx-console/vscode/lsp-client';
+import {
+  getNxlsClient,
+  onWorkspaceRefreshed,
+} from '@nx-console/vscode/lsp-client';
 import { getNxWorkspace } from '@nx-console/vscode/nx-workspace';
 import { AbstractTreeProvider } from '@nx-console/vscode/utils';
 import { commands, ExtensionContext } from 'vscode';
@@ -14,6 +17,8 @@ export class NxCommandsTreeProvider extends AbstractTreeProvider<NxCommandsTreeI
     );
 
     onWorkspaceRefreshed(() => this.refresh());
+
+    getNxlsClient().showRefreshLoadingAtLocation({ viewId: 'nxCommands' });
   }
 
   getParent(_: NxCommandsTreeItem) {

diff --git a/libs/vscode/nx-project-view/src/lib/init-nx-project-view.ts b/libs/vscode/nx-project-view/src/lib/init-nx-project-view.ts
@@ -30,7 +30,9 @@ export function initNxProjectView(
 
   AtomizerDecorationProvider.register(context);
 
-  listenToLoadingEventsAndShowBar(context);
+  context.subscriptions.push(
+    getNxlsClient().showRefreshLoadingAtLocation({ viewId: 'nxProjects' })
+  );
 
   return nxProjectsTreeProvider;
 }
@@ -61,31 +63,3 @@ export async function showProjectConfiguration(selection: NxTreeItem) {
   const target = viewItem.nxTarget;
   return revealNxProject(project, root, target);
 }
-
-function listenToLoadingEventsAndShowBar(context: ExtensionContext) {
-  const client = getNxlsClient();
-  context.subscriptions.push(
-    client.onNotification(NxWorkspaceRefreshStartedNotification, () => {
-      const refreshPromise = new Promise<void>((resolve) => {
-        const disposable = client.onNotification(
-          NxWorkspaceRefreshNotification,
-          () => {
-            disposable?.dispose();
-            resolve();
-          }
-        );
-      });
-
-      window.withProgress(
-        {
-          location: { viewId: 'nxProjects' },
-          cancellable: false,
-          title: 'Refreshing Nx workspace',
-        },
-        async () => {
-          await refreshPromise;
-        }
-      );
-    })
-  );
-}
diff --git a/nx.json b/nx.json
@@ -71,23 +71,6 @@
     "extract-dependencies": {
       "cache": true
     },
-    "@nx/jest:jest": {
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
-      "cache": true,
-      "options": {
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
-      }
-    },
-    "@nx/eslint:lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
-      "cache": true
-    },
     "@nx/esbuild:esbuild": {
       "cache": true,
       "dependsOn": ["^build"],