cloud-ide-core 2.0.119 → 2.0.121

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,6 +13189,11 @@ 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
             data.core_entity_mapping.forEach((mapping, index) => {
@@ -13479,19 +13489,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