Bugfix/stack url dialog (#18)

* fix: added url validation and changed import stack screen interaction

Signed-off-by: Adroaldo Neto <adroaldo.neto@zup.com.br>

* fix: fixed handling for invalid url

Signed-off-by: Adroaldo Neto <adroaldo.neto@zup.com.br>

Signed-off-by: Adroaldo Neto <adroaldo.neto@zup.com.br>

Author: adroaldonetozup

src/main/kotlin/com/stackspot/intellij/actions/ImportStackAction.kt

@@ -22,6 +22,9 @@ import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.ui.Messages
 import com.stackspot.intellij.commands.listeners.NotifyStacksUpdatedCommandListener
 import com.stackspot.intellij.commands.stk.ImportStack
+import com.stackspot.intellij.commons.ErrorDialog
+import com.stackspot.intellij.commons.InputDialog.REPOSITORY_URL
+import com.stackspot.intellij.commons.isUrlValid
 import com.stackspot.intellij.ui.Icons
 import com.stackspot.intellij.ui.StackSpotTerminalRunner
 
@@ -30,14 +33,20 @@ const val IMPORT_STACK = "Import Stack"
 
 class ImportStackAction : AnAction(IMPORT_STACK, IMPORT_STACK, Icons.IMPORT_STACK), DumbAware {
     override fun actionPerformed(e: AnActionEvent) {
-        val stackUrl = askForStackUrl()
+        val stackUrl = askForStackUrl() ?: return
+
+        if (!stackUrl.isUrlValid()) {
+            Messages.showErrorDialog(ErrorDialog.URL_IS_NOT_VALID_MESSAGE, ErrorDialog.URL_IS_NOT_VALID_TITLE)
+            return
+        }
+
         val project = e.project
-        if (stackUrl != null && project != null) {
+        if (project != null) {
             ImportStack(stackUrl, StackSpotTerminalRunner(project)).run(NotifyStacksUpdatedCommandListener())
         }
     }
 
     private fun askForStackUrl(): String? {
-        return Messages.showInputDialog("Enter Stack GIT URL To Import", IMPORT_STACK, Messages.getQuestionIcon())
+        return Messages.showInputDialog(REPOSITORY_URL, IMPORT_STACK, Messages.getQuestionIcon())
     }
 }

src/main/kotlin/com/stackspot/intellij/commons/UrlDialogExtension.kt

@@ -0,0 +1,15 @@
+package com.stackspot.intellij.commons
+
+object InputDialog {
+    const val REPOSITORY_URL = "Insert a stack repository URL"
+}
+
+object ErrorDialog {
+    const val URL_IS_NOT_VALID_MESSAGE = "Requested URL is not valid"
+    const val URL_IS_NOT_VALID_TITLE = "Invalid URL"
+}
+
+fun String?.isUrlValid(): Boolean {
+    val regex = """((git|ssh|https)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(/)?""".toRegex()
+    return (this?.isNotEmpty() == true) && regex.matches(this)
+}

src/main/kotlin/com/stackspot/intellij/ui/project_wizard/panels/StackSpotNoStackfilesErrorPanel.kt

@@ -24,6 +24,10 @@ import com.stackspot.intellij.actions.IMPORT_STACK
 import com.stackspot.intellij.commands.BackgroundCommandRunner
 import com.stackspot.intellij.commands.listeners.NotifyProjectWizardImportedStack
 import com.stackspot.intellij.commands.stk.ImportStack
+import com.stackspot.intellij.commons.ErrorDialog.URL_IS_NOT_VALID_MESSAGE
+import com.stackspot.intellij.commons.ErrorDialog.URL_IS_NOT_VALID_TITLE
+import com.stackspot.intellij.commons.InputDialog.REPOSITORY_URL
+import com.stackspot.intellij.commons.isUrlValid
 import java.util.concurrent.Executors
 import javax.swing.JComponent
 
@@ -57,20 +61,25 @@ class StackSpotNoStackfilesErrorPanel(val parentPanel: StackSpotParentPanel) {
     }
 
     private fun askForStackUrl(): String? {
-        return Messages.showInputDialog("Enter Stack GIT URL To Import", IMPORT_STACK, Messages.getQuestionIcon())
+        return Messages.showInputDialog(REPOSITORY_URL, IMPORT_STACK, Messages.getQuestionIcon())
     }
 
     private fun runImportStack() {
-        val url = askForStackUrl()
+        val url = askForStackUrl() ?: return
+
+        if (!url.isUrlValid()) {
+            Messages.showErrorDialog(URL_IS_NOT_VALID_MESSAGE, URL_IS_NOT_VALID_TITLE)
+            return
+        }
+
         parentPanel.showImportingStack()
+
         val executor = Executors.newSingleThreadExecutor()
         executor.submit {
-            if (!url.isNullOrEmpty()) {
                 ImportStack(url, BackgroundCommandRunner(Constants.Paths.STK_HOME.toString()))
                     .run(NotifyProjectWizardImportedStack(parentPanel))
-            }
         }
         executor.shutdown()
     }
 
-}
+}