Merge pull request #7696 from fengshuaihu/users/v-shufeng/fix-2306bug

Users/v shufeng/fix 2306bug

Author: fengshuaihu

Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-hdinsight-spark-lib/src/main/java/com/microsoft/azure/toolkit/ide/hdinsight/spark/HDInsightActionsContributor.java

@@ -184,15 +184,15 @@ public void registerActions(AzureActionManager am) {
     @Override
     public void registerGroups(AzureActionManager am) {
         final ActionGroup serviceActionGroup = new ActionGroup(
-                this.REFRESH,
+                ResourceCommonActionsContributor.REFRESH,
                 ResourceCommonActionsContributor.OPEN_AZURE_REFERENCE_BOOK,
                 "---",
                 this.LINK_A_CLUSTER
         );
         am.registerGroup(SERVICE_ACTIONS, serviceActionGroup);
 
         final ActionGroup sparkActionGroup = new ActionGroup(
-                this.REFRESH,
+                ResourceCommonActionsContributor.REFRESH,
                 ResourceCommonActionsContributor.OPEN_AZURE_REFERENCE_BOOK,
                 ResourceCommonActionsContributor.OPEN_PORTAL_URL,
                 "---",
@@ -204,7 +204,7 @@ public void registerGroups(AzureActionManager am) {
         am.registerGroup(SPARK_CLUSTER_ACTIONS, sparkActionGroup);
 
         final ActionGroup sparkAdditionalActionGroup = new ActionGroup(
-                this.REFRESH,
+                ResourceCommonActionsContributor.REFRESH,
                 ResourceCommonActionsContributor.OPEN_AZURE_REFERENCE_BOOK,
                 "---",
                 this.OPEN_AZURE_STORAGE_EXPLORER,

Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-hdinsight-spark-lib/src/main/java/com/microsoft/azure/toolkit/ide/hdinsight/spark/HDInsightNodeProvider.java

@@ -59,6 +59,7 @@ public Node<?> createNode(@Nonnull Object data,@Nullable Node<?> parent,@Nonnull
                 .ifPresent(sparkClusterNode::setClusterDetail);
             final Node<SparkClusterNode> jobsNode = new AzResourceNode<>(sparkClusterNode)
                 .withIcon(AzureIcon.builder().iconPath("/icons/StorageAccountFolder.png").build())
+                .withLabel("Jobs")
                 .withDescription("")
                 .onClicked(HDInsightActionsContributor.OPEN_HDINSIGHT_JOB_VIEW);
             if ("[LinkedCluster]".equals(sparkClusterNode.getClusterDetail().getSubscription().getId())) {

Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-hdinsight-spark-lib/src/main/java/com/microsoft/azure/toolkit/lib/hdinsight/AzureHDInsightService.java

@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -41,6 +42,16 @@ public SparkClusterModule clusters(@Nonnull String subscriptionId) {
         return rm.clusters();
     }
 
+    @Nonnull
+    @Override
+    public List<HDInsightServiceSubscription> list() {
+        if (Azure.az(AzureAccount.class).isLoggedIn()) {
+            return super.list();
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
     public List<SparkClusterNode> listAdditionalCluster() {
         List<SparkClusterNode> resultList = new ArrayList<SparkClusterNode>();