Merge pull request #5433 from microsoft/fix-appservice-refresh

Fix refresh issues for app service

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java

@@ -10,6 +10,9 @@
 import com.intellij.ui.SimpleListCellRenderer;
 import com.intellij.ui.components.fields.ExtendableTextComponent;
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
+import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
+import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.webapp.WebAppService;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
@@ -19,6 +22,7 @@
 import javax.swing.*;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 public abstract class AppServiceComboBox<T extends AppServiceComboBoxModel> extends AzureComboBox<T> {
 
@@ -71,6 +75,17 @@ protected String getItemText(final Object item) {
         }
     }
 
+    protected boolean isJavaAppService(IAppService appService) {
+        try {
+            return Optional.ofNullable(appService.getRuntime()).map(Runtime::getJavaVersion)
+                    .map(javaVersion -> !Objects.equals(javaVersion, JavaVersion.OFF))
+                    .orElse(false);
+        } catch (final RuntimeException e) {
+            // app service may have been removed while parsing, return false in this case
+            return false;
+        }
+    }
+
     protected abstract void createResource();
 
     public static class AppComboBoxRender extends SimpleListCellRenderer {

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanComboBox.java

@@ -55,6 +55,8 @@ public void setSubscription(Subscription subscription) {
             this.clear();
             return;
         }
+        // force refresh service plan when switch subscription
+        Azure.az(AzureAppService.class).subscription(subscription.getId()).appServicePlans(true);
         this.refreshItems();
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppComboBox.java

@@ -9,7 +9,6 @@
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceComboBox;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
-import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
@@ -44,7 +43,7 @@ protected void createResource() {
     )
     protected List<FunctionAppComboBoxModel> loadAppServiceModels() {
         return Azure.az(AzureAppService.class).functionApps().parallelStream()
-                .filter(functionApp -> functionApp.getRuntime().getJavaVersion() != JavaVersion.OFF)
+                .filter(this::isJavaAppService)
                 .map(FunctionAppComboBoxModel::new)
                 .sorted((app1, app2) -> app1.getAppName().compareToIgnoreCase(app2.getAppName()))
                 .collect(Collectors.toList());

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java

@@ -49,10 +49,10 @@ protected void createResource() {
     )
     protected List<WebAppComboBoxModel> loadAppServiceModels() {
         final List<IWebApp> webApps = Azure.az(AzureAppService.class).webapps(false);
-        return webApps.stream()
-                      .filter(webApp -> webApp.getRuntime().getJavaVersion() != null && webApp.getRuntime().getJavaVersion() != JavaVersion.OFF)
-                      .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))
-                      .map(WebAppComboBoxModel::new)
-                      .collect(Collectors.toList());
+        return webApps.stream().parallel()
+                .filter(this::isJavaAppService)
+                .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))
+                .map(WebAppComboBoxModel::new)
+                .collect(Collectors.toList());
     }
 }

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

@@ -44,6 +44,7 @@ public FunctionAppNode(@Nonnull AzureRefreshableNode parent, @Nonnull IFunctionA
 
     @Override
     protected void refreshItems() {
+        super.refreshItems();
         this.renderSubModules();
     }
 

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

@@ -45,7 +45,7 @@ public void removeNode(String sid, String id, Node node) {
     @AzureOperation(name = "function.reload_all", type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
         Azure.az(AzureAppService.class).functionApps(true)
-                .stream().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))
+                .stream().parallel().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))
                 .forEach(this::addChildNode);
     }
 

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

@@ -81,6 +81,7 @@ public void run() {
     @Override
     public void renderChildren(@NotNull final List<IWebApp> resourceExes) {
         resourceExes.stream()
+                .parallel()
                 .filter(webApp -> StringUtils.isNotEmpty(webApp.id()))
                 .map(webApp -> new WebAppNode(this, webApp))
                 .forEach(this::addChildNode);

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

@@ -59,6 +59,7 @@ public IWebApp getWebappManager() {
     @Override
     @AzureOperation(name = "webapp.refresh", type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
+        super.refreshItems();
         this.renderSubModules();
     }
 

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBaseNode.java

@@ -10,6 +10,8 @@
 import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
+import com.microsoft.tooling.msservices.components.DefaultLoader;
+import com.microsoft.tooling.msservices.serviceexplorer.AzureIconSymbol;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureRefreshableNode;
 import com.microsoft.tooling.msservices.serviceexplorer.NodeAction;
 import com.microsoft.tooling.msservices.serviceexplorer.RefreshableNode;
@@ -38,7 +40,8 @@ public WebAppBaseNode(final AzureRefreshableNode parent, final String label, fin
         this.appService = appService;
         this.subscriptionId = ResourceId.fromString(appService.id()).subscriptionId();
 
-        renderNode(WebAppBaseState.fromString(appService.state()));
+        renderNode(WebAppBaseState.UPDATING);
+        DefaultLoader.getIdeHelper().executeOnPooledThread(() -> refreshItems());
     }
 
     protected String getAppServiceIconPath(final WebAppBaseState state) {
@@ -47,6 +50,13 @@ protected String getAppServiceIconPath(final WebAppBaseState state) {
                 + label + (state == WebAppBaseState.RUNNING ? ICON_RUNNING_POSTFIX : ICON_STOPPED_POSTFIX);
     }
 
+    @Override
+    protected void refreshItems() {
+        renderNode(WebAppBaseState.UPDATING);
+        appService.refresh();
+        renderNode(WebAppBaseState.fromString(appService.state()));
+    }
+
     @Override
     public List<NodeAction> getNodeActions() {
         boolean running = this.state == WebAppBaseState.RUNNING;
@@ -58,12 +68,15 @@ public List<NodeAction> getNodeActions() {
     }
 
     public void renderNode(@Nonnull WebAppBaseState state) {
+        this.state = state;
         switch (state) {
             case RUNNING:
             case STOPPED:
-                this.state = state;
                 this.setIconPath(getAppServiceIconPath(state));
                 break;
+            case UPDATING:
+                this.setIconPath(AzureIconSymbol.Common.REFRESH.getPath());
+                break;
             default:
                 break;
         }

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotNode.java

@@ -95,6 +95,7 @@ protected void onNodeClick(NodeActionEvent e) {
     @Override
     @AzureOperation(name = "webapp|deployment.refresh", params = {"this.slot.name()", "this.webApp.name()"}, type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
+        super.refreshItems();
         if (slot.exists()) {
             this.renderNode(WebAppBaseState.fromString(slot.state()));
         } else {