From 8474cf9bdef6da223cc7493ed51ba581a097d450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckarenmajewicz=E2=80=9D?= Date: Tue, 7 Apr 2026 11:32:05 -0500 Subject: [PATCH 1/3] Update FullDetailsTable.tsx --- .../components/resource/FullDetailsTable.tsx | 71 +++++++------------ 1 file changed, 24 insertions(+), 47 deletions(-) diff --git a/frontend/src/components/resource/FullDetailsTable.tsx b/frontend/src/components/resource/FullDetailsTable.tsx index 76597d82..db48167e 100644 --- a/frontend/src/components/resource/FullDetailsTable.tsx +++ b/frontend/src/components/resource/FullDetailsTable.tsx @@ -61,6 +61,12 @@ const relationshipLabels: { [key: string]: string } = { export function FullDetailsTable({ data }: FullDetailsTableProps) { const b1gAttributes = { ...((data?.attributes?.b1g || {}) as Attributes) }; delete b1gAttributes.data_dictionaries; + if ( + b1gAttributes.b1g_dateAccessioned_s === undefined && + b1gAttributes.b1g_dateAccessioned_dt !== undefined + ) { + b1gAttributes.b1g_dateAccessioned_s = b1gAttributes.b1g_dateAccessioned_dt; + } // Merge ogm and b1g attributes for display const attributes = { ...(data?.attributes?.ogm || {}), @@ -76,54 +82,19 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { // Define the fields for the Document Metadata table - BTAA schema only const documentMetadataFields = [ - // Core fields (Required by BTAA) - 'gbl_mdVersion_s', 'dct_title_s', 'dct_description_sm', - 'dct_language_sm', - 'dct_accessRights_s', - 'dct_license_sm', - 'b1g_code_s', - 'b1g_dct_accrualMethod_s', - 'b1g_dateAccessioned_s', - 'b1g_publication_state_s', - 'b1g_language_sm', - - // Additional BTAA fields - 'gbl_mdModified_dt', - 'dct_alternative_sm', - 'dct_subject_sm', 'dct_creator_sm', - 'dct_publisher_sm', - 'dct_source_sm', - 'dct_isPartOf_sm', - 'pcdm_memberOf_sm', - 'dct_replaces_sm', - 'dct_isReplacedBy_sm', - 'dct_isVersionOf_sm', - 'dct_relation_sm', 'dct_issued_s', 'dct_temporal_sm', - 'solr_year_i', - 'layer_id_s', - 'suppressed_b', - 'dct_references_s', - - // BTAA custom fields - 'b1g_status_s', - 'b1g_dct_accrualPeriodicity_s', - 'b1g_dateRetired_s', - 'b1g_child_record_b', - 'b1g_dct_mediator_sm', - 'b1g_access_s', - 'b1g_image_ss', - 'b1g_geonames_sm', - 'b1g_creatorID_sm', + 'dct_language_sm', 'b1g_dct_conformsTo_sm', 'b1g_dcat_spatialResolutionInMeters_sm', 'b1g_geodcat_spatialResolutionAsText_sm', - 'b1g_dct_provenanceStatement_sm', - 'b1g_adminTags_sm', + 'dct_rights_sm', + 'dct_license_sm', + 'b1g_dct_provenance_sm', + 'b1g_dateAccessioned_s', ]; // Define the fields for the Metadata Facets table - BTAA schema only @@ -131,6 +102,7 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { 'gbl_resourceClass_sm', 'gbl_resourceType_sm', 'dcat_theme_sm', + 'dct_subject_sm', 'dct_spatial_sm', 'dct_publisher_sm', 'schema_provider_s', @@ -175,6 +147,7 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { gbl_mdModified_dt: 'Metadata Modified', dct_alternative_sm: 'Alternative Title', dct_subject_sm: 'Subject', + dcat_theme_sm: 'Topic Category', dct_creator_sm: 'Creator', dct_publisher_sm: 'Publisher', gbl_resourceClass_sm: 'Resource Class', @@ -208,10 +181,10 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { b1g_image_ss: 'Image', b1g_geonames_sm: 'Geonames', b1g_creatorID_sm: 'Creator ID', - b1g_dct_conformsTo_sm: 'Conforms To', - b1g_dcat_spatialResolutionInMeters_sm: 'Spatial Resolution (Meters)', - b1g_geodcat_spatialResolutionAsText_sm: 'Spatial Resolution (Text)', - b1g_dct_provenanceStatement_sm: 'Provenance Statement', + b1g_dct_conformsTo_sm: 'Spatial Reference System', + b1g_dcat_spatialResolutionInMeters_sm: 'Spatial Resolution', + b1g_geodcat_spatialResolutionAsText_sm: 'Scale', + b1g_dct_provenance_sm: 'Provenance Statement', b1g_adminTags_sm: 'Admin Tags', b1g_localCollectionLabel_sm: 'Local collection', }; @@ -230,9 +203,13 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { // Separate fields into: // Document Metadata, Metadata Facets, and Relationship Facets - const documentMetadata = entries.filter(([key]) => - documentMetadataFields.includes(key) - ); + const documentMetadata = entries + .filter(([key]) => documentMetadataFields.includes(key)) + .sort(([a], [b]) => { + const indexA = documentMetadataFields.indexOf(a); + const indexB = documentMetadataFields.indexOf(b); + return indexA - indexB; + }); const metadataFacets = entries .filter(([key]) => metadataFacetsFields.includes(key)) .sort(([a], [b]) => { From 5f866edf945e199d9c516a10de65c32a75f30ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckarenmajewicz=E2=80=9D?= Date: Tue, 7 Apr 2026 11:38:28 -0500 Subject: [PATCH 2/3] remove b1g_dateAccessioned_s --- frontend/src/components/resource/FullDetailsTable.tsx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/frontend/src/components/resource/FullDetailsTable.tsx b/frontend/src/components/resource/FullDetailsTable.tsx index db48167e..9b74812e 100644 --- a/frontend/src/components/resource/FullDetailsTable.tsx +++ b/frontend/src/components/resource/FullDetailsTable.tsx @@ -61,12 +61,6 @@ const relationshipLabels: { [key: string]: string } = { export function FullDetailsTable({ data }: FullDetailsTableProps) { const b1gAttributes = { ...((data?.attributes?.b1g || {}) as Attributes) }; delete b1gAttributes.data_dictionaries; - if ( - b1gAttributes.b1g_dateAccessioned_s === undefined && - b1gAttributes.b1g_dateAccessioned_dt !== undefined - ) { - b1gAttributes.b1g_dateAccessioned_s = b1gAttributes.b1g_dateAccessioned_dt; - } // Merge ogm and b1g attributes for display const attributes = { ...(data?.attributes?.ogm || {}), @@ -94,7 +88,6 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { 'dct_rights_sm', 'dct_license_sm', 'b1g_dct_provenance_sm', - 'b1g_dateAccessioned_s', ]; // Define the fields for the Metadata Facets table - BTAA schema only @@ -139,7 +132,6 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { dct_license_sm: 'License', b1g_code_s: 'BTAA Code', b1g_dct_accrualMethod_s: 'Accrual Method', - b1g_dateAccessioned_s: 'Date Accessioned', b1g_publication_state_s: 'Publication State', b1g_language_sm: 'BTAA Language', @@ -348,8 +340,7 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { // Format date fields to be more readable if ( - (key === 'b1g_dateAccessioned_s' || - key === 'b1g_dateRetired_s' || + (key === 'b1g_dateRetired_s' || key === 'gbl_mdModified_dt' || key === 'dct_issued_s') && value From 31a6f3e34e57be133f7e1cbe047c4139cd48f65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckarenmajewicz=E2=80=9D?= Date: Tue, 7 Apr 2026 11:43:22 -0500 Subject: [PATCH 3/3] Added Date Accessioned --- frontend/src/components/resource/FullDetailsTable.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/resource/FullDetailsTable.tsx b/frontend/src/components/resource/FullDetailsTable.tsx index 9b74812e..3a3aadc7 100644 --- a/frontend/src/components/resource/FullDetailsTable.tsx +++ b/frontend/src/components/resource/FullDetailsTable.tsx @@ -88,6 +88,7 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { 'dct_rights_sm', 'dct_license_sm', 'b1g_dct_provenance_sm', + 'b1g_dateAccessioned_dt', ]; // Define the fields for the Metadata Facets table - BTAA schema only @@ -132,6 +133,7 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { dct_license_sm: 'License', b1g_code_s: 'BTAA Code', b1g_dct_accrualMethod_s: 'Accrual Method', + b1g_dateAccessioned_dt: 'Date Accessioned', b1g_publication_state_s: 'Publication State', b1g_language_sm: 'BTAA Language', @@ -340,7 +342,8 @@ export function FullDetailsTable({ data }: FullDetailsTableProps) { // Format date fields to be more readable if ( - (key === 'b1g_dateRetired_s' || + (key === 'b1g_dateAccessioned_dt' || + key === 'b1g_dateRetired_s' || key === 'gbl_mdModified_dt' || key === 'dct_issued_s') && value