@acorex/modules 20.2.4-next.8 → 20.3.0-next.0

package/fesm2022/acorex-modules-dashboard-management.mjs

@@ -5,7 +5,7 @@ import { AXPWidgetsCatalog, AXPLayoutBaseWidgetComponent, AXPWidgetGroupEnum, AX
 import { AXMEntityCrudServiceImpl, AXPEntityService, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import { AXP_DATA_PROPERTY_GROUP, AXP_APPEARANCE_PROPERTY_GROUP, AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_BEHAVIOR_PROPERTY_GROUP, AXP_BG_COLOR_PROPERTY, plainTextDefaultProperty, AXP_COLOR_PROPERTY, AXPWidgetsModule } from '@acorex/platform/widgets';
 import * as i0 from '@angular/core';
-import { Injectable, inject, Injector, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, ChangeDetectorRef, viewChild, HostListener, InjectionToken, HostBinding, NgModule, output, contentChild, afterNextRender, model, ViewEncapsulation } from '@angular/core';
+import { Injectable, NgModule, inject, Injector, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, ChangeDetectorRef, viewChild, HostListener, InjectionToken, HostBinding, output, contentChild, afterNextRender, model, ViewEncapsulation } from '@angular/core';
 import { AXMLocaleManagementService } from '@acorex/modules/locale-management';
 import { AXBarChartComponent } from '@acorex/charts/bar-chart';
 import * as i2$3 from '@acorex/components/decorators';
@@ -54,6 +54,7 @@ import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageLayoutBase }
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import * as i1$3 from '@acorex/components/loading';
 import { AXLoadingModule } from '@acorex/components/loading';
+import { AXMUsersEntityService } from '@acorex/modules/security-management';
 import { signalStore, withState, withComputed, withMethods, patchState } from '@ngrx/signals';
 import { AXLabelModule } from '@acorex/components/label';
 import { AXBasePageComponent } from '@acorex/components/page';
@@ -419,6 +420,33 @@ var dashboard_entity = /*#__PURE__*/Object.freeze({
     dashboardFactory: dashboardFactory
 });
 
+class AXMDashboardEntityModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardEntityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardEntityModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardEntityModule, providers: [
+            {
+                provide: AXMDashboardService,
+                useClass: AXMDashboardServiceImpl,
+            },
+        ] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardEntityModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    imports: [],
+                    exports: [],
+                    declarations: [],
+                    providers: [
+                        {
+                            provide: AXMDashboardService,
+                            useClass: AXMDashboardServiceImpl,
+                        },
+                    ],
+                }]
+        }] });
+
+// Entity Services
+
 class AXMEntityProvider {
     constructor() {
         this.injector = inject(Injector);
@@ -658,6 +686,27 @@ class AXMClockWidgetViewComponent extends AXPLayoutBaseWidgetComponent {
             const minWidthNeeded = clockCount * 100;
             return width >= minWidthNeeded && clockCount <= 4;
         }, ...(ngDevMode ? [{ debugName: "hasEnoughSpaceForHorizontal" }] : []));
+        // Dynamically compute font sizes for timezone code and abbreviation
+        this.codeFontSize = computed(() => {
+            const width = this.containerWidth();
+            const codeLength = this.timezone()?.code?.length ?? 0;
+            // Base scales with container width (100px -> ~10px, 400px -> ~22px)
+            const base = (width / 400) * 14 + 8;
+            // Penalize long codes more aggressively to allow two-line fit
+            const penalty = codeLength > 14 ? (codeLength - 14) * 0.8 : 0;
+            const size = Math.max(9, Math.min(22, base - penalty));
+            return Math.round(size);
+        }, ...(ngDevMode ? [{ debugName: "codeFontSize" }] : []));
+        this.abbrFontSize = computed(() => {
+            const width = this.containerWidth();
+            const abbrLength = this.timezone()?.abbr?.length ?? 0;
+            // Base scales with container width (100px -> ~16px, 400px -> ~30px)
+            const base = (width / 400) * 18 + 12;
+            // Penalize unusually long abbreviations
+            const penalty = abbrLength > 4 ? (abbrLength - 4) * 1 : 0;
+            const size = Math.max(14, Math.min(28, base - penalty));
+            return Math.round(size);
+        }, ...(ngDevMode ? [{ debugName: "abbrFontSize" }] : []));
         this.loadUserTimezone();
     }
     ngAfterViewInit() {
@@ -721,16 +770,17 @@ class AXMClockWidgetViewComponent extends AXPLayoutBaseWidgetComponent {
             ></axm-analog-clock>
           </div>
           @if (timezone()?.abbr) {
-            <div
-              class="ax-flex ax-flex-col ax-items-center ax-justify-center ax-text-center ax-min-w-[50px]"
-              [class.ax-pe-8]="isHorizontal() && others().length > 0"
-            >
+            <div class="ax-flex ax-flex-col ax-items-center ax-justify-center ax-text-center ax-min-w-[50px]">
               @if (timezone()?.code) {
-                <span class="ax-text-xl ax-font-medium ax-text-gray-500 ax-uppercase ax-tracking-wide">{{
-                  timezone()?.code
-                }}</span>
+                <span
+                  class="ax-font-medium ax-text-gray-500 ax-uppercase ax-block ax-2line"
+                  [style.fontSize.px]="codeFontSize()"
+                  >{{ timezone()?.code }}</span
+                >
               }
-              <span class="ax-text-2xl ax-font-bold ax-text-gray-800 ax-mt-0">{{ timezone()?.abbr }}</span>
+              <span class="ax-font-bold ax-text-gray-800 ax-mt-0" [style.fontSize.px]="abbrFontSize()">{{
+                timezone()?.abbr
+              }}</span>
             </div>
           }
         </div>
@@ -776,7 +826,7 @@ class AXMClockWidgetViewComponent extends AXPLayoutBaseWidgetComponent {
         }
       </div>
     </div>
-  `, isInline: true, styles: [":host{display:block;width:100%;height:100%}.ax-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n"], dependencies: [{ kind: "component", type: AXMAnalogClockComponent, selector: "axm-analog-clock", inputs: ["timezone", "classes", "showNumbers"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, styles: [":host{display:block;width:100%;height:100%}.ax-2line{display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;text-overflow:ellipsis;white-space:normal;line-height:1.1;max-height:2.2em}.ax-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n"], dependencies: [{ kind: "component", type: AXMAnalogClockComponent, selector: "axm-analog-clock", inputs: ["timezone", "classes", "showNumbers"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMClockWidgetViewComponent, decorators: [{
             type: Component,
@@ -807,16 +857,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
             ></axm-analog-clock>
           </div>
           @if (timezone()?.abbr) {
-            <div
-              class="ax-flex ax-flex-col ax-items-center ax-justify-center ax-text-center ax-min-w-[50px]"
-              [class.ax-pe-8]="isHorizontal() && others().length > 0"
-            >
+            <div class="ax-flex ax-flex-col ax-items-center ax-justify-center ax-text-center ax-min-w-[50px]">
               @if (timezone()?.code) {
-                <span class="ax-text-xl ax-font-medium ax-text-gray-500 ax-uppercase ax-tracking-wide">{{
-                  timezone()?.code
-                }}</span>
+                <span
+                  class="ax-font-medium ax-text-gray-500 ax-uppercase ax-block ax-2line"
+                  [style.fontSize.px]="codeFontSize()"
+                  >{{ timezone()?.code }}</span
+                >
               }
-              <span class="ax-text-2xl ax-font-bold ax-text-gray-800 ax-mt-0">{{ timezone()?.abbr }}</span>
+              <span class="ax-font-bold ax-text-gray-800 ax-mt-0" [style.fontSize.px]="abbrFontSize()">{{
+                timezone()?.abbr
+              }}</span>
             </div>
           }
         </div>
@@ -862,7 +913,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
         }
       </div>
     </div>
-  `, standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, imports: [AXMAnalogClockComponent], styles: [":host{display:block;width:100%;height:100%}.ax-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n"] }]
+  `, standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, imports: [AXMAnalogClockComponent], styles: [":host{display:block;width:100%;height:100%}.ax-2line{display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;text-overflow:ellipsis;white-space:normal;line-height:1.1;max-height:2.2em}.ax-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n"] }]
         }], ctorParameters: () => [] });
 
 var analogClockWidgetView_component = /*#__PURE__*/Object.freeze({
@@ -4934,12 +4985,10 @@ function createAppRoute() {
 }
 class AXMDashboardManagementModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardManagementModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardManagementModule, imports: [i2$2.AXPLayoutBuilderModule] }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardManagementModule, imports: [i2$2.AXPLayoutBuilderModule, 
+            // Entity Modules
+            AXMDashboardEntityModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardManagementModule, providers: [
-            {
-                provide: AXMDashboardService,
-                useClass: AXMDashboardServiceImpl,
-            },
             {
                 provide: AXP_HOME_PAGES,
                 multi: true,
@@ -4982,7 +5031,9 @@ class AXMDashboardManagementModule {
                     AXPAdvancedWeatherWidget,
                     AXPAnalogClockWidget,
                 ],
-            })] }); }
+            }),
+            // Entity Modules
+            AXMDashboardEntityModule] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMDashboardManagementModule, decorators: [{
             type: NgModule,
@@ -5005,12 +5056,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                                 AXPAnalogClockWidget,
                             ],
                         }),
+                        // Entity Modules
+                        AXMDashboardEntityModule,
                     ],
                     providers: [
-                        {
-                            provide: AXMDashboardService,
-                            useClass: AXMDashboardServiceImpl,
-                        },
                         {
                             provide: AXP_HOME_PAGES,
                             multi: true,
@@ -5426,12 +5475,12 @@ const modelToDashboardLayout = (model) => ({
     title: model.title,
     description: model.description,
     widgets: model.widgets || [],
+    createdBy: model.userId ?? model.createdBy,
     roleIds: model.roleIds,
     isDeleted: model.isDeleted,
     locked: model.locked,
     createdAt: model.createdAt,
     updatedAt: model.updatedAt,
-    createdBy: model.createdBy,
     updatedBy: model.updatedBy,
     scope: model.scope,
 });
@@ -5444,6 +5493,7 @@ const dashboardLayoutToModel = (layout) => ({
     title: layout.title,
     description: layout.description || '',
     widgets: layout.widgets,
+    userId: layout.createdBy,
     roleIds: layout.roleIds,
     isDeleted: layout.isDeleted,
     locked: layout.locked,
@@ -5467,6 +5517,28 @@ const readUserRole = (sessionService) => {
     const candidate = sessionService.user;
     return candidate?.role;
 };
+/**
+ * Extracts role ids from a user entity returned by AXMUsersEntityService.
+ */
+const extractUserRoleIds = (user) => {
+    if (!user)
+        return [];
+    if (Array.isArray(user.roleIds) && user.roleIds.length > 0) {
+        return user.roleIds.filter((r) => typeof r === 'string');
+    }
+    if (Array.isArray(user.roles) && user.roles.length > 0) {
+        const ids = user.roles
+            .map((r) => (typeof r?.id === 'string' ? r.id : undefined))
+            .filter((id) => typeof id === 'string');
+        if (ids.length > 0)
+            return ids;
+    }
+    if (typeof user.roleId === 'string' && user.roleId)
+        return [user.roleId];
+    if (typeof user.role === 'string' && user.role)
+        return [user.role];
+    return [];
+};
 /**
  * Determines whether the given dashboard contains the provided user role.
  */
@@ -5573,18 +5645,90 @@ withComputed((state, sessionService = inject(AXPSessionService), layoutThemeServ
 })), 
 //#endregion
 //#region ----   Methods   ----
-withMethods((store, dashboardPopup = inject(AXMDashboardPopupService), dialogService = inject(AXDialogService), translationService = inject(AXTranslationService), widgetPickerService = inject(AXPWidgetPickerService), dashboardService = inject(AXMDashboardService), settingService = inject(AXPSettingService), sessionService = inject(AXPSessionService), layoutThemeService = inject(AXPLayoutThemeService)) => {
-    // Load dashboards from service - runs on init via effect
+withMethods((store, dashboardPopup = inject(AXMDashboardPopupService), dialogService = inject(AXDialogService), translationService = inject(AXTranslationService), widgetPickerService = inject(AXPWidgetPickerService), dashboardService = inject(AXMDashboardService), settingService = inject(AXPSettingService), sessionService = inject(AXPSessionService), layoutThemeService = inject(AXPLayoutThemeService), usersService = inject(AXMUsersEntityService)) => {
+    // Load dashboards from service - runs on init and when admin flag changes
     effect(() => {
-        loadDashboards();
+        const isAdmin = store.isUserAdmin();
+        loadDashboards(isAdmin);
     });
     /**
      * Loads dashboards and sets current dashboard based on user settings.
      */
-    async function loadDashboards() {
+    async function loadDashboards(isAdmin) {
         try {
             patchState(store, { isLoading: true });
-            const result = await dashboardService.query({ skip: 0, take: 100 });
+            // Build server-side filter based on admin flag and user identity/role
+            const userId = readUserId(sessionService);
+            let userRoleIds = [];
+            let userDisplayName;
+            let filter;
+            if (isAdmin) {
+                // Admins see tenant scoped dashboards
+                filter = {
+                    field: 'scope',
+                    operator: { type: 'equal' },
+                    value: 'T',
+                };
+            }
+            else {
+                // Non-admins see either:
+                // 1) User scoped dashboards they created
+                // 2) Tenant scoped dashboards where their role is included in roleIds
+                const orFilters = [];
+                if (userId) {
+                    try {
+                        const user = await usersService.getOne(userId);
+                        userRoleIds = extractUserRoleIds(user);
+                        userDisplayName = user?.displayName;
+                    }
+                    catch { }
+                }
+                if (userId) {
+                    // Match personal U dashboards by new field userId (preferred)
+                    orFilters.push({
+                        field: null,
+                        logic: 'and',
+                        operator: null,
+                        filters: [
+                            { field: 'scope', operator: { type: 'equal' }, value: 'U' },
+                            { field: 'userId', operator: { type: 'equal' }, value: userId },
+                        ],
+                    });
+                    // Backward compatibility: also match by legacy createdBy if present
+                    orFilters.push({
+                        field: null,
+                        logic: 'and',
+                        operator: null,
+                        filters: [
+                            { field: 'scope', operator: { type: 'equal' }, value: 'U' },
+                            { field: 'createdBy', operator: { type: 'equal' }, value: userId },
+                        ],
+                    });
+                }
+                if (userRoleIds.length > 0) {
+                    orFilters.push({
+                        field: null,
+                        logic: 'and',
+                        operator: null,
+                        filters: [
+                            { field: 'scope', operator: { type: 'equal' }, value: 'T' },
+                            { field: 'roleIds', operator: { type: 'in' }, value: userRoleIds },
+                        ],
+                    });
+                }
+                if (orFilters.length === 1) {
+                    filter = orFilters[0];
+                }
+                else if (orFilters.length > 1) {
+                    filter = {
+                        field: null,
+                        logic: 'or',
+                        operator: null,
+                        filters: orFilters,
+                    };
+                }
+            }
+            const result = await dashboardService.query({ skip: 0, take: 100, filter });
             const dashboardModels = result.items || [];
             const dashboards = dashboardModels.map(modelToDashboardLayout);
             const currentDashboardId = await settingService
@@ -5945,19 +6089,7 @@ withMethods((store, dashboardPopup = inject(AXMDashboardPopupService), dialogSer
         setIsAdmin(isAdmin) {
             patchState(store, { isAdmin });
         },
-        /**
-         * Filters dashboards by user scope and role permissions.
-         */
-        filterDashboardsByScope(isAdmin) {
-            const allDashboards = store.availableDashboards();
-            const userId = readUserId(sessionService);
-            const userRole = readUserRole(sessionService);
-            const filteredDashboards = filterDashboardsForUser(allDashboards, isAdmin, userId, userRole);
-            patchState(store, { dashboards: filteredDashboards });
-            if (filteredDashboards.length > 0 && !filteredDashboards.some((d) => d.id === store.currentDashboardId())) {
-                this.setCurrentDashboard(filteredDashboards[0].id);
-            }
-        },
+        // Client-side scope filtering is no longer needed; handled in query filter
         /**
          * Toggles lock state for current dashboard based on permission rules.
          */
@@ -6042,9 +6174,7 @@ class AXMDashboardHomeComponent extends AXPPageLayoutBaseComponent {
     // Effects
     #initEffect;
     // Private Methods
-    applyDashboardFiltering() {
-        this.store.filterDashboardsByScope(this.store.isUserAdmin());
-    }
+    applyDashboardFiltering() { }
     async confirmWidgetDelete(dashboardId, widgetId) {
         try {
             const dialogResult = await this.dialogService.confirm(await this.translateService.translateAsync('workflow.warning'), await this.translateService.translateAsync('workflow.confirm-delete'), 'danger', 'horizontal');
@@ -6132,7 +6262,6 @@ class AXMDashboardHomeComponent extends AXPPageLayoutBaseComponent {
         switch (command.name) {
             case 'new-dashboard':
                 await this.store.addDashboard();
-                this.applyDashboardFiltering();
                 this.recompute();
                 break;
             case 'new-widget':
@@ -6145,7 +6274,6 @@ class AXMDashboardHomeComponent extends AXPPageLayoutBaseComponent {
                 break;
             case 'delete':
                 await this.store.removeDashboard(this.store.selectedDashboard()?.id);
-                this.applyDashboardFiltering();
                 this.recompute();
                 break;
             case 'toggle-lock':
@@ -6207,5 +6335,5 @@ var AXPHomeDashboardSetting;
  * Generated bundle index. Do not edit.
  */
 
-export { AXMAddDashboardPopup, AXMAdvancedWeatherViewComponent, AXMAnalogClockComponent, AXMClockWidgetViewComponent, AXMConfigurationPopup, AXMDashboardHomeComponent, AXMDashboardManagementModule, AXMDashboardPopupService, AXMDashboardService, AXMDashboardServiceImpl, AXMDashboardStore, AXMDashboardWidgetWrapperComponent, AXMMinimalWeatherViewComponent, AXPAdvancedWeatherWidget, AXPAnalogClockWidget, AXPBarChartWidget, AXPBarChartWidgetViewComponent, AXPClockCalendarWidget, AXPClockCalendarWidgetViewComponent, AXPDonutChartWidget, AXPDonutChartWidgetViewComponent, AXPGaugeChartWidget, AXPGaugeChartWidgetViewComponent, AXPHomeDashboardSetting, AXPLineChartWidget, AXPLineChartWidgetViewComponent, AXPMinimalWeatherWidget, AXPStickyNoteWidget, AXPStickyNoteWidgetViewComponent, AXPWeatherApiAbstract, AXPWeatherApiMockService, AXPWeatherApiService, AXPWeatherWidget, AXPWeatherWidgetViewComponent, AXP_DATE_FORMAT_OPTIONS, AXP_TIMEZONE_OPTIONS, AXP_WIDGETS_CHART_CATEGORY, AXP_WIDGETS_UTILITY_CATEGORY, RootConfig, dashboardFactory };
+export { AXMAddDashboardPopup, AXMAdvancedWeatherViewComponent, AXMAnalogClockComponent, AXMClockWidgetViewComponent, AXMConfigurationPopup, AXMDashboardEntityModule, AXMDashboardHomeComponent, AXMDashboardManagementModule, AXMDashboardPopupService, AXMDashboardService, AXMDashboardServiceImpl, AXMDashboardStore, AXMDashboardWidgetWrapperComponent, AXMMinimalWeatherViewComponent, AXPAdvancedWeatherWidget, AXPAnalogClockWidget, AXPBarChartWidget, AXPBarChartWidgetViewComponent, AXPClockCalendarWidget, AXPClockCalendarWidgetViewComponent, AXPDonutChartWidget, AXPDonutChartWidgetViewComponent, AXPGaugeChartWidget, AXPGaugeChartWidgetViewComponent, AXPHomeDashboardSetting, AXPLineChartWidget, AXPLineChartWidgetViewComponent, AXPMinimalWeatherWidget, AXPStickyNoteWidget, AXPStickyNoteWidgetViewComponent, AXPWeatherApiAbstract, AXPWeatherApiMockService, AXPWeatherApiService, AXPWeatherWidget, AXPWeatherWidgetViewComponent, AXP_DATE_FORMAT_OPTIONS, AXP_TIMEZONE_OPTIONS, AXP_WIDGETS_CHART_CATEGORY, AXP_WIDGETS_UTILITY_CATEGORY, RootConfig, dashboardFactory };
 //# sourceMappingURL=acorex-modules-dashboard-management.mjs.map