Skip to content

Commit a731e47

Browse files
ofahimIQSSofahimIQSS
authored
Merge pull request #333 from IQSS/feat/332-include-isAdvancedSearchFieldType-property
Include isAdvancedSearchFieldType property
2 parents 6a025d3 + d3bee42 commit a731e47

File tree

6 files changed

+25
-2
lines changed

6 files changed

+25
-2
lines changed

‎src/metadataBlocks/domain/models/MetadataBlock.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export interface MetadataFieldInfo {
2020
displayFormat: string
2121
childMetadataFields?: Record<string, MetadataFieldInfo>
2222
isRequired: boolean
23+
isAdvancedSearchFieldType: boolean
2324
displayOrder: number
2425
displayOnCreate: boolean
2526
}

‎src/metadataBlocks/infra/repositories/transformers/MetadataFieldInfoPayload.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export interface MetadataFieldInfoPayload {
1212
displayFormat: string
1313
displayOrder: number
1414
isRequired: boolean
15+
isAdvancedSearchFieldType: boolean
1516
controlledVocabularyValues?: string[]
1617
childMetadataFields?: Record<string, MetadataFieldInfoPayload>
1718
}

‎src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ const transformPayloadMetadataFieldInfo = (
9898
}),
9999
displayFormat: metadataFieldInfoPayload.displayFormat,
100100
isRequired: metadataFieldInfoPayload.isRequired,
101+
isAdvancedSearchFieldType: metadataFieldInfoPayload.isAdvancedSearchFieldType,
101102
displayOrder: metadataFieldInfoPayload.displayOrder,
102103
typeClass: metadataFieldInfoPayload.typeClass as MetadataFieldTypeClass,
103104
displayOnCreate: metadataFieldInfoPayload.displayOnCreate

‎test/environment/.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
POSTGRES_VERSION=17
22
DATAVERSE_DB_USER=dataverse
33
SOLR_VERSION=9.8.0
4-
DATAVERSE_IMAGE_REGISTRY=docker.io
5-
DATAVERSE_IMAGE_TAG=unstable
4+
DATAVERSE_IMAGE_REGISTRY=ghcr.io
5+
DATAVERSE_IMAGE_TAG=11614-include-isAdvancedSearchField-property
66
DATAVERSE_BOOTSTRAP_TIMEOUT=5m

‎test/testHelpers/datasets/datasetHelper.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
514514
isControlledVocabulary: false,
515515
displayFormat: '#VALUE',
516516
isRequired: true,
517+
isAdvancedSearchFieldType: true,
517518
displayOrder: 0,
518519
displayOnCreate: true,
519520
typeClass: MetadataFieldTypeClass.Primitive
@@ -529,6 +530,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
529530
isControlledVocabulary: false,
530531
displayFormat: '#VALUE',
531532
isRequired: true,
533+
isAdvancedSearchFieldType: false,
532534
displayOrder: 1,
533535
typeClass: MetadataFieldTypeClass.Compound,
534536
displayOnCreate: true,
@@ -544,6 +546,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
544546
isControlledVocabulary: false,
545547
displayFormat: '#VALUE',
546548
isRequired: true,
549+
isAdvancedSearchFieldType: true,
547550
displayOrder: 2,
548551
displayOnCreate: true,
549552
typeClass: MetadataFieldTypeClass.Primitive
@@ -559,6 +562,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
559562
isControlledVocabulary: false,
560563
displayFormat: '#VALUE',
561564
isRequired: false,
565+
isAdvancedSearchFieldType: true,
562566
displayOrder: 3,
563567
displayOnCreate: true,
564568
typeClass: MetadataFieldTypeClass.Primitive
@@ -577,6 +581,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
577581
isControlledVocabulary: false,
578582
displayFormat: '',
579583
isRequired: true,
584+
isAdvancedSearchFieldType: false,
580585
displayOrder: 4,
581586
displayOnCreate: true,
582587
typeClass: MetadataFieldTypeClass.Primitive
@@ -592,6 +597,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
592597
isControlledVocabulary: false,
593598
displayFormat: '#NAME: #VALUE ',
594599
isRequired: false,
600+
isAdvancedSearchFieldType: false,
595601
displayOrder: 5,
596602
displayOnCreate: true,
597603
typeClass: MetadataFieldTypeClass.Primitive
@@ -607,6 +613,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
607613
isControlledVocabulary: false,
608614
displayFormat: '#NAME: #VALUE ',
609615
isRequired: false,
616+
isAdvancedSearchFieldType: false,
610617
displayOrder: 5,
611618
displayOnCreate: true,
612619
typeClass: MetadataFieldTypeClass.Primitive
@@ -623,6 +630,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
623630
isControlledVocabulary: false,
624631
displayFormat: ':',
625632
isRequired: false,
633+
isAdvancedSearchFieldType: false,
626634
displayOrder: 6,
627635
typeClass: MetadataFieldTypeClass.Compound,
628636
displayOnCreate: true,
@@ -638,6 +646,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
638646
isControlledVocabulary: true,
639647
displayFormat: '#VALUE ',
640648
isRequired: false,
649+
isAdvancedSearchFieldType: false,
641650
displayOrder: 7,
642651
displayOnCreate: true,
643652
controlledVocabularyValues: [
@@ -673,6 +682,7 @@ export const createDatasetMetadataBlockModel = (): MetadataBlock => {
673682
isControlledVocabulary: false,
674683
displayFormat: '#VALUE',
675684
isRequired: true,
685+
isAdvancedSearchFieldType: false,
676686
displayOrder: 8,
677687
typeClass: MetadataFieldTypeClass.Primitive,
678688
displayOnCreate: true

‎test/testHelpers/metadataBlocks/metadataBlockHelper.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
2626
isControlledVocabulary: false,
2727
displayFormat: '#VALUE',
2828
isRequired: true,
29+
isAdvancedSearchFieldType: false,
2930
displayOrder: 0,
3031
typeClass: MetadataFieldTypeClass.Primitive,
3132
displayOnCreate: true
@@ -41,6 +42,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
4142
isControlledVocabulary: false,
4243
displayFormat: '',
4344
isRequired: true,
45+
isAdvancedSearchFieldType: false,
4446
displayOrder: 0,
4547
typeClass: MetadataFieldTypeClass.Compound,
4648
displayOnCreate: true,
@@ -56,6 +58,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
5658
isControlledVocabulary: false,
5759
displayFormat: '#VALUE',
5860
isRequired: true,
61+
isAdvancedSearchFieldType: false,
5962
displayOrder: 0,
6063
typeClass: MetadataFieldTypeClass.Primitive,
6164
displayOnCreate: true
@@ -71,6 +74,7 @@ export const createMetadataBlockModel = (): MetadataBlock => {
7174
isControlledVocabulary: false,
7275
displayFormat: '#VALUE',
7376
isRequired: true,
77+
isAdvancedSearchFieldType: false,
7478
displayOrder: 0,
7579
typeClass: MetadataFieldTypeClass.Primitive,
7680
displayOnCreate: true
@@ -99,6 +103,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
99103
isControlledVocabulary: false,
100104
displayFormat: '#VALUE',
101105
isRequired: true,
106+
isAdvancedSearchFieldType: false,
102107
displayOrder: 0,
103108
typeClass: 'primitive',
104109
displayOnCreate: true
@@ -114,6 +119,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
114119
isControlledVocabulary: false,
115120
displayFormat: '',
116121
isRequired: true,
122+
isAdvancedSearchFieldType: false,
117123
displayOrder: 0,
118124
typeClass: 'compound',
119125
displayOnCreate: true,
@@ -129,6 +135,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
129135
isControlledVocabulary: false,
130136
displayFormat: '#VALUE',
131137
isRequired: true,
138+
isAdvancedSearchFieldType: false,
132139
displayOrder: 0,
133140
typeClass: 'primitive',
134141
displayOnCreate: true
@@ -144,6 +151,7 @@ export const createMetadataBlockPayload = (): MetadataBlockPayload => {
144151
isControlledVocabulary: false,
145152
displayFormat: '#VALUE',
146153
isRequired: true,
154+
isAdvancedSearchFieldType: false,
147155
displayOrder: 0,
148156
typeClass: 'primitive',
149157
displayOnCreate: true
@@ -166,6 +174,7 @@ export const createMetadataFieldInfoModel = (): MetadataFieldInfo => {
166174
isControlledVocabulary: false,
167175
displayFormat: '#VALUE',
168176
isRequired: true,
177+
isAdvancedSearchFieldType: false,
169178
displayOrder: 0,
170179
typeClass: MetadataFieldTypeClass.Primitive,
171180
displayOnCreate: true
@@ -184,6 +193,7 @@ export const createMetadataFieldInfoPayload = (): MetadataFieldInfoPayload => {
184193
isControlledVocabulary: false,
185194
displayFormat: '#VALUE',
186195
isRequired: true,
196+
isAdvancedSearchFieldType: false,
187197
displayOrder: 0,
188198
typeClass: 'primitive',
189199
displayOnCreate: true

0 commit comments

Comments
 (0)