Fix storage info check not work for spark on ADL issue

Author: t-rufang

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanelConfigurable.java

@@ -22,6 +22,7 @@
 package com.microsoft.azure.hdinsight.spark.ui;
 
 import com.google.common.collect.ImmutableSortedSet;
+import com.intellij.execution.configurations.RuntimeConfigurationError;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.options.ConfigurationException;
@@ -65,6 +66,8 @@ public class SparkSubmissionContentPanelConfigurable implements SettableControl<
     private final Project myProject;
 
     private SparkSubmissionContentPanel submissionPanel;
+    private SparkSubmissionJobUploadStorageWithUploadPathPanel storageWithUploadPathPanel;
+    private SparkSubmissionJobUploadStorageCtrl jobUploadStorageCtrl;
     private JPanel myWholePanel;
 
     // Cluster refresh publish subject with preselected cluster name as event
@@ -73,8 +76,17 @@ public class SparkSubmissionContentPanelConfigurable implements SettableControl<
 
     public SparkSubmissionContentPanelConfigurable(@NotNull Project project, @NotNull SparkSubmissionContentPanel submissionPanel) {
         this.submissionPanel = submissionPanel;
+        this.storageWithUploadPathPanel = submissionPanel.storageWithUploadPathPanel;
         this.myProject = project;
 
+        this.jobUploadStorageCtrl = new SparkSubmissionJobUploadStorageCtrl(this.storageWithUploadPathPanel) {
+            @Nullable
+            @Override
+            public String getClusterName() {
+                IClusterDetail clusterDetail = getSelectedClusterDetail();
+                return clusterDetail == null ? null : clusterDetail.getName();
+            }
+        };
         this.clustersRefreshSub = BehaviorSubject.create();
     }
 
@@ -200,6 +212,7 @@ private DefaultComboBoxModel<IClusterDetail> getClusterComboBoxModel() {
 
     protected void onClusterSelected(@NotNull IClusterDetail cluster) {
         getSubmissionPanel().getClusterSelectedSubject().onNext(cluster.getName());
+        jobUploadStorageCtrl.selectCluster(cluster.getName());
     }
 
     private synchronized void refreshClusterListAsync(@Nullable String preSelectedClusterName) {
@@ -288,6 +301,9 @@ public void setData(@NotNull SparkSubmitModel data) {
 
             refreshAndSelectArtifact(data.getArtifactName());
         }, ModalityState.any());
+
+        // set Job Upload Storage panel data
+        storageWithUploadPathPanel.setData(data.getJobUploadStorageModel());
     }
 
     @Override
@@ -336,6 +352,9 @@ public void getData(@NotNull SparkSubmitModel data) {
         data.setCommandLineArgs(argsList);
 
         data.setTableModel(tableModel);
+
+        // get Job upload storage panel data
+        storageWithUploadPathPanel.getData(data.getJobUploadStorageModel());
     }
 
     @Nullable
@@ -345,6 +364,11 @@ public IClusterDetail getSelectedClusterDetail() {
 
     public void validate() throws ConfigurationException {
         getSubmissionPanel().checkInputs();
+
+        if (!jobUploadStorageCtrl.isCheckPassed()) {
+            throw new RuntimeConfigurationError("Can't save the configuration since "
+                    + jobUploadStorageCtrl.getResultMessage().toLowerCase());
+        }
     }
 
     public SparkSubmissionContentPanel getSubmissionPanel() {

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionDebuggablePanelConfigurable.kt

@@ -39,22 +39,14 @@ class SparkSubmissionDebuggablePanelConfigurable(project: Project,
     private val advancedConfigPanel
         get() = submissionDebuggablePanel.advancedConfigPanel
 
-    private val storageWithUploadPathPanel
-        get() = submissionDebuggablePanel.storageWithUploadPathPanel
-
     private val advancedConfigCtrl = object : SparkSubmissionAdvancedConfigCtrl(advancedConfigPanel) {
         override fun getClusterNameToCheck(): String? = selectedClusterDetail?.name
     }
 
-    private val jobUploadStorageCtrl = object: SparkSubmissionJobUploadStorageCtrl(storageWithUploadPathPanel) {
-        override fun getClusterName(): String? = selectedClusterDetail?.name
-    }
-
     override fun onClusterSelected(cluster: IClusterDetail) {
         super.onClusterSelected(cluster)
 
         advancedConfigCtrl.selectCluster(cluster.name)
-        jobUploadStorageCtrl.selectCluster(cluster.name)
     }
 
     override fun setData(data: SparkSubmitModel) {
@@ -63,9 +55,6 @@ class SparkSubmissionDebuggablePanelConfigurable(project: Project,
 
         // Advanced Configuration panel
         advancedConfigPanel.setData(data.advancedConfigModel.apply { clusterName = data.clusterName })
-
-        // Job Upload Storage panel
-        storageWithUploadPathPanel.setData(data.jobUploadStorageModel)
     }
 
     override fun getData(data: SparkSubmitModel) {
@@ -75,18 +64,11 @@ class SparkSubmissionDebuggablePanelConfigurable(project: Project,
         // Advanced Configuration panel
         advancedConfigPanel.getData(data.advancedConfigModel)
         data.advancedConfigModel.clusterName = selectedClusterDetail?.name
-
-        // Job upload storage panel
-        storageWithUploadPathPanel.getData(data.jobUploadStorageModel)
     }
 
     override fun validate() {
         super.validate()
 
-        if (!jobUploadStorageCtrl.isCheckPassed) {
-            throw RuntimeConfigurationError("Can't save the configuration since ${jobUploadStorageCtrl.resultMessage}")
-        }
-
         if (advancedConfigPanel.isRemoteDebugEnabled) {
             if (advancedConfigCtrl.resultMessage.isNotBlank() &&
                     !advancedConfigCtrl.isCheckPassed) {