diff --git a/CHANGELOG.md b/CHANGELOG.md index 79fcba205..f8559c248 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * Change endpoint to get actual SRS MARC data (UIDATIMP-1597) * Implement new Donor information section for Order field mapping profiles (UIDATIMP-1656) * Adjust value for invoice and invoice lines adjustments "Type" field mapping. (UIDATIMP-1662) +* Remove accepted values when Mapping profile is created/updated (Instance, Holding, Item and Order). (UIDATIMP-1663) ### Bugs fixed: * Remove `selected` column from associated profiles list. (UIDATIMP-1607) diff --git a/src/components/MatchCriterion/edit/ExistingRecordSections/ExistingSectionFolio.test.js b/src/components/MatchCriterion/edit/ExistingRecordSections/ExistingSectionFolio.test.js index 4f7b88319..652a7f709 100644 --- a/src/components/MatchCriterion/edit/ExistingRecordSections/ExistingSectionFolio.test.js +++ b/src/components/MatchCriterion/edit/ExistingRecordSections/ExistingSectionFolio.test.js @@ -82,6 +82,8 @@ describe('ExistingSectionFolio edit component', () => { it('should render data options', () => { const { getByText } = renderExistingSectionFolio(existingSectionFolioWithCorrectData); + fireEvent.click(getByText('Select control')); + expect(getByText('test label1')).toBeDefined(); expect(getByText('test label2')).toBeDefined(); }); @@ -99,6 +101,7 @@ describe('ExistingSectionFolio edit component', () => { const { getByText } = renderExistingSectionFolio(existingSectionFolioWithCorrectData); + fireEvent.click(getByText('Select control')); const optionsElement = getByText('test label1'); fireEvent.click(optionsElement); @@ -113,6 +116,7 @@ describe('ExistingSectionFolio edit component', () => { }]; const { getByText } = renderExistingSectionFolio(existingSectionFolioWithWrongData); + fireEvent.click(getByText('Select control')); const optionsElement = getByText('test label2'); fireEvent.click(optionsElement); @@ -125,12 +129,14 @@ describe('ExistingSectionFolio edit component', () => { const { container, getByPlaceholderText, + getByText, } = renderExistingSectionFolio(existingSectionFolioWithCorrectData); const filterElement = getByPlaceholderText('Filter options list'); expect(filterElement).toHaveValue(''); fireEvent.change(filterElement, { target: { value: 'test label1' } }); + fireEvent.click(getByText('Select control')); const dropdownOptionsAmount = container.querySelector('.selectionList').children.length; diff --git a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/AdministrativeData.js b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/AdministrativeData.js index 6ff774b38..55acd3bf4 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/AdministrativeData.js +++ b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/AdministrativeData.js @@ -26,8 +26,6 @@ import { getSubfieldName, getBoolFieldName, getRepeatableFieldName, - getAcceptedValuesPath, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -135,8 +133,6 @@ export const AdministrativeData = ({ wrapperSourcePath: 'holdingsTypes', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(3)} okapi={okapi} /> @@ -184,8 +180,6 @@ export const AdministrativeData = ({ wrapperSourcePath: 'statisticalCodeTypes', }]} optionTemplate="**statisticalCodeTypeName**: **code** - **name**" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(4, 0, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/ElectronicAccess.js b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/ElectronicAccess.js index 55517711c..0fad02df7 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/ElectronicAccess.js +++ b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/ElectronicAccess.js @@ -23,7 +23,6 @@ import { onRemove, getSubfieldName, getRepeatableFieldName, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -82,8 +81,6 @@ export const ElectronicAccess = ({ wrapperSourceLink: getWrapperSourceLink('ELECTRONIC_ACCESS', requestLimit), wrapperSourcePath: 'electronicAccessRelationships', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(23, 0, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsDetails.js b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsDetails.js index 8f886bd4a..e8a1f4420 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsDetails.js @@ -24,7 +24,6 @@ import { getFieldName, getSubfieldName, getRepeatableFieldName, - getAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -283,8 +282,6 @@ export const HoldingsDetails = ({ wrapperSourcePath: 'illPolicies', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(19)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsNotes.js b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsNotes.js index f09846e87..1a493f624 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsNotes.js +++ b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/HoldingsNotes.js @@ -25,7 +25,6 @@ import { getSubfieldName, getBoolSubfieldName, getRepeatableFieldName, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -84,8 +83,6 @@ export const HoldingsNotes = ({ wrapperSourceLink: getWrapperSourceLink('HOLDINGS_NOTE_TYPES', requestLimit), wrapperSourcePath: 'holdingsNoteTypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(22, 0, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/Location.js b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/Location.js index b9ee88d97..fe10fd8c5 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/Location.js +++ b/src/settings/MappingProfiles/detailsSections/edit/HoldingsDetailsSections/Location.js @@ -20,14 +20,12 @@ import { } from '../../../../../components'; import { - getAcceptedValuesPath, getFieldName, renderFieldLabelWithInfo, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; export const Location = ({ - setReferenceTables, okapi, requestLimit, }) => { @@ -57,8 +55,6 @@ export const Location = ({ wrapperSourceLink: getWrapperSourceLink('LOCATIONS', requestLimit), wrapperSourcePath: 'locations', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(6)} optionTemplate="**name** (**code**)" okapi={okapi} /> @@ -79,8 +75,6 @@ export const Location = ({ wrapperSourcePath: 'locations', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(7)} optionTemplate="**name** (**code**)" okapi={okapi} /> @@ -148,8 +142,6 @@ export const Location = ({ wrapperSourcePath: 'callNumberTypes', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(11)} okapi={okapi} /> @@ -205,7 +197,6 @@ export const Location = ({ }; Location.propTypes = { - setReferenceTables: PropTypes.func.isRequired, okapi: okapiShape.isRequired, requestLimit: PropTypes.number, }; diff --git a/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/AdministrativeData.js b/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/AdministrativeData.js index bf11509bc..0241b0c89 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/AdministrativeData.js +++ b/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/AdministrativeData.js @@ -33,8 +33,6 @@ import { getSubfieldName, getBoolFieldName, getRepeatableFieldName, - getAcceptedValuesPath, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; @@ -144,8 +142,6 @@ export const AdministrativeData = ({ wrapperSourceLink: getWrapperSourceLink('INSTANCE_STATUSES', requestLimit), wrapperSourcePath: 'instanceStatuses', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(6)} okapi={okapi} /> @@ -207,8 +203,6 @@ export const AdministrativeData = ({ wrapperSourcePath: 'statisticalCodeTypes', }]} optionTemplate="**statisticalCodeTypeName**: **code** - **name**" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(8, 0, index)} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/DescriptiveData.js b/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/DescriptiveData.js index 1a3860e92..5133c735f 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/DescriptiveData.js +++ b/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/DescriptiveData.js @@ -24,7 +24,6 @@ import { getSubfieldName, getFieldName, getRepeatableFieldName, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -210,8 +209,6 @@ export const DescriptiveData = ({ wrapperSourceLink: getWrapperSourceLink('NATURE_OF_CONTENT_TERMS', requestLimit), wrapperSourcePath: 'natureOfContentTerms', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(22, 0, index)} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/InstanceRelationship.js b/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/InstanceRelationship.js index 72e226e61..8443ec503 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/InstanceRelationship.js +++ b/src/settings/MappingProfiles/detailsSections/edit/InstanceDetailsSections/InstanceRelationship.js @@ -23,7 +23,6 @@ import { onRemove, getSubfieldName, getRepeatableFieldName, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -98,8 +97,6 @@ export const InstanceRelationship = ({ wrapperSourceLink: getWrapperSourceLink('INSTANCE_RELATIONSHIP_TYPES', requestLimit), wrapperSourcePath: 'instanceRelationshipTypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(31, 1, index)} /> @@ -160,8 +157,6 @@ export const InstanceRelationship = ({ wrapperSourceLink: getWrapperSourceLink('INSTANCE_RELATIONSHIP_TYPES', requestLimit), wrapperSourcePath: 'instanceRelationshipTypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(32, 1, index)} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/AdministrativeData.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/AdministrativeData.js index a1a693192..6015a220e 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/AdministrativeData.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/AdministrativeData.js @@ -26,7 +26,6 @@ import { getSubfieldName, getBoolFieldName, getRepeatableFieldName, - getRepeatableAcceptedValuesPath, } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { @@ -206,8 +205,6 @@ export const AdministrativeData = ({ wrapperSourcePath: 'statisticalCodeTypes', }]} optionTemplate="**statisticalCodeTypeName**: **code** - **name**" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(6, 0, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Condition.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Condition.js index 79fba27d0..b89bbd46e 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Condition.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Condition.js @@ -16,10 +16,7 @@ import { WithValidation, } from '../../../../../components'; -import { - getAcceptedValuesPath, - getFieldName, -} from '../../utils'; +import { getFieldName } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { getWrapperSourceLink, @@ -28,7 +25,6 @@ import { } from '../../../../../utils'; export const Condition = ({ - setReferenceTables, okapi, requestLimit, }) => { @@ -99,8 +95,6 @@ export const Condition = ({ wrapperSourcePath: 'itemDamageStatuses', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(23)} okapi={okapi} /> @@ -123,7 +117,6 @@ export const Condition = ({ }; Condition.propTypes = { - setReferenceTables: PropTypes.func.isRequired, okapi: okapiShape.isRequired, requestLimit: PropTypes.number, }; diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ElectronicAccess.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ElectronicAccess.js index e49e0286d..521c11daf 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ElectronicAccess.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ElectronicAccess.js @@ -19,7 +19,6 @@ import { } from '../../../../../components'; import { - getRepeatableAcceptedValuesPath, getRepeatableFieldName, getSubfieldName, onAdd, @@ -82,8 +81,6 @@ export const ElectronicAccess = ({ wrapperSourceLink: getWrapperSourceLink('ELECTRONIC_ACCESS', requestLimit), wrapperSourcePath: 'electronicAccessRelationships', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(32, 0, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemData.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemData.js index 2c838309b..e64fde227 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemData.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemData.js @@ -16,7 +16,6 @@ import { } from '../../../../../components'; import { - getAcceptedValuesPath, getFieldName, renderFieldLabelWithInfo, } from '../../utils'; @@ -27,7 +26,6 @@ import { } from '../../../../../utils'; export const ItemData = ({ - setReferenceTables, okapi, requestLimit, }) => { @@ -57,8 +55,6 @@ export const ItemData = ({ wrapperSourceLink: getWrapperSourceLink('MATERIAL_TYPES', requestLimit), wrapperSourcePath: 'mtypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(8)} okapi={okapi} /> @@ -97,8 +93,6 @@ export const ItemData = ({ wrapperSourcePath: 'callNumberTypes', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(10)} okapi={okapi} /> @@ -185,7 +179,6 @@ export const ItemData = ({ }; ItemData.propTypes = { - setReferenceTables: PropTypes.func.isRequired, okapi: okapiShape.isRequired, requestLimit: PropTypes.number, }; diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemNotes.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemNotes.js index dac0d5924..09ba90efd 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemNotes.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/ItemNotes.js @@ -21,7 +21,6 @@ import { import { getBoolSubfieldName, - getRepeatableAcceptedValuesPath, getRepeatableFieldName, getSubfieldName, onAdd, @@ -84,8 +83,6 @@ export const ItemNotes = ({ wrapperSourceLink: getWrapperSourceLink('ITEM_NOTE_TYPES', requestLimit), wrapperSourcePath: 'itemNoteTypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(25, 0, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/LoanAndAvailability.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/LoanAndAvailability.js index 06a2ae831..0ef2b974b 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/LoanAndAvailability.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/LoanAndAvailability.js @@ -23,7 +23,6 @@ import { } from '../../../../../components'; import { - getAcceptedValuesPath, getBoolSubfieldName, getFieldName, getRepeatableFieldName, @@ -105,8 +104,6 @@ export const LoanAndAvailability = ({ wrapperSourceLink: getWrapperSourceLink('LOAN_TYPES', requestLimit), wrapperSourcePath: 'loantypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(26)} okapi={okapi} /> @@ -128,8 +125,6 @@ export const LoanAndAvailability = ({ wrapperSourcePath: 'loantypes', }]} isRemoveValueAllowed - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(27)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Location.js b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Location.js index 39b7f9f43..8cb4830ef 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Location.js +++ b/src/settings/MappingProfiles/detailsSections/edit/ItemDetailSection/Location.js @@ -11,10 +11,7 @@ import { import { AcceptedValuesField } from '../../../../../components'; -import { - getAcceptedValuesPath, - getFieldName, -} from '../../utils'; +import { getFieldName } from '../../utils'; import { TRANSLATION_ID_PREFIX } from '../../constants'; import { getWrapperSourceLink, @@ -22,7 +19,6 @@ import { } from '../../../../../utils'; export const Location = ({ - setReferenceTables, okapi, requestLimit, }) => { @@ -49,8 +45,6 @@ export const Location = ({ }]} isRemoveValueAllowed optionTemplate="**name** (**code**)" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(30)} okapi={okapi} /> @@ -71,8 +65,6 @@ export const Location = ({ }]} isRemoveValueAllowed optionTemplate="**name** (**code**)" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(31)} okapi={okapi} /> @@ -82,7 +74,6 @@ export const Location = ({ }; Location.propTypes = { - setReferenceTables: PropTypes.func.isRequired, okapi: okapiShape.isRequired, requestLimit: PropTypes.number, }; diff --git a/src/settings/MappingProfiles/detailsSections/edit/MappingHoldingsDetails.js b/src/settings/MappingProfiles/detailsSections/edit/MappingHoldingsDetails.js index 5a79c8e48..20e2827dc 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/MappingHoldingsDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/MappingHoldingsDetails.js @@ -50,7 +50,6 @@ export const MappingHoldingsDetails = ({ requestLimit={requestLimit} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/MappingItemDetails.js b/src/settings/MappingProfiles/detailsSections/edit/MappingItemDetails.js index ca86a1926..de5ea4a18 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/MappingItemDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/MappingItemDetails.js @@ -50,7 +50,6 @@ export const MappingItemDetails = ({ requestLimit={requestLimit} /> @@ -61,7 +60,6 @@ export const MappingItemDetails = ({ setReferenceTables={setReferenceTables} /> @@ -82,7 +80,6 @@ export const MappingItemDetails = ({ requestLimit={requestLimit} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/MappingOrderDetails.js b/src/settings/MappingProfiles/detailsSections/edit/MappingOrderDetails.js index 4e1c0a602..de04bb03f 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/MappingOrderDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/MappingOrderDetails.js @@ -58,7 +58,6 @@ export const MappingOrderDetails = ({ requestLimit={requestLimit} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/EResourcesDetails.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/EResourcesDetails.js index 1c69fbae7..896ab36f1 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/EResourcesDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/EResourcesDetails.js @@ -36,7 +36,6 @@ import { } from '../../constants'; import { clearFieldValue, - getAcceptedValuesPath, getBoolFieldName, getFieldName, renderFieldLabelWithInfo, @@ -203,8 +202,6 @@ export const EResourcesDetails = ({ wrapperSourceLink: getWrapperSourceLink('MATERIAL_TYPES', requestLimit), wrapperSourcePath: 'mtypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(MATERIAL_TYPE_INDEX)} okapi={okapi} disabled={dismissElectronicDetails} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/FundDistribution.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/FundDistribution.js index e443ef077..54f2e56e1 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/FundDistribution.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/FundDistribution.js @@ -23,7 +23,6 @@ import { import { TRANSLATION_ID_PREFIX } from '../../constants'; import { - getRepeatableAcceptedValuesPath, getRepeatableFieldName, getSubfieldName, handleRepeatableFieldAndActionAdd, @@ -120,8 +119,6 @@ export const FundDistribution = ({ wrapperSourcePath: 'funds' }]} optionTemplate="**name** (**code**)" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(FUND_DISTRIBUTION_FIELDS_MAP.FUND_DISTRIBUTION, 0, index)} okapi={okapi} /> @@ -138,8 +135,6 @@ export const FundDistribution = ({ wrapperSourcePath: 'expenseClasses' }]} optionTemplate="**name** (**code**)" - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(FUND_DISTRIBUTION_FIELDS_MAP.FUND_DISTRIBUTION, 1, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/ItemDetails.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/ItemDetails.js index b767ce32b..5e6ae67f9 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/ItemDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/ItemDetails.js @@ -29,7 +29,6 @@ import { import { boolAcceptedValuesOptions, getFieldName, - getRepeatableAcceptedValuesPath, getRepeatableFieldName, getSubfieldName, handleRepeatableFieldAndActionAdd, @@ -291,8 +290,6 @@ export const ItemDetails = ({ wrapperSourceLink: getWrapperSourceLink('CONTRIBUTOR_NAME_TYPES', requestLimit), wrapperSourcePath: 'contributorNameTypes' }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(ITEM_DETAILS_FIELDS_MAP.CONTRIBUTORS, 1, index)} okapi={okapi} /> @@ -344,9 +341,7 @@ export const ItemDetails = ({ wrapperSourceLink: getWrapperSourceLink('IDENTIFIER_TYPES', requestLimit), wrapperSourcePath: 'identifierTypes' }]} - setAcceptedValues={setReferenceTables} formatListOptions={filterProductIdTypeOptions} - acceptedValuesPath={getRepeatableAcceptedValuesPath(ITEM_DETAILS_FIELDS_MAP.PRODUCT_IDS, 2, index)} okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Location.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Location.js index cf5b7e74e..1e8d2d478 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Location.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Location.js @@ -26,7 +26,6 @@ import { import { TRANSLATION_ID_PREFIX } from '../../constants'; import { clearSubfieldValue, - getRepeatableAcceptedValuesPath, getRepeatableFieldName, getSubfieldName, handleRepeatableFieldAndActionAdd, @@ -145,8 +144,6 @@ export const Location = ({ wrapperSourceLink: getWrapperSourceLink('LOCATIONS', requestLimit), wrapperSourcePath: 'locations' }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getRepeatableAcceptedValuesPath(LOCATIONS_INDEX, 0, index)} optionTemplate="**name** (**code**)" okapi={okapi} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/OrderInformation.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/OrderInformation.js index 96307de5f..948f607ce 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/OrderInformation.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/OrderInformation.js @@ -39,7 +39,6 @@ import { import { boolAcceptedValuesOptions, - getAcceptedValuesPath, getBoolFieldName, getFieldName, getSubfieldName, @@ -353,8 +352,6 @@ const OrderInformationComponent = ({ wrapperSourceLink: getWrapperSourceLink('ACQUISITIONS_UNITS', requestLimit), wrapperSourcePath: 'acquisitionsUnits', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(ORDER_INFO_FIELDS_MAP.ACQ_UNITS)} isMultiSelection okapi={okapi} /> @@ -384,8 +381,6 @@ const OrderInformationComponent = ({ wrapperSourceLink: getWrapperSourceLink('ADDRESSES', requestLimit), wrapperSourcePath: 'configs', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(ORDER_INFO_FIELDS_MAP.BILL_TO_NAME)} okapi={okapi} onChange={billToNameValue => { const address = addressesValue.find(value => { @@ -416,8 +411,6 @@ const OrderInformationComponent = ({ wrapperSourceLink: getWrapperSourceLink('ADDRESSES', requestLimit), wrapperSourcePath: 'configs', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(ORDER_INFO_FIELDS_MAP.SHIP_TO_NAME)} okapi={okapi} onChange={shipToNameValue => { const address = addressesValue.find(value => { diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/POLineDetails.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/POLineDetails.js index e7d7278fa..d8a51202f 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/POLineDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/POLineDetails.js @@ -32,7 +32,6 @@ import { } from '../../constants'; import { boolAcceptedValuesOptions, - getAcceptedValuesPath, getFieldName, getBoolFieldName, } from '../../utils'; @@ -45,7 +44,6 @@ import { } from '../../../../../utils'; export const POLineDetails = ({ - setReferenceTables, okapi, requestLimit, }) => { @@ -159,8 +157,6 @@ export const POLineDetails = ({ wrapperSourceLink: getWrapperSourceLink('ACQUISITION_METHODS', requestLimit), wrapperSourcePath: 'acquisitionMethods', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(PO_LINE_DETAILS_FIELDS_MAP.ACQ_METHOD)} okapi={okapi} required /> @@ -338,7 +334,6 @@ export const POLineDetails = ({ }; POLineDetails.propTypes = { - setReferenceTables: PropTypes.func.isRequired, okapi: PropTypes.object.isRequired, requestLimit: PropTypes.number, }; diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/PhysicalResourceDetails.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/PhysicalResourceDetails.js index 91efcd82d..980778719 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/PhysicalResourceDetails.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/PhysicalResourceDetails.js @@ -36,7 +36,6 @@ import { } from '../../constants'; import { clearFieldValue, - getAcceptedValuesPath, getFieldName, getSubfieldName, onAdd, @@ -215,8 +214,6 @@ export const PhysicalResourceDetails = ({ wrapperSourceLink: getWrapperSourceLink('MATERIAL_TYPES', requestLimit), wrapperSourcePath: 'mtypes', }]} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(MATERIAL_TYPE_INDEX)} okapi={okapi} disabled={dismissPhysicalDetails} /> diff --git a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Vendor.js b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Vendor.js index 1a5b029b6..4bf20dd07 100644 --- a/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Vendor.js +++ b/src/settings/MappingProfiles/detailsSections/edit/OrderDetailSection/Vendor.js @@ -30,7 +30,6 @@ import { getFieldName, onAdd, onRemove, - getAcceptedValuesPath, getRepeatableFieldName, handleRepeatableFieldAndActionAdd, handleRepeatableFieldAndActionClean, @@ -152,8 +151,6 @@ export const Vendor = ({ optionValue="value" optionLabel="label" wrapperLabel={`${TRANSLATION_ID_PREFIX}.wrapper.acceptedValues`} - setAcceptedValues={setReferenceTables} - acceptedValuesPath={getAcceptedValuesPath(VENDOR_FIELDS_MAP.ACCOUNT_NUMBER)} acceptedValuesList={accountNumbersOptions} okapi={okapi} hasLoaded diff --git a/src/settings/MappingProfiles/initialDetails/HOLDINGS.js b/src/settings/MappingProfiles/initialDetails/HOLDINGS.js index cd8a554c0..b6e23816b 100644 --- a/src/settings/MappingProfiles/initialDetails/HOLDINGS.js +++ b/src/settings/MappingProfiles/initialDetails/HOLDINGS.js @@ -34,7 +34,6 @@ const HOLDINGS = { path: 'holdings.holdingsTypeId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'statisticalCodeIds', enabled: true, @@ -48,7 +47,6 @@ const HOLDINGS = { enabled: true, path: 'holdings.statisticalCodeIds[]', value: '', - acceptedValues: {}, }], }], }, { @@ -72,14 +70,12 @@ const HOLDINGS = { path: 'holdings.permanentLocationId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'temporaryLocationId', enabled: true, path: 'holdings.temporaryLocationId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'shelvingOrder', enabled: true, @@ -104,7 +100,6 @@ const HOLDINGS = { path: 'holdings.callNumberTypeId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'callNumberPrefix', enabled: true, @@ -210,7 +205,6 @@ const HOLDINGS = { path: 'holdings.illPolicyId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'digitizationPolicy', enabled: true, @@ -237,7 +231,6 @@ const HOLDINGS = { required: true, path: 'holdings.notes[].holdingsNoteTypeId', value: '', - acceptedValues: {}, }, { name: 'note', enabled: true, @@ -264,7 +257,6 @@ const HOLDINGS = { enabled: true, path: 'holdings.electronicAccess[].relationshipId', value: '', - acceptedValues: {}, }, { name: 'uri', enabled: true, diff --git a/src/settings/MappingProfiles/initialDetails/INSTANCE.js b/src/settings/MappingProfiles/initialDetails/INSTANCE.js index 58e113449..8e4237d4f 100644 --- a/src/settings/MappingProfiles/initialDetails/INSTANCE.js +++ b/src/settings/MappingProfiles/initialDetails/INSTANCE.js @@ -43,7 +43,6 @@ const INSTANCE = { path: 'instance.statusId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'modeOfIssuanceId', enabled: false, @@ -63,7 +62,6 @@ const INSTANCE = { enabled: true, path: 'instance.statisticalCodeIds[]', value: '', - acceptedValues: {}, }], }], }, { @@ -322,7 +320,6 @@ const INSTANCE = { enabled: true, path: 'instance.natureOfContentTermIds[]', value: '', - acceptedValues: {}, }], }], }, { @@ -423,7 +420,6 @@ const INSTANCE = { enabled: false, path: 'instance.electronicAccess[].relationshipId', value: '', - acceptedValues: {}, }, { name: 'uri', enabled: false, @@ -499,7 +495,6 @@ const INSTANCE = { enabled: true, path: 'instance.parentInstances[].instanceRelationshipTypeId', value: '', - acceptedValues: {}, }], }], }, { @@ -520,7 +515,6 @@ const INSTANCE = { enabled: true, path: 'instance.childInstances[].instanceRelationshipTypeId', value: '', - acceptedValues: {}, }], }], }], diff --git a/src/settings/MappingProfiles/initialDetails/ITEM.js b/src/settings/MappingProfiles/initialDetails/ITEM.js index e4c40b777..8554801aa 100644 --- a/src/settings/MappingProfiles/initialDetails/ITEM.js +++ b/src/settings/MappingProfiles/initialDetails/ITEM.js @@ -59,7 +59,6 @@ const ITEM = { enabled: true, path: 'item.statisticalCodeIds[]', value: '', - acceptedValues: {}, }], }], }, { @@ -83,7 +82,6 @@ const ITEM = { path: 'item.materialType.id', value: '', subfields: [], - acceptedValues: {}, }, { name: 'copyNumber', enabled: true, @@ -96,7 +94,6 @@ const ITEM = { path: 'item.itemLevelCallNumberTypeId', value: '', subfields: [], - acceptedValues: {}, }, { name: 'itemLevelCallNumberPrefix', enabled: true, @@ -204,7 +201,6 @@ const ITEM = { required: true, path: 'item.notes[].itemNoteTypeId', value: '', - acceptedValues: {}, }, { name: 'note', enabled: true, @@ -224,14 +220,12 @@ const ITEM = { path: 'item.permanentLoanType.id', value: '', subfields: [], - acceptedValues: {}, }, { name: 'temporaryLoanType.id', enabled: true, path: 'item.temporaryLoanType.id', value: '', subfields: [], - acceptedValues: {}, }, { name: 'status.name', enabled: true, @@ -269,14 +263,12 @@ const ITEM = { path: 'item.permanentLocation.id', value: '', subfields: [], - acceptedValues: {}, }, { name: 'temporaryLocation.id', enabled: true, path: 'item.temporaryLocation.id', value: '', subfields: [], - acceptedValues: {}, }, { name: 'electronicAccess', enabled: true, @@ -290,7 +282,6 @@ const ITEM = { enabled: true, path: 'item.electronicAccess[].relationshipId', value: '', - acceptedValues: {}, }, { name: 'uri', enabled: true, diff --git a/src/settings/MappingProfiles/initialDetails/ORDER.js b/src/settings/MappingProfiles/initialDetails/ORDER.js index 2052cb7d3..720c87c61 100644 --- a/src/settings/MappingProfiles/initialDetails/ORDER.js +++ b/src/settings/MappingProfiles/initialDetails/ORDER.js @@ -52,7 +52,6 @@ const ORDER = { enabled: true, path: 'order.po.acqUnitIds[]', value: '', - acceptedValues: {}, }, { name: 'assignedTo', enabled: true, @@ -63,13 +62,11 @@ const ORDER = { enabled: true, path: 'order.po.billTo', value: '', - acceptedValues: {}, }, { name: 'shipTo', enabled: true, path: 'order.po.shipTo', value: '', - acceptedValues: {}, }, { name: 'manualPo', enabled: true, @@ -81,7 +78,6 @@ const ORDER = { enabled: true, path: 'order.po.reEncumber', value: '', - acceptedValues: {}, }, { name: 'notes', enabled: true, @@ -113,7 +109,6 @@ const ORDER = { enabled: true, path: 'order.poLine.details.isAcknowledged', value: '', - acceptedValues: {}, }, { name: 'subscriptionFrom', enabled: true, @@ -163,7 +158,6 @@ const ORDER = { enabled: true, path: 'order.poLine.contributors[].contributorNameTypeId', value: '', - acceptedValues: {}, }], }], }, { @@ -208,7 +202,6 @@ const ORDER = { enabled: true, path: 'order.poLine.acquisitionMethod', value: '', - acceptedValues: {}, }, { name: 'automaticExport', enabled: true, @@ -220,7 +213,6 @@ const ORDER = { enabled: true, path: 'order.poLine.orderFormat', value: '', - acceptedValues: {}, }, { name: 'receiptDate', enabled: true, @@ -236,7 +228,6 @@ const ORDER = { enabled: true, path: 'order.poLine.paymentStatus', value: '', - acceptedValues: {}, }, { name: 'source', enabled: false, @@ -262,19 +253,16 @@ const ORDER = { enabled: true, path: 'order.poLine.cancellationRestriction', value: '', - acceptedValues: {}, }, { name: 'rush', enabled: true, path: 'order.poLine.rush', value: '', - acceptedValues: {}, }, { name: 'checkinItems', enabled: true, path: 'order.poLine.checkinItems', value: '', - acceptedValues: {}, }, { name: 'cancellationRestrictionNote', enabled: true, @@ -327,13 +315,11 @@ const ORDER = { enabled: true, path: 'order.poLine.vendorDetail.vendorAccount', value: '', - acceptedValues: {}, }, { name: 'instructions', enabled: true, path: 'order.poLine.vendorDetail.instructions', value: '', - acceptedValues: {}, }, { name: 'listUnitPrice', enabled: true, @@ -393,13 +379,11 @@ const ORDER = { enabled: true, path: 'order.poLine.fundDistribution[].fundId', value: '', - acceptedValues: {}, }, { name: 'expenseClassId', enabled: true, path: 'order.poLine.fundDistribution[].expenseClassId', value: '', - acceptedValues: {}, }, { name: 'value', enabled: true, @@ -426,13 +410,11 @@ const ORDER = { enabled: true, path: 'order.poLine.locations[].locationId', value: '', - acceptedValues: {}, }, { name: 'quantityPhysical', enabled: true, path: 'order.poLine.locations[].quantityPhysical', value: '', - acceptedValues: {}, }, { name: 'quantityElectronic', enabled: true, @@ -445,7 +427,6 @@ const ORDER = { enabled: true, path: 'order.poLine.physical.materialSupplier', value: '', - acceptedValues: {}, }, { name: 'receiptDue', enabled: true, @@ -461,7 +442,6 @@ const ORDER = { enabled: true, path: 'order.poLine.physical.createInventory', value: '', - acceptedValues: {}, }, { name: 'materialType', enabled: true, @@ -488,7 +468,6 @@ const ORDER = { enabled: true, path: 'order.poLine.eresource.accessProvider', value: '', - acceptedValues: {}, }, { name: 'activationStatus', enabled: true, @@ -505,13 +484,11 @@ const ORDER = { enabled: true, path: 'order.poLine.eresource.createInventory', value: '', - acceptedValues: {}, }, { name: 'materialType', enabled: true, path: 'order.poLine.eresource.materialType', value: '', - acceptedValues: {}, }, { name: 'trial', enabled: true,