diff --git a/src/metadataBlocks/domain/models/MetadataBlock.ts b/src/metadataBlocks/domain/models/MetadataBlock.ts index b958d68d..b5cd5166 100644 --- a/src/metadataBlocks/domain/models/MetadataBlock.ts +++ b/src/metadataBlocks/domain/models/MetadataBlock.ts @@ -20,6 +20,7 @@ export interface MetadataFieldInfo { displayFormat: string childMetadataFields?: Record isRequired: boolean + isAdvancedSearchFieldType: boolean displayOrder: number displayOnCreate: boolean } diff --git a/src/metadataBlocks/infra/repositories/transformers/MetadataFieldInfoPayload.ts b/src/metadataBlocks/infra/repositories/transformers/MetadataFieldInfoPayload.ts index a380a4b7..a3cf6446 100644 --- a/src/metadataBlocks/infra/repositories/transformers/MetadataFieldInfoPayload.ts +++ b/src/metadataBlocks/infra/repositories/transformers/MetadataFieldInfoPayload.ts @@ -12,6 +12,7 @@ export interface MetadataFieldInfoPayload { displayFormat: string displayOrder: number isRequired: boolean + isAdvancedSearchFieldType: boolean controlledVocabularyValues?: string[] childMetadataFields?: Record } diff --git a/src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts b/src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts index aae50c18..478a472b 100644 --- a/src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts +++ b/src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts @@ -98,6 +98,7 @@ const transformPayloadMetadataFieldInfo = ( }), displayFormat: metadataFieldInfoPayload.displayFormat, isRequired: metadataFieldInfoPayload.isRequired, + isAdvancedSearchFieldType: metadataFieldInfoPayload.isAdvancedSearchFieldType, displayOrder: metadataFieldInfoPayload.displayOrder, typeClass: metadataFieldInfoPayload.typeClass as MetadataFieldTypeClass, displayOnCreate: metadataFieldInfoPayload.displayOnCreate diff --git a/test/environment/.env b/test/environment/.env index e7b54bde..5b641de0 100644 --- a/test/environment/.env +++ b/test/environment/.env @@ -1,6 +1,6 @@ POSTGRES_VERSION=17 DATAVERSE_DB_USER=dataverse SOLR_VERSION=9.8.0 -DATAVERSE_IMAGE_REGISTRY=docker.io -DATAVERSE_IMAGE_TAG=unstable +DATAVERSE_IMAGE_REGISTRY=ghcr.io +DATAVERSE_IMAGE_TAG=11614-include-isAdvancedSearchField-property DATAVERSE_BOOTSTRAP_TIMEOUT=5m diff --git a/test/testHelpers/datasets/datasetHelper.ts b/test/testHelpers/datasets/datasetHelper.ts index bed1fc69..65575bdc 100644 --- a/test/testHelpers/datasets/datasetHelper.ts +++ b/test/testHelpers/datasets/datasetHelper.ts @@ -514,6 +514,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: true, displayOrder: 0, displayOnCreate: true, typeClass: MetadataFieldTypeClass.Primitive @@ -529,6 +530,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 1, typeClass: MetadataFieldTypeClass.Compound, displayOnCreate: true, @@ -544,6 +546,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: true, displayOrder: 2, displayOnCreate: true, typeClass: MetadataFieldTypeClass.Primitive @@ -559,6 +562,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: false, + isAdvancedSearchFieldType: true, displayOrder: 3, displayOnCreate: true, typeClass: MetadataFieldTypeClass.Primitive @@ -577,6 +581,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 4, displayOnCreate: true, typeClass: MetadataFieldTypeClass.Primitive @@ -592,6 +597,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#NAME: #VALUE ', isRequired: false, + isAdvancedSearchFieldType: false, displayOrder: 5, displayOnCreate: true, typeClass: MetadataFieldTypeClass.Primitive @@ -607,6 +613,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#NAME: #VALUE ', isRequired: false, + isAdvancedSearchFieldType: false, displayOrder: 5, displayOnCreate: true, typeClass: MetadataFieldTypeClass.Primitive @@ -623,6 +630,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: ':', isRequired: false, + isAdvancedSearchFieldType: false, displayOrder: 6, typeClass: MetadataFieldTypeClass.Compound, displayOnCreate: true, @@ -638,6 +646,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: true, displayFormat: '#VALUE ', isRequired: false, + isAdvancedSearchFieldType: false, displayOrder: 7, displayOnCreate: true, controlledVocabularyValues: [ @@ -673,6 +682,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 8, typeClass: MetadataFieldTypeClass.Primitive, displayOnCreate: true diff --git a/test/testHelpers/metadataBlocks/metadataBlockHelper.ts b/test/testHelpers/metadataBlocks/metadataBlockHelper.ts index dd041c4c..2d5418e4 100644 --- a/test/testHelpers/metadataBlocks/metadataBlockHelper.ts +++ b/test/testHelpers/metadataBlocks/metadataBlockHelper.ts @@ -26,6 +26,7 @@ export const createMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: MetadataFieldTypeClass.Primitive, displayOnCreate: true @@ -41,6 +42,7 @@ export const createMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: MetadataFieldTypeClass.Compound, displayOnCreate: true, @@ -56,6 +58,7 @@ export const createMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: MetadataFieldTypeClass.Primitive, displayOnCreate: true @@ -71,6 +74,7 @@ export const createMetadataBlockModel = (): MetadataBlock => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: MetadataFieldTypeClass.Primitive, displayOnCreate: true @@ -99,6 +103,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: 'primitive', displayOnCreate: true @@ -114,6 +119,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => { isControlledVocabulary: false, displayFormat: '', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: 'compound', displayOnCreate: true, @@ -129,6 +135,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: 'primitive', displayOnCreate: true @@ -144,6 +151,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: 'primitive', displayOnCreate: true @@ -166,6 +174,7 @@ export const createMetadataFieldInfoModel = (): MetadataFieldInfo => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: MetadataFieldTypeClass.Primitive, displayOnCreate: true @@ -184,6 +193,7 @@ export const createMetadataFieldInfoPayload = (): MetadataFieldInfoPayload => { isControlledVocabulary: false, displayFormat: '#VALUE', isRequired: true, + isAdvancedSearchFieldType: false, displayOrder: 0, typeClass: 'primitive', displayOnCreate: true