fix: made sure telemetry sender is initialized (#926)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/java/org/jboss/tools/intellij/openshift/actions/HelmAction.java

@@ -11,14 +11,15 @@
 package org.jboss.tools.intellij.openshift.actions;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.redhat.devtools.intellij.common.actions.StructureTreeAction;
+import java.util.Arrays;
+import javax.swing.tree.TreePath;
 import org.jboss.tools.intellij.openshift.telemetry.TelemetrySender;
 import org.jboss.tools.intellij.openshift.utils.helm.Helm;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.tree.TreePath;
-
 import static org.jboss.tools.intellij.openshift.telemetry.TelemetryService.PREFIX_ACTION;
 
 public abstract class HelmAction extends TelemetryAction {
@@ -31,12 +32,27 @@ protected HelmAction(Class... filters) {
 
   @Override
   public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object selected) {
+    // not invoked
+  }
+
+  @Override
+  public void actionPerformed(AnActionEvent anActionEvent, TreePath[] path, Object[] selected) {
     setTelemetrySender(new TelemetrySender(PREFIX_ACTION + getTelemetryActionName()));
     Helm helm = getHelm(anActionEvent);
     if (helm == null) {
       return;
     }
-    this.actionPerformedOnSelectedObject(anActionEvent, getElement(selected), helm);
+    if (selected.length == 0 || path.length == 0) {
+      actionPerformed(anActionEvent, (TreePath) null, null);
+    } else if (selected.length == 1) {
+      Object selectedElement = getElement(selected[0]);
+      actionPerformedOnSelectedObject(anActionEvent, selectedElement, helm);
+    } else {
+      Object[] selectedElements = Arrays.stream(selected)
+        .map(StructureTreeAction::getElement)
+        .toArray();
+      actionPerformedOnSelectedObjects(anActionEvent, selectedElements, helm);
+    }
   }
 
   protected Helm getHelm(AnActionEvent anActionEvent) {
@@ -52,4 +68,7 @@ public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object
     // noop implementation
   }
 
+  public void actionPerformedOnSelectedObjects(AnActionEvent anActionEvent, Object[] selected, @NotNull Helm helm) {
+    // noop implementation
+  }
 }

src/main/java/org/jboss/tools/intellij/openshift/actions/helm/RemoveRepositoriesAction.java

@@ -19,13 +19,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.swing.tree.TreePath;
 import org.jboss.tools.intellij.openshift.actions.HelmAction;
 import org.jboss.tools.intellij.openshift.telemetry.TelemetryService;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
 import org.jboss.tools.intellij.openshift.tree.application.HelmRepositoryNode;
 import org.jboss.tools.intellij.openshift.tree.application.ProcessingNode;
 import org.jboss.tools.intellij.openshift.utils.helm.Helm;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static org.jboss.tools.intellij.openshift.actions.ActionUtils.runWithProgress;
@@ -35,12 +35,13 @@
 public class RemoveRepositoriesAction extends HelmAction {
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, TreePath[] path, Object[] selected) {
-    Helm helm = getHelm(anActionEvent);
-    if (helm == null) {
-      return;
-    }
-    Project project = getEventProject(anActionEvent);
+  public void actionPerformedOnSelectedObject(AnActionEvent event, Object selected, @NotNull Helm helm) {
+    actionPerformedOnSelectedObjects(event, new Object[] { selected }, helm);
+  }
+
+  @Override
+  public void actionPerformedOnSelectedObjects(AnActionEvent event, Object[] selected, @NotNull Helm helm) {
+    Project project = getEventProject(event);
     List<HelmRepositoryNode> repositories = toHelmRepositoryNodes(selected);
     if (repositories == null
       || repositories.isEmpty()) {

src/main/java/org/jboss/tools/intellij/openshift/actions/helm/UninstallReleaseAction.java

@@ -14,35 +14,33 @@
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.redhat.devtools.intellij.common.actions.StructureTreeAction;
 import com.redhat.devtools.intellij.common.utils.UIHelper;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.jboss.tools.intellij.openshift.actions.HelmAction;
 import org.jboss.tools.intellij.openshift.telemetry.TelemetryService;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
 import org.jboss.tools.intellij.openshift.tree.application.ChartReleaseNode;
 import org.jboss.tools.intellij.openshift.tree.application.ProcessingNode;
 import org.jboss.tools.intellij.openshift.utils.helm.Helm;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.tree.TreePath;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import static org.jboss.tools.intellij.openshift.actions.ActionUtils.runWithProgress;
 import static org.jboss.tools.intellij.openshift.actions.NodeUtils.clearProcessing;
 import static org.jboss.tools.intellij.openshift.actions.NodeUtils.setProcessing;
 
 public class UninstallReleaseAction extends HelmAction {
 
+  @Override
+  public void actionPerformedOnSelectedObject(AnActionEvent event, Object selected, @NotNull Helm helm) {
+    actionPerformedOnSelectedObjects(event, new Object[] { selected }, helm);
+  }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, TreePath[] path, Object[] selected) {
-    Helm helm = getHelm(anActionEvent);
-    if (helm == null) {
-      return;
-    }
-    Project project = getEventProject(anActionEvent);
+  public void actionPerformedOnSelectedObjects(AnActionEvent event, Object[] selected, @NotNull Helm helm) {
+    Project project = getEventProject(event);
     List<ChartReleaseNode> releases = toChartReleaseNodes(selected);
     if (releases == null
       || releases.isEmpty()) {
@@ -80,7 +78,6 @@ private static List<ChartReleaseNode> toChartReleaseNodes(Object[] selected) {
     }
 
     return Arrays.stream(selected)
-      .map(StructureTreeAction::getElement)
       .filter(ChartReleaseNode.class::isInstance)
       .map(ChartReleaseNode.class::cast)
       .collect(Collectors.toList());