namespace/project in 'Change Project' action and dialog (#701)

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

Author: adietish

src/main/java/org/jboss/tools/intellij/openshift/actions/project/ChangeActiveProjectAction.java

@@ -56,6 +56,19 @@ public static void execute(ParentableNode<?> node) {
     action.doActionPerformed(rootNode, location, odo, project);
   }
 
+  @Override
+  public void update(AnActionEvent e) {
+    super.update(e);
+    if (e.getPresentation().isVisible()) {
+      Odo odo = getOdo(e);
+      if (odo == null) {
+        return;
+      }
+      // overrides label given in plugin.xml
+      e.getPresentation().setText("Change " + odo.getNamespaceKind());
+    }
+  }
+
   @Override
   public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     Project project = getEventProject(anActionEvent);
@@ -71,7 +84,9 @@ private void doActionPerformed(final ApplicationsRootNode rootNode, final Point
             try {
               return new ClusterProjects(odo.isOpenShift(), odo.getCurrentNamespace(), odo.getNamespaces());
             } catch (IOException e) {
-              NotificationUtils.notifyError("Change Active Project", "Could not get projects: " + e.getMessage());
+              NotificationUtils.notifyError(
+                "Change Active " + odo.getNamespaceKind(),
+                "Could not get " + odo.getNamespaceKind().toLowerCase() + ": " + e.getMessage());
               sendTelemetryError(e.getMessage());
               throw new RuntimeException(e);
             }
@@ -80,7 +95,7 @@ private void doActionPerformed(final ApplicationsRootNode rootNode, final Point
               if (error != null) {
                 return null;
               }
-              ChangeActiveProjectDialog dialog = openActiveProjectDialog(clusterProjects.isOpenShift, clusterProjects.current, clusterProjects.all, location, project);
+              ChangeActiveProjectDialog dialog = openActiveProjectDialog(clusterProjects.current, clusterProjects.all, location, odo, project);
               if (dialog.isOK()) {
                 return new ChangeActiveProjectOperation(dialog.getActiveProject(), odo);
               } else if (dialog.isCreateNewProject()) {
@@ -103,9 +118,8 @@ private void doActionPerformed(final ApplicationsRootNode rootNode, final Point
       project);
   }
 
-  private ChangeActiveProjectDialog openActiveProjectDialog(boolean isOpenShift, String currentProject, List<String> allProjects, Point location, Project project) {
-    String kind = isOpenShift ? "Project" : "Namespace";
-    ChangeActiveProjectDialog dialog = new ChangeActiveProjectDialog(project, kind, currentProject, allProjects, location);
+  private ChangeActiveProjectDialog openActiveProjectDialog(String currentProject, List<String> allProjects, Point location, Odo odo, Project project) {
+    ChangeActiveProjectDialog dialog = new ChangeActiveProjectDialog(project, odo.getNamespaceKind(), currentProject, allProjects, location);
     dialog.show();
     return dialog;
   }
@@ -146,12 +160,17 @@ private ChangeActiveProjectOperation(String activeProject, Odo odo) {
 
     @Override
     public void run() {
+      String kind = odo.getNamespaceKind();
       try {
         odo.setProject(activeProject);
-        NotificationUtils.notifyInformation("Change active project", "Active project set to '" + activeProject + "'");
+        NotificationUtils.notifyInformation(
+          "Change active " + kind,
+          "Active " + kind.toLowerCase() + " set to '" + activeProject + "'");
         sendTelemetryResults(TelemetryService.TelemetryResult.SUCCESS);
       } catch (IOException e) {
-        NotificationUtils.notifyError("Change active project", "Could not set active project: " + e.getMessage());
+        NotificationUtils.notifyError(
+          "Change active " + kind.toLowerCase(),
+          "Could not set active " + kind.toLowerCase() + ": " + e.getMessage());
         throw new RuntimeException(e);
       }
     }

src/main/java/org/jboss/tools/intellij/openshift/actions/project/CreateProjectAction.java

@@ -42,6 +42,15 @@ public class CreateProjectAction extends LoggedInClusterAction {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(CreateProjectAction.class);
 
+  public static void execute(ApplicationsRootNode rootNode) {
+    Odo odo = rootNode.getOdo().getNow(null);
+    if (odo == null) {
+      return;
+    }
+    CreateProjectAction action = ActionUtils.createAction(CreateProjectAction.class.getName());
+    action.doActionPerformed(null, odo, rootNode.getProject());
+  }
+
   @Override
   public void update(AnActionEvent e) {
     super.update(e);
@@ -51,7 +60,7 @@ public void update(AnActionEvent e) {
         return;
       }
       // overrides label given in plugin.xml
-      e.getPresentation().setText("New " + getKind(odo));
+      e.getPresentation().setText("New " + odo.getNamespaceKind());
     }
   }
 
@@ -60,23 +69,14 @@ public String getTelemetryActionName() {
     return "create project";
   }
 
-  public static void execute(ApplicationsRootNode rootNode) {
-    Odo odo = rootNode.getOdo().getNow(null);
-    if (odo == null) {
-      return;
-    }
-    CreateProjectAction action = ActionUtils.createAction(CreateProjectAction.class.getName());
-    action.doActionPerformed(null, odo, rootNode.getProject());
-  }
-
   @Override
   public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     Point location = ActionUtils.getLocation(anActionEvent);
     doActionPerformed(location, odo, getEventProject(anActionEvent));
   }
 
   private void doActionPerformed(final Point location, @NotNull final Odo odo, Project project) {
-    String kind = getKind(odo);
+    String kind = odo.getNamespaceKind();
     runWithProgress((ProgressIndicator progress) ->
         CompletableFuture
           .supplyAsync(() -> {
@@ -113,7 +113,7 @@ private void doActionPerformed(final Point location, @NotNull final Odo odo, Pro
   }
 
   private void createProject(String newProject, @NotNull Odo odo) {
-    String kind = getKind(odo);
+    String kind = odo.getNamespaceKind();
     Notification notification = NotificationUtils.notifyInformation("Create " + kind, "Creating " + kind.toLowerCase() + " newProject");
     try {
       odo.createProject(newProject);
@@ -150,12 +150,4 @@ private boolean isLoggedIn(Object node) {
   private boolean isRoot(Object node) {
     return node instanceof ApplicationsRootNode;
   }
-
-  private String getKind(Odo odo) {
-    if (odo.isOpenShift()) {
-      return "Project";
-    } else {
-      return "Namespace";
-    }
-  }
 }

src/main/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationRootNodeOdo.java

@@ -73,6 +73,11 @@ public boolean namespaceExists(String name) {
         return delegate.namespaceExists(name);
     }
 
+    @Override
+    public String getNamespaceKind() {
+        return delegate.getNamespaceKind();
+    }
+
     @Override
     public void start(String project, String context, String component, ComponentFeature feature,
                       Consumer<Boolean> callback, Consumer<Boolean> processTerminatedCallback) throws IOException {

src/main/java/org/jboss/tools/intellij/openshift/tree/application/ChangeActiveProjectLinkNode.java

@@ -12,14 +12,26 @@
 
 import com.redhat.devtools.intellij.common.tree.LinkElement;
 import org.jboss.tools.intellij.openshift.actions.project.ChangeActiveProjectAction;
+import org.jboss.tools.intellij.openshift.utils.odo.Odo;
 
 public class ChangeActiveProjectLinkNode extends MessageNode<NamespaceNode> implements LinkElement {
+
     protected ChangeActiveProjectLinkNode(ApplicationsRootNode root, NamespaceNode parent) {
-        super(root, parent, "Missing project, <a>choose or create a different one</a>");
+        super(root, parent, getLabel(root));
     }
 
     @Override
     public void execute() {
         ChangeActiveProjectAction.execute(getParent());
     }
+
+    private static String getLabel(ApplicationsRootNode root) {
+        Odo odo = root.getOdo().getNow(null);
+        String label = "Missing %s, <a>choose or create a different one</a>";
+        if (odo == null) {
+            return String.format(label, "project/namespace");
+        } else {
+            return String.format(label, odo.getNamespaceKind().toLowerCase());
+        }
+    }
 }

src/main/java/org/jboss/tools/intellij/openshift/ui/project/ChangeActiveProjectDialog.java

@@ -92,7 +92,7 @@ protected void init() {
           .installOn(activeProjectTextField)
           .andRegisterOnDocumentListener(activeProjectTextField);
         activeProjectValidator.revalidate();
-        JLabel createProjectLabel = new JBLabel("<html>You can <a href=\"\">create a new project</a> instead.</html>");
+        JLabel createProjectLabel = new JBLabel("<html>You can <a href=\"\">create a new " + kind.toLowerCase() + "</a> instead.</html>");
         createProjectLabel.setBorder(JBUI.Borders.emptyTop(20));
         createProjectLabel.addMouseListener(onClicked());
         panel.add(createProjectLabel, "spanx");
@@ -146,9 +146,9 @@ public ValidationInfo get() {
         private ValidationInfo getValidationInfo(String project) {
             ValidationInfo validation = new ValidationInfo("").withOKEnabled();
             if (StringUtil.isEmptyOrSpaces(project)) {
-                validation = new ValidationInfo("Provide active Project").forComponent(activeProjectTextField).asWarning();
+                validation = new ValidationInfo("Provide active " + kind).forComponent(activeProjectTextField).asWarning();
             } else if (project.equals(currentProject)) {
-                validation = new ValidationInfo("Choose different Project").forComponent(activeProjectTextField).asWarning();
+                validation = new ValidationInfo("Choose different " + kind).forComponent(activeProjectTextField).asWarning();
             }
             return validation;
         }

src/main/java/org/jboss/tools/intellij/openshift/utils/odo/Odo.java

@@ -31,6 +31,8 @@ public interface Odo {
 
     boolean namespaceExists(String name);
 
+    String getNamespaceKind();
+
     void start(String project, String context, String component, ComponentFeature feature, Consumer<Boolean> callback, Consumer<Boolean> processTerminatedCallback) throws IOException;
 
     void stop(String project, String context, String component, ComponentFeature feature) throws IOException;

src/main/java/org/jboss/tools/intellij/openshift/utils/odo/OdoCli.java

@@ -327,6 +327,15 @@ public boolean namespaceExists(String name) {
         }
     }
 
+    @Override
+    public String getNamespaceKind() {
+        if (isOpenShift()) {
+            return "Project";
+        } else {
+            return "Namespace";
+        }
+    }
+
     private static String execute(@NotNull File workingDirectory, String command, Map<String, String> envs, String... args) throws IOException {
         ExecHelper.ExecResult output = ExecHelper.executeWithResult(command, true, workingDirectory, envs, args);
         try (BufferedReader reader = new BufferedReader(new StringReader(output.getStdOut()))) {