@provoly/dashboard 1.2.10 → 1.2.11

package/fesm2022/provoly-dashboard.mjs

@@ -490,11 +490,11 @@ const enTranslations$1 = {
         share: {
             private: 'Private',
             public: 'Public',
-            restricted: 'Restricted',
+            groups: 'Restricted',
             type: 'Visibility',
             users: 'Authorized users',
             noGroups: 'No group available',
-            groups: {
+            groupLabels: {
                 ALL: 'Public',
                 AUTHENTICATED: 'Connected users'
             },
@@ -907,10 +907,10 @@ const frTranslations$1 = {
         share: {
             private: 'Privé',
             public: 'Public',
-            restricted: 'Restreint',
+            groups: 'Restreint',
             type: 'Visibilité',
             users: 'Utilisateurs autorisés',
-            groups: {
+            groupLabels: {
                 ALL: 'Tout le monde',
                 AUTHENTICATED: 'Les utilisateurs connectés'
             },
@@ -954,7 +954,7 @@ const frTranslations$1 = {
                 selectItem: 'Sélectionner la source de données',
                 unselectItem: 'Désélectionner la source de données',
                 noItemSelected: 'Aucune source de données sélectionnée'
-            },
+            }
         },
         errors: {
             default: 'Une erreur est survenue. Veuillez vérifiez les informations ou contacter votre administrateur si le problème persiste',
@@ -5209,9 +5209,7 @@ class TranslateItemToSymbolPipe {
         this.symbolService = symbolService;
     }
     transform(value, ...args) {
-        return from$1(new Promise((resolve) => this.symbolService
-            .getSymbol(value)
-            .then((canvas) => resolve(canvas.toDataURL('image/png')))));
+        return from$1(new Promise((resolve) => this.symbolService.getSymbol(value).then((canvas) => resolve(canvas.toDataURL('image/png')))));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.3", ngImport: i0, type: TranslateItemToSymbolPipe, deps: [{ token: SymbolService }], target: i0.ɵɵFactoryTarget.Pipe }); }
     static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "17.1.3", ngImport: i0, type: TranslateItemToSymbolPipe, name: "translateItemToSymbol" }); }
@@ -6855,7 +6853,7 @@ class SelectA11yService {
     setToggle(toggleCallback) {
         this.toggle = toggleCallback;
     }
-    onFocusChange(origin, autocomplete, toggleFocus, focusSelect) {
+    onFocusChange(origin, autocomplete, toggleFocus, focusInput) {
         toggleFocus();
         switch (origin) {
             case 'mouse':
@@ -6865,7 +6863,7 @@ class SelectA11yService {
                 break;
             case 'keyboard':
                 if (autocomplete) {
-                    focusSelect();
+                    focusInput();
                 }
                 break;
         }
@@ -6916,11 +6914,12 @@ class SelectA11yService {
                     optionDivRef.nextElementSibling.focus();
                 }
                 if (last && autocomplete) {
-                    // with autocomplete=true, focus is not trapped, so prevent tabbing out of list
+                    // with autocomplete=true, focus is not trapped, so prevent navigating out of list
                     event.preventDefault();
                 }
                 break;
             case 'Tab':
+                // with autocomplete=true, focus is not trapped, so prevent tabbing out of list
                 if (last && autocomplete) {
                     event.preventDefault();
                 }
@@ -6997,7 +6996,7 @@ class PrySelectComponent extends SubscriptionnerDirective {
         this.modalWidth = 200;
         this.onFocusChange = (origin) => {
             if (!this.inhibate) {
-                this.a11yService.onFocusChange(origin, this.autocomplete, () => this.toggleFocus(), () => this.focusSelect());
+                this.a11yService.onFocusChange(origin, this.autocomplete, () => this.toggleFocus(), () => this.focusInput());
                 this.inhibition();
             }
         };
@@ -7147,7 +7146,7 @@ class PrySelectComponent extends SubscriptionnerDirective {
                 else {
                     this.overlayRef?.dispose();
                     this.overlayRef = undefined;
-                    this.focusSelect();
+                    this.returnFocus();
                 }
             }
         }
@@ -7167,8 +7166,11 @@ class PrySelectComponent extends SubscriptionnerDirective {
     toggleFocus() {
         this.focused = !this.focused;
     }
-    focusSelect() {
-        return this.autocomplete ? this.input?.nativeElement.focus() : this.selectElement?.nativeElement.focus();
+    returnFocus() {
+        return this.autocomplete ? this.focusInput() : this.selectElement?.nativeElement.focus();
+    }
+    focusInput() {
+        this.input?.nativeElement.focus();
     }
     getOverlayConfig() {
         const positionStrategy = this.overlay
@@ -7416,12 +7418,12 @@ const READ_ACCESS = 'READ';
 const WRITE_ACCESS = 'WRITE';
 // GROUP UTIL METHODS
 const getGroupLabel = (group, i18n) => {
-    return group.system ? i18n.instant('@pry.share.groups.' + group.name) : group.name;
+    return group.system ? i18n.instant('@pry.share.groupLabels.' + group.name) : group.name;
 };
 const getGroupLabelByName = (groupName, i18n) => {
-    return i18n.instant('@pry.share.groups.' + groupName).startsWith('@')
+    return i18n.instant('@pry.share.groupLabels.' + groupName).startsWith('@')
         ? groupName
-        : i18n.instant('@pry.share.groups.' + groupName);
+        : i18n.instant('@pry.share.groupLabels.' + groupName);
 };
 // DASHBOARD GROUP RIGHTS METHODS
 const canManifestBeMadePublic = (manifest, datasets) => {
@@ -11970,7 +11972,7 @@ class DashboardEffects {
             }
         })));
         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), withLatestFrom(this.store.select(DashboardSelectors.rank)), filter$1(([action, rank]) => rank === 0), mergeMap$1((action) => [
+        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) => [
             DashboardActions.startingMissingViews(),
             DashboardActions.assertResultSets({}),
             DashboardActions.solveCollisions()
@@ -12143,7 +12145,10 @@ class DashboardEffects {
                 const currentWindowLayout = manifestGlobal.windows[rank].grid?.layout ?? DashboardGridLayout.FULL;
                 // si non trouvé : nouvelle page, première position suggérée
                 const firstProposedLayout = WidgetPlacementUtils.placementOptions(newWidgetManifest, currentWindowLayout)[0];
-                manifestGlobal.windows.push({ widgets: [firstProposedLayout], grid: { layout: currentWindowLayout } });
+                manifestGlobal.windows.push({
+                    widgets: [firstProposedLayout ?? { x: 1, y: 1, height: 1, width: 1 }],
+                    grid: { layout: currentWindowLayout }
+                });
             }
             if (action.alert === undefined || action.alert === true) {
                 const messageAction = DashboardActions.multiSnackBar({
@@ -12163,6 +12168,73 @@ class DashboardEffects {
             }
             return DashboardActions.updateManifest({ manifest: manifestGlobal, selectedIds });
         })));
+        this.moveWidget$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.moveWidget), withLatestFrom(this.store.select(DashboardSelectors.gridLayout), this.store.select(DashboardSelectors.globalManifest), this.store.select(DashboardSelectors.rank), this.store.select(DashboardSelectors.dashboardCellParams), this.store.select(DashboardSelectors.selectedItemIds)), map$1(([action, layout, _globalManifest, rank, params, selectedIds]) => {
+            const manifestGlobal = JSON.parse(JSON.stringify(_globalManifest));
+            const newWindows = [...manifestGlobal.windows];
+            // Creating new current window manifest, without moved widget
+            const myNewWindow = {
+                ...newWindows[rank],
+                widgets: [...newWindows[rank].widgets]
+            };
+            const widget = myNewWindow.widgets.splice(action.widgetIndex, 1)[0];
+            newWindows[rank] = myNewWindow;
+            // Creating either a new window manifest or update the target one
+            const targetRank = action.targetIndex;
+            if (targetRank !== -1) {
+                if (!newWindows[targetRank]) {
+                    newWindows[targetRank] = {
+                        ...newWindows[rank],
+                        widgets: [widget]
+                    };
+                }
+                else {
+                    let found = null;
+                    // Try to find a spot in windows (starting by current rank, then in others)
+                    const sequence = WidgetPlacementUtils.swapArrayElements(new Array(manifestGlobal.windows.length).fill(0).map((_, idx, array) => idx), 0, rank);
+                    // Trying all placement options in target window
+                    const windowLayout = manifestGlobal.windows[targetRank].grid?.layout ?? DashboardGridLayout.MANUAL;
+                    if (windowLayout !== DashboardGridLayout.MANUAL) {
+                        const options = WidgetPlacementUtils.placementOptions(widget, windowLayout);
+                        if (!found) {
+                            for (const option of options) {
+                                if (!found) {
+                                    // Are we disjoint from all other widgets ?
+                                    const isDisjointFromAll = (manifestGlobal.windows[targetRank].widgets ?? [])
+                                        .map((widget) => WidgetPlacementUtils.areDisjoint(widget, option))
+                                        .reduce((p, c) => p && c, true);
+                                    if (isDisjointFromAll) {
+                                        // Found a disjoint placement !
+                                        found = { actualRank: targetRank, widget: option };
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        // In manual mode, we should resolveCollisions but for now it's not (cause we only have inverted collisions right now)
+                        found = { actualRank: targetRank, widget };
+                    }
+                    if (!!found) {
+                        const placeWeFound = found;
+                        newWindows[placeWeFound.actualRank].widgets.push(placeWeFound.widget);
+                    }
+                    else {
+                        const currentWindowLayout = manifestGlobal.windows[rank].grid?.layout ?? DashboardGridLayout.FULL;
+                        // si non trouvé : nouvelle page, première position suggérée
+                        const firstProposedLayout = WidgetPlacementUtils.placementOptions(widget, currentWindowLayout)[0];
+                        newWindows.push({ widgets: [firstProposedLayout ?? widget], grid: { layout: currentWindowLayout } });
+                    }
+                }
+            }
+            else {
+                // create new window to welcome this widget
+                newWindows.push({
+                    ...newWindows[rank],
+                    widgets: [widget]
+                });
+            }
+            return DashboardActions.updateManifest({ manifest: { ...manifestGlobal, windows: newWindows }, selectedIds });
+        })));
         this.multiSnackBar$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.multiSnackBar), tap((action) => this.snackBar.open(action.message))), { dispatch: false });
         this.relaunchAfterOrder$ = createEffect(() => this.actions$.pipe(ofType(DashboardActions.quickOrder), map$1((action) => SearchActions.getDatasourceItems({
             id: action.datasourceId,
@@ -12425,50 +12497,7 @@ const internalReducer = createReducer(dashboardInitialState, on(DashboardActions
             [action.id]: action.params
         }
     }
-})), on(DashboardActions.moveWidget, (state, action) => {
-    const myRank = state.manifests.tenants.indexOf(state.manifests.sender);
-    const newWindows = [...state.manifests.manifest.windows];
-    // Creating new current window manifest, without moved widget
-    const myNewWindow = {
-        ...newWindows[myRank],
-        widgets: [...newWindows[myRank].widgets]
-    };
-    const widget = myNewWindow.widgets.splice(action.widgetIndex, 1)[0];
-    newWindows[myRank] = myNewWindow;
-    // Creating either a new window manifest or update the target one
-    const targetRank = action.targetIndex;
-    if (targetRank !== -1) {
-        if (!newWindows[targetRank]) {
-            newWindows[targetRank] = {
-                ...newWindows[myRank],
-                widgets: [widget]
-            };
-        }
-        else {
-            newWindows[targetRank] = {
-                ...newWindows[targetRank],
-                widgets: [...(newWindows[targetRank].widgets ?? []), widget]
-            };
-        }
-    }
-    else {
-        // create new window to welcome this widget
-        newWindows.push({
-            ...newWindows[myRank],
-            widgets: [widget]
-        });
-    }
-    return {
-        ...state,
-        manifests: {
-            ...state.manifests,
-            manifest: {
-                ...state.manifests.manifest,
-                windows: newWindows
-            }
-        }
-    };
-}), on(DashboardActions.maximizeWidget, (state, action) => {
+})), on(DashboardActions.maximizeWidget, (state, action) => {
     const myRank = state.manifests.tenants.indexOf(state.manifests.sender);
     const newWindows = JSON.parse(JSON.stringify(state.manifests.manifest.windows));
     newWindows[myRank].widgets[action.widgetIndex].layout = {