cloud-ide-layout 1.0.176 → 1.0.179

package/fesm2022/{cloud-ide-layout-cloud-ide-layout-CC-eJdik.mjs → cloud-ide-layout-cloud-ide-layout-BlLjLM3N.mjs}

@@ -286,6 +286,8 @@ class AppStateService {
     activeModuleSignal = signal(null, ...(ngDevMode ? [{ debugName: "activeModuleSignal" }] : []));
     // Private signal for active entity
     activeEntitySignal = signal(null, ...(ngDevMode ? [{ debugName: "activeEntitySignal" }] : []));
+    // Private signal for active academic year
+    activeAcademicYearSignal = signal(null, ...(ngDevMode ? [{ debugName: "activeAcademicYearSignal" }] : []));
     // Track if entity change handler is initialized (to prevent triggering on initial load)
     entityChangeHandlerInitialized = false;
     // Callback registration for entity change handlers (to avoid circular dependencies)
@@ -296,6 +298,8 @@ class AppStateService {
     activeModule = computed(() => this.activeModuleSignal(), ...(ngDevMode ? [{ debugName: "activeModule" }] : []));
     // Public computed signal for active entity
     activeEntity = computed(() => this.activeEntitySignal(), ...(ngDevMode ? [{ debugName: "activeEntity" }] : []));
+    // Public computed signal for active academic year
+    activeAcademicYear = computed(() => this.activeAcademicYearSignal(), ...(ngDevMode ? [{ debugName: "activeAcademicYear" }] : []));
     // Computed signals for derived state
     isAuthenticated = computed(() => !!this.currentUserSignal(), ...(ngDevMode ? [{ debugName: "isAuthenticated" }] : []));
     userInfo = computed(() => {
@@ -333,10 +337,12 @@ class AppStateService {
             const currentUser = this.currentUserSignal();
             const activeModule = this.activeModuleSignal();
             const activeEntity = this.activeEntitySignal();
+            const activeAcademicYear = this.activeAcademicYearSignal();
             this.saveToLocalStorage({
                 user: currentUser,
                 activeModule: activeModule,
-                activeEntity: activeEntity
+                activeEntity: activeEntity,
+                activeAcademicYear: activeAcademicYear
             });
         });
         // Automatically update file manager user ID whenever user changes
@@ -451,6 +457,18 @@ class AppStateService {
     getActiveEntityValue() {
         return this.activeEntitySignal();
     }
+    /**
+     * Set the active academic year
+     */
+    setActiveAcademicYear(academicYear) {
+        this.activeAcademicYearSignal.set(academicYear);
+    }
+    /**
+     * Get active academic year value (non-reactive)
+     */
+    getActiveAcademicYearValue() {
+        return this.activeAcademicYearSignal();
+    }
     /**
      * Register a callback to be called when entity changes
      * This allows other services to react to entity changes without creating circular dependencies
@@ -522,6 +540,14 @@ class AppStateService {
                     localStorage.removeItem('cide_active_entity');
                 }
             }
+            if (data.activeAcademicYear !== undefined) {
+                if (data.activeAcademicYear) {
+                    localStorage.setItem('cide_active_academic_year', JSON.stringify(data.activeAcademicYear));
+                }
+                else {
+                    localStorage.removeItem('cide_active_academic_year');
+                }
+            }
         }
         catch (error) {
             console.error('Error saving to localStorage:', error);
@@ -550,6 +576,11 @@ class AppStateService {
                 const entity = JSON.parse(entityData);
                 this.activeEntitySignal.set(entity);
             }
+            const academicYearData = localStorage.getItem('cide_active_academic_year');
+            if (academicYearData) {
+                const academicYear = JSON.parse(academicYearData);
+                this.activeAcademicYearSignal.set(academicYear);
+            }
         }
         catch (error) {
             console.error('Error loading from localStorage:', error);
@@ -558,6 +589,7 @@ class AppStateService {
                 localStorage.removeItem('cide_auth_user');
                 localStorage.removeItem('cide_active_module');
                 localStorage.removeItem('cide_active_entity');
+                localStorage.removeItem('cide_active_academic_year');
             }
         }
     }
@@ -603,6 +635,16 @@ class AppStateService {
                         this.activeEntitySignal.set(null);
                     }
                 }
+                // Handle active academic year changes
+                if (event.key === 'cide_active_academic_year') {
+                    if (event.newValue) {
+                        const academicYear = JSON.parse(event.newValue);
+                        this.activeAcademicYearSignal.set(academicYear);
+                    }
+                    else {
+                        this.activeAcademicYearSignal.set(null);
+                    }
+                }
             }
             catch (error) {
                 console.error('Error parsing localStorage update:', error);
@@ -629,6 +671,7 @@ class AppStateHelperService {
     activeModule = this.appStateService.activeModule;
     activeModuleInfo = this.appStateService.activeModuleInfo;
     activeEntity = this.appStateService.activeEntity;
+    activeAcademicYear = this.appStateService.activeAcademicYear;
     /**
      * Get current user value (non-reactive)
      */
@@ -824,6 +867,25 @@ class AppStateHelperService {
         const entity = this.getActiveEntity();
         return entity?.syen_entity_code || null;
     }
+    /**
+     * Set the active academic year
+     */
+    setActiveAcademicYear(academicYear) {
+        this.appStateService.setActiveAcademicYear(academicYear);
+    }
+    /**
+     * Get active academic year value (non-reactive)
+     */
+    getActiveAcademicYear() {
+        return this.appStateService.getActiveAcademicYearValue();
+    }
+    /**
+     * Get active academic year ID
+     */
+    getActiveAcademicYearId() {
+        const academicYear = this.getActiveAcademicYear();
+        return academicYear?._id || null;
+    }
     /**
      * Manually refresh state from localStorage
      */
@@ -2538,6 +2600,8 @@ class CideLytHeaderWrapperComponent {
                     this.currentAcademicYear.set(null);
                     this.currentFinancialYearName.set('FY');
                     this.currentAcademicYearName.set('AY');
+                    // Clear active academic year in AppStateService when entity is cleared
+                    this.appStateService.setActiveAcademicYear(null);
                 }
             });
         });
@@ -3418,8 +3482,41 @@ class CideLytHeaderWrapperComponent {
                 iconColor: 'tw-text-green-500'
             };
         }));
-        // Set current academic year (first active one or first in list)
-        const currentAY = years.find(year => year.acayr_isactive) || years[0];
+        // Get active academic year from AppStateService
+        let currentAY = this.appStateService.getActiveAcademicYearValue();
+        // If not found in AppStateService, find and set it
+        if (!currentAY) {
+            // Find the first active academic year (acayr_isactive: true)
+            currentAY = years.find(year => year.acayr_isactive);
+            // If no active year, find one with acayr_iscurrent: true
+            if (!currentAY) {
+                currentAY = years.find(year => year.acayr_iscurrent === true);
+            }
+            // If still not found, use the first one in the list
+            if (!currentAY && years.length > 0) {
+                currentAY = years[0];
+            }
+            // Set in AppStateService if found
+            if (currentAY) {
+                this.appStateService.setActiveAcademicYear(currentAY);
+                console.log('✅ [HEADER] Set active academic year in AppStateService:', currentAY.acayr_name, currentAY._id);
+            }
+        }
+        else {
+            // Verify the academic year from AppStateService exists in the current list
+            const yearExists = years.find(year => year._id === currentAY._id);
+            if (!yearExists) {
+                // If the stored academic year doesn't exist in the list, find a new one
+                currentAY = years.find(year => year.acayr_isactive) || years.find(year => year.acayr_iscurrent === true) || years[0];
+                if (currentAY) {
+                    this.appStateService.setActiveAcademicYear(currentAY);
+                    console.log('✅ [HEADER] Updated active academic year in AppStateService (previous one not found):', currentAY.acayr_name, currentAY._id);
+                }
+            }
+            else {
+                console.log('✅ [HEADER] Using active academic year from AppStateService:', currentAY.acayr_name, currentAY._id);
+            }
+        }
         if (currentAY) {
             this.currentAcademicYear.set(currentAY);
             // Set display name with proper fallback
@@ -3436,23 +3533,6 @@ class CideLytHeaderWrapperComponent {
                 this.currentAcademicYearName.set('AY');
             }
         }
-        else if (years.length > 0) {
-            // If no active year, set the first one
-            const firstYear = years[0];
-            this.currentAcademicYear.set(firstYear);
-            const name = firstYear.acayr_name;
-            const fromDate = firstYear.acayr_from_date;
-            const toDate = firstYear.acayr_to_date;
-            if (name) {
-                this.currentAcademicYearName.set(name);
-            }
-            else if (fromDate && toDate) {
-                this.currentAcademicYearName.set(`${fromDate} - ${toDate}`);
-            }
-            else {
-                this.currentAcademicYearName.set('AY');
-            }
-        }
     }
     /**
      * Handle financial year dropdown item clicks
@@ -3485,6 +3565,9 @@ class CideLytHeaderWrapperComponent {
     onAcademicYearClick(item) {
         const selectedYear = this.academicYears().find(year => year._id === item.id);
         if (selectedYear) {
+            // Update AppStateService with the selected academic year
+            this.appStateService.setActiveAcademicYear(selectedYear);
+            console.log('✅ [HEADER] User selected academic year, updated AppStateService:', selectedYear.acayr_name, selectedYear._id);
             this.currentAcademicYear.set(selectedYear);
             // Set display name with proper fallback
             const name = selectedYear.acayr_name;
@@ -3499,7 +3582,6 @@ class CideLytHeaderWrapperComponent {
             else {
                 this.currentAcademicYearName.set('AY');
             }
-            // TODO: Update app state or notify other components about the change
         }
     }
     /**
@@ -4728,10 +4810,23 @@ class CustomRouteReuseStrategy {
         }
     }
     // Clears all stored routes (useful for cleanup)
+    // This method ensures all component instances are destroyed and removed from DOM
     clearAllStoredRoutes() {
-        Object.keys(this.storedRoutes).forEach(pathKey => {
+        const routeKeys = Object.keys(this.storedRoutes);
+        console.log(`🧹 [RouteReuseStrategy] Clearing ${routeKeys.length} stored route(s) to remove components from DOM`);
+        routeKeys.forEach(pathKey => {
             this.clearStoredRoute(pathKey);
         });
+        // Double-check that all routes are cleared
+        const remainingRoutes = Object.keys(this.storedRoutes).length;
+        if (remainingRoutes > 0) {
+            console.warn(`⚠️ [RouteReuseStrategy] ${remainingRoutes} route(s) still remain after clearing. Force clearing...`);
+            // Force clear any remaining routes
+            Object.keys(this.storedRoutes).forEach(pathKey => {
+                delete this.storedRoutes[pathKey];
+            });
+        }
+        console.log(`✅ [RouteReuseStrategy] All stored routes cleared. Components should be removed from DOM.`);
     }
     // Gets the count of stored routes (useful for debugging)
     getStoredRoutesCount() {
@@ -5083,7 +5178,8 @@ class CideLytRequestService {
             // Clear sidedrawer as no tabs are open
             this.sidedrawerService.updateDrawerItems(undefined);
             // Redirect to home screen when all tabs are closed
-            this.router.navigate(['/control-panel']);
+            // Use replaceUrl to prevent back navigation to closed tabs and ensure clean state
+            this.router.navigate(['/control-panel'], { replaceUrl: true });
         }
         this.tabsSignal.set(newTabs);
         // Request wrapper visibility is now controlled by layout configuration
@@ -5092,6 +5188,10 @@ class CideLytRequestService {
     /**
      * Close all tabs and navigate to home
      * This is used when entity changes to ensure all components are destroyed and refreshed
+     * IMPORTANT: This method ensures all tab components are removed from DOM by:
+     * 1. Clearing all stored routes from route reuse strategy (destroys component instances)
+     * 2. Clearing all tabs from TabStateService
+     * 3. Navigating to home to clear router outlet
      */
     closeAllTabs() {
         console.log('🧹 REQUEST SERVICE: Closing all tabs due to entity change');
@@ -5099,35 +5199,26 @@ class CideLytRequestService {
         // Close all floating containers first
         this.floatingContainerService.hideAll();
         console.log('🧹 REQUEST SERVICE: Closed all floating containers');
-        // Clear all tabs from TabStateService
+        // Clear all tabs from TabStateService first
         currentTabs.forEach(tab => {
             this.tabStateService.removeTab(tab.id);
-            // Clear stored routes from route reuse strategy
-            if (this.routeReuseStrategy instanceof CustomRouteReuseStrategy) {
-                let pathKey = tab.route.startsWith('/') ? tab.route.substring(1) : tab.route;
-                if (tab.params && Object.keys(tab.params).length > 0) {
-                    const queryParamsString = Object.keys(tab.params)
-                        .sort()
-                        .map(key => `${key}=${tab.params[key]}`)
-                        .join('&');
-                    pathKey += '?' + queryParamsString;
-                }
-                this.routeReuseStrategy.clearStoredRoute(pathKey);
-                // Also clear without query params
-                const pathKeyWithoutParams = tab.route.startsWith('/') ? tab.route.substring(1) : tab.route;
-                if (pathKeyWithoutParams !== pathKey) {
-                    this.routeReuseStrategy.clearStoredRoute(pathKeyWithoutParams);
-                }
-            }
         });
-        // Clear all tabs
+        // Clear ALL stored routes from route reuse strategy
+        // This ensures all component instances are destroyed and removed from DOM
+        if (this.routeReuseStrategy instanceof CustomRouteReuseStrategy) {
+            console.log('🧹 REQUEST SERVICE: Clearing all stored routes to remove components from DOM');
+            this.routeReuseStrategy.clearAllStoredRoutes();
+            console.log('✅ REQUEST SERVICE: All stored routes cleared, components destroyed');
+        }
+        // Clear all tabs from signals
         this.tabsSignal.set([]);
         this.activeTabIdSignal.set(null);
         this.tabStateService.setActiveTab(null);
         // Clear sidedrawer
         this.sidedrawerService.updateDrawerItems(undefined);
-        // Navigate to home
-        this.router.navigate(['/control-panel']);
+        // Navigate to home - this ensures router outlet is cleared and any remaining components are removed
+        // Use replaceUrl to prevent back navigation to closed tabs
+        this.router.navigate(['/control-panel'], { replaceUrl: true });
         console.log('✅ REQUEST SERVICE: All tabs and floating containers closed, navigated to home');
     }
     // Hide Request
@@ -5282,8 +5373,8 @@ class CideLytSidedrawerWrapperComponent {
     }
     ngOnInit() {
         // Initialize the component map (You'd likely populate this from a config or service)
-        this.componentMap['drowar_notes'] = () => import('./cloud-ide-layout-sidedrawer-notes.component-ByfmdVwA.mjs').then(m => m.CideLytSidedrawerNotesComponent);
-        this.componentMap['drawer_theme'] = () => import('./cloud-ide-layout-drawer-theme.component-hlIFgjX_.mjs').then(m => m.CideLytDrawerThemeComponent);
+        this.componentMap['drowar_notes'] = () => import('./cloud-ide-layout-sidedrawer-notes.component-BuDfM6ms.mjs').then(m => m.CideLytSidedrawerNotesComponent);
+        this.componentMap['drawer_theme'] = () => import('./cloud-ide-layout-drawer-theme.component-D4qmt25K.mjs').then(m => m.CideLytDrawerThemeComponent);
     }
     async loadComponent(configFor) {
         console.log('🔍 SIDEDRAWER - Loading component:', configFor, 'Current tab:', this.currentTabId);
@@ -6975,7 +7066,7 @@ const layoutControlPannelChildRoutes = [{
     },
     {
         path: "home",
-        loadComponent: () => import('./cloud-ide-layout-home-wrapper.component-TsEnFYa4.mjs').then(c => c.CideLytHomeWrapperComponent),
+        loadComponent: () => import('./cloud-ide-layout-home-wrapper.component-DeR1T21C.mjs').then(c => c.CideLytHomeWrapperComponent),
         canActivate: [authGuard],
         data: {
             sypg_page_code: "cide_lyt_home" // Used by RequestService to fetch tab properties
@@ -6983,7 +7074,7 @@ const layoutControlPannelChildRoutes = [{
     },
     {
         path: "dashboard-manager",
-        loadComponent: () => import('./cloud-ide-layout-dashboard-manager.component-asEb-RqK.mjs').then(c => c.DashboardManagerComponent),
+        loadComponent: () => import('./cloud-ide-layout-dashboard-manager.component-DWxN9ReS.mjs').then(c => c.DashboardManagerComponent),
         canActivate: [authGuard],
         data: {
             sypg_page_code: "cide_lyt_dashboard_manager"
@@ -8807,4 +8898,4 @@ var floatingEntitySelection_component = /*#__PURE__*/Object.freeze({
  */
 
 export { AppStateHelperService as A, CideLytSharedWrapperComponent as C, ENVIRONMENT_CONFIG as E, NotificationSettingsService as N, RightsService as R, CideLytSidebarService as a, CideLytSidedrawerService as b, CideLytThemeService as c, CloudIdeLayoutService as d, CloudIdeLayoutComponent as e, CideLytSharedService as f, ComponentContextService as g, layoutControlPannelChildRoutes as h, CustomRouteReuseStrategy as i, AppStateService as j, CideLytUserStatusService as k, layoutRoutes as l, CacheManagerService as m, CideLytFileManagerService as n, CideLytFloatingEntityRightsSharingComponent as o, processThemeVariable as p, CideLytFloatingEntityRightsSharingService as q, CideLytFloatingEntitySelectionComponent as r, setCSSVariable as s, themeFactory as t, CideLytFloatingEntitySelectionService as u };
-//# sourceMappingURL=cloud-ide-layout-cloud-ide-layout-CC-eJdik.mjs.map
+//# sourceMappingURL=cloud-ide-layout-cloud-ide-layout-BlLjLM3N.mjs.map