@mjhls/mjh-framework 1.0.895 → 1.0.897

package/README.md

@@ -1,4 +1,4 @@
-# mjh-framework v. 1.0.895
+# mjh-framework v. 1.0.897
 
 [![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 

package/dist/cjs/AlgoliaSearch.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _extends = require('./extends-7c86182f.js');
-var _typeof$2 = require('./typeof-567e31ff.js');
 var inherits$1 = require('./inherits-de66ea16.js');
+var _typeof$2 = require('./typeof-567e31ff.js');
 var React = require('react');
 var PropTypes = require('prop-types');
 var _typeof$1 = require('./typeof-1358762e.js');
@@ -15,11 +15,11 @@ var index$1 = require('./index-eadd5035.js');
 require('./_commonjsHelpers-06173234.js');
 require('./core.get-iterator-method-5643aa10.js');
 require('./_object-pie-083f2dd6.js');
+require('./_object-sap-d1978572.js');
+require('./define-property-e8404b64.js');
 require('./web.dom.iterable-d98303e0.js');
 require('./_is-array-54228b29.js');
 require('./_library-dd23b178.js');
-require('./_object-sap-d1978572.js');
-require('./define-property-e8404b64.js');
 require('./slicedToArray-067dd3bc.js');
 require('./index-d48b231c.js');
 require('react-dom');
@@ -14174,6 +14174,85 @@ var QueryRuleCustomDataWidget = function QueryRuleCustomDataWidget(props) {
 
 connectQueryRules(QueryRuleCustomDataWidget);
 
+var HitComponent = function HitComponent(hits, props) {
+  var propsObj = {
+    styles: props.deckStyles,
+    client: props.sanityClient,
+    siteType: props.siteType,
+    defaultImage: props.defaultImage,
+    hit: hits.hit,
+    variant: props.variant
+  };
+  var styles = propsObj.styles,
+      client = propsObj.client,
+      hit = propsObj.hit,
+      siteType = propsObj.siteType,
+      defaultImage = propsObj.defaultImage,
+      variant = propsObj.variant;
+
+  var dateFormat = siteType === 'pharmsci' ? 'MMMM DD, YYYY' : 'MMMM Do YYYY';
+
+  return React__default['default'].createElement(
+    'div',
+    { key: hit.url, className: 'hitResult ' + styles.article },
+    hit.thumbnail && hit.thumbnail.asset ? imageDiv(hit, styles, client, siteType, defaultImage, variant) : !hit.thumbnail && siteType !== 'pharmsci' ? imageDiv(hit, styles, client, siteType, defaultImage, variant) : null,
+    React__default['default'].createElement(
+      'div',
+      { className: styles.info, style: props.variant === 'right' ? { padding: '0 1rem 0 0' } : { padding: ' 0 0 0 1rem' } },
+      React__default['default'].createElement(
+        'a',
+        { href: '/view/' + hit.url },
+        React__default['default'].createElement(
+          'h2',
+          null,
+          hit.title
+        )
+      ),
+      hit.pubDateSort && React__default['default'].createElement(
+        'p',
+        { className: styles.published },
+        moment.moment(hit.pubDateSort).format('' + dateFormat)
+      ),
+      hit.authorMapping && hit.authorMapping.length > 0 && React__default['default'].createElement(
+        'p',
+        { className: styles.author },
+        hit.authorMapping.map(function (author, index) {
+          return React__default['default'].createElement(
+            'span',
+            { key: author + '_' + index },
+            author.displayName
+          );
+        })
+      ),
+      hit.summary && React__default['default'].createElement('p', { dangerouslySetInnerHTML: { __html: hit.summary }, className: styles.summary })
+    )
+  );
+};
+
+var imageDiv = function imageDiv(hit, styles, client, siteType, defaultImage, variant) {
+  return React__default['default'].createElement(
+    'a',
+    { href: '/view/' + hit.url, style: variant === 'right' ? { flexDirection: 'row-reverse' } : {} },
+    React__default['default'].createElement(
+      'div',
+      { className: styles.thumb },
+      React__default['default'].createElement(
+        'figure',
+        null,
+        React__default['default'].createElement(
+          index$1.LazyLoad,
+          { once: true },
+          React__default['default'].createElement('img', {
+            src: hit.thumbnail && hit.thumbnail.asset ? urlFor({ client: client, source: hit.thumbnail }) : hit.thumbnail && _typeof$2._typeof(hit.thumbnail === 'string') ? hit.thumbnail : defaultImage
+          })
+        )
+      )
+    )
+  );
+};
+
+var nowTimestamp = Date.now();
+
 var AlgoliaSearch = function (_React$Component) {
   inherits$1._inherits(AlgoliaSearch, _React$Component);
 
@@ -14184,78 +14263,10 @@ var AlgoliaSearch = function (_React$Component) {
   }
 
   inherits$1._createClass(AlgoliaSearch, [{
-    key: 'Deck',
-    value: function Deck(props) {
-      var _props$propsObj = props.propsObj,
-          styles = _props$propsObj.styles,
-          client = _props$propsObj.client;
-
-
-      var hit = props.hit;
-      if (moment.moment().isSameOrBefore(props.hit.pubDateSort)) return null;
-      return React__default['default'].createElement(
-        'div',
-        { key: hit.url, className: 'hitResult ' + styles.article },
-        React__default['default'].createElement(
-          'a',
-          { href: '/view/' + hit.url, style: this.props.variant === 'right' ? { flexDirection: 'row-reverse' } : {} },
-          React__default['default'].createElement(
-            'div',
-            { className: styles.thumb },
-            React__default['default'].createElement(
-              'figure',
-              null,
-              React__default['default'].createElement(
-                index$1.LazyLoad,
-                { once: true },
-                React__default['default'].createElement('img', {
-                  src: hit.thumbnail && hit.thumbnail.asset ? urlFor({ client: client, source: hit.thumbnail }) : hit.thumbnail && _typeof$2._typeof(hit.thumbnail === 'string') ? hit.thumbnail : this.props.defaultImage
-                })
-              )
-            )
-          )
-        ),
-        React__default['default'].createElement(
-          'div',
-          { className: styles.info, style: this.props.variant === 'right' ? { padding: '0 1rem 0 0' } : { padding: ' 0 0 0 1rem' } },
-          React__default['default'].createElement(
-            'a',
-            { href: '/view/' + hit.url },
-            React__default['default'].createElement(
-              'h2',
-              null,
-              hit.title
-            )
-          ),
-          hit.pubDateSort && React__default['default'].createElement(
-            'p',
-            { className: styles.published },
-            moment.moment(hit.pubDateSort).format('MMMM Do YYYY')
-          ),
-          hit.authorMapping && hit.authorMapping.length > 0 && React__default['default'].createElement(
-            'p',
-            { className: styles.author },
-            hit.authorMapping.map(function (author) {
-              return React__default['default'].createElement(
-                'span',
-                null,
-                author.displayName
-              );
-            })
-          ),
-          hit.summary && React__default['default'].createElement('p', { dangerouslySetInnerHTML: { __html: hit.summary }, className: styles.summary })
-        )
-      );
-    }
-  }, {
     key: 'render',
     value: function render() {
       var _this2 = this;
 
-      var propsObj = {
-        styles: this.props.deckStyles,
-        client: this.props.sanityClient
-      };
       return React__default['default'].createElement(
         React__default['default'].Fragment,
         null,
@@ -14270,7 +14281,7 @@ var AlgoliaSearch = function (_React$Component) {
             indexName: this.props.indexName,
             onSearchParameters: this.props.onSearchParameters
           }, this.props),
-          React__default['default'].createElement(Configure, { hitsPerPage: this.props.hitsPerPage || 20 }),
+          React__default['default'].createElement(Configure, { hitsPerPage: this.props.hitsPerPage || 20, filters: 'pubDateSort <= ' + nowTimestamp }),
           React__default['default'].createElement(
             'div',
             { className: 'd-flex align-items-center' },
@@ -14300,7 +14311,7 @@ var AlgoliaSearch = function (_React$Component) {
             'div',
             { className: 'AlgoliaResults' },
             React__default['default'].createElement(Hits, { hitComponent: function hitComponent(hit) {
-                return _this2.Deck(_extends._extends({}, hit, { propsObj: propsObj }));
+                return HitComponent(hit, _this2.props);
               } })
           ),
           React__default['default'].createElement(Pagination, null)

package/dist/cjs/PublicationLanding.js

@@ -467,8 +467,7 @@ var PublicationLanding = function PublicationLanding(props) {
       setSortedIssues = _useState8[1];
 
   React.useEffect(function () {
-
-    asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee2() {
+asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee2() {
       var _this = this;
 
       var promises, articles;
@@ -522,7 +521,6 @@ var PublicationLanding = function PublicationLanding(props) {
               articles = _context2.sent;
 
               setIssueData(articles);
-
               _context2.next = 12;
               break;
 
@@ -723,7 +721,7 @@ var PublicationLanding = function PublicationLanding(props) {
         React__default['default'].createElement(
           Row__default['default'],
           null,
-          React__default['default'].createElement(
+          issue.thumbnail && React__default['default'].createElement(
             Col__default['default'],
             { md: 3, id: 'issueThumbnail' },
             React__default['default'].createElement(
@@ -734,7 +732,7 @@ var PublicationLanding = function PublicationLanding(props) {
           ),
           React__default['default'].createElement(
             Col__default['default'],
-            { md: 9, id: 'issueDetail' },
+            { md: issue.thumbnail ? 9 : 12, id: 'issueDetail' },
             React__default['default'].createElement(
               Card__default['default'].Body,
               null,
@@ -786,7 +784,7 @@ var PublicationLanding = function PublicationLanding(props) {
         React__default['default'].createElement(
           Row__default['default'],
           null,
-          React__default['default'].createElement(
+          issue.thumbnail && React__default['default'].createElement(
             Col__default['default'],
             { md: 3, id: 'issueThumbnail' },
             React__default['default'].createElement(
@@ -797,7 +795,7 @@ var PublicationLanding = function PublicationLanding(props) {
           ),
           React__default['default'].createElement(
             Col__default['default'],
-            { md: 9, id: 'issueDetail' },
+            { md: issue.thumbnail ? 9 : 12, id: 'issueDetail' },
             React__default['default'].createElement(
               Card__default['default'].Body,
               null,

package/dist/esm/AlgoliaSearch.js

@@ -1,6 +1,6 @@
 import { _ as _extends$1 } from './extends-6d8e3924.js';
-import { _ as _typeof$2 } from './typeof-e9fc0c5d.js';
 import { _ as _inherits$1, a as _classCallCheck$1, b as _possibleConstructorReturn$1, c as _Object$getPrototypeOf, d as _createClass$1 } from './inherits-a6ba2ec4.js';
+import { _ as _typeof$2 } from './typeof-e9fc0c5d.js';
 import React__default, { createContext, Component, Children, version as version$2 } from 'react';
 import PropTypes from 'prop-types';
 import { _ as _typeof$1 } from './typeof-2f07d0e8.js';
@@ -13,11 +13,11 @@ import { L as LazyLoad } from './index-755f2cc2.js';
 import './_commonjsHelpers-0c4b6f40.js';
 import './core.get-iterator-method-ea258bb1.js';
 import './_object-pie-133f504a.js';
+import './_object-sap-7cee6f84.js';
+import './define-property-5f1bda73.js';
 import './web.dom.iterable-ab4dea5c.js';
 import './_is-array-8d21b9e3.js';
 import './_library-528f1934.js';
-import './_object-sap-7cee6f84.js';
-import './define-property-5f1bda73.js';
 import './slicedToArray-6ebcbfea.js';
 import './index-3f5c03b2.js';
 import 'react-dom';
@@ -14167,6 +14167,85 @@ var QueryRuleCustomDataWidget = function QueryRuleCustomDataWidget(props) {
 
 connectQueryRules(QueryRuleCustomDataWidget);
 
+var HitComponent = function HitComponent(hits, props) {
+  var propsObj = {
+    styles: props.deckStyles,
+    client: props.sanityClient,
+    siteType: props.siteType,
+    defaultImage: props.defaultImage,
+    hit: hits.hit,
+    variant: props.variant
+  };
+  var styles = propsObj.styles,
+      client = propsObj.client,
+      hit = propsObj.hit,
+      siteType = propsObj.siteType,
+      defaultImage = propsObj.defaultImage,
+      variant = propsObj.variant;
+
+  var dateFormat = siteType === 'pharmsci' ? 'MMMM DD, YYYY' : 'MMMM Do YYYY';
+
+  return React__default.createElement(
+    'div',
+    { key: hit.url, className: 'hitResult ' + styles.article },
+    hit.thumbnail && hit.thumbnail.asset ? imageDiv(hit, styles, client, siteType, defaultImage, variant) : !hit.thumbnail && siteType !== 'pharmsci' ? imageDiv(hit, styles, client, siteType, defaultImage, variant) : null,
+    React__default.createElement(
+      'div',
+      { className: styles.info, style: props.variant === 'right' ? { padding: '0 1rem 0 0' } : { padding: ' 0 0 0 1rem' } },
+      React__default.createElement(
+        'a',
+        { href: '/view/' + hit.url },
+        React__default.createElement(
+          'h2',
+          null,
+          hit.title
+        )
+      ),
+      hit.pubDateSort && React__default.createElement(
+        'p',
+        { className: styles.published },
+        moment(hit.pubDateSort).format('' + dateFormat)
+      ),
+      hit.authorMapping && hit.authorMapping.length > 0 && React__default.createElement(
+        'p',
+        { className: styles.author },
+        hit.authorMapping.map(function (author, index) {
+          return React__default.createElement(
+            'span',
+            { key: author + '_' + index },
+            author.displayName
+          );
+        })
+      ),
+      hit.summary && React__default.createElement('p', { dangerouslySetInnerHTML: { __html: hit.summary }, className: styles.summary })
+    )
+  );
+};
+
+var imageDiv = function imageDiv(hit, styles, client, siteType, defaultImage, variant) {
+  return React__default.createElement(
+    'a',
+    { href: '/view/' + hit.url, style: variant === 'right' ? { flexDirection: 'row-reverse' } : {} },
+    React__default.createElement(
+      'div',
+      { className: styles.thumb },
+      React__default.createElement(
+        'figure',
+        null,
+        React__default.createElement(
+          LazyLoad,
+          { once: true },
+          React__default.createElement('img', {
+            src: hit.thumbnail && hit.thumbnail.asset ? urlFor({ client: client, source: hit.thumbnail }) : hit.thumbnail && _typeof$2(hit.thumbnail === 'string') ? hit.thumbnail : defaultImage
+          })
+        )
+      )
+    )
+  );
+};
+
+var nowTimestamp = Date.now();
+
 var AlgoliaSearch = function (_React$Component) {
   _inherits$1(AlgoliaSearch, _React$Component);
 
@@ -14177,78 +14256,10 @@ var AlgoliaSearch = function (_React$Component) {
   }
 
   _createClass$1(AlgoliaSearch, [{
-    key: 'Deck',
-    value: function Deck(props) {
-      var _props$propsObj = props.propsObj,
-          styles = _props$propsObj.styles,
-          client = _props$propsObj.client;
-
-
-      var hit = props.hit;
-      if (moment().isSameOrBefore(props.hit.pubDateSort)) return null;
-      return React__default.createElement(
-        'div',
-        { key: hit.url, className: 'hitResult ' + styles.article },
-        React__default.createElement(
-          'a',
-          { href: '/view/' + hit.url, style: this.props.variant === 'right' ? { flexDirection: 'row-reverse' } : {} },
-          React__default.createElement(
-            'div',
-            { className: styles.thumb },
-            React__default.createElement(
-              'figure',
-              null,
-              React__default.createElement(
-                LazyLoad,
-                { once: true },
-                React__default.createElement('img', {
-                  src: hit.thumbnail && hit.thumbnail.asset ? urlFor({ client: client, source: hit.thumbnail }) : hit.thumbnail && _typeof$2(hit.thumbnail === 'string') ? hit.thumbnail : this.props.defaultImage
-                })
-              )
-            )
-          )
-        ),
-        React__default.createElement(
-          'div',
-          { className: styles.info, style: this.props.variant === 'right' ? { padding: '0 1rem 0 0' } : { padding: ' 0 0 0 1rem' } },
-          React__default.createElement(
-            'a',
-            { href: '/view/' + hit.url },
-            React__default.createElement(
-              'h2',
-              null,
-              hit.title
-            )
-          ),
-          hit.pubDateSort && React__default.createElement(
-            'p',
-            { className: styles.published },
-            moment(hit.pubDateSort).format('MMMM Do YYYY')
-          ),
-          hit.authorMapping && hit.authorMapping.length > 0 && React__default.createElement(
-            'p',
-            { className: styles.author },
-            hit.authorMapping.map(function (author) {
-              return React__default.createElement(
-                'span',
-                null,
-                author.displayName
-              );
-            })
-          ),
-          hit.summary && React__default.createElement('p', { dangerouslySetInnerHTML: { __html: hit.summary }, className: styles.summary })
-        )
-      );
-    }
-  }, {
     key: 'render',
     value: function render() {
       var _this2 = this;
 
-      var propsObj = {
-        styles: this.props.deckStyles,
-        client: this.props.sanityClient
-      };
       return React__default.createElement(
         React__default.Fragment,
         null,
@@ -14263,7 +14274,7 @@ var AlgoliaSearch = function (_React$Component) {
             indexName: this.props.indexName,
             onSearchParameters: this.props.onSearchParameters
           }, this.props),
-          React__default.createElement(Configure, { hitsPerPage: this.props.hitsPerPage || 20 }),
+          React__default.createElement(Configure, { hitsPerPage: this.props.hitsPerPage || 20, filters: 'pubDateSort <= ' + nowTimestamp }),
           React__default.createElement(
             'div',
             { className: 'd-flex align-items-center' },
@@ -14293,7 +14304,7 @@ var AlgoliaSearch = function (_React$Component) {
             'div',
             { className: 'AlgoliaResults' },
             React__default.createElement(Hits, { hitComponent: function hitComponent(hit) {
-                return _this2.Deck(_extends$1({}, hit, { propsObj: propsObj }));
+                return HitComponent(hit, _this2.props);
               } })
           ),
           React__default.createElement(Pagination, null)

package/dist/esm/PublicationLanding.js

@@ -457,8 +457,7 @@ var PublicationLanding = function PublicationLanding(props) {
       setSortedIssues = _useState8[1];
 
   useEffect(function () {
-
-    _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2() {
+_asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2() {
       var _this = this;
 
       var promises, articles;
@@ -512,7 +511,6 @@ var PublicationLanding = function PublicationLanding(props) {
               articles = _context2.sent;
 
               setIssueData(articles);
-
               _context2.next = 12;
               break;
 
@@ -713,7 +711,7 @@ var PublicationLanding = function PublicationLanding(props) {
         React__default.createElement(
           Row,
           null,
-          React__default.createElement(
+          issue.thumbnail && React__default.createElement(
             Col,
             { md: 3, id: 'issueThumbnail' },
             React__default.createElement(
@@ -724,7 +722,7 @@ var PublicationLanding = function PublicationLanding(props) {
           ),
           React__default.createElement(
             Col,
-            { md: 9, id: 'issueDetail' },
+            { md: issue.thumbnail ? 9 : 12, id: 'issueDetail' },
             React__default.createElement(
               Card.Body,
               null,
@@ -776,7 +774,7 @@ var PublicationLanding = function PublicationLanding(props) {
         React__default.createElement(
           Row,
           null,
-          React__default.createElement(
+          issue.thumbnail && React__default.createElement(
             Col,
             { md: 3, id: 'issueThumbnail' },
             React__default.createElement(
@@ -787,7 +785,7 @@ var PublicationLanding = function PublicationLanding(props) {
           ),
           React__default.createElement(
             Col,
-            { md: 9, id: 'issueDetail' },
+            { md: issue.thumbnail ? 9 : 12, id: 'issueDetail' },
             React__default.createElement(
               Card.Body,
               null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.895",
+  "version": "1.0.897",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",
@@ -101,7 +101,7 @@
     "nookies": "^2.4.0",
     "react-cookies": "^0.1.1",
     "react-facebook": "^8.1.4",
-    "react-instantsearch-dom": "^6.10.3",
+    "react-instantsearch-dom": "^6.12.0",
     "react-script-tag": "^1.1.2",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "shortid": "^2.2.15",