refactor openResourceInPortal to make it a common method

Author: t-rufang

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.java

@@ -280,7 +280,10 @@ public void getData(@NotNull AddNewClusterModel data) {
 
     public void afterOkActionPerformed() {
         if (hdInsightModule != null) {
-            hdInsightModule.load(false);
+            // FIXME: There is a bug for linking cluster action: If the cluster name already exists, the linked cluster
+            // will fail to be added to cache. If we don't force refresh again, the cluster will not be shown as linked
+            // state in  Azure Explorer.
+            hdInsightModule.load(true);
         }
     }
 

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/Node.java

@@ -24,7 +24,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
-import com.microsoft.azure.management.resources.fluentcore.arm.models.HasId;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
@@ -53,7 +52,6 @@ public class Node implements MvpView, BasicTelemetryProperty {
     public static final String REST_SEGMENT_JOB_MANAGEMENT_TENANTID = "/#@";
     public static final String REST_SEGMENT_JOB_MANAGEMENT_RESOURCE = "/resource";
     public static final String OPEN_RESOURCES_IN_PORTAL_FAILED = "Fail to open resources in portal.";
-    public static final String OPEN_RESOURCES_IN_PORTAL_NOT_SUPPORTED = "Open browsers is not supported in current system";
 
     protected static Map<Class<? extends Node>, ImmutableList<Class<? extends NodeActionListener>>> node2Actions;
 
@@ -399,7 +397,7 @@ public String getServiceName() {
         return TelemetryConstants.ACTION;
     }
 
-    public void openResourcesInPortal(HasId resource, String subscriptionId) throws AzureCmdException {
+    public void openResourcesInPortal(String subscriptionId, String resourceRelativePath) throws AzureCmdException {
         try {
             final AzureManager azureManager = AuthMethodManager.getInstance().getAzureManager();
             // not signed in
@@ -412,7 +410,7 @@ public void openResourcesInPortal(HasId resource, String subscriptionId) throws
                     + REST_SEGMENT_JOB_MANAGEMENT_TENANTID
                     + tenantId
                     + REST_SEGMENT_JOB_MANAGEMENT_RESOURCE
-                    + resource.id();
+                    + resourceRelativePath;
             DefaultLoader.getIdeHelper().openLinkInBrowser(url);
         } catch (IOException e) {
             throw new AzureCmdException(OPEN_RESOURCES_IN_PORTAL_FAILED, e);

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/storage/StorageNode.java

@@ -73,7 +73,7 @@ public OpenInPortalAction() {
 
         @Override
         protected void azureNodeAction(NodeActionEvent e) throws AzureCmdException {
-            openResourcesInPortal(storageAccount, subscriptionId);
+            openResourcesInPortal(subscriptionId, storageAccount.id());
         }
 
         @Override

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/StorageAccountNode.java

@@ -27,19 +27,15 @@
 import com.microsoft.azure.hdinsight.sdk.cluster.IClusterDetail;
 import com.microsoft.azure.hdinsight.sdk.storage.IHDIStorageAccount;
 import com.microsoft.azure.hdinsight.sdk.storage.StorageAccountType;
-import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
-import com.microsoft.azuretools.sdkmanage.AzureManager;
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
-import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.Node;
 import com.microsoft.tooling.msservices.serviceexplorer.NodeActionEvent;
 import com.microsoft.tooling.msservices.serviceexplorer.NodeActionListener;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -66,24 +62,9 @@ protected void loadAdditionalActions() {
             addAction("Open Storage in Azure Management Portal", new NodeActionListener() {
                 @Override
                 protected void actionPerformed(NodeActionEvent e) throws AzureCmdException {
-                    try {
-                        final AzureManager azureManager = AuthMethodManager.getInstance().getAzureManager();
-                        // not signed in
-                        if (azureManager == null) {
-                            return;
-                        }
-                        final String portalUrl = azureManager.getPortalUrl();
-                        final String tenantId = clusterDetail.getSubscription().getTenantId();
-                        String url = portalUrl
-                                + REST_SEGMENT_JOB_MANAGEMENT_TENANTID
-                                + tenantId
-                                + REST_SEGMENT_JOB_MANAGEMENT_RESOURCE
-                                + ((ClusterDetail) clusterDetail).getId()
-                                + REST_SEGMENT_STORAGE_ACCOUNT;
-                        DefaultLoader.getIdeHelper().openLinkInBrowser(url);
-                    } catch (IOException ex) {
-                        throw new AzureCmdException(OPEN_RESOURCES_IN_PORTAL_FAILED, ex);
-                    }
+                    String subscriptionId = clusterDetail.getSubscription().getSubscriptionId();
+                    String storageRelativePath = ((ClusterDetail) clusterDetail).getId() + REST_SEGMENT_STORAGE_ACCOUNT;
+                    openResourcesInPortal(subscriptionId, storageRelativePath);
                 }
             });
         }