Load workspaces after downloading CLI

code-asher · code-asher · commit a9bedcbcf318 · 2023-04-20T21:23:56.000-08:00
Since you cannot interact with the list without a CLI (and there is now
a higher chance something can go wrong since the user can customize the
source and destination) we should avoid showing them until the CLI is
good to go.
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -461,16 +461,16 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
                 appPropertiesService.setValue(CODER_URL_KEY, deploymentURL.toString())
                 appPropertiesService.setValue(SESSION_TOKEN, token)
 
-                this.indicator.text = "Retrieving workspaces..."
-                loadWorkspaces()
-
                 this.indicator.text = "Downloading Coder CLI..."
                 val cliManager = CoderCLIManager(deploymentURL)
                 cliManager.downloadCLI()
 
                 this.indicator.text = "Authenticating Coder CLI..."
                 cliManager.login(token)
 
+                this.indicator.text = "Retrieving workspaces..."
+                loadWorkspaces()
+
                 updateWorkspaceActions()
                 triggerWorkspacePolling(false)
             } catch (e: AuthenticationResponseException) {
