Migrate from UI DSL v1 to v2 - 4 (#3834)

manodnyab · web-flow · commit 50b84fbe0313 · 2023-09-01T10:45:16.000-07:00
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EnableDisableExecuteCommandWarning.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EnableDisableExecuteCommandWarning.kt
@@ -7,7 +7,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Messages
 import com.intellij.ui.components.JBLabel
-import com.intellij.ui.layout.panel
+import com.intellij.ui.dsl.builder.bindSelected
+import com.intellij.ui.dsl.builder.panel
 import software.aws.toolkits.jetbrains.core.help.HelpIds
 import software.aws.toolkits.jetbrains.settings.EcsExecCommandSettings
 import software.aws.toolkits.resources.message
@@ -23,22 +24,21 @@ class EnableDisableExecuteCommandWarning(private val project: Project, private v
     private val component by lazy {
         panel {
             row {
-                warningIcon(grow)
-                label(message("ecs.execute_command_enable_warning")).constraints(grow).visible(enable)
-                label(message("ecs.execute_command_disable_warning")).constraints(grow).visible(!enable)
+                cell(warningIcon)
+                label(message("ecs.execute_command_enable_warning")).visible(enable)
+                label(message("ecs.execute_command_disable_warning")).visible(!enable)
             }
 
             row {
                 checkBox(
-                    message("ecs.execute_command.production_warning.checkbox_label", serviceName),
-                    { confirmNonProduction },
-                    { confirmNonProduction = it }
-                ).withErrorOnApplyIf(message("general.confirm_proceed")) { !it.isSelected }
-                    .constraints(grow)
+                    message("ecs.execute_command.production_warning.checkbox_label", serviceName)
+                )
+                    .bindSelected({ confirmNonProduction }, { confirmNonProduction = it })
+                    .errorOnApply(message("general.confirm_proceed")) { !it.isSelected }
             }
 
             row {
-                checkBox(message("general.notification.action.hide_forever"), { dontDisplayWarning }, { dontDisplayWarning = it })
+                checkBox(message("general.notification.action.hide_forever")).bindSelected({ dontDisplayWarning }, { dontDisplayWarning = it })
             }
         }
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/TaskRoleNotFoundWarningDialog.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/TaskRoleNotFoundWarningDialog.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Messages
 import com.intellij.ui.components.JBLabel
-import com.intellij.ui.layout.panel
+import com.intellij.ui.dsl.builder.panel
 import software.aws.toolkits.resources.message
 import javax.swing.Action
 import javax.swing.JComponent
@@ -18,8 +18,8 @@ class TaskRoleNotFoundWarningDialog(project: Project) : DialogWrapper(project) {
     private val component by lazy {
         panel {
             row {
-                warningIcon(grow)
-                warningMessage(grow).also { it.component.setCopyable(true) }
+                cell(warningIcon)
+                cell(warningMessage).also { it.component.setCopyable(true) }
             }
         }
     }
diff --git a/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -698,14 +698,14 @@ ecs.execute_command_disable_failed=Execute Command could not be disabled for {0}
 ecs.execute_command_disable_in_progress=Cannot execute action since Execute Command is being disabled for {0}
 ecs.execute_command_disable_progress_indicator_message=Disabling Command Execution for {0}
 ecs.execute_command_disable_success=Execute Command for {0} has been disabled.
-ecs.execute_command_disable_warning=Disabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\n Do you wish to continue?
+ecs.execute_command_disable_warning=<html>Disabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.<br> Do you wish to continue?</html>
 ecs.execute_command_disable_warning_title=Disable Execute Command Warning
 ecs.execute_command_enable=Enable Command Execution
 ecs.execute_command_enable_failed=Execute Command could not be enabled for {0}
 ecs.execute_command_enable_in_progress=Cannot execute action since Execute Command is being enabled for {0}
 ecs.execute_command_enable_progress_indicator_message=Enabling Command Execution for {0}
 ecs.execute_command_enable_success=Execute Command for {0} has been enabled.
-ecs.execute_command_enable_warning=Enabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\nAltering the state of resources while the Execute Command is enabled can lead to unpredictable results.\n Do you wish to continue?
+ecs.execute_command_enable_warning=<html>Enabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.<br>Altering the state of resources while the Execute Command is enabled can lead to unpredictable results.<br> Do you wish to continue?</html>
 ecs.execute_command_enable_warning_title=Enable Execute Command Warning
 ecs.execute_command_failed=ECS Execute Command Failed
 ecs.execute_command_no_command=Command to execute must be entered

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import com.intellij.openapi.project.Project`
`7`	`7`	`import com.intellij.openapi.ui.DialogWrapper`
`8`	`8`	`import com.intellij.openapi.ui.Messages`
`9`	`9`	`import com.intellij.ui.components.JBLabel`
`10`		`-import com.intellij.ui.layout.panel`
	`10`	`+import com.intellij.ui.dsl.builder.panel`
`11`	`11`	`import software.aws.toolkits.resources.message`
`12`	`12`	`import javax.swing.Action`
`13`	`13`	`import javax.swing.JComponent`
`@@ -18,8 +18,8 @@ class TaskRoleNotFoundWarningDialog(project: Project) : DialogWrapper(project) {`
`18`	`18`	`private val component by lazy {`
`19`	`19`	`panel {`
`20`	`20`	`row {`
`21`		`- warningIcon(grow)`
`22`		`- warningMessage(grow).also { it.component.setCopyable(true) }`
	`21`	`+ cell(warningIcon)`
	`22`	`+ cell(warningMessage).also { it.component.setCopyable(true) }`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`