Fix default value for webapp/artifact combo box and related issues

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureArtifactComboBox.java

@@ -56,6 +56,14 @@ public void setArtifact(@Nullable final AzureArtifact azureArtifact) {
         this.setValue(new ItemReference<>(artifact -> artifactManager.equalsAzureArtifact(cachedArtifact, artifact)));
     }
 
+    @Override
+    public AzureArtifact getValue() {
+        if (value instanceof ItemReference && ((ItemReference<?>) value).is(cachedArtifact)) {
+            return cachedArtifact;
+        }
+        return super.getValue();
+    }
+
     @Nonnull
     @Override
     @AzureOperation(

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java

@@ -53,9 +53,9 @@ public abstract class AzureComboBox<T> extends ComboBox<T> implements AzureFormI
     private final TailingDebouncer refresher;
     private AzureComboBoxEditor loadingSpinner;
     private AzureComboBoxEditor inputEditor;
-    private Object value;
     private boolean valueNotSet = true;
     private boolean isRefreshing = false;
+    protected Object value;
     protected boolean enabled = true;
     @Getter
     @Setter

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

@@ -90,7 +90,7 @@ public T getValue() {
         final Runtime platform = this.selectorRuntime.getValue();
         final AzureArtifact artifact = this.selectorApplication.getValue();
 
-        final T result = (T) (this.config == null ? initConfig() : this.config).toBuilder().build();
+        final T result = (T) (this.config == null ? initConfig() : this.config);
         result.setName(name);
         result.setRuntime(platform);
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/AppServiceComboBox.java

@@ -18,6 +18,7 @@
 import com.microsoft.azure.toolkit.lib.webapp.WebAppService;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
+import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import rx.Subscription;
 
@@ -31,6 +32,7 @@ public abstract class AppServiceComboBox<T extends AppServiceConfig> extends Azu
     protected Project project;
     protected Subscription subscription;
 
+    @Setter
     protected T configModel;
 
     public AppServiceComboBox(final Project project) {
@@ -39,19 +41,11 @@ public AppServiceComboBox(final Project project) {
         this.setRenderer(new AppComboBoxRender());
     }
 
-    @Override
-    public void setValue(T value) {
-        if (isDraftResource(value)) {
-            configModel = value;
-        }
-        super.setValue(value);
-    }
-
     @NotNull
     @Override
     protected List<? extends T> loadItems() throws Exception {
         final List<T> items = loadAppServiceModels();
-        if (configModel != null && StringUtils.isEmpty(configModel.getResourceId())) {
+        if (isDraftResource(configModel)) {
             final boolean exist = items.stream().anyMatch(item -> AppServiceConfig.isSameApp(item, configModel));
             if (!exist) {
                 items.add(configModel);
@@ -60,6 +54,14 @@ protected List<? extends T> loadItems() throws Exception {
         return items;
     }
 
+    @Override
+    public T getValue() {
+        if (value instanceof ItemReference && ((ItemReference<?>) value).is(configModel)) {
+            return configModel;
+        }
+        return super.getValue();
+    }
+
     protected abstract List<T> loadAppServiceModels() throws Exception;
 
     @Nullable
@@ -116,6 +118,6 @@ private String getAppServiceLabel(AppServiceConfig appServiceModel) {
     }
 
     private static boolean isDraftResource(final AppServiceConfig config) {
-        return StringUtils.isEmpty(config.getResourceId());
+        return config != null && StringUtils.isEmpty(config.getResourceId());
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppDeployConfigurationPanel.java

@@ -89,6 +89,7 @@ public WebAppDeployConfigurationPanel(@NotNull Project project) {
         this.project = project;
         $$$setupUI$$$();
         comboBoxWebApp.addItemListener(e -> loadDeploymentSlot(getSelectedWebApp()));
+        comboBoxArtifact.addItemListener(e -> chkToRoot.setVisible(isAbleToDeployToRoot(comboBoxArtifact.getValue())));
 
         final ButtonGroup slotButtonGroup = new ButtonGroup();
         slotButtonGroup.add(rbtNewSlot);
@@ -133,10 +134,6 @@ public void focusLost(FocusEvent focusEvent) {
         slotDecorator.setContentComponent(pnlSlot);
     }
 
-    public void toggleSlotVisibility(final boolean visible) {
-        slotDecorator.setOn(visible);
-    }
-
     private void setComboBoxDefaultValue(JComboBox comboBox, Object value) {
         UIUtils.listComboBoxItems(comboBox).stream().filter(item -> item.equals(value)).findFirst().ifPresent(defaultItem -> comboBox.setSelectedItem(value));
     }
@@ -254,6 +251,7 @@ public void setValue(WebAppDeployRunConfigurationModel data) {
         // configuration
         chkToRoot.setSelected(data.isDeployToRoot());
         chkOpenBrowser.setSelected(data.isOpenBrowserAfterDeployment());
+        slotDecorator.setOn(data.isSlotPanelVisible());
     }
 
     @Override
@@ -263,9 +261,9 @@ public WebAppDeployRunConfigurationModel getValue() {
                 AzureArtifactConfig.builder().artifactType(artifact.getType().name())
                         .artifactIdentifier(AzureArtifactManager.getInstance(project).getArtifactIdentifier(artifact)).build();
         final DeploymentSlotConfig slotConfig = chkDeployToSlot.isSelected() ? rbtExistingSlot.isSelected() ?
-                DeploymentSlotConfig.builder().newCreate(false).name(cbxSlotName.getSelectedItem().toString()).build() :
+                DeploymentSlotConfig.builder().newCreate(false).name(Objects.toString(cbxSlotName.getSelectedItem(), null)).build() :
                 DeploymentSlotConfig.builder().newCreate(true).name(txtNewSlotName.getText())
-                        .configurationSource(cbxSlotConfigurationSource.getSelectedItem().toString()).build() : null;
+                        .configurationSource(Objects.toString(cbxSlotConfigurationSource.getSelectedItem(), null)).build() : null;
         final WebAppConfig webAppConfig = comboBoxWebApp.getValue();
         if (webAppConfig != null) {
             webAppConfig.setDeploymentSlot(slotConfig);
@@ -275,6 +273,7 @@ public WebAppDeployRunConfigurationModel getValue() {
                 .artifactConfig(artifactConfig)
                 .openBrowserAfterDeployment(chkOpenBrowser.isSelected())
                 .deployToRoot(chkToRoot.isSelected())
+                .slotPanelVisible(slotDecorator.isExpanded())
                 .build();
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppSlimSettingPanel.java

@@ -47,7 +47,6 @@ public class WebAppSlimSettingPanel extends AzureSettingPanel<WebAppConfiguratio
     public WebAppSlimSettingPanel(@NotNull Project project, @NotNull WebAppConfiguration webAppConfiguration) {
         super(project, false);
         $$$setupUI$$$();
-        pnlDeployment.toggleSlotVisibility(webAppConfiguration.isSlotPanelVisible());
     }
 
     @NotNull

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/model/AppServiceConfig.java

@@ -35,7 +35,7 @@
 @AllArgsConstructor
 @EqualsAndHashCode
 @SuperBuilder(toBuilder = true)
-public class AppServiceConfig {
+public abstract class AppServiceConfig {
     @Builder.Default
     private MonitorConfig monitorConfig = MonitorConfig.builder().build();
     private String name;
@@ -50,8 +50,6 @@ public class AppServiceConfig {
     private Map<String, String> appSettings = new HashMap<>();
     private DeploymentSlotConfig deploymentSlot;
 
-    protected Runtime runtime;
-
     public Map<String, String> getTelemetryProperties() {
         final Map<String, String> result = new HashMap<>();
         result.put("subscriptionId", Optional.ofNullable(subscription).map(Subscription::getId).orElse(StringUtils.EMPTY));
@@ -79,6 +77,10 @@ public String getSubscriptionId() {
         return Optional.ofNullable(subscription).map(Subscription::getId).orElse(StringUtils.EMPTY);
     }
 
+    public abstract Runtime getRuntime();
+
+    public abstract void setRuntime(Runtime runtime);
+
     public static boolean isSameApp(AppServiceConfig first, AppServiceConfig second) {
         if (Objects.isNull(first) || Objects.isNull(second)) {
             return first == second;

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/webapp/model/WebAppConfig.java

@@ -6,6 +6,7 @@
 package com.microsoft.azure.toolkit.ide.appservice.webapp.model;
 
 import com.microsoft.azure.toolkit.ide.appservice.model.AppServiceConfig;
+import com.microsoft.azure.toolkit.lib.appservice.entity.AppServicePlanEntity;
 import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.appservice.service.IWebApp;
@@ -42,9 +43,11 @@ public static WebAppConfig fromRemote(IWebApp webApp) {
         return WebAppConfig.builder()
                 .name(webApp.name())
                 .resourceId(webApp.id())
+                .servicePlan(AppServicePlanEntity.builder().id(webApp.entity().getAppServicePlanId()).build())
                 .subscription(Subscription.builder().id(webApp.subscriptionId()).build())
                 .resourceGroup(ResourceGroup.builder().name(webApp.resourceGroup()).build())
                 .runtime(webApp.getRuntime())
+                .region(webApp.entity().getRegion())
                 .build();
     }
 }