Additional enhancements, bug fixes

Author: bohdan-harniuk

src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java

@@ -239,7 +239,10 @@ private void lookupUctExecutablePath(
             uctExecutablePath = storedUctExecutable;
             return;
         }
-        final VirtualFile uctExecutableVf = UctModuleLocatorUtil.locateUctExecutable(project);
+        final VirtualFile uctExecutableVf = UctModuleLocatorUtil.locateUctExecutable(
+                project,
+                uctRunConfiguration.getProjectRoot()
+        );
 
         if (uctExecutableVf == null) {
             warningPanel.setVisible(true);
@@ -264,7 +267,11 @@ private String getStoredUctExecutablePath(
         if (!uctRunConfiguration.getScriptName().isEmpty()) {
             uctExecutablePath = uctRunConfiguration.getScriptName();
 
-            return uctExecutablePath;
+            if (UctExecutableValidatorUtil.validate(uctExecutablePath)) {
+                return uctExecutablePath;
+            } else {
+                uctRunConfiguration.setScriptName("");
+            }
         }
         if (!uctRunConfiguration.isNewlyCreated()) {
             return null;

src/com/magento/idea/magento2uct/execution/output/ReportBuilder.java

@@ -28,6 +28,8 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
+
 import org.jetbrains.annotations.NotNull;
 import org.json.simple.JSONObject;
 
@@ -39,7 +41,10 @@ public class ReportBuilder {
 
     private final Project project;
     private final Report report;
-    private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHms");
+    private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(
+            "dd_MMM_yyyy_HH:mm:ss",
+            Locale.US
+    );
 
     /**
      * Report builder.

src/com/magento/idea/magento2uct/util/module/UctModuleLocatorUtil.java

@@ -27,14 +27,18 @@ private UctModuleLocatorUtil() {
     }
 
     /**
-     * Find UCT executable for the specified project.
+     * Find UCT executable for the specified magento 2 project path.
      *
      * @param project Project
+     * @param projectRoot String
      *
      * @return VirtualFile
      */
-    public static @Nullable VirtualFile locateUctExecutable(final @NotNull Project project) {
-        final PsiDirectory uctModuleDir = locateModule(project);
+    public static @Nullable VirtualFile locateUctExecutable(
+            final @NotNull Project project,
+            final @NotNull String projectRoot
+    ) {
+        final PsiDirectory uctModuleDir = locateModule(project, projectRoot);
 
         if (uctModuleDir == null) {
             return null;
@@ -54,6 +58,7 @@ private UctModuleLocatorUtil() {
      * Find UCT module base directory.
      *
      * @param project Project
+     * @param projectRoot String
      *
      * @return PsiDirectory
      */
@@ -63,24 +68,27 @@ private UctModuleLocatorUtil() {
             "PMD.CyclomaticComplexity",
             "PMD.AvoidDeeplyNestedIfStmts"
     })
-    public static @Nullable PsiDirectory locateModule(final @NotNull Project project) {
-        final String projectBasePath = project.getBasePath();
-
-        if (projectBasePath == null) {
+    public static @Nullable PsiDirectory locateModule(
+            final @NotNull Project project,
+            final @NotNull String projectRoot
+    ) {
+        if (projectRoot.isEmpty()) {
             return null;
         }
-        final VirtualFile projectBaseVf = VfsUtil.findFile(Path.of(projectBasePath), false);
+        final VirtualFile magentoProjectBaseVf = VfsUtil.findFile(Path.of(projectRoot), false);
 
-        if (projectBaseVf == null) {
+        if (magentoProjectBaseVf == null) {
             return null;
         }
         final PsiManager psiManager = PsiManager.getInstance(project);
-        final PsiDirectory projectBaseDir = psiManager.findDirectory(projectBaseVf);
+        final PsiDirectory magentoProjectBaseDir = psiManager.findDirectory(magentoProjectBaseVf);
 
-        if (projectBaseDir == null) {
+        if (magentoProjectBaseDir == null) {
             return null;
         }
-        final PsiFile composerConfigurationFile = projectBaseDir.findFile(ComposerJson.FILE_NAME);
+        final PsiFile composerConfigurationFile = magentoProjectBaseDir.findFile(
+                ComposerJson.FILE_NAME
+        );
 
         if (composerConfigurationFile instanceof JsonFile) {
             final boolean hasUctAsProjectDependency = composerConfigurationFile
@@ -89,15 +97,15 @@ private UctModuleLocatorUtil() {
 
             if (hasUctAsProjectDependency) {
                 PsiDirectory uctBaseDir = findSubdirectoryByPath(
-                        projectBaseDir,
+                        magentoProjectBaseDir,
                         "vendor".concat(File.separator)
                                 .concat("magento")
                                 .concat(File.separator)
                                 .concat("module-upgrade-compatibility-tool")
                 );
                 if (uctBaseDir == null) {
                     uctBaseDir = findSubdirectoryByPath(
-                            projectBaseDir,
+                            magentoProjectBaseDir,
                             "app".concat(File.separator)
                                     .concat("code")
                                     .concat(File.separator)
@@ -110,6 +118,21 @@ private UctModuleLocatorUtil() {
                     return uctBaseDir;
                 }
             }
+            final String projectBasePath = project.getBasePath();
+
+            if (projectBasePath == null) {
+                return null;
+            }
+            final VirtualFile projectBaseVf = VfsUtil.findFile(Path.of(projectBasePath), false);
+
+            if (projectBaseVf == null) {
+                return null;
+            }
+            final PsiDirectory projectBaseDir = psiManager.findDirectory(projectBaseVf);
+
+            if (projectBaseDir == null) {
+                return null;
+            }
 
             for (final PsiDirectory subDir : projectBaseDir.getSubdirectories()) {
                 final PsiFile composerFile = subDir.findFile(ComposerJson.FILE_NAME);