Fix regression: when there is no current spark type and no default spark type, local/livy console will point to job submission (#2715)

To address #2714

Author: konjac

PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml

@@ -595,14 +595,23 @@
 
     <action id="Actions.SparkSubmitJobActionGroups" class="com.microsoft.azure.hdinsight.spark.run.action.SparkSubmitJobActionGroups" text="Submit Spark Application"/>
 
-    <action id="Actions.SparkRunConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunConsoleActionGroups" text="Run Spark Console"/>
+    <action id="Actions.SparkRunLivyConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunLivyConsoleActionGroups" text="Run Spark Console"/>
+
+    <action id="Actions.SparkRunLocalConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunLocalConsoleActionGroups" text="Run Spark Local Console"/>
 
     <action id="Actions.RunLivySparkConsoleAction"
-            class="com.microsoft.azure.hdinsight.spark.console.LivySparkSelectTypeAndRunConsoleAction" text="Spark on HDInsight"
-            description="Start interactive console for Spark on HDInsight Application" icon="/icons/Spark.png"/>
+            class="com.microsoft.azure.hdinsight.spark.console.SelectLivySparkTypeThenRunLivyConsoleAction" text="Spark on HDInsight"
+            description="Start an interactive console for Spark on HDInsight Application" icon="/icons/Spark.png"/>
     <action id="Actions.RunCosmosSparkConsoleAction"
-            class="com.microsoft.azure.hdinsight.spark.console.CosmosSparkSelectTypeAndRunConsoleAction" text="Spark on Cosmos"
-            description="Start interactive console for Spark on Cosmos Application" icon="/icons/Spark.png"/>
+            class="com.microsoft.azure.hdinsight.spark.console.SelectCosmosSparkTypeThenRunLivyConsoleAction" text="Spark on Cosmos"
+            description="Start an interactive console for Spark on Cosmos Application" icon="/icons/Spark.png"/>
+
+    <action id="Actions.RunLivySparkLocalConsoleAction"
+            class="com.microsoft.azure.hdinsight.spark.console.SelectLivySparkTypeThenRunLocalConsoleAction" text="Spark on HDInsight"
+            description="Start a Spark local console for Spark on HDInsight Application" icon="/icons/Spark.png"/>
+    <action id="Actions.RunCosmosSparkLocalConsoleAction"
+            class="com.microsoft.azure.hdinsight.spark.console.SelectCosmosSparkTypeThenRunLocalConsoleAction" text="Spark on Cosmos"
+            description="Start a Spark local console for Spark on Cosmos Application" icon="/icons/Spark.png"/>
     </actions>
     <helpset file="azure-toolkit-for-intellij-help.jar" path="/helpset.hs"/>
 </idea-plugin>

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/CosmosSparkScalaLivyConsoleRunConfiguration.kt

@@ -64,9 +64,12 @@ class CosmosSparkScalaLivyConsoleRunConfiguration(project: Project,
     }
 
     override fun checkRunnerSettings(runner: ProgramRunner<*>, runnerSettings: RunnerSettings?, configurationPerRunnerSettings: ConfigurationPerRunnerSettings?) {
-        val adlAccount = (submitModel as? CosmosSparkSubmitModel)?.accountName
+        val cosmosSparkSubmitModel = (submitModel as? CosmosSparkSubmitModel)
                 ?: throw RuntimeConfigurationError("Can't cast submitModel to CosmosSparkSubmitModel")
 
+        val adlAccount = cosmosSparkSubmitModel?.accountName
+                ?: throw RuntimeConfigurationError("The target cluster name is not selected")
+
         cluster = AzureSparkCosmosClusterManager
                 .getInstance()
                 .getAccountByName(adlAccount)

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/RunSparkScalaConsoleAction.kt

@@ -27,15 +27,13 @@ import com.intellij.execution.RunManagerEx
 import com.intellij.execution.RunnerAndConfigurationSettings
 import com.intellij.execution.configurations.ConfigurationType
 import com.intellij.execution.configurations.RunConfiguration
-import com.intellij.execution.configurations.RuntimeConfigurationError
 import com.intellij.execution.executors.DefaultRunExecutor
 import com.intellij.execution.runners.ExecutionEnvironmentBuilder
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.Messages
 import com.intellij.psi.PsiFile
 import com.microsoft.azure.hdinsight.common.logger.ILogger
 import com.microsoft.azure.hdinsight.spark.run.action.RunConfigurationActionUtils
@@ -53,6 +51,8 @@ abstract class RunSparkScalaConsoleAction
     : AnAction(), RunConsoleAction.RunActionBase<LivySparkBatchJobRunConfigurationType>, ILogger {
     abstract val consoleRunConfigurationFactory: ScalaConsoleRunConfigurationFactory
 
+    abstract val selectedMenuActionId: String
+
     override fun actionPerformed(event: AnActionEvent) {
         val dataContext = event.dataContext
         val project = CommonDataKeys.PROJECT.getData(dataContext) ?: return
@@ -68,7 +68,7 @@ abstract class RunSparkScalaConsoleAction
 
         val batchConfigurationType = SelectSparkApplicationTypeAction.getRunConfigurationType()
         if (batchConfigurationType == null) {
-            val action = ActionManagerEx.getInstance().getAction("Actions.SparkRunConsoleActionGroups")
+            val action = ActionManagerEx.getInstance().getAction(selectedMenuActionId)
             action?.actionPerformed(event)
             return
         }
@@ -94,9 +94,14 @@ abstract class RunSparkScalaConsoleAction
         runInReadAction {
             val factory = configurationType.configurationFactories[0]
             val setting = RunManager.getInstance(project).createConfiguration(name, factory)
+
+            // Newly created config should let the user to edit
             setting.isEditBeforeRun = true
             handler.apply(setting.configuration)
             runFromSetting(setting, runManagerEx)
+
+            // Skip edit the next time
+            setting.isEditBeforeRun = false
         }
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/RunSparkScalaLivyConsoleAction.kt

@@ -31,6 +31,9 @@ import com.microsoft.azure.hdinsight.spark.run.configuration.*
 import org.jetbrains.plugins.scala.console.ScalaConsoleRunConfigurationFactory
 
 class RunSparkScalaLivyConsoleAction : RunSparkScalaConsoleAction() {
+    override val selectedMenuActionId: String
+        get() = "Actions.SparkRunLivyConsoleActionGroups"
+
     override val focusedTabIndex: Int
         get() = 1
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/RunSparkScalaLocalConsoleAction.kt

@@ -25,6 +25,9 @@ package com.microsoft.azure.hdinsight.spark.console
 import org.jetbrains.plugins.scala.console.ScalaConsoleRunConfigurationFactory
 
 class RunSparkScalaLocalConsoleAction : RunSparkScalaConsoleAction() {
+    override val selectedMenuActionId: String
+        get() = "Actions.SparkRunLocalConsoleActionGroups"
+
     override val isLocalRunConfigEnabled: Boolean
         get() = true
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkRunConsoleActionGroups.kt renamed to PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkRunLivyConsoleActionGroups.kt

@@ -30,12 +30,12 @@ import com.intellij.openapi.project.Project
 import com.microsoft.azure.hdinsight.spark.run.action.SeqActions
 
 
-class SparkRunConsoleActionGroups : QuickSwitchSchemeAction() {
+class SparkRunLivyConsoleActionGroups : QuickSwitchSchemeAction() {
     override fun fillActions(project: Project?, group: DefaultActionGroup, dataContext: DataContext) {
         group.add(ActionManager.getInstance().getAction("Actions.RunLivySparkConsoleAction"))
         group.add(ActionManager.getInstance().getAction("Actions.RunCosmosSparkConsoleAction"))
     }
 }
 
-class LivySparkSelectTypeAndRunConsoleAction : SeqActions("Actions.SelectHDInsightSparkType", "Actions.SubmitSparkApplicationAction")
-class CosmosSparkSelectTypeAndRunConsoleAction : SeqActions("Actions.SelectCosmosSparkType", "Actions.SubmitSparkApplicationAction")
+class SelectLivySparkTypeThenRunLivyConsoleAction : SeqActions("Actions.SelectHDInsightSparkType", "Spark.RunScalaLivyConsole")
+class SelectCosmosSparkTypeThenRunLivyConsoleAction : SeqActions("Actions.SelectCosmosSparkType", "Spark.RunScalaLivyConsole")

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkRunLocalConsoleActionGroups.kt

@@ -0,0 +1,18 @@
+package com.microsoft.azure.hdinsight.spark.console
+
+import com.intellij.ide.actions.QuickSwitchSchemeAction
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.project.Project
+import com.microsoft.azure.hdinsight.spark.run.action.SeqActions
+
+class SparkRunLocalConsoleActionGroups : QuickSwitchSchemeAction() {
+    override fun fillActions(project: Project?, group: DefaultActionGroup, dataContext: DataContext) {
+        group.add(ActionManager.getInstance().getAction("Actions.RunLivySparkLocalConsoleAction"))
+        group.add(ActionManager.getInstance().getAction("Actions.RunCosmosSparkLocalConsoleAction"))
+    }
+}
+
+class SelectLivySparkTypeThenRunLocalConsoleAction : SeqActions("Actions.SelectHDInsightSparkType", "Spark.RunScalaLocalConsole")
+class SelectCosmosSparkTypeThenRunLocalConsoleAction : SeqActions("Actions.SelectCosmosSparkType", "Spark.RunScalaLocalConsole")