@collectionspace/cspace-public-browser 3.2.0 → 3.3.0

package/lib/components/detail/DetailPanel.js

@@ -66,8 +66,18 @@ class DetailPanel extends _react.Component {
       data
     } = this.props;
     const descFormatter = _config.default.get('detailDescription');
-    const desc = descFormatter && descFormatter(data);
-    return /*#__PURE__*/_react.default.createElement("p", null, desc);
+    const descriptionData = descFormatter && descFormatter(data);
+    if (descriptionData) {
+      const descriptions = Array.isArray(descriptionData)
+      // eslint-disable-next-line react/no-array-index-key
+      ? descriptionData.map((desc, idx) => /*#__PURE__*/_react.default.createElement("p", {
+        key: idx
+      }, desc)) : /*#__PURE__*/_react.default.createElement("p", null, descriptionData);
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: _DetailPanel.default.description
+      }, descriptions);
+    }
+    return undefined;
   }
   renderFieldList() {
     const {

package/lib/config/default.js

@@ -343,9 +343,9 @@ var _default = exports.default = {
       'collectionobjects_common:briefDescriptions': briefDescriptions
     } = data;
     if (briefDescriptions && briefDescriptions.length > 0) {
-      return briefDescriptions[0];
+      return briefDescriptions;
     }
-    return undefined;
+    return [];
   },
   detailFields: {
     fields: {
@@ -555,6 +555,20 @@ var _default = exports.default = {
         format: (0, _formatHelpers.listOf)((0, _formatHelpers.valueAt)({
           path: 'rightReproductionStatement'
         }))
+      },
+      relatedLinks: {
+        messages: (0, _reactIntl.defineMessages)({
+          label: {
+            "id": "detailField.relatedLinks.label",
+            "defaultMessage": "Related Links"
+          }
+        }),
+        field: 'collectionobjects_common:publishedRelatedLinkGroupList',
+        format: (0, _formatHelpers.listOf)((0, _formatHelpers.linkText)({
+          urlFieldName: 'relatedLink',
+          textFieldName: 'descriptiveTitle',
+          type: 'external'
+        }))
       }
     },
     groups: {
@@ -593,10 +607,19 @@ var _default = exports.default = {
           }
         }),
         fields: ['rightStatement', 'standardizedRightStatement', 'rightReproductionStatement']
+      },
+      group_reference: {
+        messages: (0, _reactIntl.defineMessages)({
+          label: {
+            "id": "detailGroup.group_reference.label",
+            "defaultMessage": "Reference"
+          }
+        }),
+        fields: ['relatedLinks']
       }
     },
     layout: {
-      fields1: ['group_id', 'group_description', 'group_production', 'group_rights']
+      fields1: ['group_id', 'group_description', 'group_production', 'group_rights', 'group_reference']
     }
   }
 };

package/lib/config/materials.js

@@ -401,6 +401,24 @@ var _default = exports.default = {
             "defaultMessage": "Additional process"
           }
         })
+      },
+      featuredApplication: {
+        field: 'materials_common:featuredApplicationGroupList.featuredApplication.displayName',
+        messages: (0, _reactIntl.defineMessages)({
+          label: {
+            "id": "filter.featuredApplication.label",
+            "defaultMessage": "Featured application"
+          }
+        })
+      },
+      featuredCollection: {
+        field: 'materials_common:featuredCollectionGroupList.featuredCollection.displayName',
+        messages: (0, _reactIntl.defineMessages)({
+          label: {
+            "id": "filter.featuredCollection.label",
+            "defaultMessage": "Featured collection"
+          }
+        })
       }
     },
     groups: {
@@ -481,7 +499,9 @@ var _default = exports.default = {
         field: 'materials_common:featuredCollectionGroupList',
         format: (0, _formatHelpers.listOf)((0, _formatHelpers.valueAt)({
           path: 'featuredCollection',
-          format: _formatHelpers.displayName
+          format: (0, _formatHelpers.filterLink)({
+            filterValueFormat: _formatHelpers.displayName
+          })
         }))
       },
       materialCompositionGroupList: {

package/package.json

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

package/src/components/detail/DetailPanel.jsx

@@ -67,9 +67,22 @@ export default class DetailPanel extends Component {
     } = this.props;
 
     const descFormatter = config.get('detailDescription');
-    const desc = descFormatter && descFormatter(data);
+    const descriptionData = descFormatter && descFormatter(data);
 
-    return <p>{desc}</p>;
+    if (descriptionData) {
+      const descriptions = Array.isArray(descriptionData)
+        // eslint-disable-next-line react/no-array-index-key
+        ? descriptionData.map((desc, idx) => <p key={idx}>{desc}</p>)
+        : <p>{descriptionData}</p>;
+
+      return (
+        <div className={styles.description}>
+          {descriptions}
+        </div>
+      );
+    }
+
+    return undefined;
   }
 
   renderFieldList() {

package/src/config/default.js

@@ -6,6 +6,7 @@ import {
   decade,
   displayName,
   filterLink,
+  linkText,
   list,
   listOf,
   nameRole,
@@ -400,10 +401,10 @@ export default {
     } = data;
 
     if (briefDescriptions && briefDescriptions.length > 0) {
-      return briefDescriptions[0];
+      return briefDescriptions;
     }
 
-    return undefined;
+    return [];
   },
 
   detailFields: {
@@ -611,6 +612,20 @@ export default {
           path: 'rightReproductionStatement',
         })),
       },
+      relatedLinks: {
+        messages: defineMessages({
+          label: {
+            id: 'detailField.relatedLinks.label',
+            defaultMessage: 'Related Links',
+          },
+        }),
+        field: 'collectionobjects_common:publishedRelatedLinkGroupList',
+        format: listOf(linkText({
+          urlFieldName: 'relatedLink',
+          textFieldName: 'descriptiveTitle',
+          type: 'external',
+        })),
+      },
     },
     groups: {
       group_id: {
@@ -670,6 +685,17 @@ export default {
           'rightReproductionStatement',
         ],
       },
+      group_reference: {
+        messages: defineMessages({
+          label: {
+            id: 'detailGroup.group_reference.label',
+            defaultMessage: 'Reference',
+          },
+        }),
+        fields: [
+          'relatedLinks',
+        ],
+      },
     },
     layout: {
       fields1: [
@@ -677,6 +703,7 @@ export default {
         'group_description',
         'group_production',
         'group_rights',
+        'group_reference',
       ],
     },
   },

package/src/config/materials.js

@@ -454,6 +454,24 @@ export default {
           },
         }),
       },
+      featuredApplication: {
+        field: 'materials_common:featuredApplicationGroupList.featuredApplication.displayName',
+        messages: defineMessages({
+          label: {
+            id: 'filter.featuredApplication.label',
+            defaultMessage: 'Featured application',
+          },
+        }),
+      },
+      featuredCollection: {
+        field: 'materials_common:featuredCollectionGroupList.featuredCollection.displayName',
+        messages: defineMessages({
+          label: {
+            id: 'filter.featuredCollection.label',
+            defaultMessage: 'Featured collection',
+          },
+        }),
+      },
     },
     groups: {
       group_institution: {
@@ -576,7 +594,9 @@ export default {
         field: 'materials_common:featuredCollectionGroupList',
         format: listOf((valueAt({
           path: 'featuredCollection',
-          format: displayName,
+          format: filterLink({
+            filterValueFormat: displayName,
+          }),
         }))),
       },
       materialCompositionGroupList: {

package/styles/cspace/DetailPanel.css

@@ -67,3 +67,16 @@ 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;
+}