@provoly/dashboard 1.3.29 → 1.3.31

package/fesm2022/provoly-dashboard.mjs

@@ -4136,7 +4136,9 @@ const operators = [
     'END_WITH',
     'LOWER_THAN',
     'INSIDE',
-    'OUTSIDE'
+    'OUTSIDE',
+    'IN',
+    'NOT_IN'
 ];
 class FilterParamEncoder extends HttpUrlEncodingCodec {
     constructor() {
@@ -4145,9 +4147,7 @@ class FilterParamEncoder extends HttpUrlEncodingCodec {
     encodeValue(v) {
         const hasOperator = operators.includes(v.split(',')?.[1]);
         if (hasOperator) {
-            const fragments = v.split(',');
-            fragments[2] = encodeURIComponent(fragments.splice(2).join('\\,'));
-            return fragments.slice(0, 3).join(',');
+            return v;
         }
         return encodeURIComponent(v);
     }
@@ -4184,7 +4184,10 @@ class SearchService {
             this.filters[id]
                 .filter((filter) => filter.value !== null && filter.value !== undefined)
                 .forEach((filter) => {
-                params = params.append('filter', `${filter.attribute},${filter.operator},${filter.value.toString()}`);
+                const value = Array.isArray(filter.value)
+                    ? filter.value.map((v) => encodeURIComponent(v.toString().split(',').join('\\,'))).join(',')
+                    : encodeURIComponent(filter.value.toString().replace(/,/g, '\\,'));
+                params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);
             });
         }
         if (includeLimit) {
@@ -9229,11 +9232,12 @@ class DashboardComponent extends SubscriptionnerDirective {
     set forceModeEdition(mode) {
         this.forceModeEdition$.next(mode);
     }
-    constructor(store, overlay, viewContainerRef) {
+    constructor(store, overlay, viewContainerRef, widgetFactoryService) {
         super();
         this.store = store;
         this.overlay = overlay;
         this.viewContainerRef = viewContainerRef;
+        this.widgetFactoryService = widgetFactoryService;
         this.manifest = null;
         this.modeEdition = false;
         this.staticDashboard$ = new BehaviorSubject(null);
@@ -9309,12 +9313,9 @@ class DashboardComponent extends SubscriptionnerDirective {
         this.nonFillerWidgets$ = this.windowManifest$.pipe(map$1((wManifest) => (wManifest.widgets ?? []).filter((w) => w.type !== 'filler').length));
         this.subscriptions.add(this.staticDashboard$.subscribe((manifest) => {
             if (!!manifest) {
-                const getDataActions = [
-                    ...new Set((manifest.widgets ?? [])
-                        .reduce((p, c) => [...p, c], [])
-                        .map((widManifest) => widManifest.datasource))
-                ].reduce((p, c) => [...p, ...(Array.isArray(c) ? c : [c])], []).map((resultSet) => DashboardActions.assertResultSets({ id: resultSet }));
-                getDataActions.forEach((action) => this.store.dispatch(action));
+                this.store.dispatch(DashboardActions.assertResultSets({
+                    staticManifest: manifest
+                }));
             }
         }));
         this.subscriptions.add(combineLatest([this.windowManifest$, this.store.select(DataSourceSelectors.getDataSources)]).subscribe(([manifest, datasets]) => {
@@ -9761,13 +9762,13 @@ class DashboardComponent extends SubscriptionnerDirective {
             }
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.3", ngImport: i0, type: DashboardComponent, deps: [{ token: i1.Store }, { token: i2.Overlay }, { token: i0.ViewContainerRef }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.3", ngImport: i0, type: DashboardComponent, deps: [{ token: i1.Store }, { token: i2.Overlay }, { token: i0.ViewContainerRef }, { token: WidgetFactoryService }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.1.3", type: DashboardComponent, selector: "pry-dashboard", inputs: { staticDashboard: "staticDashboard", forceModeEdition: "forceModeEdition", CloseOnDragOut: "CloseOnDragOut", displayOptions: "displayOptions", noBackground: "noBackground", breakpoint: "breakpoint" }, outputs: { rowHeight: "rowHeight", rows: "rows" }, viewQueries: [{ propertyName: "templateModal", first: true, predicate: ["templateModal"], descendants: true, read: TemplateRef }, { propertyName: "gridRef", first: true, predicate: ["grid"], descendants: true }, { propertyName: "instanciators", predicate: WidgetInstanciatorComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"o-dashboard-edit\" [class.-edit]=\"modeEdition$ | async\">\n  <div class=\"o-dashboard-add -rows\">\n    <button (click)=\"changeSize('rows', -1)\">\n      <pry-icon iconSvg=\"remove\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n    <button (click)=\"changeSize('rows', +1)\">\n      <pry-icon iconSvg=\"add\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n    <p>{{ '@pry.grid.rows' | i18n }}</p>\n  </div>\n  <div class=\"o-dashboard-add -cols\">\n    <p>{{ '@pry.grid.columns' | i18n }}</p>\n    <button (click)=\"changeSize('columns', -1)\">\n      <pry-icon iconSvg=\"remove\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n    <button (click)=\"changeSize('columns', +1)\">\n      <pry-icon iconSvg=\"add\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n  </div>\n  <div\n    class=\"o-dashboard-grid\"\n    [style.gridTemplateColumns]=\"gridTemplateColumns$ | async\"\n    [style.gridTemplateRows]=\"gridTemplateRows$ | async\"\n    [style.gridGap]=\"dashboardParams.gridGap + 'px'\"\n    #grid\n    (mousemove)=\"movingMouse($event)\"\n    (drop)=\"dropping($event)\"\n    (dragover)=\"dragMove($event)\"\n    (dragleave)=\"dragLeave($event)\"\n    (dragenter)=\"dragEnter($event)\"\n  >\n    <ng-container\n      *ngFor=\"\n        let widgetManifest of (windowManifest$ | async)?.widgets || [];\n        let widgetIndex = index;\n        trackBy: trackWidgets\n      \"\n    >\n      <div\n        class=\"o-dashboard-widget\"\n        [class.-edited]=\"modeEdition\"\n        [style.gridColumn]=\"gridColumn(widgetManifest.layout)\"\n        [style.gridRow]=\"gridRow(widgetManifest.layout)\"\n        (drop)=\"droppingInWidget($event, widgetIndex)\"\n      >\n        <ng-container *ngIf=\"modeEdition\">\n          <div class=\"resize nw-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-nw')\">\n            <pry-icon iconSvg=\"north_west\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize sw-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-sw')\">\n            <pry-icon iconSvg=\"south_west\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize ne-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-ne')\">\n            <pry-icon iconSvg=\"north_east\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize se-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-se')\">\n            <pry-icon iconSvg=\"south_east\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize delete\" (mousedown)=\"toggleRemoveConfirm($event, widgetIndex)\">\n            <pry-icon iconSvg=\"close\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"move\" draggable=\"true\" (dragstart)=\"dragStart($event, widgetIndex)\">\n            <div class=\"move-inside move-{{ widgetManifest.type }}\">\n              <span>{{ widgetManifest.title ?? ('@pry.toolbox.' + widgetManifest.type | i18n) }}</span>\n            </div>\n          </div>\n        </ng-container>\n        <ng-container *ngIf=\"!modeEdition\">\n          <pry-widget-instanciator\n            [staticManifest]=\"widgetManifest\"\n            [widgetIndex]=\"widgetIndex\"\n          ></pry-widget-instanciator>\n        </ng-container>\n      </div>\n    </ng-container>\n\n    <ng-container *ngIf=\"!noBackground\">\n      <ng-container\n        *ngIf=\"{\n          noWidgets: (nonFillerWidgets$ | async) === 0,\n          globalLoading: loading$ | async,\n          fetchLoading: (dataFetching$ | async)?.length ?? 1 > 0\n        } as data\"\n      >\n        <ng-container *ngIf=\"data.noWidgets\">\n          <div\n            *ngIf=\"data.globalLoading; else notLoading\"\n            class=\"no-widget\"\n            [style.grid-area]=\"backgroundArea$ | async\"\n          >\n            <pry-page-loader></pry-page-loader>\n            <span class=\"no-widget__text\">{{ '@pry.widget.target.loading' | i18n }}...</span>\n          </div>\n          <ng-template #notLoading>\n            <div class=\"no-widget\" [style.grid-area]=\"backgroundArea$ | async\">\n              <img\n                class=\"no-widget__search\"\n                src=\"../../../assets/svgs/pry_recherche.svg\"\n                alt=\"{{\n                  (layout === DashboardGridLayout.MANUAL\n                    ? '@pry.widget.target.none_manual'\n                    : '@pry.widget.target.none_auto'\n                  ) | i18n\n                }}\"\n              />\n              <span class=\"no-widget__text\">{{\n                (layout === DashboardGridLayout.MANUAL\n                  ? '@pry.widget.target.none_manual'\n                  : '@pry.widget.target.none_auto'\n                ) | i18n\n              }}</span>\n            </div>\n          </ng-template>\n        </ng-container>\n        <div\n          class=\"a-page-loader backdrop\"\n          [style.display]=\"data.fetchLoading && !data.globalLoading ? 'flex' : 'none'\"\n          [style.width.px]=\"params.gridWidth\"\n          [style.height.px]=\"params.gridHeight\"\n        >\n          <pry-page-loader></pry-page-loader>\n          <p>{{ '@pry.widget.target.loading' | i18n }}...</p>\n        </div>\n      </ng-container>\n    </ng-container>\n  </div>\n</div>\n<pry-context-menu></pry-context-menu>\n\n<ng-template #templateModal>\n  <div class=\"o-modal\">\n    <div class=\"o-modal__top\">\n      <div class=\"o-modal__top__title\">\n        <h2 class=\"a-h2\" id=\"dialog_title\">\n          {{ '@pry.widget.modalTitle' | i18n }}\n        </h2>\n      </div>\n      <div class=\"o-modal__top__close\">\n        <button class=\"a-btn a-btn--icon-only\" (click)=\"cancelRemoveConfirm()\">\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    <div class=\"m-btn-group\">\n      <button type=\"button\" (click)=\"cancelRemoveConfirm()\" class=\"a-btn a-btn--secondary\">\n        {{ '@pry.toolbox.manifest.close' | i18n }}\n      </button>\n      <button type=\"submit\" (click)=\"confirmRemove()\" class=\"a-btn a-btn--primary\">\n        {{ '@pry.toolbox.manifest.validate' | i18n }}\n      </button>\n    </div>\n  </div>\n</ng-template>\n", dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: PryIconComponent, selector: "pry-icon", inputs: ["color", "iconSvg", "animation", "iconImage", "alt", "width", "height", "classes"] }, { kind: "component", type: i8.PryPageLoaderComponent, selector: "pry-page-loader", inputs: ["image", "imageAltText"] }, { kind: "component", type: WidgetInstanciatorComponent, selector: "pry-widget-instanciator", inputs: ["widgetIndex", "staticManifest", "standalone", "open$"], outputs: ["manifestModified"] }, { kind: "component", type: ContextMenuComponent, selector: "pry-context-menu" }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "pipe", type: I18nPipe, name: "i18n" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.3", ngImport: i0, type: DashboardComponent, decorators: [{
             type: Component,
             args: [{ selector: 'pry-dashboard', template: "<div class=\"o-dashboard-edit\" [class.-edit]=\"modeEdition$ | async\">\n  <div class=\"o-dashboard-add -rows\">\n    <button (click)=\"changeSize('rows', -1)\">\n      <pry-icon iconSvg=\"remove\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n    <button (click)=\"changeSize('rows', +1)\">\n      <pry-icon iconSvg=\"add\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n    <p>{{ '@pry.grid.rows' | i18n }}</p>\n  </div>\n  <div class=\"o-dashboard-add -cols\">\n    <p>{{ '@pry.grid.columns' | i18n }}</p>\n    <button (click)=\"changeSize('columns', -1)\">\n      <pry-icon iconSvg=\"remove\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n    <button (click)=\"changeSize('columns', +1)\">\n      <pry-icon iconSvg=\"add\" [width]=\"12\" [height]=\"12\"></pry-icon>\n    </button>\n  </div>\n  <div\n    class=\"o-dashboard-grid\"\n    [style.gridTemplateColumns]=\"gridTemplateColumns$ | async\"\n    [style.gridTemplateRows]=\"gridTemplateRows$ | async\"\n    [style.gridGap]=\"dashboardParams.gridGap + 'px'\"\n    #grid\n    (mousemove)=\"movingMouse($event)\"\n    (drop)=\"dropping($event)\"\n    (dragover)=\"dragMove($event)\"\n    (dragleave)=\"dragLeave($event)\"\n    (dragenter)=\"dragEnter($event)\"\n  >\n    <ng-container\n      *ngFor=\"\n        let widgetManifest of (windowManifest$ | async)?.widgets || [];\n        let widgetIndex = index;\n        trackBy: trackWidgets\n      \"\n    >\n      <div\n        class=\"o-dashboard-widget\"\n        [class.-edited]=\"modeEdition\"\n        [style.gridColumn]=\"gridColumn(widgetManifest.layout)\"\n        [style.gridRow]=\"gridRow(widgetManifest.layout)\"\n        (drop)=\"droppingInWidget($event, widgetIndex)\"\n      >\n        <ng-container *ngIf=\"modeEdition\">\n          <div class=\"resize nw-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-nw')\">\n            <pry-icon iconSvg=\"north_west\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize sw-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-sw')\">\n            <pry-icon iconSvg=\"south_west\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize ne-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-ne')\">\n            <pry-icon iconSvg=\"north_east\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize se-resize\" (mousedown)=\"startResize($event, widgetIndex, 'resize-se')\">\n            <pry-icon iconSvg=\"south_east\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"resize delete\" (mousedown)=\"toggleRemoveConfirm($event, widgetIndex)\">\n            <pry-icon iconSvg=\"close\" [animation]=\"false\"></pry-icon>\n          </div>\n          <div class=\"move\" draggable=\"true\" (dragstart)=\"dragStart($event, widgetIndex)\">\n            <div class=\"move-inside move-{{ widgetManifest.type }}\">\n              <span>{{ widgetManifest.title ?? ('@pry.toolbox.' + widgetManifest.type | i18n) }}</span>\n            </div>\n          </div>\n        </ng-container>\n        <ng-container *ngIf=\"!modeEdition\">\n          <pry-widget-instanciator\n            [staticManifest]=\"widgetManifest\"\n            [widgetIndex]=\"widgetIndex\"\n          ></pry-widget-instanciator>\n        </ng-container>\n      </div>\n    </ng-container>\n\n    <ng-container *ngIf=\"!noBackground\">\n      <ng-container\n        *ngIf=\"{\n          noWidgets: (nonFillerWidgets$ | async) === 0,\n          globalLoading: loading$ | async,\n          fetchLoading: (dataFetching$ | async)?.length ?? 1 > 0\n        } as data\"\n      >\n        <ng-container *ngIf=\"data.noWidgets\">\n          <div\n            *ngIf=\"data.globalLoading; else notLoading\"\n            class=\"no-widget\"\n            [style.grid-area]=\"backgroundArea$ | async\"\n          >\n            <pry-page-loader></pry-page-loader>\n            <span class=\"no-widget__text\">{{ '@pry.widget.target.loading' | i18n }}...</span>\n          </div>\n          <ng-template #notLoading>\n            <div class=\"no-widget\" [style.grid-area]=\"backgroundArea$ | async\">\n              <img\n                class=\"no-widget__search\"\n                src=\"../../../assets/svgs/pry_recherche.svg\"\n                alt=\"{{\n                  (layout === DashboardGridLayout.MANUAL\n                    ? '@pry.widget.target.none_manual'\n                    : '@pry.widget.target.none_auto'\n                  ) | i18n\n                }}\"\n              />\n              <span class=\"no-widget__text\">{{\n                (layout === DashboardGridLayout.MANUAL\n                  ? '@pry.widget.target.none_manual'\n                  : '@pry.widget.target.none_auto'\n                ) | i18n\n              }}</span>\n            </div>\n          </ng-template>\n        </ng-container>\n        <div\n          class=\"a-page-loader backdrop\"\n          [style.display]=\"data.fetchLoading && !data.globalLoading ? 'flex' : 'none'\"\n          [style.width.px]=\"params.gridWidth\"\n          [style.height.px]=\"params.gridHeight\"\n        >\n          <pry-page-loader></pry-page-loader>\n          <p>{{ '@pry.widget.target.loading' | i18n }}...</p>\n        </div>\n      </ng-container>\n    </ng-container>\n  </div>\n</div>\n<pry-context-menu></pry-context-menu>\n\n<ng-template #templateModal>\n  <div class=\"o-modal\">\n    <div class=\"o-modal__top\">\n      <div class=\"o-modal__top__title\">\n        <h2 class=\"a-h2\" id=\"dialog_title\">\n          {{ '@pry.widget.modalTitle' | i18n }}\n        </h2>\n      </div>\n      <div class=\"o-modal__top__close\">\n        <button class=\"a-btn a-btn--icon-only\" (click)=\"cancelRemoveConfirm()\">\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    <div class=\"m-btn-group\">\n      <button type=\"button\" (click)=\"cancelRemoveConfirm()\" class=\"a-btn a-btn--secondary\">\n        {{ '@pry.toolbox.manifest.close' | i18n }}\n      </button>\n      <button type=\"submit\" (click)=\"confirmRemove()\" class=\"a-btn a-btn--primary\">\n        {{ '@pry.toolbox.manifest.validate' | i18n }}\n      </button>\n    </div>\n  </div>\n</ng-template>\n" }]
-        }], ctorParameters: () => [{ type: i1.Store }, { type: i2.Overlay }, { type: i0.ViewContainerRef }], propDecorators: { templateModal: [{
+        }], ctorParameters: () => [{ type: i1.Store }, { type: i2.Overlay }, { type: i0.ViewContainerRef }, { type: WidgetFactoryService }], propDecorators: { templateModal: [{
                 type: ViewChild,
                 args: ['templateModal', { read: TemplateRef }]
             }], instanciators: [{
@@ -12022,56 +12023,41 @@ class DashboardEffects {
         this.endLoadingAfterFollowingManifestRoute$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.followManifestRoute), map$1((action) => DashboardActions.endLoading())));
         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, 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) {
-                // 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 = Object.values(manifest.windows
+            const manifestToCheck = action.type === DashboardActions.assertResultSets.type && action.staticManifest
+                ? { windows: [action.staticManifest] }
+                : manifest;
+            // First send aggregate updates
+            const toAggregateActions = [
+                ...new Set(manifestToCheck.windows
                     .map((winManifest) => (winManifest ?? {}).widgets ?? [])
                     .reduce((p, c) => [...p, ...c], [])
-                    .map((widManifest) => this.widgetFactoryService.datasourcesToAutoLoad(widManifest))
-                    .flat()
-                    .reduce((p, c) => ({
-                    ...p,
-                    [c.datasetId]: {
-                        ...p[c.datasetId],
-                        ...c,
-                        excludeGeo: p[c.datasetId]?.excludeGeo === false ? p[c.datasetId].excludeGeo : c.excludeGeo
-                    }
-                }), {}))
-                    .filter((resultSet) => !!resultSet.datasetId &&
-                    resultSet.datasetId !== '' &&
-                    (!resultSets[resultSet.datasetId] ||
-                        resultSetsParams[resultSet.datasetId] !==
-                            this.searchService.getItemsSerializedParams(resultSet.datasetId, quickOrder)))
-                    .map((resultSet) => SearchActions.getDatasourceItems({
-                    id: resultSet.datasetId,
-                    excludeGeo: resultSet.excludeGeo,
-                    from: 'DashboardEffects.assertResultSets$-1'
-                }));
-                return [...toItemsActions, ...toAggregateActions];
-            }
-            else {
-                // @ts-ignore
-                if (!resultSets[action.id]) {
-                    return [
-                        SearchActions.getDatasourceItems({
-                            // @ts-ignore
-                            id: action.id,
-                            // @ts-ignore
-                            excludeGeo: action.excludeGeo != undefined ? action.excludeGeo : true,
-                            from: 'DashboardEffects.assertResultSets$-2'
-                        })
-                    ];
+                    .map((widManifest) => this.widgetFactoryService.aggregatesToAutoLoad(widManifest))
+                    .reduce((p, c) => [...p, ...c], []))
+            ].map((ds) => DashboardActions.triggerAggregate({ id: ds }));
+            const toItemsActions = Object.values(manifestToCheck.windows
+                .map((winManifest) => (winManifest ?? {}).widgets ?? [])
+                .reduce((p, c) => [...p, ...c], [])
+                .map((widManifest) => this.widgetFactoryService.datasourcesToAutoLoad(widManifest))
+                .flat()
+                .reduce((p, c) => ({
+                ...p,
+                [c.datasetId]: {
+                    ...p[c.datasetId],
+                    ...c,
+                    excludeGeo: p[c.datasetId]?.excludeGeo === false ? p[c.datasetId].excludeGeo : c.excludeGeo
                 }
-                return [];
-            }
+            }), {}))
+                .filter((resultSet) => !!resultSet.datasetId &&
+                resultSet.datasetId !== '' &&
+                (!resultSets[resultSet.datasetId] ||
+                    resultSetsParams[resultSet.datasetId] !==
+                        this.searchService.getItemsSerializedParams(resultSet.datasetId, quickOrder)))
+                .map((resultSet) => SearchActions.getDatasourceItems({
+                id: resultSet.datasetId,
+                excludeGeo: resultSet.excludeGeo,
+                from: 'DashboardEffects.assertResultSets$-1'
+            }));
+            return [...toItemsActions, ...toAggregateActions];
         })));
         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.startMissingViewAfterViewUpdate$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.updateManifest, DashboardActions.updateManifestAfterFetch, DashboardActions.updateManifestAfterTenantLeave, DashboardActions.updateManifestAfterTenantJoin, DashboardActions.explore, DashboardActions.detail, DashboardActions.restoreInitialManifest, DashboardActions.createTab, DashboardActions.moveWidget), withLatestFrom(this.store.select(DashboardSelectors.rank)), filter$1(([action, rank]) => rank === 0), mergeMap$1((action) => [