@acorex/modules 20.2.4-next.0 → 20.2.4-next.2

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

@@ -1,7 +1,7 @@
+import { AXMDeviceSessionsService, AXMDeviceSessionsServiceImpl } from '@acorex/modules/auth';
 import { createAllQueryView, AXPEntityCommandScope, AXPEntityQueryType, AXPSearchCommandProvider, AXPRefreshEvent, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
 import * as i2 from '@acorex/platform/layout/builder';
 import { AXPWidgetsCatalog, AXPWidgetGroupEnum, AXPLayoutBuilderModule, AXPValueWidgetComponent, AXPColumnWidgetComponent, AXPLayoutWidgetComponent } from '@acorex/platform/layout/builder';
-import { AXMDeviceSessionsService, AXMDeviceSessionsServiceImpl } from '@acorex/modules/auth';
 import * as i0 from '@angular/core';
 import { NgModule, Injectable, inject, Injector, signal, input, output, computed, ViewEncapsulation, Component, ViewChild, effect, ChangeDetectionStrategy } from '@angular/core';
 import { AXMEntityCrudServiceImpl, AXPEntityService, AXPEntityResolver, AXPEntityDefinitionRegistryService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
@@ -343,7 +343,7 @@ async function factory$3(injector) {
             },
             list: {
                 execute: async (e) => {
-                    const res = await dataService.query({ skip: e.skip, take: e.take, filter: e.filter });
+                    const res = await dataService.query(e);
                     console.log('res', res);
                     return res;
                 },
@@ -655,7 +655,7 @@ class AXMEntityProvider {
     }
     preload() {
         const { entities, module } = RootConfig;
-        return [entities.users.name, entities.roles.name].map((entity) => ({ module: module.name, entity }));
+        return [entities.users.name, entities.roles.name, entities.deviceSessions.name].map((entity) => ({ module: module.name, entity }));
     }
     async get(moduleName, entityName) {
         const { entities, module } = RootConfig;
@@ -753,6 +753,7 @@ async function factory$2(injector) {
         name: RootConfig.entities.users.name,
         source: '',
         title: RootConfig.entities.users.title,
+        icon: 'fa-light fa-user',
         formats: {
             individual: `t("user", { scope: "${i18n}" })`,
             plural: `t("users", { scope: "${i18n}" })`,
@@ -760,19 +761,19 @@ async function factory$2(injector) {
         relatedEntities: [],
         groups: [
             {
-                id: 'info',
-                title: `t("information", { scope: "${i18n}" })`,
+                id: 'basic-info',
+                title: '@general:terms.basic-info',
             },
             {
                 id: 'authorizations',
-                title: `t("authorizations", { scope: "${i18n}" })`,
+                title: `@${i18n}.authorizations`,
             },
         ],
         properties: [
             {
                 name: 'username',
                 title: `t("username", { scope: "${i18n}" })`,
-                groupId: 'info',
+                groupId: 'basic-info',
                 options: {
                     filter: {
                         advance: {
@@ -799,9 +800,9 @@ async function factory$2(injector) {
                 ],
             },
             {
-                name: 'firstName',
-                title: `t("firstName", { scope: "${i18n}" })`,
-                groupId: 'info',
+                name: 'displayName',
+                title: `@general:terms.display-name`,
+                groupId: 'basic-info',
                 options: {
                     sort: {
                         enabled: true,
@@ -824,84 +825,6 @@ async function factory$2(injector) {
                     },
                 ],
             },
-            {
-                name: 'lastName',
-                title: `t("lastName", { scope: "${i18n}" })`,
-                groupId: 'info',
-                schema: {
-                    dataType: 'string',
-                    interface: {
-                        type: AXPWidgetsCatalog.text,
-                    },
-                },
-                options: {
-                    filter: {
-                        advance: {
-                            enabled: true,
-                        },
-                    },
-                    sort: {
-                        enabled: true,
-                    },
-                },
-                validations: [
-                    {
-                        rule: 'required',
-                    },
-                ],
-            },
-            {
-                name: 'nationalCode',
-                title: `t("nationalCode", { scope: "${i18n}" })`,
-                groupId: 'info',
-                schema: {
-                    dataType: 'string',
-                    interface: {
-                        type: AXPWidgetsCatalog.text,
-                    },
-                },
-                options: {
-                    filter: {
-                        advance: {
-                            enabled: true,
-                        },
-                    },
-                    sort: {
-                        enabled: true,
-                    },
-                },
-                validations: [
-                    {
-                        rule: 'required',
-                    },
-                ],
-            },
-            {
-                name: 'mobile',
-                title: `t("mobile", { scope: "${i18n}" })`,
-                groupId: 'info',
-                schema: {
-                    dataType: 'string',
-                    interface: {
-                        type: AXPWidgetsCatalog.text,
-                        options: {
-                            hasLabel: false,
-                            placeholder: ``,
-                        },
-                    },
-                },
-                options: {
-                    filter: {
-                        advance: {
-                            enabled: true,
-                        },
-                    },
-                    sort: {
-                        enabled: true,
-                    },
-                },
-                validations: [],
-            },
             {
                 name: 'password',
                 title: `t("password", { scope: "${i18n}" })`,
@@ -956,10 +879,8 @@ async function factory$2(injector) {
         ],
         columns: [
             { name: 'username' },
-            { name: 'firstName' },
-            { name: 'lastName' },
-            { name: 'nationalCode' },
-            { name: 'mobile' },
+            { name: 'displayName' },
+            { name: 'roles' },
         ],
         commands: {
             create: {
@@ -989,7 +910,8 @@ async function factory$2(injector) {
             },
             list: {
                 execute: async (e) => {
-                    return await dataService.query({ skip: e.skip, take: e.take, filter: e.filter });
+                    console.log({ e });
+                    return await dataService.query(e);
                 },
                 type: AXPEntityQueryType.List,
             },
@@ -999,7 +921,7 @@ async function factory$2(injector) {
                 create: {
                     sections: [
                         {
-                            id: 'info',
+                            id: 'basic-info',
                         },
                         {
                             id: 'authorizations',
@@ -1017,37 +939,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'firstName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'lastName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'nationalCode',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'mobile',
+                            name: 'displayName',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1081,7 +973,7 @@ async function factory$2(injector) {
                 update: {
                     sections: [
                         {
-                            id: 'info',
+                            id: 'basic-info',
                         },
                         {
                             id: 'authorizations',
@@ -1099,17 +991,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'firstName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'lastName',
+                            name: 'displayName',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1164,7 +1046,7 @@ async function factory$2(injector) {
                     title: '{{firstName}} {{lastName}}',
                     sections: [
                         {
-                            id: 'info',
+                            id: 'basic-info',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1175,6 +1057,7 @@ async function factory$2(injector) {
                         },
                         {
                             id: 'authorizations',
+                            collapsed: true,
                             layout: {
                                 positions: {
                                     lg: {
@@ -1196,37 +1079,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'firstName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'lastName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'nationalCode',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'mobile',
+                            name: 'displayName',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1707,7 +1560,7 @@ async function factory(injector) {
             },
             list: {
                 execute: async (e) => {
-                    return await dataService.query({ skip: e.skip, take: e.take, filter: e.filter });
+                    return await dataService.query(e);
                 },
                 type: AXPEntityQueryType.List,
             },
@@ -2135,11 +1988,12 @@ class AXMUserAvatarProvider {
         if (!user) {
             throw new Error(`User not found for ${userId}`);
         }
+        const [firstName, lastName] = user.displayName.split(' ');
         return {
             id: user.id,
             username: user.username,
-            firstName: user.firstName,
-            lastName: user.lastName,
+            firstName: firstName,
+            lastName: lastName,
             status: 'online',
             avatarUrl: 'https://via.placeholder.com/150',
         };
@@ -2307,7 +2161,7 @@ class AXMUsersDataSourceDefinition {
                                 return {
                                     items: res.items.map((item) => ({
                                         ...item,
-                                        displayName: `${item.firstName} ${item.lastName}`,
+                                        displayName: item.displayName,
                                     })),
                                     total: res.total,
                                 };