pushing some cleanup relevant to #428

pattern-lab · Aug 16, 2016 · cfee9ff · cfee9ff
1 parent 25bbea0
commit cfee9ff
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/core/lib/pattern_assembler.js b/core/lib/pattern_assembler.js
@@ -219,7 +219,7 @@ var pattern_assembler = function () {
           subTypePattern.isPattern = false;
           subTypePattern.engine = null;
 
-          addSubtypePattern(subTypePattern, patternlab)
+          addSubtypePattern(subTypePattern, patternlab);
           return subTypePattern;
         }
       } catch (err) {
@@ -410,21 +410,30 @@ var pattern_assembler = function () {
   }
 
   function parseDataLinksHelper(patternlab, obj, key) {
-    var linkRE, dataObjAsString, linkMatches, expandedLink;
+    var linkRE, dataObjAsString, linkMatches;
 
     linkRE = /link\.[A-z0-9-_]+/g;
     dataObjAsString = JSON5.stringify(obj);
     linkMatches = dataObjAsString.match(linkRE);
 
     if (linkMatches) {
       for (var i = 0; i < linkMatches.length; i++) {
-        expandedLink = encodeURI(patternlab.data.link[linkMatches[i].split('.')[1]]);
-        if (expandedLink) {
-          expandedLink = expandedLink.replace('\\', '/');
-          if (patternlab.config.debug) {
-            console.log('expanded data link from ' + linkMatches[i] + ' to ' + expandedLink + ' inside ' + key);
+        var dataLink = linkMatches[i];
+        if (dataLink && dataLink.split('.').length >= 2) {
+          var linkPatternPartial = dataLink.split('.')[1];
+          var pattern = getPartial(linkPatternPartial, patternlab);
+          if (pattern !== undefined) {
+            var fullLink = patternlab.data.link[linkPatternPartial];
+            if (fullLink) {
+              fullLink = path.normalize(fullLink).replace(/\\/g, '/');
+              if (patternlab.config.debug) {
+                console.log('expanded data link from ' + dataLink + ' to ' + fullLink + ' inside ' + key);
+              }
+              dataObjAsString = dataObjAsString.replace(dataLink, fullLink);
+            }
+          } else {
+            console.log('pattern not found for', dataLink, 'inside', key);
           }
-          dataObjAsString = dataObjAsString.replace(linkMatches[i], expandedLink);
         }
       }
     }
@@ -449,7 +458,7 @@ var pattern_assembler = function () {
 
     //loop through all patterns
     for (var i = 0; i < patternlab.patterns.length; i++) {
-      patternlab.patterns[i].jsonFileData = parseDataLinksHelper(patternlab, patternlab.patterns[i].jsonFileData, patternlab.patterns[i].partial);
+      patternlab.patterns[i].jsonFileData = parseDataLinksHelper(patternlab, patternlab.patterns[i].jsonFileData, patternlab.patterns[i].patternPartial);
     }
   }
 

diff --git a/core/lib/ui_builder.js b/core/lib/ui_builder.js
@@ -240,12 +240,19 @@ var ui_builder = function () {
    * @returns {{patternPartial: string, patternName: (*|string), patternState: string, patternSrcPath: string, patternPath: string}}
      */
   function createPatternSubTypeItem(pattern) {
+    var patternPath = '';
+    if (pattern.isFlatPattern) {
+      patternPath = pattern.flatPatternPath + '-' + pattern.fileName + '/' + pattern.flatPatternPath + '-' + pattern.fileName + '.html';
+    } else {
+      patternPath = pattern.flatPatternPath + '/' + pattern.flatPatternPath + '.html';
+    }
+
     return {
       patternPartial: pattern.patternPartial,
       patternName: pattern.patternName,
       patternState: pattern.patternState,
-      patternSrcPath: encodeURI(pattern.subdir + pattern.filename),
-      patternPath: encodeURI(pattern.flatPatternPath + '/' + pattern.flatPatternPath + '.html')
+      patternSrcPath: encodeURI(pattern.subdir + '/' + pattern.fileName),
+      patternPath: patternPath
     }
   }
 
@@ -299,7 +306,6 @@ var ui_builder = function () {
         patternType.patternItems.push({
           patternPartial: 'viewall-' + pattern.patternGroup + '-all',
           patternName: 'View All',
-          patternSrcPath: encodeURI(pattern.patternType + '/index.html'),
           patternPath: encodeURI(pattern.patternType + '/index.html')
         });
       }