Use state sent with GET /directories instead of querying state sepa…

…rately (#6794) * Use inline project state * Fixes * Fix type error
enso-org · May 23, 2023 · cbc3568 · cbc3568
1 parent efd33c0
commit cbc3568
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/backend.ts b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/backend.ts
@@ -271,6 +271,7 @@ export interface IdType {
 export interface Asset<Type extends AssetType = AssetType> extends BaseAsset {
     type: Type
     id: IdType[Type]
+    projectState: Type extends AssetType.project ? ProjectStateType : null
 }
 
 /** The type returned from the "create directory" endpoint. */

diff --git a/...desktop/lib/dashboard/src/authentication/src/dashboard/components/projectActionButton.tsx b/...desktop/lib/dashboard/src/authentication/src/dashboard/components/projectActionButton.tsx
@@ -56,14 +56,21 @@ function ProjectActionButton(props: ProjectActionButtonProps) {
     const [spinnerState, setSpinnerState] = react.useState(SpinnerState.done)
 
     react.useEffect(() => {
-        void (async () => {
-            const projectDetails = await backend.getProjectDetails(project.id)
-            setState(projectDetails.state.type)
-            if (projectDetails.state.type === backendModule.ProjectState.openInProgress) {
+        switch (project.projectState.type) {
+            case backendModule.ProjectState.opened:
+                setState(backendModule.ProjectState.openInProgress)
+                setSpinnerState(SpinnerState.initial)
+                setIsCheckingResources(true)
+                break
+            case backendModule.ProjectState.openInProgress:
+                setState(backendModule.ProjectState.openInProgress)
                 setSpinnerState(SpinnerState.initial)
                 setIsCheckingStatus(true)
-            }
-        })()
+                break
+            default:
+                setState(project.projectState.type)
+                break
+        }
     }, [])
 
     react.useEffect(() => {
@@ -136,6 +143,7 @@ function ProjectActionButton(props: ProjectActionButtonProps) {
         appRunner?.stopApp()
         void backend.closeProject(project.id)
         setIsCheckingStatus(false)
+        setIsCheckingResources(false)
         onClose()
     }
 

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
@@ -47,6 +47,14 @@ export class LocalBackend implements Partial<backend.Backend> {
             modifiedAt: project.lastOpened,
             parentId: newtype.asNewtype<backend.AssetId>(''),
             permissions: [],
+            projectState: {
+                type:
+                    project.id === LocalBackend.currentlyOpeningProjectId
+                        ? backend.ProjectState.openInProgress
+                        : project.lastOpened != null
+                        ? backend.ProjectState.closed
+                        : backend.ProjectState.created,
+            },
         }))
     }