merge: resolve merge conflict

Signed-off-by: Matheus Ferreira <matheus.ferreira@zup.com.br>

Author: matheusferreirazup

build.gradle.kts

@@ -6,8 +6,8 @@ fun properties(key: String) = project.findProperty(key).toString()
 plugins {
     id("java")
     id("jacoco")
-    id("org.jetbrains.kotlin.jvm") version "1.7.10"
-    id("org.jetbrains.intellij") version "1.8.0"
+    id("org.jetbrains.kotlin.jvm") version "1.7.20"
+    id("org.jetbrains.intellij") version "1.9.0"
     id("org.sonarqube") version "3.4.0.2513"
 
     // Gradle Changelog Plugin

src/main/kotlin/com/stackspot/intellij/commands/BackgroundCommandRunner.kt

@@ -54,7 +54,7 @@ class BackgroundCommandRunner : CommandRunner {
     override fun runSync(commandLine: List<String>, workingDir: String?): BackgroundCommandRunner {
         return singleThread {
             var done = false
-            this.run(commandLine, object : CommandRunner.CommandEndedListener {
+            run(commandLine, object : CommandRunner.CommandEndedListener {
                 override fun notifyEnded() {
                     done = true
                 }

src/main/kotlin/com/stackspot/intellij/commands/listeners/NotifyStackSpotToolWindow.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 ZUP IT SERVICOS EM TECNOLOGIA E INOVACAO SA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.stackspot.intellij.commands.listeners
+
+import com.stackspot.intellij.commands.CommandRunner
+import com.stackspot.intellij.ui.toolwindow.AbstractStackSpotTree
+
+class NotifyStackSpotToolWindow(private val tree: AbstractStackSpotTree) : CommandRunner.CommandEndedListener {
+    override fun notifyEnded() {
+        tree.notifyChange()
+    }
+}

src/main/kotlin/com/stackspot/intellij/commands/stk/ApplyPlugin.kt

@@ -25,8 +25,9 @@ import com.stackspot.model.Stack
 class ApplyPlugin(
     private val stack: Stack,
     private val plugin: Plugin,
-    project: Project
+    project: Project,
+    private val inputFlags: Array<String> = arrayOf()
 ) : BaseCommand(StackSpotTerminalRunner(project)) {
 
-    override fun commandLine() = listOf("stk", "apply", "plugin", "${stack.name}/${plugin.name}")
+    override fun commandLine() = listOf("stk", "apply", "plugin", "${stack.name}/${plugin.name}", *inputFlags)
 }

src/main/kotlin/com/stackspot/intellij/services/StackSpotToolWindowService.kt

@@ -30,7 +30,7 @@ class StackSpotToolWindowService {
     var project: Project? = null
     var history: History? = null
     var template: AppliedTemplate? = null
-    var appliedPlugins: List<AppliedTemplate> = ArrayList<AppliedTemplate>(0)
+    var appliedPlugins: List<AppliedTemplate> = ArrayList(0)
 
     fun reloadProjectData() {
         val p = project
@@ -58,4 +58,10 @@ class StackSpotToolWindowService {
             appliedPlugins = appliedTemplates.subList(1, appliedTemplates.size)
         }
     }
+
+    fun pluginsOrTemplatesNotApplied(plugins: List<String>? = null): List<String> {
+        return plugins
+            ?.filter { p -> appliedPlugins.none { ap -> ap.templateDataPath == p } && p != template?.templateDataPath }
+            ?.toList() ?: listOf()
+    }
 }

src/main/kotlin/com/stackspot/intellij/ui/Icons.kt

@@ -51,4 +51,7 @@ object Icons {
 
     @JvmField
     val WARNING = IconLoader.getIcon("/images/warning.svg", javaClass)
+
+    @JvmField
+    val DEPENDENCY_WARNING = IconLoader.getIcon("/images/dependency_warning.svg", javaClass)
 }

src/main/kotlin/com/stackspot/intellij/ui/toolwindow/AvailablePluginsTreeNode.kt

@@ -35,7 +35,9 @@ class AvailablePluginsTreeNode(private val service: StackSpotToolWindowService)
             val stackNode = StackSpotTreeNode(stack, null, stack, null)
             add(stackNode)
             plugins.forEach { plugin ->
-                val pluginNode = StackSpotTreeNode(plugin, null, stack, plugin)
+                val pluginsNotApplied = service.pluginsOrTemplatesNotApplied(plugin.requirements)
+                val icon = if (pluginsNotApplied.isNotEmpty()) Icons.DEPENDENCY_WARNING else null
+                val pluginNode = StackSpotTreeNode(plugin, icon, stack, plugin, pluginsNotApplied)
                 stackNode.add(pluginNode)
             }
         }

src/main/kotlin/com/stackspot/intellij/ui/toolwindow/StackSpotCellRenderer.kt

@@ -16,22 +16,27 @@
 
 package com.stackspot.intellij.ui.toolwindow
 
+import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.util.IconLoader
 import com.intellij.ui.ColorUtil
 import com.intellij.util.ui.UIUtil
-import com.stackspot.intellij.commands.CommandRunner
+import com.stackspot.intellij.commands.listeners.NotifyStackSpotToolWindow
 import com.stackspot.intellij.commands.listeners.NotifyStacksUpdatedCommandListener
 import com.stackspot.intellij.commands.stk.ApplyPlugin
 import com.stackspot.intellij.commands.stk.DeleteStack
 import com.stackspot.intellij.commands.stk.UpdateStack
 import com.stackspot.intellij.ui.Icons
+import com.stackspot.intellij.ui.toolwindow.panels.PluginInputsPanel
 import java.awt.BorderLayout
 import java.awt.Color
 import java.awt.Component
 import java.awt.Dimension
 import javax.swing.*
 import javax.swing.tree.DefaultTreeCellRenderer
 
+private const val COULD_NOT_APPLY_PLUGIN = "Could not apply plugin"
+private const val PLUGIN_HAS_DEPENDENCY = "This plugin has dependencies. First, apply these before proceeding:"
+
 class StackSpotCellRenderer(val tree: AbstractStackSpotTree) : DefaultTreeCellRenderer() {
 
     private val panel = object : JPanel() {
@@ -106,18 +111,29 @@ class StackSpotCellRenderer(val tree: AbstractStackSpotTree) : DefaultTreeCellRe
     ): JButton {
         val button = createButton("Apply Plugin", getIcon(Icons.APPLY_PLUGIN, selected, true))
         button.addActionListener {
+            if (stackSpotNode.hasPluginDependency()) {
+                val requirements = stackSpotNode.pluginsNotAppliedToString()
+                Messages.showWarningDialog("$PLUGIN_HAS_DEPENDENCY\n$requirements", COULD_NOT_APPLY_PLUGIN)
+                return@addActionListener
+            }
+
             val stackSpotTree = (tree as AbstractStackSpotTree)
             val project = stackSpotTree.service.project
+
             if (stackSpotNode.stack != null && stackSpotNode.plugin != null && project != null) {
-                ApplyPlugin(
-                    stackSpotNode.stack,
-                    stackSpotNode.plugin,
-                    project,
-                ).run(object : CommandRunner.CommandEndedListener {
-                    override fun notifyEnded() {
-                        stackSpotTree.notifyChange()
+                if (stackSpotNode.plugin.inputs != null) {
+                    val title = "${stackSpotNode.stack}/${stackSpotNode.plugin}"
+                    val pluginInputPanel = PluginInputsPanel(project, stackSpotNode.plugin, title)
+                    val isOkExit = pluginInputPanel.showAndGet()
+                    if (isOkExit) {
+                        val inputValueAsFlags = extractVarsToCmd(pluginInputPanel.variablesMap)
+                        val applyPluginCmd =
+                            ApplyPlugin(stackSpotNode.stack, stackSpotNode.plugin, project, inputValueAsFlags)
+                        applyPluginCmd.run(NotifyStackSpotToolWindow(tree))
                     }
-                })
+                } else {
+                    ApplyPlugin(stackSpotNode.stack, stackSpotNode.plugin, project).run(NotifyStackSpotToolWindow(tree))
+                }
             }
         }
         return button
@@ -130,18 +146,22 @@ class StackSpotCellRenderer(val tree: AbstractStackSpotTree) : DefaultTreeCellRe
     }
 
     private fun getLabelForeground(selected: Boolean, focused: Boolean): Color {
-        if (UIUtil.isUnderIntelliJLaF()) {
-            if (!selected && focused || selected && !focused) {
-                return UIUtil.getTreeForeground(true, true)
-            }
+        if (UIUtil.isUnderIntelliJLaF() && (!selected && focused || selected && !focused)) {
+            return UIUtil.getTreeForeground(true, true)
         }
         return UIUtil.getTreeForeground(selected, focused)
     }
 
     private fun createIcon(stackSpotNode: StackSpotTreeNode, selected: Boolean, focused: Boolean) {
         if (stackSpotNode.icon != null) {
             val icon = getIcon(stackSpotNode.icon, selected, focused)
-            panel.add(JLabel(icon), BorderLayout.WEST)
+            val jLabel = JLabel(icon)
+            if (stackSpotNode.plugin != null && stackSpotNode.hasPluginDependency()) {
+                jLabel.toolTipText =
+                    "This plugin has dependencies. First, apply these before proceeding: <br>" +
+                            "${stackSpotNode.pluginsNotAppliedToString(isHtml = true)}"
+            }
+            panel.add(jLabel, BorderLayout.WEST)
         }
     }
 
@@ -200,4 +220,17 @@ class StackSpotCellRenderer(val tree: AbstractStackSpotTree) : DefaultTreeCellRe
         button.isContentAreaFilled = false
         return button
     }
+
+    private fun extractVarsToCmd(varsMap: Map<String, Any>): Array<String> {
+        val args = mutableListOf<String>()
+        varsMap.forEach { (key, value) ->
+            if (value is Set<*>) {
+                value.forEach { elem -> args.add("--$key $elem") }
+            } else {
+                args.add("--$key $value")
+            }
+        }
+
+        return args.toTypedArray()
+    }
 }

src/main/kotlin/com/stackspot/intellij/ui/toolwindow/StackSpotTreeNode.kt

@@ -26,4 +26,19 @@ open class StackSpotTreeNode(
     val icon: Icon? = null,
     val stack: Stack? = null,
     val plugin: Plugin? = null,
-) : DefaultMutableTreeNode(userObject)
+    private val pluginsNotApplied: List<String>? = null
+) : DefaultMutableTreeNode(userObject) {
+
+    fun hasPluginDependency(): Boolean {
+        return pluginsNotApplied?.isNotEmpty() ?: false
+    }
+
+    fun pluginsNotAppliedToString(isHtml: Boolean  = false): StringBuilder {
+        val newLine = if (isHtml) "<br>" else "\n"
+        val stringBuilder = StringBuilder()
+        pluginsNotApplied?.forEach { pa ->
+            stringBuilder.append("- $pa $newLine")
+        }
+        return stringBuilder
+    }
+}