fix: improved urlChangeListenerInitializer

package.json

@@ -38,17 +38,17 @@
     "@angular/router": "^18.2.1",
     "@ngx-translate/core": "^15.0.0",
     "@nx/angular": "19.6.3",
-    "@onecx/accelerator": "^5.9.0",
-    "@onecx/angular-accelerator": "^5.9.0",
-    "@onecx/angular-auth": "^5.9.0",
-    "@onecx/angular-integration-interface": "^5.9.0",
-    "@onecx/angular-remote-components": "^5.9.0",
-    "@onecx/angular-webcomponents": "^5.9.0",
-    "@onecx/integration-interface": "^5.9.0",
-    "@onecx/keycloak-auth": "^5.9.0",
-    "@onecx/portal-integration-angular": "^5.9.0",
-    "@onecx/portal-layout-styles": "^5.9.0",
-    "@onecx/shell-core": "^5.9.0",
+    "@onecx/accelerator": "^5.9.2",
+    "@onecx/angular-accelerator": "^5.9.2",
+    "@onecx/angular-auth": "^5.9.2",
+    "@onecx/angular-integration-interface": "^5.9.2",
+    "@onecx/angular-remote-components": "^5.9.2",
+    "@onecx/angular-webcomponents": "^5.9.2",
+    "@onecx/integration-interface": "^5.9.2",
+    "@onecx/keycloak-auth": "^5.9.2",
+    "@onecx/portal-integration-angular": "^5.9.2",
+    "@onecx/portal-layout-styles": "^5.9.2",
+    "@onecx/shell-core": "^5.9.2",
     "@openapitools/openapi-generator-cli": "^2.13.5",
     "keycloak-angular": "^16.0.1",
     "keycloak-js": "^25.0.4",

src/app/app.module.ts

@@ -54,27 +54,27 @@ import { EventsPublisher, EventsTopic } from '@onecx/integration-interface';
 
 export function createTranslateLoader(
   http: HttpClient,
-  translationCacheService: TranslationCacheService
+  translationCacheService: TranslationCacheService,
 ) {
   return new TranslateCombinedLoader(
     new CachingTranslateLoader(
       translationCacheService,
       http,
       `./assets/i18n/`,
-      '.json'
+      '.json',
     ),
     new CachingTranslateLoader(
       translationCacheService,
       http,
       `./onecx-portal-lib/assets/i18n/`,
-      '.json'
-    )
+      '.json',
+    ),
   );
 }
 
 function publishCurrentWorkspace(
   appStateService: AppStateService,
-  loadWorkspaceConfigResponse: LoadWorkspaceConfigResponse
+  loadWorkspaceConfigResponse: LoadWorkspaceConfigResponse,
 ) {
   return appStateService.currentWorkspace$.publish({
     baseUrl: loadWorkspaceConfigResponse.workspace.baseUrl,
@@ -83,7 +83,7 @@ function publishCurrentWorkspace(
     routes: loadWorkspaceConfigResponse.routes,
     homePage: loadWorkspaceConfigResponse.workspace.homePage,
     microfrontendRegistrations: [],
-    displayName: loadWorkspaceConfigResponse.workspace.displayName
+    displayName: loadWorkspaceConfigResponse.workspace.displayName,
   });
 }
 
@@ -93,7 +93,7 @@ export function workspaceConfigInitializer(
   themeService: ThemeService,
   appStateService: AppStateService,
   remoteComponentsService: RemoteComponentsService,
-  router: Router
+  router: Router,
 ) {
   return async () => {
     await appStateService.isAuthenticated$.isInitialized;
@@ -106,13 +106,13 @@ export function workspaceConfigInitializer(
           retry({ delay: 500, count: 3 }),
           catchError((error) => {
             return initializationErrorHandler(error, router);
-          })
-        )
+          }),
+        ),
     );
 
     if (loadWorkspaceConfigResponse) {
       const parsedProperties = JSON.parse(
-        loadWorkspaceConfigResponse.theme.properties
+        loadWorkspaceConfigResponse.theme.properties,
       ) as Record<string, Record<string, string>>;
       const themeWithParsedProperties = {
         ...loadWorkspaceConfigResponse.theme,
@@ -138,7 +138,7 @@ export function userProfileInitializer(
   userProfileBffService: UserProfileBffService,
   userService: UserService,
   appStateService: AppStateService,
-  router: Router
+  router: Router,
 ) {
   return async () => {
     await appStateService.isAuthenticated$.isInitialized;
@@ -147,14 +147,14 @@ export function userProfileInitializer(
         retry({ delay: 500, count: 3 }),
         catchError((error) => {
           return initializationErrorHandler(error, router);
-        })
-      )
+        }),
+      ),
     );
 
     if (getUserProfileResponse) {
       console.log(
         'ORGANIZATION : ',
-        getUserProfileResponse.userProfile.organization
+        getUserProfileResponse.userProfile.organization,
       );
 
       await userService.profile$.publish(getUserProfileResponse.userProfile);
@@ -167,13 +167,13 @@ export function slotInitializer(slotService: SlotService) {
 }
 
 export function permissionProxyInitializer(
-  permissionProxyService: PermissionProxyService
+  permissionProxyService: PermissionProxyService,
 ) {
   return () => permissionProxyService.init();
 }
 
 export function configurationServiceInitializer(
-  configurationService: ConfigurationService
+  configurationService: ConfigurationService,
 ) {
   return () => configurationService.init();
 }
@@ -201,21 +201,25 @@ window.history.replaceState = (data: any, unused: string, url?: string) => {
 
 export function urlChangeListenerInitializer(
   router: Router,
-  appStateService: AppStateService
+  appStateService: AppStateService,
 ) {
   return async () => {
     await appStateService.isAuthenticated$.isInitialized;
     let lastUrl = '';
+    let lastHash = '';
     let isFirstRoute = true;
     const observer = new EventsTopic();
     observer.pipe(filter((e) => e.type === 'navigated')).subscribe(() => {
       const routerUrl = `${location.pathname.substring(
-        getLocation().deploymentPath.length
+        getLocation().deploymentPath.length,
       )}${location.search}`;
-      if (routerUrl !== lastUrl) {
+      if (routerUrl !== lastUrl || location.hash !== lastHash) {
         lastUrl = routerUrl;
+        lastHash = location.hash;
         if (!isFirstRoute) {
-          router.navigateByUrl(routerUrl);
+          router.navigate([routerUrl], {
+            fragment: location.hash.substring(1),
+          });
         } else {
           isFirstRoute = false;
         }