Merge pull request #6267 from microsoft/bugfix-1894623

wangmingliang-ms · web-flow · commit 3eb71f0b80b8 · 2021-12-27T14:56:50.000+08:00
#1894623: [Test] The children nodes are out of order in new `Tree` based nodes(Azure Explorer, Resource Connection Explorer)
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/Tree.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/Tree.java
@@ -39,7 +39,6 @@
 import javax.swing.tree.TreeSelectionModel;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -169,9 +168,7 @@ protected synchronized void loadChildren() {
             tm.runOnPooledThread(() -> {
                 try {
                     final List<Node<?>> children = this.inner.getChildren();
-                    tm.runLater(() -> setChildren(children.stream()
-                        .sorted(Comparator.comparing(o -> o.view().getLabel()))
-                        .map(c -> new TreeNode<>(c, this.tree))));
+                    tm.runLater(() -> setChildren(children.stream().map(c -> new TreeNode<>(c, this.tree))));
                 } catch (final Exception e) {
                     this.setChildren(Stream.empty());
                 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/ui/SignInWindow.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/ui/SignInWindow.java
@@ -101,7 +101,7 @@ private void checkAccountAvailability() {
             Mono.just(az).subscribeOn(Schedulers.boundedElastic())
                 .flatMap(a -> a.checkAvailable().onErrorResume(e -> Mono.just(false)))
                 .doFinally((s) -> {
-                    cliBtn.setText("Azure CLI");
+                    cliBtn.setText(cliBtn.isEnabled() ? "Azure CLI" : "Azure CLI (Not logged in)");
                     cliDesc.setIcon(null);
                     oauthBtn.setSelected(cliBtn.isSelected() && !cliBtn.isEnabled());
                     updateSelection();
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-database-lib/src/main/java/com/microsoft/azure/toolkit/ide/database/postgre/PostgreSqlExplorerContributor.java b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-database-lib/src/main/java/com/microsoft/azure/toolkit/ide/database/postgre/PostgreSqlExplorerContributor.java
@@ -9,7 +9,14 @@
 import com.microsoft.azure.toolkit.ide.common.component.AzureResourceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.AzureServiceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.Node;
+import com.microsoft.azure.toolkit.lib.common.entity.IAzureResource;
 import com.microsoft.azure.toolkit.lib.postgre.AzurePostgreSql;
+import com.microsoft.azure.toolkit.lib.postgre.PostgreSqlServer;
+
+import javax.annotation.Nonnull;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.lib.Azure.az;
 
@@ -22,8 +29,13 @@ public Node<?> getModuleNode() {
         final AzurePostgreSql service = az(AzurePostgreSql.class);
         return new Node<>(service).view(new AzureServiceLabelView<>(service, NAME, ICON))
                 .actions(PostgreSqlActionsContributor.SERVICE_ACTIONS)
-                .addChildren(AzurePostgreSql::list, (postgre, serviceNode) -> new Node<>(postgre)
+                .addChildren(this::listPostgreServers, (postgre, serviceNode) -> new Node<>(postgre)
                         .view(new AzureResourceLabelView<>(postgre))
                         .actions(PostgreSqlActionsContributor.POSTGRE_ACTIONS));
     }
+
+    @Nonnull
+    private List<PostgreSqlServer> listPostgreServers(AzurePostgreSql s) {
+        return s.list().stream().sorted(Comparator.comparing(IAzureResource::name)).collect(Collectors.toList());
+    }
 }
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-redis-lib/src/main/java/com/microsoft/azure/toolkit/ide/redis/RedisExplorerContributor.java b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-redis-lib/src/main/java/com/microsoft/azure/toolkit/ide/redis/RedisExplorerContributor.java
@@ -10,9 +10,16 @@
 import com.microsoft.azure.toolkit.ide.common.component.AzureServiceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.Node;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
+import com.microsoft.azure.toolkit.lib.common.entity.IAzureResource;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
 import com.microsoft.azure.toolkit.redis.AzureRedis;
+import com.microsoft.azure.toolkit.redis.RedisCache;
+
+import javax.annotation.Nonnull;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.lib.Azure.az;
 
@@ -28,8 +35,13 @@ public Node<?> getModuleNode() {
         final AzureRedis service = az(AzureRedis.class);
         return new Node<>(service).view(new AzureServiceLabelView<>(service, NAME, ICON))
                 .actions(RedisActionsContributor.SERVICE_ACTIONS)
-                .addChildren(AzureRedis::list, (redis, serviceNode) -> new Node<>(redis)
+                .addChildren(this::listRedisCache, (redis, serviceNode) -> new Node<>(redis)
                         .view(new AzureResourceLabelView<>(redis))
                         .actions(RedisActionsContributor.REDIS_ACTIONS));
     }
+
+    @Nonnull
+    private List<RedisCache> listRedisCache(AzureRedis s) {
+        return s.list().stream().sorted(Comparator.comparing(IAzureResource::name)).collect(Collectors.toList());
+    }
 }
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-springcloud-lib/src/main/java/com/microsoft/azure/toolkit/ide/springcloud/SpringCloudExplorerContributor.java b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-springcloud-lib/src/main/java/com/microsoft/azure/toolkit/ide/springcloud/SpringCloudExplorerContributor.java
@@ -10,11 +10,18 @@
 import com.microsoft.azure.toolkit.ide.common.component.AzureResourceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.AzureServiceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.Node;
+import com.microsoft.azure.toolkit.lib.common.entity.IAzureResource;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
 import com.microsoft.azure.toolkit.lib.springcloud.AzureSpringCloud;
+import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
 
+import javax.annotation.Nonnull;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static com.microsoft.azure.toolkit.lib.Azure.az;
 
 public class SpringCloudExplorerContributor implements IExplorerContributor {
@@ -30,11 +37,21 @@ public Node<?> getModuleNode() {
         final AzureSpringCloud service = az(AzureSpringCloud.class);
         return new Node<>(service).view(new AzureServiceLabelView<>(service, "Spring Cloud", ICON))
                 .actions(SpringCloudActionsContributor.SERVICE_ACTIONS)
-                .addChildren(AzureSpringCloud::clusters, (cluster, ascNode) -> new Node<>(cluster)
+                .addChildren(this::listClusters, (cluster, ascNode) -> new Node<>(cluster)
                         .view(new AzureResourceLabelView<>(cluster))
                         .actions(SpringCloudActionsContributor.CLUSTER_ACTIONS)
-                        .addChildren(SpringCloudCluster::apps, (app, clusterNode) -> new Node<>(app)
+                        .addChildren(this::listApps, (app, clusterNode) -> new Node<>(app)
                                 .view(new AzureResourceLabelView<>(app))
                                 .actions(SpringCloudActionsContributor.APP_ACTIONS)));
     }
+
+    @Nonnull
+    private List<SpringCloudApp> listApps(SpringCloudCluster c) {
+        return c.apps().stream().sorted(Comparator.comparing(IAzureResource::name)).collect(Collectors.toList());
+    }
+
+    @Nonnull
+    private List<SpringCloudCluster> listClusters(AzureSpringCloud s) {
+        return s.clusters().stream().sorted(Comparator.comparing(IAzureResource::name)).collect(Collectors.toList());
+    }
 }
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-storage-lib/src/main/java/com/microsoft/azure/toolkit/ide/storage/StorageExplorerContributor.java b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-storage-lib/src/main/java/com/microsoft/azure/toolkit/ide/storage/StorageExplorerContributor.java
@@ -10,9 +10,16 @@
 import com.microsoft.azure.toolkit.ide.common.component.AzureResourceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.AzureServiceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.Node;
+import com.microsoft.azure.toolkit.lib.common.entity.IAzureResource;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
 import com.microsoft.azure.toolkit.lib.storage.service.AzureStorageAccount;
+import com.microsoft.azure.toolkit.lib.storage.service.StorageAccount;
+
+import javax.annotation.Nonnull;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.lib.Azure.az;
 
@@ -28,8 +35,13 @@ public Node<?> getModuleNode() {
         final AzureStorageAccount service = az(AzureStorageAccount.class);
         return new Node<>(service).view(new AzureServiceLabelView<>(service, NAME, ICON))
                 .actions(StorageActionsContributor.SERVICE_ACTIONS)
-                .addChildren(AzureStorageAccount::list, (account, storageNode) -> new Node<>(account)
+                .addChildren(this::listStorageAccounts, (account, storageNode) -> new Node<>(account)
                         .view(new AzureResourceLabelView<>(account))
                         .actions(StorageActionsContributor.ACCOUNT_ACTIONS));
     }
+
+    @Nonnull
+    private List<StorageAccount> listStorageAccounts(AzureStorageAccount s) {
+        return s.list().stream().sorted(Comparator.comparing(IAzureResource::name)).collect(Collectors.toList());
+    }
 }
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-vm-lib/src/main/java/com/microsoft/azure/toolkit/ide/vm/VirtualMachineExplorerContributor.java b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-vm-lib/src/main/java/com/microsoft/azure/toolkit/ide/vm/VirtualMachineExplorerContributor.java
@@ -10,7 +10,14 @@
 import com.microsoft.azure.toolkit.ide.common.component.AzureServiceLabelView;
 import com.microsoft.azure.toolkit.ide.common.component.Node;
 import com.microsoft.azure.toolkit.lib.Azure;
+import com.microsoft.azure.toolkit.lib.compute.AbstractAzureResource;
 import com.microsoft.azure.toolkit.lib.compute.vm.AzureVirtualMachine;
+import com.microsoft.azure.toolkit.lib.compute.vm.VirtualMachine;
+
+import javax.annotation.Nonnull;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class VirtualMachineExplorerContributor implements IExplorerContributor {
     private static final String NAME = "Virtual Machines";
@@ -21,8 +28,13 @@ public Node<?> getModuleNode() {
         final AzureVirtualMachine service = Azure.az(AzureVirtualMachine.class);
         return new Node<>(service).view(new AzureServiceLabelView<>(service, NAME, ICON))
                 .actions(VirtualMachineActionsContributor.SERVICE_ACTIONS)
-                .addChildren(AzureVirtualMachine::list, (vm, vmNode) -> new Node<>(vm)
+                .addChildren(this::listVirtualMachines, (vm, vmNode) -> new Node<>(vm)
                         .view(new AzureResourceLabelView<>(vm))
                         .actions(VirtualMachineActionsContributor.VM_ACTIONS));
     }
+
+    @Nonnull
+    private List<VirtualMachine> listVirtualMachines(AzureVirtualMachine s) {
+        return s.list().stream().sorted(Comparator.comparing(AbstractAzureResource::name)).collect(Collectors.toList());
+    }
 }
