Consistent UX across all access points in a create Dev Env panel (#3571)

* Consistent UX in all entry points to create dev env

* Fixed InstanceType issue in workspaceGroup dev env panel

* Addressed PR comments

* detekt issues

* Resolved PR comments

* Added changLog

Author: vchikoti1998

.changes/next-release/bugfix-1f3ab1df-cec3-491f-b205-2e229dfd522f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Provided UX consistent in all access points for creating Dev Environment"
+}

jetbrains-core/src-222+/software/aws/toolkits/jetbrains/services/caws/CawsParameterDescriptions.kt

@@ -48,11 +48,11 @@ fun isSubscriptionFreeTier(
     client: CodeCatalystClient,
     space: String?
 ): Boolean {
-    val subscriptionTier = if (existingProject != null) {
-        checkIfSubscriptionIsFreeTier(client, existingProject.space)
+    val subscriptionTier = if (space != null) {
+        checkIfSubscriptionIsFreeTier(client, space)
     } else {
-        space?.let { checkIfSubscriptionIsFreeTier(client, it) }
-    } ?: return true
+        return true
+    }
 
     return subscriptionTier == "FREE"
 }

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

@@ -146,7 +146,6 @@ abstract class CawsLoadingPanel(protected val lifetime: Lifetime, private val se
                 lifetime,
                 CawsSettings().also {
                     it.initialSpace = CawsSpaceTracker.getInstance().lastSpaceName()
-                    it.cloneType = CawsWizardCloneType.NONE
                 }
             )
         )

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

@@ -19,6 +19,7 @@ import software.aws.toolkits.jetbrains.gateway.toSourceRepository
 import software.aws.toolkits.jetbrains.gateway.toWorkspace
 import software.aws.toolkits.jetbrains.services.caws.CawsProject
 import software.aws.toolkits.jetbrains.services.caws.listAccessibleProjectsPaginator
+import software.aws.toolkits.jetbrains.settings.CawsSpaceTracker
 import java.time.Duration
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read
@@ -147,6 +148,9 @@ class WorkspaceDataRetriever(
     }
 
     fun markWorkspaceAsDirty(identifer: WorkspaceIdentifier) {
+        if (CawsSpaceTracker.getInstance().lastSpaceName() != identifer.project.space) {
+            return
+        }
         dirtyWorkspaces.add(identifer)
         updateAlarm.cancelAllRequests()
         pollForUpdate()

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

@@ -25,7 +25,6 @@ import com.intellij.util.ui.components.BorderLayoutPanel
 import com.jetbrains.rd.util.lifetime.Lifetime
 import software.amazon.awssdk.services.codecatalyst.CodeCatalystClient
 import software.aws.toolkits.jetbrains.gateway.CawsSettings
-import software.aws.toolkits.jetbrains.gateway.CawsWizardCloneType
 import software.aws.toolkits.jetbrains.gateway.SourceRepository
 import software.aws.toolkits.jetbrains.gateway.Workspace
 import software.aws.toolkits.jetbrains.gateway.cawsWizard
@@ -173,10 +172,6 @@ class WorkspaceGroupsPanel(
                             CawsSettings().also {
                                 it.project = project
                                 it.linkedRepoName = workspaceGroup.repoName ?: ""
-                                // TODO: 3p unlinked case
-                                if (workspaceGroup.repoName == null) {
-                                    it.cloneType = CawsWizardCloneType.NONE
-                                }
                             }
                         )
                     )

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

@@ -247,6 +247,7 @@ caws.view.projects_web=View project summary in Amazon CodeCatalyst...
 caws.view.workspaces_web=View all Dev Environments for project in Amazon CodeCatalyst...
 caws.workspace.backend.title=Amazon CodeCatalyst Dev Environment
 caws.workspace.clone.info=The project source repository will be cloned to the Dev Environment directly.
+caws.workspace.clone.info_repo=Choose the branch to clone, or create a branch for your work in this Dev Environment.
 caws.workspace.clone.ssh_agent=Your SSH agent will be forwarded to the Dev Environment for authentication to the repository.
 caws.workspace.connection.failed=Dev Environment connection failed
 caws.workspace.creation.failed=Dev Environment creation failed
@@ -258,7 +259,9 @@ caws.workspace.details.branch_new=New Branch:
 caws.workspace.details.branch_new_validation=New branch name is required
 caws.workspace.details.branch_title=Branch:
 caws.workspace.details.branch_validation=Branch selection is required
+caws.workspace.details.clone_repo=Clone a repository
 caws.workspace.details.create_branch_comment=Choose an existing branch or create a new branch. If you choose a third-party source repository, you must work in an existing branch.
+caws.workspace.details.create_empty_dev_env=Create an empty Dev Environment
 caws.workspace.details.create_from_existing_branch=Existing Branch
 caws.workspace.details.create_from_new_branch=New Branch
 caws.workspace.details.developer_tool_settings=Toolkit Developer Settings
@@ -289,6 +292,7 @@ caws.workspace.list_panel_search_empty_text=Search Dev Environments
 caws.workspace.new=Create Dev Environment
 caws.workspace.panel_other_repos=Other repositories
 caws.workspace.settings=Dev Environment Configuration
+caws.workspace.settings.repository_header=Repository
 caws.write_credentials_to_file_progress=Writing credentials to shared credentials file
 cloudformation.capabilities=CloudFormation Capabilities:
 cloudformation.capabilities.auto_expand=Auto Expand