Merge branch 'hotfix/20181102-03'

johnsusek · Nov 2, 2018 · fd0d9d6 · fd0d9d6
2 parents f8e95ef + b6afa23
commit fd0d9d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/store/config/index.js b/src/store/config/index.js
@@ -535,16 +535,16 @@ export default {
         ...getters.queryString
       };
 
-      let dots = '';
-
-      for (let i = 0; i < state.path.split('/').length; i++) {
-        dots += '../';
-      }
-
       if (forTest) {
         // when run as part of a test, fix path since rule will be in server_data/tests/
         config.import = '../../rules/BaseRule.config';
       } else {
+        let dots = '';
+
+        for (let i = 1; i < state.path.split('/').length; i++) {
+          dots += '../';
+        }
+
         config.import = `${dots}BaseRule.config`;
       }
 

diff --git a/src/store/configs.js b/src/store/configs.js
@@ -135,10 +135,20 @@ export default {
       let newConfig = cloneDeep(oldConfig);
 
       // If there is a new path (i.e. in a subfolder), add that to the full pathname
-      newConfig.__praeco_full_path = `${newPath ? `${newPath}/` : ''}${newConfig.name}`;
+      newConfig.__praeco_full_path = `${newPath}${newConfig.name}`;
 
       if (oldConfig.__praeco_full_path === newConfig.__praeco_full_path) return;
 
+      if (type === 'rules') {
+        let dots = '';
+
+        for (let i = 1; i < newConfig.__praeco_full_path.split('/').length; i++) {
+          dots += '../';
+        }
+
+        newConfig.import = `${dots}BaseRule.config`;
+      }
+
       try {
         // Create the config at the full path
         let res = await dispatch('createConfig', { config: newConfig, type });