Type "delete me" instead of resource name for resource deletion (#2453)

* Type delete me instead of resource name for resource deletion

* Type delete me instead of resource name for resource  deletion

* Dialog for delete resource confirmation with dialog wrapper

* Delete resource confirmation UI Test change

* Delete Resource

* Ok button disabled until delete me entered

* Ok button disabled until delete me entered

* Override function OkAction removed

* Override function OkAction removed -

* Validation function properties removed

Co-authored-by: Austin Brooks <[email protected]>

Author: manodnyab

.changes/next-release/feature-6e6f3f94-ccf7-4c5d-89e5-e56c4fdddbc1.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Deleting resources now requires typing \"delete me\" instead of the resource name"
+}

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

@@ -0,0 +1,50 @@
+// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+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.ui.DocumentAdapter
+import com.intellij.ui.components.JBLabel
+import com.intellij.ui.components.JBTextField
+import com.intellij.ui.layout.panel
+import software.aws.toolkits.resources.message
+import javax.swing.JComponent
+import javax.swing.event.DocumentEvent
+
+class DeleteResourceDialog(
+    project: Project,
+    private val resourceType: String,
+    private val resourceName: String
+) : DialogWrapper(project) {
+    private val deleteResourceConfirmation = JBTextField().apply { emptyText.text = message("delete_resource.confirmation_text") }
+    private val warningIcon = JBLabel(Messages.getWarningIcon())
+    private val component by lazy {
+        panel {
+            row {
+                warningIcon(grow)
+                right { label(message("delete_resource.message", resourceType, resourceName)) }
+            }
+            row {
+                deleteResourceConfirmation(grow)
+            }
+        }
+    }
+
+    init {
+        super.init()
+        title = message("delete_resource.title", resourceType, resourceName)
+        okAction.isEnabled = false
+        deleteResourceConfirmation.document.addDocumentListener(
+            object : DocumentAdapter() {
+                override fun textChanged(e: DocumentEvent) {
+                    isOKActionEnabled = deleteResourceConfirmation.text == message("delete_resource.confirmation_text")
+                }
+            }
+        )
+    }
+
+    override fun createCenterPanel(): JComponent = component
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/DeleteResourceAction.kt

@@ -7,8 +7,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAware
-import com.intellij.openapi.ui.InputValidator
-import com.intellij.openapi.ui.Messages
+import software.aws.toolkits.jetbrains.core.explorer.DeleteResourceDialog
 import software.aws.toolkits.jetbrains.core.explorer.nodes.AwsExplorerResourceNode
 import software.aws.toolkits.jetbrains.utils.Operation
 import software.aws.toolkits.jetbrains.utils.TaggingResourceType
@@ -24,23 +23,11 @@ abstract class DeleteResourceAction<in T : AwsExplorerResourceNode<*>>(text: Str
     SingleResourceNodeAction<T>(text, icon = AllIcons.Actions.Cancel), DumbAware {
     final override fun actionPerformed(selected: T, e: AnActionEvent) {
         warnResourceOperationAgainstCodePipeline(selected.nodeProject, selected.displayName(), selected.resourceArn(), taggingResourceType, Operation.DELETE) {
+
             val resourceType = selected.resourceType()
             val resourceName = selected.displayName()
-
-            val response = Messages.showInputDialog(
-                selected.project,
-                message("delete_resource.message", resourceType, resourceName),
-                message("delete_resource.title", resourceType, resourceName),
-                Messages.getWarningIcon(),
-                null,
-                object : InputValidator {
-                    override fun checkInput(inputString: String?): Boolean = inputString == resourceName
-
-                    override fun canClose(inputString: String?): Boolean = checkInput(inputString)
-                }
-            )
-
-            if (response == null) {
+            val response = DeleteResourceDialog(selected.nodeProject, resourceType, resourceName).showAndGet()
+            if (!response) {
                 AwsTelemetry.deleteResource(selected.project, ServiceType.from(selected.serviceId), Result.Cancelled)
             } else {
                 ApplicationManager.getApplication().executeOnPooledThread {

resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -343,9 +343,10 @@ datagrip.secretsmanager.validation.no_username=Secret {0} does not have a field
 datagrip.secretsmanager.validation.unkown_engine=Unknown database engine {0}
 datagrip.validation.invalid_credential_specified=Invalid credential profile {0} selected!
 datagrip.validation.invalid_region_specified=Invalid region {0} selected!
+delete_resource.confirmation_text=delete me
 delete_resource.delete_failed=Failed to delete {0} ''{1}''
 delete_resource.deleted=Deleted {0} ''{1}''
-delete_resource.message=Are you sure you want to delete {0} ''{1}''?\n\nType the {0} name below to confirm.
+delete_resource.message=Are you sure you want to delete {0} ''{1}''?\n\nType "delete me" below to confirm.
 delete_resource.title=Delete {0} {1}
 dockerfile.label=Dockerfile:
 ecr.copy_image_uri.action=Copy Tag URI

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/CloudFormationBrowserTest.kt

@@ -17,7 +17,7 @@ import software.aws.toolkits.jetbrains.uitests.CoreTest
 import software.aws.toolkits.jetbrains.uitests.extensions.uiTest
 import software.aws.toolkits.jetbrains.uitests.fixtures.IdeaFrame
 import software.aws.toolkits.jetbrains.uitests.fixtures.awsExplorer
-import software.aws.toolkits.jetbrains.uitests.fixtures.fillSingleTextField
+import software.aws.toolkits.jetbrains.uitests.fixtures.fillAllJBTextFields
 import software.aws.toolkits.jetbrains.uitests.fixtures.findAndClick
 import software.aws.toolkits.jetbrains.uitests.fixtures.idea
 import software.aws.toolkits.jetbrains.uitests.fixtures.pressOk
@@ -91,7 +91,7 @@ class CloudFormationBrowserTest {
                     openExplorerActionMenu(cloudFormation, stack)
                 }
                 findAndClick("//div[@text='$deleteStackText']")
-                fillSingleTextField(stack)
+                fillAllJBTextFields("delete me")
                 pressOk()
             }
 

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/S3BrowserTest.kt

@@ -28,6 +28,7 @@ import software.aws.toolkits.jetbrains.uitests.fixtures.actionButton
 import software.aws.toolkits.jetbrains.uitests.fixtures.actionMenuItem
 import software.aws.toolkits.jetbrains.uitests.fixtures.awsExplorer
 import software.aws.toolkits.jetbrains.uitests.fixtures.fileBrowser
+import software.aws.toolkits.jetbrains.uitests.fixtures.fillAllJBTextFields
 import software.aws.toolkits.jetbrains.uitests.fixtures.fillSingleTextField
 import software.aws.toolkits.jetbrains.uitests.fixtures.findAndClick
 import software.aws.toolkits.jetbrains.uitests.fixtures.idea
@@ -192,7 +193,7 @@ class S3BrowserTest {
                     openExplorerActionMenu(S3, bucket)
                 }
                 findAndClick("//div[@text='$deleteBucketText']")
-                fillSingleTextField(bucket)
+                fillAllJBTextFields("delete me")
                 pressOk()
                 waitForS3BucketDeletion()
             }

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/SQSTest.kt

@@ -220,7 +220,7 @@ class SQSTest {
                         openExplorerActionMenu(sqsNodeLabel, queueName)
                     }
                     actionMenuItem(deleteQueueText).click()
-                    fillSingleTextField(queueName)
+                    fillAllJBTextFields("delete me")
                     pressOk()
                     client.waitForDeletion(queueName)
                 }
@@ -229,7 +229,7 @@ class SQSTest {
                         openExplorerActionMenu(sqsNodeLabel, fifoQueueName)
                     }
                     actionMenuItem(deleteQueueText).click()
-                    fillSingleTextField(fifoQueueName)
+                    fillAllJBTextFields("delete me")
                     pressOk()
                     client.waitForDeletion(fifoQueueName)
                 }