@acorex/modules 20.7.16 → 20.7.19

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

@@ -9,6 +9,7 @@ import * as i0 from '@angular/core';
 import { Injectable, inject, Injector, NgModule, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, ChangeDetectorRef, HostBinding, viewChild, HostListener, InjectionToken, output, contentChild, afterNextRender, ViewEncapsulation, model } from '@angular/core';
 import * as i4 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
+import { AXPCommonMenuKeys, AXP_GLOBAL_SEARCH_CONFIG_TOKEN } from '@acorex/modules/common';
 import { firstValueFrom, interval, map, Observable, catchError, throwError, of, finalize, switchMap } from 'rxjs';
 import * as i1 from '@acorex/components/tooltip';
 import { AXTooltipModule } from '@acorex/components/tooltip';
@@ -23,7 +24,6 @@ import { AXFormatModule } from '@acorex/core/format';
 import * as i3 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { AXPopupService } from '@acorex/components/popup';
-import { AXP_GLOBAL_SEARCH_CONFIG_TOKEN } from '@acorex/modules/common';
 import { AXPWorkflowService } from '@acorex/platform/workflow';
 import { AXDonutChartComponent } from '@acorex/charts/donut-chart';
 import { AXGaugeChartComponent } from '@acorex/charts/gauge-chart';
@@ -162,34 +162,39 @@ class AXMMenuProvider {
         this.entityService = inject(AXPEntityService);
     }
     async provide(context) {
+        const isAuthorized = await firstValueFrom(this.sessionService.isAuthorized$);
+        if (!isAuthorized) {
+            return;
+        }
         const scope = RootConfig.config.i18n;
         const module = RootConfig.module;
         const appName = this.sessionService.application?.name;
-        context.addItems([
+        const contentMenu = context.find(AXPCommonMenuKeys.Content);
+        if (!contentMenu.exists) {
+            context.find(AXPCommonMenuKeys.Administration).addItems([
+                {
+                    name: AXPCommonMenuKeys.Content,
+                    priority: 10,
+                    text: '@general:menus.content.title',
+                    icon: 'fa-light fa-paint-brush',
+                    type: 'menu',
+                    children: [],
+                },
+            ]);
+        }
+        context.find(AXPCommonMenuKeys.Content).addItems([
             {
-                name: AXPDashboardManagementMenuKeys.Root,
-                priority: 9001,
-                text: '@dashboard-management:module.menus.root.title',
-                icon: RootConfig.module.icon,
+                name: AXPDashboardManagementMenuKeys.Dashboards,
+                text: '@dashboard-management:dashboards.menus.dashboards.title',
+                path: `${appName}/dashboards`,
+                icon: RootConfig.entities.dashboard.icon,
+                priority: 2,
                 policy: {
                     features: [RootConfig.module.name],
-                    permissions: [AXMPermissionsKeys.DashboardManagement.Management]
+                    permissions: [AXMPermissionsKeys.DashboardManagement.Management],
                 },
-                children: [
-                    {
-                        name: AXPDashboardManagementMenuKeys.Dashboards,
-                        text: '@dashboard-management:dashboards.menus.dashboards.title',
-                        path: `${this.sessionService.application?.name}/dashboard/management`,
-                        icon: RootConfig.entities.dashboard.icon,
-                        priority: 1,
-                    },
-                ],
             },
         ]);
-        const isAuthorized = await firstValueFrom(this.sessionService.isAuthorized$);
-        if (!isAuthorized) {
-            return;
-        }
     }
 }
 
@@ -4958,37 +4963,21 @@ const AXPWeatherWidget = {
     },
 };
 
-// Separate dashboard routes configuration
-const dashboardRoutes = [
-    {
-        path: 'dashboard',
-        loadComponent: () => Promise.resolve().then(function () { return homeDashboard; }).then((c) => c.AXMDashboardHomeComponent),
-    },
-    {
-        path: 'dashboard/management',
-        data: {
-            isAdmin: true,
-            //roles: ['admin'], // Add roles if needed
-            //permissions: ['manage_dashboard'], // Add required permissions if needed
-        },
-        loadComponent: () => Promise.resolve().then(function () { return homeDashboard; }).then((c) => c.AXMDashboardHomeComponent),
-    },
-];
 function createAppRoute() {
     const config = inject(AXP_ENTITY_CONFIG_TOKEN);
     return {
-        path: ':app/dashboard',
+        path: ':app',
         canActivate: [AXPAuthGuard],
         loadComponent: () => {
             return config.viewers.root();
         },
         children: [
             {
-                path: '',
+                path: 'dashboard',
                 loadComponent: () => Promise.resolve().then(function () { return homeDashboard; }).then((c) => c.AXMDashboardHomeComponent),
             },
             {
-                path: 'management',
+                path: 'dashboards',
                 data: {
                     isAdmin: true,
                 },