From a43d331173be17076950881418300ea822cb6ebc Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 13 Jul 2022 14:44:57 -0700 Subject: [PATCH 1/7] DEX-922 implement stickyHeader and add a meaningful maxHeight to every DataDisplay. Also add horizontalScroll --- src/components/IndividualSelector.jsx | 2 +- src/components/cards/CollaborationsCard.jsx | 1 + src/components/cards/CooccurrenceCard.jsx | 1 + src/components/cards/EncountersCard.jsx | 1 + src/components/cards/SightingsCard.jsx | 1 + src/components/dataDisplays/DataDisplay.jsx | 10 +++++++++- src/components/dataDisplays/IndividualsDisplay.jsx | 1 + src/components/dataDisplays/RelationshipDisplay.jsx | 1 + src/components/dataDisplays/SightingsDisplay.jsx | 1 + src/pages/assetGroup/AGSTable.jsx | 1 + src/pages/fieldManagement/settings/CategoryTable.jsx | 1 + .../fieldManagement/settings/CustomFieldTable.jsx | 1 + .../fieldManagement/settings/DefaultFieldTable.jsx | 1 + .../settings/defaultFieldComponents/SpeciesEditor.jsx | 1 + src/pages/match/MatchCandidatesTable.jsx | 1 + src/pages/match/QueryAnnotationsTable.jsx | 1 + src/pages/userManagement/UserEditTable.jsx | 1 + .../UserManagerCollaborationEditTable.jsx | 1 + 18 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/components/IndividualSelector.jsx b/src/components/IndividualSelector.jsx index d41983155..b7faff3a8 100644 --- a/src/components/IndividualSelector.jsx +++ b/src/components/IndividualSelector.jsx @@ -123,7 +123,7 @@ export default function IndividualSelector({ {canShowTable && ( ); diff --git a/src/components/cards/CooccurrenceCard.jsx b/src/components/cards/CooccurrenceCard.jsx index f61d197e9..63bbbee53 100644 --- a/src/components/cards/CooccurrenceCard.jsx +++ b/src/components/cards/CooccurrenceCard.jsx @@ -34,6 +34,7 @@ export default function CooccurrenceCard({ }, ]} data={data} + maxHeight={600} /> ); diff --git a/src/components/cards/EncountersCard.jsx b/src/components/cards/EncountersCard.jsx index 38ec9e138..4d018c069 100644 --- a/src/components/cards/EncountersCard.jsx +++ b/src/components/cards/EncountersCard.jsx @@ -162,6 +162,7 @@ export default function EncountersCard({ columns={filteredColumns} data={encountersWithLocationData} tableStyles={{ tableLayout: 'fixed' }} + maxHeight={600} /> )} {!noEncounters && showMapView &&
Map goes here
} diff --git a/src/components/cards/SightingsCard.jsx b/src/components/cards/SightingsCard.jsx index a60def7a2..d19dd0897 100644 --- a/src/components/cards/SightingsCard.jsx +++ b/src/components/cards/SightingsCard.jsx @@ -149,6 +149,7 @@ export default function SightingsCard({ data={sightings} loading={loading} noResultsTextId={noSightingsMsg} + maxHeight={400} /> )} {!noSightings && showMapView && ( diff --git a/src/components/dataDisplays/DataDisplay.jsx b/src/components/dataDisplays/DataDisplay.jsx index 6519d9c7c..be58916e4 100644 --- a/src/components/dataDisplays/DataDisplay.jsx +++ b/src/components/dataDisplays/DataDisplay.jsx @@ -64,6 +64,9 @@ export default function DataDisplay({ paperStyles = {}, tableStyles = {}, cellStyles = {}, + stickyHeader = true, + horizontalScroll = true, + maxHeight, ...rest }) { const intl = useIntl(); @@ -258,9 +261,14 @@ export default function DataDisplay({ { // window.open('/individuals/picturebook', '_blank'); // }} diff --git a/src/components/dataDisplays/RelationshipDisplay.jsx b/src/components/dataDisplays/RelationshipDisplay.jsx index c3200b5a5..f32ceae03 100644 --- a/src/components/dataDisplays/RelationshipDisplay.jsx +++ b/src/components/dataDisplays/RelationshipDisplay.jsx @@ -47,6 +47,7 @@ export default function RelationshipDisplay({ columns={relationshipCols} data={data} loading={loading} + maxHeight={400} /> ); } diff --git a/src/components/dataDisplays/SightingsDisplay.jsx b/src/components/dataDisplays/SightingsDisplay.jsx index 6e155462d..e645d15a4 100644 --- a/src/components/dataDisplays/SightingsDisplay.jsx +++ b/src/components/dataDisplays/SightingsDisplay.jsx @@ -100,6 +100,7 @@ export default function SightingsDisplay({ title={title} loading={loading} showNoResultsBao + maxHeight={600} // renderExpandedRow={expandedSighting => ( //
// ); } diff --git a/src/pages/fieldManagement/settings/CategoryTable.jsx b/src/pages/fieldManagement/settings/CategoryTable.jsx index 4a4342884..36e62a533 100644 --- a/src/pages/fieldManagement/settings/CategoryTable.jsx +++ b/src/pages/fieldManagement/settings/CategoryTable.jsx @@ -291,6 +291,7 @@ export default function FieldSettings() { variant="secondary" columns={categoryColumns} data={categories} + maxHeight={300} /> ); diff --git a/src/pages/fieldManagement/settings/CustomFieldTable.jsx b/src/pages/fieldManagement/settings/CustomFieldTable.jsx index 5eff750bd..1367ac914 100644 --- a/src/pages/fieldManagement/settings/CustomFieldTable.jsx +++ b/src/pages/fieldManagement/settings/CustomFieldTable.jsx @@ -188,6 +188,7 @@ export default function CustomFieldTable({ columns={tableColumns} data={fieldSchemas} noResultsTextId={noFieldsTextId} + maxHeight={300} /> ); diff --git a/src/pages/fieldManagement/settings/DefaultFieldTable.jsx b/src/pages/fieldManagement/settings/DefaultFieldTable.jsx index 78bdc4743..01b3c8ffe 100644 --- a/src/pages/fieldManagement/settings/DefaultFieldTable.jsx +++ b/src/pages/fieldManagement/settings/DefaultFieldTable.jsx @@ -198,6 +198,7 @@ export default function DefaultFieldTable({ variant="secondary" columns={tableColumns} data={configurableFields} + maxHeight={300} /> ); diff --git a/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx b/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx index 19d224b0e..ea4130a30 100644 --- a/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx +++ b/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx @@ -174,6 +174,7 @@ export default function SpeciesEditor({ columns={tableColumns} data={searchResults || suggestedValues} idKey="itisTsn" + maxHeight={300} /> ); } diff --git a/src/pages/match/QueryAnnotationsTable.jsx b/src/pages/match/QueryAnnotationsTable.jsx index 625da4be2..17068818e 100644 --- a/src/pages/match/QueryAnnotationsTable.jsx +++ b/src/pages/match/QueryAnnotationsTable.jsx @@ -55,6 +55,7 @@ export default function QueryAnnotationsTable({ setSelectedQueryAnnotation(nextSelection); } }} + maxHeight={300} /> ); } diff --git a/src/pages/userManagement/UserEditTable.jsx b/src/pages/userManagement/UserEditTable.jsx index df83e7ea9..d9a3b5f4d 100644 --- a/src/pages/userManagement/UserEditTable.jsx +++ b/src/pages/userManagement/UserEditTable.jsx @@ -116,6 +116,7 @@ export default function UserEditTable() { columns={tableColumns} data={activeUsers} loading={loading} + maxHeight={500} /> {usersError ? ( {collaborationError ? ( Date: Wed, 13 Jul 2022 14:45:53 -0700 Subject: [PATCH 2/7] DEX-922 remove seemingly unnecessary horizontal scroll prop --- src/components/dataDisplays/DataDisplay.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/dataDisplays/DataDisplay.jsx b/src/components/dataDisplays/DataDisplay.jsx index be58916e4..88b1e884a 100644 --- a/src/components/dataDisplays/DataDisplay.jsx +++ b/src/components/dataDisplays/DataDisplay.jsx @@ -65,7 +65,6 @@ export default function DataDisplay({ tableStyles = {}, cellStyles = {}, stickyHeader = true, - horizontalScroll = true, maxHeight, ...rest }) { @@ -262,8 +261,7 @@ export default function DataDisplay({ component={variant === 'secondary' ? Paper : undefined} elevation={variant === 'secondary' ? 2 : undefined} style={{ - overflowX: horizontalScroll ? 'auto' : undefined, - maxHeight: maxHeight, + maxHeight, ...paperStyles, }} > From 1873372adbdd2a04effc92a7c121ae238b5bd48c Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 21 Jul 2022 10:29:08 -0700 Subject: [PATCH 3/7] DEX-922 respond to code review feedback. Remove default maxHeight for Card component and replaced with optional styles, which was then implemented for ImageCard and StatusCard. Remove maxHeight from Card in relationshipCard, remove unused paperStyles from DataDisplay. --- src/components/cards/Card.jsx | 4 ++-- src/components/cards/RelationshipsCard.jsx | 2 +- src/components/dataDisplays/DataDisplay.jsx | 2 -- .../settings/defaultFieldComponents/SpeciesEditor.jsx | 1 - src/pages/match/ImageCard.jsx | 2 +- src/pages/sighting/statusCard/StatusCard.jsx | 5 ++++- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/cards/Card.jsx b/src/components/cards/Card.jsx index 012064de3..89f2aa674 100644 --- a/src/components/cards/Card.jsx +++ b/src/components/cards/Card.jsx @@ -7,9 +7,9 @@ export default function Card({ title, titleId, htmlId = null, - maxHeight = 360, overflow = 'auto', overflowX = 'auto', + styles = {}, renderActions, children, }) { @@ -35,7 +35,7 @@ export default function Card({ {renderActions}
-
+
{children}
diff --git a/src/components/cards/RelationshipsCard.jsx b/src/components/cards/RelationshipsCard.jsx index d4fc58be2..a2aa7b6bb 100644 --- a/src/components/cards/RelationshipsCard.jsx +++ b/src/components/cards/RelationshipsCard.jsx @@ -341,7 +341,7 @@ export default function RelationshipsCard({
, - + {/* // renderActions={ //
//
+ + Date: Fri, 22 Jul 2022 12:47:24 -0700 Subject: [PATCH 4/7] DEX-922 respond to code review feedback pt 2 --- src/components/cards/Card.jsx | 5 +---- src/components/dataDisplays/DataDisplay.jsx | 4 +--- src/components/dataDisplays/IndividualsDisplay.jsx | 1 - src/pages/match/ImageCard.jsx | 2 +- src/pages/sighting/statusCard/StatusCard.jsx | 5 +---- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/components/cards/Card.jsx b/src/components/cards/Card.jsx index 89f2aa674..78ab7c8fb 100644 --- a/src/components/cards/Card.jsx +++ b/src/components/cards/Card.jsx @@ -9,7 +9,6 @@ export default function Card({ htmlId = null, overflow = 'auto', overflowX = 'auto', - styles = {}, renderActions, children, }) { @@ -35,9 +34,7 @@ export default function Card({ {renderActions} -
- {children} -
+
{children}
); diff --git a/src/components/dataDisplays/DataDisplay.jsx b/src/components/dataDisplays/DataDisplay.jsx index 2eb3f371d..2b5d86171 100644 --- a/src/components/dataDisplays/DataDisplay.jsx +++ b/src/components/dataDisplays/DataDisplay.jsx @@ -259,9 +259,7 @@ export default function DataDisplay({
{ // window.open('/individuals/picturebook', '_blank'); // }} diff --git a/src/pages/match/ImageCard.jsx b/src/pages/match/ImageCard.jsx index 2c5fd4ef2..bbcd7a4ce 100644 --- a/src/pages/match/ImageCard.jsx +++ b/src/pages/match/ImageCard.jsx @@ -40,7 +40,7 @@ export default function ImageCard({ titleId, annotation }) { ); return ( - + + Date: Mon, 25 Jul 2022 09:17:35 -0700 Subject: [PATCH 5/7] DEX-922 add tableContainerStyles to DataDisplay and remove maxHeight --- src/components/IndividualSelector.jsx | 2 +- src/components/cards/CollaborationsCard.jsx | 16 ++++++---- src/components/cards/CooccurrenceCard.jsx | 2 +- src/components/cards/EncountersCard.jsx | 31 ++++++++++--------- src/components/cards/SightingsCard.jsx | 31 ++++++++++--------- src/components/dataDisplays/DataDisplay.jsx | 10 +++--- .../dataDisplays/IndividualsDisplay.jsx | 3 +- .../dataDisplays/RelationshipDisplay.jsx | 2 +- .../dataDisplays/SightingsDisplay.jsx | 2 +- src/pages/assetGroup/AGSTable.jsx | 2 +- .../settings/CategoryTable.jsx | 2 +- .../settings/CustomFieldTable.jsx | 15 ++++++--- .../settings/DefaultFieldTable.jsx | 2 +- .../defaultFieldComponents/SpeciesEditor.jsx | 2 +- src/pages/match/MatchCandidatesTable.jsx | 8 +++-- src/pages/match/QueryAnnotationsTable.jsx | 5 ++- .../reportSighting/utils/prepareReport.js | 2 ++ src/pages/userManagement/UserEditTable.jsx | 2 +- .../UserManagerCollaborationEditTable.jsx | 8 +++-- 19 files changed, 84 insertions(+), 63 deletions(-) diff --git a/src/components/IndividualSelector.jsx b/src/components/IndividualSelector.jsx index b7faff3a8..de3b92643 100644 --- a/src/components/IndividualSelector.jsx +++ b/src/components/IndividualSelector.jsx @@ -123,7 +123,7 @@ export default function IndividualSelector({ {canShowTable && ( { - setCollabDialogButtonClickLoading(false); - }, [data]); + useEffect( + () => { + setCollabDialogButtonClickLoading(false); + }, + [data], + ); const collaborations = get(data, ['collaborations'], []); const tableData = collaborations.map(collaboration => { @@ -139,7 +143,7 @@ export default function CollaborationsCard({ columns={columns} data={tableData} idKey="guid" - maxHeight={600} + tableContainerStyles={{ maxHeight: 600 }} /> ); diff --git a/src/components/cards/CooccurrenceCard.jsx b/src/components/cards/CooccurrenceCard.jsx index 63bbbee53..bfd7f8e3d 100644 --- a/src/components/cards/CooccurrenceCard.jsx +++ b/src/components/cards/CooccurrenceCard.jsx @@ -34,7 +34,7 @@ export default function CooccurrenceCard({ }, ]} data={data} - maxHeight={600} + tableContainerStyles={{ maxHeight: 600 }} /> ); diff --git a/src/components/cards/EncountersCard.jsx b/src/components/cards/EncountersCard.jsx index 4d018c069..fba5fae78 100644 --- a/src/components/cards/EncountersCard.jsx +++ b/src/components/cards/EncountersCard.jsx @@ -34,20 +34,23 @@ export default function EncountersCard({ const mapModeClicked = () => setShowMapView(true); const listModeClicked = () => setShowMapView(false); - const encountersWithLocationData = useMemo(() => { - // hotfix // - if (!encounters) return []; - // hotfix // + const encountersWithLocationData = useMemo( + () => { + // hotfix // + if (!encounters) return []; + // hotfix // - return encounters.map(encounter => ({ - ...encounter, - formattedLocation: formatLocationFromSighting( - encounter, - regionOptions, - intl, - ), - })); - }, [get(encounters, 'length')]); + return encounters.map(encounter => ({ + ...encounter, + formattedLocation: formatLocationFromSighting( + encounter, + regionOptions, + intl, + ), + })); + }, + [get(encounters, 'length')], + ); const tooFewEncounters = encounters.length <= 1; @@ -162,7 +165,7 @@ export default function EncountersCard({ columns={filteredColumns} data={encountersWithLocationData} tableStyles={{ tableLayout: 'fixed' }} - maxHeight={600} + tableContainerStyles={{ maxHeight: 600 }} /> )} {!noEncounters && showMapView &&
Map goes here
} diff --git a/src/components/cards/SightingsCard.jsx b/src/components/cards/SightingsCard.jsx index d19dd0897..9db060131 100644 --- a/src/components/cards/SightingsCard.jsx +++ b/src/components/cards/SightingsCard.jsx @@ -33,20 +33,23 @@ export default function SightingsCard({ const mapModeClicked = () => setShowMapView(true); const listModeClicked = () => setShowMapView(false); - const sightingsWithLocationData = useMemo(() => { - // hotfix // - if (!sightings) return []; - // hotfix // + const sightingsWithLocationData = useMemo( + () => { + // hotfix // + if (!sightings) return []; + // hotfix // - return sightings.map(sighting => ({ - ...sighting, - formattedLocation: formatLocationFromSighting( - sighting, - regionOptions, - intl, - ), - })); - }, [get(sightings, 'length')]); + return sightings.map(sighting => ({ + ...sighting, + formattedLocation: formatLocationFromSighting( + sighting, + regionOptions, + intl, + ), + })); + }, + [get(sightings, 'length')], + ); const allColumns = [ { @@ -149,7 +152,7 @@ export default function SightingsCard({ data={sightings} loading={loading} noResultsTextId={noSightingsMsg} - maxHeight={400} + tableContainerStyles={{ maxHeight: 400 }} /> )} {!noSightings && showMapView && ( diff --git a/src/components/dataDisplays/DataDisplay.jsx b/src/components/dataDisplays/DataDisplay.jsx index 2b5d86171..8624c1d24 100644 --- a/src/components/dataDisplays/DataDisplay.jsx +++ b/src/components/dataDisplays/DataDisplay.jsx @@ -64,7 +64,8 @@ export default function DataDisplay({ tableStyles = {}, cellStyles = {}, stickyHeader = true, - maxHeight, + tableContainerStyles = {}, + // maxHeight, ...rest }) { const intl = useIntl(); @@ -81,8 +82,9 @@ export default function DataDisplay({ ); const [filter, setFilter] = useState(''); const [internalSortColumn, setInternalSortColumn] = useState(null); - const [internalSortDirection, setInternalSortDirection] = - useState(null); + const [internalSortDirection, setInternalSortDirection] = useState( + null, + ); const [anchorEl, setAnchorEl] = useState(null); const filterPopperOpen = Boolean(anchorEl); @@ -259,7 +261,7 @@ export default function DataDisplay({
{ // window.open('/individuals/picturebook', '_blank'); // }} - showNoResultsBao - // renderExpandedRow={expandedIndividual => ( + showNoResultsBao // renderExpandedRow={expandedIndividual => ( //
// {/* ); } diff --git a/src/components/dataDisplays/SightingsDisplay.jsx b/src/components/dataDisplays/SightingsDisplay.jsx index e645d15a4..237cba0bf 100644 --- a/src/components/dataDisplays/SightingsDisplay.jsx +++ b/src/components/dataDisplays/SightingsDisplay.jsx @@ -100,7 +100,7 @@ export default function SightingsDisplay({ title={title} loading={loading} showNoResultsBao - maxHeight={600} + tableContainerStyles={{ maxHeight: 600 }} // renderExpandedRow={expandedSighting => ( //
// ); } diff --git a/src/pages/fieldManagement/settings/CategoryTable.jsx b/src/pages/fieldManagement/settings/CategoryTable.jsx index 36e62a533..f25e15e07 100644 --- a/src/pages/fieldManagement/settings/CategoryTable.jsx +++ b/src/pages/fieldManagement/settings/CategoryTable.jsx @@ -291,7 +291,7 @@ export default function FieldSettings() { variant="secondary" columns={categoryColumns} data={categories} - maxHeight={300} + tableContainerStyles={{ maxHeight: 300 }} /> ); diff --git a/src/pages/fieldManagement/settings/CustomFieldTable.jsx b/src/pages/fieldManagement/settings/CustomFieldTable.jsx index 1367ac914..2ea09b98a 100644 --- a/src/pages/fieldManagement/settings/CustomFieldTable.jsx +++ b/src/pages/fieldManagement/settings/CustomFieldTable.jsx @@ -47,8 +47,9 @@ export default function CustomFieldTable({ const intl = useIntl(); const [deleteField, setDeleteField] = useState(null); const [previewField, setPreviewField] = useState(null); - const [previewInitialValue, setPreviewInitialValue] = - useState(null); + const [previewInitialValue, setPreviewInitialValue] = useState( + null, + ); const { removeCustomField, needsForce, @@ -101,7 +102,9 @@ export default function CustomFieldTable({ /> ); diff --git a/src/pages/fieldManagement/settings/DefaultFieldTable.jsx b/src/pages/fieldManagement/settings/DefaultFieldTable.jsx index 01b3c8ffe..e1a63baf7 100644 --- a/src/pages/fieldManagement/settings/DefaultFieldTable.jsx +++ b/src/pages/fieldManagement/settings/DefaultFieldTable.jsx @@ -198,7 +198,7 @@ export default function DefaultFieldTable({ variant="secondary" columns={tableColumns} data={configurableFields} - maxHeight={300} + tableContainerStyles={{ maxHeight: 300 }} /> ); diff --git a/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx b/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx index e5c19d168..c5cca2529 100644 --- a/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx +++ b/src/pages/fieldManagement/settings/defaultFieldComponents/SpeciesEditor.jsx @@ -173,7 +173,7 @@ export default function SpeciesEditor({ columns={tableColumns} data={searchResults || suggestedValues} idKey="itisTsn" - maxHeight={300} + tableContainerStyles={{ maxHeight: 300 }} /> ); } diff --git a/src/pages/match/QueryAnnotationsTable.jsx b/src/pages/match/QueryAnnotationsTable.jsx index 17068818e..4de89a5a2 100644 --- a/src/pages/match/QueryAnnotationsTable.jsx +++ b/src/pages/match/QueryAnnotationsTable.jsx @@ -43,8 +43,7 @@ export default function QueryAnnotationsTable({ ); } diff --git a/src/pages/reportSighting/utils/prepareReport.js b/src/pages/reportSighting/utils/prepareReport.js index 3a43aebbe..e525c2218 100644 --- a/src/pages/reportSighting/utils/prepareReport.js +++ b/src/pages/reportSighting/utils/prepareReport.js @@ -13,6 +13,8 @@ export function prepareBasicReport( assetReferences, simpleAssets = false, ) { + console.log('deleteMe sightingData in prepareBasicReport is: '); + console.log(sightingData); const customSightingDictionary = transformCustomFields( customSightingData, customSightingSchemas, diff --git a/src/pages/userManagement/UserEditTable.jsx b/src/pages/userManagement/UserEditTable.jsx index d9a3b5f4d..707a2ef38 100644 --- a/src/pages/userManagement/UserEditTable.jsx +++ b/src/pages/userManagement/UserEditTable.jsx @@ -116,7 +116,7 @@ export default function UserEditTable() { columns={tableColumns} data={activeUsers} loading={loading} - maxHeight={500} + tableContainerStyles={{ maxHeight: 500 }} /> {usersError ? ( {collaborationError ? ( Date: Mon, 25 Jul 2022 11:17:00 -0700 Subject: [PATCH 6/7] DEX-922 remove tableContainerStyles from SightingsDisplay and fix a few little things --- src/components/dataDisplays/DataDisplay.jsx | 1 - src/components/dataDisplays/IndividualsDisplay.jsx | 3 ++- src/components/dataDisplays/SightingsDisplay.jsx | 1 - src/pages/match/QueryAnnotationsTable.jsx | 3 ++- src/pages/reportSighting/utils/prepareReport.js | 2 -- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/dataDisplays/DataDisplay.jsx b/src/components/dataDisplays/DataDisplay.jsx index 8624c1d24..a84964c02 100644 --- a/src/components/dataDisplays/DataDisplay.jsx +++ b/src/components/dataDisplays/DataDisplay.jsx @@ -65,7 +65,6 @@ export default function DataDisplay({ cellStyles = {}, stickyHeader = true, tableContainerStyles = {}, - // maxHeight, ...rest }) { const intl = useIntl(); diff --git a/src/components/dataDisplays/IndividualsDisplay.jsx b/src/components/dataDisplays/IndividualsDisplay.jsx index ec4b67113..2f9d1e73b 100644 --- a/src/components/dataDisplays/IndividualsDisplay.jsx +++ b/src/components/dataDisplays/IndividualsDisplay.jsx @@ -78,7 +78,8 @@ export default function IndividualsDisplay({ // onPrint={() => { // window.open('/individuals/picturebook', '_blank'); // }} - showNoResultsBao // renderExpandedRow={expandedIndividual => ( + showNoResultsBao + // renderExpandedRow={expandedIndividual => ( //
// {/* ( //
// Date: Mon, 25 Jul 2022 11:35:16 -0700 Subject: [PATCH 7/7] DEX-922 final little fixes --- src/components/dataDisplays/DataDisplay.jsx | 2 +- src/pages/match/MatchCandidatesTable.jsx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/dataDisplays/DataDisplay.jsx b/src/components/dataDisplays/DataDisplay.jsx index a84964c02..18c0fd595 100644 --- a/src/components/dataDisplays/DataDisplay.jsx +++ b/src/components/dataDisplays/DataDisplay.jsx @@ -260,7 +260,7 @@ export default function DataDisplay({