diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index b13a5055e..24a5d3557 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -35,6 +35,7 @@ const routes: Routes = [ component: BaseScreenComponent, loadChildren: () => import('./modules/dossier/dossiers.module').then(m => m.DossiersModule), canActivate: [CompositeRouteGuard], + canDeactivate: [DossiersGuard], data: { routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard, DossiersGuard], requiredRoles: ['RED_USER', 'RED_MANAGER'], diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index db26abbda..d9c5c9938 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router'; -import { DossiersService } from '../services/entity-services/dossiers.service'; -import { BreadcrumbsService } from '../services/breadcrumbs.service'; -import { AppStateService } from '../state/app-state.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { BreadcrumbsService } from '@services/breadcrumbs.service'; +import { AppStateService } from '@state/app-state.service'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate, CanDeactivate { diff --git a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts index 8125063d5..f4cf007ae 100644 --- a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts @@ -20,7 +20,7 @@ export class AccountSideNavComponent { }, { screen: 'notifications', - label: _('notifications.title'), + label: _('notifications'), }, ]; } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 20d2fd1e5..737ad3f96 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -985,10 +985,6 @@ "total-rows": "{rows} rows in total" }, "file-attributes-listing": { - "error": { - "generic": "Failed to add File-Attribute", - "conflict": "File-Attribute with this name already exists!" - }, "action": { "delete": "Delete Attribute", "edit": "Edit Attribute" @@ -997,6 +993,10 @@ "bulk-actions": { "delete": "Delete Selected Attributes" }, + "error": { + "conflict": "File-Attribute with this name already exists!", + "generic": "Failed to add File-Attribute" + }, "no-data": { "title": "There are no file attributes yet." }, @@ -1280,7 +1280,6 @@ "sep": "Sep." }, "notification": { - "no-data": "You currently have no notifications", "assign-approver": "You have been assigned as approver for {fileName} in the {dossierName}!", "assign-reviewer": "You have been assigned as reviewer for {fileName} in the {dossierName}!", "document-approved": " {fileName} has been approved!", @@ -1288,6 +1287,7 @@ "dossier-owner-deleted": "{dossierName} owner removed!", "dossier-owner-removed": "{dossierName} owner removed!", "dossier-owner-set": " {dossierName} owner changed to {user}!", + "no-data": "You currently have no notifications", "unassigned-from-file": "You have been unassigned from {fileName} in the {dossierName}!", "user-becomes-dossier-member": "{user} joined dossier: {dossierName}!", "user-demoted-to-reviewer": "{user} demoted to reviewer in dossier: {dossierName}!",