@provoly/dashboard 0.11.0 → 0.11.2

package/fesm2022/provoly-dashboard.mjs

@@ -3,7 +3,7 @@ import { OverlayConfig, OverlayModule } from '@angular/cdk/overlay';
 import * as i1$1 from '@angular/common';
 import { CommonModule, AsyncPipe } from '@angular/common';
 import * as i1$2 from '@angular/common/http';
-import { HttpHeaders, HttpClientModule } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Directive, Optional, Inject, Input, Component, Pipe, ChangeDetectionStrategy, HostBinding, SecurityContext, NgModule, EventEmitter, Output, TemplateRef, ViewChild, Injector, HostListener, forwardRef, ContentChildren, ViewContainerRef, createNgModule } from '@angular/core';
 import * as i2 from '@angular/router';
@@ -2350,11 +2350,11 @@ class PryModalStatusComponent {
         this.gotoConsult.emit(this.version);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryModalStatusComponent, deps: [{ token: i1.Store }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.6", type: PryModalStatusComponent, selector: "pry-modalStatus", inputs: { version: "version" }, outputs: { gotoConsult: "gotoConsult" }, ngImport: i0, template: "<div class=\"o-modal-wrapper\">\n  <div>\n    <h2>{{ '@pry.dataset.error.title' | i18n }}</h2>\n  </div>\n  <div></div>\n  <table class=\"a-table\">\n    <thead>\n      <tr>\n        <th>{{ '@pry.dataset.error.code' | i18n }}</th>\n        <th>{{ '@pry.dataset.error.elements' | i18n }} << TOFIX</th>\n        <th>{{ '@pry.dataset.error.message' | i18n }}</th>\n      </tr>\n    </thead>\n    <tbody>\n      <tr *ngFor=\"let error of datasetErrors$ | async\">\n        <td>\n          {{ error.code }}\n        </td>\n        <td>\n          {{ error.line }}\n        </td>\n        <td>\n          {{ error.message }}\n        </td>\n      </tr>\n    </tbody>\n  </table>\n  <div class=\"m-btn-group\">\n    <button>\n      <pry-icon [height]=\"15\" [width]=\"15\" iconSvg=\"download\" class=\"download\"></pry-icon>\n      <span>{{ '@pry.dataset.export' | i18n }}</span>\n    </button>\n    <button class=\"a-btn a-btn--primary\" (click)=\"goBack()\">\n      <span>{{ '@pry.dataset.error.close' | i18n }}</span>\n    </button>\n  </div>\n</div>\n", dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: PryIconComponent, selector: "pry-icon", inputs: ["color", "iconSvg", "animation", "iconImage", "alt", "width", "height", "classes"] }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "pipe", type: I18nPipe, name: "i18n" }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.6", type: PryModalStatusComponent, selector: "pry-modalStatus", inputs: { version: "version" }, outputs: { gotoConsult: "gotoConsult" }, ngImport: i0, template: "<div class=\"o-modal-wrapper\">\n  <div class=\"o-modal__top\">\n    <div class=\"o-modal__top__title\">\n      <h2 class=\"a-h2\">{{ '@pry.dataset.error.title' | i18n }}</h2>\n    </div>\n    <div class=\"o-modal__top__close\">\n      <button class=\"a-btn a-btn--icon-only\" (click)=\"goBack()\">\n        <pry-icon iconSvg=\"close\" [height]=\"35\" [width]=\"35\"></pry-icon>\n        <span class=\"u-visually-hidden\">{{ '@pry.toolbox.close' | i18n }}</span>\n      </button>\n    </div>\n  </div>\n  <table class=\"a-table\">\n    <thead>\n      <tr>\n        <th>{{ '@pry.dataset.error.code' | i18n }}</th>\n        <th>{{ '@pry.dataset.error.elements' | i18n }}</th>\n        <th>{{ '@pry.dataset.error.message' | i18n }}</th>\n      </tr>\n    </thead>\n    <tbody>\n      <tr *ngFor=\"let error of datasetErrors$ | async | slice : 0 : 5\">\n        <td>\n          {{ error.code }}\n        </td>\n        <td>\n          {{ error.line }}\n        </td>\n        <td>\n          {{ error.message }}\n        </td>\n      </tr>\n    </tbody>\n  </table>\n</div>\n", dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: PryIconComponent, selector: "pry-icon", inputs: ["color", "iconSvg", "animation", "iconImage", "alt", "width", "height", "classes"] }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "pipe", type: i1$1.SlicePipe, name: "slice" }, { kind: "pipe", type: I18nPipe, name: "i18n" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryModalStatusComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'pry-modalStatus', template: "<div class=\"o-modal-wrapper\">\n  <div>\n    <h2>{{ '@pry.dataset.error.title' | i18n }}</h2>\n  </div>\n  <div></div>\n  <table class=\"a-table\">\n    <thead>\n      <tr>\n        <th>{{ '@pry.dataset.error.code' | i18n }}</th>\n        <th>{{ '@pry.dataset.error.elements' | i18n }} << TOFIX</th>\n        <th>{{ '@pry.dataset.error.message' | i18n }}</th>\n      </tr>\n    </thead>\n    <tbody>\n      <tr *ngFor=\"let error of datasetErrors$ | async\">\n        <td>\n          {{ error.code }}\n        </td>\n        <td>\n          {{ error.line }}\n        </td>\n        <td>\n          {{ error.message }}\n        </td>\n      </tr>\n    </tbody>\n  </table>\n  <div class=\"m-btn-group\">\n    <button>\n      <pry-icon [height]=\"15\" [width]=\"15\" iconSvg=\"download\" class=\"download\"></pry-icon>\n      <span>{{ '@pry.dataset.export' | i18n }}</span>\n    </button>\n    <button class=\"a-btn a-btn--primary\" (click)=\"goBack()\">\n      <span>{{ '@pry.dataset.error.close' | i18n }}</span>\n    </button>\n  </div>\n</div>\n" }]
+            args: [{ selector: 'pry-modalStatus', template: "<div class=\"o-modal-wrapper\">\n  <div class=\"o-modal__top\">\n    <div class=\"o-modal__top__title\">\n      <h2 class=\"a-h2\">{{ '@pry.dataset.error.title' | i18n }}</h2>\n    </div>\n    <div class=\"o-modal__top__close\">\n      <button class=\"a-btn a-btn--icon-only\" (click)=\"goBack()\">\n        <pry-icon iconSvg=\"close\" [height]=\"35\" [width]=\"35\"></pry-icon>\n        <span class=\"u-visually-hidden\">{{ '@pry.toolbox.close' | i18n }}</span>\n      </button>\n    </div>\n  </div>\n  <table class=\"a-table\">\n    <thead>\n      <tr>\n        <th>{{ '@pry.dataset.error.code' | i18n }}</th>\n        <th>{{ '@pry.dataset.error.elements' | i18n }}</th>\n        <th>{{ '@pry.dataset.error.message' | i18n }}</th>\n      </tr>\n    </thead>\n    <tbody>\n      <tr *ngFor=\"let error of datasetErrors$ | async | slice : 0 : 5\">\n        <td>\n          {{ error.code }}\n        </td>\n        <td>\n          {{ error.line }}\n        </td>\n        <td>\n          {{ error.message }}\n        </td>\n      </tr>\n    </tbody>\n  </table>\n</div>\n" }]
         }], ctorParameters: function () { return [{ type: i1.Store }]; }, propDecorators: { gotoConsult: [{
                 type: Output
             }], version: [{
@@ -3085,10 +3085,10 @@ const rank = createSelector(manifests, (manifests) => manifests?.tenants.indexOf
 const currentManifestId = createSelector(manifests, (manifests) => manifests.currentId);
 const globalManifest = createSelector(manifests, 
 // @ts-ignore
-(manifests) => ({ windows: [], ...manifests?.manifest }) ?? { windows: [] });
+(manifests) => ({ windows: [], ...manifests?.manifest } ?? { windows: [] }));
 const staticManifest = createSelector(manifests, 
 // @ts-ignore
-(manifests) => ({ windows: [], ...manifests?.staticManifest }) ?? { windows: [] });
+(manifests) => ({ windows: [], ...manifests?.staticManifest } ?? { windows: [] }));
 const refreshRates = createSelector(globalManifest, (manifests) => manifests.refreshRates ?? {});
 const windowManifest = createSelector(globalManifest, rank, (manifest, rank) => manifest.windows[rank] ?? { widgets: [] });
 const gridLayout = createSelector(windowManifest, (manifest) => (manifest.grid ?? {}).layout ?? DashboardGridLayout.MANUAL);
@@ -3151,7 +3151,7 @@ const datasourceFilters = createSelector(feature$5, (state) => state?.manifests.
     ? state?.manifests.manifest.filters.reduce((obj, filter) => (filter.attributes.forEach((attribute) => (obj[attribute.datasource] || (obj[attribute.datasource] = [])).push({
         attribute: attribute.id,
         operator: filter.operator ?? '',
-        value: filter.value ?? ''
+        value: filter.value
     })),
         obj), {})
     : {});
@@ -3759,32 +3759,31 @@ class SearchService {
      * @param quickOrder if it has to be applied
      */
     getItems(id, quickOrder) {
-        const params = this.getItemsParams(quickOrder);
-        let filterFormed = this.getItemsFilter(id);
+        const params = this.getItemsFilter(id, this.getOrder(quickOrder));
         if (!id) {
             console.warn('Not sending items request with no datasource attached.');
             return of({ items: {}, relations: [] });
         }
-        return this.store.select(ConfigSelectors.dataUrl).pipe(mergeMap((url) => this.httpClient.get(encodeURI(`${url}/data-sources/id/${id}/items${filterFormed}`), { params })), map((rs) => this.applyTransformations('current', rs)));
+        return this.store.select(ConfigSelectors.dataUrl).pipe(mergeMap((url) => this.httpClient.get(encodeURI(`${url}/data-sources/id/${id}/items`), { params })), map((rs) => this.applyTransformations('current', rs)));
     }
     getItemsSerializedParams(id, quickOrder) {
-        return JSON.stringify(this.getItemsParams(quickOrder[id])) + this.getItemsFilter(id);
+        return JSON.stringify(this.getItemsFilter(id, this.getOrder(quickOrder[id])));
     }
-    getItemsFilter(id) {
-        let filterFormed = '';
+    getItemsFilter(id, cumulative) {
+        let params = cumulative ?? new HttpParams();
         if (this.filters[id]) {
-            filterFormed = [];
-            this.filters[id].forEach((filter) => {
-                filterFormed.push('filter=' + filter.attribute + ',' + filter.operator + ',' + filter.value);
+            this.filters[id]
+                .filter((filter) => filter.value !== null && filter.value !== undefined)
+                .forEach((filter) => {
+                params = params.append('filter', `${filter.attribute},${filter.operator},${filter.value}`);
             });
-            filterFormed = '?' + filterFormed.join('&');
         }
-        return filterFormed;
+        return params;
     }
-    getItemsParams(quickOrder) {
-        const params = {};
+    getOrder(quickOrder, cumulative) {
+        let params = cumulative ?? new HttpParams();
         if (quickOrder) {
-            params['order'] = `${quickOrder.attribute},${quickOrder.asc ?? ''}`;
+            params = params.append('order', `${quickOrder.attribute},${quickOrder.asc ?? ''}`);
         }
         return params;
     }
@@ -8172,17 +8171,21 @@ class PryHttpErrorInterceptorService {
                 if (!message) {
                     message = error.message;
                 }
-                this.snackbar.open({
-                    message: 'Statut: ' + error.status + '. Erreur: ' + message,
-                    type: 'error'
-                });
+                if (error.status >= 400) {
+                    this.snackbar.open({
+                        message: 'Statut: ' + error.status + '. Erreur: ' + message,
+                        type: 'error'
+                    });
+                }
                 console.error(error);
             }
             else {
-                this.snackbar.open({
-                    message: this.translateService.instant('@pry.errors.codes.' + error.status),
-                    type: 'error'
-                });
+                if (error.status >= 400) {
+                    this.snackbar.open({
+                        message: this.translateService.instant('@pry.errors.codes.' + error.status),
+                        type: 'error'
+                    });
+                }
             }
             return throwError(() => error);
         }));
@@ -8448,15 +8451,15 @@ class DataWidgetComponent extends BaseWidgetComponent {
     constructor(store, el) {
         super(store, el);
         this.staticResultSet$ = new BehaviorSubject(null);
-        this.datasourceIds$ = this.manifest$.pipe(map$1((manifest) => (Array.isArray(manifest.datasource) ? manifest.datasource : [manifest.datasource]).filter((id) => !!id)));
+        this.datasourceIds$ = this.manifest$.pipe(map((manifest) => (Array.isArray(manifest.datasource) ? manifest.datasource : [manifest.datasource]).filter((id) => !!id)));
         this.usedDatasources$ = combineLatest([
             this.datasourceIds$,
             this.store.select(DataSourceSelectors.getDataSources)
-        ]).pipe(map$1(([ids, datasources]) => ids
+        ]).pipe(map(([ids, datasources]) => ids
             .map((id) => datasources.find((ds) => ds.id === id) ?? id)
             .map((nq) => (typeof nq !== 'string' ? nq : UNKNOWN_DATASOURCE(nq)))));
         this.resultSet$ = this.initResultSet$();
-        this.allItems$ = this.resultSet$.pipe(filter$1((resultSet) => !!resultSet), map$1((resultSet) => Object.keys(resultSet?.items)
+        this.allItems$ = this.resultSet$.pipe(filter((resultSet) => !!resultSet), map((resultSet) => Object.keys(resultSet?.items)
             .map((classId) => resultSet.items[classId])
             .reduce((prev, curr) => [...prev, ...curr], [])));
     }
@@ -8465,7 +8468,7 @@ class DataWidgetComponent extends BaseWidgetComponent {
             this.store.select(DashboardSelectors.resultSets),
             this.datasourceIds$,
             this.staticResultSet$
-        ]).pipe(map$1(([resultSets, resultSetNamesArray, staticResultSet]) => {
+        ]).pipe(map(([resultSets, resultSetNamesArray, staticResultSet]) => {
             if (!!staticResultSet) {
                 return staticResultSet;
             }
@@ -8477,7 +8480,7 @@ class DataWidgetComponent extends BaseWidgetComponent {
                 relations: [],
                 merged: resultSetArray.length
             });
-        }), distinctUntilChanged((p, v) => equal(p, v)));
+        }), distinctUntilChanged$1((p, v) => equal(p, v)));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: DataWidgetComponent, deps: [{ token: i1.Store }, { token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.6", type: DataWidgetComponent, selector: "pry-data-widget", inputs: { staticResultSet: "staticResultSet" }, usesInheritance: true, ngImport: i0, template: '', isInline: true }); }
@@ -9202,8 +9205,10 @@ class ManifestService {
             }
             else {
                 // The backend returned an unsuccessful response code.
-                console.error(`Backend returned code ${error.status}, body was: ${JSON.stringify(error.error)}`);
-                if (error.code !== 204) {
+                if (error.code !== 200) {
+                    console.error(`Backend returned code ${error.status}, body was: ${JSON.stringify(error.error)}`);
+                }
+                if (error.code >= 400) {
                     this.snackBar.open({
                         type: 'error',
                         message: this.translateService.instant('@pry.manifest.get.errorBack', {
@@ -10293,22 +10298,28 @@ const internalReducer = createReducer(dashboardInitialState, on(DashboardActions
             filters: state.manifests.manifest.filters?.filter((filter) => filter.id !== action.id)
         }
     }
-})), on(DashboardActions.updateFilterValue, (state, action) => ({
-    ...state,
-    manifests: {
-        ...state.manifests,
-        manifest: {
-            ...state.manifests.manifest,
-            filters: state.manifests.manifest.filters
-                ? [
-                    ...state.manifests.manifest.filters.map((filter, i) => i === state.manifests.manifest.filters?.findIndex((filter) => filter.id === action.id)
-                        ? { ...filter, value: action.value }
-                        : filter)
-                ]
-                : []
+})), on(DashboardActions.updateFilterValue, (state, action) => {
+    const filters = JSON.parse(JSON.stringify(state.manifests.manifest.filters ?? []));
+    const filterToUpdate = filters.find((filter) => filter.id === action.id);
+    if (filterToUpdate) {
+        if (!action.value) {
+            delete filterToUpdate.value;
+        }
+        else {
+            filterToUpdate.value = action.value;
         }
     }
-})), on(DashboardActions.getWmsFeatures, (state, action) => ({
+    return {
+        ...state,
+        manifests: {
+            ...state.manifests,
+            manifest: {
+                ...state.manifests.manifest,
+                filters
+            }
+        }
+    };
+}), on(DashboardActions.getWmsFeatures, (state, action) => ({
     ...state,
     wmsFeatures: []
 })), on(DashboardActions.addWmsFeatures, (state, action) => ({