add support for setting cluster and whether fixed later.

changing cluster should be disabled when creating new app in deployment dialog.

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/component/SpringCloudAppComboBox.java

@@ -25,11 +25,7 @@
 import javax.swing.*;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 public class SpringCloudAppComboBox extends AzureComboBox<SpringCloudApp> {
     private SpringCloudCluster cluster;
@@ -116,7 +112,8 @@ protected List<Extension> getExtensions() {
     }
 
     private void showAppCreationPopup() {
-        final SpringCloudAppCreationDialog dialog = new SpringCloudAppCreationDialog(this.cluster);
+        final SpringCloudAppCreationDialog dialog = new SpringCloudAppCreationDialog();
+        dialog.setCluster(this.cluster, true);
         Optional.ofNullable(this.javaVersion).ifPresent(a -> dialog.setDefaultRuntimeVersion(javaVersion));
         dialog.setOkActionListener((draft) -> {
             dialog.close();

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/CreateSpringCloudAppAction.java

@@ -35,7 +35,8 @@ public class CreateSpringCloudAppAction {
     public static void createApp(@Nonnull SpringCloudCluster cluster, @Nullable Project project) {
         Azure.az(AzureAccount.class).account();
         AzureTaskManager.getInstance().runLater(() -> {
-            final SpringCloudAppCreationDialog dialog = new SpringCloudAppCreationDialog(cluster, project);
+            final SpringCloudAppCreationDialog dialog = new SpringCloudAppCreationDialog(project);
+            dialog.setCluster(cluster, false);
             dialog.setDefaultRuntimeVersion(JdkUtils.getJdkLanguageLevel(Optional.ofNullable(project).orElseGet(ProjectUtils::getProject)));
             dialog.setOkActionListener((draft) -> {
                 dialog.close();

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/SpringCloudAppCreationDialog.java

@@ -11,24 +11,21 @@
 import com.microsoft.azure.toolkit.intellij.common.ConfigDialog;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudAppDraft;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
-import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudDeploymentDraft;
 
 import javax.annotation.Nullable;
 import javax.swing.*;
 
 public class SpringCloudAppCreationDialog extends ConfigDialog<SpringCloudAppDraft> {
-    private final SpringCloudCluster cluster;
     private JPanel panel;
     private SpringCloudAppInfoBasicPanel basicForm;
     private SpringCloudAppInfoAdvancedPanel advancedForm;
 
-    public SpringCloudAppCreationDialog(@Nullable SpringCloudCluster cluster) {
-        this(cluster, null);
+    public SpringCloudAppCreationDialog() {
+        this(null);
     }
 
-    public SpringCloudAppCreationDialog(@Nullable SpringCloudCluster cluster, @Nullable Project project) {
+    public SpringCloudAppCreationDialog(@Nullable Project project) {
         super(project);
-        this.cluster = cluster;
         this.init();
         setFrontPanel(basicForm);
     }
@@ -55,8 +52,13 @@ protected JComponent createCenterPanel() {
     }
 
     private void createUIComponents() {
-        advancedForm = new SpringCloudAppInfoAdvancedPanel(this.cluster);
-        basicForm = new SpringCloudAppInfoBasicPanel(this.cluster);
+        advancedForm = new SpringCloudAppInfoAdvancedPanel();
+        basicForm = new SpringCloudAppInfoBasicPanel();
+    }
+
+    public void setCluster(@Nullable SpringCloudCluster cluster, Boolean fixed) {
+        this.advancedForm.setCluster(cluster, fixed);
+        this.basicForm.setCluster(cluster, fixed);
     }
 
     public void setDefaultRuntimeVersion(@Nullable Integer jdkVersion) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/SpringCloudAppInfoAdvancedPanel.java

@@ -15,11 +15,9 @@
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudAppDraft;
-import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
 import lombok.AccessLevel;
 import lombok.Getter;
 
-import javax.annotation.Nullable;
 import javax.swing.*;
 import java.util.Arrays;
 import java.util.List;
@@ -34,8 +32,8 @@ public class SpringCloudAppInfoAdvancedPanel extends SpringCloudAppInfoPanel {
     private SpringCloudAppConfigPanel formConfig;
     private JLabel lblSubscription;
 
-    public SpringCloudAppInfoAdvancedPanel(@Nullable final SpringCloudCluster cluster) {
-        super(cluster);
+    public SpringCloudAppInfoAdvancedPanel() {
+        super();
         $$$setupUI$$$();
         this.init();
         this.lblSubscription.setIcon(AllIcons.General.ContextHelp);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/SpringCloudAppInfoBasicPanel.java

@@ -14,15 +14,13 @@
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudAppDraft;
-import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudDeploymentDraft;
 import com.microsoft.azure.toolkit.lib.springcloud.model.Sku;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.annotation.Nullable;
 import javax.swing.*;
 import java.util.Arrays;
 import java.util.List;
@@ -44,8 +42,8 @@ public class SpringCloudAppInfoBasicPanel extends SpringCloudAppInfoPanel {
     @Setter
     private String defaultRuntimeVersion = SpringCloudDeploymentDraft.DEFAULT_RUNTIME_VERSION.toString();
 
-    public SpringCloudAppInfoBasicPanel(@Nullable final SpringCloudCluster cluster) {
-        super(cluster);
+    public SpringCloudAppInfoBasicPanel() {
+        super();
         $$$setupUI$$$();
         this.init();
         this.lblSubscription.setIcon(AllIcons.General.ContextHelp);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/SpringCloudAppInfoPanel.java

@@ -34,13 +34,10 @@
 public abstract class SpringCloudAppInfoPanel extends JPanel implements AzureFormPanel<SpringCloudAppDraft> {
     private static final String SPRING_CLOUD_APP_NAME_PATTERN = "^[a-z][a-z0-9-]{2,30}[a-z0-9]$";
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
-    @Nullable
-    private final SpringCloudCluster cluster;
     private final String defaultAppName;
 
-    public SpringCloudAppInfoPanel(@Nullable final SpringCloudCluster cluster) {
+    public SpringCloudAppInfoPanel() {
         super();
-        this.cluster = cluster;
         this.defaultAppName = String.format("spring-app-%s", DATE_FORMAT.format(new Date()));
     }
 
@@ -56,16 +53,20 @@ protected void init() {
         textName.setValue(this.defaultAppName);
         textName.addValidator(() -> {
             try {
-                validateSpringCloudAppName(textName.getValue(), this.cluster);
+                final SpringCloudCluster cluster = this.getSelectorCluster().getValue();
+                validateSpringCloudAppName(textName.getValue(), cluster);
             } catch (final IllegalArgumentException e) {
                 final AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
                 return builder.input(textName).type(AzureValidationInfo.Type.ERROR).message(e.getMessage()).build();
             }
             return AzureValidationInfo.success(this);
         });
-        if (Objects.nonNull(this.cluster)) {
-            selectorSubscription.setValue(this.cluster.getSubscription());
-            selectorCluster.setValue(this.cluster);
+    }
+
+    public void setCluster(SpringCloudCluster cluster, Boolean fixed) {
+        if (Objects.nonNull(cluster)) {
+            this.getSelectorSubscription().setValue(cluster.getSubscription(), fixed);
+            this.getSelectorCluster().setValue(cluster, fixed);
         }
     }
 
@@ -97,7 +98,6 @@ protected void onAppChanged(SpringCloudApp app) {
     public SpringCloudAppDraft getValue() {
         final String appName = this.getTextName().getValue();
         final SpringCloudApp app = Optional.ofNullable(this.getSelectorCluster().getValue())
-            .or(() -> Optional.ofNullable(this.cluster))
             .map(SpringCloudCluster::apps)
             .map(apps -> apps.getOrDraft(appName, null)).orElse(null);
         return (SpringCloudAppDraft) (Objects.isNull(app) || app.isDraft() ? app : app.update());
@@ -116,7 +116,7 @@ public void setVisible(final boolean visible) {
         super.setVisible(visible);
     }
 
-    public static void validateSpringCloudAppName(final String name, final SpringCloudCluster cluster) {
+    public static void validateSpringCloudAppName(final String name, @Nullable final SpringCloudCluster cluster) {
         if (StringUtils.isEmpty(name)) {
             throw new IllegalArgumentException(AzureMessageBundle.message("springcloud.app.name.validate.empty").toString());
         } else if (!name.matches(SPRING_CLOUD_APP_NAME_PATTERN)) {