Merge pull request #6130 from microsoft/fix-1896362

fix several spring cloud related bugs.

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureFormInputComponent.java

@@ -11,6 +11,7 @@
 import com.intellij.openapi.util.Disposer;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 
 import javax.accessibility.AccessibleRelation;
@@ -56,7 +57,7 @@ public void windowClosed(WindowEvent e) {
             return new ComponentValidator(AzureFormInputComponent.this).installOn(input);
         });
         if (v != null) {
-            AzureTaskManager.getInstance().runLater(() -> v.updateInfo(info));
+            AzureTaskManager.getInstance().runLater(() -> v.updateInfo(info), AzureTask.Modality.ANY);
         }
     }
 

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

@@ -14,6 +14,7 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
 import com.microsoft.azure.toolkit.intellij.common.EnvironmentVariablesTextFieldWithBrowseButton;
 import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.common.utils.TailingDebouncer;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
@@ -134,7 +135,7 @@ public synchronized void updateForm(@Nonnull SpringCloudApp app) {
                     this.txtEndpoint.setIcon(null);
                     this.txtEndpoint.setText("---");
                 }
-            });
+            }, AzureTask.Modality.ANY);
         });
         final SpringCloudSku sku = app.getCluster().entity().getSku();
         final boolean basic = sku.getTier().toLowerCase().startsWith("b");
@@ -158,7 +159,7 @@ public synchronized void updateForm(@Nonnull SpringCloudApp app) {
                     .map(SpringCloudDeployment::entity)
                     .orElse(new SpringCloudDeploymentEntity("default", app.entity()));
             final List<SpringCloudDeploymentInstanceEntity> instances = deploymentEntity.getInstances();
-            AzureTaskManager.getInstance().runLater(() -> this.numInstance.setRealMin(Math.min(instances.size(), 1)));
+            AzureTaskManager.getInstance().runLater(() -> this.numInstance.setRealMin(Math.min(instances.size(), 1)), AzureTask.Modality.ANY);
         });
     }
 
@@ -219,6 +220,9 @@ public void setEnabled(boolean enable) {
     }
 
     private void toggleStorage(Boolean e) {
+        if (Objects.isNull(this.originalConfig)) { // prevent action before data is loaded.
+            return;
+        }
         final boolean enabled = BooleanUtils.isTrue(e);
         this.toggleStorage.setActionCommand(enabled ? "disable" : "enable");
         this.toggleStorage.setText(enabled ? "Disable" : "Enable");
@@ -230,6 +234,9 @@ private void toggleStorage(Boolean e) {
     }
 
     private void toggleEndpoint(Boolean e) {
+        if (Objects.isNull(this.originalConfig)) { // prevent action before data is loaded.
+            return;
+        }
         final boolean enabled = BooleanUtils.isTrue(e);
         this.toggleEndpoint.setActionCommand(enabled ? "disable" : "enable");
         this.toggleEndpoint.setText(enabled ? "Disable" : "Enable");

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

@@ -15,6 +15,7 @@
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.AzureValidationInfoBuilder;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessageBundle;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudAppEntity;
@@ -75,14 +76,14 @@ protected void init() {
 
     private void onSubscriptionChanged(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED || e.getStateChange() == ItemEvent.DESELECTED) {
-            final Subscription subscription = (Subscription) e.getItem();
+            final Subscription subscription = this.getSelectorSubscription().getValue();
             this.getSelectorCluster().setSubscription(subscription);
         }
     }
 
     private void onClusterChanged(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED || e.getStateChange() == ItemEvent.DESELECTED) {
-            final SpringCloudCluster c = (SpringCloudCluster) e.getItem();
+            final SpringCloudCluster c = this.getSelectorCluster().getValue();
             final String appName = StringUtils.firstNonBlank(this.getTextName().getName(), this.defaultAppName);
             if (Objects.nonNull(c)) {
                 final SpringCloudApp app = c.app(new SpringCloudAppEntity(appName, c.entity()));
@@ -95,7 +96,7 @@ protected void onAppChanged(SpringCloudApp app) {
         if (Objects.isNull(this.originalConfig)) {
             AzureTaskManager.getInstance().runOnPooledThread(() -> {
                 this.originalConfig = SpringCloudAppConfig.fromApp(app);
-                AzureTaskManager.getInstance().runLater(() -> this.setValue(this.originalConfig));
+                AzureTaskManager.getInstance().runLater(() -> this.setValue(this.originalConfig), AzureTask.Modality.ANY);
             });
         }
     }

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

@@ -10,6 +10,7 @@
 import com.microsoft.azure.toolkit.intellij.springcloud.component.SpringCloudAppConfigPanel;
 import com.microsoft.azure.toolkit.intellij.springcloud.component.SpringCloudClusterComboBox;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
@@ -37,7 +38,7 @@ public SpringCloudAppInfoAdvancedPanel(@Nullable final SpringCloudCluster cluste
     }
 
     protected void onAppChanged(SpringCloudApp app) {
-        AzureTaskManager.getInstance().runLater(() -> this.formConfig.updateForm(app));
+        AzureTaskManager.getInstance().runLater(() -> this.formConfig.updateForm(app), AzureTask.Modality.ANY);
         super.onAppChanged(app);
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfiguration.java

@@ -163,7 +163,7 @@ protected void resetEditorFrom(@NotNull SpringCloudDeploymentConfiguration confi
         protected void applyEditorTo(@NotNull SpringCloudDeploymentConfiguration config) throws ConfigurationException {
             final List<AzureValidationInfo> infos = this.panel.getAllValidationInfos(true);
             final AzureValidationInfo error = infos.stream()
-                    .filter(i -> i.getType() == AzureValidationInfo.Type.ERROR)
+                    .filter(i -> !i.isValid())
                     .findAny().orElse(null);
             if (Objects.nonNull(error)) {
                 throw new ConfigurationException(error.getMessage());

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfigurationPanel.java

@@ -88,14 +88,14 @@ private void onArtifactChanged(final ItemEvent e) {
 
     private void onSubscriptionChanged(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED || e.getStateChange() == ItemEvent.DESELECTED) {
-            final Subscription subscription = (Subscription) e.getItem();
+            final Subscription subscription = this.selectorSubscription.getValue();
             this.selectorCluster.setSubscription(subscription);
         }
     }
 
     private void onClusterChanger(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED || e.getStateChange() == ItemEvent.DESELECTED) {
-            final SpringCloudCluster cluster = (SpringCloudCluster) e.getItem();
+            final SpringCloudCluster cluster = this.selectorCluster.getValue();
             this.selectorApp.setCluster(cluster);
         }
     }