@mjhls/mjh-framework 1.0.704 → 1.0.705

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.703
+# mjh-framework v. 1.0.705
 
 > Foundation Framework 
 

package/dist/cjs/PublicationLanding.js

@@ -415,36 +415,86 @@ Publication.getInitialProps = async (ctx) => {
 export default Publication
 */
 
+var generateContentPlacements = function generateContentPlacements(issues) {
+  var contentPlacements = [];
+  issues && issues.length > 0 && issues.forEach(function (issue) {
+    if (issue.taxonomyMapping && issue.taxonomyMapping.length > 0) {
+      issue.taxonomyMapping && issue.taxonomyMapping.forEach(function (tm) {
+        if (!contentPlacements.find(function (cp) {
+          return cp.identifier === tm.identifier;
+        })) {
+          contentPlacements.push({ _id: tm._id, name: tm.name, identifier: tm.identifier });
+        }
+      });
+    }
+  });
+  return contentPlacements;
+};
+
 var PublicationLanding = function PublicationLanding(props) {
   var publication = props.publication,
-      year = props.year,
+      _props$year = props.year,
+      year = _props$year === undefined ? '' : _props$year,
       href = props.href;
       props.pdf;
+      var _props$contentPlaceme = props.contentPlacement,
+      contentPlacement = _props$contentPlaceme === undefined ? '' : _props$contentPlaceme;
 
 
   var router = Router.useRouter();
   var years = [].concat(toConsumableArray._toConsumableArray(new _Set(publication.issues.map(function (issue) {
     return issue.year;
   })))).sort().reverse();
+  var contentPlacements = generateContentPlacements(publication.issues);
 
   var _useState = React.useState(publication.issues),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       issueData = _useState2[0],
       setIssueData = _useState2[1];
 
-  var _useState3 = React.useState(year ? year : years[0]),
+  var _useState3 = React.useState(year),
       _useState4 = slicedToArray._slicedToArray(_useState3, 2),
       activeYear = _useState4[0],
       setActiveYear = _useState4[1];
 
+  var _useState5 = React.useState(contentPlacement),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      activeContentPlacement = _useState6[0],
+      setActiveContentPlacement = _useState6[1];
+
   React.useEffect(function () {
-    router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear, { shallow: true });
-    setIssueData(function () {
-      return publication.issues.filter(function (issue) {
-        return issue.year === activeYear;
+    if (activeYear && activeContentPlacement) {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear + '&cp=' + activeContentPlacement, { shallow: true });
+      setIssueData(function () {
+        return publication.issues.filter(function (issue) {
+          return issue.year === activeYear;
+        }).filter(function (issue) {
+          return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
+            return tm.identifier === activeContentPlacement;
+          });
+        });
       });
-    });
-  }, [activeYear]);
+    } else if (activeYear) {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear, { shallow: true });
+      setIssueData(function () {
+        return publication.issues.filter(function (issue) {
+          return issue.year === activeYear;
+        });
+      });
+    } else if (activeContentPlacement) {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?cp=' + activeContentPlacement, { shallow: true });
+      setIssueData(function () {
+        return publication.issues.filter(function (issue) {
+          return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
+            return tm.identifier === activeContentPlacement;
+          });
+        });
+      });
+    } else {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current, { shallow: true });
+      setIssueData(publication.issues);
+    }
+  }, [activeYear, activeContentPlacement]);
 
   return React__default['default'].createElement(
     'div',
@@ -452,25 +502,28 @@ var PublicationLanding = function PublicationLanding(props) {
     React__default['default'].createElement(
       'style',
       { jsx: true },
-      '\n          #pubYearFilter .dropdown-menu.show {\n            max-height: 25vh;\n          }\n        '
+      '\n          #pubYearFilter .dropdown-menu.show,\n          #contentPlacementFilter .dropdown-menu.show {\n            max-height: 25vh;\n            overflow: auto;\n          }\n        '
     ),
     React__default['default'].createElement(
       Row__default['default'],
-      { style: { marginBottom: '1rem' } },
+      null,
       React__default['default'].createElement(
         Col__default['default'],
-        null,
+        { className: 'flex-grow-0 mb-3' },
         React__default['default'].createElement(
           Dropdown__default['default'],
           { id: 'pubYearFilter' },
           React__default['default'].createElement(
             Dropdown__default['default'].Toggle,
             null,
-            activeYear
+            activeYear ? activeYear : 'Select Year'
           ),
           React__default['default'].createElement(
             Dropdown__default['default'].Menu,
             null,
+            React__default['default'].createElement(Dropdown__default['default'].Item, { style: { height: '2rem' }, onClick: function onClick() {
+                return setActiveYear('');
+              } }),
             years.map(function (yr, key) {
               return React__default['default'].createElement(
                 Dropdown__default['default'].Item,
@@ -482,6 +535,35 @@ var PublicationLanding = function PublicationLanding(props) {
             })
           )
         )
+      ),
+      contentPlacements && contentPlacements.length > 0 && React__default['default'].createElement(
+        Col__default['default'],
+        { className: 'flex-grow-0 mb-3' },
+        React__default['default'].createElement(
+          Dropdown__default['default'],
+          { id: 'contentPlacementFilter' },
+          React__default['default'].createElement(
+            Dropdown__default['default'].Toggle,
+            null,
+            activeContentPlacement ? activeContentPlacement : 'Select Content Placement'
+          ),
+          React__default['default'].createElement(
+            Dropdown__default['default'].Menu,
+            null,
+            React__default['default'].createElement(Dropdown__default['default'].Item, { style: { height: '2rem' }, onClick: function onClick() {
+                return setActiveContentPlacement('');
+              } }),
+            contentPlacements.map(function (cp) {
+              return React__default['default'].createElement(
+                Dropdown__default['default'].Item,
+                { key: cp._id, onClick: function onClick() {
+                    return setActiveContentPlacement(cp.identifier);
+                  } },
+                cp.name
+              );
+            })
+          )
+        )
       )
     ),
     issueData && issueData.length > 0 ? issueData.map(function (issue, key) {
@@ -559,7 +641,7 @@ var PublicationLanding = function PublicationLanding(props) {
     React__default['default'].createElement(
       'style',
       { jsx: 'true' },
-      '\n        .issueCard.card:hover {\n          cursor: default;\n        }\n        .content-category-label {\n          margin: 0.5rem 0;\n          display: block;\n        }\n        .sanityDisplayLabel {\n          margin: 0.5rem 0;\n          border: 1px solid black;\n          display: inline;\n          width: 100%;\n          padding: 5px;\n          color: #484848;\n          border-radius: 2px;\n        }\n      '
+      '\n        .issueCard.card:hover {\n          cursor: default;\n        }\n        .content-category-label {\n          margin: 0.5rem 0;\n          display: block;\n        }\n        .sanityDisplayLabel {\n          margin: 0.5rem 0;\n          border: 1px solid black;\n          display: inline;\n          width: 100%;\n          padding: 5px;\n          color: #484848;\n          border-radius: 2px;\n        }\n        .dropdown-toggle {\n          min-width: 5rem;\n        }\n        .dropdown-toggle:empty:after {\n          margin-left: 4rem;\n        }\n      '
     )
   );
 };

package/dist/cjs/getQuery.js

@@ -14,7 +14,7 @@ var getQuery = function getQuery(type) {
     case 'article':
       return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          issueGroup-> { _id, name, identifier, parent-> },\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            _id,\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
-      return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
+      return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                taxonomyMapping[]->,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n            ' + params + '\n            ...,\n            \'issue\': *[_type == \'publication\'\n                && references(^._id)\n                && identifier.current == $issue][0] {\n                    ...,\n                    \'articles\': *[_type == \'article\'\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && is_visible\n                        && defined(url)\n                        && defined(published) \n                        && dateTime(published) <= dateTime(now())\n                        && passwordLock != true\n                        && references(^._id)] | order(published desc) {\n                          ...,\n                          authorMapping[0]->,\n                          contentCategory->,\n                          issueSection-> {\n                            name\n                          }\n                        }\n                }\n        }';
     case 'externalResources':

package/dist/esm/PublicationLanding.js

@@ -405,36 +405,86 @@ Publication.getInitialProps = async (ctx) => {
 export default Publication
 */
 
+var generateContentPlacements = function generateContentPlacements(issues) {
+  var contentPlacements = [];
+  issues && issues.length > 0 && issues.forEach(function (issue) {
+    if (issue.taxonomyMapping && issue.taxonomyMapping.length > 0) {
+      issue.taxonomyMapping && issue.taxonomyMapping.forEach(function (tm) {
+        if (!contentPlacements.find(function (cp) {
+          return cp.identifier === tm.identifier;
+        })) {
+          contentPlacements.push({ _id: tm._id, name: tm.name, identifier: tm.identifier });
+        }
+      });
+    }
+  });
+  return contentPlacements;
+};
+
 var PublicationLanding = function PublicationLanding(props) {
   var publication = props.publication,
-      year = props.year,
+      _props$year = props.year,
+      year = _props$year === undefined ? '' : _props$year,
       href = props.href;
       props.pdf;
+      var _props$contentPlaceme = props.contentPlacement,
+      contentPlacement = _props$contentPlaceme === undefined ? '' : _props$contentPlaceme;
 
 
   var router = useRouter();
   var years = [].concat(_toConsumableArray(new _Set(publication.issues.map(function (issue) {
     return issue.year;
   })))).sort().reverse();
+  var contentPlacements = generateContentPlacements(publication.issues);
 
   var _useState = useState(publication.issues),
       _useState2 = _slicedToArray(_useState, 2),
       issueData = _useState2[0],
       setIssueData = _useState2[1];
 
-  var _useState3 = useState(year ? year : years[0]),
+  var _useState3 = useState(year),
       _useState4 = _slicedToArray(_useState3, 2),
       activeYear = _useState4[0],
       setActiveYear = _useState4[1];
 
+  var _useState5 = useState(contentPlacement),
+      _useState6 = _slicedToArray(_useState5, 2),
+      activeContentPlacement = _useState6[0],
+      setActiveContentPlacement = _useState6[1];
+
   useEffect(function () {
-    router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear, { shallow: true });
-    setIssueData(function () {
-      return publication.issues.filter(function (issue) {
-        return issue.year === activeYear;
+    if (activeYear && activeContentPlacement) {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear + '&cp=' + activeContentPlacement, { shallow: true });
+      setIssueData(function () {
+        return publication.issues.filter(function (issue) {
+          return issue.year === activeYear;
+        }).filter(function (issue) {
+          return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
+            return tm.identifier === activeContentPlacement;
+          });
+        });
       });
-    });
-  }, [activeYear]);
+    } else if (activeYear) {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear, { shallow: true });
+      setIssueData(function () {
+        return publication.issues.filter(function (issue) {
+          return issue.year === activeYear;
+        });
+      });
+    } else if (activeContentPlacement) {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?cp=' + activeContentPlacement, { shallow: true });
+      setIssueData(function () {
+        return publication.issues.filter(function (issue) {
+          return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
+            return tm.identifier === activeContentPlacement;
+          });
+        });
+      });
+    } else {
+      router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current, { shallow: true });
+      setIssueData(publication.issues);
+    }
+  }, [activeYear, activeContentPlacement]);
 
   return React.createElement(
     'div',
@@ -442,25 +492,28 @@ var PublicationLanding = function PublicationLanding(props) {
     React.createElement(
       'style',
       { jsx: true },
-      '\n          #pubYearFilter .dropdown-menu.show {\n            max-height: 25vh;\n          }\n        '
+      '\n          #pubYearFilter .dropdown-menu.show,\n          #contentPlacementFilter .dropdown-menu.show {\n            max-height: 25vh;\n            overflow: auto;\n          }\n        '
     ),
     React.createElement(
       Row,
-      { style: { marginBottom: '1rem' } },
+      null,
       React.createElement(
         Col,
-        null,
+        { className: 'flex-grow-0 mb-3' },
         React.createElement(
           Dropdown,
           { id: 'pubYearFilter' },
           React.createElement(
             Dropdown.Toggle,
             null,
-            activeYear
+            activeYear ? activeYear : 'Select Year'
           ),
           React.createElement(
             Dropdown.Menu,
             null,
+            React.createElement(Dropdown.Item, { style: { height: '2rem' }, onClick: function onClick() {
+                return setActiveYear('');
+              } }),
             years.map(function (yr, key) {
               return React.createElement(
                 Dropdown.Item,
@@ -472,6 +525,35 @@ var PublicationLanding = function PublicationLanding(props) {
             })
           )
         )
+      ),
+      contentPlacements && contentPlacements.length > 0 && React.createElement(
+        Col,
+        { className: 'flex-grow-0 mb-3' },
+        React.createElement(
+          Dropdown,
+          { id: 'contentPlacementFilter' },
+          React.createElement(
+            Dropdown.Toggle,
+            null,
+            activeContentPlacement ? activeContentPlacement : 'Select Content Placement'
+          ),
+          React.createElement(
+            Dropdown.Menu,
+            null,
+            React.createElement(Dropdown.Item, { style: { height: '2rem' }, onClick: function onClick() {
+                return setActiveContentPlacement('');
+              } }),
+            contentPlacements.map(function (cp) {
+              return React.createElement(
+                Dropdown.Item,
+                { key: cp._id, onClick: function onClick() {
+                    return setActiveContentPlacement(cp.identifier);
+                  } },
+                cp.name
+              );
+            })
+          )
+        )
       )
     ),
     issueData && issueData.length > 0 ? issueData.map(function (issue, key) {
@@ -549,7 +631,7 @@ var PublicationLanding = function PublicationLanding(props) {
     React.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .issueCard.card:hover {\n          cursor: default;\n        }\n        .content-category-label {\n          margin: 0.5rem 0;\n          display: block;\n        }\n        .sanityDisplayLabel {\n          margin: 0.5rem 0;\n          border: 1px solid black;\n          display: inline;\n          width: 100%;\n          padding: 5px;\n          color: #484848;\n          border-radius: 2px;\n        }\n      '
+      '\n        .issueCard.card:hover {\n          cursor: default;\n        }\n        .content-category-label {\n          margin: 0.5rem 0;\n          display: block;\n        }\n        .sanityDisplayLabel {\n          margin: 0.5rem 0;\n          border: 1px solid black;\n          display: inline;\n          width: 100%;\n          padding: 5px;\n          color: #484848;\n          border-radius: 2px;\n        }\n        .dropdown-toggle {\n          min-width: 5rem;\n        }\n        .dropdown-toggle:empty:after {\n          margin-left: 4rem;\n        }\n      '
     )
   );
 };

package/dist/esm/getQuery.js

@@ -12,7 +12,7 @@ var getQuery = function getQuery(type) {
     case 'article':
       return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          issueGroup-> { _id, name, identifier, parent-> },\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            _id,\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
-      return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
+      return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                taxonomyMapping[]->,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n            ' + params + '\n            ...,\n            \'issue\': *[_type == \'publication\'\n                && references(^._id)\n                && identifier.current == $issue][0] {\n                    ...,\n                    \'articles\': *[_type == \'article\'\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && is_visible\n                        && defined(url)\n                        && defined(published) \n                        && dateTime(published) <= dateTime(now())\n                        && passwordLock != true\n                        && references(^._id)] | order(published desc) {\n                          ...,\n                          authorMapping[0]->,\n                          contentCategory->,\n                          issueSection-> {\n                            name\n                          }\n                        }\n                }\n        }';
     case 'externalResources':

package/package.json

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