Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

7.2 QA Updates #188

Merged
merged 5 commits into from
Aug 14, 2023
Merged

7.2 QA Updates #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8f3a0f
DRYD-1264: Update chronology field names to be consistent with the ui
mikejritter Aug 10, 2023
302604f
DRYD-1264: Update associated authority field names
mikejritter Aug 10, 2023
cdb0e84
DRYD-1267: Remove associated authorities from chronology
mikejritter Aug 11, 2023
742e2b0
DRYD-1262: Fix typo
mikejritter Aug 11, 2023
730ff98
DRYD-1261: Remove chronology fieldcollection authority from core
mikejritter Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions docs/configuration/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand All @@ -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 spatial 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",

Expand Down Expand Up @@ -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",

Expand Down Expand Up @@ -7682,4 +7682,4 @@ export default {
"workflowStateIcon.locked": "Locked",

"workflowStateIcon.replicated": "Replicated",
}
}
86 changes: 45 additions & 41 deletions src/plugins/extensions/associatedAuthority/fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -22,17 +26,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',
},
}),
Expand Down Expand Up @@ -147,17 +151,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',
},
}),
Expand Down Expand Up @@ -272,17 +276,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',
},
}),
Expand Down Expand Up @@ -397,17 +401,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',
},
}),
Expand Down Expand Up @@ -522,17 +526,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',
},
}),
Expand Down Expand Up @@ -647,54 +651,54 @@ 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,
view: {
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',
},
}),
view: {
type: AutocompleteInput,
props: {
source: 'chronology/era,chronology/event,chronology/fieldcollection',
source: 'chronology/era,chronology/event',
},
},
},
},
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',
},
}),
Expand All @@ -706,16 +710,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',
},
}),
Expand All @@ -725,21 +729,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',
},
}),
Expand All @@ -753,15 +757,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',
},
}),
Expand Down
Loading