From 241baae2eb96a8f9601e986bcd5727e812ff4817 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 27 Jul 2023 11:30:29 -0800 Subject: [PATCH 1/2] Do not remove CLI when going back to workspaces view We set it when connecting so this results in no CLI being available (for example if you go back and select a different or even the same workspace). Fixes #277. --- .../com/coder/gateway/views/steps/CoderWorkspacesStepView.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt index 69398a20..a0d5c160 100644 --- a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt +++ b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt @@ -303,7 +303,6 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod } override fun onInit(wizardModel: CoderWorkspacesWizardModel) { - cliManager = null tableOfWorkspaces.listTableModel.items = emptyList() if (localWizardModel.coderURL.isNotBlank() && localWizardModel.token != null) { triggerWorkspacePolling(true) From 3e2c384dea7354c49f0c6991ad18289ced7995b5 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 27 Jul 2023 11:51:03 -0800 Subject: [PATCH 2/2] Bump version --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f81135c..fb6bfcdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ## Unreleased +### Fixed +- Inability to connect to a workspace after going back to the workspaces view. + ### Fixed - Inability to download new editors in older versions of Gateway. diff --git a/gradle.properties b/gradle.properties index ff7002c9..4d91f647 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ pluginGroup=com.coder.gateway pluginName=coder-gateway # SemVer format -> https://semver.org -pluginVersion=2.5.1 +pluginVersion=2.5.2 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. pluginSinceBuild=223.7571.70