geonetwork-ui 2.8.1-dev.5167dd591 → 2.8.1-dev.8a76e5fef

package/fesm2022/geonetwork-ui.mjs

@@ -25511,7 +25511,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
             }] } });
 
 var name = "geonetwork-ui";
-var version = "2.8.1-dev.5167dd591";
+var version = "2.8.1-dev.8a76e5fef";
 var engines = {
 	node: ">=20"
 };
@@ -25925,14 +25925,18 @@ class ElasticsearchService {
             })
                 .join(' OR ');
         };
-        const queryString = typeof filters === 'string'
+        let queryString = typeof filters === 'string'
             ? filters
             : Object.keys(filters)
+                .filter((fieldname) => fieldname !== 'gn-ui-crossFieldFilter')
                 .filter((fieldname) => !isDateRange(filters[fieldname]))
                 .filter((fieldname) => filters[fieldname] &&
                 JSON.stringify(filters[fieldname]) !== '{}')
                 .map((fieldname) => `${fieldname}:(${makeQuery(filters[fieldname])})`)
                 .join(' AND ');
+        if (filters['gn-ui-crossFieldFilter']) {
+            queryString = `${queryString} AND (${filters['gn-ui-crossFieldFilter']})`;
+        }
         const queryRange = Object.entries(filters)
             .filter(([, value]) => isDateRange(value))
             .map(([searchField, dateRange]) => {
@@ -26105,7 +26109,12 @@ class ElasticsearchService {
                     must_not: this.mustNotFilters(),
                 },
             },
-            _source: ['resourceTitleObject', 'uuid', 'resourceType'],
+            _source: [
+                'resourceTitleObject',
+                'uuid',
+                'resourceType',
+                'cl_presentationForm',
+            ],
             from: 0,
             size: 20,
         };
@@ -32971,8 +32980,8 @@ class RecordKindField extends SimpleSearchField {
         };
         const presentationFormFilter = {};
         if (values.includes('reuse') && !values.includes('dataset')) {
-            presentationFormFilter['mapDigital'] = true;
-            presentationFormFilter['mapHardcopy'] = true;
+            filters['gn-ui-crossFieldFilter'] =
+                `(resourceType:("dataset" OR "document") AND cl_presentationForm.key:("mapDigital" OR "mapHardcopy")) OR resourceType:("application" OR "interactiveMap" OR "map" OR "map/static" OR "map/interactive" OR "map-interactive" OR "map-static" OR "mapDigital" OR "mapHardcopy" OR "staticMap")`;
         }
         else if (values.includes('dataset') && !values.includes('reuse')) {
             presentationFormFilter['mapDigital'] = false;
@@ -33065,7 +33074,12 @@ class FieldsService {
                 : [fieldValues[fieldName]];
             return this.getFiltersForValues(fieldName, values);
         });
-        return forkJoin(filtersByField$).pipe(map$1((filters) => filters.reduce((prev, curr) => ({ ...prev, ...curr }), {})));
+        return forkJoin(filtersByField$).pipe(map$1((filters) => {
+            if (typeof filters === 'string') {
+                return filters;
+            }
+            return filters.reduce((prev, curr) => ({ ...prev, ...curr }), {});
+        }));
     }
     readFieldValuesFromFilters(filters) {
         const fieldValues$ = this.supportedFields.map((fieldName) => this.getValuesForFilters(fieldName, filters).pipe(map$1((values) => ({ [fieldName]: values }))));