cloud-ide-core 2.0.89 → 2.0.91

package/fesm2022/cloud-ide-core.mjs

@@ -9,7 +9,7 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { BehaviorSubject, throwError, Observable, Subject, takeUntil, debounceTime, distinctUntilChanged } from 'rxjs';
 import { tap, catchError, map } from 'rxjs/operators';
-import { coreRoutesUrl, generateStringFromObject, cidePath, hostManagerRoutesUrl, MDesignationInsertUpdatePayload, MDesignation, MGradeLevel, generateObjectFromString, userRoutesUrl, AuthUserMstGetByIdPayload, customEncrypt, customDecrypt, AuthUserMstListPayload, academicsRoutesUrl } from 'cloud-ide-lms-model';
+import { coreRoutesUrl, generateStringFromObject, cidePath, hostManagerRoutesUrl, MDepartment, MDesignationInsertUpdatePayload, MDesignation, MGradeLevel, generateObjectFromString, userRoutesUrl, AuthUserMstGetByIdPayload, customEncrypt, customDecrypt, AuthUserMstListPayload, academicsRoutesUrl } from 'cloud-ide-lms-model';
 import * as i1 from '@angular/common/http';
 import { HttpClient } from '@angular/common/http';
 import { NotificationService, CideEleDataGridComponent, CideEleButtonComponent, CideInputComponent, CideSelectComponent, CideTextareaComponent, CideIconComponent, CideEleDropdownComponent, ConfirmationService, CideEleGlobalNotificationsComponent, CideEleConfirmationModalComponent, CideEleJsonEditorComponent, CideEleFileInputComponent, CideEleFileImageDirective, CideFormFieldErrorComponent, CideEleFileManagerService, CideEleTabComponent, CideEleFloatingFeaturesService, CideEleToastNotificationComponent } from 'cloud-ide-element';
@@ -2795,12 +2795,20 @@ class CideCoreDepartmentListComponent {
         console.log('🚀 CideCoreDepartmentListComponent.loadDepartments() called');
         this.loading.set(true);
         this.error.set(null);
-        const requestBody = {
+        const activeEntityId = this.appState.getActiveEntityId();
+        if (!activeEntityId) {
+            console.error('❌ No active entity ID found');
+            this.error.set('No active entity selected');
+            this.loading.set(false);
+            return;
+        }
+        const requestBody = new MDepartment({
             total: this.totalItems(),
             pageIndex: this.currentPage(),
             pageSize: this.pageSize(),
-            query: this.searchTerm()
-        };
+            query: this.searchTerm(),
+            sydept_entity_id_syen: activeEntityId
+        });
         console.log('📋 Request body:', requestBody);
         if (!this.departmentService) {
             console.error('❌ DepartmentService is not available');
@@ -3923,7 +3931,10 @@ class CideCoreDesignationListComponent {
      */
     initializeComponent() {
         console.log('CideCoreDesignationListComponent initialized with modern Angular patterns');
-        // Load designations first since department and grade level data is populated in the response
+        // Load departments and grade levels first for dropdown options
+        this.loadDepartments();
+        this.loadGradeLevels();
+        // Then load designations
         this.loadDesignations();
         this.setupEventListeners();
         this.exposeGlobalFunctions();
@@ -4018,12 +4029,18 @@ class CideCoreDesignationListComponent {
             console.error('❌ DepartmentService is not available');
             return;
         }
-        const requestBody = {
+        const activeEntityId = this.appState.getActiveEntityId();
+        if (!activeEntityId) {
+            console.error('❌ No active entity ID found for departments');
+            return;
+        }
+        const requestBody = new MDepartment({
             total: 0,
             pageIndex: 1,
-            pageSize: 1000, // Load all departments
-            query: ''
-        };
+            pageSize: 1000, // Load all departments for dropdown
+            query: '',
+            sydept_entity_id_syen: activeEntityId
+        });
         this.departmentService.getDepartmentList(requestBody)
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe({