feat: validate new project name (#237)

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

Author: adietish

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

@@ -73,11 +73,11 @@ private void doActionPerformed(final ApplicationsRootNode rootNode, final Point
               throw new RuntimeException(e);
             }
           }, SwingUtils.EXECUTOR_BACKGROUND)
-          .handleAsync((ClusterProjects, error) -> {
+          .handleAsync((clusterProjects, error) -> {
               if (error != null) {
                 return null;
               }
-              ChangeActiveProjectDialog dialog = openActiveProjectDialog(ClusterProjects.isOpenShift, ClusterProjects.current, ClusterProjects.all, location, project);
+              ChangeActiveProjectDialog dialog = openActiveProjectDialog(clusterProjects.isOpenShift, clusterProjects.current, clusterProjects.all, location, project);
               if (dialog.isOK()) {
                 return new ChangeActiveProjectOperation(dialog.getActiveProject(), odo);
               } else if (dialog.isCreateNewProject()) {

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

@@ -19,11 +19,17 @@
 import org.jboss.tools.intellij.openshift.actions.ActionUtils;
 import org.jboss.tools.intellij.openshift.actions.NotificationUtils;
 import org.jboss.tools.intellij.openshift.actions.cluster.LoggedInClusterAction;
+import org.jboss.tools.intellij.openshift.telemetry.TelemetryService;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
+import org.jboss.tools.intellij.openshift.ui.SwingUtils;
+import org.jboss.tools.intellij.openshift.ui.project.CreateNewProjectDialog;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
 import org.jetbrains.annotations.NotNull;
 
+import java.awt.Point;
 import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
 import static org.jboss.tools.intellij.openshift.actions.ActionUtils.runWithProgress;
@@ -40,35 +46,69 @@ public static void execute(ApplicationsRootNode rootNode) {
       return;
     }
     CreateProjectAction action = ActionUtils.createAction(CreateProjectAction.class.getName());
-    action.doActionPerformed(rootNode, odo, rootNode.getProject());
+    action.doActionPerformed(rootNode, null, odo, rootNode.getProject());
   }
 
   @Override
   public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ApplicationsRootNode clusterNode = (ApplicationsRootNode) selected;
-    doActionPerformed(clusterNode, odo, getEventProject(anActionEvent));
+    Point location = ActionUtils.getLocation(anActionEvent);
+    doActionPerformed(clusterNode, location, odo, getEventProject(anActionEvent));
   }
 
-  private void doActionPerformed(ApplicationsRootNode clusterNode, Odo odo, Project project) {
-    String projectName = Messages.showInputDialog("Project name", "New Project", Messages.getQuestionIcon());
-    if ((projectName == null) || projectName.trim().isEmpty()) {
-      sendTelemetryResults(TelemetryResult.ABORTED);
-      return;
-    }
-    runWithProgress((ProgressIndicator progress) -> {
+  private void doActionPerformed(final ApplicationsRootNode clusterNode, final Point location, final Odo odo, Project project) {
+    runWithProgress((ProgressIndicator progress) ->
+        CompletableFuture
+          .supplyAsync(() -> {
+            try {
+              return odo.getNamespaces();
+            } catch (IOException e) {
+              NotificationUtils.notifyError("Create New Project", "Could not get projects: " + e.getMessage());
+              sendTelemetryError(e.getMessage());
+              throw new RuntimeException(e);
+            }
+          }, SwingUtils.EXECUTOR_BACKGROUND)
+          .handleAsync((allProjects, error) -> {
+              if (error != null) {
+                return null;
+              }
+              CreateNewProjectDialog dialog = openCreateProjectDialog(allProjects, location, project);
+              if (dialog.isOK()) {
+                return dialog.getNewProject();
+              } else {
+                sendTelemetryResults(TelemetryService.TelemetryResult.ABORTED);
+                return null;
+              }
+            }
+            , SwingUtils.EXECUTOR_UI)
+          .whenCompleteAsync((newProject, error) -> {
+            if (error != null
+              || newProject == null) {
+              return;
+            }
+            createProject(newProject, odo);
+          }, SwingUtils.EXECUTOR_BACKGROUND),
+      "Create Active Project...",
+    project);
+  }
+
+  private void createProject(String newProject, Odo odo) {
       try {
-        Notification notif = NotificationUtils.notifyInformation("Create Project", "Creating project " + projectName);
-        odo.createProject(projectName);
+        Notification notif = NotificationUtils.notifyInformation("Create Project", "Creating project " + newProject);
+        odo.createProject(newProject);
         notif.expire();
-        NotificationUtils.notifyInformation("Create Project", "Project " + projectName + " successfully created");
-        clusterNode.getStructure().fireModified(clusterNode);
+        NotificationUtils.notifyInformation("Create Project", "Project " + newProject + " successfully created");
         sendTelemetryResults(TelemetryResult.SUCCESS);
       } catch (IOException | CompletionException e) {
         sendTelemetryError(e);
         UIHelper.executeInUI(() -> Messages.showErrorDialog("Error: " + e.getLocalizedMessage(), "Create Project"));
       }
-    },
-    "Create Project...",
-    project);
   }
+
+  private CreateNewProjectDialog openCreateProjectDialog(List<String> allProjects, Point location, Project project) {
+    CreateNewProjectDialog dialog = new CreateNewProjectDialog(project, allProjects, location);
+    dialog.show();
+    return dialog;
+  }
+
 }

src/main/java/org/jboss/tools/intellij/openshift/ui/SwingUtils.java

@@ -38,6 +38,8 @@
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.MouseInfo;
+import java.awt.Point;
 import java.util.concurrent.Executor;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -140,4 +142,11 @@ public static void setMovable(JRootPane rootPane, JComponent... movableComponent
       component -> component.addMouseListener(windowMoveListener));
   }
 
+  public static Point locationOrMouseLocation(Point location) {
+    if (location == null) {
+      location = MouseInfo.getPointerInfo().getLocation();
+    }
+    return location;
+  }
+
 }

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

@@ -37,7 +37,6 @@
 import javax.swing.JRootPane;
 import javax.swing.RootPaneContainer;
 import javax.swing.SwingConstants;
-import java.awt.MouseInfo;
 import java.awt.Point;
 import java.awt.Window;
 import java.awt.event.MouseAdapter;
@@ -46,6 +45,8 @@
 import java.util.Collection;
 import java.util.function.Supplier;
 
+import static org.jboss.tools.intellij.openshift.ui.SwingUtils.locationOrMouseLocation;
+
 public class ChangeActiveProjectDialog extends DialogWrapper {
 
     private static final String WIDTH = "300";
@@ -89,10 +90,7 @@ protected void init() {
 
     @Override
     public void setLocation(Point location) {
-        if (location == null) {
-            location = MouseInfo.getPointerInfo().getLocation();
-        }
-        super.setLocation(location);
+        super.setLocation(locationOrMouseLocation(location));
     }
 
     private void registerShortcuts(JRootPane rootPane) {

src/main/java/org/jboss/tools/intellij/openshift/ui/project/CreateActiveProjectDialog.java renamed to src/main/java/org/jboss/tools/intellij/openshift/ui/project/CreateNewProjectDialog.java

@@ -21,13 +21,10 @@
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.PopupBorder;
-import com.intellij.ui.TextFieldWithAutoCompletion;
-import com.intellij.ui.TextFieldWithAutoCompletionListProvider;
 import com.intellij.ui.components.JBLabel;
-import com.intellij.util.textCompletion.TextFieldWithCompletion;
+import com.intellij.ui.components.JBTextField;
 import com.intellij.util.ui.JBUI;
 import net.miginfocom.swing.MigLayout;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.JComponent;
@@ -36,39 +33,29 @@
 import javax.swing.JRootPane;
 import javax.swing.RootPaneContainer;
 import javax.swing.SwingConstants;
-import java.awt.MouseInfo;
 import java.awt.Point;
 import java.awt.Window;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.util.Collection;
 import java.util.function.Supplier;
 
-public class CreateActiveProjectDialog extends DialogWrapper {
+import static org.jboss.tools.intellij.openshift.ui.SwingUtils.locationOrMouseLocation;
+
+public class CreateNewProjectDialog extends DialogWrapper {
 
     private static final String WIDTH = "300";
-    private final Project project;
-    private final String kind;
-    private final String currentProject;
     private final Collection<String> allProjects;
     private final Point location;
-    private TextFieldWithCompletion activeProjectTextField;
-
-    private String activeProject;
+    private final Project project;
+    private JBTextField newProjectTextField;
 
-    private boolean createNewProject;
+    private String newProject;
 
-    public CreateActiveProjectDialog(
+    public CreateNewProjectDialog(
       @Nullable Project project,
-      String kind,
-      String currentProject,
       Collection<String> allProjects,
       Point location) {
         super(project, false);
         this.project = project;
-        this.kind = kind;
-        this.currentProject = currentProject;
         this.allProjects = allProjects;
         this.location = location;
         init();
@@ -83,15 +70,12 @@ protected void init() {
         setOKButtonText("Create");
         setBorders(rootPane);
         setLocation(location);
-        setTitle("Create Active " + kind);
+        setTitle("Create New Project");
     }
 
     @Override
     public void setLocation(Point location) {
-        if (location == null) {
-            location = MouseInfo.getPointerInfo().getLocation();
-        }
-        super.setLocation(location);
+        super.setLocation(locationOrMouseLocation(location));
     }
 
     private void registerShortcuts(JRootPane rootPane) {
@@ -113,44 +97,20 @@ private void setBorders(JRootPane rootPane) {
         JComponent panel = new JPanel(new MigLayout(
           "flowx, ins 0, gap 0, fillx, filly, hidemode 3",
           "[left]10[" + WIDTH +",fill]"));
-        JLabel newActiveProjectLabel = new JBLabel("Create Active " + kind + ":", SwingConstants.LEFT);
+        JLabel newActiveProjectLabel = new JBLabel("New project:", SwingConstants.LEFT);
         newActiveProjectLabel.setBorder(JBUI.Borders.empty(10, 0));
         panel.add(newActiveProjectLabel, "left, bottom");
-        this.activeProjectTextField = new TextFieldWithAutoCompletion<>(
-          project, onLookup(allProjects), false, true, null);
-        activeProjectTextField.selectAll();
-        panel.add(activeProjectTextField, "pushx, growx, wrap");
+        this.newProjectTextField = new JBTextField();
+        newProjectTextField.selectAll();
+        panel.add(newProjectTextField, "pushx, growx, wrap");
         ComponentValidator activeProjectValidator = new ComponentValidator(myDisposable)
           .withValidator(new ActiveProjectValidator())
-          .installOn(activeProjectTextField)
-          .andRegisterOnDocumentListener(activeProjectTextField);
+          .installOn(newProjectTextField)
+          .andRegisterOnDocumentListener(newProjectTextField);
         activeProjectValidator.revalidate();
-        JLabel createProjectLabel = new JBLabel("<html>You can <a href=\"\">create a new project</a> instead.</html>");
-        createProjectLabel.setBorder(JBUI.Borders.emptyTop(20));
-        createProjectLabel.addMouseListener(onClicked());
-        panel.add(createProjectLabel, "spanx");
         return panel;
     }
 
-    private MouseListener onClicked() {
-        return new MouseAdapter() {
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                CreateActiveProjectDialog.this.createNewProject = true;
-                closeImmediately();
-            }
-        };
-    }
-
-    private TextFieldWithAutoCompletionListProvider<String> onLookup(Collection<String> projects) {
-        return new TextFieldWithAutoCompletionListProvider<>(projects) {
-            public @NotNull String getLookupString(@NotNull String item) {
-                return item;
-            }
-        };
-    }
-
     private void closeImmediately() {
         if (isVisible()) {
             doCancelAction();
@@ -160,34 +120,30 @@ private void closeImmediately() {
     @Override
     protected void doOKAction() {
         super.doOKAction();
-        this.activeProject = activeProjectTextField.getText();
-    }
-
-    public String getActiveProject() {
-        return activeProject;
+        this.newProject = newProjectTextField.getText();
     }
 
-    public boolean isCreateNewProject() {
-        return createNewProject;
+    public String getNewProject() {
+        return newProject;
     }
 
     private class ActiveProjectValidator implements Supplier<ValidationInfo> {
 
         @Override
         public ValidationInfo get() {
-            String activeProject = activeProjectTextField.getText();
+            String activeProject = newProjectTextField.getText();
             ValidationInfo validation = getValidationInfo(activeProject);
             // update OK button
             setOKActionEnabled(validation.okEnabled);
             return validation;
         }
 
-        private ValidationInfo getValidationInfo(String project) {
+        private ValidationInfo getValidationInfo(String newProject) {
             ValidationInfo validation = new ValidationInfo("").withOKEnabled();
-            if (StringUtil.isEmptyOrSpaces(project)) {
-                validation = new ValidationInfo("Provide active Project").forComponent(activeProjectTextField).asWarning();
-            } else if (project.equals(currentProject)) {
-                validation = new ValidationInfo("Choose different Project").forComponent(activeProjectTextField).asWarning();
+            if (StringUtil.isEmptyOrSpaces(newProject)) {
+                validation = new ValidationInfo("Provide project name").forComponent(newProjectTextField).asWarning();
+            } else if (allProjects.contains(newProject)) {
+                validation = new ValidationInfo("Already exists, choose new name").forComponent(newProjectTextField).asWarning();
             }
             return validation;
         }