cloud-ide-core 2.0.55 → 2.0.58

package/fesm2022/cloud-ide-core.mjs

@@ -1,4 +1,4 @@
-import { authGuard, CideSharedOrgStructureComponent } from 'cloud-ide-shared';
+import { authGuard, SharedObjectIdService, CideSharedOrgStructureComponent } from 'cloud-ide-shared';
 import * as i0 from '@angular/core';
 import { Injectable, Component, inject, DestroyRef, viewChild, signal, computed, input, output, ChangeDetectorRef, ViewChild } from '@angular/core';
 import * as i1$1 from '@angular/common';
@@ -9613,6 +9613,8 @@ class CideCoreEntityCreateComponent {
     breadcrumbData = signal([], ...(ngDevMode ? [{ debugName: "breadcrumbData" }] : []));
     // Reactive form
     entityForm;
+    // Generated entity ID - created during form initialization
+    generatedEntityId = null;
     entityTypes = signal([], ...(ngDevMode ? [{ debugName: "entityTypes" }] : []));
     currencies = signal([], ...(ngDevMode ? [{ debugName: "currencies" }] : []));
     users = signal([], ...(ngDevMode ? [{ debugName: "users" }] : []));
@@ -9726,6 +9728,7 @@ class CideCoreEntityCreateComponent {
     route = inject(ActivatedRoute);
     router = inject(Router);
     fileManagerService = inject(CideEleFileManagerService);
+    sharedObjectIdService = inject(SharedObjectIdService);
     destroy$ = new Subject();
     globalErrorHandler;
     globalRejectionHandler;
@@ -9796,6 +9799,8 @@ class CideCoreEntityCreateComponent {
         // Store handlers for cleanup
         this.globalErrorHandler = errorHandler;
         this.globalRejectionHandler = rejectionHandler;
+        // Generate entity ID during form initialization
+        this.generateEntityId();
         // Initialize dropdown options
         // this.initializeDropdownOptions(); // Removed - using shared wrapper breadcrumb system
         // Check for entity ID in query parameters
@@ -10073,80 +10078,96 @@ class CideCoreEntityCreateComponent {
             }
         });
     }
+    /**
+     * Generate entity ID during form initialization
+     * This ID will be used for the entity and its mappings
+     */
+    generateEntityId() {
+        this.sharedObjectIdService.generateObjectId().subscribe({
+            next: (response) => {
+                if (response?.success && response?.data?.objectId) {
+                    this.generatedEntityId = response.data.objectId;
+                    console.log('🆔 [EntityCreate] Generated entity ID during initialization:', this.generatedEntityId);
+                }
+                else {
+                    console.error('❌ [EntityCreate] Failed to generate entity ID');
+                }
+            },
+            error: (error) => {
+                console.error('❌ [EntityCreate] Error generating entity ID:', error);
+            }
+        });
+    }
     addUserMapping() {
         if (this.userMappingForm.valid) {
             const formValue = this.userMappingForm.value;
-            // Generate both entity ID and mapping ID using fileManagerService
-            this.fileManagerService.generateObjectId().subscribe({
-                next: (entityResponse) => {
-                    if (entityResponse?.success && entityResponse?.data?.objectId) {
-                        const generatedEntityId = entityResponse.data.objectId;
-                        // Generate mapping ID
-                        this.fileManagerService.generateObjectId().subscribe({
-                            next: (mappingResponse) => {
-                                if (mappingResponse?.success && mappingResponse?.data?.objectId) {
-                                    const generatedMappingId = mappingResponse.data.objectId;
-                                    // Check if user is already mapped to any entity
-                                    const existingMapping = this.userEntityMappings().find(m => m.syenm_id_user === formValue.syenm_id_user);
-                                    if (existingMapping) {
-                                        this.notificationService.error('This user is already mapped to an entity');
-                                        return;
-                                    }
-                                    // Find user details from available users
-                                    const selectedUser = this.availableUsers().find(u => u.value === formValue.syenm_id_user);
-                                    if (!selectedUser) {
-                                        this.notificationService.error('Selected user not found');
-                                        return;
-                                    }
-                                    const newMapping = {
-                                        _id: generatedMappingId, // Use generated mapping ID
-                                        syenm_id_user: formValue.syenm_id_user, // Store user ID as string
-                                        _displayUserName: selectedUser.label, // Store user name for display
-                                        syenm_id_logses: '',
-                                        syenm_entity_id_syen: generatedEntityId, // Store entity ID as string directly (type assertion)
-                                        syenm_role_id_syusrol: undefined, // Set to undefined as requested
-                                        syenm_designation_id_sydsg: undefined, // Set to undefined as requested
-                                        syenm_department_id_sydept: undefined, // Set to undefined as requested
-                                        syenm_activefrom: new Date().toISOString().split('T')[0], // Default to today
-                                        syenm_activeupto: '', // Default to empty
-                                        syenm_isdefault: false, // Always false
-                                        syenm_isactive: true, // Always active
-                                        syenm_isloggedin: false // Always false
-                                    };
-                                    console.log('🍞 Selected user:', newMapping);
-                                    // Add to existing mappings
-                                    const currentMappings = this.userEntityMappings();
-                                    const updatedMappings = [...currentMappings, newMapping];
-                                    // Update signal first
-                                    this.userEntityMappings.set(updatedMappings);
-                                    // Update grid config data - create new reference to trigger change detection
-                                    this.userMappingsGridConfig = {
-                                        ...this.userMappingsGridConfig,
-                                        data: updatedMappings
-                                    };
-                                    // Reset form
-                                    this.userMappingForm.reset({
-                                        syenm_id_user: ''
-                                    });
-                                    this.notificationService.success('User mapping added successfully');
-                                }
-                                else {
-                                    this.notificationService.error('Failed to generate mapping ID');
-                                }
-                            },
-                            error: (err) => {
-                                console.error('Error generating mapping ID:', err);
-                                this.notificationService.error('Failed to generate mapping ID');
-                            }
+            // Check if entity ID is available
+            if (!this.generatedEntityId) {
+                console.error('❌ [EntityCreate] Entity ID not generated yet');
+                this.notificationService.error('Entity ID not ready. Please try again.');
+                return;
+            }
+            // Generate mapping ID using shared service
+            this.sharedObjectIdService.generateObjectId().subscribe({
+                next: (mappingResponse) => {
+                    if (mappingResponse?.success && mappingResponse?.data?.objectId) {
+                        const generatedMappingId = mappingResponse.data.objectId;
+                        // Check if user is already mapped to any entity
+                        const existingMapping = this.userEntityMappings().find(m => m.syenm_id_user === formValue.syenm_id_user);
+                        if (existingMapping) {
+                            this.notificationService.error('This user is already mapped to an entity');
+                            return;
+                        }
+                        // Find user details from available users
+                        const selectedUser = this.availableUsers().find(u => u.value === formValue.syenm_id_user);
+                        if (!selectedUser) {
+                            this.notificationService.error('Selected user not found');
+                            return;
+                        }
+                        const newMapping = {
+                            _id: generatedMappingId, // Use generated mapping ID
+                            syenm_id_user: formValue.syenm_id_user, // Store user ID as string
+                            _displayUserName: selectedUser.label, // Store user name for display
+                            syenm_id_logses: '',
+                            syenm_entity_id_syen: this.generatedEntityId, // Use pre-generated entity ID
+                            syenm_role_id_syusrol: undefined, // Set to undefined as requested
+                            syenm_designation_id_sydsg: undefined, // Set to undefined as requested
+                            syenm_department_id_sydept: undefined, // Set to undefined as requested
+                            syenm_activefrom: new Date().toISOString().split('T')[0], // Default to today
+                            syenm_activeupto: '', // Default to empty
+                            syenm_isdefault: false, // Always false
+                            syenm_isactive: true, // Always active
+                            syenm_isloggedin: false // Always false
+                        };
+                        console.log('🍞 Selected user:', newMapping);
+                        // Add to existing mappings
+                        const currentMappings = this.userEntityMappings();
+                        const updatedMappings = [...currentMappings, newMapping];
+                        // Update signal first
+                        this.userEntityMappings.set(updatedMappings);
+                        // Update grid config data - create new reference to trigger change detection
+                        this.userMappingsGridConfig = {
+                            ...this.userMappingsGridConfig,
+                            data: updatedMappings
+                        };
+                        // Reset form
+                        this.userMappingForm.reset({
+                            syenm_id_user: ''
+                        });
+                        this.notificationService.success('User mapping added successfully');
+                        console.log('✅ [EntityCreate] User mapped successfully:', {
+                            userId: formValue.syenm_id_user,
+                            entityId: this.generatedEntityId,
+                            mappingId: generatedMappingId
                         });
                     }
                     else {
-                        this.notificationService.error('Failed to generate entity ID');
+                        this.notificationService.error('Failed to generate mapping ID');
                     }
                 },
                 error: (err) => {
-                    console.error('Error generating entity ID:', err);
-                    this.notificationService.error('Failed to generate entity ID');
+                    console.error('Error generating mapping ID:', err);
+                    this.notificationService.error('Failed to generate mapping ID');
                 }
             });
         }
@@ -11474,7 +11495,6 @@ class CideCoreOrgStructureComponent {
     allowSwitching = input(true, ...(ngDevMode ? [{ debugName: "allowSwitching" }] : [])); // Allow entity switching (default: true)
     showActions = input(true, ...(ngDevMode ? [{ debugName: "showActions" }] : [])); // Show action buttons (default: true)
     mode = input('view', ...(ngDevMode ? [{ debugName: "mode" }] : [])); // Mode: selection or view-only
-    useSharedWrapper = input(true, ...(ngDevMode ? [{ debugName: "useSharedWrapper" }] : [])); // Use shared wrapper (default: true)
     // Output events
     entityClick = output(); // Emit when entity is clicked
     entitySelect = output(); // Emit when entity is selected for switching
@@ -11484,6 +11504,12 @@ class CideCoreOrgStructureComponent {
     ngOnInit() {
         // No initialization needed - shared component handles everything
     }
+    /**
+     * Navigate back to entity list
+     */
+    onBack() {
+        this.router.navigate(['/control-panel/entity-list']);
+    }
     /**
      * Handle entity click event from shared org structure
      */
@@ -11503,33 +11529,67 @@ class CideCoreOrgStructureComponent {
         this.entityView.emit(entity);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: CideCoreOrgStructureComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.1.0", version: "20.1.7", type: CideCoreOrgStructureComponent, isStandalone: true, selector: "cide-core-org-structure", inputs: { allowSwitching: { classPropertyName: "allowSwitching", publicName: "allowSwitching", isSignal: true, isRequired: false, transformFunction: null }, showActions: { classPropertyName: "showActions", publicName: "showActions", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: false, transformFunction: null }, useSharedWrapper: { classPropertyName: "useSharedWrapper", publicName: "useSharedWrapper", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { entityClick: "entityClick", entitySelect: "entitySelect", entityView: "entityView" }, ngImport: i0, template: `
-    <cide-shared-org-structure
-      [allowSwitching]="allowSwitching()"
-      [showActions]="showActions()"
-      [mode]="mode()"
-      [useSharedWrapper]="useSharedWrapper()"
-      (entityClick)="onEntityClick($event)"
-      (entitySelect)="onEntitySelect($event)"
-      (entityView)="onEntityView($event)">
-    </cide-shared-org-structure>
-  `, isInline: true, styles: [":host{height:100%;display:flex;flex-direction:column}.tw-overflow-y-auto::-webkit-scrollbar{width:6px}.tw-overflow-y-auto::-webkit-scrollbar-track{background:#f1f5f9;border-radius:3px}.tw-overflow-y-auto::-webkit-scrollbar-thumb{background:#cbd5e1;border-radius:3px}.tw-overflow-y-auto::-webkit-scrollbar-thumb:hover{background:#94a3b8}.tw-transition-shadow{transition:box-shadow .2s ease-in-out}.tw-shadow-lg:hover{box-shadow:0 20px 25px -5px #0000001a,0 10px 10px -5px #0000000a;transform:translateY(-2px);transition:all .2s ease-in-out}.tw-bg-purple-300,.tw-bg-purple-400{transition:all .3s ease-in-out}.connection-line-compact{display:block;overflow:visible}.connection-line-compact path,.connection-line-compact line{stroke-linecap:round;stroke-linejoin:round;transition:stroke-width .2s ease}.connection-line-compact:hover path,.connection-line-compact:hover line{stroke-width:3}.connection-line-compact circle{transition:all .2s ease}.connection-line-compact circle:hover{filter:drop-shadow(0 2px 4px rgba(147,51,234,.4))}.level-0{border-color:#fb923c!important}.level-1{border-color:#60a5fa!important}.level-2{border-color:#a78bfa!important}.level-3{border-color:#4ade80!important}.level-4{border-color:#818cf8!important}.level-5{border-color:#f472b6!important}@media (max-width: 1200px){.tw-max-w-7xl{max-width:100%}.tw-gap-6{gap:1rem}.tw-min-w-64{min-width:14rem}.tw-max-w-72{max-width:16rem}}@media (max-width: 768px){.tw-min-w-64{min-width:12rem}.tw-max-w-72{max-width:14rem}.tw-max-w-7xl{max-width:100%}.tw-gap-6{gap:.75rem}.tw-p-4{padding:.75rem}.tw-mb-4{margin-bottom:.75rem}.tw-space-x-3{gap:.5rem}.tw-space-x-2{gap:.375rem}.tw-w-12{width:2.5rem}.tw-h-12{height:2.5rem}}@media (max-width: 480px){.tw-min-w-72{min-width:12rem}.tw-max-w-80{max-width:14rem}.tw-p-4{padding:.5rem}.tw-space-x-3{gap:.375rem}.tw-space-x-2{gap:.25rem}.tw-mb-3{margin-bottom:.5rem}.tw-w-12{width:2rem}.tw-h-12{height:2rem}.tw-w-8{width:1.5rem}.tw-h-8{height:1.5rem}}@media print{.tw-bg-gray-50{background:#fff!important}.tw-shadow-lg{box-shadow:none!important;border:1px solid #e5e7eb!important}.tw-bg-purple-300{background:#6b7280!important}.tw-border-purple-300{border-color:#6b7280!important}}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: CideSharedOrgStructureComponent, selector: "cide-shared-org-structure", inputs: ["allowSwitching", "showActions", "mode", "useSharedWrapper"], outputs: ["entityClick", "entitySelect", "entityView"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.1.0", version: "20.1.7", type: CideCoreOrgStructureComponent, isStandalone: true, selector: "cide-core-org-structure", inputs: { allowSwitching: { classPropertyName: "allowSwitching", publicName: "allowSwitching", isSignal: true, isRequired: false, transformFunction: null }, showActions: { classPropertyName: "showActions", publicName: "showActions", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { entityClick: "entityClick", entitySelect: "entitySelect", entityView: "entityView" }, ngImport: i0, template: `
+    <cide-lyt-shared-wrapper [shared_wrapper_setup_param]="{ sypg_page_code: 'org_structure' }">
+      
+      <!-- Back Button using standard content projection -->
+      <div breadcrumb-actions>
+        <button
+          cideEleButton
+          variant="outline"
+          size="xs"
+          (click)="onBack()"
+          class="tw-whitespace-nowrap tw-flex tw-items-center">
+          <cide-ele-icon size="xs" class="tw-w-6 tw-h-5">arrow_back</cide-ele-icon>
+          Back to Entities
+        </button>
+      </div>
+
+      <!-- Shared Org Structure Component -->
+      <cide-shared-org-structure
+        [allowSwitching]="allowSwitching()"
+        [showActions]="showActions()"
+        [mode]="mode()"
+        (entityClick)="onEntityClick($event)"
+        (entitySelect)="onEntitySelect($event)"
+        (entityView)="onEntityView($event)">
+      </cide-shared-org-structure>
+    </cide-lyt-shared-wrapper>
+  `, isInline: true, styles: [":host{height:100%;display:flex;flex-direction:column}.tw-overflow-y-auto::-webkit-scrollbar{width:6px}.tw-overflow-y-auto::-webkit-scrollbar-track{background:#f1f5f9;border-radius:3px}.tw-overflow-y-auto::-webkit-scrollbar-thumb{background:#cbd5e1;border-radius:3px}.tw-overflow-y-auto::-webkit-scrollbar-thumb:hover{background:#94a3b8}.tw-transition-shadow{transition:box-shadow .2s ease-in-out}.tw-shadow-lg:hover{box-shadow:0 20px 25px -5px #0000001a,0 10px 10px -5px #0000000a;transform:translateY(-2px);transition:all .2s ease-in-out}.tw-bg-purple-300,.tw-bg-purple-400{transition:all .3s ease-in-out}.connection-line-compact{display:block;overflow:visible}.connection-line-compact path,.connection-line-compact line{stroke-linecap:round;stroke-linejoin:round;transition:stroke-width .2s ease}.connection-line-compact:hover path,.connection-line-compact:hover line{stroke-width:3}.connection-line-compact circle{transition:all .2s ease}.connection-line-compact circle:hover{filter:drop-shadow(0 2px 4px rgba(147,51,234,.4))}.level-0{border-color:#fb923c!important}.level-1{border-color:#60a5fa!important}.level-2{border-color:#a78bfa!important}.level-3{border-color:#4ade80!important}.level-4{border-color:#818cf8!important}.level-5{border-color:#f472b6!important}@media (max-width: 1200px){.tw-max-w-7xl{max-width:100%}.tw-gap-6{gap:1rem}.tw-min-w-64{min-width:14rem}.tw-max-w-72{max-width:16rem}}@media (max-width: 768px){.tw-min-w-64{min-width:12rem}.tw-max-w-72{max-width:14rem}.tw-max-w-7xl{max-width:100%}.tw-gap-6{gap:.75rem}.tw-p-4{padding:.75rem}.tw-mb-4{margin-bottom:.75rem}.tw-space-x-3{gap:.5rem}.tw-space-x-2{gap:.375rem}.tw-w-12{width:2.5rem}.tw-h-12{height:2.5rem}}@media (max-width: 480px){.tw-min-w-72{min-width:12rem}.tw-max-w-80{max-width:14rem}.tw-p-4{padding:.5rem}.tw-space-x-3{gap:.375rem}.tw-space-x-2{gap:.25rem}.tw-mb-3{margin-bottom:.5rem}.tw-w-12{width:2rem}.tw-h-12{height:2rem}.tw-w-8{width:1.5rem}.tw-h-8{height:1.5rem}}@media print{.tw-bg-gray-50{background:#fff!important}.tw-shadow-lg{box-shadow:none!important;border:1px solid #e5e7eb!important}.tw-bg-purple-300{background:#6b7280!important}.tw-border-purple-300{border-color:#6b7280!important}}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: CideSharedOrgStructureComponent, selector: "cide-shared-org-structure", inputs: ["allowSwitching", "showActions", "mode"], outputs: ["entityClick", "entitySelect", "entityView"] }, { kind: "component", type: CideIconComponent, selector: "cide-ele-icon", inputs: ["size", "type", "toolTip"] }, { kind: "component", type: CideLytSharedWrapperComponent, selector: "cide-lyt-shared-wrapper", inputs: ["shared_wrapper_setup_param", "breadcrumb_data"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: CideCoreOrgStructureComponent, decorators: [{
             type: Component,
             args: [{ selector: 'cide-core-org-structure', standalone: true, imports: [
                         CommonModule,
-                        CideSharedOrgStructureComponent
+                        CideSharedOrgStructureComponent,
+                        CideIconComponent,
+                        CideLytSharedWrapperComponent
                     ], template: `
-    <cide-shared-org-structure
-      [allowSwitching]="allowSwitching()"
-      [showActions]="showActions()"
-      [mode]="mode()"
-      [useSharedWrapper]="useSharedWrapper()"
-      (entityClick)="onEntityClick($event)"
-      (entitySelect)="onEntitySelect($event)"
-      (entityView)="onEntityView($event)">
-    </cide-shared-org-structure>
+    <cide-lyt-shared-wrapper [shared_wrapper_setup_param]="{ sypg_page_code: 'org_structure' }">
+      
+      <!-- Back Button using standard content projection -->
+      <div breadcrumb-actions>
+        <button
+          cideEleButton
+          variant="outline"
+          size="xs"
+          (click)="onBack()"
+          class="tw-whitespace-nowrap tw-flex tw-items-center">
+          <cide-ele-icon size="xs" class="tw-w-6 tw-h-5">arrow_back</cide-ele-icon>
+          Back to Entities
+        </button>
+      </div>
+
+      <!-- Shared Org Structure Component -->
+      <cide-shared-org-structure
+        [allowSwitching]="allowSwitching()"
+        [showActions]="showActions()"
+        [mode]="mode()"
+        (entityClick)="onEntityClick($event)"
+        (entitySelect)="onEntitySelect($event)"
+        (entityView)="onEntityView($event)">
+      </cide-shared-org-structure>
+    </cide-lyt-shared-wrapper>
   `, styles: [":host{height:100%;display:flex;flex-direction:column}.tw-overflow-y-auto::-webkit-scrollbar{width:6px}.tw-overflow-y-auto::-webkit-scrollbar-track{background:#f1f5f9;border-radius:3px}.tw-overflow-y-auto::-webkit-scrollbar-thumb{background:#cbd5e1;border-radius:3px}.tw-overflow-y-auto::-webkit-scrollbar-thumb:hover{background:#94a3b8}.tw-transition-shadow{transition:box-shadow .2s ease-in-out}.tw-shadow-lg:hover{box-shadow:0 20px 25px -5px #0000001a,0 10px 10px -5px #0000000a;transform:translateY(-2px);transition:all .2s ease-in-out}.tw-bg-purple-300,.tw-bg-purple-400{transition:all .3s ease-in-out}.connection-line-compact{display:block;overflow:visible}.connection-line-compact path,.connection-line-compact line{stroke-linecap:round;stroke-linejoin:round;transition:stroke-width .2s ease}.connection-line-compact:hover path,.connection-line-compact:hover line{stroke-width:3}.connection-line-compact circle{transition:all .2s ease}.connection-line-compact circle:hover{filter:drop-shadow(0 2px 4px rgba(147,51,234,.4))}.level-0{border-color:#fb923c!important}.level-1{border-color:#60a5fa!important}.level-2{border-color:#a78bfa!important}.level-3{border-color:#4ade80!important}.level-4{border-color:#818cf8!important}.level-5{border-color:#f472b6!important}@media (max-width: 1200px){.tw-max-w-7xl{max-width:100%}.tw-gap-6{gap:1rem}.tw-min-w-64{min-width:14rem}.tw-max-w-72{max-width:16rem}}@media (max-width: 768px){.tw-min-w-64{min-width:12rem}.tw-max-w-72{max-width:14rem}.tw-max-w-7xl{max-width:100%}.tw-gap-6{gap:.75rem}.tw-p-4{padding:.75rem}.tw-mb-4{margin-bottom:.75rem}.tw-space-x-3{gap:.5rem}.tw-space-x-2{gap:.375rem}.tw-w-12{width:2.5rem}.tw-h-12{height:2.5rem}}@media (max-width: 480px){.tw-min-w-72{min-width:12rem}.tw-max-w-80{max-width:14rem}.tw-p-4{padding:.5rem}.tw-space-x-3{gap:.375rem}.tw-space-x-2{gap:.25rem}.tw-mb-3{margin-bottom:.5rem}.tw-w-12{width:2rem}.tw-h-12{height:2rem}.tw-w-8{width:1.5rem}.tw-h-8{height:1.5rem}}@media print{.tw-bg-gray-50{background:#fff!important}.tw-shadow-lg{box-shadow:none!important;border:1px solid #e5e7eb!important}.tw-bg-purple-300{background:#6b7280!important}.tw-border-purple-300{border-color:#6b7280!important}}\n"] }]
         }] });
 
@@ -11560,6 +11620,7 @@ class CideCoreUserCreateComponent {
     appState = inject(AppStateHelperService);
     floatingFeaturesService = inject(CideEleFloatingFeaturesService);
     fileManagerService = inject(CideEleFileManagerService);
+    sharedObjectIdService = inject(SharedObjectIdService);
     entityRightsService = inject(CideLytFloatingEntityRightsSharingService);
     notificationService = inject(NotificationService);
     userMasterForm;
@@ -14288,11 +14349,11 @@ class CideCoreUserCreateComponent {
         console.log('📸 Profile photo preview will be loaded by file-input component for ID:', fileId);
     }
     addContactAddress() {
-        // Generate a new ObjectId for the address
-        this.fileManagerService.generateObjectId().subscribe({
+        // Generate a new ObjectId for the address using shared service
+        this.sharedObjectIdService.generateObjectId().subscribe({
             next: (response) => {
                 const newObjectId = response.data?.objectId;
-                console.log('🆔 [UserCreate] Generated new ObjectId for address:', newObjectId);
+                console.log('🆔 [UserCreate] Generated new ObjectId for address via SharedObjectIdService:', newObjectId);
                 // Create entity access pass management record with owner rights
                 const currentUser = this.appState.currentUser();
                 const currentEntity = this.appState.activeEntity();
@@ -14441,11 +14502,11 @@ class CideCoreUserCreateComponent {
         });
     }
     addDocument() {
-        // Generate a new ObjectId for the document
-        this.fileManagerService.generateObjectId().subscribe({
+        // Generate a new ObjectId for the document using shared service
+        this.sharedObjectIdService.generateObjectId().subscribe({
             next: (response) => {
                 const newObjectId = response.data?.objectId;
-                console.log('🆔 [UserCreate] Generated new ObjectId for document:', newObjectId);
+                console.log('🆔 [UserCreate] Generated new ObjectId for document via SharedObjectIdService:', newObjectId);
                 // Create entity access pass management record with owner rights
                 const currentUser = this.appState.currentUser();
                 const currentEntity = this.appState.activeEntity();
@@ -14519,11 +14580,11 @@ class CideCoreUserCreateComponent {
         this.applyDocumentAccessControl();
     }
     addFamilyDetail() {
-        // Generate a new ObjectId for the family detail
-        this.fileManagerService.generateObjectId().subscribe({
+        // Generate a new ObjectId for the family detail using shared service
+        this.sharedObjectIdService.generateObjectId().subscribe({
             next: (response) => {
                 const newObjectId = response.data?.objectId;
-                console.log('🆔 [UserCreate] Generated new ObjectId for family detail:', newObjectId);
+                console.log('🆔 [UserCreate] Generated new ObjectId for family detail via SharedObjectIdService:', newObjectId);
                 // Create entity access pass management record with owner rights
                 const currentUser = this.appState.currentUser();
                 const currentEntity = this.appState.activeEntity();
@@ -15205,19 +15266,14 @@ class CideCoreUserCreateComponent {
     }
     /**
      * Generate Object ID for new user creation
-     * Uses the user master service to generate a unique ObjectId
+     * Uses the shared object ID service to generate a unique ObjectId
      * @returns Promise<string> - The generated ObjectId
      */
     async generateObjectId() {
         try {
-            const response = await this.userMasterService.generateObjectId().toPromise();
-            if (response?.success && response?.data?.objectId) {
-                console.log('🆔 [UserCreate] Generated new ObjectId for user:', response.data.objectId);
-                return response.data.objectId;
-            }
-            else {
-                throw new Error('Failed to generate ObjectId: Invalid response');
-            }
+            const objectId = await this.sharedObjectIdService.generateObjectIdAsync();
+            console.log('🆔 [UserCreate] Generated new ObjectId for user via SharedObjectIdService:', objectId);
+            return objectId;
         }
         catch (error) {
             console.error('❌ [UserCreate] Error generating ObjectId:', error);
@@ -15226,18 +15282,14 @@ class CideCoreUserCreateComponent {
     }
     /**
      * Generate Object ID for user-related entities (addresses, documents, family details)
+     * Uses the shared object ID service for consistency
      * @returns Promise<string> - The generated ObjectId
      */
     async generateEntityObjectId() {
         try {
-            const response = await this.fileManagerService.generateObjectId().toPromise();
-            if (response?.success && response?.data?.objectId) {
-                console.log('🆔 [UserCreate] Generated new ObjectId for entity:', response.data.objectId);
-                return response.data.objectId;
-            }
-            else {
-                throw new Error('Failed to generate ObjectId: Invalid response');
-            }
+            const objectId = await this.sharedObjectIdService.generateObjectIdAsync();
+            console.log('🆔 [UserCreate] Generated new ObjectId for entity via SharedObjectIdService:', objectId);
+            return objectId;
         }
         catch (error) {
             console.error('❌ [UserCreate] Error generating entity ObjectId:', error);