Make the schema panel lazy in the project wizard (#2374)

- Make all of the panels lazy so they aren't initialized unless the user goes into the aws wizard
- Make schemas only load once a template that supports them is selected

Author: hunterwerlla

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.kt

@@ -151,8 +151,11 @@ class SamInitSelectionPanel(
         val selectedRuntime = runtimes.selected
         val selectedTemplate = templateComboBox.selectedItem as? SamProjectTemplate
         wizardFragments.forEach { (wizardFragment, jComponent) ->
-            wizardFragment.updateUi(projectLocation, selectedRuntime?.runtimeGroup, selectedTemplate)
-            jComponent.isVisible = wizardFragment.isApplicable(selectedTemplate)
+            val isApplicable = wizardFragment.isApplicable(selectedTemplate)
+            if (isApplicable) {
+                wizardFragment.updateUi(projectLocation, selectedRuntime?.runtimeGroup, selectedTemplate)
+            }
+            jComponent.isVisible = isApplicable
         }
         wizardUpdateCallback()
     }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaResourceSelector.kt

@@ -15,28 +15,25 @@ import software.aws.toolkits.jetbrains.ui.ResourceSelector
 import javax.swing.JComponent
 
 class SchemaResourceSelector {
-    private var currentAwsConnection: ConnectionSettings? = null
+    var awsConnection: ConnectionSettings? = null
 
     internal val schemasSelector = initializeSchemasSelector()
         @TestOnly
         get() = field
 
     val component: JComponent = schemasSelector
 
+    fun reload() = schemasSelector.reload()
+
     private fun initializeSchemasSelector(): ResourceSelector<SchemaSelectionItem> = ResourceSelector.builder()
         .resource(SchemasResources.LIST_REGISTRIES_AND_SCHEMAS)
         .comboBoxModel(SchemaSelectionComboBoxModel())
         .customRenderer(SchemaSelectionListCellRenderer())
         .disableAutomaticLoading()
         .disableAutomaticSorting()
-        .awsConnection { currentAwsConnection }
+        .awsConnection { awsConnection }
         .build()
 
-    fun reloadSchemas(awsConnection: ConnectionSettings?) {
-        currentAwsConnection = awsConnection
-        schemasSelector.reload()
-    }
-
     fun registryName(): String? = when (val selected = schemasSelector.selected()) {
         is SchemaSelectionItem.SchemaItem -> selected.registryName
         else -> null
@@ -59,7 +56,7 @@ class SchemaResourceSelector {
 
         val schemaDownloader = SchemaDownloader()
         val describeSchemaResponse =
-            schemaDownloader.getSchemaContent(registryName, schemaName, connectionSettings = currentAwsConnection!!).toCompletableFuture().get()
+            schemaDownloader.getSchemaContent(registryName, schemaName, connectionSettings = awsConnection!!).toCompletableFuture().get()
         val latestSchemaVersion = describeSchemaResponse.schemaVersion()
 
         val schemaNode = schemaDownloader.getSchemaContentAsJson(describeSchemaResponse)

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanel.kt

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.lambda.wizard
 
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.ui.layout.panel
@@ -23,17 +24,26 @@ import javax.swing.JComponent
  * A panel encapsulating  AWS credential selection during SAM new project creation wizard
   */
 class SchemaSelectionPanel : WizardFragment {
-    private val schemaSelector = SchemaResourceSelector()
-    private val awsConnectionSelector = AwsConnectionSettingsSelector(
-        null,
-        schemaSelector::reloadSchemas
-    )
-    private val component = panel {
-        row {
-            awsConnectionSelector.selectorPanel()(grow)
+    private val schemaSelector by lazy { SchemaResourceSelector() }
+    private val awsConnectionSelector by lazy {
+        AwsConnectionSettingsSelector(
+            null
+        ) {
+            val prev = schemaSelector.awsConnection
+            schemaSelector.awsConnection = it
+            if (prev != null) {
+                schemaSelector.reload()
+            }
         }
-        row(message("sam.init.schema.label")) {
-            schemaSelector.component(grow)
+    }
+    private val component by lazy {
+        panel {
+            row {
+                awsConnectionSelector.selectorPanel()(grow)
+            }
+            row(message("sam.init.schema.label")) {
+                schemaSelector.component(grow)
+            }
         }
     }
 
@@ -56,6 +66,11 @@ class SchemaSelectionPanel : WizardFragment {
 
     override fun isApplicable(template: SamProjectTemplate?): Boolean = template?.supportsDynamicSchemas() == true
 
+    override fun updateUi(projectLocation: TextFieldWithBrowseButton?, runtimeGroup: RuntimeGroup?, template: SamProjectTemplate?) {
+        super.updateUi(projectLocation, runtimeGroup, template)
+        schemaSelector.reload()
+    }
+
     override fun postProjectGeneration(model: ModifiableRootModel, template: SamProjectTemplate, runtime: LambdaRuntime, progressIndicator: ProgressIndicator) {
         if (!template.supportsDynamicSchemas()) {
             return

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanelTest.kt

@@ -228,7 +228,8 @@ class SchemaSelectionPanelTest {
 
     private fun load() {
         initMockResourceCache()
-        schemaSelectionPanel.reloadSchemas(connectionManager.settingsManager.connectionSettings())
+        schemaSelectionPanel.awsConnection = connectionManager.settingsManager.connectionSettings()
+        schemaSelectionPanel.reload()
         schemaSelectionPanel.schemasSelector.waitToLoad()
     }
 }