@collectionspace/cspace-public-browser 2.1.2 → 2.1.3

package/lib/config/anthro.js

@@ -57,7 +57,7 @@ var _default = exports.default = {
         fields: ['collectionYears']
       },
       group_description: {
-        fields: ['material', 'technique', 'subject', 'color', 'taxon']
+        fields: ['material', 'technique', 'contentConcept', 'color', 'taxon']
       }
     },
     layout: {
@@ -115,7 +115,7 @@ var _default = exports.default = {
         fields: ['fieldCollectionDate', 'fieldCollector']
       },
       group_description: {
-        fields: ['material', 'technique', 'subject', 'contentDescription', 'measuredPart', 'creditLine', 'taxon']
+        fields: ['material', 'technique', 'contentConcept', 'measuredPart', 'creditLine', 'taxon']
       }
     },
     layout: {

package/lib/config/default.js

@@ -227,15 +227,15 @@ var _default = exports.default = {
           }
         })
       },
-      subject: {
-        field: 'collectionspace_denorm:contentSubjectList.subject',
+      contentConcept: {
+        field: 'collectionobjects_common:contentConcepts.displayName',
         messages: (0, _reactIntl.defineMessages)({
           label: {
-            "id": "filter.subject.label",
+            "id": "filter.contentConcept.label",
             "defaultMessage": "Subject"
           },
           shortLabel: {
-            "id": "filter.subject.shortLabel",
+            "id": "filter.contentConcept.shortLabel",
             "defaultMessage": "Subject"
           }
         }),
@@ -298,7 +298,7 @@ var _default = exports.default = {
             "defaultMessage": "Description"
           }
         }),
-        fields: ['material', 'subject', 'color']
+        fields: ['material', 'contentConcept', 'color']
       },
       group_production: {
         messages: (0, _reactIntl.defineMessages)({
@@ -473,28 +473,18 @@ var _default = exports.default = {
           roleFieldName: 'techniqueType'
         }))
       },
-      subject: {
+      contentConcept: {
         messages: (0, _reactIntl.defineMessages)({
           label: {
-            "id": "detailField.subject.label",
+            "id": "detailField.contentConcept.label",
             "defaultMessage": "Subject"
           }
         }),
-        field: 'collectionspace_denorm:contentSubjectList',
-        format: (0, _formatHelpers.listOf)((0, _formatHelpers.valueAt)({
-          path: 'subject',
-          format: (0, _formatHelpers.filterLink)({})
+        field: 'collectionobjects_common:contentConcepts',
+        format: (0, _formatHelpers.listOf)((0, _formatHelpers.filterLink)({
+          filterValueFormat: _formatHelpers.displayName
         }))
       },
-      contentDescription: {
-        messages: (0, _reactIntl.defineMessages)({
-          label: {
-            "id": "detailField.contentDescription.label",
-            "defaultMessage": "Content Description"
-          }
-        }),
-        field: 'collectionobjects_common:contentDescription'
-      },
       measuredPart: {
         messages: (0, _reactIntl.defineMessages)({
           label: {
@@ -574,7 +564,7 @@ var _default = exports.default = {
             "defaultMessage": "Description"
           }
         }),
-        fields: ['material', 'technique', 'subject', 'contentDescription', 'measuredPart', 'creditLine']
+        fields: ['material', 'technique', 'contentConcept', 'measuredPart', 'creditLine']
       },
       group_production: {
         messages: (0, _reactIntl.defineMessages)({

package/lib/config/fcart.js

@@ -28,7 +28,7 @@ var _default = exports.default = {
     },
     groups: {
       group_description: {
-        fields: ['materialTechniqueDescription', 'material', 'technique', 'subject', 'contentDescription', 'measuredPart', 'creditLine']
+        fields: ['materialTechniqueDescription', 'material', 'technique', 'contentConcept', 'measuredPart', 'creditLine']
       }
     }
   }

package/lib/config/materials.js

@@ -917,12 +917,9 @@ var _default = exports.default = {
             linkValue: false
           }))
         },
-        objectCount: {
+        numberOfObjects: {
           label: 'Holdings',
-          field: 'collectionobjects_common:objectCountGroupList',
-          format: (0, _formatHelpers.head)((0, _formatHelpers.valueAt)({
-            path: 'objectCount'
-          }))
+          field: 'collectionobjects_common:numberOfObjects'
         },
         objectStatusList: {
           label: 'Type',
@@ -969,7 +966,7 @@ var _default = exports.default = {
           fields: ['colors', 'materialGenericColors', 'materialFinishGroupList']
         },
         group_sample_holdings: {
-          fields: ['objectCount', 'objectStatusList'],
+          fields: ['numberOfObjects', 'objectStatusList'],
           className: 'inline'
         },
         group_sample_briefDescriptions: {

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.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.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"));
@@ -231,8 +231,6 @@ array && array.length > 0 && array.map((value, index) => /*#__PURE__*/_react.def
   key: index
 }, value));
 exports.paragraphs = paragraphs;
-const head = format => (array, fieldName) => Array.isArray(array) && array.length > 0 ? format(array[0], fieldName) : null;
-exports.head = head;
 const valueAt = config => data => {
   const {
     path,

package/package.json

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

package/src/config/anthro.js

@@ -65,7 +65,7 @@ export default {
         fields: [
           'material',
           'technique',
-          'subject',
+          'contentConcept',
           'color',
           'taxon',
         ],
@@ -137,8 +137,7 @@ export default {
         fields: [
           'material',
           'technique',
-          'subject',
-          'contentDescription',
+          'contentConcept',
           'measuredPart',
           'creditLine',
           'taxon',

package/src/config/default.js

@@ -252,15 +252,15 @@ export default {
           },
         }),
       },
-      subject: {
-        field: 'collectionspace_denorm:contentSubjectList.subject',
+      contentConcept: {
+        field: 'collectionobjects_common:contentConcepts.displayName',
         messages: defineMessages({
           label: {
-            id: 'filter.subject.label',
+            id: 'filter.contentConcept.label',
             defaultMessage: 'Subject',
           },
           shortLabel: {
-            id: 'filter.subject.shortLabel',
+            id: 'filter.contentConcept.shortLabel',
             defaultMessage: 'Subject',
           },
         }),
@@ -331,7 +331,7 @@ export default {
         }),
         fields: [
           'material',
-          'subject',
+          'contentConcept',
           'color',
         ],
       },
@@ -528,28 +528,18 @@ export default {
           roleFieldName: 'techniqueType',
         })),
       },
-      subject: {
+      contentConcept: {
         messages: defineMessages({
           label: {
-            id: 'detailField.subject.label',
+            id: 'detailField.contentConcept.label',
             defaultMessage: 'Subject',
           },
         }),
-        field: 'collectionspace_denorm:contentSubjectList',
-        format: listOf(valueAt({
-          path: 'subject',
-          format: filterLink({}),
+        field: 'collectionobjects_common:contentConcepts',
+        format: listOf(filterLink({
+          filterValueFormat: displayName,
         })),
       },
-      contentDescription: {
-        messages: defineMessages({
-          label: {
-            id: 'detailField.contentDescription.label',
-            defaultMessage: 'Content Description',
-          },
-        }),
-        field: 'collectionobjects_common:contentDescription',
-      },
       measuredPart: {
         messages: defineMessages({
           label: {
@@ -636,8 +626,7 @@ export default {
         fields: [
           'material',
           'technique',
-          'subject',
-          'contentDescription',
+          'contentConcept',
           'measuredPart',
           'creditLine',
         ],

package/src/config/fcart.js

@@ -28,8 +28,7 @@ export default {
           'materialTechniqueDescription',
           'material',
           'technique',
-          'subject',
-          'contentDescription',
+          'contentConcept',
           'measuredPart',
           'creditLine',
         ],

package/src/config/materials.js

@@ -4,7 +4,6 @@ import { getItemShortID } from 'cspace-refname';
 import {
   displayName,
   filterLink,
-  head,
   linkText,
   inlineList,
   listOf,
@@ -1071,10 +1070,9 @@ export default {
             linkValue: false,
           })),
         },
-        objectCount: {
+        numberOfObjects: {
           label: 'Holdings',
-          field: 'collectionobjects_common:objectCountGroupList',
-          format: head(valueAt({ path: 'objectCount' })),
+          field: 'collectionobjects_common:numberOfObjects',
         },
         objectStatusList: {
           label: 'Type',
@@ -1140,7 +1138,7 @@ export default {
         },
         group_sample_holdings: {
           fields: [
-            'objectCount',
+            'numberOfObjects',
             'objectStatusList',
           ],
           className: 'inline',

package/src/helpers/formatHelpers.jsx

@@ -299,10 +299,6 @@ export const paragraphs = (array) => (
   array && array.length > 0 && array.map((value, index) => <p key={index}>{value}</p>)
 );
 
-export const head = (format) => (array, fieldName) => (
-  Array.isArray(array) && array.length > 0 ? format(array[0], fieldName) : null
-);
-
 export const valueAt = (config) => (data) => {
   const {
     path,