@acorex-platform/module-tenant-management-client 0.0.59 → 0.0.61

package/fesm2022/acorex-platform-module-tenant-management-client.mjs

@@ -1,11 +1,14 @@
-import { AXPMiddlewareAbortError, AXPEntityService, AXP_ENTITY_STORAGE_MIDDLEWARE } from '@acorex-platform/framework-client/layout/entity';
+import { AXPMiddlewareAbortError, AXPEntityService, configureEntityListColumnsSettingsMigrateDrop, configureEntityListColumnsSettingsVersion, AXP_ENTITY_STORAGE_MIDDLEWARE } from '@acorex-platform/framework-client/layout/entity';
 import { AXP_FEATURE_DEFINITION_PROVIDER, AXP_CONTEXT_DEFINITION_PROVIDER } from '@acorex-platform/framework-client/core';
 import { AXPSearchCommandProvider, createEntitySearchCommand, AXP_STATUS_PROVIDERS, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex-platform/framework-client/common';
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex-platform/framework-client/auth';
+import { provideCommandSetups } from '@acorex-platform/framework-client/runtime';
+import { RootConfig, AXP_TENANT_USER_ADMIN_SCOPE_PARAM, resolveTenantUserAdminScopeFromUrl, AXP_TENANT_USER_ADMIN_SCOPE_HEADER, AXMTenantManagementFeatureKeys, AXPApplicationsPlatformPermissionKeys, AXP_TENANT_USERS_VIEW, AXMTenantManagementMenuKeys, AXM_TENANT_APPROVE_REQUEST_COMMAND, AXM_TENANT_REJECT_REQUEST_COMMAND } from '@acorex-platform/module-tenant-management-client/contracts';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { Injectable, inject, NgModule } from '@angular/core';
-import { AXPStatusProvider, AXPSystemStatusType, systemStatusToDefinition } from '@acorex-platform/framework-shared/core';
-import { RootConfig, AXPApplicationsPlatformPermissionKeys, AXMTenantManagementMenuKeys } from '@acorex-platform/module-tenant-management-client/contracts';
+import { inject, Injectable, NgModule, InjectionToken } from '@angular/core';
+import { AXPStatusProvider, AXPSystemStatusType, systemStatusToDefinition, AXPWidgetsList } from '@acorex-platform/framework-shared/core';
+import { Router } from '@angular/router';
 import { AXPCommonPermissionGroupKeys, AXPCommonMenuKeys } from '@acorex-platform/module-common-client/contracts';
 import { AXM_TENANT_CONTEXT_DEFINITIONS } from '@acorex-platform/module-tenant-management-client/contracts';
 
@@ -38,13 +41,14 @@ class AXMTenantStatusProvider extends AXPStatusProvider {
                 title: '@tenant-management:tenants.states.pending',
                 generateView: true,
             }),
+            systemStatusToDefinition(AXPSystemStatusType.Rejected, {
+                title: '@tenant-management:tenants.states.rejected',
+                generateView: true,
+            }),
         ];
         this.transitions = [
-            {
-                from: AXPSystemStatusType.Pending,
-                to: AXPSystemStatusType.Active,
-                title: '@tenant-management:tenants.transitions.activate',
-            },
+            // Pending → Active / Rejected: use primary Approve / Reject request actions only
+            // (status-chip UpdateStatus would skip invite / email / provisioning).
             {
                 from: AXPSystemStatusType.Active,
                 to: AXPSystemStatusType.Inactive,
@@ -258,19 +262,136 @@ const tenantUserAccountHolderMiddleware = {
 };
 //#endregion
 
+//#region ----- Imports -----
+//#endregion
+//#region ----- Tenant Users admin scope (client) -----
+const TENANT_USER_ENTITY_NAME = `${RootConfig.module.name}.${RootConfig.entities.tenantUser.name}`;
+const TENANT_USER_APP_ACCESS_ENTITY_NAME = `${RootConfig.module.name}.${RootConfig.entities.tenantUserAppAccess.name}`;
+function isTenantUserAdminScopeEntity(entityName) {
+    return (entityName === TENANT_USER_ENTITY_NAME || entityName === TENANT_USER_APP_ACCESS_ENTITY_NAME);
+}
+function withTenantUserAdminScopeParam(params, scope) {
+    return {
+        ...(params ?? {}),
+        [AXP_TENANT_USER_ADMIN_SCOPE_PARAM]: scope,
+    };
+}
+//#endregion
+
+//#region ----- Imports -----
+//#endregion
+//#region ----- Tenant Users admin scope (client entity middleware) -----
+/**
+ * Injects explicit `tenantUserAdminScope=current-tenant` on TenantUser /
+ * TenantUserAppAccess queries when the open surface carries `view=tenant-users`
+ * — not for generic / PC / shared entity routes without that view.
+ */
+const tenantUserAdminScopeMiddleware = {
+    target: {
+        ops: ['query'],
+        order: 8,
+    },
+    execute: async (ctx, next) => {
+        if (!isTenantUserAdminScopeEntity(ctx.entityName)) {
+            await next();
+            return;
+        }
+        const router = inject(Router);
+        const scope = resolveTenantUserAdminScopeFromUrl(router.url);
+        if (scope === 'current-tenant' && ctx.request) {
+            ctx.request = {
+                ...ctx.request,
+                params: withTenantUserAdminScopeParam(ctx.request.params, scope),
+            };
+        }
+        await next();
+    },
+};
+//#endregion
+
+//#region ----- Imports -----
+//#endregion
+//#region ----- Tenant Users admin scope interceptor -----
+/**
+ * Attaches admin-scope header for TenantUser / TenantUserAppAccess runtime
+ * calls so getOne / update / delete honor the same Tenant Users operation
+ * as the open list/detail surface.
+ */
+class TenantUserAdminScopeInterceptor {
+    constructor() {
+        this.router = inject(Router);
+    }
+    intercept(request, next) {
+        if (!this.targetsTenantUserEntities(request)) {
+            return next.handle(request);
+        }
+        const scope = resolveTenantUserAdminScopeFromUrl(this.router.url);
+        if (scope !== 'current-tenant') {
+            return next.handle(request);
+        }
+        return next.handle(request.clone({
+            setHeaders: {
+                [AXP_TENANT_USER_ADMIN_SCOPE_HEADER]: scope,
+            },
+        }));
+    }
+    targetsTenantUserEntities(request) {
+        const body = request.body;
+        if (body && typeof body === 'object' && !Array.isArray(body)) {
+            const record = body;
+            const input = record['input'];
+            const entityFromInput = input && typeof input === 'object' && !Array.isArray(input)
+                ? input['entity']
+                : undefined;
+            const entity = record['entity'] ?? entityFromInput;
+            if (typeof entity === 'string' && isTenantUserAdminScopeEntity(entity)) {
+                return true;
+            }
+        }
+        const entityQuery = request.params?.get?.('entity');
+        if (typeof entityQuery === 'string' && isTenantUserAdminScopeEntity(entityQuery)) {
+            return true;
+        }
+        return (request.url.includes('TenantUserAppAccess') || request.url.includes('/TenantUser'));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: TenantUserAdminScopeInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: TenantUserAdminScopeInterceptor }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: TenantUserAdminScopeInterceptor, decorators: [{
+            type: Injectable
+        }] });
+
 //#region ----   Middleware Exports   ----
 //#endregion
 
-//#region ----   Imports   ----
+//#region ---- Imports ----
 //#endregion
-//#region ----   Feature Definition Provider   ----
+//#region ---- Feature Definition Provider ----
 /**
  * Tenant Management Feature Definition Provider.
  * Provides feature definitions for the Tenant Management module.
  */
 class AXMTenantManagementFeatureDefinitionProvider {
     async provide(context) {
-        // Management feature removed - module name is used directly as feature key
+        const i18n = RootConfig.config.i18n;
+        context.addFeature(AXMTenantManagementFeatureKeys.ManagePlatformTenants, {
+            title: `@${i18n}:features.manage-platform-tenants.title`,
+            description: `@${i18n}:features.manage-platform-tenants.description`,
+            defaultValue: false,
+            type: 'boolean',
+        });
+        context.addFeature(AXMTenantManagementFeatureKeys.TenantConsole, {
+            title: `@${i18n}:features.tenant-console.title`,
+            description: `@${i18n}:features.tenant-console.description`,
+            defaultValue: false,
+            type: 'boolean',
+        });
+        context.addFeature(AXMTenantManagementFeatureKeys.InviteMultiApplication, {
+            title: `@${i18n}:features.invite-multi-application.title`,
+            description: `@${i18n}:features.invite-multi-application.description`,
+            defaultValue: false,
+            type: 'boolean',
+        });
     }
 }
 //#endregion
@@ -305,6 +426,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
 
 //#region ---- Imports ----
 //#endregion
+//#region ---- Constants ----
+/** Stable capability keys (avoid importing SecurityManagement client — cycle risk). */
+const MAINTAIN_USERS_AND_ROLES = 'Administration:Permission:MaintainUsersAndRoles';
+const MANAGE_SESSIONS = 'Administration:Permission:ManageSessions';
+const SECURITY_MODULE = 'SecurityManagement';
+const DEVICE_SESSIONS_ENTITY = 'DeviceSessions';
+/** Explicit tenant-sessions list view (operation-owned scope; not inferred from TM app id). */
+const TENANT_SESSIONS_VIEW = 'tenant-sessions';
+/**
+ * Durable Tenant Users operation signal on the menu path.
+ * Prefer `tenantUserAdminScope=` over `view=` alone — entity list rewrites
+ * unknown/hidden views to `all` and would drop a view-only signal.
+ */
+const TENANT_USERS_OPERATION_QUERY = `${AXP_TENANT_USER_ADMIN_SCOPE_PARAM}=current-tenant&view=${AXP_TENANT_USERS_VIEW}`;
+//#endregion
 //#region ---- Menu Provider ----
 class AXMTenantManagementModuleMenuProvider {
     constructor() {
@@ -312,6 +448,7 @@ class AXMTenantManagementModuleMenuProvider {
     }
     async provide(context) {
         const module = RootConfig.module;
+        // Platform → Tenants: Platform Console only (ADR-TEN-001 — must not appear in TM).
         context.find(AXPCommonMenuKeys.Platform).addItems([
             {
                 name: AXMTenantManagementMenuKeys.Tenants,
@@ -320,12 +457,52 @@ class AXMTenantManagementModuleMenuProvider {
                 icon: RootConfig.entities.tenant.icon,
                 priority: 4,
                 policy: {
-                    features: [module.name],
+                    features: [AXMTenantManagementFeatureKeys.ManagePlatformTenants],
                     permissions: [AXPApplicationsPlatformPermissionKeys.MaintainTenants],
                 },
             },
             { name: `${AXMTenantManagementMenuKeys.Root}:divider`, text: '', type: 'break', priority: 5 },
         ]);
+        // TM Administration surfaces (ADR-TEN-001 D-04 / D-07) — TM application only.
+        // Gated by TenantConsole (TM Standard edition); not by TenantManagement module alone
+        // (PC also enables the module for Platform → Tenants).
+        // Application Users remain under Administration → Security → Users (SecurityManagement provider).
+        context.find(AXPCommonMenuKeys.Administration).addItems([
+            {
+                name: AXMTenantManagementMenuKeys.TenantUsers,
+                text: RootConfig.entities.tenantUser.titlePlural,
+                // Explicit Tenant Users operation (current-tenant scope; not Application.code).
+                path: `${this.entityService.createPath(module.name, RootConfig.entities.tenantUser.name)}?${TENANT_USERS_OPERATION_QUERY}`,
+                icon: RootConfig.entities.tenantUser.icon,
+                priority: 20,
+                policy: {
+                    features: [AXMTenantManagementFeatureKeys.TenantConsole],
+                    permissions: [MAINTAIN_USERS_AND_ROLES],
+                },
+            },
+            {
+                name: AXMTenantManagementMenuKeys.TenantApplicationAccess,
+                text: RootConfig.entities.tenantUserAppAccess.titlePlural,
+                path: `${this.entityService.createPath(module.name, RootConfig.entities.tenantUserAppAccess.name)}?${TENANT_USERS_OPERATION_QUERY}`,
+                icon: RootConfig.entities.tenantUserAppAccess.icon,
+                priority: 21,
+                policy: {
+                    features: [AXMTenantManagementFeatureKeys.TenantConsole],
+                    permissions: [MAINTAIN_USERS_AND_ROLES],
+                },
+            },
+            {
+                name: AXMTenantManagementMenuKeys.TenantSessions,
+                text: `@${RootConfig.config.i18n}:module.menus.tenant-sessions.title`,
+                path: `${this.entityService.createPath(SECURITY_MODULE, DEVICE_SESSIONS_ENTITY)}?view=${TENANT_SESSIONS_VIEW}`,
+                icon: 'fa-light fa-laptop-mobile',
+                priority: 22,
+                policy: {
+                    features: [AXMTenantManagementFeatureKeys.TenantConsole, SECURITY_MODULE],
+                    permissions: [MANAGE_SESSIONS],
+                },
+            },
+        ]);
     }
 }
 //#endregion
@@ -374,6 +551,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
             type: Injectable
         }] });
 
+//#region ----- Boot configure (once) -----
+/**
+ * Stale AppAccess list prefs pinned `tenantUser.userId` / bare `userDisplayName`
+ * text columns; list now uses `userId` lookup (display via userDisplayName expose).
+ */
+configureEntityListColumnsSettingsMigrateDrop([
+    'tenantUser.userId',
+    'tenantUserId',
+    'userDisplayName',
+]);
+configureEntityListColumnsSettingsVersion(5);
+//#endregion
 // Entity Modules
 class AXMTenantManagementModule {
     constructor() { }
@@ -396,6 +585,16 @@ class AXMTenantManagementModule {
                 useValue: tenantUserAccountHolderMiddleware,
                 multi: true,
             },
+            {
+                provide: AXP_ENTITY_STORAGE_MIDDLEWARE,
+                useValue: tenantUserAdminScopeMiddleware,
+                multi: true,
+            },
+            {
+                provide: HTTP_INTERCEPTORS,
+                useClass: TenantUserAdminScopeInterceptor,
+                multi: true,
+            },
             // Provider references (now using tokens)
             {
                 provide: AXP_FEATURE_DEFINITION_PROVIDER,
@@ -427,6 +626,16 @@ class AXMTenantManagementModule {
                 useClass: AXMTenantManagementContextDefinitionProvider,
                 multi: true,
             },
+            provideCommandSetups([
+                {
+                    key: AXM_TENANT_APPROVE_REQUEST_COMMAND,
+                    command: () => import('./acorex-platform-module-tenant-management-client-approve-tenant-request.command-D18-n5Lc.mjs').then((c) => c.AXPApproveTenantRequestCommand),
+                },
+                {
+                    key: AXM_TENANT_REJECT_REQUEST_COMMAND,
+                    command: () => import('./acorex-platform-module-tenant-management-client-reject-tenant-request.command-CKSHPw1a.mjs').then((c) => c.AXPRejectTenantRequestCommand),
+                },
+            ]),
         ] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMTenantManagementModule, decorators: [{
@@ -454,6 +663,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
                             useValue: tenantUserAccountHolderMiddleware,
                             multi: true,
                         },
+                        {
+                            provide: AXP_ENTITY_STORAGE_MIDDLEWARE,
+                            useValue: tenantUserAdminScopeMiddleware,
+                            multi: true,
+                        },
+                        {
+                            provide: HTTP_INTERCEPTORS,
+                            useClass: TenantUserAdminScopeInterceptor,
+                            multi: true,
+                        },
                         // Provider references (now using tokens)
                         {
                             provide: AXP_FEATURE_DEFINITION_PROVIDER,
@@ -485,13 +704,130 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
                             useClass: AXMTenantManagementContextDefinitionProvider,
                             multi: true,
                         },
+                        provideCommandSetups([
+                            {
+                                key: AXM_TENANT_APPROVE_REQUEST_COMMAND,
+                                command: () => import('./acorex-platform-module-tenant-management-client-approve-tenant-request.command-D18-n5Lc.mjs').then((c) => c.AXPApproveTenantRequestCommand),
+                            },
+                            {
+                                key: AXM_TENANT_REJECT_REQUEST_COMMAND,
+                                command: () => import('./acorex-platform-module-tenant-management-client-reject-tenant-request.command-CKSHPw1a.mjs').then((c) => c.AXPRejectTenantRequestCommand),
+                            },
+                        ]),
                     ],
                 }]
         }], ctorParameters: () => [] });
 
+//#region ----- Tenant extra field providers -----
+/**
+ * Multi provider: each demo product (e.g. Safetyminder) supplies field defs
+ * that merge into Tenant.extra on the public request form / PC layout.
+ */
+const AXP_TENANT_EXTRA_FIELD_DEFINITIONS = new InjectionToken('AXP_TENANT_EXTRA_FIELD_DEFINITIONS');
+//#endregion
+
+//#region ----- Build layout for Tenant.extra -----
+/** Flattens multi-provider arrays into one field list (later providers override by name). */
+function mergeTenantExtraFieldDefinitions(batches) {
+    const byName = new Map();
+    for (const batch of batches) {
+        if (!Array.isArray(batch)) {
+            continue;
+        }
+        for (const field of batch) {
+            const name = String(field?.name ?? '').trim();
+            if (!name) {
+                continue;
+            }
+            byName.set(name, field);
+        }
+    }
+    return [...byName.values()];
+}
+/**
+ * Builds an `axp-layout-renderer` tree bound under context path `extra.*`.
+ */
+function buildTenantExtraFieldsLayout(fields) {
+    if (!fields.length) {
+        return null;
+    }
+    return {
+        type: AXPWidgetsList.Layouts.FlexLayout,
+        mode: 'edit',
+        options: {
+            flexDirection: 'column',
+            gap: '16px',
+        },
+        children: fields.map((field) => buildFieldNode(field)),
+    };
+}
+function buildFieldNode(field) {
+    const editorType = (field.editorType ?? AXPWidgetsList.Editors.TextBox).trim();
+    const path = `extra.${field.name}`;
+    const validations = field.required ? [{ rule: 'required' }] : [];
+    const editorOptions = {
+        placeholder: field.placeholder,
+        validations,
+    };
+    if (editorType === AXPWidgetsList.Editors.SelectBox && Array.isArray(field.selectOptions)) {
+        editorOptions['dataSource'] = field.selectOptions;
+        editorOptions['valueField'] = 'id';
+        editorOptions['textField'] = 'title';
+    }
+    return {
+        type: AXPWidgetsList.Layouts.FormField,
+        mode: 'edit',
+        options: {
+            label: field.title,
+            showLabel: true,
+        },
+        children: [
+            {
+                type: editorType,
+                mode: 'edit',
+                path,
+                name: field.name,
+                options: editorOptions,
+            },
+        ],
+    };
+}
+/**
+ * Meta-data-editor `listMeta` shape (interface is a JSON widget tree string).
+ */
+function toTenantExtraMetaDataList(fields) {
+    return fields.map((field) => {
+        const editorType = (field.editorType ?? AXPWidgetsList.Editors.TextBox).trim();
+        const editorNode = {
+            type: editorType,
+            mode: 'edit',
+            path: field.name,
+            name: field.name,
+            options: {
+                placeholder: field.placeholder,
+                ...(editorType === AXPWidgetsList.Editors.SelectBox && Array.isArray(field.selectOptions)
+                    ? {
+                        dataSource: field.selectOptions,
+                        valueField: 'id',
+                        textField: 'title',
+                    }
+                    : {}),
+            },
+        };
+        return {
+            name: field.name,
+            title: field.title,
+            interface: JSON.stringify({
+                children: [{ children: [editorNode] }],
+            }),
+        };
+    });
+}
+//#endregion
+
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXMTenantManagementFeatureDefinitionProvider, AXMTenantManagementModule, AXMTenantManagementModuleMenuProvider, AXMTenantSearchCommandProvider, AXMTenantSettingProvider };
+export { AXMTenantManagementFeatureDefinitionProvider, AXMTenantManagementModule, AXMTenantManagementModuleMenuProvider, AXMTenantSearchCommandProvider, AXMTenantSettingProvider, AXP_TENANT_EXTRA_FIELD_DEFINITIONS, buildTenantExtraFieldsLayout, mergeTenantExtraFieldDefinitions, toTenantExtraMetaDataList };
 //# sourceMappingURL=acorex-platform-module-tenant-management-client.mjs.map