diff --git a/src/actions/search.js b/src/actions/search.js index 6786cb0c..57b7f67a 100644 --- a/src/actions/search.js +++ b/src/actions/search.js @@ -186,6 +186,7 @@ export const search = (config, searchName, searchDescriptor, listType = 'common' pgSz: searchQuery.get('size'), rtSbj: searchQuery.get('rel'), rtPredicate: searchQuery.get('relType'), + servicetag: searchQuery.get('serviceTag'), sn: searchQuery.get('sn'), // accounts screen name dn: searchQuery.get('dn'), // role display name wf_deleted: false, diff --git a/src/components/record/RecordSidebar.jsx b/src/components/record/RecordSidebar.jsx index 4ca5879d..ec88af34 100644 --- a/src/components/record/RecordSidebar.jsx +++ b/src/components/record/RecordSidebar.jsx @@ -123,11 +123,15 @@ export default function RecordSidebar(props) { relatedRecords = relatedRecordDescriptors.map((relatedRecordDescriptor) => { const { + id, sort, + serviceTag, recordType: relatedRecordType, columnSet = 'narrow', } = relatedRecordDescriptor; + const panelName = id ? `related${upperFirst(id)}Panel` : `related${upperFirst(relatedRecordType)}Panel`; + return ( ); }); diff --git a/src/components/record/RelatedRecordPanel.jsx b/src/components/record/RelatedRecordPanel.jsx index 5cfea860..91c571cf 100644 --- a/src/components/record/RelatedRecordPanel.jsx +++ b/src/components/record/RelatedRecordPanel.jsx @@ -29,6 +29,7 @@ const getSearchDescriptor = (props) => { initialSort, recordRelationUpdatedTimestamp, relatedRecordType, + serviceTag, } = props; return Immutable.fromJS({ @@ -39,6 +40,7 @@ const getSearchDescriptor = (props) => { p: 0, size: config.defaultSearchPanelSize || 5, sort: initialSort, + serviceTag, }, seqID: recordRelationUpdatedTimestamp, }); @@ -69,9 +71,11 @@ const propTypes = { recordType: PropTypes.string, relatedRecordType: PropTypes.string, selectedItems: PropTypes.instanceOf(Immutable.Map), + serviceTag: PropTypes.string, showCheckboxColumn: PropTypes.bool, showSearchButton: PropTypes.bool, showAddButton: PropTypes.bool, + panelId: PropTypes.string, // not set on this prop name yet openModalName: PropTypes.string, closeModal: PropTypes.func, openModal: PropTypes.func, @@ -360,12 +364,17 @@ export default class RelatedRecordPanel extends Component { renderTitle() { const { config, + recordType, relatedRecordType, + panelId, } = this.props; + const sidebarMessage = get(config, ['recordTypes', recordType, 'messages', 'sidebar', panelId]); const collectionNameMessage = get(config, ['recordTypes', relatedRecordType, 'messages', 'record', 'collectionName']); - const collectionName = ; + const collectionName = sidebarMessage != null + ? + : ; return ; } diff --git a/test/specs/components/record/RelatedRecordPanel.spec.jsx b/test/specs/components/record/RelatedRecordPanel.spec.jsx index 7e757c0a..1bd241c4 100644 --- a/test/specs/components/record/RelatedRecordPanel.spec.jsx +++ b/test/specs/components/record/RelatedRecordPanel.spec.jsx @@ -81,6 +81,7 @@ describe('RelatedRecordPanel', () => { const relatedRecordType = 'group'; const recordRelationUpdatedTimestamp = '2017-03-06T12:05:34.000Z'; const sort = 'objectNumber'; + const serviceTag = 'ownership'; const shallowRenderer = createRenderer(); @@ -93,6 +94,7 @@ describe('RelatedRecordPanel', () => { relatedRecordType={relatedRecordType} recordRelationUpdatedTimestamp={recordRelationUpdatedTimestamp} initialSort={sort} + serviceTag={serviceTag} />, ); @@ -111,6 +113,7 @@ describe('RelatedRecordPanel', () => { relType: 'affects', p: 0, size: 5, + serviceTag, }, seqID: recordRelationUpdatedTimestamp, }));