Skip to content

Include isAdvancedSearchFieldType property #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofahimIQSS merged 2 commits into from
Jul 22, 2025
Merged

Include isAdvancedSearchFieldType property #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b84eba2
feat: include isAdvancedSearchFieldType prop
g-saracca Jul 8, 2025
d3bee42
test: include property in helpers
g-saracca Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/metadataBlocks/domain/models/MetadataBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface MetadataFieldInfo {
displayFormat: string
childMetadataFields?: Record<string, MetadataFieldInfo>
isRequired: boolean
isAdvancedSearchFieldType: boolean
displayOrder: number
displayOnCreate: boolean
}
Expand Down
1 change: 1 addition & 0 deletions src/metadataBlocks/infra/repositories/transformers/MetadataFieldInfoPayload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface MetadataFieldInfoPayload {
displayFormat: string
displayOrder: number
isRequired: boolean
isAdvancedSearchFieldType: boolean
controlledVocabularyValues?: string[]
childMetadataFields?: Record<string, MetadataFieldInfoPayload>
}
1 change: 1 addition & 0 deletions src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/environment/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions test/testHelpers/datasets/datasetHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: true,
displayOrder: 0,
displayOnCreate: true,
typeClass: MetadataFieldTypeClass.Primitive
Expand All @@ -529,6 +530,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 1,
typeClass: MetadataFieldTypeClass.Compound,
displayOnCreate: true,
Expand All @@ -544,6 +546,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: true,
displayOrder: 2,
displayOnCreate: true,
typeClass: MetadataFieldTypeClass.Primitive
Expand All @@ -559,6 +562,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: false,
isAdvancedSearchFieldType: true,
displayOrder: 3,
displayOnCreate: true,
typeClass: MetadataFieldTypeClass.Primitive
Expand All @@ -577,6 +581,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 4,
displayOnCreate: true,
typeClass: MetadataFieldTypeClass.Primitive
Expand All @@ -592,6 +597,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#NAME: #VALUE ',
isRequired: false,
isAdvancedSearchFieldType: false,
displayOrder: 5,
displayOnCreate: true,
typeClass: MetadataFieldTypeClass.Primitive
Expand All @@ -607,6 +613,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#NAME: #VALUE ',
isRequired: false,
isAdvancedSearchFieldType: false,
displayOrder: 5,
displayOnCreate: true,
typeClass: MetadataFieldTypeClass.Primitive
Expand All @@ -623,6 +630,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: ':',
isRequired: false,
isAdvancedSearchFieldType: false,
displayOrder: 6,
typeClass: MetadataFieldTypeClass.Compound,
displayOnCreate: true,
Expand All @@ -638,6 +646,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: true,
displayFormat: '#VALUE ',
isRequired: false,
isAdvancedSearchFieldType: false,
displayOrder: 7,
displayOnCreate: true,
controlledVocabularyValues: [
Expand Down Expand Up @@ -673,6 +682,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 8,
typeClass: MetadataFieldTypeClass.Primitive,
displayOnCreate: true
Expand Down
10 changes: 10 additions & 0 deletions test/testHelpers/metadataBlocks/metadataBlockHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: MetadataFieldTypeClass.Primitive,
displayOnCreate: true
Expand All @@ -41,6 +42,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: MetadataFieldTypeClass.Compound,
displayOnCreate: true,
Expand All @@ -56,6 +58,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: MetadataFieldTypeClass.Primitive,
displayOnCreate: true
Expand All @@ -71,6 +74,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: MetadataFieldTypeClass.Primitive,
displayOnCreate: true
Expand Down Expand Up @@ -99,6 +103,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: 'primitive',
displayOnCreate: true
Expand All @@ -114,6 +119,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
isControlledVocabulary: false,
displayFormat: '',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: 'compound',
displayOnCreate: true,
Expand All @@ -129,6 +135,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: 'primitive',
displayOnCreate: true
Expand All @@ -144,6 +151,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: 'primitive',
displayOnCreate: true
Expand All @@ -166,6 +174,7 @@ export const createMetadataFieldInfoModel = (): MetadataFieldInfo => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: MetadataFieldTypeClass.Primitive,
displayOnCreate: true
Expand All @@ -184,6 +193,7 @@ export const createMetadataFieldInfoPayload = (): MetadataFieldInfoPayload => {
isControlledVocabulary: false,
displayFormat: '#VALUE',
isRequired: true,
isAdvancedSearchFieldType: false,
displayOrder: 0,
typeClass: 'primitive',
displayOnCreate: true
Expand Down