@collectionspace/cspace-public-browser 3.3.0 → 3.4.0

package/lib/components/detail/DetailNavBar.js

@@ -16,7 +16,7 @@ var _DetailNavBar = _interopRequireDefault(require("../../../styles/cspace/Detai
 var _Link = _interopRequireDefault(require("../../../styles/cspace/Link.css"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const propTypes = {
-  params: _propTypes.default.instanceOf(_immutable.default.Map).isRequired,
+  params: _propTypes.default.instanceOf(_immutable.default.Map),
   prev: _propTypes.default.shape({
     'ecm:name': _propTypes.default.string
   }),
@@ -25,6 +25,7 @@ const propTypes = {
   })
 };
 const defaultProps = {
+  params: _immutable.default.Map(),
   prev: undefined,
   next: undefined
 };
@@ -42,48 +43,36 @@ const messages = (0, _reactIntl.defineMessages)({
     "defaultMessage": "Next"
   }
 });
-function DetailNavBar(props) {
-  const {
-    params,
-    prev,
-    next
-  } = props;
-  const index = params.get('index');
-  const searchParams = params.get('searchParams');
-  if (!searchParams || typeof index === 'undefined') {
-    return null;
-  }
-  const searchParamsObj = searchParams.toJS();
-  const detailPath = _config.default.get('detailPath');
-  let prevLink;
-  let nextLink;
-  if (prev) {
-    const csid = (0, _get.default)(prev, 'ecm:name');
-    prevLink = /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Link, {
-      className: _Link.default.prev,
+function DetailNavBar({
+  params,
+  prev,
+  next
+}) {
+  function renderLink(searchParams, index, adjacent, className, message) {
+    const detailPath = _config.default.get('detailPath');
+    const csid = (0, _get.default)(adjacent, 'ecm:name');
+    return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Link, {
+      className: className,
       to: {
         pathname: `/${detailPath}/${csid}`,
         state: {
-          index: index - 1,
-          searchParams: searchParamsObj
+          index,
+          searchParams
         }
       }
-    }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, messages.prev)));
+    }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, message)));
   }
-  if (next) {
-    const csid = (0, _get.default)(next, 'ecm:name');
-    nextLink = /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Link, {
-      className: _Link.default.next,
-      to: {
-        pathname: `/${detailPath}/${csid}`,
-        state: {
-          index: index + 1,
-          searchParams: searchParamsObj
-        }
-      }
-    }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, messages.next)));
+  let prevLink;
+  let nextLink;
+  let queryString = '';
+  const index = params.get('index');
+  const searchParams = params.get('searchParams');
+  if (searchParams && index !== undefined) {
+    const searchParamsObj = searchParams.toJS();
+    prevLink = prev && renderLink(searchParamsObj, index - 1, prev, _Link.default.prev, messages.prev);
+    nextLink = next && renderLink(searchParamsObj, index + 1, next, _Link.default.next, messages.next);
+    queryString = (0, _urlHelpers.searchParamsToQueryString)(searchParams);
   }
-  const queryString = (0, _urlHelpers.searchParamsToQueryString)(searchParams);
   return /*#__PURE__*/_react.default.createElement("nav", {
     className: _DetailNavBar.default.common
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Link, {

package/lib/config/anthro.js

@@ -115,11 +115,11 @@ var _default = exports.default = {
         fields: ['fieldCollectionDate', 'fieldCollector']
       },
       group_description: {
-        fields: ['material', 'technique', 'subject', 'contentDescription', 'measuredPart', 'creditLine', 'taxon']
+        fields: ['material', 'technique', 'subject', 'color', 'contentDescription', 'measuredPart', 'creditLine', 'taxon']
       }
     },
     layout: {
-      fields1: ['group_id', 'group_collection', 'group_description', 'group_production']
+      fields1: ['group_id', 'group_collection', 'group_description', 'group_production', 'group_reference']
     }
   }
 };

package/lib/config/default.js

@@ -343,7 +343,7 @@ var _default = exports.default = {
       'collectionobjects_common:briefDescriptions': briefDescriptions
     } = data;
     if (briefDescriptions && briefDescriptions.length > 0) {
-      return briefDescriptions;
+      return briefDescriptions.flatMap(desc => desc.split('\n'));
     }
     return [];
   },
@@ -460,6 +460,16 @@ var _default = exports.default = {
           format: (0, _formatHelpers.filterLink)({})
         }))
       },
+      color: {
+        messages: (0, _reactIntl.defineMessages)({
+          label: {
+            "id": "filter.color.label",
+            "defaultMessage": "Color"
+          }
+        }),
+        field: 'collectionobjects_common:colors',
+        format: _formatHelpers.inlineList
+      },
       technique: {
         messages: (0, _reactIntl.defineMessages)({
           label: {
@@ -493,7 +503,10 @@ var _default = exports.default = {
             "defaultMessage": "Content Description"
           }
         }),
-        field: 'collectionobjects_common:contentDescription'
+        field: 'collectionobjects_common:contentDescription',
+        format: (0, _formatHelpers.split)({
+          format: _formatHelpers.paragraphs
+        })
       },
       measuredPart: {
         messages: (0, _reactIntl.defineMessages)({

package/lib/config/fcart.js

@@ -32,7 +32,7 @@ var _default = exports.default = {
       }
     },
     layout: {
-      fields1: ['group_production', 'group_id', 'group_description', 'group_rights']
+      fields1: ['group_production', 'group_id', 'group_description', 'group_rights', 'group_reference']
     }
   }
 };

package/lib/config/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _get = _interopRequireDefault(require("lodash/get"));
-var _merge = _interopRequireDefault(require("lodash/merge"));
+var _mergeWith = _interopRequireDefault(require("lodash/mergeWith"));
 var _default2 = _interopRequireDefault(require("./default"));
 var _anthro = _interopRequireDefault(require("./anthro"));
 var _bonsai = _interopRequireDefault(require("./bonsai"));
@@ -26,7 +26,14 @@ const namedConfig = {
   materials: _materials.default,
   publicart: _publicart.default
 };
-const config = (0, _merge.default)({}, _default2.default);
+const config = (0, _mergeWith.default)({}, _default2.default);
+const configMerge = (objValue, srcValue) => {
+  // overwrite arrays instead of merging them
+  if (Array.isArray(objValue)) {
+    return srcValue;
+  }
+  return undefined;
+};
 var _default = exports.default = {
   get: (path, defaultValue) => (0, _get.default)(config, path, defaultValue),
   // eslint-disable-next-line no-console
@@ -39,10 +46,10 @@ var _default = exports.default = {
       if (baseConfigName) {
         const baseConfig = namedConfig[baseConfigName];
         if (baseConfig) {
-          (0, _merge.default)(config, baseConfig);
+          (0, _mergeWith.default)(config, baseConfig, configMerge);
         }
       }
-      (0, _merge.default)(config, source);
+      (0, _mergeWith.default)(config, source, configMerge);
     });
   },
   getFilterFieldConfig: id => (0, _get.default)(config, ['filters', 'fields', id])

package/lib/config/lhmc.js

@@ -15,7 +15,7 @@ var _default = exports.default = {
   },
   detailFields: {
     layout: {
-      fields1: ['group_production', 'group_id', 'group_description', 'group_rights']
+      fields1: ['group_production', 'group_id', 'group_description', 'group_rights', 'group_reference']
     }
   }
 };

package/lib/config/materials.js

@@ -68,7 +68,7 @@ var _default = exports.default = {
     const {
       'materials_common:description': description
     } = data;
-    return description;
+    return description && description.split('\n');
   },
   filters: {
     fields: {
@@ -1003,7 +1003,7 @@ var _default = exports.default = {
         }
       },
       layout: {
-        fields1: ['group_sample_otherNumberList', 'group_sample_collection', 'group_sample_namedCollection', 'group_sample_computedCurrentLocation', 'group_sample_materialPhysicalDescriptions', 'group_sample_condition', 'group_sample_description', 'group_sample_holdings', 'group_sample_briefDescriptions', 'group_sample_measuredPartGroupList', 'group_sample_system']
+        fields1: ['group_sample_otherNumberList', 'group_sample_collection', 'group_sample_namedCollection', 'group_sample_computedCurrentLocation', 'group_sample_materialPhysicalDescriptions', 'group_sample_condition', 'group_sample_description', 'group_sample_holdings', 'group_sample_briefDescriptions', 'group_sample_measuredPartGroupList', 'group_sample_system', 'group_reference']
       }
     }
   }

package/lib/helpers/formatHelpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.valueWithNote = exports.valueAt = exports.unqualifiedFieldName = exports.unformatted = exports.renderLink = exports.renderJoined = exports.renderFilterLink = exports.property = exports.pickFromList = exports.pickAllFromList = exports.paragraphs = exports.objectTypeValue = exports.numericRange = exports.nameValue = exports.nameRole = exports.literal = exports.listOf = exports.list = exports.linkedDisplayName = exports.linkText = exports.linkNote = exports.lines = exports.inlineListOf = exports.inlineList = exports.html = exports.head = exports.filterLink = exports.displayNameFrom = exports.displayName = exports.decade = exports.collectionValue = exports.boolean = void 0;
+exports.valueWithNote = exports.valueAt = exports.unqualifiedFieldName = exports.unformatted = exports.split = exports.renderLink = exports.renderJoined = exports.renderFilterLink = exports.property = exports.pickFromList = exports.pickAllFromList = exports.paragraphs = exports.objectTypeValue = exports.numericRange = exports.nameValue = exports.nameRole = exports.literal = exports.listOf = exports.list = exports.linkedDisplayName = exports.linkText = exports.linkNote = exports.lines = exports.inlineListOf = exports.inlineList = exports.html = exports.head = exports.filterLink = exports.displayNameFrom = exports.displayName = exports.decade = exports.collectionValue = exports.boolean = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _qs = _interopRequireDefault(require("qs"));
@@ -224,13 +224,39 @@ const numericRange = config => data => {
   const rangeUnit = renderJoined([range, unit], ' ');
   return renderJoined([rangeUnit, linkQualifier ? renderFilterLink(qualifierFieldName, qualifier) : qualifier], qualifierSeparator);
 };
+
+/**
+ * Create a paragraph element for each String in an array. If the String contains a newline, it will
+ * be split in order to retain line breaks in that display.
+ *
+ * @param {} array
+ * @returns
+ */
 exports.numericRange = numericRange;
 const paragraphs = array =>
 // eslint-disable-next-line react/no-array-index-key
-array && array.length > 0 && array.map((value, index) => /*#__PURE__*/_react.default.createElement("p", {
+Array.isArray(array) && array.flatMap(value => value.split('\n')).map((value, index) => /*#__PURE__*/_react.default.createElement("p", {
   key: index
 }, value));
+
+/**
+ * Split a string based on a given character to split with. Defaults to newline.
+ *
+ * @param {*} config
+ * @returns
+ */
 exports.paragraphs = paragraphs;
+const split = config => string => {
+  const {
+    splitter = '\n',
+    format = unformatted
+  } = config;
+  if (!(typeof string === 'string' || string instanceof String)) {
+    return null;
+  }
+  return format(string.split(splitter));
+};
+exports.split = split;
 const head = format => (array, fieldName) => Array.isArray(array) && array.length > 0 ? format(array[0], fieldName) : null;
 exports.head = head;
 const valueAt = config => data => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@collectionspace/cspace-public-browser",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "CollectionSpace public browser",
   "author": "Ray Lee <ray.lee@lyrasis.org>",
   "license": "ECL-2.0",

package/src/components/detail/DetailNavBar.jsx

@@ -10,7 +10,7 @@ import styles from '../../../styles/cspace/DetailNavBar.css';
 import linkStyles from '../../../styles/cspace/Link.css';
 
 const propTypes = {
-  params: PropTypes.instanceOf(Immutable.Map).isRequired,
+  params: PropTypes.instanceOf(Immutable.Map),
   prev: PropTypes.shape({
     'ecm:name': PropTypes.string,
   }),
@@ -20,6 +20,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+  params: Immutable.Map(),
   prev: undefined,
   next: undefined,
 };
@@ -39,72 +40,43 @@ const messages = defineMessages({
   },
 });
 
-export default function DetailNavBar(props) {
-  const {
-    params,
-    prev,
-    next,
-  } = props;
+export default function DetailNavBar({ params, prev, next }) {
+  function renderLink(searchParams, index, adjacent, className, message) {
+    const detailPath = config.get('detailPath');
+    const csid = get(adjacent, 'ecm:name');
 
-  const index = params.get('index');
-  const searchParams = params.get('searchParams');
-
-  if (!searchParams || typeof index === 'undefined') {
-    return null;
-  }
-
-  const searchParamsObj = searchParams.toJS();
-  const detailPath = config.get('detailPath');
-
-  let prevLink;
-  let nextLink;
-
-  if (prev) {
-    const csid = get(prev, 'ecm:name');
-
-    prevLink = (
+    return (
       <span>
         <Link
-          className={linkStyles.prev}
+          className={className}
           to={{
             pathname: `/${detailPath}/${csid}`,
             state: {
-              index: index - 1,
-              searchParams: searchParamsObj,
+              index,
+              searchParams,
             },
           }}
         >
           {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-          <FormattedMessage {...messages.prev} />
+          <FormattedMessage {...message} />
         </Link>
       </span>
     );
   }
 
-  if (next) {
-    const csid = get(next, 'ecm:name');
+  let prevLink;
+  let nextLink;
+  let queryString = '';
 
-    nextLink = (
-      <span>
-        <Link
-          className={linkStyles.next}
-          to={{
-            pathname: `/${detailPath}/${csid}`,
-            state: {
-              index: index + 1,
-              searchParams: searchParamsObj,
-            },
-          }}
-        >
-          {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-          <FormattedMessage {...messages.next} />
-        </Link>
-      </span>
-    );
+  const index = params.get('index');
+  const searchParams = params.get('searchParams');
+  if (searchParams && index !== undefined) {
+    const searchParamsObj = searchParams.toJS();
+    prevLink = prev && renderLink(searchParamsObj, index - 1, prev, linkStyles.prev, messages.prev);
+    nextLink = next && renderLink(searchParamsObj, index + 1, next, linkStyles.next, messages.next);
+    queryString = searchParamsToQueryString(searchParams);
   }
 
-  const queryString = searchParamsToQueryString(searchParams);
-
   return (
     <nav className={styles.common}>
       <div>

package/src/config/anthro.js

@@ -138,6 +138,7 @@ export default {
           'material',
           'technique',
           'subject',
+          'color',
           'contentDescription',
           'measuredPart',
           'creditLine',
@@ -151,6 +152,7 @@ export default {
         'group_collection',
         'group_description',
         'group_production',
+        'group_reference',
       ],
     },
   },

package/src/config/default.js

@@ -6,10 +6,13 @@ import {
   decade,
   displayName,
   filterLink,
+  inlineList,
   linkText,
   list,
   listOf,
   nameRole,
+  paragraphs,
+  split,
   valueAt,
 } from '../helpers/formatHelpers';
 
@@ -401,7 +404,7 @@ export default {
     } = data;
 
     if (briefDescriptions && briefDescriptions.length > 0) {
-      return briefDescriptions;
+      return briefDescriptions.flatMap((desc) => desc.split('\n'));
     }
 
     return [];
@@ -516,6 +519,16 @@ export default {
           format: filterLink({}),
         })),
       },
+      color: {
+        messages: defineMessages({
+          label: {
+            id: 'filter.color.label',
+            defaultMessage: 'Color',
+          },
+        }),
+        field: 'collectionobjects_common:colors',
+        format: inlineList,
+      },
       technique: {
         messages: defineMessages({
           label: {
@@ -550,6 +563,9 @@ export default {
           },
         }),
         field: 'collectionobjects_common:contentDescription',
+        format: split({
+          format: paragraphs,
+        }),
       },
       measuredPart: {
         messages: defineMessages({

package/src/config/fcart.js

@@ -41,6 +41,7 @@ export default {
         'group_id',
         'group_description',
         'group_rights',
+        'group_reference',
       ],
     },
   },

package/src/config/index.js

@@ -1,5 +1,5 @@
 import loget from 'lodash/get';
-import lomerge from 'lodash/merge';
+import lomerge from 'lodash/mergeWith';
 import defaultConfig from './default';
 import anthroConfig from './anthro';
 import bonsaiConfig from './bonsai';
@@ -23,6 +23,15 @@ const namedConfig = {
 
 const config = lomerge({}, defaultConfig);
 
+const configMerge = (objValue, srcValue) => {
+  // overwrite arrays instead of merging them
+  if (Array.isArray(objValue)) {
+    return srcValue;
+  }
+
+  return undefined;
+};
+
 export default {
   get: (path, defaultValue) => loget(config, path, defaultValue),
 
@@ -39,11 +48,11 @@ export default {
         const baseConfig = namedConfig[baseConfigName];
 
         if (baseConfig) {
-          lomerge(config, baseConfig);
+          lomerge(config, baseConfig, configMerge);
         }
       }
 
-      lomerge(config, source);
+      lomerge(config, source, configMerge);
     });
   },
 

package/src/config/lhmc.js

@@ -15,6 +15,7 @@ export default {
         'group_id',
         'group_description',
         'group_rights',
+        'group_reference',
       ],
     },
   },

package/src/config/materials.js

@@ -119,7 +119,7 @@ export default {
       'materials_common:description': description,
     } = data;
 
-    return description;
+    return description && description.split('\n');
   },
 
   filters: {
@@ -1194,6 +1194,7 @@ export default {
           'group_sample_briefDescriptions',
           'group_sample_measuredPartGroupList',
           'group_sample_system',
+          'group_reference',
         ],
       },
     },

package/src/helpers/formatHelpers.jsx

@@ -294,11 +294,37 @@ export const numericRange = (config) => (data) => {
   ], qualifierSeparator);
 };
 
+/**
+ * Create a paragraph element for each String in an array. If the String contains a newline, it will
+ * be split in order to retain line breaks in that display.
+ *
+ * @param {} array
+ * @returns
+ */
 export const paragraphs = (array) => (
   // eslint-disable-next-line react/no-array-index-key
-  array && array.length > 0 && array.map((value, index) => <p key={index}>{value}</p>)
+  Array.isArray(array) && array.flatMap((value) => value.split('\n')).map((value, index) => <p key={index}>{value}</p>)
 );
 
+/**
+ * Split a string based on a given character to split with. Defaults to newline.
+ *
+ * @param {*} config
+ * @returns
+ */
+export const split = (config) => (string) => {
+  const {
+    splitter = '\n',
+    format = unformatted,
+  } = config;
+
+  if (!(typeof string === 'string' || string instanceof String)) {
+    return null;
+  }
+
+  return format(string.split(splitter));
+};
+
 export const head = (format) => (array, fieldName) => (
   Array.isArray(array) && array.length > 0 ? format(array[0], fieldName) : null
 );

package/styles/cspace/DetailPanel.css

@@ -67,16 +67,3 @@ and (max-width: 839px) {
     grid-template-columns: auto 360px;
   }
 }
-
-.description > p {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.description > p:first-child {
-  margin-top: 16px;
-}
-
-.description > p:last-child {
-  margin-bottom: 16px;
-}

package/styles/cspace/RootPage.css

@@ -25,11 +25,15 @@ a:focus {
 }
 
 p {
-  margin: 16px 0;
+  margin: 0;
 }
 
 p:first-child {
-  margin-top: 0;
+  margin-top: 16px;
+}
+
+p:last-child {
+  margin-bottom: 16px;
 }
 
 input {