Merge pull request #3 from iMi-digital/fix/relative-to-absolute-file-…

…path-conversion fix: early return if path is already absolute
elgentos · Mar 25, 2022 · 2c7fe08 · 2c7fe08
2 parents d9d7a45 + 1c702c0
commit 2c7fe08
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/components/OverrideSelector.vue b/src/components/OverrideSelector.vue
@@ -215,8 +215,8 @@ export default {
       }
 
       this.methodName = methodName;
-      this.copyPasteableFilePath = customFilePath.replace("data/", "");
-      customFilePath = this.fixPath(customFilePath);
+      this.copyPasteableFilePath = this.getRelativePath(customFilePath);
+      customFilePath = this.getAbsolutePath(customFilePath);
       this.customFileType = customFilePath.split(".").pop();
       if (this.customFileType === "phtml") {
         this.customFileType = "php";
@@ -241,12 +241,15 @@ export default {
       //
       // }, 100);
     },
-    fixPath(path) {
-      if (path.indexOf("/data/") > -1) {
-        path = path.split("magento2/")[1];
+    getAbsolutePath(path) {
+      if (path.indexOf(this.selectedMagento2ProjectDir) > -1) {
+        return path;
       }
       return this.selectedMagento2ProjectDir + "/" + path;
     },
+    getRelativePath(path) {
+      return path.replace(this.selectedMagento2ProjectDir + "/", "");
+    },
   },
 };
 </script>