@provoly/dashboard 0.12.1 → 0.12.3

package/fesm2022/provoly-dashboard.mjs

@@ -20,6 +20,7 @@ import { ComponentPortal, TemplatePortal } from '@angular/cdk/portal';
 import equal from 'fast-deep-equal/es6';
 import { distinctUntilChanged, filter as filter$1, debounceTime as debounceTime$1, mergeMap as mergeMap$1, map as map$1, catchError, withLatestFrom, tap, delay } from 'rxjs/operators';
 import { animation, style, animate, trigger, transition, useAnimation } from '@angular/animations';
+import { v4 } from 'uuid';
 import { GeoJSON } from 'ol/format';
 import { fromLonLat } from 'ol/proj';
 import * as i2$2 from '@angular/forms';
@@ -27,7 +28,6 @@ import { NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
 import * as i2$3 from '@ng-select/ng-select';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { webSocket } from 'rxjs/webSocket';
-import { v4 } from 'uuid';
 import * as i8 from '@provoly/dashboard/components/checkbox';
 import { PryCheckboxModule } from '@provoly/dashboard/components/checkbox';
 
@@ -2972,7 +2972,7 @@ class PryUploadComponent {
                     }));
                     this.asyncEmit(files[0]);
                     break;
-                case 'csv':
+                case 'files':
                     this.uploaded.emit(files[0].name);
                     this.uploadedFile.emit(files[0]);
                     break;
@@ -3624,6 +3624,95 @@ var DashboardGridLayout;
     DashboardGridLayout["MANUAL"] = "0";
 })(DashboardGridLayout || (DashboardGridLayout = {}));
 
+class ManifestService {
+    constructor(httpClient, store, snackBar, translateService) {
+        this.httpClient = httpClient;
+        this.store = store;
+        this.snackBar = snackBar;
+        this.translateService = translateService;
+    }
+    list() {
+        return this.store.select(ConfigSelectors.refUrl).pipe(mergeMap((url) => this.httpClient.get(encodeURI(`${url}/users/me/dashboards`))), catchError((error) => {
+            if (error.error instanceof Error) {
+                // A client-side or network error occurred
+                console.error('A frontend error occurred:', error.error.message);
+                this.snackBar.open({
+                    type: 'error',
+                    message: this.translateService.instant('@pry.manifest.get.errorFront', { msg: error.error.message })
+                });
+            }
+            else {
+                // The backend returned an unsuccessful response code.
+                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', {
+                            code: error.status
+                        })
+                    });
+                }
+            }
+            return of([]);
+        }));
+    }
+    get(id) {
+        return this.store
+            .select(ConfigSelectors.refUrl)
+            .pipe(mergeMap((url) => this.httpClient.get(encodeURI(`${url}/users/me/dashboards/id/${id}/manifest`))));
+    }
+    save(name, manifest, visibility, id, description, image, cover) {
+        return this.store.select(ConfigSelectors.refUrl).pipe(mergeMap((url) => this.httpClient.post(encodeURI(`${url}/users/me/dashboards`), {
+            id: id === undefined || id.length === 0 ? v4() : id,
+            name,
+            description,
+            manifest,
+            image,
+            visibility,
+            cover,
+            datasource: ManifestService.getDatasourcesUsedByManifest(manifest)
+        })));
+    }
+    delete(id) {
+        return this.store
+            .select(ConfigSelectors.refUrl)
+            .pipe(mergeMap((url) => this.httpClient.delete(encodeURI(`${url}/users/me/dashboards/id/${id}`))));
+    }
+    default(id) {
+        return this.store.select(ConfigSelectors.refUrl).pipe(withLatestFrom(this.store.select(DashboardSelectors.manifestsList)), mergeMap(([url, manifests]) => {
+            const actual = manifests.find((manifest) => manifest.id === id);
+            if (!!actual && !actual.default) {
+                return this.httpClient
+                    .put(encodeURI(`${url}/users/me/dashboards/id/${id}/default`), {})
+                    .pipe(map$1(() => true));
+            }
+            else {
+                return this.httpClient
+                    .delete(encodeURI(`${url}/users/me/dashboards/default`), {})
+                    .pipe(map$1(() => false));
+            }
+        }));
+    }
+    static getDatasourcesUsedByManifest(manifest) {
+        return [
+            ...new Set(manifest.windows
+                .map((window) => window.widgets.map((widget) => widget.datasource))
+                .flat(3)
+                .filter((dataset) => !!dataset))
+        ];
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: ManifestService, deps: [{ token: i1$2.HttpClient }, { token: i1.Store }, { token: PrySnackbarService }, { token: PryI18nService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: ManifestService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: ManifestService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1$2.HttpClient }, { type: i1.Store }, { type: PrySnackbarService }, { type: PryI18nService }]; } });
+
 const NEW_WINDOW_TARGET = -1;
 const feature$4 = createFeatureSelector('@pry/dashboard');
 const manifests = createSelector(feature$4, (state) => state?.manifests);
@@ -3632,6 +3721,7 @@ const currentManifestId = createSelector(manifests, (manifests) => manifests.cur
 const globalManifest = createSelector(manifests, 
 // @ts-ignore
 (manifests) => ({ windows: [], ...manifests?.manifest } ?? { windows: [] }));
+const manifestDatasources = createSelector(globalManifest, (manifest) => ManifestService.getDatasourcesUsedByManifest(manifest));
 const staticManifest = createSelector(manifests, 
 // @ts-ignore
 (manifests) => ({ windows: [], ...manifests?.staticManifest } ?? { windows: [] }));
@@ -3707,6 +3797,7 @@ const DashboardSelectors = {
     rank,
     currentManifestId,
     globalManifest,
+    manifestDatasources,
     refreshRates,
     windowManifest,
     widgetManifest,
@@ -9185,95 +9276,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImpor
                 args: ['filters', { read: ViewContainerRef }]
             }] } });
 
-class ManifestService {
-    constructor(httpClient, store, snackBar, translateService) {
-        this.httpClient = httpClient;
-        this.store = store;
-        this.snackBar = snackBar;
-        this.translateService = translateService;
-    }
-    list() {
-        return this.store.select(ConfigSelectors.refUrl).pipe(mergeMap((url) => this.httpClient.get(encodeURI(`${url}/users/me/dashboards`))), catchError((error) => {
-            if (error.error instanceof Error) {
-                // A client-side or network error occurred
-                console.error('A frontend error occurred:', error.error.message);
-                this.snackBar.open({
-                    type: 'error',
-                    message: this.translateService.instant('@pry.manifest.get.errorFront', { msg: error.error.message })
-                });
-            }
-            else {
-                // The backend returned an unsuccessful response code.
-                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', {
-                            code: error.status
-                        })
-                    });
-                }
-            }
-            return of([]);
-        }));
-    }
-    get(id) {
-        return this.store
-            .select(ConfigSelectors.refUrl)
-            .pipe(mergeMap((url) => this.httpClient.get(encodeURI(`${url}/users/me/dashboards/id/${id}/manifest`))));
-    }
-    save(name, manifest, visibility, id, description, image, cover) {
-        return this.store.select(ConfigSelectors.refUrl).pipe(mergeMap((url) => this.httpClient.post(encodeURI(`${url}/users/me/dashboards`), {
-            id: id === undefined || id.length === 0 ? v4() : id,
-            name,
-            description,
-            manifest,
-            image,
-            visibility,
-            cover,
-            datasource: ManifestService.getDatasourcesUsedByManifest(manifest)
-        })));
-    }
-    delete(id) {
-        return this.store
-            .select(ConfigSelectors.refUrl)
-            .pipe(mergeMap((url) => this.httpClient.delete(encodeURI(`${url}/users/me/dashboards/id/${id}`))));
-    }
-    default(id) {
-        return this.store.select(ConfigSelectors.refUrl).pipe(withLatestFrom(this.store.select(DashboardSelectors.manifestsList)), mergeMap(([url, manifests]) => {
-            const actual = manifests.find((manifest) => manifest.id === id);
-            if (!!actual && !actual.default) {
-                return this.httpClient
-                    .put(encodeURI(`${url}/users/me/dashboards/id/${id}/default`), {})
-                    .pipe(map$1(() => true));
-            }
-            else {
-                return this.httpClient
-                    .delete(encodeURI(`${url}/users/me/dashboards/default`), {})
-                    .pipe(map$1(() => false));
-            }
-        }));
-    }
-    static getDatasourcesUsedByManifest(manifest) {
-        return [
-            ...new Set(manifest.windows
-                .map((window) => window.widgets.map((widget) => widget.datasource))
-                .flat(3)
-                .filter((dataset) => !!dataset))
-        ];
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: ManifestService, deps: [{ token: i1$2.HttpClient }, { token: i1.Store }, { token: PrySnackbarService }, { token: PryI18nService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: ManifestService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: ManifestService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1$2.HttpClient }, { type: i1.Store }, { type: PrySnackbarService }, { type: PryI18nService }]; } });
-
 class DefaultViewGuard {
     constructor(manifestService, router, store) {
         this.manifestService = manifestService;
@@ -9724,6 +9726,7 @@ class DashboardEffects {
             return DashboardActions.addWmsFeatures({
                 features: json.features.map((feature) => {
                     const result = {
+                        id: feature.id,
                         oClass: action.oClass,
                         coordinates: action.coordinates,
                         values: { properties: [] }
@@ -10328,10 +10331,14 @@ const internalReducer = createReducer(dashboardInitialState, on(DashboardActions
 }), on(DashboardActions.getWmsFeatures, (state, action) => ({
     ...state,
     wmsFeatures: []
-})), on(DashboardActions.addWmsFeatures, (state, action) => ({
-    ...state,
-    wmsFeatures: [...state.wmsFeatures, ...action.features]
-})));
+})), on(DashboardActions.addWmsFeatures, (state, action) => {
+    const allFeatures = [...state.wmsFeatures, ...action.features];
+    const deDupedIds = [...new Set(allFeatures.map((feat) => feat.id))];
+    return {
+        ...state,
+        wmsFeatures: deDupedIds.map((id) => allFeatures.find((feat) => feat.id === id))
+    };
+}));
 function dashboardReducer(state, action) {
     return internalReducer(state, action);
 }