@acorex/modules 20.2.4-next.1 → 20.2.4-next.3

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

@@ -4,11 +4,10 @@ import * as i2 from '@acorex/platform/layout/builder';
 import { AXPWidgetsCatalog, AXPWidgetGroupEnum, AXPLayoutBuilderModule, AXPValueWidgetComponent, AXPColumnWidgetComponent, AXPLayoutWidgetComponent } from '@acorex/platform/layout/builder';
 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';
+import { AXMEntityCrudServiceImpl, AXPEntityService, AXPEntityResolver, entityMasterCrudActions, entityMasterRecordActions, AXPEntityDefinitionRegistryService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import * as i1 from '@acorex/platform/workflow';
 import { createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule, AXPWorkflowService } from '@acorex/platform/workflow';
 import { AXPSessionService, AXPPermissionDefinitionService } from '@acorex/platform/auth';
-import { AXDataSource } from '@acorex/cdk/common';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import * as i3$1 from '@acorex/core/translation';
@@ -17,6 +16,7 @@ import { AXP_USER_AVATAR_PROVIDER, AXPThemeLayoutBlockComponent } from '@acorex/
 import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY } from '@acorex/platform/widgets';
 import { AXPopupService } from '@acorex/components/popup';
 import { AXP_DATASOURCE_DEFINITION_PROVIDER, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER } from '@acorex/platform/core';
+import { AXDataSource } from '@acorex/cdk/common';
 import * as i1$1 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { AXFormModule } from '@acorex/components/form';
@@ -58,17 +58,17 @@ const RootConfig = {
             icon: 'fa-light fa-default',
         },
         users: {
-            name: 'users',
+            name: 'User',
             title: `t("users", { scope: "${config.i18n}" })`,
             icon: 'fa-light fa-users',
         },
         roles: {
-            name: 'roles',
+            name: 'Role',
             title: `t("roles",{scope:"${config.i18n}"})`,
             icon: 'fa-light fa-key',
         },
         profile: {
-            name: 'profile',
+            name: 'Profile',
             title: `t("profile",{scope:"${config.i18n}"})`,
             icon: 'fa-light fa-user',
         },
@@ -753,26 +753,32 @@ 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}" })`,
         },
-        relatedEntities: [],
+        plugins: [
+            { name: 'history' },
+            { name: 'lock' },
+            { name: 'compare' },
+            { name: 'extra-properties' },
+        ],
         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 +805,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 +830,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}" })`,
@@ -912,38 +840,23 @@ async function factory$2(injector) {
                         type: AXPWidgetsCatalog.text,
                     },
                 },
-                options: {
-                    filter: {
-                        advance: {
-                            enabled: true,
-                        },
-                    },
-                    sort: {
-                        enabled: true,
-                    },
-                },
             },
             {
-                name: 'roles',
+                name: 'roleIds',
                 title: `t("roles", { scope: "${i18n}" })`,
                 groupId: 'authorizations',
                 schema: {
-                    dataType: 'string',
+                    dataType: 'object',
                     interface: {
-                        type: AXPWidgetsCatalog.select,
+                        type: AXPWidgetsCatalog.lookup,
                         options: {
-                            dataSource: new AXDataSource({
-                                load: async () => {
-                                    const rolesEntity = await entityResolver.get(RootConfig.module.name, 'roles');
-                                    const roles = await (rolesEntity?.queries.list?.execute)({ skip: 0, take: 100 });
-                                    return roles;
-                                },
-                                pageSize: 100,
-                                key: 'id',
-                            }),
-                            valueField: 'id',
-                            textField: 'title',
+                            entity: 'SecurityManagement.Role',
                             multiple: true,
+                            look: 'select',
+                            expose: [
+                                { source: 'id', target: 'roles.{id}' },
+                                { source: 'title', target: 'roles.{title}' },
+                            ],
                         },
                     },
                 },
@@ -956,10 +869,8 @@ async function factory$2(injector) {
         ],
         columns: [
             { name: 'username' },
-            { name: 'firstName' },
-            { name: 'lastName' },
-            { name: 'nationalCode' },
-            { name: 'mobile' },
+            { name: 'displayName' },
+            { name: 'roleIds', options: { dataPath: 'roles.{title}' } },
         ],
         commands: {
             create: {
@@ -1000,7 +911,7 @@ async function factory$2(injector) {
                 create: {
                     sections: [
                         {
-                            id: 'info',
+                            id: 'basic-info',
                         },
                         {
                             id: 'authorizations',
@@ -1018,7 +929,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'firstName',
+                            name: 'displayName',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1028,37 +939,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'lastName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'nationalCode',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'mobile',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'roles',
+                            name: 'roleIds',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1082,7 +963,7 @@ async function factory$2(injector) {
                 update: {
                     sections: [
                         {
-                            id: 'info',
+                            id: 'basic-info',
                         },
                         {
                             id: 'authorizations',
@@ -1100,17 +981,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'firstName',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'lastName',
+                            name: 'displayName',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1140,7 +1011,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'roles',
+                            name: 'roleIds',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1162,10 +1033,10 @@ async function factory$2(injector) {
                     ],
                 },
                 single: {
-                    title: '{{firstName}} {{lastName}}',
+                    title: '{{displayName}}',
                     sections: [
                         {
-                            id: 'info',
+                            id: 'basic-info',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1176,7 +1047,6 @@ async function factory$2(injector) {
                         },
                         {
                             id: 'authorizations',
-                            collapsed: true,
                             layout: {
                                 positions: {
                                     lg: {
@@ -1198,37 +1068,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: {
@@ -1248,7 +1088,7 @@ async function factory$2(injector) {
                             },
                         },
                         {
-                            name: 'roles',
+                            name: 'roleIds',
                             layout: {
                                 positions: {
                                     lg: {
@@ -1258,54 +1098,19 @@ async function factory$2(injector) {
                             },
                         },
                     ],
-                    actions: [],
+                    actions: [...entityMasterRecordActions()],
                 },
                 list: {
-                    actions: [
-                        {
-                            title: `t("create", { scope: "common" })`,
-                            command: 'create-entity',
-                            priority: 'primary',
-                            type: 'create',
-                            scope: AXPEntityCommandScope.TypeLevel,
-                        },
-                        // {
-                        //   title: `t("deleteItems", {scope: "common"})`,
-                        //   command: 'delete-entity',
-                        //   priority: 'primary',
-                        //   type: 'delete',
-                        //   scope: AXPEntityCommandScope.Selected,
-                        // },
-                        {
-                            title: `t("detail", {scope: "common"})`,
-                            command: { name: 'open-entity', options: { test: 'test' } },
-                            priority: 'secondary',
-                            type: 'view',
-                            scope: AXPEntityCommandScope.Individual,
-                        },
-                        // {
-                        //   title: `t("delete", {scope: "common"})`,
-                        //   command: 'delete-entity',
-                        //   priority: 'secondary',
-                        //   type: 'delete',
-                        //   scope: AXPEntityCommandScope.Individual,
-                        // },
-                    ],
+                    actions: [...entityMasterCrudActions()],
                     views: [
-                        {
-                            name: 'all',
-                            title: `t("allItem", {scope: "common"})`,
-                            fixed: true,
-                            columns: [],
-                            conditions: [],
-                            sorts: [],
-                        },
+                        createAllQueryView({
+                            sorts: [{ name: 'displayName', dir: 'asc' }],
+                        }),
                     ],
                 },
             },
         },
     };
-    const x = entityDef.properties.find((x) => x.name === 'roles')?.schema.interface?.options;
     return entityDef;
 }
 
@@ -1587,6 +1392,7 @@ async function factory(injector) {
         name: RootConfig.entities.roles.name,
         source: '',
         title: RootConfig.entities.roles.title,
+        icon: 'fa-light fa-key',
         formats: {
             individual: `t("role", { scope: "${i18n}" })`,
             plural: `t("roles", { scope: "${i18n}" })`,
@@ -2137,11 +1943,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',
         };
@@ -2309,7 +2116,7 @@ class AXMUsersDataSourceDefinition {
                                 return {
                                     items: res.items.map((item) => ({
                                         ...item,
-                                        displayName: `${item.firstName} ${item.lastName}`,
+                                        displayName: item.displayName,
                                     })),
                                     total: res.total,
                                 };