make actions on Azure group to decide its own visibility/enabling

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/action/RunFunctionAction.java

@@ -14,7 +14,7 @@
 import com.intellij.execution.impl.RunDialog;
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.AzureFunctionSupportConfigurationType;
@@ -32,6 +32,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 
@@ -41,15 +42,16 @@ public class RunFunctionAction extends AzureAnAction {
 
     @Override
     public boolean onActionPerformed(@NotNull AnActionEvent anActionEvent, @Nullable Operation operation) {
-        final Module module = DataKeys.MODULE.getData(anActionEvent.getDataContext());
+        final Module module = LangDataKeys.MODULE.getData(anActionEvent.getDataContext());
         AzureTaskManager.getInstance().runLater(() -> runConfiguration(module));
         return true;
     }
 
     @Override
     @ExceptionNotification
-    public void update(AnActionEvent event) {
-        event.getPresentation().setEnabledAndVisible(FunctionUtils.isFunctionProject(event.getProject()));
+    public void update(AnActionEvent e) {
+        final boolean onModule = Objects.nonNull(LangDataKeys.MODULE.getData(e.getDataContext()));
+        e.getPresentation().setEnabledAndVisible(onModule && FunctionUtils.isFunctionProject(e.getProject()));
     }
 
     @Override

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

@@ -16,6 +16,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 import static com.microsoft.azure.toolkit.lib.common.action.Action.EMPTY_PLACE;
 import static com.microsoft.azure.toolkit.lib.common.action.Action.PLACE;
 
@@ -37,4 +39,10 @@ public static void connectModuleToAzureResource(@NotNull final Module module) {
         dialog.setConsumer(new ModuleResource(module.getName()));
         dialog.show();
     }
+
+    @Override
+    public void update(@NotNull AnActionEvent e) {
+        final boolean onModule = Objects.nonNull(LangDataKeys.MODULE.getData(e.getDataContext()));
+        e.getPresentation().setEnabledAndVisible(onModule);
+    }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/actions/AzurePopupGroup.java

@@ -5,26 +5,8 @@
 
 package com.microsoft.intellij.actions;
 
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
-import com.intellij.openapi.actionSystem.LangDataKeys;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleTypeId;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.microsoft.intellij.util.PluginUtil;
 
 public class AzurePopupGroup extends DefaultActionGroup implements DumbAware {
-
-    public void update(AnActionEvent e) {
-        Module module = LangDataKeys.MODULE.getData(e.getDataContext());
-        if (module == null) {
-            e.getPresentation().setEnabledAndVisible(false);
-        } else {
-            VirtualFile selectedFile = CommonDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
-            e.getPresentation().setEnabledAndVisible(PluginUtil.isModuleRoot(selectedFile, module)
-                    && ModuleTypeId.JAVA_MODULE.equals(module.getOptionValue(Module.ELEMENT_TYPE)));
-        }
-    }
 }