Fix create empty dev environment (#3599)

Author: rli

.changes/next-release/bugfix-62c95501-2bee-430c-9a67-d08fcc8e042b.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue where nothing happens when trying to create an empty Dev Environment"
+}

jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt

@@ -79,9 +79,6 @@ import javax.swing.JComponent
 import software.aws.toolkits.telemetry.Result as TelemetryResult
 
 class CawsSettings(
-    // ui initialization params
-    var initialSpace: String? = null,
-
     // core bindings
     var project: CawsProject? = null,
     var productType: GatewayProduct? = null,
@@ -334,7 +331,6 @@ class EnvironmentDetailsPanel(private val context: CawsSettings, lifetime: Lifet
                             .columns(COLUMNS_MEDIUM)
                     }
 
-                    // TODO: might want to show linked repos as disabled to reduce confusion
                     val linkedRepoCombo = AsyncComboBox<SourceRepository> { label, value, _ -> label.text = value?.name }
                     val linkedBranchCombo = AsyncComboBox<BranchSummary> { label, value, _ -> label.text = value?.name }
                     Disposer.register(disposable, linkedRepoCombo)
@@ -347,7 +343,7 @@ class EnvironmentDetailsPanel(private val context: CawsSettings, lifetime: Lifet
                                 { i, v -> i.selectedItem = i.model.find { it.name == v } },
                                 context::linkedRepoName.toMutableProperty()
                             )
-                            .errorOnApply(message("caws.workspace.details.repository_validation")) { it.selectedItem == null }
+                            .errorOnApply(message("caws.workspace.details.repository_validation")) { it.isVisible && it.selectedItem == null }
                             .columns(COLUMNS_MEDIUM)
                         projectCombo.addActionListener {
                             linkedRepoCombo.proposeModelUpdate { model ->
@@ -406,7 +402,7 @@ class EnvironmentDetailsPanel(private val context: CawsSettings, lifetime: Lifet
                     row(message("caws.workspace.details.branch_existing")) {
                         cell(linkedBranchCombo)
                             .bindItem(context::linkedRepoBranch.toMutableProperty())
-                            .errorOnApply(message("caws.workspace.details.branch_validation")) { it.selectedItem == null }
+                            .errorOnApply(message("caws.workspace.details.branch_validation")) { it.isVisible && it.selectedItem == null }
                             .columns(COLUMNS_MEDIUM)
 
                         linkedRepoCombo.addActionListener {
@@ -437,7 +433,9 @@ class EnvironmentDetailsPanel(private val context: CawsSettings, lifetime: Lifet
                     // need here to force comboboxes to load
                     getProjects(client, spaces).apply {
                         forEach { projectCombo.addItem(it) }
-                        projectCombo.selectedItem = firstOrNull { it.space == CawsSpaceTracker.getInstance().lastSpaceName() }
+                        projectCombo.selectedItem = existingProject
+                            ?: firstOrNull { it.space == CawsSpaceTracker.getInstance().lastSpaceName() }
+                            ?: firstOrNull()
                     }
 
                     val propertyGraph = PropertyGraph()

jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsLoadingPanel.kt

@@ -40,7 +40,6 @@ import software.aws.toolkits.jetbrains.gateway.welcomescreen.PANEL_TOP_INSET
 import software.aws.toolkits.jetbrains.gateway.welcomescreen.recursivelySetBackground
 import software.aws.toolkits.jetbrains.services.caws.CawsLetterBadge
 import software.aws.toolkits.jetbrains.services.caws.CawsResources
-import software.aws.toolkits.jetbrains.settings.CawsSpaceTracker
 import software.aws.toolkits.jetbrains.ui.connection.SonoLoginOverlay
 import software.aws.toolkits.resources.message
 import java.awt.BorderLayout
@@ -144,9 +143,7 @@ abstract class CawsLoadingPanel(protected val lifetime: Lifetime, private val se
         callback(
             cawsWizard(
                 lifetime,
-                CawsSettings().also {
-                    it.initialSpace = CawsSpaceTracker.getInstance().lastSpaceName()
-                }
+                CawsSettings()
             )
         )
     }

jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceGroupsPanel.kt

@@ -171,7 +171,7 @@ class WorkspaceGroupsPanel(
                             lifetime,
                             CawsSettings().also {
                                 it.project = project
-                                it.linkedRepoName = workspaceGroup.repoName ?: ""
+                                it.linkedRepoName = workspaceGroup.repoName
                             }
                         )
                     )