diff --git a/__tests__/src/components/LabelValueMetadata.test.js b/__tests__/src/components/LabelValueMetadata.test.js index 0e80dbde59ad9c64b6c4870f2176b5ec16793c86..23c279ff140fa029e8c8b8c0adad4d2d6468bab3 100644 --- a/__tests__/src/components/LabelValueMetadata.test.js +++ b/__tests__/src/components/LabelValueMetadata.test.js @@ -13,11 +13,11 @@ describe('LabelValueMetadata', () => { labelValuePair = [ { label: 'Label 1', - value: 'Value 1', + values: ['Value 1'], }, { label: 'Label 2', - value: 'Value 2', + values: ['Value 2'], }, ]; wrapper = shallow( @@ -67,11 +67,11 @@ describe('LabelValueMetadata', () => { beforeEach(() => { labelValuePair = [ { - value: 'Value 1', + values: ['Value 1'], }, { label: 'Label 2', - value: 'Value 2', + values: ['Value 2'], }, ]; wrapper = shallow( diff --git a/__tests__/src/selectors/manifests.test.js b/__tests__/src/selectors/manifests.test.js index a459e3c8ad669e0bcb3d2de0ba7435ddd278504d..17d9db6c07e1e461b87dfa5ff46879a6734f5637 100644 --- a/__tests__/src/selectors/manifests.test.js +++ b/__tests__/src/selectors/manifests.test.js @@ -247,7 +247,7 @@ describe('getDestructuredMetadata', () => { const received = getDestructuredMetadata(iiifResource); const expected = [{ label: 'date', - value: 'some date', + values: ['some date'], }]; expect(received).toEqual(expected); @@ -267,7 +267,7 @@ describe('getManifestMetadata', () => { const received = getManifestMetadata(state, { manifestId: 'x' }); const expected = [{ label: 'date', - value: 'some date', + values: ['some date'], }]; expect(received).toEqual(expected); diff --git a/src/components/LabelValueMetadata.js b/src/components/LabelValueMetadata.js index d89e50352662a769491dd4daef7d590cdf7e006f..a003b9a4007fece59dd7c349cf6222c014485f80 100644 --- a/src/components/LabelValueMetadata.js +++ b/src/components/LabelValueMetadata.js @@ -29,7 +29,7 @@ export class LabelValueMetadata extends Component { {labelValuePairs.reduce((acc, labelValuePair, i) => acc.concat([ <Typography component="dt" key={`label-${i}`} variant="subtitle2">{labelValuePair.label || defaultLabel}</Typography>, <Typography style={{ marginBottom: '.5em', marginLeft: '0px' }} component="dd" key={`value-${i}`} variant="body1"> - <SanitizedHtml htmlString={labelValuePair.value} ruleSet="iiif" /> + <SanitizedHtml htmlString={labelValuePair.values.join(', ')} ruleSet="iiif" /> </Typography>, ]), [])} </dl> diff --git a/src/state/selectors/manifests.js b/src/state/selectors/manifests.js index 8b8d02bce111db0f52708a50d962f4dd2cb27407..e54d140778829c43711afbd8a583b1632cb6d56c 100644 --- a/src/state/selectors/manifests.js +++ b/src/state/selectors/manifests.js @@ -288,7 +288,7 @@ export function getDestructuredMetadata(iiifResource) { return (iiifResource && iiifResource.getMetadata().map(labelValuePair => ({ label: labelValuePair.getLabel(), - value: labelValuePair.getValue(), + values: labelValuePair.getValues(), })) ); }