@provoly/dashboard 1.4.22 → 1.4.24

package/fesm2022/provoly-dashboard.mjs

@@ -5021,17 +5021,26 @@ class SearchService {
         }
         return this.store.select(ConfigSelectors.dataUrl).pipe(mergeMap((url) => {
             const ds = this.datasources.find((d) => d.id === id);
+            const otherParams = {};
+            if (linkedItems.length > 0) {
+                if (linkedItems.includes('destination')) {
+                    otherParams['withDestinationItems'] = 'true';
+                }
+                if (linkedItems.includes('source')) {
+                    otherParams['withSourceItems'] = 'true';
+                }
+            }
             return this.httpClient.post(encodeURI(`${url}/data-sources/id/${id}/items`), {
                 type: ds?.sourceType === 'namedQuery' ? ds.request.type : NamedQueryTypes.MONO_CLASS,
                 excludeGeo: excludeGeo ?? false,
                 searchAfter: searchAfter ?? undefined,
-                linkedItems,
-                limit: this.limits[id] || this.limits['default']
+                limit: this.limits[id] || this.limits['default'],
+                ...otherParams
             }, { params });
         }), map((rs) => this.applyTransformations(id, rs)));
     }
-    getItemsSerializedParams(id, quickOrder = {}) {
-        return '|' + this.getItemsFilter(id, this.getOrder(quickOrder[id])).toString() + '|';
+    getItemsSerializedParams(id, quickOrder = {}, excludeGeo, linkedItems) {
+        return `|${this.getItemsFilter(id, this.getOrder(quickOrder[id])).toString()}|${excludeGeo ? 'excludeGeo' : ''}|${linkedItems?.join(',')}|`;
     }
     getItemsFilter(id, cumulative) {
         let params = cumulative ?? new HttpParams({ encoder: new FilterParamEncoder() });
@@ -5243,6 +5252,60 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
             args: [{ selector: 'pry-widget-placeholder', template: "<p>{{ '@pry.widget.unrecognized' | i18n: { type: manifest ? manifest.type : 'placeholder' } }}</p>\n" }]
         }], ctorParameters: () => [{ type: i1.Store }, { type: i0.ElementRef }] });
 
+const DEFAULT_GAP_PX = 15;
+const DEFAULT_COLUMNS_NUMBER = 12;
+const DEFAULT_ROWS_NUMBER = 12;
+const DEFAULT_ROW_HEIGHT_PX = 50;
+
+class ManifestUtils {
+    static getDatasourcesUsedByManifest(manifest) {
+        const mapOfDatasources = manifest.windows
+            .map((window) => (window.widgets ?? []).map((widget) => ({ datasetId: widget.datasource, excludeGeo: widget?.type !== 'map' })))
+            .flat(3)
+            .filter((dataset) => !!dataset.datasetId)
+            .map((res) => Array.isArray(res.datasetId)
+            ? res.datasetId.map((r) => ({ datasetId: r, excludeGeo: res.excludeGeo }))
+            : [res])
+            .flat().reduce((p, c) => ({ ...p, [c.datasetId]: { ...p[c.datasetId], ...c } }), {});
+        return Object.values(mapOfDatasources);
+    }
+    static cleanupManifest(manifest) {
+        return {
+            ...manifest,
+            windows: manifest.windows.map((window) => ManifestUtils.cleanupDashboardManifest(window))
+        };
+    }
+    static cleanupDashboardManifest(window) {
+        return {
+            ...window,
+            grid: {
+                columns: DEFAULT_COLUMNS_NUMBER,
+                rows: DEFAULT_ROWS_NUMBER,
+                layout: DashboardGridLayout.MANUAL,
+                gap: DEFAULT_GAP_PX,
+                ...window.grid
+            },
+            widgets: window.widgets ?? []
+        };
+    }
+    static mergeDatasourceRequests(datasourceRequests) {
+        const uniqueDatasourceRequestIds = [...new Set((datasourceRequests ?? []).map((ds) => ds.datasetId))];
+        // We keep the most inclusive request for multiple requests for the same dataset
+        return uniqueDatasourceRequestIds.map((id) => ({
+            datasetId: id,
+            // If at least one request must include geo data, then keep request with geo data
+            excludeGeo: !datasourceRequests.some((ds) => ds.datasetId === id && !ds.excludeGeo),
+            // If at least one request must include source or destination items, then create request with everything needed
+            linkedItems: [
+                ...new Set(datasourceRequests
+                    .filter((ds) => ds.datasetId === id)
+                    .map((ds) => ds.linkedItems ?? [])
+                    .flat())
+            ]
+        }));
+    }
+}
+
 const WIDGET_DEFINITION = new InjectionToken('Widgets definition');
 const NON_EXCLUDE_GEO_WIDGET_TYPES = {
     values: ['map', 'tile']
@@ -5292,23 +5355,31 @@ class WidgetFactoryService {
         return this.reference$.pipe(map((componentDefs) => !!componentDefs[type]));
     }
     datasourcesToAutoLoad(manifest) {
-        const widgetDefinition = this.reference$.getValue()[manifest.type];
-        const datasourcesArray = Array.isArray(manifest.datasource ?? [])
-            ? (manifest.datasource ?? [])
-            : [manifest.datasource];
-        return datasourcesArray
-            .filter((datasource) => {
-            const matching = this.datasources.find((ds) => ds.id === datasource);
-            return (!!matching &&
-                (widgetDefinition.autoLoadDatasource === undefined ||
-                    widgetDefinition.autoLoadDatasource === 'all' ||
-                    (widgetDefinition.autoLoadDatasource === 'geo' && DatasourceUtils.isGeo(matching)) ||
-                    (widgetDefinition.autoLoadDatasource === 'not-geo' && !DatasourceUtils.isGeo(matching))));
+        return ManifestUtils.mergeDatasourceRequests(manifest.widgets
+            .map((widgetManifest) => {
+            const widgetDefinition = this.reference$.getValue()[widgetManifest.type];
+            const datasourcesArray = Array.isArray(widgetManifest.datasource ?? [])
+                ? (widgetManifest.datasource ?? [])
+                : [widgetManifest.datasource];
+            return datasourcesArray
+                .filter((datasource) => {
+                const matching = this.datasources.find((ds) => ds.id === datasource);
+                return (!!matching &&
+                    (widgetDefinition.autoLoadDatasource === undefined ||
+                        widgetDefinition.autoLoadDatasource === 'all' ||
+                        (widgetDefinition.autoLoadDatasource === 'geo' && DatasourceUtils.isGeo(matching)) ||
+                        (widgetDefinition.autoLoadDatasource === 'not-geo' && !DatasourceUtils.isGeo(matching))));
+            })
+                .map((datasetId) => {
+                const matching = this.datasources.find((ds) => ds.id === datasetId);
+                return {
+                    datasetId: datasetId,
+                    excludeGeo: this.calculateExcludeGeo(widgetManifest, matching),
+                    linkedItems: manifest.linkedItems
+                };
+            });
         })
-            .map((datasetId) => {
-            const matching = this.datasources.find((ds) => ds.id === datasetId);
-            return { datasetId: datasetId, excludeGeo: this.calculateExcludeGeo(manifest, matching) };
-        });
+            .flat());
     }
     calculateExcludeGeo(manifest, matching) {
         if (manifest.excludeGeo === undefined || manifest.excludeGeo === 'widget-type-based') {
@@ -5336,16 +5407,16 @@ class WidgetFactoryService {
         const datasources = [];
         const aggregates = [];
         manifest.windows.forEach((windowManifest) => {
+            this.datasourcesToAutoLoad(windowManifest).forEach((res) => {
+                if (res.datasetId) {
+                    datasources.push(res);
+                }
+            });
             (windowManifest.widgets ?? []).forEach((widgetManifest) => {
-                this.datasourcesToAutoLoad(widgetManifest).forEach((res) => {
-                    if (res.datasetId) {
-                        datasources.push(res);
-                    }
-                });
                 this.aggregatesToAutoLoad(widgetManifest).forEach((ds) => aggregates.push(ds));
             });
         });
-        return { datasources, aggregates };
+        return { datasources: ManifestUtils.mergeDatasourceRequests(datasources), aggregates };
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", 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: "18.2.7", ngImport: i0, type: WidgetFactoryService, providedIn: 'root' }); }
@@ -5371,20 +5442,25 @@ class SearchEffects {
             .pipe(map((resultSet) => SearchActions.searchSuccess({
             resultSet,
             id: props.id,
-            params: this.searchService.getItemsSerializedParams(props.id, quickOrder),
+            params: this.searchService.getItemsSerializedParams(props.id, quickOrder, props.excludeGeo, props.linkedItems),
             next: props.next
         })), catchError((error) => [SearchActions.searchFailure({ error, id: props.id })])))))));
         this.fetchMore$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.fetchMoreItems), withLatestFrom(this.store.select(DashboardSelectors.rank), this.store.select(DashboardSelectors.resultSets)), filter(([props, rank, rs]) => rank === 0 && !!rs[props.id].searchAfter), debounceTime(300), mergeMap(([props]) => {
             const ds = this.widgetFactoryService.datasourcesToAutoLoad({
-                type: props.widgetType,
-                datasource: [props.id]
+                widgets: [
+                    {
+                        type: props.widgetType,
+                        datasource: [props.id]
+                    }
+                ]
             })[0];
             if (!!ds) {
                 return of(SearchActions.getDatasourceItems({
                     id: ds.datasetId,
                     excludeGeo: ds.excludeGeo,
                     from: 'fetchMore',
-                    next: true
+                    next: true,
+                    linkedItems: ds.linkedItems
                 }));
             }
             else {
@@ -6025,17 +6101,10 @@ class ResultsetUtils {
         if (!rs2)
             return rs1;
         const rs1Copy = structuredClone(rs1);
-        Object.keys(rs2.items ?? {}).forEach((key) => {
-            if (!rs1Copy.items[key]) {
-                rs1Copy.items[key] = [];
-            }
-            rs1Copy.items[key].push(...rs2.items[key]);
-        });
+        this.mergeItems(rs1Copy, rs2, (rs) => rs.items);
+        this.mergeItems(rs1Copy, rs2, (rs) => rs.sourceItems ?? {});
+        this.mergeItems(rs1Copy, rs2, (rs) => rs.destinationItems ?? {});
         /* Make items and relations unique in resulted dataset */
-        Object.keys(rs1Copy.items).forEach((key) => {
-            const uniqueList = [...new Set(rs1Copy.items[key].map((it) => it.id))];
-            rs1Copy.items[key] = uniqueList.map((id) => rs1Copy.items[key].find((it) => it.id === id));
-        });
         rs1Copy.relations = [
             ...new Set([
                 ...([...(rs1Copy.relations ?? []), ...(rs2.relations ?? [])] ?? []).map((rel) => `${rel.relationType}|${rel.source}|${rel.destination}`),
@@ -6060,6 +6129,20 @@ class ResultsetUtils {
         rs1Copy.searchAfter = rs2.searchAfter ?? rs1Copy.searchAfter;
         return rs1Copy;
     }
+    static mergeItems(rs1, rs2, getItemsToMerge) {
+        const rs1Items = getItemsToMerge(rs1);
+        const rs2Items = getItemsToMerge(rs2);
+        Object.keys(rs2Items).forEach((key) => {
+            if (!rs1Items[key]) {
+                rs1Items[key] = [];
+            }
+            rs1Items[key].push(...rs2Items[key]);
+        });
+        Object.keys(rs1Items).forEach((key) => {
+            const uniqueList = [...new Set(rs1Items[key].map((it) => it.id))];
+            rs1Items[key] = uniqueList.map((id) => (rs1Items ? rs1Items[key].find((it) => it.id === id) : []));
+        });
+    }
 }
 
 class AggregationUtils {
@@ -8821,11 +8904,6 @@ const WidgetPlacementUtils = {
     }
 };
 
-const DEFAULT_GAP_PX = 15;
-const DEFAULT_COLUMNS_NUMBER = 12;
-const DEFAULT_ROWS_NUMBER = 12;
-const DEFAULT_ROW_HEIGHT_PX = 50;
-
 function orderWidgetsAccordingToPlacement(a, b) {
     return ((b.layout.weight ?? 0) * 1000000 -
         (a.layout.weight ?? 0) * 1000000 +
@@ -9432,16 +9510,13 @@ class DashboardComponent extends SubscriptionnerDirective {
             return wManifest;
         }), distinctUntilChanged((p, c) => equal(p, c)));
         this.nonFillerWidgets$ = this.windowManifest$.pipe(map((wManifest) => (wManifest.widgets ?? []).filter((w) => w.type !== 'filler').length));
-        this.subscriptions.add(this.staticDashboard$.subscribe((manifest) => {
-            if (!!manifest) {
-                this.store.dispatch(DashboardActions.assertResultSets({
-                    staticManifest: manifest
-                }));
-            }
-        }));
-        this.subscriptions.add(combineLatest([this.windowManifest$, this.store.select(DataSourceSelectors.getDataSources)]).subscribe(([manifest, datasets]) => {
+        this.subscriptions.add(combineLatest([
+            this.windowManifest$,
+            this.store.select(DataSourceSelectors.getDataSources),
+            this.staticDashboard$
+        ]).subscribe(([manifest, datasets, staticManifest]) => {
             if (datasets.length > 0) {
-                this.store.dispatch(DashboardActions.assertResultSets({}));
+                this.store.dispatch(DashboardActions.assertResultSets({ staticManifest }));
             }
         }));
         this.store.dispatch(FieldActions.load({}));
@@ -10784,7 +10859,9 @@ class DataWidgetComponent extends BaseWidgetComponent {
             return resultSetArray.reduce((rs1, rs2) => ResultsetUtils.mergeResultSets(rs1, rs2), {
                 items: {},
                 relations: [],
-                merged: resultSetArray.length
+                merged: resultSetArray.length,
+                sourceItems: {},
+                destinationItems: {}
             });
         }), distinctUntilChanged((p, v) => equal(p, v)));
     }
@@ -11832,39 +11909,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
                     args: [BASE_CONFIG]
                 }] }] });
 
-class ManifestUtils {
-    static getDatasourcesUsedByManifest(manifest) {
-        const mapOfDatasources = manifest.windows
-            .map((window) => (window.widgets ?? []).map((widget) => ({ datasetId: widget.datasource, excludeGeo: widget?.type !== 'map' })))
-            .flat(3)
-            .filter((dataset) => !!dataset.datasetId)
-            .map((res) => Array.isArray(res.datasetId)
-            ? res.datasetId.map((r) => ({ datasetId: r, excludeGeo: res.excludeGeo }))
-            : [res])
-            .flat().reduce((p, c) => ({ ...p, [c.datasetId]: { ...p[c.datasetId], ...c } }), {});
-        return Object.values(mapOfDatasources);
-    }
-    static cleanupManifest(manifest) {
-        return {
-            ...manifest,
-            windows: manifest.windows.map((window) => ManifestUtils.cleanupDashboardManifest(window))
-        };
-    }
-    static cleanupDashboardManifest(window) {
-        return {
-            ...window,
-            grid: {
-                columns: DEFAULT_COLUMNS_NUMBER,
-                rows: DEFAULT_ROWS_NUMBER,
-                layout: DashboardGridLayout.MANUAL,
-                gap: DEFAULT_GAP_PX,
-                ...window.grid
-            },
-            widgets: window.widgets ?? []
-        };
-    }
-}
-
 class ManifestService {
     constructor(httpClient, store, snackBar, translateService) {
         this.httpClient = httpClient;
@@ -12205,28 +12249,19 @@ class DashboardEffects {
                     .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
-                }
-            }), {}))
+            const toItemsActions = ManifestUtils.mergeDatasourceRequests(manifestToCheck.windows
+                .map((winManifest) => this.widgetFactoryService.datasourcesToAutoLoad(winManifest))
+                .flat())
                 .filter((resultSet) => !!resultSet.datasetId &&
                 resultSet.datasetId !== '' &&
                 (!resultSets[resultSet.datasetId] ||
                     resultSetsParams[resultSet.datasetId] !==
-                        this.searchService.getItemsSerializedParams(resultSet.datasetId, quickOrder)))
+                        this.searchService.getItemsSerializedParams(resultSet.datasetId, quickOrder, resultSet.excludeGeo, resultSet.linkedItems)))
                 .map((resultSet) => SearchActions.getDatasourceItems({
                 id: resultSet.datasetId,
                 excludeGeo: resultSet.excludeGeo,
-                from: 'DashboardEffects.assertResultSets$-1'
+                from: 'DashboardEffects.assertResultSets$-1',
+                linkedItems: resultSet.linkedItems
             }));
             return [...toItemsActions, ...toAggregateActions];
         })));
@@ -12499,7 +12534,8 @@ class DashboardEffects {
         this.relaunchAfterOrder$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.quickOrder), map((action) => SearchActions.getDatasourceItems({
             id: action.datasourceId,
             excludeGeo: true,
-            from: 'DashboardEffects.relaunchAfterOrder$'
+            from: 'DashboardEffects.relaunchAfterOrder$',
+            linkedItems: action.linkedItems
         }))));
         this.propagateGridLayout$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.setGridLayout), withLatestFrom(this.store.select(DashboardSelectors.rank), this.store.select(DashboardSelectors.windowManifest)), map(([action, rank, windowManifest]) => DashboardActions.propagateGridLayout({ manifest: windowManifest, rank }))));
         this.toggleEditionModeIfNotManual$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.setGridLayout), filter((action) => action.layout !== DashboardGridLayout.MANUAL), map(() => DashboardActions.toggleEditionMode({ force: false }))));
@@ -13168,7 +13204,10 @@ const internalReducer = createReducer(dashboardInitialState, on(DashboardActions
             ...state.manifests,
             manifest: {
                 ...state.manifests.manifest,
-                filters: state.manifests.manifest.filters?.map((filter) => ({ ...filter, value: undefined }))
+                filters: state.manifests.manifest.filters?.map((filter) => ({
+                    ...filter,
+                    value: filter.type === 'invisible' ? filter.value : undefined
+                }))
             }
         }
     };