@mjhls/mjh-framework 1.0.273 → 1.0.275

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.273
+# mjh-framework v. 1.0.275
 
 > Foundation Framework
 

package/dist/cjs/index.js

@@ -2016,8 +2016,7 @@ var EventsDeck = function EventsDeck(_ref) {
       Row,
       null,
       data && data.map(function (row, index) {
-        var title = row.title,
-            description = row.description,
+        var description = row.description,
             start = row.start,
             venues = row.venues,
             _links = row._links,
@@ -2025,6 +2024,21 @@ var EventsDeck = function EventsDeck(_ref) {
             timezone = row.timezone,
             closeAfter = row.closeAfter;
 
+        var discussionTopic = row.customFields.reduce(function (result, item) {
+          if (item.name === 'Discussion Topic' && item.value) {
+            result = item.value[0];
+            return result;
+          }
+          return result;
+        }, '');
+        var eventRegion = row.customFields.reduce(function (result, item) {
+          if (item.name === 'Event Region' && item.value) {
+            result = item.value[0];
+            return result;
+          }
+          return result;
+        }, '');
+
         var pageNumber = row.pageNumber || 1;
         return React__default.createElement(
           React__default.Fragment,
@@ -2050,7 +2064,7 @@ var EventsDeck = function EventsDeck(_ref) {
                     React__default.createElement(
                       'h5',
                       null,
-                      venues[0].name
+                      eventRegion
                     ),
                     React__default.createElement(
                       'p',
@@ -2067,7 +2081,7 @@ var EventsDeck = function EventsDeck(_ref) {
                 React__default.createElement(
                   Col,
                   { xs: 12, sm: 5 },
-                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: title } }),
+                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: discussionTopic } }),
                   virtual && React__default.createElement(
                     'h5',
                     null,
@@ -2140,6 +2154,8 @@ var EventsDeck = function EventsDeck(_ref) {
     );
   }
 
+  // console.log(data.length > 0 && data[0].customFields.find((item) => item.name === 'Discussion Topic').value[0])
+
   if (data.length > 0) {
     return React__default.createElement(
       'div',
@@ -15231,6 +15247,7 @@ var Article = function Article(props) {
       articleBody = _props$article.body,
       summary = _props$article.summary,
       thumbnail = _props$article.thumbnail,
+      content_placement = _props$article.content_placement,
       _props$article$url = _props$article.url;
   _props$article$url = _props$article$url === undefined ? {
     current: ''
@@ -15312,6 +15329,27 @@ var Article = function Article(props) {
               twitterSiteName: twitterSiteName
             })
           ),
+          content_placement && content_placement.length > 0 && React__default.createElement(
+            Dropdown,
+            { style: { marginBottom: '1rem' } },
+            React__default.createElement(
+              Dropdown.Toggle,
+              { variant: 'primary', id: 'partner-dropdown' },
+              'Relevant Topics'
+            ),
+            React__default.createElement(
+              Dropdown.Menu,
+              null,
+              content_placement.length > 0 ? content_placement.map(function (cp, index) {
+                var href = '/' + cp.path;
+                return React__default.createElement(
+                  Dropdown.Item,
+                  { key: index, href: href },
+                  cp.name
+                );
+              }) : null
+            )
+          ),
           React__default.createElement(
             'p',
             null,
@@ -15501,7 +15539,12 @@ var _initialiseProps = function _initialiseProps() {
         regionalPages = _props2.regionalPages,
         nationalPage = _props2.nationalPage;
 
-    return regionalPages.includes(url) || nationalPage === url;
+    if (regionalPages || nationalPage) {
+
+      return regionalPages.includes(url) || nationalPage === url;
+    } else {
+      return false;
+    }
   };
 
   this.urlFor = function (source) {

package/dist/esm/index.js

@@ -2014,8 +2014,7 @@ var EventsDeck = function EventsDeck(_ref) {
       Row,
       null,
       data && data.map(function (row, index) {
-        var title = row.title,
-            description = row.description,
+        var description = row.description,
             start = row.start,
             venues = row.venues,
             _links = row._links,
@@ -2023,6 +2022,21 @@ var EventsDeck = function EventsDeck(_ref) {
             timezone = row.timezone,
             closeAfter = row.closeAfter;
 
+        var discussionTopic = row.customFields.reduce(function (result, item) {
+          if (item.name === 'Discussion Topic' && item.value) {
+            result = item.value[0];
+            return result;
+          }
+          return result;
+        }, '');
+        var eventRegion = row.customFields.reduce(function (result, item) {
+          if (item.name === 'Event Region' && item.value) {
+            result = item.value[0];
+            return result;
+          }
+          return result;
+        }, '');
+
         var pageNumber = row.pageNumber || 1;
         return React__default.createElement(
           React__default.Fragment,
@@ -2048,7 +2062,7 @@ var EventsDeck = function EventsDeck(_ref) {
                     React__default.createElement(
                       'h5',
                       null,
-                      venues[0].name
+                      eventRegion
                     ),
                     React__default.createElement(
                       'p',
@@ -2065,7 +2079,7 @@ var EventsDeck = function EventsDeck(_ref) {
                 React__default.createElement(
                   Col,
                   { xs: 12, sm: 5 },
-                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: title } }),
+                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: discussionTopic } }),
                   virtual && React__default.createElement(
                     'h5',
                     null,
@@ -2138,6 +2152,8 @@ var EventsDeck = function EventsDeck(_ref) {
     );
   }
 
+  // console.log(data.length > 0 && data[0].customFields.find((item) => item.name === 'Discussion Topic').value[0])
+
   if (data.length > 0) {
     return React__default.createElement(
       'div',
@@ -15229,6 +15245,7 @@ var Article = function Article(props) {
       articleBody = _props$article.body,
       summary = _props$article.summary,
       thumbnail = _props$article.thumbnail,
+      content_placement = _props$article.content_placement,
       _props$article$url = _props$article.url;
   _props$article$url = _props$article$url === undefined ? {
     current: ''
@@ -15310,6 +15327,27 @@ var Article = function Article(props) {
               twitterSiteName: twitterSiteName
             })
           ),
+          content_placement && content_placement.length > 0 && React__default.createElement(
+            Dropdown,
+            { style: { marginBottom: '1rem' } },
+            React__default.createElement(
+              Dropdown.Toggle,
+              { variant: 'primary', id: 'partner-dropdown' },
+              'Relevant Topics'
+            ),
+            React__default.createElement(
+              Dropdown.Menu,
+              null,
+              content_placement.length > 0 ? content_placement.map(function (cp, index) {
+                var href = '/' + cp.path;
+                return React__default.createElement(
+                  Dropdown.Item,
+                  { key: index, href: href },
+                  cp.name
+                );
+              }) : null
+            )
+          ),
           React__default.createElement(
             'p',
             null,
@@ -15499,7 +15537,12 @@ var _initialiseProps = function _initialiseProps() {
         regionalPages = _props2.regionalPages,
         nationalPage = _props2.nationalPage;
 
-    return regionalPages.includes(url) || nationalPage === url;
+    if (regionalPages || nationalPage) {
+
+      return regionalPages.includes(url) || nationalPage === url;
+    } else {
+      return false;
+    }
   };
 
   this.urlFor = function (source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.273",
+  "version": "1.0.275",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",