From b31c863a380078b97d102631274a8fe30b5e10e5 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 18 Sep 2023 17:48:04 +0300 Subject: [PATCH 1/2] DM-451 - Clicking the 'Back' button does not lead to navigating to the previous page --- apps/red-ui/src/app/guards/if-logged-in.guard.ts | 3 +++ apps/red-ui/src/app/services/router-history.service.ts | 9 ++++++++- libs/common-ui | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/guards/if-logged-in.guard.ts b/apps/red-ui/src/app/guards/if-logged-in.guard.ts index 91a51e440..5acd504d7 100644 --- a/apps/red-ui/src/app/guards/if-logged-in.guard.ts +++ b/apps/red-ui/src/app/guards/if-logged-in.guard.ts @@ -5,6 +5,7 @@ import { keycloakInitializer, KeycloakStatusService, TenantsService } from '@iqs import { KeycloakService } from 'keycloak-angular'; import { UserService } from '@users/user.service'; import { LicenseService } from '@services/license.service'; +import { RouterHistoryService } from '@services/router-history.service'; export function ifLoggedIn(): CanActivateFn { return async (route: ActivatedRouteSnapshot) => { @@ -16,6 +17,7 @@ export function ifLoggedIn(): CanActivateFn { const usersService = inject(UserService); const licenseService = inject(LicenseService); const keycloakStatusService = inject(KeycloakStatusService); + const routerHistoryService = inject(RouterHistoryService); const keycloakInstance = keycloakService.getKeycloakInstance(); const tenant = route.paramMap.get('tenant'); @@ -34,6 +36,7 @@ export function ifLoggedIn(): CanActivateFn { await tenantsService.selectTenant(tenant); await usersService.initialize(); await licenseService.loadLicenses(); + routerHistoryService.clearRouterHistory(); } const isLoggedIn = await keycloakService.isLoggedIn(); diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts index 985b5df93..65cac7491 100644 --- a/apps/red-ui/src/app/services/router-history.service.ts +++ b/apps/red-ui/src/app/services/router-history.service.ts @@ -11,7 +11,10 @@ const LAST_DOSSIERS_SCREEN = 'routerHistory_lastDossiersScreen'; export class RouterHistoryService { private _lastDossiersScreen = localStorage.getItem(LAST_DOSSIERS_SCREEN); - constructor(private readonly _router: Router, private readonly _tenantsService: TenantsService) { + constructor( + private readonly _router: Router, + private readonly _tenantsService: TenantsService, + ) { // eslint-disable-next-line rxjs/no-ignored-subscription this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => { if (event.url.includes('/dossiers') || event.url.includes('/archive')) { @@ -30,4 +33,8 @@ export class RouterHistoryService { this._router.navigate([url]); } } + + clearRouterHistory() { + localStorage.removeItem(LAST_DOSSIERS_SCREEN); + } } diff --git a/libs/common-ui b/libs/common-ui index d1df30b56..6cb63fcf4 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit d1df30b56ea5abd03b0c8623f68fc96db9fef271 +Subproject commit 6cb63fcf43fbbf522b847f57467156808bbe72a1 From 80443fd8ed219e8bee9d6339d8bd4387ba745094 Mon Sep 17 00:00:00 2001 From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1 Date: Mon, 18 Sep 2023 14:48:50 +0000 Subject: [PATCH 2/2] push back localazy update --- apps/red-ui/src/assets/i18n/redact/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index bc667b653..1a7d241a0 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -2069,7 +2069,7 @@ "label": "Remove here" } }, - "redacted-text": "Selected redactions" + "redacted-text": "Selected {length, plural, one{redaction} other {redactions}}" }, "title": "Remove {count, plural, one{annotation} other {annotations}}" }