cloud-ide-core 2.0.119 → 2.0.123

package/fesm2022/cloud-ide-core.mjs

@@ -13171,12 +13171,17 @@ class CideCoreUserCreateComponent {
             // Update entity mappings FormArray
             const entityMappingFormArray = this.entityMappingsFormArray;
             entityMappingFormArray.clear();
-            data.core_entity_mapping.forEach((mapping) => {
+            data.core_entity_mapping.forEach((mapping, index) => {
                 const mappingGroup = this.createEntityMappingFormGroup();
                 let core_entity_mapping = {};
+                // Extract entity ID as string (handle both object and string formats)
+                const entityIdValue = mapping?.syenm_entity_id_syen;
+                const entityIdString = typeof entityIdValue === 'string'
+                    ? entityIdValue
+                    : (entityIdValue?._id || '');
                 core_entity_mapping = {
                     ...mapping,
-                    syenm_entity_id_syen: mapping?.syenm_entity_id_syen?._id,
+                    syenm_entity_id_syen: entityIdString,
                     syenm_designation_id_sydsg: mapping?.syenm_designation_id_sydsg?._id,
                     syenm_role_id_syusrol: mapping?.syenm_role_id_syusrol?._id,
                     syenm_department_id_sydept: mapping?.syenm_department_id_sydept?._id
@@ -13184,16 +13189,29 @@ class CideCoreUserCreateComponent {
                 mappingGroup.patchValue(core_entity_mapping);
                 mappingGroup.get('syenm_entity_id_syen')?.disable();
                 entityMappingFormArray.push(mappingGroup);
+                // Load roles for this entity after form is patched
+                if (entityIdString) {
+                    console.log(`🎭 Loading roles for entity ${entityIdString} in mapping ${index} after form patch`);
+                    this.loadRolesForEntity(index, entityIdString);
+                }
             });
-            // Load role permissions for each mapping that has a role selected
+            // Load role permissions and menu rights for each mapping that has a role selected
             data.core_entity_mapping.forEach((mapping, index) => {
-                if (mapping.syenm_role_id_syusrol) {
+                if (mapping.syenm_role_id_syusrol && mapping.syenm_entity_id_syen) {
                     const roleId = typeof mapping.syenm_role_id_syusrol === 'object'
                         ? mapping.syenm_role_id_syusrol._id
                         : mapping.syenm_role_id_syusrol;
-                    if (roleId) {
-                        console.log(`🎭 Loading role permissions for mapping ${index} with role ${roleId}`);
+                    const entityId = typeof mapping.syenm_entity_id_syen === 'object' && mapping.syenm_entity_id_syen !== null
+                        ? mapping.syenm_entity_id_syen._id
+                        : mapping.syenm_entity_id_syen;
+                    if (roleId && entityId) {
+                        console.log(`🎭 Loading role permissions for mapping ${index} with role ${roleId} and entity ${entityId}`);
                         this.loadRolePermissions(roleId, index);
+                        // Load menu rights after a short delay to ensure form is patched
+                        setTimeout(() => {
+                            console.log(`🚀 Loading menu rights for mapping ${index} after data load`);
+                            this.loadMenuRights(index);
+                        }, 200);
                     }
                 }
             });
@@ -13479,19 +13497,42 @@ class CideCoreUserCreateComponent {
         });
     }
     getRoleOptionsForEntity(mappingIndex) {
-        const mapping = this.entityMappings()[mappingIndex];
-        console.log(`🎭 getRoleOptionsForEntity:`, mapping);
-        if (!mapping?.syenm_entity_id_syen?._id) {
+        // First try to get entity ID from form control (most reliable)
+        const mappingFormGroup = this.entityMappingsFormArray.at(mappingIndex);
+        let entityId = undefined;
+        if (mappingFormGroup) {
+            const entityIdValue = mappingFormGroup.get('syenm_entity_id_syen')?.value;
+            if (entityIdValue) {
+                // Handle both string and object formats
+                entityId = typeof entityIdValue === 'string'
+                    ? entityIdValue
+                    : (entityIdValue._id || undefined);
+            }
+        }
+        // Fallback: try to get from entity mappings signal
+        if (!entityId) {
+            const mapping = this.entityMappings()[mappingIndex];
+            if (mapping?.syenm_entity_id_syen) {
+                const entityValue = mapping.syenm_entity_id_syen;
+                // Handle both string and object formats
+                entityId = typeof entityValue === 'string'
+                    ? entityValue
+                    : (entityValue._id || undefined);
+            }
+        }
+        if (!entityId) {
+            console.log(`🎭 getRoleOptionsForEntity: No entity ID found for mapping ${mappingIndex}`);
             return [];
         }
-        const entityId = mapping?.syenm_entity_id_syen?._id || '';
-        console.log(`🎭 roles:`, this.roleOptions());
+        console.log(`🎭 getRoleOptionsForEntity for entity ${entityId}:`, this.roleOptions());
         const roles = this.roleOptions()[entityId];
-        if (roles) {
-            return roles;
+        // If roles are not loaded yet, trigger loading
+        if (!roles && entityId) {
+            console.log(`🎭 Roles not cached for entity ${entityId}, loading...`);
+            this.loadRolesForEntity(mappingIndex, entityId);
+            return []; // Return empty while loading
         }
-        // Return empty array if no roles found for this entity
-        return [];
+        return roles || [];
     }
     /**
      * Get filtered entity options with disabled state for already selected entities in other mappings
@@ -13824,22 +13865,61 @@ class CideCoreUserCreateComponent {
         console.log(`🎭 Role changed for mapping ${mappingIndex}:`, role);
         if (!role) {
             this.clearRolePermissions();
+            this.clearRoleForMapping(mappingIndex);
             return;
         }
+        const roleId = role?._id || '';
         this.selectedEntityIndex.set(mappingIndex);
-        this.selectedRoleId.set(role?._id || '');
+        this.selectedRoleId.set(roleId);
+        // Update the signal with the selected role
+        this.entityMappings.update(mappings => {
+            const updated = [...mappings];
+            if (updated[mappingIndex]) {
+                updated[mappingIndex] = {
+                    ...updated[mappingIndex],
+                    syenm_role_id_syusrol: {
+                        _id: roleId,
+                        syusrol_name: role.syusrol_role_name || ''
+                    }
+                };
+            }
+            return updated;
+        });
         // Load role details and permissions
-        this.loadRolePermissions(role?._id || '', mappingIndex);
+        this.loadRolePermissions(roleId, mappingIndex);
+        // Get entity ID from form control or signal
+        const mappingFormGroup = this.entityMappingsFormArray.at(mappingIndex);
+        let entityId = undefined;
+        if (mappingFormGroup) {
+            const entityIdValue = mappingFormGroup.get('syenm_entity_id_syen')?.value;
+            if (entityIdValue) {
+                entityId = typeof entityIdValue === 'string'
+                    ? entityIdValue
+                    : (entityIdValue._id || undefined);
+            }
+        }
+        // Fallback to signal
+        if (!entityId) {
+            const mapping = this.entityMappings()[mappingIndex];
+            if (mapping?.syenm_entity_id_syen) {
+                const entityValue = mapping.syenm_entity_id_syen;
+                entityId = typeof entityValue === 'string'
+                    ? entityValue
+                    : (entityValue._id || undefined);
+            }
+        }
         // Automatically load menu rights when both entity and role are selected
-        const mapping = this.entityMappings()[mappingIndex];
-        if (mapping?.syenm_entity_id_syen && mapping?.syenm_role_id_syusrol) {
-            console.log(`🚀 Auto-loading menu rights for mapping ${mappingIndex}`);
+        if (entityId && roleId) {
+            console.log(`🚀 Auto-loading menu rights for mapping ${mappingIndex} with entity ${entityId} and role ${roleId}`);
             this.loadMenuRights(mappingIndex);
             // Force refresh the grid to show updated permission states
             setTimeout(() => {
                 this.cdr.detectChanges();
             }, 100);
         }
+        else {
+            console.warn(`⚠️ Cannot load menu rights: entity=${entityId}, role=${roleId}`);
+        }
     }
     /**
      * Load role permissions from API
@@ -14568,12 +14648,52 @@ class CideCoreUserCreateComponent {
         return menuRights[mappingIndex.toString()] || [];
     }
     loadMenuRights(mappingIndex) {
-        const mapping = this.entityMappings()[mappingIndex];
-        if (!mapping.syenm_entity_id_syen || !mapping.syenm_role_id_syusrol) {
-            console.warn('Entity and Role must be selected before loading menu rights');
+        // Get entity ID from form control or signal
+        const mappingFormGroup = this.entityMappingsFormArray.at(mappingIndex);
+        let entityId = undefined;
+        let roleId = undefined;
+        // Try to get from form control first
+        if (mappingFormGroup) {
+            const entityIdValue = mappingFormGroup.get('syenm_entity_id_syen')?.value;
+            if (entityIdValue) {
+                entityId = typeof entityIdValue === 'string'
+                    ? entityIdValue
+                    : (entityIdValue._id || undefined);
+            }
+            const roleIdValue = mappingFormGroup.get('syenm_role_id_syusrol')?.value;
+            if (roleIdValue) {
+                roleId = typeof roleIdValue === 'string'
+                    ? roleIdValue
+                    : (roleIdValue._id || undefined);
+            }
+        }
+        // Fallback to signal
+        if (!entityId || !roleId) {
+            const mapping = this.entityMappings()[mappingIndex];
+            if (mapping?.syenm_entity_id_syen && !entityId) {
+                const entityValue = mapping.syenm_entity_id_syen;
+                entityId = typeof entityValue === 'string'
+                    ? entityValue
+                    : (entityValue._id || undefined);
+            }
+            if (mapping?.syenm_role_id_syusrol && !roleId) {
+                const roleValue = mapping.syenm_role_id_syusrol;
+                roleId = typeof roleValue === 'string'
+                    ? roleValue
+                    : (roleValue._id || undefined);
+            }
+        }
+        if (!entityId || !roleId) {
+            console.warn('Entity and Role must be selected before loading menu rights', {
+                mappingIndex,
+                entityId,
+                roleId,
+                formControl: mappingFormGroup?.value,
+                signal: this.entityMappings()[mappingIndex]
+            });
             return;
         }
-        console.log('🚀 Loading menu rights for mapping:', mappingIndex);
+        console.log('🚀 Loading menu rights for mapping:', mappingIndex, 'Entity:', entityId, 'Role:', roleId);
         this.loading.set(true);
         // Use actual API call to get menu list
         const requestBody = {