Fix the refreshed cluster not matching selection issue

Signed-off-by: Wei Zhang <[email protected]>

Author: wezhang

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

@@ -69,13 +69,8 @@ private void createUIComponents() {
 
         ManifestFileUtil.setupMainClassField(myProject, submissionPanel.getMainClassTextField());
 
-        this.submissionPanel.addClusterListRefreshActionListener(e -> {
-            List<IClusterDetail> clusterDetails = ClusterManagerEx.getInstance().getClusterDetails();
-            Optional<String> selectedClusterTitle = submitModel.getSelectedClusterDetail()
-                    .map(IClusterDetail::getTitle);
-            resetClusterDetailsToComboBoxModel(submitModel, clusterDetails);
-            selectedClusterTitle.ifPresent(selectedTitle -> setSelectedClusterByTitle(submitModel, selectedTitle));
-        });
+        this.submissionPanel.addClusterListRefreshActionListener(e ->
+                refreshClusterSelection(ClusterManagerEx.getInstance().getClusterDetails()));
 
         this.submissionPanel.addJobConfigurationLoadButtonActionListener(e -> {
             FileChooserDescriptor fileChooserDescriptor = new FileChooserDescriptor(
@@ -118,6 +113,17 @@ public JComponent getComponent() {
         return submissionPanel;
     }
 
+    private void refreshClusterSelection(List<IClusterDetail> clusters) {
+        Optional<String> selectedClusterTitle = submitModel.getSelectedClusterDetail()
+                .map(IClusterDetail::getTitle);
+        resetClusterDetailsToComboBoxModel(submitModel, clusters);
+        if (selectedClusterTitle.isPresent()) {
+            setSelectedClusterByTitle(submitModel, selectedClusterTitle.get());
+        } else {
+            setSelectedClusterByName(submitModel, submitModel.getSubmissionParameter().getClusterName());
+        }
+    }
+
     private void refreshClusterListAsync() {
         submissionPanel.setClustersListRefreshEnabled(false);
 
@@ -139,10 +145,7 @@ private void refreshClusterListAsync() {
                 HDInsightUtil.showErrorMessageOnSubmissionMessageWindow(myProject, "Error: Failed to list additional cluster");
             }
 
-            Optional<String> selectedClusterTitle = submitModel.getSelectedClusterDetail()
-                    .map(IClusterDetail::getTitle);
-            resetClusterDetailsToComboBoxModel(submitModel, cachedClusters);
-            selectedClusterTitle.ifPresent(selectedTitle -> setSelectedClusterByTitle(submitModel, selectedTitle));
+            refreshClusterSelection(cachedClusters);
 
             submissionPanel.setClustersListRefreshEnabled(true);
             submissionPanel.getClusterSelectedSubject().onNext((String) submissionPanel.getClustersListComboBox().getComboBox().getSelectedItem());
@@ -187,6 +190,20 @@ private void setSelectedClusterByTitle(SparkSubmitModel destSubmitModel, String
                 });
     }
 
+    private void setSelectedClusterByName(SparkSubmitModel destSubmitModel, String clusterNameToSelect) {
+        final DefaultComboBoxModel<String> clusterComboBoxModel = destSubmitModel.getClusterComboBoxModel();
+
+        destSubmitModel.getCachedClusterDetails().stream()
+                .filter(clusterDetail -> clusterDetail.getName().equals(clusterNameToSelect))
+                .map(IClusterDetail::getTitle)
+                .findFirst()
+                .ifPresent(clusterTitle -> {
+                    if (clusterComboBoxModel.getIndexOf(clusterTitle) >= 0) {
+                        clusterComboBoxModel.setSelectedItem(clusterTitle);
+                    }
+                });
+    }
+
     @Override
     public void setData(@NotNull SparkSubmitModel data) {
         // Data -> Component