cloud-ide-core 2.0.83 → 2.0.84

package/fesm2022/cloud-ide-core.mjs

@@ -12170,9 +12170,11 @@ class CideCoreUserCreateComponent {
      * - If modified !== actual: create/update exception
      * - If modified === actual BUT exception exists in DB: delete exception
      * - If modified === actual AND no exception exists: do nothing
+     * - Also process all existing exceptions from DB to ensure nothing is missed
      */
     processRoleExceptions() {
         const exceptions = [];
+        const processedExceptionKeys = new Set(); // Track processed exceptions to avoid duplicates
         console.log('🎭 Processing role exceptions for all entity mappings...');
         // Iterate through all entity mappings
         this.entityMappings().forEach((mapping, mappingIndex) => {
@@ -12185,6 +12187,9 @@ class CideCoreUserCreateComponent {
                         const permissionData = menu?._permissionValues?.[permissionId] || {};
                         // Find existing exception for this menu/permission combination
                         const existingException = this.findExistingException(this.userId() || '', mapping._id || '', permissionId, menu._id || '');
+                        // Create a unique key for this exception
+                        const exceptionKey = `${mapping._id || ''}_${menu._id || ''}_${permissionId}`;
+                        processedExceptionKeys.add(exceptionKey);
                         // Check if permission was modified (different from actual role permission)
                         if (permissionData.modified !== permissionData.actual) {
                             // Create or update exception
@@ -12228,6 +12233,39 @@ class CideCoreUserCreateComponent {
                     });
                 }
             });
+            // Also check all existing exceptions from DB that might not be in current menu rights
+            // This ensures we don't miss any exceptions that should be deleted
+            existingExceptions.forEach((existingException) => {
+                if (existingException._id) {
+                    const exceptionKey = `${existingException.syusrex_user_entity_mapping_id_syenm || ''}_${existingException.syusrex_menu_id_syme || ''}_${existingException.syusrex_role_permissions_id_sygms || ''}`;
+                    // If this exception wasn't processed above, check if it should be deleted
+                    if (!processedExceptionKeys.has(exceptionKey)) {
+                        // Find the corresponding menu and permission to check if it matches role
+                        const menuRights = this.menuRightsMap()[mappingIndex.toString()] || [];
+                        const menu = menuRights.find((m) => m._id === existingException.syusrex_menu_id_syme);
+                        if (menu && menu._permissionValues) {
+                            const permissionId = existingException.syusrex_role_permissions_id_sygms?.toString() || '';
+                            const permissionData = menu._permissionValues[permissionId];
+                            if (permissionData && permissionData.modified === permissionData.actual) {
+                                // Permission matches role, but exception exists - mark for deletion
+                                const exceptionToDelete = {
+                                    _id: existingException._id,
+                                    syusrex_user_id_user: this.userId() || '',
+                                    syusrex_user_entity_mapping_id_syenm: mapping._id || '',
+                                    syusrex_role_id_syusrol: mapping.syenm_role_id_syusrol?._id || '',
+                                    syusrex_role_permissions_id_sygms: permissionId,
+                                    syusrex_menu_id_syme: menu._id || '',
+                                    syusrex_isactive: true,
+                                    syusrex_status: false,
+                                    isDelete: true
+                                };
+                                exceptions.push(exceptionToDelete);
+                                console.log(`🗑️ Exception marked for deletion (orphaned/not in menu rights): ${existingException._id}`);
+                            }
+                        }
+                    }
+                }
+            });
         });
         console.log(`🎭 Total exceptions to process: ${exceptions.length}`, exceptions);
         return exceptions;