Merge branch 'develop' of github.com:IQSS/dataverse into 11605-existing-external-users-api-auth

Author: GPortas

doc/release-notes/11614-include-isAdvancedSeachField-property.md

@@ -0,0 +1,3 @@
+The API endpoints `api/{dataverse-alias}/metadatablocks` and `/api/metadatablocks/{block_id}` have been extended to include the following field:
+
+- `isAdvancedSearchFieldType`: Whether the field can be used in advanced search or not.

modules/dataverse-parent/pom.xml

@@ -454,8 +454,8 @@
                     Once the release has been made (tag created), change this back to "${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}"
                     (These properties are provided by the build-helper plugin below.)
                 -->
-                <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
-                <base.image.version>${revision}</base.image.version>
+                <base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>
+                <!--<base.image.version>${revision}</base.image.version>-->
                 <!-- This is used by the maintenance CI jobs, no need to adapt during releases. -->
                 <app.image.version>${base.image.version}</app.image.version>
             </properties>

src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java

@@ -755,6 +755,7 @@ public static JsonObjectBuilder json(DatasetFieldType fld, Dataverse ownerDatave
         fieldsBld.add("description", fld.getDescription());
         fieldsBld.add("multiple", fld.isAllowMultiples());
         fieldsBld.add("isControlledVocabulary", fld.isControlledVocabulary());
+        fieldsBld.add("isAdvancedSearchFieldType", fld.isAdvancedSearchFieldType());
         fieldsBld.add("displayFormat", fld.getDisplayFormat());
         fieldsBld.add("displayOrder", fld.getDisplayOrder());
 

src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java

@@ -75,7 +75,8 @@ void testGetMetadataBlock() {
                 .body("data.fields.subject.controlledVocabularyValues[0]", CoreMatchers.is("Agricultural Sciences"))
                 .body("data.fields.title.displayOrder", CoreMatchers.is(0))
                 .body("data.fields.title.typeClass", CoreMatchers.is("primitive"))
-                .body("data.fields.title.isRequired", CoreMatchers.is(true));
+                .body("data.fields.title.isRequired", CoreMatchers.is(true))
+                .body("data.fields.title.isAdvancedSearchFieldType", CoreMatchers.is(true));
     }
 
     @Test