@mjhls/mjh-framework 1.0.642-multi-doc-group → 1.0.642-multi-doc-group-v2

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.642-multi-doc-group
+# mjh-framework v. 1.0.642-multi-doc-group-v2
 
 > Foundation Framework 
 

package/dist/cjs/View.js

@@ -405,6 +405,24 @@ var Article = function Article(props) {
     return null;
   };
 
+  var getDocGroupUrl = function getDocGroupUrl(docGroup) {
+    if (!docGroup || !docGroup.path) {
+      return null;
+    }
+
+    var url = docGroup.path;
+    if (url.includes('/') || !docGroup.parent) {
+      return '/' + url;
+    }
+
+    var parent_url = docGroup.parent && docGroup.parent.identifier && docGroup.parent.identifier.current;
+    if (!parent_url) {
+      return '/' + url;
+    }
+
+    return '/' + parent_url + '/' + url;
+  };
+
   var RelevantTopics = function RelevantTopics() {
     if (content_placement && content_placement.length > 0 || documentGroupMapping) {
       return React__default.createElement(
@@ -420,7 +438,8 @@ var Article = function Article(props) {
           )
         ),
         documentGroupMapping && documentGroupMapping.length > 0 && documentGroupMapping.map(function (map, map_index) {
-          var map_href = (cpModificationRequired ? map.parent && '/' + (map.parent.identifier && map.parent.identifier.current) : '') + '/' + map.path;
+          var map_href = getDocGroupUrl(map);
+          console.log('map_index:', map_index);
           return React__default.createElement(
             React__default.Fragment,
             null,
@@ -437,10 +456,10 @@ var Article = function Article(props) {
                 map.name
               )
             ),
-            map.index < documentGroupMapping.length && ' | '
+            map_index + 1 < documentGroupMapping.length && ' | '
           );
         }),
-        content_placement && content_placement.length > 0 && ' | ',
+        documentGroupMapping && documentGroupMapping.length > 0 && content_placement && content_placement.length > 0 && ' | ',
         content_placement && content_placement.length > 0 ? content_placement.map(function (cp, index) {
           var cp_url = cpModificationRequired ? getTargeting.getContentPlacementUrl(cp) : cp.path;
           var href = '/' + cp_url;

package/dist/esm/View.js

@@ -399,6 +399,24 @@ var Article = function Article(props) {
     return null;
   };
 
+  var getDocGroupUrl = function getDocGroupUrl(docGroup) {
+    if (!docGroup || !docGroup.path) {
+      return null;
+    }
+
+    var url = docGroup.path;
+    if (url.includes('/') || !docGroup.parent) {
+      return '/' + url;
+    }
+
+    var parent_url = docGroup.parent && docGroup.parent.identifier && docGroup.parent.identifier.current;
+    if (!parent_url) {
+      return '/' + url;
+    }
+
+    return '/' + parent_url + '/' + url;
+  };
+
   var RelevantTopics = function RelevantTopics() {
     if (content_placement && content_placement.length > 0 || documentGroupMapping) {
       return React__default.createElement(
@@ -414,7 +432,8 @@ var Article = function Article(props) {
           )
         ),
         documentGroupMapping && documentGroupMapping.length > 0 && documentGroupMapping.map(function (map, map_index) {
-          var map_href = (cpModificationRequired ? map.parent && '/' + (map.parent.identifier && map.parent.identifier.current) : '') + '/' + map.path;
+          var map_href = getDocGroupUrl(map);
+          console.log('map_index:', map_index);
           return React__default.createElement(
             React__default.Fragment,
             null,
@@ -431,10 +450,10 @@ var Article = function Article(props) {
                 map.name
               )
             ),
-            map.index < documentGroupMapping.length && ' | '
+            map_index + 1 < documentGroupMapping.length && ' | '
           );
         }),
-        content_placement && content_placement.length > 0 && ' | ',
+        documentGroupMapping && documentGroupMapping.length > 0 && content_placement && content_placement.length > 0 && ' | ',
         content_placement && content_placement.length > 0 ? content_placement.map(function (cp, index) {
           var cp_url = cpModificationRequired ? getContentPlacementUrl(cp) : cp.path;
           var href = '/' + cp_url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.642-multi-doc-group",
+  "version": "1.0.642-multi-doc-group-v2",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",