geonetwork-ui 2.4.2 → 2.5.0-dev.0a41b52e9

package/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-menu.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,YAAY,EAIb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,SAAS,EAAmB,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAiB,cAAc,EAAE,MAAM,wBAAwB,CAAA;;AAKtE,KAAK,cAAc,GAAG,UAAU,GAAG,YAAY,CAAA;AAE/C,qBAca,mBAAmB;IAYrB,MAAM,EAAE,SAAS;IACxB,OAAO,CAAC,GAAG;IAZJ,YAAY,EAAE,OAAO,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IACjB,SAAS,qBAA2B;IACpC,MAAM,qBAA2B;IACjC,eAAe,qBAA2B;IAEzB,OAAO,EAAE,cAAc,CAAA;IAElD,gBAAgB,EAAE,cAAc,CAAa;gBAGpC,MAAM,EAAE,SAAS,EAChB,GAAG,EAAE,iBAAiB;IAGhC,QAAQ;IAIR,eAAe;IAKf,iBAAiB;yCAzBN,mBAAmB;2CAAnB,mBAAmB;CA6B/B"}
+{"version":3,"file":"action-menu.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,YAAY,EAIb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,SAAS,EAAmB,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAiB,cAAc,EAAE,MAAM,wBAAwB,CAAA;;AAKtE,KAAK,cAAc,GAAG,UAAU,GAAG,YAAY,GAAG,cAAc,CAAA;AAEhE,qBAca,mBAAmB;IAcrB,MAAM,EAAE,SAAS;IACxB,OAAO,CAAC,GAAG;IAdJ,YAAY,EAAE,OAAO,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,WAAW,EAAE,OAAO,CAAA;IACnB,SAAS,qBAA2B;IACpC,MAAM,qBAA2B;IACjC,eAAe,qBAA2B;IAC1C,QAAQ,qBAA2B;IAElB,OAAO,EAAE,cAAc,CAAA;IAElD,gBAAgB,EAAE,cAAc,CAAa;gBAGpC,MAAM,EAAE,SAAS,EAChB,GAAG,EAAE,iBAAiB;IAGhC,QAAQ;IAIR,eAAe;IAKf,iBAAiB;yCA3BN,mBAAmB;2CAAnB,mBAAmB;CAmC/B"}

package/libs/ui/search/src/lib/results-table/results-table.component.d.ts

@@ -1,13 +1,14 @@
 import { ChangeDetectorRef, ElementRef, EventEmitter, QueryList, ViewContainerRef } from '@angular/core';
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record';
 import { SortByField } from '../../../../../../libs/common/domain/src/lib/model/search';
-import { FileFormat } from '../../../../../../libs/util/shared/src';
+import { DateService, FileFormat } from '../../../../../../libs/util/shared/src';
 import { Overlay } from '@angular/cdk/overlay';
 import * as i0 from "@angular/core";
 export declare class ResultsTableComponent {
     private overlay;
     private viewContainerRef;
     private cdr;
+    private dateService;
     records: CatalogRecord[];
     selectedRecordsIdentifiers: string[];
     sortOrder: SortByField;
@@ -20,11 +21,12 @@ export declare class ResultsTableComponent {
     recordClick: EventEmitter<CatalogRecord>;
     duplicateRecord: EventEmitter<CatalogRecord>;
     deleteRecord: EventEmitter<CatalogRecord>;
+    rollbackDraft: EventEmitter<CatalogRecord>;
     recordsSelectedChange: EventEmitter<[CatalogRecord[], boolean]>;
     actionMenuButtons: QueryList<ElementRef>;
     private overlayRef;
     isActionMenuOpen: boolean;
-    constructor(overlay: Overlay, viewContainerRef: ViewContainerRef, cdr: ChangeDetectorRef);
+    constructor(overlay: Overlay, viewContainerRef: ViewContainerRef, cdr: ChangeDetectorRef, dateService: DateService);
     openActionMenu(item: any, template: any): void;
     closeActionMenu(): void;
     dateToString(date: Date): string;
@@ -34,11 +36,12 @@ export declare class ResultsTableComponent {
     handleRecordClick(item: CatalogRecord): void;
     handleDuplicate(item: unknown): void;
     handleDelete(item: unknown): void;
+    handleRollback(item: unknown): void;
     setSortBy(col: string, order: 'asc' | 'desc'): void;
     isSortedBy(col: string): 'desc' | 'asc' | null;
     isChecked(record: CatalogRecord): boolean;
     handleRecordSelectedChange(selected: boolean, record: CatalogRecord): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ResultsTableComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ResultsTableComponent, "gn-ui-results-table", never, { "records": { "alias": "records"; "required": false; }; "selectedRecordsIdentifiers": { "alias": "selectedRecordsIdentifiers"; "required": false; }; "sortOrder": { "alias": "sortOrder"; "required": false; }; "hasDraft": { "alias": "hasDraft"; "required": false; }; "canDuplicate": { "alias": "canDuplicate"; "required": false; }; "canDelete": { "alias": "canDelete"; "required": false; }; "isDraftPage": { "alias": "isDraftPage"; "required": false; }; "isDuplicating": { "alias": "isDuplicating"; "required": false; }; }, { "sortByChange": "sortByChange"; "recordClick": "recordClick"; "duplicateRecord": "duplicateRecord"; "deleteRecord": "deleteRecord"; "recordsSelectedChange": "recordsSelectedChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ResultsTableComponent, "gn-ui-results-table", never, { "records": { "alias": "records"; "required": false; }; "selectedRecordsIdentifiers": { "alias": "selectedRecordsIdentifiers"; "required": false; }; "sortOrder": { "alias": "sortOrder"; "required": false; }; "hasDraft": { "alias": "hasDraft"; "required": false; }; "canDuplicate": { "alias": "canDuplicate"; "required": false; }; "canDelete": { "alias": "canDelete"; "required": false; }; "isDraftPage": { "alias": "isDraftPage"; "required": false; }; "isDuplicating": { "alias": "isDuplicating"; "required": false; }; }, { "sortByChange": "sortByChange"; "recordClick": "recordClick"; "duplicateRecord": "duplicateRecord"; "deleteRecord": "deleteRecord"; "rollbackDraft": "rollbackDraft"; "recordsSelectedChange": "recordsSelectedChange"; }, never, never, true, never>;
 }
 //# sourceMappingURL=results-table.component.d.ts.map

package/libs/ui/search/src/lib/results-table/results-table.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"results-table.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/ui/search/src/lib/results-table/results-table.component.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,UAAU,EACV,YAAY,EAGZ,SAAS,EAET,gBAAgB,EACjB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAA;AACzF,OAAO,EAEL,WAAW,EACZ,MAAM,2DAA2D,CAAA;AAMlE,OAAO,EACL,UAAU,EAKX,MAAM,wCAAwC,CAAA;AAK/C,OAAO,EAGL,OAAO,EAER,MAAM,sBAAsB,CAAA;;AAI7B,qBAkBa,qBAAqB;IA0B9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,GAAG;IA3BJ,OAAO,EAAE,aAAa,EAAE,CAAK;IAC7B,0BAA0B,EAAE,MAAM,EAAE,CAAK;IACzC,SAAS,EAAE,WAAW,CAAO;IAC7B,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAc;IAC1D,YAAY,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAa;IAC7D,SAAS,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAa;IAC1D,WAAW,UAAQ;IACnB,aAAa,UAAQ;IAGpB,YAAY,yCAA+C;IAC3D,WAAW,8BAAoC;IAC/C,eAAe,8BAAoC;IACnD,YAAY,8BAAoC;IAChD,qBAAqB,2CAE5B;IAGH,iBAAiB,EAAG,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,OAAO,CAAC,UAAU,CAAa;IAE/B,gBAAgB,UAAQ;gBAGd,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,EAAE,iBAAiB;IAGhC,cAAc,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAyC7B,eAAe;IAQf,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAShC,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,EAAE;IAerD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM;IAIlD,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM;IAIzC,iBAAiB,CAAC,IAAI,EAAE,aAAa;IAKrC,eAAe,CAAC,IAAI,EAAE,OAAO;IAI7B,YAAY,CAAC,IAAI,EAAE,OAAO;IAK1B,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM;IAI5C,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI;IAe9C,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAIzC,0BAA0B,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa;yCArJxD,qBAAqB;2CAArB,qBAAqB;CAwJjC"}
+{"version":3,"file":"results-table.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/ui/search/src/lib/results-table/results-table.component.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,UAAU,EACV,YAAY,EAGZ,SAAS,EAET,gBAAgB,EACjB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAA;AACzF,OAAO,EAEL,WAAW,EACZ,MAAM,2DAA2D,CAAA;AAMlE,OAAO,EACL,WAAW,EACX,UAAU,EAKX,MAAM,wCAAwC,CAAA;AAK/C,OAAO,EAGL,OAAO,EAER,MAAM,sBAAsB,CAAA;;AAI7B,qBAkBa,qBAAqB;IA2B9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,WAAW;IA7BZ,OAAO,EAAE,aAAa,EAAE,CAAK;IAC7B,0BAA0B,EAAE,MAAM,EAAE,CAAK;IACzC,SAAS,EAAE,WAAW,CAAO;IAC7B,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAc;IAC1D,YAAY,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAa;IAC7D,SAAS,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAa;IAC1D,WAAW,UAAQ;IACnB,aAAa,UAAQ;IAGpB,YAAY,yCAA+C;IAC3D,WAAW,8BAAoC;IAC/C,eAAe,8BAAoC;IACnD,YAAY,8BAAoC;IAChD,aAAa,8BAAoC;IACjD,qBAAqB,2CAE5B;IAGH,iBAAiB,EAAG,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,OAAO,CAAC,UAAU,CAAa;IAE/B,gBAAgB,UAAQ;gBAGd,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,EAAE,iBAAiB,EACtB,WAAW,EAAE,WAAW;IAGlC,cAAc,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAyC7B,eAAe;IAQf,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAShC,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,EAAE;IAerD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM;IAIlD,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM;IAIzC,iBAAiB,CAAC,IAAI,EAAE,aAAa;IAKrC,eAAe,CAAC,IAAI,EAAE,OAAO;IAI7B,YAAY,CAAC,IAAI,EAAE,OAAO;IAK1B,cAAc,CAAC,IAAI,EAAE,OAAO;IAK5B,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM;IAI5C,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI;IAe9C,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAIzC,0BAA0B,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa;yCA5JxD,qBAAqB;2CAArB,qBAAqB;CA+JjC"}

package/libs/ui/widgets/src/index.d.ts

@@ -5,5 +5,4 @@ export * from './lib/loading-mask/loading-mask.component';
 export * from './lib/color-scale/color-scale.component';
 export * from './lib/popup-alert/popup-alert.component';
 export * from './lib/spinning-loader/spinning-loader.component';
-export * from './lib/step-bar/step-bar.component';
 //# sourceMappingURL=index.d.ts.map

package/libs/ui/widgets/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/ui/widgets/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,2CAA2C,CAAA;AACzD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,2CAA2C,CAAA;AACzD,cAAc,yCAAyC,CAAA;AACvD,cAAc,yCAAyC,CAAA;AACvD,cAAc,iDAAiD,CAAA;AAC/D,cAAc,mCAAmC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/ui/widgets/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,2CAA2C,CAAA;AACzD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,2CAA2C,CAAA;AACzD,cAAc,yCAAyC,CAAA;AACvD,cAAc,yCAAyC,CAAA;AACvD,cAAc,iDAAiD,CAAA"}

package/libs/ui/widgets/src/lib/ui-widgets.module.d.ts

@@ -1,16 +1,15 @@
 import * as i0 from "@angular/core";
 import * as i1 from "./color-scale/color-scale.component";
-import * as i2 from "./step-bar/step-bar.component";
-import * as i3 from "@angular/common";
-import * as i4 from "@ngx-translate/core";
-import * as i5 from "ngx-dropzone";
-import * as i6 from "@angular/forms";
-import * as i7 from "ngx-chips";
-import * as i8 from "../../../../util/shared/src/lib/util-shared.module";
-import * as i9 from "@angular/material/progress-spinner";
+import * as i2 from "@angular/common";
+import * as i3 from "@ngx-translate/core";
+import * as i4 from "ngx-dropzone";
+import * as i5 from "@angular/forms";
+import * as i6 from "ngx-chips";
+import * as i7 from "../../../../util/shared/src/lib/util-shared.module";
+import * as i8 from "@angular/material/progress-spinner";
 export declare class UiWidgetsModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<UiWidgetsModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<UiWidgetsModule, [typeof i1.ColorScaleComponent, typeof i2.StepBarComponent], [typeof i3.CommonModule, typeof i4.TranslateModule, typeof i5.NgxDropzoneModule, typeof i6.FormsModule, typeof i6.ReactiveFormsModule, typeof i7.TagInputModule, typeof i8.UtilSharedModule, typeof i9.MatProgressSpinnerModule], [typeof i2.StepBarComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<UiWidgetsModule, [typeof i1.ColorScaleComponent], [typeof i2.CommonModule, typeof i3.TranslateModule, typeof i4.NgxDropzoneModule, typeof i5.FormsModule, typeof i5.ReactiveFormsModule, typeof i6.TagInputModule, typeof i7.UtilSharedModule, typeof i8.MatProgressSpinnerModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<UiWidgetsModule>;
 }
 //# sourceMappingURL=ui-widgets.module.d.ts.map

package/libs/ui/widgets/src/lib/ui-widgets.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-widgets.module.d.ts","sourceRoot":"","sources":["../../../../../src/libs/ui/widgets/src/lib/ui-widgets.module.ts"],"names":[],"mappings":";;;;;;;;;;AAWA,qBAca,eAAe;yCAAf,eAAe;0CAAf,eAAe;0CAAf,eAAe;CAAG"}
+{"version":3,"file":"ui-widgets.module.d.ts","sourceRoot":"","sources":["../../../../../src/libs/ui/widgets/src/lib/ui-widgets.module.ts"],"names":[],"mappings":";;;;;;;;;AAUA,qBAca,eAAe;yCAAf,eAAe;0CAAf,eAAe;0CAAf,eAAe;CAAG"}

package/libs/util/data-fetcher/src/index.d.ts

@@ -1,5 +1,7 @@
 export * from './lib/data-fetcher';
-export { SupportedType, SupportedTypes, DataItem, FetchError, FieldAggregation, } from './lib/model';
+export { SupportedType, SupportedTypes, DataItem, FetchError, FieldAggregation, PropertyInfo, } from './lib/model';
 export { getJsonDataItemsProxy } from './lib/utils';
 export { BaseReader } from './lib/readers/base';
+export { BaseFileReader } from './lib/readers/base-file';
+export { GeojsonReader } from './lib/readers/geojson';
 //# sourceMappingURL=index.d.ts.map

package/libs/util/data-fetcher/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/util/data-fetcher/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,OAAO,EACL,aAAa,EACb,cAAc,EACd,QAAQ,EACR,UAAU,EACV,gBAAgB,GACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/util/data-fetcher/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,OAAO,EACL,aAAa,EACb,cAAc,EACd,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,YAAY,GACb,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA"}

package/libs/util/data-fetcher/src/lib/data-fetcher.d.ts

@@ -5,7 +5,7 @@ export declare function openDataset(url: string, typeHint?: SupportedType, optio
     namespace?: string;
     wfsVersion?: WfsVersion;
     wfsFeatureType?: string;
-}): Promise<BaseReader>;
+}, cacheActive?: boolean): Promise<BaseReader>;
 /**
  * This fetches the full dataset at the given URL and parses it according to its mime type.
  * All items in the dataset are converted to GeoJSON features, even if they do not bear any spatial geometry.
@@ -15,7 +15,7 @@ export declare function openDataset(url: string, typeHint?: SupportedType, optio
  *  2. otherwise, look for a Content-Type header in the response with a supported mime type
  *  3. if no valid mime type was found, look for an explicit file extension in the url (.csv, .geojson etc.)
  */
-export declare function readDataset(url: string, typeHint?: SupportedType, options?: any): Promise<DataItem[]>;
+export declare function readDataset(url: string, typeHint?: SupportedType, options?: any, cacheActive?: boolean): Promise<DataItem[]>;
 /**
  * This fetches only the header of the dataset at the given URL, giving info on size, mime-type and last update if available.
  */

package/libs/util/data-fetcher/src/lib/data-fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-fetcher.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/data-fetcher/src/lib/data-fetcher.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAc,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,EACxB,OAAO,CAAC,EAAE;IACR,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,GACA,OAAO,CAAC,UAAU,CAAC,CA6BrB;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,EACxB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,QAAQ,EAAE,CAAC,CAOrB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAEvE"}
+{"version":3,"file":"data-fetcher.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/data-fetcher/src/lib/data-fetcher.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAc,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,EACxB,OAAO,CAAC,EAAE;IACR,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,EACD,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,UAAU,CAAC,CAoCrB;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,EACxB,OAAO,CAAC,EAAE,GAAG,EACb,WAAW,UAAO,GACjB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAOrB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAEvE"}

package/libs/util/data-fetcher/src/lib/model.d.ts

@@ -7,7 +7,7 @@ export declare class FetchError {
     message: string;
     stack: any;
     constructor(type: 'http' | 'network' | 'parse' | 'unsupportedType' | 'unknown', info: string, httpStatus?: number);
-    static http(code: number): FetchError;
+    static http(code: number, body?: string): FetchError;
     static corsOrNetwork(message: string): FetchError;
     static parsingFailed(info: string): FetchError;
     static unsupportedType(mimeType: string): FetchError;

package/libs/util/data-fetcher/src/lib/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/data-fetcher/src/lib/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/data-fetcher/src/lib/model.ts"],"names":[],"mappings":"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"}

package/libs/util/data-fetcher/src/lib/readers/base-cache.d.ts

@@ -0,0 +1,8 @@
+import { BaseReader } from './base';
+export declare abstract class BaseCacheReader extends BaseReader {
+    protected url: string;
+    protected cacheActive: boolean;
+    constructor(url: string, cacheActive?: boolean);
+    setCacheActive(value: boolean): void;
+}
+//# sourceMappingURL=base-cache.d.ts.map

package/libs/util/data-fetcher/src/lib/readers/base-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-cache.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/base-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,8BAAsB,eAAgB,SAAQ,UAAU;IAEpD,SAAS,CAAC,GAAG,EAAE,MAAM;IACrB,SAAS,CAAC,WAAW;gBADX,GAAG,EAAE,MAAM,EACX,WAAW,UAAO;IAK9B,cAAc,CAAC,KAAK,EAAE,OAAO;CAG9B"}

package/libs/util/data-fetcher/src/lib/readers/base-file.d.ts

@@ -1,10 +1,10 @@
-import { BaseReader } from './base';
 import { DataItem, DatasetInfo, PropertyInfo } from '../model';
+import { BaseCacheReader } from './base-cache';
 type ParseResult = {
     items: DataItem[];
     properties: PropertyInfo[];
 };
-export declare class BaseFileReader extends BaseReader {
+export declare class BaseFileReader extends BaseCacheReader {
     private parseResult_;
     protected getData(): Promise<ParseResult>;
     load(): void;

package/libs/util/data-fetcher/src/lib/readers/base-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-file.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/base-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAI9D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,UAAU,EAAE,YAAY,EAAE,CAAA;CAC3B,CAAA;AAED,qBAAa,cAAe,SAAQ,UAAU;IAC5C,OAAO,CAAC,YAAY,CAAsB;IAE1C,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAIzC,IAAI;IAIJ,IAAI,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAExC;IAED,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAO/B;IAEK,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;CA8BlC"}
+{"version":3,"file":"base-file.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/base-file.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAG9D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,UAAU,EAAE,YAAY,EAAE,CAAA;CAC3B,CAAA;AAED,qBAAa,cAAe,SAAQ,eAAe;IACjD,OAAO,CAAC,YAAY,CAAsB;IAE1C,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAIzC,IAAI;IAIJ,IAAI,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAExC;IAED,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAO/B;IAEK,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;CA8BlC"}

package/libs/util/data-fetcher/src/lib/readers/base.d.ts

@@ -2,8 +2,8 @@ import { DataItem, DatasetInfo, FieldAggregation, FieldFilter, FieldGroupBy, Fie
 export declare class BaseReader {
     protected url: string;
     protected selected: FieldName[];
-    protected groupedBy: FieldGroupBy[];
-    protected aggregations: FieldAggregation[];
+    groupedBy: FieldGroupBy[];
+    aggregations: FieldAggregation[];
     protected filter: FieldFilter;
     protected sort: FieldSort[];
     protected startIndex: number;

package/libs/util/data-fetcher/src/lib/readers/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,SAAS,EACT,YAAY,EACb,MAAM,UAAU,CAAA;AAEjB,qBAAa,UAAU;IAST,SAAS,CAAC,GAAG,EAAE,MAAM;IARjC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAO;IACtC,SAAS,CAAC,SAAS,EAAE,YAAY,EAAE,CAAO;IAC1C,SAAS,CAAC,YAAY,EAAE,gBAAgB,EAAE,CAAO;IACjD,SAAS,CAAC,MAAM,EAAE,WAAW,CAAO;IACpC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAO;IAClC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAO;IACnC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAO;gBAER,GAAG,EAAE,MAAM;IAEjC,IAAI;IAIJ,IAAI,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAExC;IAED,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAE/B;IAED,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI3B,SAAS,IAAI,IAAI;IASjB,MAAM,CAAC,GAAG,cAAc,EAAE,SAAS,EAAE,GAAG,IAAI;IAM5C,OAAO,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI;IAKzC,SAAS,CAAC,GAAG,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAIpD,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAIhC,OAAO,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAIzC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAK/C"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,SAAS,EACT,YAAY,EACb,MAAM,UAAU,CAAA;AAEjB,qBAAa,UAAU;IAST,SAAS,CAAC,GAAG,EAAE,MAAM;IARjC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAO;IAC/B,SAAS,EAAE,YAAY,EAAE,CAAO;IAChC,YAAY,EAAE,gBAAgB,EAAE,CAAO;IAC9C,SAAS,CAAC,MAAM,EAAE,WAAW,CAAO;IACpC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAO;IAClC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAO;IACnC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAO;gBAER,GAAG,EAAE,MAAM;IAEjC,IAAI;IAIJ,IAAI,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAExC;IAED,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAE/B;IAED,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI3B,SAAS,IAAI,IAAI;IASjB,MAAM,CAAC,GAAG,cAAc,EAAE,SAAS,EAAE,GAAG,IAAI;IAM5C,OAAO,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI;IAKzC,SAAS,CAAC,GAAG,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAIpD,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAIhC,OAAO,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAIzC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAK/C"}

package/libs/util/data-fetcher/src/lib/readers/gml.d.ts

@@ -6,9 +6,11 @@ export declare function parseGml(text: string, namespace: string, version: strin
     properties: PropertyInfo[];
 };
 export declare class GmlReader extends BaseFileReader {
-    namespace: string;
-    version: WfsVersion;
-    constructor(url: any, namespace: any, version: any);
+    protected url: string;
+    protected namespace: string;
+    protected version: WfsVersion;
+    protected cacheActive: boolean;
+    constructor(url: string, namespace: string, version: WfsVersion, cacheActive?: boolean);
     protected getData(): Promise<{
         items: DataItem[];
         properties: PropertyInfo[];

package/libs/util/data-fetcher/src/lib/readers/gml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gml.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/gml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd;IACD,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,UAAU,EAAE,YAAY,EAAE,CAAA;CAC3B,CAuBA;AAED,qBAAa,SAAU,SAAQ,cAAc;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,UAAU,CAAA;gBAEP,GAAG,KAAA,EAAE,SAAS,KAAA,EAAE,OAAO,KAAA;IAMnC,SAAS,CAAC,OAAO;eArCV,QAAQ,EAAE;oBACL,YAAY,EAAE;;CAyC3B"}
+{"version":3,"file":"gml.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/gml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd;IACD,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,UAAU,EAAE,YAAY,EAAE,CAAA;CAC3B,CAuBA;AAED,qBAAa,SAAU,SAAQ,cAAc;IAEzC,SAAS,CAAC,GAAG,EAAE,MAAM;IACrB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,OAAO,EAAE,UAAU;IAC7B,SAAS,CAAC,WAAW;gBAHX,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,UAAU,EACnB,WAAW,UAAO;IAK9B,SAAS,CAAC,OAAO;eArCV,QAAQ,EAAE;oBACL,YAAY,EAAE;;CAyC3B"}

package/libs/util/data-fetcher/src/lib/readers/wfs.d.ts

@@ -1,20 +1,23 @@
 import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client';
 import { DataItem, DatasetInfo, PropertyInfo } from '../model';
-import { BaseReader } from './base';
 import { GmlReader } from './gml';
 import { GeojsonReader } from './geojson';
-export declare class WfsReader extends BaseReader {
+import { BaseCacheReader } from './base-cache';
+export declare class WfsReader extends BaseCacheReader {
     endpoint: WfsEndpoint;
     featureTypeName: string;
     version: WfsVersion;
-    constructor(url: string, wfsEndpoint: WfsEndpoint, featureTypeName: string);
+    constructor(url: string, wfsEndpoint: WfsEndpoint, featureTypeName: string, cacheActive?: boolean);
     get properties(): Promise<PropertyInfo[]>;
     get info(): Promise<DatasetInfo>;
     static createReader(wfsUrlEndpoint: string, featureTypeName?: string): Promise<GeojsonReader | GmlReader | WfsReader>;
-    protected getData(): Promise<{
+    getData(aggregation?: any, groupedBy?: any): Promise<{
         items: DataItem[];
         properties: PropertyInfo[];
+    } | {
+        items: any;
     }>;
+    getQueryData(): Promise<any>;
     load(): void;
     read(): Promise<DataItem[]>;
 }

package/libs/util/data-fetcher/src/lib/readers/wfs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wfs.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/wfs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,SAAS,EAAY,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAgB,MAAM,WAAW,CAAA;AAEvD,qBAAa,SAAU,SAAQ,UAAU;IACvC,QAAQ,EAAE,WAAW,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,OAAO,EAAE,UAAU,CAAA;gBAEP,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM;IAO1E,IAAI,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAExC;IAED,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAO/B;WAEY,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM;IA4C1E,SAAS,CAAC,OAAO;;;;IA4BjB,IAAI;IAIE,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;CAGlC"}
+{"version":3,"file":"wfs.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/data-fetcher/src/lib/readers/wfs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAY,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAgB,MAAM,WAAW,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAI9C,qBAAa,SAAU,SAAQ,eAAe;IAC5C,QAAQ,EAAE,WAAW,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,OAAO,EAAE,UAAU,CAAA;gBAGjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,OAAO;IAQvB,IAAI,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAiBxC;IAED,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAO/B;WAEY,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM;IA4C7D,OAAO,CAAC,WAAW,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA;;;;;;IAiChC,YAAY;IAkBzB,IAAI;IAIE,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;CAGlC"}

package/libs/util/data-fetcher/src/lib/utils.d.ts

@@ -1,8 +1,8 @@
 import { DataItem, DatasetHeaders, PropertyInfo, SupportedType } from './model';
 export declare function inferDatasetType(url: string, typeHint?: SupportedType): Promise<SupportedType>;
 export declare function fetchHeaders(url: string): Promise<DatasetHeaders>;
-export declare function fetchDataAsText(url: string): Promise<string>;
-export declare function fetchDataAsArrayBuffer(url: string): Promise<ArrayBuffer>;
+export declare function fetchDataAsText(url: string, cacheActive: boolean): Promise<string>;
+export declare function fetchDataAsArrayBuffer(url: string, cacheActive: boolean): Promise<ArrayBuffer>;
 export declare function tryParseDate(input: unknown): Date | null;
 export declare function tryParseNumber(input: string): number | null;
 export declare function jsonToGeojsonFeature(object: {

package/libs/util/data-fetcher/src/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/data-fetcher/src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,cAAc,EAEd,YAAY,EACZ,aAAa,EAEd,MAAM,SAAS,CAAA;AAMhB,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,aAAa,CAAC,CAsBxB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAWjE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgB5D;AACD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAmBxE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,CAkBxD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,QAAQ,CAsB7E;AAqBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,QAAQ,EAAE,EACjB,UAAU,UAAQ,GACjB;IACD,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,UAAU,EAAE,YAAY,EAAE,CAAA;CAC3B,CA0DA;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,QAAQ,EAAE,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAgB3B"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/data-fetcher/src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,cAAc,EAEd,YAAY,EACZ,aAAa,EAEd,MAAM,SAAS,CAAA;AAMhB,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,aAAa,CAAC,CAsBxB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAWjE;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AACD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,WAAW,CAAC,CAmBtB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,CAkBxD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,QAAQ,CAsB7E;AAqBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,QAAQ,EAAE,EACjB,UAAU,UAAQ,GACjB;IACD,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,UAAU,EAAE,YAAY,EAAE,CAAA;CAC3B,CA0DA;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,QAAQ,EAAE,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAgB3B"}

package/libs/util/shared/src/lib/services/date.service.d.ts

@@ -0,0 +1,13 @@
+import { TranslateService } from '@ngx-translate/core';
+import * as i0 from "@angular/core";
+export declare class DateService {
+    private translateService;
+    constructor(translateService: TranslateService);
+    private getDateObject;
+    private getLocaleAndDate;
+    formatDate(date: Date | string, options?: Intl.DateTimeFormatOptions): string;
+    formatDateTime(date: Date | string, options?: Intl.DateTimeFormatOptions): string;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DateService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<DateService>;
+}
+//# sourceMappingURL=date.service.d.ts.map

package/libs/util/shared/src/lib/services/date.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"date.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/date.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;;AAEtD,qBAGa,WAAW;IACV,OAAO,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAEtD,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,gBAAgB;IASxB,UAAU,CACR,IAAI,EAAE,IAAI,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,GACnC,MAAM;IAKT,cAAc,CACZ,IAAI,EAAE,IAAI,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,GACnC,MAAM;yCAlCE,WAAW;6CAAX,WAAW;CAsCvB"}

package/libs/util/shared/src/lib/services/index.d.ts

@@ -1,4 +1,5 @@
 export * from './theme.service';
 export * from './log.service';
 export * from './proxy.service';
+export * from './date.service';
 //# sourceMappingURL=index.d.ts.map

package/libs/util/shared/src/lib/services/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA"}

package/libs/util/shared/src/lib/utils/temporal-extent-union.d.ts

@@ -1,7 +1,8 @@
+import { DateService } from '../services';
 export declare function getTemporalRangeUnion(ranges: {
     start?: Date;
     end?: Date;
-}[]): {
+}[], dateService: DateService): {
     start: string;
     end: string;
 };

package/libs/util/shared/src/lib/utils/temporal-extent-union.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"temporal-extent-union.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/temporal-extent-union.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CACnC,MAAM,EAAE;IACN,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,GAAG,CAAC,EAAE,IAAI,CAAA;CACX,EAAE;;;EAgCJ"}
+{"version":3,"file":"temporal-extent-union.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/temporal-extent-union.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,wBAAgB,qBAAqB,CACnC,MAAM,EAAE;IACN,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,GAAG,CAAC,EAAE,IAAI,CAAA;CACX,EAAE,EACH,WAAW,EAAE,WAAW;;;EAgCzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.4.2",
+  "version": "2.5.0-dev.0a41b52e9",
   "engines": {
     "node": ">=20"
   },

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -277,6 +277,31 @@ export class Gn4FieldMapper {
         },
         output
       ),
+    featureTypes: (output, source) =>
+      this.addExtra(
+        {
+          featureTypes: selectField(source, 'featureTypes'),
+        },
+        output
+      ),
+    related: (output, source) => {
+      const fcatSource = selectField(
+        getFirstValue(
+          selectField(
+            <SourceWithUnknownProps>selectField(source, 'related'),
+            'fcats'
+          )
+        ) ?? {},
+        '_source'
+      )
+      const featureCatalogIdentifier = selectField(
+        <SourceWithUnknownProps>fcatSource,
+        'uuid'
+      )
+      return featureCatalogIdentifier
+        ? this.addExtra({ featureCatalogIdentifier }, output)
+        : output
+    },
     isPublishedToAll: (output, source) =>
       this.addExtra(
         {

package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts

@@ -203,3 +203,7 @@ export interface Gn4Record {
   guestdownload?: boolean
   selected?: boolean
 }
+
+export interface Gn4RecordRelated {
+  fcats?: Gn4Record[]
+}

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -28,6 +28,7 @@ import {
 } from '../../../../../../../libs/api/metadata-converter/src'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
 import { formatDate, isDateRange } from './date-range.utils'
+import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 export type DateRange = { start?: Date; end?: Date }
 
@@ -50,7 +51,7 @@ export class ElasticsearchService {
     size = 0,
     from = 0,
     sortBy: SortByField = null,
-    requestFields: RequestFields = [],
+    requestFields: RequestFields = null,
     searchFilters: SearchFilters = {},
     configFilters: SearchFilters = {},
     uuids?: string[],
@@ -68,7 +69,7 @@ export class ElasticsearchService {
         geometry
       ),
       ...(size > 0 ? { track_total_hits: true } : {}),
-      _source: requestFields,
+      ...(requestFields && { _source: requestFields }),
     }
     this.processRuntimeFields(payload)
     return payload
@@ -134,8 +135,7 @@ export class ElasticsearchService {
   }
 
   getRelatedRecordPayload(
-    title: string,
-    uuid: string,
+    record: CatalogRecord,
     size = 6,
     _source = [...ES_SOURCE_SUMMARY, 'allKeywords', 'createDate']
   ): EsSearchParams {
@@ -148,9 +148,23 @@ export class ElasticsearchService {
                 fields: [
                   'resourceTitleObject.default',
                   'resourceAbstractObject.default',
-                  'tag.raw',
+                  'allKeywords',
+                ],
+                like: [
+                  {
+                    doc: {
+                      resourceTitleObject: {
+                        default: record.title,
+                      },
+                      resourceAbstractObject: {
+                        default: record.abstract,
+                      },
+                      allKeywords: record.keywords.map(
+                        (keyword) => keyword.label
+                      ),
+                    },
+                  },
                 ],
-                like: title,
                 min_term_freq: 1,
                 max_query_terms: 12,
               },
@@ -166,7 +180,7 @@ export class ElasticsearchService {
               },
             },
           ],
-          must_not: [{ wildcard: { uuid: uuid } }],
+          must_not: [{ wildcard: { uuid: record.uniqueIdentifier } }],
         },
       },
       size,
@@ -220,6 +234,7 @@ export class ElasticsearchService {
   private filtersToQuery(
     filters: FieldFilters | FiltersAggregationParams | string
   ): FilterQuery {
+    const addQuote = (key: string) => (/^\/.+\/$/.test(key) ? key : `"${key}"`)
     const makeQuery = (filter: FieldFilter): string => {
       if (typeof filter === 'string') {
         return filter
@@ -227,9 +242,9 @@ export class ElasticsearchService {
       return Object.keys(filter)
         .map((key) => {
           if (filter[key] === true) {
-            return `"${key}"`
+            return addQuote(key)
           }
-          return `-"${key}"`
+          return `-${addQuote(key)}`
         })
         .join(' OR ')
     }
@@ -282,6 +297,25 @@ export class ElasticsearchService {
     return queryParts.length > 0 ? (queryParts as FilterQuery) : undefined
   }
 
+  private mustNotFilters(): Record<string, unknown>[] {
+    return [
+      {
+        ...this.queryFilterOnValues('resourceType', [
+          'service',
+          'map',
+          'map/static',
+          'mapDigital',
+        ]),
+      },
+      {
+        query_string: {
+          query:
+            'resourceType:featureCatalog AND !resourceType:dataset AND !cl_level.key:dataset',
+        },
+      },
+    ]
+  }
+
   private buildPayloadQuery(
     { any, ...fieldSearchFilters }: SearchFilters,
     configFilters: SearchFilters,
@@ -289,14 +323,7 @@ export class ElasticsearchService {
     geometry?: Geometry
   ) {
     const must = [] as Record<string, unknown>[]
-    const must_not = {
-      ...this.queryFilterOnValues('resourceType', [
-        'service',
-        'map',
-        'map/static',
-        'mapDigital',
-      ]),
-    }
+    const must_not = this.mustNotFilters()
     const should = [] as Record<string, unknown>[]
     const filter = [this.queryFilterOnValues('isTemplate', 'n')] as Record<
       string,
@@ -398,14 +425,8 @@ export class ElasticsearchService {
               },
             },
           ],
-          must_not: {
-            ...this.queryFilterOnValues('resourceType', [
-              'service',
-              'map',
-              'map/static',
-              'mapDigital',
-            ]),
-          },
+
+          must_not: this.mustNotFilters(),
         },
       },
       _source: ['resourceTitleObject', 'uuid'],
@@ -518,13 +539,15 @@ export class ElasticsearchService {
       switch (aggregation.type) {
         case 'filters':
           return {
-            filters: Object.keys(aggregation.filters).reduce((prev, curr) => {
-              const filter = aggregation.filters[curr]
-              return {
-                ...prev,
-                [curr]: this.filtersToQuery(filter)[0],
-              }
-            }, {}),
+            filters: {
+              filters: Object.keys(aggregation.filters).reduce((prev, curr) => {
+                const filter = aggregation.filters[curr]
+                return {
+                  ...prev,
+                  [curr]: this.filtersToQuery(filter)[0],
+                }
+              }, {}),
+            },
           }
         case 'terms':
           return {