geonetwork-ui 2.8.1-dev.08e3d5c5a → 2.8.1-dev.7b5cb2278

package/fesm2022/geonetwork-ui.mjs

@@ -13,7 +13,7 @@ import * as i4 from '@ngx-translate/core';
 import { TranslateLoader, TranslateCompiler, TranslateDefaultParser, TranslateParser, TranslateService, provideTranslateService, TranslateDirective, TranslatePipe, TranslateModule } from '@ngx-translate/core';
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-import { map as map$1, shareReplay as shareReplay$1, catchError, tap as tap$1, filter as filter$1, startWith as startWith$1, withLatestFrom, switchMap as switchMap$1, take, mergeMap, delay, distinctUntilChanged, debounceTime, finalize, throttleTime, first as first$1, pairwise as pairwise$1, share, defaultIfEmpty, toArray } from 'rxjs/operators';
+import { map as map$1, shareReplay as shareReplay$1, catchError, tap as tap$1, filter as filter$1, startWith as startWith$1, withLatestFrom, switchMap as switchMap$1, take, mergeMap, delay, debounceTime, distinctUntilChanged, finalize, throttleTime, first as first$1, pairwise as pairwise$1, share, defaultIfEmpty, toArray } from 'rxjs/operators';
 import { of, map as map$2, lastValueFrom, fromEvent, startWith, shareReplay, filter, pairwise, switchMap, Subject, combineLatest, from, exhaustMap, throwError, forkJoin, takeLast, firstValueFrom, merge, BehaviorSubject, timer, ReplaySubject, Subscription, first, distinctUntilChanged as distinctUntilChanged$1, animationFrameScheduler, debounceTime as debounceTime$1, Observable, buffer, tap as tap$2, combineLatestWith, take as take$1, catchError as catchError$1, takeUntil, EMPTY, mergeMap as mergeMap$1, withLatestFrom as withLatestFrom$1 } from 'rxjs';
 import { lt, valid, coerce, satisfies, ltr } from 'semver';
 import chroma from 'chroma-js';
@@ -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.08e3d5c5a";
+var version = "2.8.1-dev.7b5cb2278";
 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]) => {
@@ -29192,9 +29196,8 @@ class AutocompleteComponent {
     ngOnChanges(changes) {
         const { value } = changes;
         if (value) {
-            const previousTextValue = this.displayWithFnInternal(value.previousValue);
             const currentTextValue = this.displayWithFnInternal(value.currentValue);
-            if (previousTextValue !== currentTextValue) {
+            if (currentTextValue !== this.control.value) {
                 if (currentTextValue) {
                     this.searchActive = true;
                     this.isSearchActive.emit(true);
@@ -29208,13 +29211,15 @@ class AutocompleteComponent {
         }
     }
     ngOnInit() {
-        const newValue$ = merge(of(''), this.inputCleared.pipe(map$1(() => '')), this.control.valueChanges.pipe(filter$1((value) => typeof value === 'string'), distinctUntilChanged(), debounceTime(400)));
+        const newValue$ = merge(of(''), this.inputCleared.pipe(map$1(() => '')), this.control.valueChanges.pipe(filter$1((value) => typeof value === 'string'), debounceTime(400), distinctUntilChanged()));
         const externalValueChange$ = this.control.valueChanges.pipe(filter$1((value) => typeof value === 'object' && value.title), map$1((item) => item.title));
         // this observable emits arrays of suggestions loaded using the given action
         const suggestionsFromAction = merge(newValue$.pipe(filter$1((value) => value.length >= this.minCharacterCount)), externalValueChange$).pipe(tap$1(() => {
             this.searching = true;
             this.error = null;
-        }), switchMap$1((value) => this.action(value)), tap$1((suggestions) => {
+        }), switchMap$1((value) => this.action(value)), // this can trigger http requests
+        shareReplay$1(1), // share the loaded suggestions to avoid multiple requests
+        tap$1((suggestions) => {
             // forcing the panel to open if there are suggestions
             if (suggestions.length > 0 && !this.searchActive) {
                 this.triggerRef?.openPanel();
@@ -29275,6 +29280,7 @@ class AutocompleteComponent {
     }
     clear() {
         this.inputRef.nativeElement.value = '';
+        this.control.setValue('');
         this.searchActive = false;
         this.isSearchActive.emit(false);
         this.inputCleared.emit();
@@ -32976,8 +32982,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;
@@ -33070,7 +33076,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 }))));