From f8f3a0f30fc50bafd3bf6de3beb9f76aa919ec31 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 10 Aug 2023 11:30:23 -0600 Subject: [PATCH 1/5] DRYD-1264: Update chronology field names to be consistent with the ui --- docs/configuration/messages.js | 24 +++++----- src/plugins/recordTypes/chronology/fields.js | 44 +++++++++---------- .../recordTypes/chronology/forms/default.jsx | 22 +++++----- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/configuration/messages.js b/docs/configuration/messages.js index ea1d3683..4b1b16c8 100644 --- a/docs/configuration/messages.js +++ b/docs/configuration/messages.js @@ -725,13 +725,13 @@ export default { "field.blobs_common.name.name": "Name", - "field.chronologies_common.chronologyDateStructuredDateGroup.name": "Primary date range", + "field.chronologies_common.primaryDateRangeStructuredDateGroup.name": "Primary date range", "field.chronologies_common.chronologyDescription.name": "Chronology description", "field.chronologies_common.chronologyNote.name": "Chronology note", - "field.chronologies_common.chronologyPlaces.name": "Spatial coverage", + "field.chronologies_common.spatialCoverage.name": "Spatial coverage", "field.chronologies_common.chronologyTermGroup.name": "Term", @@ -757,23 +757,23 @@ export default { "field.chronologies_common.identifierValue.name": "Value", - "field.chronologies_common.otherDateCitation.fullName": "Alternative date citation", + "field.chronologies_common.altDateCitation.fullName": "Alternative date citation", - "field.chronologies_common.otherDateCitation.name": "Citation", + "field.chronologies_common.altDateCitation.name": "Citation", - "field.chronologies_common.otherDateGroup.name": "Alternative date", + "field.chronologies_common.altDateGroup.name": "Alternative date", - "field.chronologies_common.otherDateNote.fullName": "Alternative date note", + "field.chronologies_common.altDateNote.fullName": "Alternative date note", - "field.chronologies_common.otherDateNote.name": "Note", + "field.chronologies_common.altDateNote.name": "Note", - "field.chronologies_common.otherDatePlace.fullName": "Alternative date spacial coverage", + "field.chronologies_common.altDateSpatialCoverage.fullName": "Alternative date spacial coverage", - "field.chronologies_common.otherDatePlace.name": "Spatial coverage", + "field.chronologies_common.altDateSpatialCoverage.name": "Spatial coverage", - "field.chronologies_common.otherDateStructuredDateGroup.fullName": "Alternative date range", + "field.chronologies_common.altDateRangeStructuredDateGroup.fullName": "Alternative date range", - "field.chronologies_common.otherDateStructuredDateGroup.name": "Range", + "field.chronologies_common.altDateRangeStructuredDateGroup.name": "Range", "field.chronologies_common.termDisplayName.fullName": "Term display name", @@ -7682,4 +7682,4 @@ export default { "workflowStateIcon.locked": "Locked", "workflowStateIcon.replicated": "Replicated", -} \ No newline at end of file +} diff --git a/src/plugins/recordTypes/chronology/fields.js b/src/plugins/recordTypes/chronology/fields.js index 78ccd6dd..a45492f4 100644 --- a/src/plugins/recordTypes/chronology/fields.js +++ b/src/plugins/recordTypes/chronology/fields.js @@ -360,12 +360,12 @@ export default (configContext) => { }, }, }, - chronologyDateStructuredDateGroup: { + primaryDateRangeStructuredDateGroup: { [config]: { dataType: DATA_TYPE_STRUCTURED_DATE, messages: defineMessages({ name: { - id: 'field.chronologies_common.chronologyDateStructuredDateGroup.name', + id: 'field.chronologies_common.primaryDateRangeStructuredDateGroup.name', defaultMessage: 'Primary date range', }, }), @@ -375,17 +375,17 @@ export default (configContext) => { }, ...extensions.structuredDate.fields, }, - chronologyPlaces: { + spatialCoverages: { [config]: { view: { type: CompoundInput, }, }, - chronologyPlace: { + spatialCoverage: { [config]: { messages: defineMessages({ name: { - id: 'field.chronologies_common.chronologyPlaces.name', + id: 'field.chronologies_common.spatialCoverage.name', defaultMessage: 'Spatial coverage', }, }), @@ -526,17 +526,17 @@ export default (configContext) => { }, }, }, - otherDateGroupList: { + altDateGroupList: { [config]: { view: { type: CompoundInput, }, }, - otherDateGroup: { + altDateGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.chronologies_common.otherDateGroup.name', + id: 'field.chronologies_common.altDateGroup.name', defaultMessage: 'Alternative date', }, }), @@ -545,16 +545,16 @@ export default (configContext) => { type: CompoundInput, }, }, - otherDateStructuredDateGroup: { + altDateRangeStructuredDateGroup: { [config]: { dataType: DATA_TYPE_STRUCTURED_DATE, messages: defineMessages({ fullName: { - id: 'field.chronologies_common.otherDateStructuredDateGroup.fullName', + id: 'field.chronologies_common.altDateRangeStructuredDateGroup.fullName', defaultMessage: 'Alternative date range', }, name: { - id: 'field.chronologies_common.otherDateStructuredDateGroup.name', + id: 'field.chronologies_common.altDateRangeStructuredDateGroup.name', defaultMessage: 'Range', }, }), @@ -564,21 +564,21 @@ export default (configContext) => { }, ...extensions.structuredDate.fields, }, - otherDatePlaces: { + altDateSpatialCoverages: { [config]: { view: { type: CompoundInput, }, }, - otherDatePlace: { + altDateSpatialCoverage: { [config]: { messages: defineMessages({ fullName: { - id: 'field.chronologies_common.otherDatePlace.fullName', + id: 'field.chronologies_common.altDateSpatialCoverage.fullName', defaultMessage: 'Alternative date spacial coverage', }, name: { - id: 'field.chronologies_common.otherDatePlace.name', + id: 'field.chronologies_common.altDateSpatialCoverage.name', defaultMessage: 'Spatial coverage', }, }), @@ -592,21 +592,21 @@ export default (configContext) => { }, }, }, - otherDateCitations: { + altDateCitations: { [config]: { view: { type: CompoundInput, }, }, - otherDateCitation: { + altDateCitation: { [config]: { messages: defineMessages({ fullName: { - id: 'field.chronologies_common.otherDateCitation.fullName', + id: 'field.chronologies_common.altDateCitation.fullName', defaultMessage: 'Alternative date citation', }, name: { - id: 'field.chronologies_common.otherDateCitation.name', + id: 'field.chronologies_common.altDateCitation.name', defaultMessage: 'Citation', }, }), @@ -620,15 +620,15 @@ export default (configContext) => { }, }, }, - otherDateNote: { + altDateNote: { [config]: { messages: defineMessages({ fullName: { - id: 'field.chronologies_common.otherDateNote.fullName', + id: 'field.chronologies_common.altDateNote.fullName', defaultMessage: 'Alternative date note', }, name: { - id: 'field.chronologies_common.otherDateNote.name', + id: 'field.chronologies_common.altDateNote.name', defaultMessage: 'Note', }, }), diff --git a/src/plugins/recordTypes/chronology/forms/default.jsx b/src/plugins/recordTypes/chronology/forms/default.jsx index 290659c8..e28e7be8 100644 --- a/src/plugins/recordTypes/chronology/forms/default.jsx +++ b/src/plugins/recordTypes/chronology/forms/default.jsx @@ -54,10 +54,10 @@ const template = (configContext) => { - + - - + + @@ -80,22 +80,22 @@ const template = (configContext) => { - - + + - - - + + + - - + + - + From 302604fd6c45031d067293ad2a0a3de3c9e745a2 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 10 Aug 2023 12:01:06 -0600 Subject: [PATCH 2/5] DRYD-1264: Update associated authority field names --- docs/configuration/messages.js | 22 ++--- .../extensions/associatedAuthority/fields.js | 80 +++++++++---------- .../extensions/associatedAuthority/form.jsx | 36 ++++----- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/docs/configuration/messages.js b/docs/configuration/messages.js index 4b1b16c8..797d417b 100644 --- a/docs/configuration/messages.js +++ b/docs/configuration/messages.js @@ -2633,27 +2633,27 @@ export default { "field.ext.associatedAuthority.placeType.name": "Relationship/Type", - "field.ext.associatedAuthority.relatedPeriod.fullName": "Related period associated", + "field.ext.associatedAuthority.chronology.fullName": "Related period associated", - "field.ext.associatedAuthority.relatedPeriod.name": "Associated", + "field.ext.associatedAuthority.chronology.name": "Associated", - "field.ext.associatedAuthority.relatedPeriodCitation.fullName": "Related period citation", + "field.ext.associatedAuthority.chronologyCitation.fullName": "Related period citation", - "field.ext.associatedAuthority.relatedPeriodCitation.name": "Citation", + "field.ext.associatedAuthority.chronologyCitation.name": "Citation", - "field.ext.associatedAuthority.relatedPeriodGroup.name": "Related period", + "field.ext.associatedAuthority.chronologyGroup.name": "Related chronology", - "field.ext.associatedAuthority.relatedPeriodNote.fullName": "Related period note", + "field.ext.associatedAuthority.chronologyNote.fullName": "Related chronology note", - "field.ext.associatedAuthority.relatedPeriodNote.name": "Note", + "field.ext.associatedAuthority.chronologyNote.name": "Note", - "field.ext.associatedAuthority.relatedPeriodStructuredDateGroup.fullName": "Related period date", + "field.ext.associatedAuthority.chronologyStructuredDateGroup.fullName": "Related chronology date", - "field.ext.associatedAuthority.relatedPeriodStructuredDateGroup.name": "Date", + "field.ext.associatedAuthority.chronologyStructuredDateGroup.name": "Date", - "field.ext.associatedAuthority.relatedPeriodType.fullName": "Related period relationship/type", + "field.ext.associatedAuthority.chronologyType.fullName": "Related chronology relationship/type", - "field.ext.associatedAuthority.relatedPeriodType.name": "Relationship/Type", + "field.ext.associatedAuthority.chronologyType.name": "Relationship/Type", "field.ext.authItem.csid.name": "System CSID", diff --git a/src/plugins/extensions/associatedAuthority/fields.js b/src/plugins/extensions/associatedAuthority/fields.js index 08072459..1e2dcb3a 100644 --- a/src/plugins/extensions/associatedAuthority/fields.js +++ b/src/plugins/extensions/associatedAuthority/fields.js @@ -22,17 +22,17 @@ export default (configContext) => { } = configContext.config; return { - personGroupList: { + assocPersonAuthGroupList: { [config]: { view: { type: CompoundInput, }, }, - personGroup: { + assocPersonAuthGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.ext.associatedAuthority.personGroup.name', + id: 'field.ext.associatedAuthority.assocPersonAuthGroup.name', defaultMessage: 'Person', }, }), @@ -147,17 +147,17 @@ export default (configContext) => { }, }, }, - peopleGroupList: { + assocPeopleAuthGroupList: { [config]: { view: { type: CompoundInput, }, }, - peopleGroup: { + assocPeopleAuthGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.ext.associatedAuthority.peopleGroup.name', + id: 'field.ext.associatedAuthority.assocPeopleAuthGroup.name', defaultMessage: 'People', }, }), @@ -272,17 +272,17 @@ export default (configContext) => { }, }, }, - organizationGroupList: { + assocOrganizationAuthGroupList: { [config]: { view: { type: CompoundInput, }, }, - organizationGroup: { + assocOrganizationAuthGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.ext.associatedAuthority.organizationGroup.name', + id: 'field.ext.associatedAuthority.assocOrganizationAuthGroup.name', defaultMessage: 'Organization', }, }), @@ -397,17 +397,17 @@ export default (configContext) => { }, }, }, - conceptGroupList: { + assocConceptAuthGroupList: { [config]: { view: { type: CompoundInput, }, }, - conceptGroup: { + assocConceptAuthGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.ext.associatedAuthority.conceptGroup.name', + id: 'field.ext.associatedAuthority.assocConceptAuthGroup.name', defaultMessage: 'Concept', }, }), @@ -522,17 +522,17 @@ export default (configContext) => { }, }, }, - placeGroupList: { + assocPlaceAuthGroupList: { [config]: { view: { type: CompoundInput, }, }, - placeGroup: { + assocPlaceAuthGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.ext.associatedAuthority.placeGroup.name', + id: 'field.ext.associatedAuthority.assocPlaceAuthGroup.name', defaultMessage: 'Place', }, }), @@ -647,18 +647,18 @@ export default (configContext) => { }, }, }, - relatedPeriodGroupList: { + assocChronologyAuthGroupList: { [config]: { view: { type: CompoundInput, }, }, - relatedPeriodGroup: { + assocChronologyAuthGroup: { [config]: { messages: defineMessages({ name: { - id: 'field.ext.associatedAuthority.relatedPeriodGroup.name', - defaultMessage: 'Related period', + id: 'field.ext.associatedAuthority.assocChronologyAuthGroup.name', + defaultMessage: 'Related chronology', }, }), repeating: true, @@ -666,15 +666,15 @@ export default (configContext) => { type: CompoundInput, }, }, - relatedPeriod: { + chronology: { [config]: { messages: defineMessages({ fullName: { - id: 'field.ext.associatedAuthority.relatedPeriod.fullName', - defaultMessage: 'Related period associated', + id: 'field.ext.associatedAuthority.chronology.fullName', + defaultMessage: 'Related chronology associated', }, name: { - id: 'field.ext.associatedAuthority.relatedPeriod.name', + id: 'field.ext.associatedAuthority.chronology.name', defaultMessage: 'Associated', }, }), @@ -686,15 +686,15 @@ export default (configContext) => { }, }, }, - relatedPeriodType: { + chronologyType: { [config]: { messages: defineMessages({ fullName: { - id: 'field.ext.associatedAuthority.relatedPeriodType.fullName', - defaultMessage: 'Related period relationship/type', + id: 'field.ext.associatedAuthority.chronologyType.fullName', + defaultMessage: 'Related chronology relationship/type', }, name: { - id: 'field.ext.associatedAuthority.relatedPeriodType.name', + id: 'field.ext.associatedAuthority.chronologyType.name', defaultMessage: 'Relationship/Type', }, }), @@ -706,16 +706,16 @@ export default (configContext) => { }, }, }, - relatedPeriodStructuredDateGroup: { + chronologyStructuredDateGroup: { [config]: { dataType: DATA_TYPE_STRUCTURED_DATE, messages: defineMessages({ fullName: { - id: 'field.ext.associatedAuthority.relatedPeriodStructuredDateGroup.fullName', - defaultMessage: 'Related period date', + id: 'field.ext.associatedAuthority.chronologyStructuredDateGroup.fullName', + defaultMessage: 'Related chronology date', }, name: { - id: 'field.ext.associatedAuthority.relatedPeriodStructuredDateGroup.name', + id: 'field.ext.associatedAuthority.chronologyStructuredDateGroup.name', defaultMessage: 'Date', }, }), @@ -725,21 +725,21 @@ export default (configContext) => { }, ...extensions.structuredDate.fields, }, - relatedPeriodCitations: { + chronologyCitations: { [config]: { view: { type: CompoundInput, }, }, - relatedPeriodCitation: { + chronologyCitation: { [config]: { messages: defineMessages({ fullName: { - id: 'field.ext.associatedAuthority.relatedPeriodCitation.fullName', - defaultMessage: 'Related period citation', + id: 'field.ext.associatedAuthority.chronologyCitation.fullName', + defaultMessage: 'Related chronology citation', }, name: { - id: 'field.ext.associatedAuthority.relatedPeriodCitation.name', + id: 'field.ext.associatedAuthority.chronologyCitation.name', defaultMessage: 'Citation', }, }), @@ -753,15 +753,15 @@ export default (configContext) => { }, }, }, - relatedPeriodNote: { + chronologyNote: { [config]: { messages: defineMessages({ fullName: { - id: 'field.ext.associatedAuthority.relatedPeriodNote.fullName', - defaultMessage: 'Related period note', + id: 'field.ext.associatedAuthority.chronologyNote.fullName', + defaultMessage: 'Related chronology note', }, name: { - id: 'field.ext.associatedAuthority.relatedPeriodNote.name', + id: 'field.ext.associatedAuthority.chronologyNote.name', defaultMessage: 'Note', }, }), diff --git a/src/plugins/extensions/associatedAuthority/form.jsx b/src/plugins/extensions/associatedAuthority/form.jsx index 82190d23..16ef1836 100644 --- a/src/plugins/extensions/associatedAuthority/form.jsx +++ b/src/plugins/extensions/associatedAuthority/form.jsx @@ -20,8 +20,8 @@ export default (configContext) => { return ( <> - - + + @@ -36,8 +36,8 @@ export default (configContext) => { - - + + @@ -52,8 +52,8 @@ export default (configContext) => { - - + + @@ -68,8 +68,8 @@ export default (configContext) => { - - + + @@ -84,8 +84,8 @@ export default (configContext) => { - - + + @@ -100,17 +100,17 @@ export default (configContext) => { - - + + - - - - - + + + + + - + From cdb0e841f899a3a359de82f57beb6176c9dbfb66 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 11 Aug 2023 12:18:55 -0600 Subject: [PATCH 3/5] DRYD-1267: Remove associated authorities from chronology --- src/plugins/extensions/associatedAuthority/fields.js | 4 ++++ src/plugins/recordTypes/chronology/fields.js | 1 - src/plugins/recordTypes/chronology/forms/default.jsx | 8 -------- src/plugins/recordTypes/chronology/messages.js | 4 ---- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/plugins/extensions/associatedAuthority/fields.js b/src/plugins/extensions/associatedAuthority/fields.js index 1e2dcb3a..6f4e573c 100644 --- a/src/plugins/extensions/associatedAuthority/fields.js +++ b/src/plugins/extensions/associatedAuthority/fields.js @@ -1,5 +1,9 @@ import { defineMessages } from 'react-intl'; +/** + * The associated authorities extension is currently unused while + * it is being re-spec'd + */ export default (configContext) => { const { AutocompleteInput, diff --git a/src/plugins/recordTypes/chronology/fields.js b/src/plugins/recordTypes/chronology/fields.js index a45492f4..1878de9b 100644 --- a/src/plugins/recordTypes/chronology/fields.js +++ b/src/plugins/recordTypes/chronology/fields.js @@ -74,7 +74,6 @@ export default (configContext) => { }, }, ...extensions.authItem.fields, - ...extensions.associatedAuthority.fields, chronologyTermGroupList: { [config]: { messages: defineMessages({ diff --git a/src/plugins/recordTypes/chronology/forms/default.jsx b/src/plugins/recordTypes/chronology/forms/default.jsx index e28e7be8..a653e1df 100644 --- a/src/plugins/recordTypes/chronology/forms/default.jsx +++ b/src/plugins/recordTypes/chronology/forms/default.jsx @@ -17,10 +17,6 @@ const template = (configContext) => { InputTable, } = configContext.recordComponents; - const { - extensions, - } = configContext.config; - return ( @@ -75,10 +71,6 @@ const template = (configContext) => { - - {extensions.associatedAuthority.form} - - diff --git a/src/plugins/recordTypes/chronology/messages.js b/src/plugins/recordTypes/chronology/messages.js index 11481b61..1f7cad90 100644 --- a/src/plugins/recordTypes/chronology/messages.js +++ b/src/plugins/recordTypes/chronology/messages.js @@ -18,10 +18,6 @@ export default { id: 'panel.chronology.info', defaultMessage: 'Chronology Information', }, - associated: { - id: 'panel.chronology.associated', - defaultMessage: 'Associated Authorities', - }, altdate: { id: 'panel.chronology.altdate', defaultMessage: 'Alternative Date Information', From 742e2b0aedbffabb76068db9648547ef16dc1809 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 11 Aug 2023 12:27:38 -0600 Subject: [PATCH 4/5] DRYD-1262: Fix typo --- docs/configuration/messages.js | 2 +- src/plugins/recordTypes/chronology/fields.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuration/messages.js b/docs/configuration/messages.js index 797d417b..eed3102e 100644 --- a/docs/configuration/messages.js +++ b/docs/configuration/messages.js @@ -767,7 +767,7 @@ export default { "field.chronologies_common.altDateNote.name": "Note", - "field.chronologies_common.altDateSpatialCoverage.fullName": "Alternative date spacial coverage", + "field.chronologies_common.altDateSpatialCoverage.fullName": "Alternative date spatial coverage", "field.chronologies_common.altDateSpatialCoverage.name": "Spatial coverage", diff --git a/src/plugins/recordTypes/chronology/fields.js b/src/plugins/recordTypes/chronology/fields.js index 1878de9b..41c46e6f 100644 --- a/src/plugins/recordTypes/chronology/fields.js +++ b/src/plugins/recordTypes/chronology/fields.js @@ -574,7 +574,7 @@ export default (configContext) => { messages: defineMessages({ fullName: { id: 'field.chronologies_common.altDateSpatialCoverage.fullName', - defaultMessage: 'Alternative date spacial coverage', + defaultMessage: 'Alternative date spatial coverage', }, name: { id: 'field.chronologies_common.altDateSpatialCoverage.name', From 730ff9822d7f0ad7e00e81103dd3ef11b5f38b27 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 10 Aug 2023 16:16:11 -0600 Subject: [PATCH 5/5] DRYD-1261: Remove chronology fieldcollection authority from core --- .../extensions/associatedAuthority/fields.js | 2 +- .../recordTypes/chronology/vocabularies.js | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/plugins/extensions/associatedAuthority/fields.js b/src/plugins/extensions/associatedAuthority/fields.js index 6f4e573c..3e1b79b4 100644 --- a/src/plugins/extensions/associatedAuthority/fields.js +++ b/src/plugins/extensions/associatedAuthority/fields.js @@ -685,7 +685,7 @@ export default (configContext) => { view: { type: AutocompleteInput, props: { - source: 'chronology/era,chronology/event,chronology/fieldcollection', + source: 'chronology/era,chronology/event', }, }, }, diff --git a/src/plugins/recordTypes/chronology/vocabularies.js b/src/plugins/recordTypes/chronology/vocabularies.js index 6ae11041..9c088e46 100644 --- a/src/plugins/recordTypes/chronology/vocabularies.js +++ b/src/plugins/recordTypes/chronology/vocabularies.js @@ -69,26 +69,4 @@ export default { servicePath: 'urn:cspace:name(event)', }, }, - fieldcollection: { - messages: defineMessages({ - name: { - id: 'vocab.chronology.fieldcollection.name', - description: 'The name of the vocabulary.', - defaultMessage: 'Field Collection', - }, - collectionName: { - id: 'vocab.chronology.fieldcollection.collectionName', - description: 'The name of a collection of records from the vocabulary.', - defaultMessage: 'Field Collection Chronologies', - }, - itemName: { - id: 'vocab.chronology.fieldcollection.itemName', - description: 'The name of a record from the vocabulary.', - defaultMessage: 'Field Collection Chronology', - }, - }), - serviceConfig: { - servicePath: 'urn:cspace:name(field_collection)', - }, - }, };