Merge pull request #6032 from microsoft/run-configuration/refactor

[Task #1890183] Migrate to web app deployment configuration panel in run configuration panel

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.webapp/src/com/microsoft/azuretools/webapp/ui/AppServiceCreateDialog.java

@@ -1121,7 +1121,7 @@ protected void fillJavaVersion() {
     private void recordUserSettings() {
         try {
             CommonUtils.setPreference(CommonUtils.SUBSCRIPTION, getSelectedItem(comboSubscription));
-            CommonUtils.setPreference(CommonUtils.RUNTIME_OS, model.getOS().toString());
+            CommonUtils.setPreference(CommonUtils.RUNTIME_OS, model.getOperatingSystem());
             CommonUtils.setPreference(CommonUtils.RUNTIME_LINUX, getSelectedItem(comboLinuxRuntime));
             CommonUtils.setPreference(CommonUtils.RUNTIME_JAVAVERSION, getSelectedItem(cbJavaVersion));
             CommonUtils.setPreference(CommonUtils.RUNTIME_WEBCONTAINER, getSelectedItem(comboWebContainer));

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);
 
@@ -129,8 +129,7 @@ public void setValue(final T config) {
     public List<AzureFormInput<?>> getInputs() {
         final AzureFormInput<?>[] inputs = {
             this.textName,
-            this.selectorRuntime,
-            this.selectorApplication
+            this.selectorRuntime
         };
         return Arrays.asList(inputs);
     }

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

@@ -29,6 +29,7 @@
 import com.microsoft.azuretools.utils.WebAppUtils;
 import com.microsoft.intellij.RunProcessHandler;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.compress.utils.FileNameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,6 +50,7 @@
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
 public class WebAppRunState extends AzureRunProfileState<IAppService> {
+    private File artifact;
     private WebAppConfiguration webAppConfiguration;
     private final IntelliJWebAppSettingModel webAppSettingModel;
 
@@ -65,14 +67,13 @@ public WebAppRunState(Project project, WebAppConfiguration webAppConfiguration)
     @Override
     @AzureOperation(name = "webapp.deploy_artifact", params = {"this.webAppConfiguration.getWebAppName()"}, type = AzureOperation.Type.ACTION)
     public IAppService executeSteps(@NotNull RunProcessHandler processHandler, @NotNull Operation operation) throws Exception {
-        File file = new File(getTargetPath());
-        if (!file.exists()) {
-            throw new FileNotFoundException(message("webapp.deploy.error.noTargetFile", file.getAbsolutePath()));
+        artifact = new File(getTargetPath());
+        if (!artifact.exists()) {
+            throw new FileNotFoundException(message("webapp.deploy.error.noTargetFile", artifact.getAbsolutePath()));
         }
-        webAppConfiguration.setTargetName(file.getName());
         final IWebAppBase deployTarget = getOrCreateDeployTargetFromAppSettingModel(processHandler);
         updateApplicationSettings(deployTarget, processHandler);
-        AzureWebAppMvpModel.getInstance().deployArtifactsToWebApp(deployTarget, file, webAppSettingModel.isDeployToRoot(), processHandler);
+        AzureWebAppMvpModel.getInstance().deployArtifactsToWebApp(deployTarget, artifact, webAppSettingModel.isDeployToRoot(), processHandler);
         return deployTarget;
     }
 
@@ -118,9 +119,8 @@ protected void onSuccess(IAppService result, @NotNull RunProcessHandler processH
             AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, result));
         }
         updateConfigurationDataModel(result);
-        int indexOfDot = webAppSettingModel.getTargetName().lastIndexOf(".");
-        final String fileName = webAppSettingModel.getTargetName().substring(0, indexOfDot);
-        final String fileType = webAppSettingModel.getTargetName().substring(indexOfDot + 1);
+        final String fileName = FileNameUtils.getBaseName(artifact.getName());
+        final String fileType = FileNameUtils.getExtension(artifact.getName());
         final String url = getUrl(result, fileName, fileType);
         processHandler.setText(message("appService.deploy.hint.succeed"));
         processHandler.setText("URL: " + url);

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

@@ -11,15 +11,18 @@
 import com.intellij.ui.HideableDecorator;
 import com.intellij.ui.HyperlinkLabel;
 import com.microsoft.azure.toolkit.ide.appservice.model.AzureArtifactConfig;
+import com.microsoft.azure.toolkit.ide.appservice.model.DeploymentSlotConfig;
 import com.microsoft.azure.toolkit.ide.appservice.webapp.model.WebAppConfig;
 import com.microsoft.azure.toolkit.ide.appservice.webapp.model.WebAppDeployRunConfigurationModel;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifact;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifactComboBox;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifactManager;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifactType;
+import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.appservice.AzureWebApp;
+import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.appservice.model.WebContainer;
 import com.microsoft.azure.toolkit.lib.appservice.service.IWebAppDeploymentSlot;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
@@ -38,7 +41,10 @@
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -82,14 +88,16 @@ public class WebAppDeployConfigurationPanel extends JPanel implements AzureFormP
     public WebAppDeployConfigurationPanel(@NotNull Project project) {
         super();
         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);
         slotButtonGroup.add(rbtExistingSlot);
-        rbtExistingSlot.addActionListener(e -> toggleSlotType(true));
-        rbtNewSlot.addActionListener(e -> toggleSlotType(false));
-
-        chkDeployToSlot.addActionListener(e -> toggleSlotPanel(chkDeployToSlot.isSelected()));
+        rbtExistingSlot.addItemListener(e -> toggleSlotType(true));
+        rbtNewSlot.addItemListener(e -> toggleSlotType(false));
+        chkDeployToSlot.addItemListener(e -> toggleSlotPanel(chkDeployToSlot.isSelected()));
 
         final Icon informationIcon = AllIcons.General.ContextHelp;
         btnSlotHover.setIcon(informationIcon);
@@ -120,14 +128,13 @@ public void focusLost(FocusEvent focusEvent) {
         lblArtifact.setLabelFor(comboBoxArtifact);
         lblWebApp.setLabelFor(comboBoxWebApp);
 
+        final DateFormat df = new SimpleDateFormat("yyMMddHHmmss");
+        txtNewSlotName.setText(String.format(DEFAULT_SLOT_NAME, df.format(new Date())));
+
         slotDecorator = new HideableDecorator(pnlSlotHolder, DEPLOYMENT_SLOT, true);
         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));
     }
@@ -141,10 +148,11 @@ private boolean isAbleToDeployToRoot(final AzureArtifact azureArtifact) {
         if (selectedWebApp == null || azureArtifact == null) {
             return false;
         }
-        final WebContainer webContainer = selectedWebApp.getRuntime().getWebContainer();
+        final String webContainer = Optional.ofNullable(selectedWebApp.getRuntime())
+                .map(Runtime::getWebContainer).map(WebContainer::getValue).orElse(null);
         final String packaging = AzureArtifactManager.getInstance(project).getPackaging(azureArtifact);
         final boolean isDeployingWar = StringUtils.equalsAnyIgnoreCase(packaging, MavenConstants.TYPE_WAR, "ear");
-        return isDeployingWar && StringUtils.containsAnyIgnoreCase(webContainer.getValue(), "tomcat", "jboss");
+        return isDeployingWar && StringUtils.containsAnyIgnoreCase(webContainer, "tomcat", "jboss");
     }
 
     private void toggleSlotPanel(boolean slot) {
@@ -173,7 +181,6 @@ private void createUIComponents() {
         lblNewSlot.addHyperlinkListener(e -> rbtNewSlot.doClick());
 
         comboBoxWebApp = new WebAppComboBox(project);
-        comboBoxWebApp.addItemListener(e -> loadDeploymentSlot(getSelectedWebApp()));
         comboBoxWebApp.refreshItems();
 
         comboBoxArtifact = new AzureArtifactComboBox(this.project);
@@ -220,26 +227,57 @@ private synchronized void fillDeploymentSlots(List<IWebAppDeploymentSlot> slotLi
     @Override
     public void setValue(WebAppDeployRunConfigurationModel data) {
         // artifact
-        Optional.ofNullable(data.getArtifactConfig()).map(config -> AzureArtifactManager.getInstance(this.project)
-                .getAzureArtifactById(AzureArtifactType.valueOf(config.getArtifactType()), config.getArtifactIdentifier()))
+        Optional.ofNullable(data.getArtifactConfig())
+                .filter(config -> !StringUtils.isAnyEmpty(config.getArtifactIdentifier(), config.getArtifactType()))
+                .map(config -> AzureArtifactManager.getInstance(this.project)
+                        .getAzureArtifactById(AzureArtifactType.valueOf(config.getArtifactType()), config.getArtifactIdentifier()))
                 .ifPresent(artifact -> comboBoxArtifact.setArtifact(artifact));
         // web app
-        Optional.ofNullable(data.getWebAppConfig()).ifPresent(webApp -> comboBoxWebApp.setValue(webApp));
+        Optional.ofNullable(data.getWebAppConfig()).ifPresent(webApp -> {
+            comboBoxWebApp.setConfigModel(webApp);
+            comboBoxWebApp.setValue(new AzureComboBox.ItemReference<>(item -> WebAppConfig.isSameApp(item, webApp)));
+            toggleSlotPanel(webApp.getDeploymentSlot() != null);
+            Optional.ofNullable(webApp.getDeploymentSlot()).ifPresent(slot -> {
+                chkDeployToSlot.setSelected(true);
+                rbtNewSlot.setSelected(slot.isNewCreate());
+                rbtExistingSlot.setSelected(!slot.isNewCreate());
+                toggleSlotType(!slot.isNewCreate());
+                if (slot.isNewCreate()) {
+                    txtNewSlotName.setText(slot.getName());
+                    cbxSlotConfigurationSource.addItem(slot.getConfigurationSource());
+                    cbxSlotConfigurationSource.setSelectedItem(slot.getConfigurationSource());
+                } else {
+                    cbxSlotName.addItem(slot.getName());
+                    cbxSlotName.setSelectedItem(slot.getName());
+                }
+            });
+        });
         // configuration
         chkToRoot.setSelected(data.isDeployToRoot());
         chkOpenBrowser.setSelected(data.isOpenBrowserAfterDeployment());
+        slotDecorator.setOn(data.isSlotPanelVisible());
     }
 
     @Override
     public WebAppDeployRunConfigurationModel getValue() {
         final AzureArtifact artifact = comboBoxArtifact.getValue();
-        final AzureArtifactConfig artifactConfig = AzureArtifactConfig.builder().artifactType(artifact.getType().name())
-                .artifactIdentifier(AzureArtifactManager.getInstance(project).getArtifactIdentifier(artifact)).build();
+        final AzureArtifactConfig artifactConfig = artifact == null ? null :
+                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(Objects.toString(cbxSlotName.getSelectedItem(), null)).build() :
+                DeploymentSlotConfig.builder().newCreate(true).name(txtNewSlotName.getText())
+                        .configurationSource(Objects.toString(cbxSlotConfigurationSource.getSelectedItem(), null)).build() : null;
+        final WebAppConfig webAppConfig = comboBoxWebApp.getValue();
+        if (webAppConfig != null) {
+            webAppConfig.setDeploymentSlot(slotConfig);
+        }
         return WebAppDeployRunConfigurationModel.builder()
-                .webAppConfig(comboBoxWebApp.getValue())
+                .webAppConfig(webAppConfig)
                 .artifactConfig(artifactConfig)
                 .openBrowserAfterDeployment(chkOpenBrowser.isSelected())
                 .deployToRoot(chkToRoot.isSelected())
+                .slotPanelVisible(slotDecorator.isExpanded())
                 .build();
     }