Merge pull request #5074 from microsoft/function/fixAppSettings

Clear app settings table before load app settings

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/FunctionDeployConfiguration.java

@@ -5,7 +5,6 @@
 
 package com.microsoft.azure.toolkit.intellij.function.runner.deploy;
 
-import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.RunConfiguration;
@@ -19,8 +18,8 @@
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.common.function.configurations.RuntimeConfiguration;
 import com.microsoft.azure.management.appservice.FunctionApp;
-import com.microsoft.azure.toolkit.intellij.function.FunctionAppComboBoxModel;
 import com.microsoft.azure.toolkit.intellij.common.AzureRunConfigurationBase;
+import com.microsoft.azure.toolkit.intellij.function.FunctionAppComboBoxModel;
 import com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -67,7 +66,7 @@ public String getFunctionId() {
         return functionDeployModel.getFunctionId();
     }
 
-    public Map getAppSettings() {
+    public Map<String, String> getAppSettings() {
         return functionDeployModel.getAppSettings();
     }
 
@@ -140,8 +139,7 @@ public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
 
     @Nullable
     @Override
-    public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment executionEnvironment)
-            throws ExecutionException {
+    public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment executionEnvironment) {
         return new FunctionDeploymentState(getProject(), this);
     }
 
@@ -227,7 +225,6 @@ public void setAppSettingsKey(String appSettingsStorageKey) {
     public void saveModel(FunctionAppComboBoxModel functionAppComboBoxModel) {
         if (functionAppComboBoxModel.getFunctionDeployModel() != null) {
             setFunctionDeployModel(functionAppComboBoxModel.getFunctionDeployModel());
-            return;
         } else {
             functionDeployModel.saveModel(functionAppComboBoxModel);
         }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/ui/FunctionDeployViewPresenter.java

@@ -7,8 +7,6 @@
 
 import com.microsoft.azure.management.appservice.FunctionApp;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
-import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
-import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azuretools.core.mvp.ui.base.MvpPresenter;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import rx.Observable;
@@ -33,17 +31,15 @@ public void loadAppSettings(FunctionApp functionApp) {
             return;
         }
         unsubscribeSubscription(loadAppSettingsSubscription);
-        loadAppSettingsSubscription = Observable.fromCallable(() -> {
-            AzureTaskManager.getInstance().runAndWait(() -> getMvpView().beforeFillAppSettings(), AzureTask.Modality.ANY);
-            return functionApp.getAppSettings();
-        }).subscribeOn(getSchedulerProvider().io())
-                .subscribe(appSettings -> DefaultLoader.getIdeHelper().invokeLater(() -> {
-                    if (isViewDetached()) {
-                        return;
-                    }
-                    final Map<String, String> result = new HashMap<>();
-                    appSettings.entrySet().forEach(entry -> result.put(entry.getKey(), entry.getValue().value()));
-                    getMvpView().fillAppSettings(result);
-                }));
+        loadAppSettingsSubscription =
+            Observable.fromCallable(functionApp::getAppSettings).subscribeOn(getSchedulerProvider().io())
+                      .subscribe(appSettings -> DefaultLoader.getIdeHelper().invokeLater(() -> {
+                          if (isViewDetached()) {
+                              return;
+                          }
+                          final Map<String, String> result = new HashMap<>();
+                          appSettings.forEach((key, value) -> result.put(key, value.value()));
+                          getMvpView().fillAppSettings(result);
+                      }));
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/ui/FunctionDeploymentPanel.java

@@ -8,14 +8,14 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.ComboBox;
 import com.intellij.packaging.artifacts.Artifact;
 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.common.AzureSettingPanel;
 import com.microsoft.azure.toolkit.intellij.function.FunctionAppComboBox;
 import com.microsoft.azure.toolkit.intellij.function.FunctionAppComboBoxModel;
-import com.microsoft.azure.toolkit.intellij.common.AzureSettingPanel;
 import com.microsoft.azure.toolkit.intellij.function.runner.component.table.AppSettingsTable;
 import com.microsoft.azure.toolkit.intellij.function.runner.component.table.AppSettingsTableUtils;
 import com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils;
@@ -39,7 +39,7 @@
 
 public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployConfiguration> implements FunctionDeployMvpView {
 
-    private FunctionDeployViewPresenter presenter = null;
+    private final FunctionDeployViewPresenter<FunctionDeploymentPanel> presenter;
 
     private JPanel pnlRoot;
     private HyperlinkLabel lblCreateFunctionApp;
@@ -53,10 +53,10 @@ public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployCon
 
     public FunctionDeploymentPanel(@NotNull Project project, @NotNull FunctionDeployConfiguration functionDeployConfiguration) {
         super(project);
-        this.presenter = new FunctionDeployViewPresenter();
+        this.presenter = new FunctionDeployViewPresenter<>();
         this.presenter.onAttachView(this);
 
-        cbFunctionModule.setRenderer(new ListCellRendererWrapper<Module>() {
+        cbFunctionModule.setRenderer(new ListCellRendererWrapper<>() {
             @Override
             public void customize(JList list, Module module, int i, boolean b, boolean b1) {
                 if (module != null) {
@@ -101,7 +101,7 @@ public JPanel getMainPanel() {
     @NotNull
     @Override
     protected JComboBox<Artifact> getCbArtifact() {
-        return new JComboBox<Artifact>();
+        return new ComboBox<>();
     }
 
     @NotNull
@@ -113,7 +113,7 @@ protected JLabel getLblArtifact() {
     @NotNull
     @Override
     protected JComboBox<MavenProject> getCbMavenProject() {
-        return new JComboBox<MavenProject>();
+        return new ComboBox<>();
     }
 
     @NotNull
@@ -183,6 +183,7 @@ private void onSelectFunctionApp() {
         } else { // For existing Functions
             if (!AppServiceComboBoxModel.isSameApp(model, appSettingsFunctionApp) || appSettingsTable.isEmpty()) {
                 // Do not refresh if selected function app is not changed except create run configuration from azure explorer
+                this.beforeFillAppSettings();
                 presenter.loadAppSettings(model.getResource());
             }
         }