feat: optimize code

Signed-off-by: SuZhou-Joe <[email protected]>
SuZhou-Joe · Aug 15, 2023 · c317dd9 · c317dd9
1 parent 7682ba1
commit c317dd9
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/src/plugins/workspace/public/workspace_client.ts b/src/plugins/workspace/public/workspace_client.ts
@@ -67,32 +67,34 @@ export class WorkspaceClient {
     this.http = http;
     this.workspaces = workspaces;
 
-    combineLatest([workspaces.workspaceList$, workspaces.currentWorkspaceId$]).subscribe(
-      ([workspaceList, currentWorkspaceId]) => {
-        if (this.workspaces.hasFetchedWorkspaceList$.getValue()) {
-          const currentWorkspace = this.findWorkspace([workspaceList, currentWorkspaceId]);
+    combineLatest([
+      workspaces.hasFetchedWorkspaceList$,
+      workspaces.workspaceList$,
+      workspaces.currentWorkspaceId$,
+    ]).subscribe(([hasFetchedWorkspaceList, workspaceList, currentWorkspaceId]) => {
+      if (hasFetchedWorkspaceList) {
+        const currentWorkspace = this.findWorkspace([workspaceList, currentWorkspaceId]);
+
+        /**
+         * Do a simple idempotent verification here
+         */
+        if (!isEqual(currentWorkspace, workspaces.currentWorkspace$.getValue())) {
+          workspaces.currentWorkspace$.next(currentWorkspace);
+        }
 
+        if (currentWorkspaceId && !currentWorkspace?.id) {
           /**
-           * Do a simple idempotent verification here
+           * Current workspace is staled
            */
-          if (!isEqual(currentWorkspace, workspaces.currentWorkspace$.getValue())) {
-            workspaces.currentWorkspace$.next(currentWorkspace);
-          }
-
-          if (currentWorkspaceId && !currentWorkspace?.id) {
-            /**
-             * Current workspace is staled
-             */
-            workspaces.currentWorkspaceId$.error({
-              reason: WORKSPACE_ERROR_REASON_MAP.WORKSPACE_STALED,
-            });
-            workspaces.currentWorkspace$.error({
-              reason: WORKSPACE_ERROR_REASON_MAP.WORKSPACE_STALED,
-            });
-          }
+          workspaces.currentWorkspaceId$.error({
+            reason: WORKSPACE_ERROR_REASON_MAP.WORKSPACE_STALED,
+          });
+          workspaces.currentWorkspace$.error({
+            reason: WORKSPACE_ERROR_REASON_MAP.WORKSPACE_STALED,
+          });
         }
       }
-    );
+    });
   }
 
   /**