Merge pull request #5048 from microsoft/app/combobox

Flanker32 · web-flow · commit e65a9862d132 · 2021-03-29T15:11:17.000+08:00
Update AppServiceComboBox to adapt AzureComboBox refresh strategy
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java
@@ -12,72 +12,46 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
-import com.microsoft.tooling.msservices.components.DefaultLoader;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import rx.Subscription;
 
 import javax.swing.*;
-import java.io.InterruptedIOException;
+import java.util.List;
 import java.util.Objects;
 
-import static com.microsoft.intellij.util.RxJavaUtils.unsubscribeSubscription;
-
 public abstract class AppServiceComboBox<T extends AppServiceComboBoxModel> extends AzureComboBox<T> {
 
     protected Project project;
     protected Subscription subscription;
 
+    private T configModel;
+
     public AppServiceComboBox(final Project project) {
         super(false);
         this.project = project;
         this.setRenderer(new AppCombineBoxRender(this));
     }
 
-    // todo: optimize refreshing logic
-    public synchronized void refreshItemsWithDefaultValue(@NotNull T defaultValue) {
-        unsubscribeSubscription(subscription);
-        this.setLoading(true);
-        this.removeAllItems();
-        this.addItem(defaultValue);
-        subscription = this.loadItemsAsync()
-            .subscribe(items -> DefaultLoader.getIdeHelper().invokeLater(() -> {
-                synchronized (AppServiceComboBox.this) {
-                    AppServiceComboBox.this.removeAllItems();
-                    items.forEach(this::addItem);
-                    this.resetDefaultValue(defaultValue);
-                    this.setLoading(false);
-                }
-            }), this::handleLoadingError);
-    }
-
-    private void resetDefaultValue(@NotNull T defaultValue) {
-        final AppServiceComboBoxModel model = getItems()
-            .stream()
-            .filter(item -> AppServiceComboBoxModel.isSameApp(defaultValue, item) && item != defaultValue)
-            .findFirst().orElse(null);
-        if (model != null) {
-            this.setSelectedItem(model);
-            this.removeItem(defaultValue);
-        } else if (defaultValue.isNewCreateResource()) {
-            return;
-        } else {
-            this.setSelectedItem(null);
-            this.removeItem(defaultValue);
-        }
+    public void setConfigModel(T configModel) {
+        this.configModel = configModel;
+        setValue(new ItemReference<>(item -> AppServiceComboBoxModel.isSameApp(item, configModel)));
     }
 
+    @NotNull
     @Override
-    protected void handleLoadingError(final Throwable e) {
-        final Throwable rootCause = ExceptionUtils.getRootCause(e);
-        if (rootCause instanceof InterruptedIOException || rootCause instanceof InterruptedException) {
-            // Swallow interrupted exception caused by unsubscribe
-            return;
+    protected List<? extends T> loadItems() throws Exception {
+        final List<T> items = loadAppServiceModels();
+        if (configModel != null && configModel.isNewCreateResource()) {
+            final boolean exist = items.stream().anyMatch(item -> AppServiceComboBoxModel.isSameApp(item, configModel));
+            if (!exist) {
+                items.add(configModel);
+            }
         }
-        this.setLoading(false);
-        super.handleLoadingError(e);
+        return items;
     }
 
+    protected abstract List<T> loadAppServiceModels() throws Exception;
+
     @Nullable
     @Override
     protected ExtendableTextComponent.Extension getExtension() {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppComboBox.java
@@ -46,7 +46,7 @@ protected void createResource() {
         name = "function.list.detail|subscription|selected",
         type = AzureOperation.Type.SERVICE
     )
-    protected List<? extends FunctionAppComboBoxModel> loadItems() throws Exception {
+    protected List<FunctionAppComboBoxModel> loadAppServiceModels() throws Exception {
         return AzureFunctionMvpModel.getInstance().listJavaFunctionApps(false).parallelStream()
             .map(FunctionAppComboBoxModel::new)
             .sorted((app1, app2) -> app1.getAppName().compareToIgnoreCase(app2.getAppName()))
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/ui/FunctionDeploymentPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/ui/FunctionDeploymentPanel.java
@@ -12,6 +12,7 @@
 import com.intellij.ui.HyperlinkLabel;
 import com.intellij.ui.ListCellRendererWrapper;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceComboBoxModel;
+import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azure.toolkit.intellij.function.FunctionAppComboBox;
 import com.microsoft.azure.toolkit.intellij.function.FunctionAppComboBoxModel;
 import com.microsoft.azure.toolkit.intellij.common.AzureSettingPanel;
@@ -130,14 +131,12 @@ protected void resetFromConfig(@NotNull FunctionDeployConfiguration configuratio
             this.appSettingsKey = configuration.getAppSettingsKey();
             appSettingsTable.setAppSettings(FunctionUtils.loadAppSettingsFromSecurityStorage(appSettingsKey));
         }
-        if (StringUtils.isAllEmpty(configuration.getFunctionId(), configuration.getAppName())) {
-            functionAppComboBox.refreshItems();
-        } else {
-            final FunctionAppComboBoxModel functionAppComboBoxModel =
-                    new FunctionAppComboBoxModel(configuration.getModel());
-            appSettingsFunctionApp = functionAppComboBoxModel;
-            functionAppComboBox.refreshItemsWithDefaultValue(functionAppComboBoxModel);
+        if (!StringUtils.isAllEmpty(configuration.getFunctionId(), configuration.getAppName())) {
+            final FunctionAppComboBoxModel configModel = new FunctionAppComboBoxModel(configuration.getModel());
+            appSettingsFunctionApp = configModel;
+            functionAppComboBox.setConfigModel(configModel);
         }
+        functionAppComboBox.refreshItems();
         final Module previousModule = configuration.getModule();
         if (previousModule != null) {
             for (int i = 0; i < cbFunctionModule.getItemCount(); i++) {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java
@@ -44,7 +44,7 @@ protected void createResource() {
         name = "webapp.list.detail|subscription|selected",
         type = AzureOperation.Type.SERVICE
     )
-    protected List<WebAppComboBoxModel> loadItems() throws Exception {
+    protected List<WebAppComboBoxModel> loadAppServiceModels() throws Exception {
         return AzureWebAppMvpModel.getInstance().listJavaWebApps(false).parallelStream()
             .map(WebAppComboBoxModel::new)
             .sorted((app1, app2) -> app1.getAppName().compareToIgnoreCase(app2.getAppName()))
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppSlimSettingPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppSlimSettingPanel.java
@@ -13,14 +13,12 @@
 import com.intellij.ui.HideableDecorator;
 import com.intellij.ui.HyperlinkLabel;
 import com.microsoft.azure.management.appservice.DeploymentSlot;
-import com.microsoft.azure.toolkit.intellij.common.AzureArtifactComboBox;
+import com.microsoft.azure.toolkit.intellij.appservice.AppServiceComboBoxModel;
+import com.microsoft.azure.toolkit.intellij.common.*;
 import com.microsoft.azure.toolkit.intellij.webapp.WebAppComboBox;
 import com.microsoft.azure.toolkit.intellij.webapp.WebAppComboBoxModel;
-import com.microsoft.azure.toolkit.intellij.common.AzureSettingPanel;
 import com.microsoft.azure.toolkit.intellij.webapp.runner.Constants;
 import com.microsoft.azure.toolkit.intellij.webapp.runner.webappconfig.WebAppConfiguration;
-import com.microsoft.azure.toolkit.intellij.common.AzureArtifact;
-import com.microsoft.azure.toolkit.intellij.common.AzureArtifactManager;
 import com.microsoft.intellij.ui.util.UIUtils;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import org.apache.commons.compress.utils.FileNameUtils;
@@ -186,12 +184,11 @@ protected JLabel getLblMavenProject() {
 
     @Override
     protected void resetFromConfig(@NotNull WebAppConfiguration configuration) {
-        final WebAppComboBoxModel configurationModel = new WebAppComboBoxModel(configuration.getModel());
-        if (StringUtils.isAllEmpty(configurationModel.getAppName(), configurationModel.getResourceId())) {
-            comboBoxWebApp.refreshItems();
-        } else {
-            comboBoxWebApp.refreshItemsWithDefaultValue(configurationModel);
+        if (!StringUtils.isAllEmpty(configuration.getWebAppName(), configuration.getWebAppId())) {
+            final WebAppComboBoxModel configModel = new WebAppComboBoxModel(configuration.getModel());
+            comboBoxWebApp.setConfigModel(configModel);
         }
+        comboBoxWebApp.refreshItems();
         if (configuration.getAzureArtifactType() != null) {
             lastSelectedAzureArtifact = AzureArtifactManager
                     .getInstance(project)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected void createResource() {`
`46`	`46`	`name = "function.list.detail\|subscription\|selected",`
`47`	`47`	`type = AzureOperation.Type.SERVICE`
`48`	`48`	`)`
`49`		`- protected List<? extends FunctionAppComboBoxModel> loadItems() throws Exception {`
	`49`	`+ protected List<FunctionAppComboBoxModel> loadAppServiceModels() throws Exception {`
`50`	`50`	`return AzureFunctionMvpModel.getInstance().listJavaFunctionApps(false).parallelStream()`
`51`	`51`	`.map(FunctionAppComboBoxModel::new)`
`52`	`52`	`.sorted((app1, app2) -> app1.getAppName().compareToIgnoreCase(app2.getAppName()))`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected void createResource() {`
`44`	`44`	`name = "webapp.list.detail\|subscription\|selected",`
`45`	`45`	`type = AzureOperation.Type.SERVICE`
`46`	`46`	`)`
`47`		`- protected List<WebAppComboBoxModel> loadItems() throws Exception {`
	`47`	`+ protected List<WebAppComboBoxModel> loadAppServiceModels() throws Exception {`
`48`	`48`	`return AzureWebAppMvpModel.getInstance().listJavaWebApps(false).parallelStream()`
`49`	`49`	`.map(WebAppComboBoxModel::new)`
`50`	`50`	`.sorted((app1, app2) -> app1.getAppName().compareToIgnoreCase(app2.getAppName()))`