Merge pull request #6968 from microsoft/hanli-fixes-202209

wangmingliang-ms · web-flow · commit 96f88c2a798d · 2022-09-27T22:55:14.000+08:00
Resolve issues in end game tests
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/FunctionDeploymentSettingEditor.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/FunctionDeploymentSettingEditor.java
@@ -12,6 +12,7 @@
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.FunctionDeploymentPanel;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import org.jetbrains.annotations.NotNull;
+import reactor.core.scheduler.Schedulers;
 
 import java.util.Objects;
 
@@ -33,6 +34,7 @@ protected void applyEditorTo(@NotNull FunctionDeployConfiguration conf) throws C
                 .filter(i -> !i.isValid())
                 .findAny().orElse(null);
         if (Objects.nonNull(error)) {
+            mainPanel.validateAllInputsAsync().subscribeOn(Schedulers.boundedElastic()).subscribe(ignore -> this.fireEditorStateChanged());
             final String message = error.getType() == AzureValidationInfo.Type.PENDING ? "Validating..." : error.getMessage();
             throw new ConfigurationException(message);
         }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.form b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="pnlRoot" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="604" height="220"/>
+      <xy x="20" y="20" width="604" height="133"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -53,18 +53,6 @@
           <text value="Module: "/>
         </properties>
       </component>
-      <component id="56e9e" class="javax.swing.JLabel" binding="lblDeploymentSlot">
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <minimum-size width="-1" height="24"/>
-            <preferred-size width="-1" height="24"/>
-            <maximum-size width="-1" height="24"/>
-          </grid>
-        </constraints>
-        <properties>
-          <text value="Deployment Slot:"/>
-        </properties>
-      </component>
       <component id="760ca" class="com.microsoft.azure.toolkit.intellij.legacy.function.FunctionAppComboBox" binding="functionAppComboBox" custom-create="true">
         <constraints>
           <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
@@ -73,29 +61,29 @@
       </component>
       <component id="35551" class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.components.DeploymentSlotComboBox" binding="cbDeploymentSlot" custom-create="true">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <visible value="true"/>
         </properties>
       </component>
+      <component id="2bbdf" class="javax.swing.JComboBox" binding="cbFunctionModule">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
       <component id="60952" class="javax.swing.JCheckBox" binding="chkSlot">
         <constraints>
-          <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <contentAreaFilled value="true"/>
           <hideActionText value="false"/>
           <horizontalTextPosition value="4"/>
-          <text value="Deploy To Slot"/>
+          <text value="Deploy to Slot:"/>
         </properties>
       </component>
-      <component id="2bbdf" class="javax.swing.JComboBox" binding="cbFunctionModule">
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-      </component>
     </children>
   </grid>
 </form>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.java
@@ -14,6 +14,7 @@
 import com.intellij.ui.ListCellRendererWrapper;
 import com.microsoft.azure.toolkit.ide.appservice.function.FunctionAppConfig;
 import com.microsoft.azure.toolkit.ide.appservice.model.DeploymentSlotConfig;
+import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
 import com.microsoft.azure.toolkit.intellij.legacy.common.AzureSettingPanel;
 import com.microsoft.azure.toolkit.intellij.legacy.function.FunctionAppComboBox;
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.component.table.FunctionAppSettingsTable;
@@ -24,36 +25,31 @@
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.appservice.AppServiceAppBase;
 import com.microsoft.azure.toolkit.lib.appservice.function.AzureFunctions;
-import com.microsoft.azure.toolkit.lib.appservice.function.FunctionApp;
-import com.microsoft.azure.toolkit.lib.appservice.function.FunctionAppBase;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
-import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResource;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.project.MavenProject;
 
 import javax.annotation.Nonnull;
 import javax.swing.*;
-import java.awt.event.ItemEvent;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 
 
-public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployConfiguration> {
+public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployConfiguration> implements AzureFormPanel<FunctionDeployConfiguration> {
 
     private JPanel pnlRoot;
     private HyperlinkLabel lblCreateFunctionApp;
@@ -65,14 +61,15 @@ public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployCon
     private JLabel lblAppSettings;
     private JCheckBox chkSlot;
     private DeploymentSlotComboBox cbDeploymentSlot;
-    private JLabel lblDeploymentSlot;
     private FunctionAppSettingsTable appSettingsTable;
     private String appSettingsKey;
     private String appSettingsResourceId;
     private Module previousModule = null;
+    private final FunctionDeployConfiguration configuration;
 
     public FunctionDeploymentPanel(@NotNull Project project, @NotNull FunctionDeployConfiguration functionDeployConfiguration) {
         super(project);
+        this.configuration = functionDeployConfiguration;
         this.appSettingsKey = StringUtils.firstNonBlank(functionDeployConfiguration.getAppSettingsKey(), UUID.randomUUID().toString());
         $$$setupUI$$$();
 
@@ -86,11 +83,12 @@ public void customize(JList list, Module module, int i, boolean b, boolean b1) {
             }
         });
         functionAppComboBox.setRequired(true);
-        chkSlot.addItemListener(e -> onSelectSlot());
+        chkSlot.addItemListener(e -> onSlotCheckBoxChanged());
 
         lblModule.setLabelFor(cbFunctionModule);
         lblFunction.setLabelFor(functionAppComboBox);
         lblAppSettings.setLabelFor(appSettingsTable);
+        final JLabel lblDeploymentSlot = new JLabel("Deployment Slot:");
         lblDeploymentSlot.setLabelFor(cbDeploymentSlot);
         fillModules();
     }
@@ -202,24 +200,23 @@ private void onSelectFunctionApp(final FunctionAppConfig value) {
             return;
         }
         // disable slot for draft function
+        this.chkSlot.setEnabled(StringUtils.isNotEmpty(value.getResourceId()));
         if (StringUtils.isEmpty(value.getResourceId())) {
             this.chkSlot.setSelected(false);
         }
-        this.chkSlot.setEnabled(StringUtils.isNotEmpty(value.getResourceId()));
-        this.toggleDeploymentSlot(chkSlot.isSelected());
         this.cbDeploymentSlot.setAppService(value.getResourceId());
         if (!this.chkSlot.isSelected()) {
             loadAppSettings(getResourceId(value, null));
         }
     }
 
-    private void loadAppSettings(@Nonnull final String resourceId) {
+    private void loadAppSettings(@Nullable final String resourceId) {
         if (StringUtils.equalsIgnoreCase(resourceId, this.appSettingsResourceId) && MapUtils.isNotEmpty(this.appSettingsTable.getAppSettings())) {
             return;
         }
         this.appSettingsResourceId = resourceId;
         this.appSettingsTable.loadAppSettings(() -> {
-            final AbstractAzResource<?, ?, ?> resource = Azure.az().getById(resourceId);
+            final AbstractAzResource<?, ?, ?> resource = StringUtils.isBlank(resourceId) ? null : Azure.az().getById(resourceId);
             return resource instanceof AppServiceAppBase<?, ?, ?> ? ((AppServiceAppBase<?, ?, ?>) resource).getAppSettings() : Collections.emptyMap();
         });
     }
@@ -247,10 +244,14 @@ private void selectModule(final Module target) {
         }
     }
 
-    private void onSelectSlot() {
+    private void onSlotCheckBoxChanged() {
         toggleDeploymentSlot(chkSlot.isSelected());
-        if (!chkSlot.isSelected() && functionAppComboBox.getValue() != null) {
-            // reload app settings for function app
+        final FunctionAppConfig function = functionAppComboBox.getValue();
+        final DeploymentSlotConfig slot = cbDeploymentSlot.getValue();
+        // reload app settings when switch slot configuration
+        if (chkSlot.isSelected() && ObjectUtils.allNotNull(function, slot)) {
+            loadAppSettings(getResourceId(functionAppComboBox.getValue(), slot));
+        } else if (!chkSlot.isSelected() && Objects.nonNull(function)) {
             loadAppSettings(getResourceId(functionAppComboBox.getValue(), null));
         }
     }
@@ -261,24 +262,32 @@ private void toggleDeploymentSlot(boolean isDeployToSlot) {
         cbDeploymentSlot.validateValueAsync();
     }
 
-    // todo: @hanli migrate to AzureFormInput
-    public List<AzureValidationInfo> getAllValidationInfos(final boolean revalidateIfNone) {
-        final List<AzureFormInput<?>> inputs = Arrays.asList(functionAppComboBox, cbDeploymentSlot);
-        return inputs.stream()
-                .map(input -> input.getValidationInfo(revalidateIfNone))
-                .filter(Objects::nonNull).collect(Collectors.toList());
+    @Override
+    public void setValue(FunctionDeployConfiguration data) {
+        resetFromConfig(data);
+    }
+
+    @Override
+    public FunctionDeployConfiguration getValue() {
+        final FunctionDeployConfiguration result = new FunctionDeployConfiguration(configuration.getProject(), configuration.getFactory(), configuration.getName());
+        apply(result);
+        return result;
     }
 
+    @Override
+    public List<AzureFormInput<?>> getInputs() {
+        return Arrays.asList(functionAppComboBox, cbDeploymentSlot);
+    }
+
+    @Nullable
     private String getResourceId(@Nonnull FunctionAppConfig config, @Nullable DeploymentSlotConfig slotConfig) {
         if (Objects.isNull(slotConfig)) {
             return StringUtils.isNoneBlank(config.getResourceId()) ? config.getResourceId() :
                     Azure.az(AzureFunctions.class).functionApps(config.getSubscriptionId()).getOrTemp(config.getName(), config.getResourceGroupName()).getId();
         } else {
-            return Azure.az(AzureFunctions.class).functionApp(config.getResourceId()).slots().getOrTemp(slotConfig.getName(), null).getId();
+            return Optional.ofNullable(Azure.az(AzureFunctions.class).functionApp(config.getResourceId()))
+                    .map(func -> func.slots().getOrTemp(slotConfig.getName(), null).getId())
+                    .orElse(null);
         }
     }
-
-    // CHECKSTYLE IGNORE check FOR NEXT 1 LINES
-    void $$$setupUI$$$() {
-    }
 }
