show Deploy to Azure node under Deployment Targets node if never deployed

Author: wangmingliang-ms

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

@@ -16,21 +16,25 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.microsoft.azure.toolkit.ide.common.IActionsContributor;
 import com.microsoft.azure.toolkit.ide.common.action.ResourceCommonActionsContributor;
+import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons;
 import com.microsoft.azure.toolkit.intellij.common.fileexplorer.VirtualFileActions;
 import com.microsoft.azure.toolkit.intellij.common.properties.IntellijShowPropertiesViewAction;
 import com.microsoft.azure.toolkit.lib.common.action.Action;
+import com.microsoft.azure.toolkit.lib.common.action.ActionGroup;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
 import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
 import com.microsoft.azure.toolkit.lib.common.model.AzResource;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.BiConsumer;
 
 public class IntellijActionsContributor implements IActionsContributor {
     public static final Action.Id<Object> TRY_ULTIMATE = Action.Id.of("user/database.try_ultimate");
     private static final String IDE_DOWNLOAD_URL = "https://www.jetbrains.com/idea/download/";
+    public static final String ACTIONS_DEPLOY_TO_AZURE = "actions.common.deploy_to_azure";
 
     @Override
     public void registerHandlers(AzureActionManager am) {
@@ -80,6 +84,16 @@ public void registerActions(AzureActionManager am) {
             .register(am);
     }
 
+    @Override
+    public void registerGroups(final AzureActionManager am) {
+        final ActionGroup deployToAzure = new ActionGroup(Arrays.asList(
+            "Actions.DeployFunction",
+            "Actions.DeploySpringCloud",
+            "Actions.WebDeployAction"
+        ), new Action.View("Deploy to Azure...", AzureIcons.Action.DEPLOY.getIconPath(), true, null));
+        am.registerGroup(ACTIONS_DEPLOY_TO_AZURE, deployToAzure);
+    }
+
     @Override
     public int getOrder() {
         return ResourceCommonActionsContributor.INITIALIZE_ORDER + 1; //after azure resource common actions registered

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

@@ -23,6 +23,7 @@
 import com.intellij.openapi.actionSystem.ShortcutSet;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.microsoft.azure.toolkit.ide.common.IActionsContributor;
 import com.microsoft.azure.toolkit.ide.common.action.ResourceCommonActionsContributor;
 import com.microsoft.azure.toolkit.intellij.common.IntelliJAzureIcons;
@@ -32,6 +33,7 @@
 import com.microsoft.azure.toolkit.lib.common.action.IActionGroup;
 import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResource;
 import com.microsoft.azure.toolkit.lib.common.model.Emulatable;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.common.view.IView;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
@@ -199,6 +201,10 @@ public ActionGroupWrapper(@Nonnull ActionGroup group) {
             this.group = group;
             this.setPopup(true);
             this.addActions(group.getActions());
+            final Presentation presentation = this.getTemplatePresentation();
+            presentation.setPerformGroup(true);
+            final IView.Label view = this.group.getView();
+            Optional.ofNullable(this.group.getView()).ifPresent(v -> presentation.setText(v.getLabel()));
         }
 
         @Override
@@ -208,7 +214,10 @@ public void update(@Nonnull AnActionEvent e) {
             final Presentation presentation = e.getPresentation();
             Optional.ofNullable(view).ifPresent(v -> {
                 presentation.setText(v.getLabel());
-                Optional.ofNullable(v.getIconPath()).filter(StringUtils::isNotBlank).ifPresent(IntelliJAzureIcons::getIcon);
+                presentation.setDescription(v.getDescription());
+                presentation.setEnabled(v.isEnabled());
+                presentation.setVisible(v.isVisible());
+                Optional.ofNullable(v.getIconPath()).filter(StringUtils::isNotBlank).map(IntelliJAzureIcons::getIcon).ifPresent(presentation::setIcon);
             });
         }
 
@@ -223,6 +232,15 @@ private void addActions(List<Object> actions) {
             }
         }
 
+        @Override
+        public void actionPerformed(@Nonnull AnActionEvent e) {
+            AzureTaskManager.getInstance().runLater(() -> JBPopupFactory.getInstance().createActionGroupPopup(
+                    e.getPresentation().getText(), this, e.getDataContext(),
+                    JBPopupFactory.ActionSelectionAid.SPEEDSEARCH,
+                    false, null, -1, null, ActionPlaces.getPopupPlace(e.getPlace()))
+                .showInBestPositionFor(e.getDataContext()));
+        }
+
         @Override
         public IView.Label getView() {
             return group.getView();

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/projectexplorer/ActionNode.java

@@ -57,12 +57,16 @@ protected Collection<? extends AbstractAzureFacetNode<?>> buildChildren() {
     @Override
     protected void buildView(@Nonnull PresentationData presentation) {
         final IView.Label view = this.getValue().getView(this.source);
-        presentation.addText(StringUtils.capitalize(view.getLabel()), SimpleTextAttributes.LINK_ATTRIBUTES);
+        presentation.addText(StringUtils.capitalize(view.getLabel()), view.isEnabled() && view.isVisible() ? SimpleTextAttributes.LINK_ATTRIBUTES : SimpleTextAttributes.GRAYED_ATTRIBUTES);
         presentation.setTooltip(view.getDescription());
     }
 
     @Override
     public void onClicked(Object event) {
+        final IView.Label view = this.getValue().getView(this.source);
+        if (!view.isVisible() || !view.isEnabled()) {
+            return;
+        }
         final Action<T> value = getValue();
         if (event instanceof AnActionEvent) {
             value.getContext().setTelemetryProperty(Action.PLACE, ((AnActionEvent) event).getPlace());

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/projectexplorer/DeploymentTargetsNode.java

@@ -25,14 +25,18 @@
 import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
 import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResource;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
+import org.apache.commons.collections4.CollectionUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
+import static com.microsoft.azure.toolkit.intellij.common.action.IntellijActionsContributor.ACTIONS_DEPLOY_TO_AZURE;
 import static com.microsoft.azure.toolkit.intellij.connector.ResourceConnectionActionsContributor.REFRESH_MODULE_TARGETS;
 
 public class DeploymentTargetsNode extends AbstractAzureFacetNode<DeploymentTargetManager> {
@@ -60,12 +64,18 @@ private void onEvent(@Nonnull final AzureEvent azureEvent) {
     @Override
     @Nonnull
     public Collection<? extends AbstractAzureFacetNode<?>> buildChildren() {
-        return Optional.ofNullable(this.getValue()).stream()
+        final List<? extends AbstractAzureFacetNode<?>> children = Optional.ofNullable(this.getValue()).stream()
             .flatMap(p -> p.getTargets().stream())
             .map(id -> Azure.az().getById(id))
             .filter(Objects::nonNull)
             .map(this::createResourceNode)
             .toList();
+        if (CollectionUtils.isNotEmpty(children)) {
+            return children;
+        }
+        final ArrayList<AbstractAzureFacetNode<?>> nodes = new ArrayList<>();
+        nodes.add(new ActionNode<>(this.getProject(), Action.Id.of(ACTIONS_DEPLOY_TO_AZURE), this.getValue().getProfile().getModule().getModule()));
+        return nodes;
     }
 
     @Override