Merge pull request #6647 from microsoft/miller/fix-bugs

fix miscellaneous bugs

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoAdvancedPanel.java

@@ -30,7 +30,6 @@
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroupConfig;
 import com.microsoft.azuretools.utils.WebAppUtils;
 import org.apache.commons.compress.utils.FileNameUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;
@@ -97,8 +96,11 @@ public T getValue() {
         config.setRuntime(runtime);
         config.setRegion(region);
         final AppServicePlanConfig planConfig = AppServicePlanConfig.fromResource(servicePlan);
-        planConfig.setResourceGroupName(StringUtils.firstNonBlank(planConfig.getResourceGroupName(), config.getResourceGroupName()));
-        planConfig.setRegion(ObjectUtils.firstNonNull(planConfig.getRegion(), config.getRegion()));
+        if (Objects.nonNull(planConfig) && servicePlan.isDraftForCreating()) {
+            planConfig.setResourceGroupName(config.getResourceGroupName());
+            planConfig.setRegion(region);
+            planConfig.setOs(Objects.requireNonNull(runtime).getOperatingSystem());
+        }
         config.setServicePlan(planConfig);
         if (Objects.nonNull(artifact)) {
             final AzureArtifactManager manager = AzureArtifactManager.getInstance(this.project);

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

@@ -126,23 +126,33 @@ public IView.Label getInlineActionView() {
 
         @Override
         public void refreshView() {
-            if (this.getParent() != null) {
-                ((DefaultTreeModel) this.tree.getModel()).nodeChanged(this);
+            synchronized (this.tree) {
+                final DefaultTreeModel model = (DefaultTreeModel) this.tree.getModel();
+                if (Objects.nonNull(this.getParent()) && Objects.nonNull(model)) {
+                    model.nodeChanged(this);
+                }
+            }
+        }
+
+        private void refreshChildrenView() {
+            synchronized (this.tree) {
+                final DefaultTreeModel model = (DefaultTreeModel) this.tree.getModel();
+                if (Objects.nonNull(this.getParent()) && Objects.nonNull(model)) {
+                    model.nodeStructureChanged(this);
+                }
             }
         }
 
         @Override
         public synchronized void refreshChildren(boolean... incremental) {
             if (this.getAllowsChildren() && BooleanUtils.isNotFalse(this.loaded)) {
                 final DefaultTreeModel model = (DefaultTreeModel) this.tree.getModel();
-                if (incremental.length > 0 && incremental[0]) {
+                if (incremental.length > 0 && incremental[0] && Objects.nonNull(model)) {
                     model.insertNodeInto(new LoadingNode(), this, 0);
                 } else {
                     this.removeAllChildren();
                     this.add(new LoadingNode());
-                    if (Objects.nonNull(this.getParent())) {
-                        ((DefaultTreeModel) this.tree.getModel()).nodeStructureChanged(this);
-                    }
+                    this.refreshChildrenView();
                 }
                 this.loaded = null;
                 this.loadChildren(incremental);
@@ -169,9 +179,7 @@ private synchronized void setChildren(List<Node<?>> children) {
             this.removeAllChildren();
             children.stream().map(c -> new TreeNode<>(c, this.tree)).forEach(this::add);
             this.loaded = true;
-            if (Objects.nonNull(this.getParent())) {
-                ((DefaultTreeModel) this.tree.getModel()).nodeStructureChanged(this);
-            }
+            this.refreshChildrenView();
         }
 
         private synchronized void updateChildren(List<Node<?>> children) {
@@ -195,22 +203,20 @@ private synchronized void updateChildren(List<Node<?>> children) {
                 }
             }
             this.remove(0);
-            if (Objects.nonNull(this.getParent())) {
-                ((DefaultTreeModel) this.tree.getModel()).nodeStructureChanged(this);
-            }
+            this.refreshChildrenView();
             Optional.ofNullable(toSelect).ifPresent(p -> TreeUtil.selectPath(this.tree, p, false));
             this.loaded = true;
         }
 
-        public synchronized void clearChildren() {
-            this.removeAllChildren();
-            this.loaded = null;
-            if (this.getAllowsChildren()) {
-                this.add(new LoadingNode());
-                this.tree.collapsePath(new TreePath(this.getPath()));
-            }
-            if (Objects.nonNull(this.getParent())) {
-                ((DefaultTreeModel) this.tree.getModel()).nodeStructureChanged(this);
+        public void clearChildren() {
+            synchronized (this.tree) {
+                this.removeAllChildren();
+                this.loaded = null;
+                if (this.getAllowsChildren()) {
+                    this.add(new LoadingNode());
+                    this.tree.collapsePath(new TreePath(this.getPath()));
+                }
+                this.refreshChildrenView();
             }
         }
 

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

@@ -72,7 +72,7 @@ protected List<? extends SpringCloudApp> loadItems() throws Exception {
     @Override
     protected ExtendableTextComponent.Extension getExtension() {
         return ExtendableTextComponent.Extension.create(
-            AllIcons.General.Add, "Create Azure Spring app", this::showAppCreationPopup);
+            AllIcons.General.Add, "Create Azure Spring App", this::showAppCreationPopup);
     }
 
     private void showAppCreationPopup() {

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/java/com/microsoft/azure/toolkit/ide/common/favorite/Favorites.java

@@ -174,7 +174,7 @@ public synchronized void pin(@Nonnull AbstractAzResource<?, ?, ?> resource) {
         }
         final FavoriteDraft draft = this.create(resource.getId(), null);
         draft.setResource(resource);
-        draft.commit();
+        draft.createIfNotExist();
     }
 
     public void unpin(@Nonnull String resourceId) {

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/message.properties

@@ -23,7 +23,7 @@ azure.mysql.create.task.title=Creating Azure Database for MySQL...
 azure.mysql.link.connection.title=Connecting to Azure Database for MySQL ({0})...
 
 #################### Azure Spring Apps #######################
-springcloud.app.create.title=Create Azure Spring app
+springcloud.app.create.title=Create Azure Spring App
 springcloud.app.create.tooltip=Create Azure Spring app instance.
 springcloud.app.name.validate.empty=The name is required.
 springcloud.app.name.validate.exist=App with name({0}) already exists.

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-springcloud-lib/src/main/java/com/microsoft/azure/toolkit/ide/springcloud/SpringCloudActionsContributor.java

@@ -39,7 +39,7 @@ public void registerActions(AzureActionManager am) {
         final Consumer<SpringCloudApp> openPublicUrl = s -> am.getAction(ResourceCommonActionsContributor.OPEN_URL).handle(s.getApplicationUrl());
         final ActionView.Builder openPublicUrlView = new ActionView.Builder("Access Public Endpoint", AzureIcons.Action.BROWSER.getIconPath())
                 .title(s -> Optional.ofNullable(s).map(r -> description("springcloud.open_public_url.app", ((SpringCloudApp) r).name())).orElse(null))
-                .enabled(s -> s instanceof SpringCloudApp && ((SpringCloudApp) s).isPublicEndpointEnabled());
+                .enabled(s -> s instanceof SpringCloudApp && ((SpringCloudApp) s).getFormalStatus().isConnected() && ((SpringCloudApp) s).isPublicEndpointEnabled());
         final Action<SpringCloudApp> openPublicUrlAction = new Action<>(OPEN_PUBLIC_URL, openPublicUrl, openPublicUrlView);
         openPublicUrlAction.setShortcuts("control alt P");
         am.registerAction(OPEN_PUBLIC_URL, openPublicUrlAction);