Migrate from UI DSL v1 to v2 - 1 (#3797)

* changed dialog to dslv2

* fixed cawsclonedialog

* fixed delete resource dialog

* resolved detekt

* detekt changes

Author: manodnyab

jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/DeleteResourceDialog.kt

@@ -6,11 +6,11 @@ package software.aws.toolkits.jetbrains.core.explorer
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Messages
-import com.intellij.openapi.ui.panel.ComponentPanelBuilder
 import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBTextField
-import com.intellij.ui.layout.panel
+import com.intellij.ui.dsl.builder.Align
+import com.intellij.ui.dsl.builder.panel
 import software.aws.toolkits.resources.message
 import javax.swing.JComponent
 import javax.swing.event.DocumentEvent
@@ -25,24 +25,18 @@ class DeleteResourceDialog(
         emptyText.text = message("delete_resource.confirmation_text")
         accessibleContext.accessibleName = message("general.delete_accessible_name")
     }
+
     private val warningIcon = JBLabel(Messages.getWarningIcon())
     private val component by lazy {
         panel {
             row {
-                warningIcon(grow)
+                cell(warningIcon)
                 label(message("delete_resource.message", resourceType, resourceName))
             }
             row {
-                deleteResourceConfirmation(grow)
+                cell(deleteResourceConfirmation).align(Align.FILL)
             }
-            createNoteOrCommentRow(
-                ComponentPanelBuilder.createCommentComponent(
-                    comment,
-                    true,
-                    -1,
-                    true
-                )
-            ).visible = !comment.isNullOrEmpty()
+            row { }.comment(comment).visible(this@DeleteResourceDialog.comment.isNotBlank())
         }
     }
 

jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ViewResourceDialog.kt

@@ -5,8 +5,8 @@ package software.aws.toolkits.jetbrains.core.explorer
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
-import com.intellij.ui.layout.GrowPolicy
-import com.intellij.ui.layout.panel
+import com.intellij.ui.dsl.builder.bindText
+import com.intellij.ui.dsl.builder.panel
 import javax.swing.JComponent
 
 class ViewResourceDialog(project: Project, val resourceType: String, actionTitle: String, checkResourceNameValidity: (resource: String?) -> Boolean) :
@@ -15,7 +15,7 @@ class ViewResourceDialog(project: Project, val resourceType: String, actionTitle
     private val component by lazy {
         panel {
             row("$resourceType:") {
-                textField(::resourceName).growPolicy(GrowPolicy.SHORT_TEXT).withErrorOnApplyIf("$resourceType must be entered") {
+                textField().bindText(::resourceName).errorOnApply("$resourceType must be entered") {
                     it.text.isNullOrBlank() || checkResourceNameValidity(it.text)
                 }
             }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCloneDialogComponent.kt

@@ -22,8 +22,10 @@ import com.intellij.ui.IdeBorderFactory
 import com.intellij.ui.SearchTextField
 import com.intellij.ui.SimpleTextAttributes
 import com.intellij.ui.components.JBList
+import com.intellij.ui.dsl.builder.Align
+import com.intellij.ui.dsl.builder.AlignX
+import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.layout.listCellRenderer
-import com.intellij.ui.layout.panel
 import com.intellij.util.ui.StatusText
 import com.intellij.util.ui.UIUtil
 import git4idea.checkout.GitCheckoutProvider
@@ -49,7 +51,6 @@ import software.aws.toolkits.telemetry.CodecatalystTelemetry
 import java.net.URI
 import java.nio.file.Paths
 import javax.swing.JComponent
-import javax.swing.JSeparator
 import software.aws.toolkits.telemetry.Result as TelemetryResult
 
 class CawsCloneDialogComponent(
@@ -138,21 +139,16 @@ class CawsCloneDialogComponent(
                     it.presentableString
                 }
                 val label = CawsLetterBadge(connectionSettings)
-
-                cell(isFullWidth = true) {
-                    searchField.textEditor(growX)
-                    JSeparator(JSeparator.VERTICAL)(growY)
-                    component(label)
-                }
+                cell(searchField.textEditor).resizableColumn().align(Align.FILL)
+                cell(label).align(AlignX.RIGHT)
             }
 
             row {
-                scrollPane(repoList)
-                    .constraints(growX)
-            }
+                scrollCell(repoList).resizableColumn().align(Align.FILL)
+            }.resizableRow()
 
             row(message("caws.clone_dialog_directory")) {
-                browseButton()
+                cell(browseButton).align(Align.FILL)
             }
         }
 

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PullFromRepositoryAction.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.SimpleListCellRenderer
-import com.intellij.ui.layout.panel
+import com.intellij.ui.dsl.builder.panel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import software.amazon.awssdk.services.ecr.EcrClient
@@ -76,21 +76,15 @@ private class PullFromRepositoryDialog(selectedRepository: Repository, project:
     }
 
     override fun createCenterPanel() = panel {
-        val sizeGroup = "repoTag"
+        val widthGroup = "repoTag"
         row(message("ecr.repo.label")) {
-            repoSelector()
-                .sizeGroup(sizeGroup)
-                .constraints(grow)
-                .withErrorOnApplyIf(message("loading_resource.still_loading")) { it.isLoading }
-                .withErrorOnApplyIf(message("ecr.repo.not_selected")) { it.selected() == null }
+            cell(repoSelector).widthGroup(widthGroup).apply {
+            }.errorOnApply(message("loading_resource.still_loading")) { it.isLoading }.errorOnApply(message("ecr.repo.not_selected")) { it.selected() == null }
         }
 
         row(message("ecr.push.remoteTag")) {
-            imageSelector()
-                .sizeGroup(sizeGroup)
-                .constraints(grow)
-                .withErrorOnApplyIf(message("loading_resource.still_loading")) { it.isLoading }
-                .withErrorOnApplyIf(message("ecr.image.not_selected")) { it.selected() == null }
+            cell(imageSelector).widthGroup(widthGroup).apply {
+            }.errorOnApply(message("loading_resource.still_loading")) { it.isLoading }.errorOnApply(message("ecr.image.not_selected")) { it.selected() == null }
         }
     }