@provoly/dashboard 0.18.7 → 0.18.9

package/fesm2022/provoly-dashboard.mjs

@@ -1378,7 +1378,8 @@ const DashboardActions = {
     getCapability: createAction('[Widget map] Get Wms capability', props()),
     updateCapability: createAction('[Widget map] Store Wms capability', props()),
     addManifestMetadata: createAction('[Dashboard] Add manifest metadata', props()),
-    deleteManifestMetadata: createAction('[Dashboard] Delete manifest metadata', props())
+    deleteManifestMetadata: createAction('[Dashboard] Delete manifest metadata', props()),
+    triggerAggregate: createAction('[Dashboard] (bus) Triggering aggregates for datasource', props())
 };
 
 const ConfigActions = {
@@ -4679,7 +4680,6 @@ class SearchEffects {
             id: props.id,
             params: this.searchService.getItemsSerializedParams(props.id, quickOrder)
         })), catchError$1((error) => [SearchActions.searchFailure({ error, id: props.id })])))));
-        this.updateAggregatesInWidget$ = createEffect(() => this.actions$.pipe(ofType(SearchActions.getDatasourceItems), filter((props) => props.id !== DEFAULT_NAMED_QUERY_ID && props.id !== EXPLORE_NAMED_QUERY_ID), tap$1((props) => window.dispatchEvent(new CustomEvent('datasourceRefresh', { detail: props.id })))), { dispatch: false });
         this.search$ = createEffect(() => this.actions$.pipe(ofType(SearchActions.search), mergeMap((props) => this.searchService.search(props.payload).pipe(map((resultSet) => SearchActions.searchSuccess({ resultSet, id: props.id })), catchError$1((error) => [SearchActions.searchFailure({ error })])))));
         this.searchSuccess$ = createEffect(() => this.actions$.pipe(ofType(SearchActions.searchSuccess), map((action) => DashboardActions.updateResultSet({
             id: action.id ?? DEFAULT_NAMED_QUERY_ID,
@@ -7392,6 +7392,13 @@ class WidgetFactoryService {
                 (widgetDefinition.autoLoadDatasource === 'not-geo' && !DatasourceUtils.isGeo(matching)));
         });
     }
+    aggregatesToAutoLoad(manifest) {
+        const widgetDefinition = this.reference$.getValue()[manifest.type];
+        const datasourcesArray = Array.isArray(manifest.datasource ?? [])
+            ? (manifest.datasource ?? [])
+            : [manifest.datasource];
+        return datasourcesArray.filter(() => widgetDefinition.autoLoadDatasource === undefined || widgetDefinition.autoLoadDatasource === 'aggregate');
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: WidgetFactoryService, deps: [{ token: i0.Injector }, { token: WIDGET_DEFINITION }, { token: i1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: WidgetFactoryService, providedIn: 'root' }); }
 }
@@ -10088,6 +10095,10 @@ class FilterInstanciatorComponent extends SubscriptionnerDirective {
             }
         }));
     }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.applySub?.unsubscribe();
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: FilterInstanciatorComponent, deps: [{ token: i1.Store }, { token: i0.Injector }, { token: FilterFactoryService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.6", type: FilterInstanciatorComponent, selector: "pry-filter-instanciator", inputs: { filter: "filter", applyFilter$: "applyFilter$" }, viewQueries: [{ propertyName: "filterContainerRef", first: true, predicate: ["filters"], descendants: true, read: ViewContainerRef }], usesInheritance: true, ngImport: i0, template: "<ng-template #filters></ng-template>\n" }); }
 }
@@ -10446,9 +10457,18 @@ class DashboardEffects {
             }
         })), { dispatch: false });
         this.requestManifestRoute$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.requestAllRoutes), map$1(() => DashboardActions.updateRouteManifest({ route: this.router.url }))));
-        this.assertResultSets$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.assertResultSets), withLatestFrom(this.store.select(DashboardSelectors.globalManifest), this.store.select(DashboardSelectors.resultSets), this.store.select(DashboardSelectors.resultSetsParams), this.store.select(DashboardSelectors.quickOrder)), mergeMap$1(([action, manifest, resultSets, resultSetsParams, quickOrder]) => {
+        this.assertResultSets$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.assertResultSets, DashboardActions.dispatchFilters, DashboardActions.clearAllFilterValues), withLatestFrom(this.store.select(DashboardSelectors.globalManifest), this.store.select(DashboardSelectors.resultSets), this.store.select(DashboardSelectors.resultSetsParams), this.store.select(DashboardSelectors.quickOrder)), mergeMap$1(([action, manifest, resultSets, resultSetsParams, quickOrder]) => {
+            // @ts-ignore
             if (!action.id) {
-                return [
+                // First send aggregate updates
+                const toAggregateActions = [
+                    ...new Set(manifest.windows
+                        .map((winManifest) => (winManifest ?? {}).widgets ?? [])
+                        .reduce((p, c) => [...p, ...c], [])
+                        .map((widManifest) => this.widgetFactoryService.aggregatesToAutoLoad(widManifest))
+                        .reduce((p, c) => [...p, ...c], []))
+                ].map((ds) => DashboardActions.triggerAggregate({ id: ds }));
+                const toItemsActions = [
                     ...new Set(manifest.windows
                         .map((winManifest) => (winManifest ?? {}).widgets ?? [])
                         .reduce((p, c) => [...p, ...c], [])
@@ -10460,14 +10480,18 @@ class DashboardEffects {
                     (!resultSets[resultSet] ||
                         resultSetsParams[resultSet] !== this.searchService.getItemsSerializedParams(resultSet, quickOrder)))
                     .map((resultSet) => SearchActions.getDatasourceItems({ id: resultSet }));
+                return [...toItemsActions, ...toAggregateActions];
             }
             else {
+                // @ts-ignore
                 if (!resultSets[action.id]) {
+                    // @ts-ignore
                     return [SearchActions.getDatasourceItems({ id: action.id })];
                 }
                 return [];
             }
         })));
+        this.sendAggregatesEvent$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.triggerAggregate), filter$1((action) => action.id !== DEFAULT_NAMED_QUERY_ID && action.id !== EXPLORE_NAMED_QUERY_ID), tap((action) => window.dispatchEvent(new CustomEvent('datasourceRefresh', { detail: action.id })))), { dispatch: false });
         this.resize$ = createEffect(() => this.actions$.pipe(
         // forward new manifest after any of these types of actions
         ofType(DashboardActions.updateDashboardManifest, DashboardActions.moveWidget, DashboardActions.updateWidgetManifest), 
@@ -10667,19 +10691,6 @@ class DashboardEffects {
         this.relaunchAfterOrder$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.quickOrder), map$1((action) => SearchActions.getDatasourceItems({ id: action.datasourceId }))));
         this.propagateGridLayout$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.setGridLayout), withLatestFrom(this.store.select(DashboardSelectors.rank), this.store.select(DashboardSelectors.windowManifest)), map$1(([action, rank, windowManifest]) => DashboardActions.propagateGridLayout({ manifest: windowManifest, rank }))));
         this.toggleEditionModeIfNotManual$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.setGridLayout), filter$1((action) => action.layout !== DashboardGridLayout.MANUAL), map$1(() => DashboardActions.toggleEditionMode({ force: false }))));
-        this.dispatchFilters$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.dispatchFilters, DashboardActions.clearAllFilterValues), withLatestFrom(this.store.select(DashboardSelectors.filters), this.store.select(DashboardSelectors.resultSets), this.store.select(DashboardSelectors.resultSetsParams), this.store.select(DashboardSelectors.quickOrder)), mergeMap$1(([action, filters, resultSets, resultSetsParams, quickOrder]) => {
-            return [
-                ...new Set(filters
-                    .map((f) => f.attributes)
-                    .flat()
-                    .map((attribute) => attribute.datasource))
-            ]
-                .filter((resultSet) => !!resultSet &&
-                resultSet !== '' &&
-                (!resultSets[resultSet] ||
-                    resultSetsParams[resultSet] !== this.searchService.getItemsSerializedParams(resultSet, quickOrder)))
-                .map((ds) => SearchActions.getDatasourceItems({ id: ds }));
-        })));
         this.getCapability$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.getCapability), debounceTime$1(100), withLatestFrom(this.store.select(DashboardSelectors.capabilities)), filter$1(([action, capabilities]) => (!!capabilities && !!action.url && !capabilities[action.url]) || !!action.force), mergeMap$1(([action, _]) => this.wmsService.getCapabilities(action.url).pipe(map$1((capability) => DashboardActions.updateCapability({ url: action.url, capability })), startWith(DashboardActions.updateCapability({ url: action.url, capability: null }))))));
         this.getWmsFeatures = createEffect(() => this.actions$.pipe(ofType(DashboardActions.getWmsFeatures), mergeMap$1((action) => combineLatest([of(action), this.wmsService.getWmsFeatures(action.url)])), map$1(([action, json]) => {
             return DashboardActions.addWmsFeatures({