From ab3f15b4fab8b6201cd1eab770bf669c1d4eed14 Mon Sep 17 00:00:00 2001
From: Florent POITTEVIN <poittevin.florent@gmail.com>
Date: Mon, 6 Jul 2020 11:35:09 +0200
Subject: [PATCH] feat: 1521 add contextual back button and allow coherent back
browser
---
package-lock.json | 6 ++--
package.json | 2 +-
...semination-policy-form.presentational.html | 2 +-
...dmin-dissemination-policy-list.routable.ts | 4 +--
...-funding-agencies-form.presentational.html | 2 +-
.../admin-funding-agencies-list.routable.ts | 4 +--
...admin-institution-form.presentational.html | 2 +-
.../admin-institution-list.routable.ts | 4 +--
.../admin-language-list.routable.ts | 2 +-
.../admin-license-list.routable.ts | 4 +--
...min-metadata-type-form.presentational.html | 2 +-
.../admin-metadata-type-list.routable.ts | 4 +--
.../admin-notification-list.routable.ts | 2 +-
.../admin-oai-set-form.presentational.html | 2 +-
.../admin-oai-set-list.routable.ts | 7 +++--
...min-oauth2-client-form.presentational.html | 2 +-
.../admin-oauth2-client-list.routable.ts | 4 +--
...-unit-additional-fields-rename.dialog.html | 2 +-
...additional-fields-form.presentational.html | 2 +-
...ganizational-unit-form.presentational.html | 2 +-
...al-unit-additional-fields-list.routable.ts | 2 +-
...admin-organizational-unit-list.routable.ts | 6 ++--
...n-organizational-unit-metadata.routable.ts | 2 +-
.../admin-person-list.routable.ts | 2 +-
...eservation-policy-form.presentational.html | 2 +-
...admin-preservation-policy-list.routable.ts | 4 +--
...n-research-domain-form.presentational.html | 2 +-
.../admin-research-domain-list.routable.ts | 4 +--
.../admin-role-form.presentational.html | 2 +-
.../admin-role-list.routable.ts | 4 +--
...submission-policy-form.presentational.html | 2 +-
.../admin-submission-policy-list.routable.ts | 4 +--
.../admin-user-list.routable.ts | 2 +-
.../deposit-collection.container.ts | 2 +-
.../deposit-detail-edit.routable.ts | 2 +-
.../deposit-list/deposit-list.routable.ts | 4 +--
.../deposit-metadata.routable.ts | 2 +-
.../order-all-order-form.presentational.html | 2 +-
.../order-all-order-list.routable.ts | 4 +--
.../order-my-order-form.presentational.html | 2 +-
.../order-my-order-list.routable.ts | 4 +--
...ion-planning-aip-status-home.routable.html | 2 +-
...ation-planning-aip-status-home.routable.ts | 2 +-
...eservation-planning-aip-home.routable.html | 2 +-
...tion-planning-dip-form.presentational.html | 2 +-
...preservation-planning-dip-list.routable.ts | 2 +-
...tion-planning-job-form.presentational.html | 2 +-
...lanning-job-execution-detail.routable.html | 1 +
...preservation-planning-job-list.routable.ts | 4 +--
...ion-planning-monitoring-home.routable.html | 2 +-
...tion-planning-sip-form.presentational.html | 2 +-
...vation-planning-sip-collection.routable.ts | 2 +-
...preservation-planning-sip-list.routable.ts | 2 +-
.../helper/notification.helper.ts | 4 +++
...ganizational-unit-form.presentational.html | 2 +-
...space-organizational-unit-list.routable.ts | 2 +-
...-abstract-button-toolbar.presentational.ts | 12 +++----
...-button-toolbar-detail.presentational.html | 4 +--
...ed-button-toolbar-detail.presentational.ts | 2 +-
...ed-button-toolbar-list.presentational.html | 4 +--
...ared-button-toolbar-list.presentational.ts | 4 +--
.../shared-abstract-crud.routable.ts | 4 +++
.../shared-abstract-detail-edit.routable.ts | 2 +-
.../shared-abstract-list.routable.html | 1 +
.../shared-abstract-list.routable.ts | 9 ++----
src/app/shared/enums/label-translate.enum.ts | 10 ++++--
.../shared-aip-form.presentational.html | 2 +-
.../shared-aip-collection.routable.ts | 2 +-
.../shared-aip-detail-edit.routable.html | 1 +
.../shared-aip-detail-edit.routable.ts | 15 +++++++++
.../aip-list/shared-aip-list.routable.ts | 20 ++++++++++--
.../models/extra-button-toolbar.model.ts | 4 +--
src/assets/i18n/de.json | 31 +++++++------------
src/assets/i18n/en.json | 31 +++++++------------
src/assets/i18n/fr.json | 31 +++++++------------
75 files changed, 180 insertions(+), 163 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 09206a414..1cdfa36ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15746,9 +15746,9 @@
}
},
"solidify-frontend": {
- "version": "0.5.12",
- "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-0.5.12.tgz",
- "integrity": "sha512-qQGBI58WsYCDA39zCdhWZA+1Y0c7d3ChWKvKOwKSK7SDCCJuSU1ZNbB1A1qXmRuHbzigLvTSu6QmFN3CPUm1sw=="
+ "version": "0.6.0",
+ "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-0.6.0.tgz",
+ "integrity": "sha512-iemDGFaKk4lvjq/0ZnUwyCYwH8dBSQjd+7Nhnd1usx5VFT3hXAKIo9wEFQnVoCSDGokSbe02NZYzp9Zm4JLGmA=="
},
"sort-keys": {
"version": "1.1.2",
diff --git a/package.json b/package.json
index c6adff617..1658c069e 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
"primeicons": "2.0.0",
"primeng": "9.0.2",
"rxjs": "6.5.4",
- "solidify-frontend": "0.5.12",
+ "solidify-frontend": "0.6.0",
"streamsaver": "2.0.3",
"sync-pom-version-to-package": "1.3.1",
"ts-key-enum": "2.0.2",
diff --git a/src/app/features/admin/dissemination-policy/components/presentationals/admin-dissemination-policy-form/admin-dissemination-policy-form.presentational.html b/src/app/features/admin/dissemination-policy/components/presentationals/admin-dissemination-policy-form/admin-dissemination-policy-form.presentational.html
index 229583e9c..53e46a178 100644
--- a/src/app/features/admin/dissemination-policy/components/presentationals/admin-dissemination-policy-form/admin-dissemination-policy-form.presentational.html
+++ b/src/app/features/admin/dissemination-policy/components/presentationals/admin-dissemination-policy-form/admin-dissemination-policy-form.presentational.html
@@ -2,7 +2,7 @@
(ngSubmit)="onSubmit()"
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControl]="fd"
[required]="formValidationHelper.hasRequiredField(fd)"
diff --git a/src/app/features/admin/dissemination-policy/components/routables/admin-dissemination-policy-list/admin-dissemination-policy-list.routable.ts b/src/app/features/admin/dissemination-policy/components/routables/admin-dissemination-policy-list/admin-dissemination-policy-list.routable.ts
index b5a858788..8b56847f7 100644
--- a/src/app/features/admin/dissemination-policy/components/routables/admin-dissemination-policy-list/admin-dissemination-policy-list.routable.ts
+++ b/src/app/features/admin/dissemination-policy/components/routables/admin-dissemination-policy-list/admin-dissemination-policy-list.routable.ts
@@ -28,7 +28,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminDisseminationPolicyListRoutable extends SharedAbstractListRoutable<DisseminationPolicy, AdminDisseminationPolicyStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof DisseminationPolicy & string = "name";
constructor(protected readonly _store: Store,
@@ -61,7 +61,7 @@ export class AdminDisseminationPolicyListRoutable extends SharedAbstractListRout
},
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/funding-agencies/components/presentationals/admin-funding-agencies-form/admin-funding-agencies-form.presentational.html b/src/app/features/admin/funding-agencies/components/presentationals/admin-funding-agencies-form/admin-funding-agencies-form.presentational.html
index dbb94bac9..8cd803ffa 100644
--- a/src/app/features/admin/funding-agencies/components/presentationals/admin-funding-agencies-form/admin-funding-agencies-form.presentational.html
+++ b/src/app/features/admin/funding-agencies/components/presentationals/admin-funding-agencies-form/admin-funding-agencies-form.presentational.html
@@ -12,7 +12,7 @@
</mat-form-field>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate}}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate}}</mat-label>
<input matInput
[solidifyValidation]="errors"
[formControl]="fd"
diff --git a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-list/admin-funding-agencies-list.routable.ts b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-list/admin-funding-agencies-list.routable.ts
index a15be8369..c5b61686e 100644
--- a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-list/admin-funding-agencies-list.routable.ts
+++ b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-list/admin-funding-agencies-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminFundingAgenciesListRoutable extends SharedAbstractListRoutable<FundingAgency, AdminFundingAgenciesStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof FundingAgency & string = "name";
constructor(protected readonly _store: Store,
@@ -59,7 +59,7 @@ export class AdminFundingAgenciesListRoutable extends SharedAbstractListRoutable
},
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/institution/components/presentationals/admin-institution-form/admin-institution-form.presentational.html b/src/app/features/admin/institution/components/presentationals/admin-institution-form/admin-institution-form.presentational.html
index 1699ece80..8937511e6 100644
--- a/src/app/features/admin/institution/components/presentationals/admin-institution-form/admin-institution-form.presentational.html
+++ b/src/app/features/admin/institution/components/presentationals/admin-institution-form/admin-institution-form.presentational.html
@@ -3,7 +3,7 @@
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControl]="fd"
autofocus
diff --git a/src/app/features/admin/institution/components/routables/admin-institution-list/admin-institution-list.routable.ts b/src/app/features/admin/institution/components/routables/admin-institution-list/admin-institution-list.routable.ts
index 1822f96b9..ec438afad 100644
--- a/src/app/features/admin/institution/components/routables/admin-institution-list/admin-institution-list.routable.ts
+++ b/src/app/features/admin/institution/components/routables/admin-institution-list/admin-institution-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminInstitutionListRoutable extends SharedAbstractListRoutable<Institution, AdminInstitutionStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof Institution & string = "name";
constructor(protected readonly _store: Store,
@@ -51,7 +51,7 @@ export class AdminInstitutionListRoutable extends SharedAbstractListRoutable<Ins
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/language/components/routables/admin-language-list/admin-language-list.routable.ts b/src/app/features/admin/language/components/routables/admin-language-list/admin-language-list.routable.ts
index 7d7abec17..072273a87 100644
--- a/src/app/features/admin/language/components/routables/admin-language-list/admin-language-list.routable.ts
+++ b/src/app/features/admin/language/components/routables/admin-language-list/admin-language-list.routable.ts
@@ -37,7 +37,7 @@ import {
})
export class AdminLanguageListRoutable extends SharedAbstractListRoutable<Language, AdminLanguageStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof Language & string = "code";
constructor(protected readonly _store: Store,
diff --git a/src/app/features/admin/license/components/routables/admin-license-list/admin-license-list.routable.ts b/src/app/features/admin/license/components/routables/admin-license-list/admin-license-list.routable.ts
index 024fcbd88..ef311085f 100644
--- a/src/app/features/admin/license/components/routables/admin-license-list/admin-license-list.routable.ts
+++ b/src/app/features/admin/license/components/routables/admin-license-list/admin-license-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminLicenseListRoutable extends SharedAbstractListRoutable<License, AdminLicenseStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof License & string = "title";
constructor(protected readonly _store: Store,
@@ -51,7 +51,7 @@ export class AdminLicenseListRoutable extends SharedAbstractListRoutable<License
this.columns = [
{
field: "title",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/metadata-type/components/presentationals/admin-metadata-type-form/admin-metadata-type-form.presentational.html b/src/app/features/admin/metadata-type/components/presentationals/admin-metadata-type-form/admin-metadata-type-form.presentational.html
index b6c74f612..d53233a4d 100644
--- a/src/app/features/admin/metadata-type/components/presentationals/admin-metadata-type-form/admin-metadata-type-form.presentational.html
+++ b/src/app/features/admin/metadata-type/components/presentationals/admin-metadata-type-form/admin-metadata-type-form.presentational.html
@@ -5,7 +5,7 @@
<div class="two-columns-wrapper">
<div class="left-part">
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate}}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate}}</mat-label>
<input matInput
[solidifyValidation]="errors"
autofocus
diff --git a/src/app/features/admin/metadata-type/components/routables/admin-metadata-type-list/admin-metadata-type-list.routable.ts b/src/app/features/admin/metadata-type/components/routables/admin-metadata-type-list/admin-metadata-type-list.routable.ts
index 59cc66fc1..35297d2d2 100644
--- a/src/app/features/admin/metadata-type/components/routables/admin-metadata-type-list/admin-metadata-type-list.routable.ts
+++ b/src/app/features/admin/metadata-type/components/routables/admin-metadata-type-list/admin-metadata-type-list.routable.ts
@@ -28,7 +28,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminMetadataTypeListRoutable extends SharedAbstractListRoutable<MetadataType, AdminMetadataTypeStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof MetadataType & string = "name";
constructor(protected readonly _store: Store,
@@ -52,7 +52,7 @@ export class AdminMetadataTypeListRoutable extends SharedAbstractListRoutable<Me
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/notification/components/routables/admin-notification-list/admin-notification-list.routable.ts b/src/app/features/admin/notification/components/routables/admin-notification-list/admin-notification-list.routable.ts
index 78c923bd1..7b3252e08 100644
--- a/src/app/features/admin/notification/components/routables/admin-notification-list/admin-notification-list.routable.ts
+++ b/src/app/features/admin/notification/components/routables/admin-notification-list/admin-notification-list.routable.ts
@@ -37,7 +37,7 @@ import {
})
export class AdminNotificationListRoutable extends SharedAbstractListRoutable<NotificationDlcm, AdminNotificationStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof NotificationDlcm & string = "notificationType";
readonly KEY_QUERY_PARAMETER_NOTIFIED_ORGUNIT_ID: keyof NotificationDlcm | string = "notifiedOrgUnit.resId";
diff --git a/src/app/features/admin/oai-set/components/presentationals/admin-oai-set-form/admin-oai-set-form.presentational.html b/src/app/features/admin/oai-set/components/presentationals/admin-oai-set-form/admin-oai-set-form.presentational.html
index bc8119c9e..59bd5596d 100644
--- a/src/app/features/admin/oai-set/components/presentationals/admin-oai-set-form/admin-oai-set-form.presentational.html
+++ b/src/app/features/admin/oai-set/components/presentationals/admin-oai-set-form/admin-oai-set-form.presentational.html
@@ -19,7 +19,7 @@
</mat-form-field>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate}}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate}}</mat-label>
<input matInput
[solidifyValidation]="errors"
[formControl]="fd"
diff --git a/src/app/features/admin/oai-set/components/routables/admin-oai-set-list/admin-oai-set-list.routable.ts b/src/app/features/admin/oai-set/components/routables/admin-oai-set-list/admin-oai-set-list.routable.ts
index 476799ca6..c55410fe4 100644
--- a/src/app/features/admin/oai-set/components/routables/admin-oai-set-list/admin-oai-set-list.routable.ts
+++ b/src/app/features/admin/oai-set/components/routables/admin-oai-set-list/admin-oai-set-list.routable.ts
@@ -8,6 +8,7 @@ import {
import {MatDialog} from "@angular/material/dialog";
import {ActivatedRoute} from "@angular/router";
import {OaiSet} from "@models";
+import {Navigate} from "@ngxs/router-plugin";
import {
Actions,
Store,
@@ -32,7 +33,7 @@ import {
})
export class AdminOaiSetListRoutable extends SharedAbstractListRoutable<OaiSet, AdminOaiSetStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof OaiSet & string = "name";
constructor(protected readonly _store: Store,
@@ -47,7 +48,7 @@ export class AdminOaiSetListRoutable extends SharedAbstractListRoutable<OaiSet,
color: "primary",
icon: IconNameEnum.create,
labelToTranslate: (current) => MARK_AS_TRANSLATABLE("admin.oai-set.button.bulkCreate"),
- route: RoutesEnum.adminOaiSetBulkCreate,
+ navigate: new Navigate([RoutesEnum.adminOaiSetBulkCreate], {}, {skipLocationChange: true}),
order: 40,
},
],
@@ -66,7 +67,7 @@ export class AdminOaiSetListRoutable extends SharedAbstractListRoutable<OaiSet,
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/oauth2-client/components/presentationals/admin-oauth2-client-form/admin-oauth2-client-form.presentational.html b/src/app/features/admin/oauth2-client/components/presentationals/admin-oauth2-client-form/admin-oauth2-client-form.presentational.html
index 604820d18..f7652897c 100644
--- a/src/app/features/admin/oauth2-client/components/presentationals/admin-oauth2-client-form/admin-oauth2-client-form.presentational.html
+++ b/src/app/features/admin/oauth2-client/components/presentationals/admin-oauth2-client-form/admin-oauth2-client-form.presentational.html
@@ -5,7 +5,7 @@
<div class="two-columns-wrapper">
<div class="left-part">
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControl]="fd"
autofocus
diff --git a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-list/admin-oauth2-client-list.routable.ts b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-list/admin-oauth2-client-list.routable.ts
index 8ba743488..7b03f86a1 100644
--- a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-list/admin-oauth2-client-list.routable.ts
+++ b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-list/admin-oauth2-client-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminOAuth2ClientListRoutable extends SharedAbstractListRoutable<Oauth2Client, AdminOAuth2ClientStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof Oauth2Client & string = "name";
constructor(protected readonly _store: Store,
@@ -51,7 +51,7 @@ export class AdminOAuth2ClientListRoutable extends SharedAbstractListRoutable<Oa
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-additional-fields-rename/admin-organizational-unit-additional-fields-rename.dialog.html b/src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-additional-fields-rename/admin-organizational-unit-additional-fields-rename.dialog.html
index 481677e62..6fa5c6493 100644
--- a/src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-additional-fields-rename/admin-organizational-unit-additional-fields-rename.dialog.html
+++ b/src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-additional-fields-rename/admin-organizational-unit-additional-fields-rename.dialog.html
@@ -7,7 +7,7 @@
<input [formControl]="fd"
[solidifyValidation]="errors"
matInput
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
[required]="formValidationHelper.hasRequiredField(fd)"
>
<mat-error #errors></mat-error>
diff --git a/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-additional-fields-form/admin-organizational-unit-additional-fields-form.presentational.html b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-additional-fields-form/admin-organizational-unit-additional-fields-form.presentational.html
index 468ba4b92..d697efdc3 100644
--- a/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-additional-fields-form/admin-organizational-unit-additional-fields-form.presentational.html
+++ b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-additional-fields-form/admin-organizational-unit-additional-fields-form.presentational.html
@@ -6,7 +6,7 @@
<input [formControl]="fd"
[solidifyValidation]="errors"
matInput
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
[required]="formValidationHelper.hasRequiredField(fd)"
>
<mat-error #errors></mat-error>
diff --git a/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.html b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.html
index c689f136e..2dbe64141 100644
--- a/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.html
+++ b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.html
@@ -8,7 +8,7 @@
<input [formControl]="fd"
[solidifyValidation]="errors"
matInput
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
[required]="formValidationHelper.hasRequiredField(fd)"
[dlcmDataTest]="dataTestEnum.adminOrgUnitName"
(blur)="checkAvailable(formDefinition.name, fd)"
diff --git a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-additional-fields-list/admin-organizational-unit-additional-fields-list.routable.ts b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-additional-fields-list/admin-organizational-unit-additional-fields-list.routable.ts
index 898469e68..aaf1ea580 100644
--- a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-additional-fields-list/admin-organizational-unit-additional-fields-list.routable.ts
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-additional-fields-list/admin-organizational-unit-additional-fields-list.routable.ts
@@ -88,7 +88,7 @@ export class AdminOrganizationalUnitAdditionalFieldsListRoutable {
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts
index 1cb4cc479..e6fcee098 100644
--- a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts
@@ -36,7 +36,7 @@ import {
})
export class AdminOrganizationalUnitListRoutable extends SharedAbstractListRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof OrganizationalUnit & string = "name";
constructor(protected readonly _store: Store,
@@ -58,14 +58,14 @@ export class AdminOrganizationalUnitListRoutable extends SharedAbstractListRouta
@Override()
goToEdit(model: OrganizationalUnit): void {
- this._store.dispatch(new Navigate([RoutesEnum.adminOrganizationalUnitDetail, model.resId, AdminRoutesEnum.organizationalUnitData, AdminRoutesEnum.organizationalUnitEdit]));
+ this._store.dispatch(new Navigate([RoutesEnum.adminOrganizationalUnitDetail, model.resId, AdminRoutesEnum.organizationalUnitData, AdminRoutesEnum.organizationalUnitEdit], {}, {skipLocationChange: true}));
}
defineColumns(): void {
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.descending,
isFilterable: true,
diff --git a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-metadata/admin-organizational-unit-metadata.routable.ts b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-metadata/admin-organizational-unit-metadata.routable.ts
index 1bd449df7..9922d6997 100644
--- a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-metadata/admin-organizational-unit-metadata.routable.ts
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-metadata/admin-organizational-unit-metadata.routable.ts
@@ -139,7 +139,7 @@ export class AdminOrganizationalUnitMetadataRoutable extends SharedAbstractDetai
if (this.isEdit) {
return;
}
- this._store.dispatch(new Navigate([RoutesEnum.adminOrganizationalUnitDetail, this._resId, AdminRoutesEnum.organizationalUnitData, DepositRoutesEnum.edit]));
+ this._store.dispatch(new Navigate([RoutesEnum.adminOrganizationalUnitDetail, this._resId, AdminRoutesEnum.organizationalUnitData, DepositRoutesEnum.edit], {}, {skipLocationChange: true}));
}
@Override()
diff --git a/src/app/features/admin/person/components/routables/admin-person-list/admin-person-list.routable.ts b/src/app/features/admin/person/components/routables/admin-person-list/admin-person-list.routable.ts
index 30eeaaba1..9d95065a3 100644
--- a/src/app/features/admin/person/components/routables/admin-person-list/admin-person-list.routable.ts
+++ b/src/app/features/admin/person/components/routables/admin-person-list/admin-person-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminPersonListRoutable extends SharedAbstractListRoutable<Person, AdminPersonStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof Person & string = "fullName";
constructor(protected readonly _store: Store,
diff --git a/src/app/features/admin/preservation-policy/components/presentationals/admin-preservation-policy-form/admin-preservation-policy-form.presentational.html b/src/app/features/admin/preservation-policy/components/presentationals/admin-preservation-policy-form/admin-preservation-policy-form.presentational.html
index cbf136dda..a47e7a3f7 100644
--- a/src/app/features/admin/preservation-policy/components/presentationals/admin-preservation-policy-form/admin-preservation-policy-form.presentational.html
+++ b/src/app/features/admin/preservation-policy/components/presentationals/admin-preservation-policy-form/admin-preservation-policy-form.presentational.html
@@ -3,7 +3,7 @@
(ngSubmit)="onSubmit()"
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControl]="fd"
[required]="formValidationHelper.hasRequiredField(fd)"
diff --git a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-list/admin-preservation-policy-list.routable.ts b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-list/admin-preservation-policy-list.routable.ts
index 41e2bce8e..4bd62f802 100644
--- a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-list/admin-preservation-policy-list.routable.ts
+++ b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-list/admin-preservation-policy-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminPreservationPolicyListRoutable extends SharedAbstractListRoutable<PreservationPolicy, AdminPreservationPolicyStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof PreservationPolicy & string = "name";
constructor(protected readonly _store: Store,
@@ -51,7 +51,7 @@ export class AdminPreservationPolicyListRoutable extends SharedAbstractListRouta
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/research-domain/components/presentationals/admin-research-domain-form/admin-research-domain-form.presentational.html b/src/app/features/admin/research-domain/components/presentationals/admin-research-domain-form/admin-research-domain-form.presentational.html
index 2175e9a09..8c8fc25bd 100644
--- a/src/app/features/admin/research-domain/components/presentationals/admin-research-domain-form/admin-research-domain-form.presentational.html
+++ b/src/app/features/admin/research-domain/components/presentationals/admin-research-domain-form/admin-research-domain-form.presentational.html
@@ -4,7 +4,7 @@
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControl]="fd"
[solidifyValidation]="errors"
diff --git a/src/app/features/admin/research-domain/components/routables/admin-research-domain-list/admin-research-domain-list.routable.ts b/src/app/features/admin/research-domain/components/routables/admin-research-domain-list/admin-research-domain-list.routable.ts
index 9ae24a0c1..61afcbcbf 100644
--- a/src/app/features/admin/research-domain/components/routables/admin-research-domain-list/admin-research-domain-list.routable.ts
+++ b/src/app/features/admin/research-domain/components/routables/admin-research-domain-list/admin-research-domain-list.routable.ts
@@ -52,7 +52,7 @@ import {
})
export class AdminResearchDomainListRoutable extends SharedAbstractListRoutable<ResearchDomain, AdminResearchDomainStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof ResearchDomain & string = "name";
languagesObs: Observable<Language[]> = MemoizedUtil.list(this._store, SharedLanguageState);
@@ -97,7 +97,7 @@ export class AdminResearchDomainListRoutable extends SharedAbstractListRoutable<
},
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/role/components/presentationals/admin-role-form/admin-role-form.presentational.html b/src/app/features/admin/role/components/presentationals/admin-role-form/admin-role-form.presentational.html
index 6bc571583..a8796f2d7 100644
--- a/src/app/features/admin/role/components/presentationals/admin-role-form/admin-role-form.presentational.html
+++ b/src/app/features/admin/role/components/presentationals/admin-role-form/admin-role-form.presentational.html
@@ -2,7 +2,7 @@
(ngSubmit)="onSubmit()"
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControl]="fd"
[solidifyValidation]="errors"
diff --git a/src/app/features/admin/role/components/routables/admin-role-list/admin-role-list.routable.ts b/src/app/features/admin/role/components/routables/admin-role-list/admin-role-list.routable.ts
index 25d76b2f9..2db42f42c 100644
--- a/src/app/features/admin/role/components/routables/admin-role-list/admin-role-list.routable.ts
+++ b/src/app/features/admin/role/components/routables/admin-role-list/admin-role-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminRoleListRoutable extends SharedAbstractListRoutable<Role, AdminRoleStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof Role & string = "name";
constructor(protected readonly _store: Store,
@@ -51,7 +51,7 @@ export class AdminRoleListRoutable extends SharedAbstractListRoutable<Role, Admi
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/submission-policy/components/presentationals/admin-submission-policy-form/admin-submission-policy-form.presentational.html b/src/app/features/admin/submission-policy/components/presentationals/admin-submission-policy-form/admin-submission-policy-form.presentational.html
index 66304ea85..c394fbe0f 100644
--- a/src/app/features/admin/submission-policy/components/presentationals/admin-submission-policy-form/admin-submission-policy-form.presentational.html
+++ b/src/app/features/admin/submission-policy/components/presentationals/admin-submission-policy-form/admin-submission-policy-form.presentational.html
@@ -3,7 +3,7 @@
[solidifyFocusFirstElement]="true"
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
tabindex="0"
autofocus
diff --git a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-list/admin-submission-policy-list.routable.ts b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-list/admin-submission-policy-list.routable.ts
index 65fdbbe9f..60cf946c0 100644
--- a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-list/admin-submission-policy-list.routable.ts
+++ b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-list/admin-submission-policy-list.routable.ts
@@ -27,7 +27,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminSubmissionPolicyListRoutable extends SharedAbstractListRoutable<SubmissionPolicy, AdminSubmissionPolicyStateModel> {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof SubmissionPolicy & string = "name";
constructor(protected readonly _store: Store,
@@ -51,7 +51,7 @@ export class AdminSubmissionPolicyListRoutable extends SharedAbstractListRoutabl
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/admin/user/components/routables/admin-user-list/admin-user-list.routable.ts b/src/app/features/admin/user/components/routables/admin-user-list/admin-user-list.routable.ts
index 2d0ce78df..6f2698aa9 100644
--- a/src/app/features/admin/user/components/routables/admin-user-list/admin-user-list.routable.ts
+++ b/src/app/features/admin/user/components/routables/admin-user-list/admin-user-list.routable.ts
@@ -29,7 +29,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class AdminUserListRoutable extends SharedAbstractListRoutable<User, AdminUserStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdminHome;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToAdmin;
readonly KEY_PARAM_NAME: keyof User & string = "externalUid";
constructor(protected readonly _store: Store,
diff --git a/src/app/features/deposit/components/containers/deposit-collection/deposit-collection.container.ts b/src/app/features/deposit/components/containers/deposit-collection/deposit-collection.container.ts
index 61dfc9d77..0c26aef1d 100644
--- a/src/app/features/deposit/components/containers/deposit-collection/deposit-collection.container.ts
+++ b/src/app/features/deposit/components/containers/deposit-collection/deposit-collection.container.ts
@@ -107,7 +107,7 @@ export class DepositCollectionContainer extends SharedAbstractDetailEditRoutable
this.columns = [
{
field: "info.name" as any,
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isSortable: true,
diff --git a/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts
index 563663ef0..70db030d8 100644
--- a/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts
+++ b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts
@@ -394,7 +394,7 @@ export class DepositDetailEditRoutable extends SharedAbstractDetailEditRoutable<
@Override()
edit(): void {
- this._store.dispatch(new Navigate([RoutesEnum.deposit, this._orgUnitResId, DepositRoutesEnum.detail, this._resId, DepositRoutesEnum.metadata, DepositRoutesEnum.edit]));
+ this._store.dispatch(new Navigate([RoutesEnum.deposit, this._orgUnitResId, DepositRoutesEnum.detail, this._resId, DepositRoutesEnum.metadata, DepositRoutesEnum.edit], {}, {skipLocationChange: true}));
}
getSubResourceWithParentId(id: string): void {
diff --git a/src/app/features/deposit/components/routables/deposit-list/deposit-list.routable.ts b/src/app/features/deposit/components/routables/deposit-list/deposit-list.routable.ts
index 8ea1bafc6..401034069 100644
--- a/src/app/features/deposit/components/routables/deposit-list/deposit-list.routable.ts
+++ b/src/app/features/deposit/components/routables/deposit-list/deposit-list.routable.ts
@@ -315,7 +315,7 @@ export class DepositListRoutable extends SharedAbstractListRoutable<Deposit, Dep
@Override()
goToEdit(deposit: Deposit): void {
- this._store.dispatch(new Navigate([AppRoutesEnum.deposit, deposit.organizationalUnitId, DepositRoutesEnum.detail, deposit.resId, DepositRoutesEnum.edit]));
+ this._store.dispatch(new Navigate([AppRoutesEnum.deposit, deposit.organizationalUnitId, DepositRoutesEnum.detail, deposit.resId, DepositRoutesEnum.edit], {}, {skipLocationChange: true}));
}
showDetail(deposit: Deposit): void {
@@ -323,7 +323,7 @@ export class DepositListRoutable extends SharedAbstractListRoutable<Deposit, Dep
}
create(element: ElementRef): void {
- this._store.dispatch(new Navigate([RoutesEnum.deposit, this._orgUnitResId, DepositRoutesEnum.create]));
+ this._store.dispatch(new Navigate([RoutesEnum.deposit, this._orgUnitResId, DepositRoutesEnum.create], {}, {skipLocationChange: true}));
}
private updateQueryParameterWithOrgUnit(queryParameters: QueryParameters, orgUnit: OrganizationalUnit | undefined): QueryParameters | undefined {
diff --git a/src/app/features/deposit/components/routables/deposit-metadata/deposit-metadata.routable.ts b/src/app/features/deposit/components/routables/deposit-metadata/deposit-metadata.routable.ts
index d8a7785d9..a443d590a 100644
--- a/src/app/features/deposit/components/routables/deposit-metadata/deposit-metadata.routable.ts
+++ b/src/app/features/deposit/components/routables/deposit-metadata/deposit-metadata.routable.ts
@@ -158,7 +158,7 @@ export class DepositMetadataRoutable extends SharedAbstractDetailEditRoutable<De
if (this.isEdit) {
return;
}
- this._store.dispatch(new Navigate([RoutesEnum.deposit, this._orgUnitResId, DepositRoutesEnum.detail, this._resId, DepositRoutesEnum.metadata, DepositRoutesEnum.edit]));
+ this._store.dispatch(new Navigate([RoutesEnum.deposit, this._orgUnitResId, DepositRoutesEnum.detail, this._resId, DepositRoutesEnum.metadata, DepositRoutesEnum.edit], {}, {skipLocationChange: true}));
}
protected getSubResourceWithParentId(id: string): void {
diff --git a/src/app/features/order/features/all-order/components/presentationals/all-order-form/order-all-order-form.presentational.html b/src/app/features/order/features/all-order/components/presentationals/all-order-form/order-all-order-form.presentational.html
index 5a6692560..ed27f4888 100644
--- a/src/app/features/order/features/all-order/components/presentationals/all-order-form/order-all-order-form.presentational.html
+++ b/src/app/features/order/features/all-order/components/presentationals/all-order-form/order-all-order-form.presentational.html
@@ -13,7 +13,7 @@
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
<input [formControl]="fd"
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
matInput
[required]="formValidationHelper.hasRequiredField(fd)"
>
diff --git a/src/app/features/order/features/all-order/components/routables/all-order-list/order-all-order-list.routable.ts b/src/app/features/order/features/all-order/components/routables/all-order-list/order-all-order-list.routable.ts
index fc5caffa0..f50bd0128 100644
--- a/src/app/features/order/features/all-order/components/routables/all-order-list/order-all-order-list.routable.ts
+++ b/src/app/features/order/features/all-order/components/routables/all-order-list/order-all-order-list.routable.ts
@@ -29,7 +29,7 @@ import {OrderEnum} from "solidify-frontend";
})
export class OrderAllOrderListRoutable extends SharedAbstractListRoutable<Order, OrderAllOrderStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.back;
+ readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.backToArchiveOrders;
readonly KEY_PARAM_NAME: keyof Order & string = "name";
constructor(protected readonly _store: Store,
@@ -69,7 +69,7 @@ export class OrderAllOrderListRoutable extends SharedAbstractListRoutable<Order,
},
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/order/features/my-order/components/presentationals/my-order-form/order-my-order-form.presentational.html b/src/app/features/order/features/my-order/components/presentationals/my-order-form/order-my-order-form.presentational.html
index 7179df653..22b142e47 100644
--- a/src/app/features/order/features/my-order/components/presentationals/my-order-form/order-my-order-form.presentational.html
+++ b/src/app/features/order/features/my-order/components/presentationals/my-order-form/order-my-order-form.presentational.html
@@ -3,7 +3,7 @@
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
<input [formControl]="fd"
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
matInput
[required]="formValidationHelper.hasRequiredField(fd)"
>
diff --git a/src/app/features/order/features/my-order/components/routables/my-order-list/order-my-order-list.routable.ts b/src/app/features/order/features/my-order/components/routables/my-order-list/order-my-order-list.routable.ts
index 1084aaa0f..572d38c2c 100644
--- a/src/app/features/order/features/my-order/components/routables/my-order-list/order-my-order-list.routable.ts
+++ b/src/app/features/order/features/my-order/components/routables/my-order-list/order-my-order-list.routable.ts
@@ -38,7 +38,7 @@ import {
})
export class OrderMyOrderListRoutable extends SharedAbstractListRoutable<Order, OrderMyOrderStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = undefined;
- readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.back;
+ readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.backToArchiveOrders;
readonly KEY_PARAM_NAME: keyof Order & string = "name";
private readonly KEY_CREATOR: string = "creation.who";
@@ -84,7 +84,7 @@ export class OrderMyOrderListRoutable extends SharedAbstractListRoutable<Order,
},
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.html b/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.html
index be946ed9d..3b84fb040 100644
--- a/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.html
+++ b/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.html
@@ -15,7 +15,7 @@
>
<dlcm-shared-icon [iconName]="iconNameEnum.back"></dlcm-shared-icon>
- {{labelTranslateEnum.back | translate}}
+ {{labelTranslateEnum.backToPreservationPlanning | translate}}
</button>
<button mat-button
color="primary"
diff --git a/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.ts b/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.ts
index 1088d2c9c..665e0e0a9 100644
--- a/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.ts
+++ b/src/app/features/preservation-planning/aip-status/components/routables/aip-status-home/preservation-planning-aip-status-home.routable.ts
@@ -55,7 +55,7 @@ export class PreservationPlanningAipStatusHomeRoutable extends SharedAbstractPre
},
{
field: "copies",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: false,
diff --git a/src/app/features/preservation-planning/aip/components/routables/aip-home/preservation-planning-aip-home.routable.html b/src/app/features/preservation-planning/aip/components/routables/aip-home/preservation-planning-aip-home.routable.html
index a0b1c8aaa..1f8d46392 100644
--- a/src/app/features/preservation-planning/aip/components/routables/aip-home/preservation-planning-aip-home.routable.html
+++ b/src/app/features/preservation-planning/aip/components/routables/aip-home/preservation-planning-aip-home.routable.html
@@ -9,7 +9,7 @@
(click)="back()"
>
<dlcm-shared-icon [iconName]="iconNameEnum.back"></dlcm-shared-icon>
- {{labelTranslateEnum.back | translate}}
+ {{labelTranslateEnum.backToPreservationPlanning | translate}}
</button>
</div>
diff --git a/src/app/features/preservation-planning/dip/components/presentationals/dip-form/preservation-planning-dip-form.presentational.html b/src/app/features/preservation-planning/dip/components/presentationals/dip-form/preservation-planning-dip-form.presentational.html
index b28ba7851..3eace542d 100644
--- a/src/app/features/preservation-planning/dip/components/presentationals/dip-form/preservation-planning-dip-form.presentational.html
+++ b/src/app/features/preservation-planning/dip/components/presentationals/dip-form/preservation-planning-dip-form.presentational.html
@@ -26,7 +26,7 @@
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
<input [formControl]="fd"
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
matInput
>
</mat-form-field>
diff --git a/src/app/features/preservation-planning/dip/components/routables/dip-list/preservation-planning-dip-list.routable.ts b/src/app/features/preservation-planning/dip/components/routables/dip-list/preservation-planning-dip-list.routable.ts
index b6a027845..272a3c537 100644
--- a/src/app/features/preservation-planning/dip/components/routables/dip-list/preservation-planning-dip-list.routable.ts
+++ b/src/app/features/preservation-planning/dip/components/routables/dip-list/preservation-planning-dip-list.routable.ts
@@ -46,7 +46,7 @@ import {
})
export class PreservationPlanningDipListRoutable extends SharedAbstractListRoutable<Dip, PreservationPlanningDipStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = undefined;
- readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.back;
+ readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.backToPreservationPlanning;
readonly KEY_PARAM_NAME: keyof Dip & string = undefined;
appAuthorizedOrganizationalUnitSort: Sort<OrganizationalUnit> = {
diff --git a/src/app/features/preservation-planning/job/components/presentationals/job-form/preservation-planning-job-form.presentational.html b/src/app/features/preservation-planning/job/components/presentationals/job-form/preservation-planning-job-form.presentational.html
index 4018ee94a..dee2c14d8 100644
--- a/src/app/features/preservation-planning/job/components/presentationals/job-form/preservation-planning-job-form.presentational.html
+++ b/src/app/features/preservation-planning/job/components/presentationals/job-form/preservation-planning-job-form.presentational.html
@@ -3,7 +3,7 @@
(ngSubmit)="onSubmit()"
>
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
- <mat-label>{{labelTranslateEnum.name | translate}}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate}}</mat-label>
<input matInput
[solidifyValidation]="errors"
[formControl]="fd"
diff --git a/src/app/features/preservation-planning/job/components/routables/job-execution-detail/preservation-planning-job-execution-detail.routable.html b/src/app/features/preservation-planning/job/components/routables/job-execution-detail/preservation-planning-job-execution-detail.routable.html
index 1350e09f6..a92419671 100644
--- a/src/app/features/preservation-planning/job/components/routables/job-execution-detail/preservation-planning-job-execution-detail.routable.html
+++ b/src/app/features/preservation-planning/job/components/routables/job-execution-detail/preservation-planning-job-execution-detail.routable.html
@@ -1,4 +1,5 @@
<dlcm-shared-button-toolbar-detail [mode]="'detail'"
+ [keyBackButtonToTranslate]="labelTranslateEnum.backToJobDetail"
[editAvailable]="editAvailable"
[deleteAvailable]="deleteAvailable"
[currentModel]="currentObs | async"
diff --git a/src/app/features/preservation-planning/job/components/routables/job-list/preservation-planning-job-list.routable.ts b/src/app/features/preservation-planning/job/components/routables/job-list/preservation-planning-job-list.routable.ts
index 5cdede4c9..b35b340d7 100644
--- a/src/app/features/preservation-planning/job/components/routables/job-list/preservation-planning-job-list.routable.ts
+++ b/src/app/features/preservation-planning/job/components/routables/job-list/preservation-planning-job-list.routable.ts
@@ -41,7 +41,7 @@ import JobRecurrenceEnum = JobRecurrence.JobRecurrenceEnum;
})
export class PreservationPlanningJobListRoutable extends SharedAbstractListRoutable<PreservationJob, PreservationPlanningJobStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = LabelTranslateEnum.create;
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.back;
+ readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.backToPreservationPlanning;
readonly KEY_PARAM_NAME: keyof PreservationJob & string = "name";
constructor(protected readonly _store: Store,
@@ -80,7 +80,7 @@ export class PreservationPlanningJobListRoutable extends SharedAbstractListRouta
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/features/preservation-planning/monitoring/components/routables/monitoring-home/preservation-planning-monitoring-home.routable.html b/src/app/features/preservation-planning/monitoring/components/routables/monitoring-home/preservation-planning-monitoring-home.routable.html
index bf045bf7a..42dae0cf6 100644
--- a/src/app/features/preservation-planning/monitoring/components/routables/monitoring-home/preservation-planning-monitoring-home.routable.html
+++ b/src/app/features/preservation-planning/monitoring/components/routables/monitoring-home/preservation-planning-monitoring-home.routable.html
@@ -12,7 +12,7 @@
(click)="back()"
>
<dlcm-shared-icon [iconName]="iconNameEnum.back"></dlcm-shared-icon>
- {{labelTranslateEnum.back | translate}}
+ {{labelTranslateEnum.backToPreservationPlanning | translate}}
</button>
<button mat-button
color="primary"
diff --git a/src/app/features/preservation-planning/sip/components/presentationals/sip-form/preservation-planning-sip-form.presentational.html b/src/app/features/preservation-planning/sip/components/presentationals/sip-form/preservation-planning-sip-form.presentational.html
index b003342de..94084cedf 100644
--- a/src/app/features/preservation-planning/sip/components/presentationals/sip-form/preservation-planning-sip-form.presentational.html
+++ b/src/app/features/preservation-planning/sip/components/presentationals/sip-form/preservation-planning-sip-form.presentational.html
@@ -21,7 +21,7 @@
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd">
<input [formControl]="fd"
- [placeholder]="labelTranslateEnum.name | translate"
+ [placeholder]="labelTranslateEnum.nameLabel | translate"
matInput
>
</mat-form-field>
diff --git a/src/app/features/preservation-planning/sip/components/routables/sip-collection/preservation-planning-sip-collection.routable.ts b/src/app/features/preservation-planning/sip/components/routables/sip-collection/preservation-planning-sip-collection.routable.ts
index e6bf14927..ca5652ab1 100644
--- a/src/app/features/preservation-planning/sip/components/routables/sip-collection/preservation-planning-sip-collection.routable.ts
+++ b/src/app/features/preservation-planning/sip/components/routables/sip-collection/preservation-planning-sip-collection.routable.ts
@@ -92,7 +92,7 @@ export class PreservationPlanningSipCollectionRoutable extends SharedAbstractDet
this.columns = [
{
field: "info.name" as any,
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isSortable: true,
diff --git a/src/app/features/preservation-planning/sip/components/routables/sip-list/preservation-planning-sip-list.routable.ts b/src/app/features/preservation-planning/sip/components/routables/sip-list/preservation-planning-sip-list.routable.ts
index d4b996faf..49a4b7241 100644
--- a/src/app/features/preservation-planning/sip/components/routables/sip-list/preservation-planning-sip-list.routable.ts
+++ b/src/app/features/preservation-planning/sip/components/routables/sip-list/preservation-planning-sip-list.routable.ts
@@ -45,7 +45,7 @@ import {
})
export class PreservationPlanningSipListRoutable extends SharedAbstractListRoutable<Sip, PreservationPlanningSipStateModel> implements OnInit {
readonly KEY_CREATE_BUTTON: string = undefined;
- readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.back;
+ readonly KEY_BACK_BUTTON: string = LabelTranslateEnum.backToPreservationPlanning;
readonly KEY_PARAM_NAME: keyof Sip & string = undefined;
appAuthorizedOrganizationalUnitSort: Sort<OrganizationalUnit> = {
diff --git a/src/app/features/preservation-space/notification/helper/notification.helper.ts b/src/app/features/preservation-space/notification/helper/notification.helper.ts
index 90dbbfd1a..96de8d46d 100644
--- a/src/app/features/preservation-space/notification/helper/notification.helper.ts
+++ b/src/app/features/preservation-space/notification/helper/notification.helper.ts
@@ -85,6 +85,8 @@ export class NotificationHelper {
store.dispatch(new Navigate([RoutesEnum.preservationSpaceOrganizationalUnitDetail, notification.notifiedOrgUnit.resId, OrganizationalUnitRoutesEnum.edit], {
[NotificationHelper.KEY_ROLE_ID]: notification.objectId, // contain roleId
[NotificationHelper.KEY_PERSON_ID]: notification.emitter.person.resId,
+ }, {
+ skipLocationChange: true,
}));
}
@@ -113,6 +115,8 @@ export class NotificationHelper {
[NotificationHelper.KEY_ROLE_ID]: Enums.Role.RoleEnum.MANAGER,
[NotificationHelper.KEY_PERSON_ID]: notification.emitter.person.resId,
[NotificationHelper.KEY_ORGUNIT_NAME]: notification.objectId, // contain org unit name
+ }, {
+ skipLocationChange: true,
}));
}
diff --git a/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.html b/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.html
index dc9e83c87..7fc807ca4 100644
--- a/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.html
+++ b/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.html
@@ -6,7 +6,7 @@
<mat-form-field *ngIf="getFormControl(formDefinition.name) as fd"
>
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input [formControl]="fd"
[solidifyValidation]="errors"
matInput
diff --git a/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts
index 30153b68b..4e1f1a14f 100644
--- a/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts
@@ -147,7 +147,7 @@ export class PreservationSpaceOrganizationalUnitListRoutable extends SharedAbstr
this.columns = [
{
field: "name",
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.ascending,
isFilterable: true,
diff --git a/src/app/shared/components/presentationals/shared-abstract-button-toolbar/shared-abstract-button-toolbar.presentational.ts b/src/app/shared/components/presentationals/shared-abstract-button-toolbar/shared-abstract-button-toolbar.presentational.ts
index 05bc9e8f5..168e66a13 100644
--- a/src/app/shared/components/presentationals/shared-abstract-button-toolbar/shared-abstract-button-toolbar.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-abstract-button-toolbar/shared-abstract-button-toolbar.presentational.ts
@@ -5,6 +5,7 @@ import {
Output,
ViewChild,
} from "@angular/core";
+import {Navigate} from "@ngxs/router-plugin";
import {SharedAbstractPresentational} from "@shared/components/presentationals/shared-abstract/shared-abstract.presentational";
import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
@@ -17,12 +18,11 @@ import {
isNotNullNorUndefined,
isTruthyObject,
ObservableUtil,
- RoutesEnum,
} from "solidify-frontend";
export abstract class SharedAbstractButtonToolbarPresentational<TResourceModel extends BaseResource> extends SharedAbstractPresentational implements OnInit {
@Input()
- readonly keyBackButtonToTranslate: string = LabelTranslateEnum.back;
+ readonly keyBackButtonToTranslate: string = LabelTranslateEnum.backToList;
@Input()
isLoading: boolean;
@@ -46,9 +46,9 @@ export abstract class SharedAbstractButtonToolbarPresentational<TResourceModel e
@Output("backToListChange")
readonly backToListObs: Observable<void> = ObservableUtil.asObservable(this._backToListBS);
- private readonly _navigateBS: BehaviorSubject<RoutesEnum> = new BehaviorSubject<RoutesEnum>(undefined);
+ private readonly _navigateBS: BehaviorSubject<Navigate> = new BehaviorSubject<Navigate>(undefined);
@Output("navigateChange")
- readonly navigateObs: Observable<RoutesEnum> = ObservableUtil.asObservable(this._navigateBS);
+ readonly navigateObs: Observable<Navigate> = ObservableUtil.asObservable(this._navigateBS);
private readonly _refreshBS: BehaviorSubject<void> = new BehaviorSubject<void>(undefined);
@Output("refreshChange")
@@ -97,8 +97,8 @@ export abstract class SharedAbstractButtonToolbarPresentational<TResourceModel e
this._backToListBS.next();
}
- navigate(route: RoutesEnum): void {
- this._navigateBS.next(route);
+ navigate(navigate: Navigate): void {
+ this._navigateBS.next(navigate);
}
refresh(): void {
diff --git a/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.html b/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.html
index a8e542206..3ffd6aa10 100644
--- a/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.html
+++ b/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.html
@@ -14,8 +14,8 @@
[dlcmDataTest]="button.dataTest"
[color]="button.color === 'success' ? 'primary' : button.color"
solidifyShortCuts
- (onEnter)="button.callback ? button.callback(currentModel, buttonRef._elementRef) : navigate(button.route)"
- (click)="button.callback ? button.callback(currentModel, buttonRef._elementRef) : navigate(button.route)"
+ (onEnter)="button.callback ? button.callback(currentModel, buttonRef._elementRef) : navigate(button.navigate)"
+ (click)="button.callback ? button.callback(currentModel, buttonRef._elementRef) : navigate(button.navigate)"
(onEscape)="mode ==='edit' ? backToDetail() : backToList()"
>
<dlcm-shared-icon [iconName]="button.icon"></dlcm-shared-icon>
diff --git a/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.ts b/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.ts
index 0d993eca2..4ade0bb3d 100644
--- a/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-button-toolbar-detail/shared-button-toolbar-detail.presentational.ts
@@ -31,7 +31,7 @@ export class SharedButtonToolbarDetailPresentational<TResourceModel extends Base
readonly keyDeleteButtonToTranslate: string = LabelTranslateEnum.delete;
@Input()
- readonly keyBackToDetailButtonToTranslate: string = LabelTranslateEnum.backToDetail;
+ readonly keyBackToDetailButtonToTranslate: string = LabelTranslateEnum.exitEditMode;
@Input()
readonly keySaveButtonToTranslate: string = LabelTranslateEnum.save;
diff --git a/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.html b/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.html
index edc445bce..ec9b4971e 100644
--- a/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.html
+++ b/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.html
@@ -13,8 +13,8 @@
[dlcmDataTest]="button.dataTest"
[matTooltip]="button.tooltipToTranslate | translate"
solidifyShortCuts
- (click)="button.callback ? button.callback(undefined, buttonRef._elementRef) : navigate(button.route)"
- (onEnter)="button.callback ? button.callback(undefined, buttonRef._elementRef) : navigate(button.route)"
+ (click)="button.callback ? button.callback(undefined, buttonRef._elementRef) : navigate(button.navigate)"
+ (onEnter)="button.callback ? button.callback(undefined, buttonRef._elementRef) : navigate(button.navigate)"
(onEscape)="backToList()"
>
<dlcm-shared-icon [iconName]="button.icon"></dlcm-shared-icon>
diff --git a/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.ts b/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.ts
index 012e7d77f..a21381cd8 100644
--- a/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-button-toolbar-list/shared-button-toolbar-list.presentational.ts
@@ -8,13 +8,13 @@ import {
import {SharedAbstractButtonToolbarPresentational} from "@shared/components/presentationals/shared-abstract-button-toolbar/shared-abstract-button-toolbar.presentational";
import {DataTestEnum} from "@shared/enums/data-test.enum";
import {IconNameEnum} from "@shared/enums/icon-name.enum";
+import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
import {
BehaviorSubject,
Observable,
} from "rxjs";
import {
BaseResource,
- MARK_AS_TRANSLATABLE,
ObservableUtil,
} from "solidify-frontend";
@@ -26,7 +26,7 @@ import {
})
export class SharedButtonToolbarListPresentational<TResourceModel extends BaseResource> extends SharedAbstractButtonToolbarPresentational<TResourceModel> implements OnInit {
@Input()
- readonly keyCreateButtonToTranslate: string = MARK_AS_TRANSLATABLE("app.navigation.button.create");
+ readonly keyCreateButtonToTranslate: string = LabelTranslateEnum.create;
@Input()
readonly backAvailable: boolean = true;
diff --git a/src/app/shared/components/routables/shared-abstract-crud/shared-abstract-crud.routable.ts b/src/app/shared/components/routables/shared-abstract-crud/shared-abstract-crud.routable.ts
index b8f3c3f3d..f32ab828e 100644
--- a/src/app/shared/components/routables/shared-abstract-crud/shared-abstract-crud.routable.ts
+++ b/src/app/shared/components/routables/shared-abstract-crud/shared-abstract-crud.routable.ts
@@ -63,6 +63,10 @@ export abstract class SharedAbstractCrudRoutable<TResourceModel extends BaseReso
this._store.dispatch(new Navigate(isArray(path) ? path : [path]));
}
+ navigateNavigate(navigate: Navigate): void {
+ this._store.dispatch(navigate);
+ }
+
navigateWithQueryParam(navigateAction: Navigate): void {
this._store.dispatch(navigateAction);
}
diff --git a/src/app/shared/components/routables/shared-abstract-detail-edit/shared-abstract-detail-edit.routable.ts b/src/app/shared/components/routables/shared-abstract-detail-edit/shared-abstract-detail-edit.routable.ts
index 4543be86b..dd711c183 100644
--- a/src/app/shared/components/routables/shared-abstract-detail-edit/shared-abstract-detail-edit.routable.ts
+++ b/src/app/shared/components/routables/shared-abstract-detail-edit/shared-abstract-detail-edit.routable.ts
@@ -154,7 +154,7 @@ export abstract class SharedAbstractDetailEditRoutable<TResourceModel extends Ba
if (!this.editAvailable) {
return;
}
- this._store.dispatch(new Navigate([StoreRouteLocalUtil.getEditRoute(this._state, this._resId)]));
+ this._store.dispatch(new Navigate([StoreRouteLocalUtil.getEditRoute(this._state, this._resId)], {}, {skipLocationChange: true}));
}
update(model: ModelFormControlEvent<TResourceModel>): Observable<any> {
diff --git a/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.html b/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.html
index feade2b14..48aba7b5f 100644
--- a/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.html
+++ b/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.html
@@ -12,6 +12,7 @@
[listExtraButtons]="options?.listExtraButtons"
(backToListChange)="back()"
(createChange)="create($event)"
+ (navigateChange)="navigateNavigate($event)"
(refreshChange)="getAll()"
></dlcm-shared-button-toolbar-list>
diff --git a/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.ts b/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.ts
index 449e7b4ab..9533a9908 100644
--- a/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.ts
+++ b/src/app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable.ts
@@ -22,7 +22,6 @@ import {SharedDataTablePresentational} from "@shared/components/presentationals/
import {IconNameEnum} from "@shared/enums/icon-name.enum";
import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
import {LocalStateEnum} from "@shared/enums/local-state.enum";
-import {RoutesEnum} from "@shared/enums/routes.enum";
import {DataTableActions} from "@shared/models/data-table-actions.model";
import {DeleteDialog} from "@shared/models/delete-dialog.model";
import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
@@ -130,7 +129,7 @@ export abstract class SharedAbstractListRoutable<TResourceModel extends BaseReso
abstract conditionDisplayDeleteButton(model: TResourceModel | undefined): boolean;
goToEdit(model: TResourceModel): void {
- this._store.dispatch(new Navigate([StoreRouteLocalUtil.getEditRoute(this._state, model.resId)]));
+ this._store.dispatch(new Navigate([StoreRouteLocalUtil.getEditRoute(this._state, model.resId)], {}, {skipLocationChange: true}));
}
delete(model: TResourceModel): void {
@@ -153,7 +152,7 @@ export abstract class SharedAbstractListRoutable<TResourceModel extends BaseReso
}
create(element: ElementRef): void {
- this.navigate(StoreRouteLocalUtil.getCreateRoute(this._state));
+ this.navigateNavigate(new Navigate([StoreRouteLocalUtil.getCreateRoute(this._state)], {}, {skipLocationChange: true}));
}
getAll(queryParameters?: QueryParameters): void {
@@ -172,10 +171,6 @@ export abstract class SharedAbstractListRoutable<TResourceModel extends BaseReso
back(): void {
this._store.dispatch(new Navigate(RouteUtil.generateFullUrlFromActivatedRouteNormal(this._route.parent.parent)));
}
-
- navigate(route: RoutesEnum): void {
- this._store.dispatch(new Navigate([route]));
- }
}
export interface SharedAbstractListRoutableOption<TResourceModel> {
diff --git a/src/app/shared/enums/label-translate.enum.ts b/src/app/shared/enums/label-translate.enum.ts
index 8f46638ef..1ac5b965e 100644
--- a/src/app/shared/enums/label-translate.enum.ts
+++ b/src/app/shared/enums/label-translate.enum.ts
@@ -4,8 +4,13 @@ export class LabelTranslateEnum {
static back: string = MARK_AS_TRANSLATABLE("general.button.back");
static backToHomePage: string = MARK_AS_TRANSLATABLE("general.button.backToHomePage");
static backToList: string = MARK_AS_TRANSLATABLE("general.button.backToList");
- static backToDetail: string = MARK_AS_TRANSLATABLE("general.button.backToDetail");
- static backToAdminHome: string = MARK_AS_TRANSLATABLE("general.button.backToAdminHome");
+ static exitEditMode: string = MARK_AS_TRANSLATABLE("general.button.exitEditMode");
+ static backToAdmin: string = MARK_AS_TRANSLATABLE("general.button.backToAdmin");
+ static backToStoragionList: string = MARK_AS_TRANSLATABLE("general.button.backToStoragionList");
+ static backToArchiveOrders: string = MARK_AS_TRANSLATABLE("general.button.backToArchiveOrders");
+ static backToJobDetail: string = MARK_AS_TRANSLATABLE("general.button.backToJobDetail");
+ static backToNotification: string = MARK_AS_TRANSLATABLE("general.button.backToNotification");
+ static backToPreservationPlanning: string = MARK_AS_TRANSLATABLE("general.button.backToPreservationPlanning");
static save: string = MARK_AS_TRANSLATABLE("general.button.save");
static cancel: string = MARK_AS_TRANSLATABLE("general.button.cancel");
static create: string = MARK_AS_TRANSLATABLE("general.button.create");
@@ -257,6 +262,7 @@ export class LabelTranslateEnum {
static format: string = MARK_AS_TRANSLATABLE("general.label.format");
static clientId: string = MARK_AS_TRANSLATABLE("general.label.clientId");
static urlRedirect: string = MARK_AS_TRANSLATABLE("general.label.urlRedirect");
+ static nameLabel: string = MARK_AS_TRANSLATABLE("general.label.name");
static fileName: string = MARK_AS_TRANSLATABLE("general.label.fileName");
static runNumber: string = MARK_AS_TRANSLATABLE("general.label.runNumber");
static odConformance: string = MARK_AS_TRANSLATABLE("general.label.odConformance");
diff --git a/src/app/shared/features/aip/components/presentationals/aip-form/shared-aip-form.presentational.html b/src/app/shared/features/aip/components/presentationals/aip-form/shared-aip-form.presentational.html
index 722345193..56a3325e7 100644
--- a/src/app/shared/features/aip/components/presentationals/aip-form/shared-aip-form.presentational.html
+++ b/src/app/shared/features/aip/components/presentationals/aip-form/shared-aip-form.presentational.html
@@ -23,7 +23,7 @@
</mat-form-field>
<mat-form-field>
- <mat-label>{{labelTranslateEnum.name | translate }}</mat-label>
+ <mat-label>{{labelTranslateEnum.nameLabel | translate }}</mat-label>
<input matInput
[formControlName]="formDefinition.name"
>
diff --git a/src/app/shared/features/aip/components/routables/aip-collection/shared-aip-collection.routable.ts b/src/app/shared/features/aip/components/routables/aip-collection/shared-aip-collection.routable.ts
index 17915a427..9d9109fc1 100644
--- a/src/app/shared/features/aip/components/routables/aip-collection/shared-aip-collection.routable.ts
+++ b/src/app/shared/features/aip/components/routables/aip-collection/shared-aip-collection.routable.ts
@@ -85,7 +85,7 @@ export class SharedAipCollectionRoutable extends SharedAbstractDetailEditRoutabl
this.columns = [
{
field: "info.name" as any,
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isSortable: true,
diff --git a/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.html b/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.html
index 0b05fcaec..395e4e6d4 100644
--- a/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.html
+++ b/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.html
@@ -5,6 +5,7 @@
<dlcm-shared-banner-edit-mode [isEdit]="isEdit"></dlcm-shared-banner-edit-mode>
<dlcm-shared-button-toolbar-detail [mode]="'detail'"
+ [keyBackButtonToTranslate]="backButtonLabel"
[formPresentational]="formPresentational"
[currentModel]="currentObs | async"
[deleteAvailable]="deleteAvailable"
diff --git a/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.ts b/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.ts
index 838462c5e..e783082ea 100644
--- a/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.ts
+++ b/src/app/shared/features/aip/components/routables/aip-detail-edit/shared-aip-detail-edit.routable.ts
@@ -106,6 +106,7 @@ export class SharedAipDetailEditRoutable extends SharedAbstractDetailEditCommonR
storagion_number: number | undefined = undefined;
mode: AipMode;
+ backButtonLabel: string;
private currentTab: Tab;
@@ -254,6 +255,7 @@ export class SharedAipDetailEditRoutable extends SharedAbstractDetailEditCommonR
this.storagion_number = +this._route.snapshot.parent.paramMap.get(PreservationPlanningRoutesEnum.storagionNumberWithoutPrefixParam);
}
super.ngOnInit();
+ this._computeBackButtonLabel();
this.subscribe(this._router.events
.pipe(
@@ -279,6 +281,19 @@ export class SharedAipDetailEditRoutable extends SharedAbstractDetailEditCommonR
}
}
+ private _computeBackButtonLabel(): void {
+ switch (this.mode) {
+ case AipMode.AIP_STEWARD:
+ this.backButtonLabel = LabelTranslateEnum.backToNotification;
+ break;
+ case AipMode.DOWNLOADED_AIP:
+ case AipMode.AIP:
+ default:
+ this.backButtonLabel = LabelTranslateEnum.backToList;
+ break;
+ }
+ }
+
simpleChecksum(): void {
this._store.dispatch(new SharedAipAction.SimpleChecksum(this._resId));
}
diff --git a/src/app/shared/features/aip/components/routables/aip-list/shared-aip-list.routable.ts b/src/app/shared/features/aip/components/routables/aip-list/shared-aip-list.routable.ts
index 8da604bfe..fbd9e267a 100644
--- a/src/app/shared/features/aip/components/routables/aip-list/shared-aip-list.routable.ts
+++ b/src/app/shared/features/aip/components/routables/aip-list/shared-aip-list.routable.ts
@@ -74,7 +74,7 @@ import {
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class SharedAipListRoutable extends SharedAbstractListRoutable<Aip, SharedAipStateModel> implements OnInit, OnDestroy {
- readonly KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.back;
+ KEY_BACK_BUTTON: string | undefined = LabelTranslateEnum.back;
readonly KEY_CREATE_BUTTON: string = undefined;
readonly KEY_PARAM_NAME: keyof Aip & string = undefined;
@@ -124,6 +124,7 @@ export class SharedAipListRoutable extends SharedAbstractListRoutable<Aip, Share
super.ngOnInit();
this.mode = AipHelper.determineMode(this._store);
+ this._computeBackButtonLabel();
this.updateListWithCurrentTab();
this.subscribe(this.observeRoutingUpdate());
if (this.mode === AipMode.AIP) {
@@ -131,6 +132,21 @@ export class SharedAipListRoutable extends SharedAbstractListRoutable<Aip, Share
}
}
+ private _computeBackButtonLabel(): void {
+ switch (this.mode) {
+ case AipMode.AIP:
+ this.KEY_BACK_BUTTON = LabelTranslateEnum.backToStoragionList;
+ break;
+ case AipMode.DOWNLOADED_AIP:
+ this.KEY_BACK_BUTTON = LabelTranslateEnum.backToPreservationPlanning;
+ break;
+ case AipMode.AIP_STEWARD:
+ default:
+ this.KEY_BACK_BUTTON = LabelTranslateEnum.back;
+ break;
+ }
+ }
+
private observeRoutingUpdate(): Observable<any> {
return this._router.events
.pipe(
@@ -160,7 +176,7 @@ export class SharedAipListRoutable extends SharedAbstractListRoutable<Aip, Share
this.columns = [
{
field: "info.name" as any,
- header: LabelTranslateEnum.name,
+ header: LabelTranslateEnum.nameLabel,
type: FieldTypeEnum.string,
order: OrderEnum.none,
isFilterable: true,
diff --git a/src/app/shared/models/extra-button-toolbar.model.ts b/src/app/shared/models/extra-button-toolbar.model.ts
index eb7ea9da2..6297f78ba 100644
--- a/src/app/shared/models/extra-button-toolbar.model.ts
+++ b/src/app/shared/models/extra-button-toolbar.model.ts
@@ -1,8 +1,8 @@
import {ElementRef} from "@angular/core";
+import {Navigate} from "@ngxs/router-plugin";
import {MatButtonThemeClassName} from "@shared/directives/shared-mat-button-theme/shared-mat-button-theme.directive";
import {DataTestEnum} from "@shared/enums/data-test.enum";
import {IconNameEnum} from "@shared/enums/icon-name.enum";
-import {RoutesEnum} from "@shared/enums/routes.enum";
import {
EMPTY,
Observable,
@@ -24,7 +24,7 @@ export interface ExtraButtonToolbar<TResourceModel extends BaseResource> {
typeButton?: MatButtonThemeClassName;
labelToTranslate: (current?: TResourceModel | undefined) => ObservableOrPromiseOrValue<string>;
tooltipToTranslate?: string | undefined;
- route?: RoutesEnum;
+ navigate?: Navigate;
callback?: (current?: TResourceModel | undefined, buttonElementRef?: ElementRef | undefined) => void;
order?: number;
dataTest?: DataTestEnum;
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 79791d54b..0c752944f 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -376,18 +376,8 @@
},
"editCurrentUser": "Warnung, Sie bearbeiten möglicherweise Ihre eigenen Informationen!",
"form": {
- "email": "E-Mail",
- "externalUid": "externe Uid",
- "firstName": "Vorname",
- "homeOrganization": "Heimatorganisation",
- "lastName": "Nachname",
- "person": "Person",
- "role": "Rolle",
- "tooltip": {
- "goToPerson": "Siehe Personendetail"
- },
- "lastLoginTime": "Letzte Anmeldezeit",
- "lastLoginIpAddress": "Letzte Anmelde-IP-Adresse"
+ "lastLoginIpAddress": "Letzte Anmelde-IP-Adresse",
+ "lastLoginTime": "Letzte Anmeldezeit"
},
"home": {
"subtitle": "Beschreibt Benutzer"
@@ -462,11 +452,6 @@
"darkMode": "Dunkler Modus",
"themeSelector": "Thema der Anwendung"
},
- "navigation": {
- "button": {
- "create": "erstellen"
- }
- },
"notFound": {
"title": "Die angeforderte Ressource existiert nicht oder nicht mehr..."
},
@@ -925,10 +910,14 @@
"approve": "Genehmigen",
"approveDisposal": "Entsorgung genehmigen",
"back": "Zurück",
- "backToAdminHome": "Zurück zu Verwaltung home",
- "backToDetail": "Zurück zu den Details",
+ "backToAdmin": "Zurück zu Verwaltung",
+ "backToArchiveOrders": "Zurück zu den Archivbestellungen",
"backToHomePage": "Zurück zur Startseite",
+ "backToJobDetail": "Zurück zu Jobdetails",
"backToList": "Zurück zur Liste",
+ "backToNotification": "Zurück zur Benachrichtigung",
+ "backToPreservationPlanning": "Zurück zum Konservierungsraum",
+ "backToStoragionList": "Zurück zur Storagion-Liste",
"cancel": "Abbrechen",
"changeDataCategoryType": "Daten ändern Kategorie / Typ",
"check": "Siehe",
@@ -947,6 +936,7 @@
"download": "Herunterladen",
"downloadFolder": "Download-Ordner",
"edit": "Bearbeiten",
+ "exitEditMode": "Beenden des Bearbeitungsmodus",
"extendTheRetention": "Erweitern Sie die Retention",
"goToAip": "Weiter zu AIP",
"init": "Init",
@@ -1137,6 +1127,7 @@
"metadataVersion": "Metadaten-Version",
"monitoring": "Ãœberwachung",
"myOrders": "Meine Befehle",
+ "name": "Name",
"newSubDirectory": "Neues Unterverzeichnis",
"noFiltering": "Keine Filterung",
"notification": "Benachrichtigung",
@@ -1880,4 +1871,4 @@
"required": "Dieses Feld muss ausgefüllt werden"
}
}
-}
+}
\ No newline at end of file
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index fad074845..227c42efc 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -376,18 +376,8 @@
},
"editCurrentUser": "Warning, you may be editing your own information!",
"form": {
- "email": "Email",
- "externalUid": "external Uid",
- "firstName": "First name",
- "homeOrganization": "Home Organization",
- "lastName": "Last name",
- "person": "Person",
- "role": "Role",
- "tooltip": {
- "goToPerson": "See person detail"
- },
- "lastLoginTime": "Last login time",
- "lastLoginIpAddress": "Last login IP address"
+ "lastLoginIpAddress": "Last login IP address",
+ "lastLoginTime": "Last login time"
},
"home": {
"subtitle": "Describes Users"
@@ -462,11 +452,6 @@
"darkMode": "Dark mode",
"themeSelector": "Application theme"
},
- "navigation": {
- "button": {
- "create": "Create"
- }
- },
"notFound": {
"title": "The requested resource does not exist or no longer exists..."
},
@@ -925,10 +910,14 @@
"approve": "Approve",
"approveDisposal": "Approve disposal",
"back": "Back",
- "backToAdminHome": "Back to administration home",
- "backToDetail": "Back to detail",
+ "backToAdmin": "Back to administration",
+ "backToArchiveOrders": "Back to archive orders",
"backToHomePage": "Back to home page",
+ "backToJobDetail": "Back to job detail",
"backToList": "Back to list",
+ "backToNotification": "Back to notification",
+ "backToPreservationPlanning": "Back to preservation space",
+ "backToStoragionList": "Back to storagion list",
"cancel": "Cancel",
"changeDataCategoryType": "Change data Category / Type",
"check": "Check",
@@ -947,6 +936,7 @@
"download": "Download",
"downloadFolder": "Download folder",
"edit": "Edit",
+ "exitEditMode": "Exit edit mode",
"extendTheRetention": "Extend the retention",
"goToAip": "Go to AIP",
"init": "Init",
@@ -1137,6 +1127,7 @@
"metadataVersion": "Metadata version",
"monitoring": "Monitoring",
"myOrders": "My orders",
+ "name": "Name",
"newSubDirectory": "New sub directory",
"noFiltering": "No filtering",
"notification": "Notification",
@@ -1880,4 +1871,4 @@
"required": "This field is required"
}
}
-}
+}
\ No newline at end of file
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index b18b989af..9414e2ffc 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -376,18 +376,8 @@
},
"editCurrentUser": "Attention, vous allez éditer vos propres informations !",
"form": {
- "email": "Email",
- "externalUid": "Identifiant externe",
- "firstName": "Prénom",
- "homeOrganization": "Unitée Organisationnelle",
- "lastName": "Nom",
- "person": "Personne liée",
- "role": "Rôle",
- "tooltip": {
- "goToPerson": "Voir le détail de la personne"
- },
- "lastLoginTime": "Dernière heure de connexion",
- "lastLoginIpAddress": "Dernière adresse IP de connexion"
+ "lastLoginIpAddress": "Dernière adresse IP de connexion",
+ "lastLoginTime": "Dernière heure de connexion"
},
"home": {
"subtitle": "Décrit l'utilisateur-rice"
@@ -462,11 +452,6 @@
"darkMode": "Mode sombre",
"themeSelector": "Thème d'application"
},
- "navigation": {
- "button": {
- "create": "Créer"
- }
- },
"notFound": {
"title": "La resource demandée n'existe pas ou plus..."
},
@@ -925,10 +910,14 @@
"approve": "Approuver",
"approveDisposal": "Approuver l'élimination",
"back": "Retour",
- "backToAdminHome": "Retour à la page d'accueil de l'administration",
- "backToDetail": "Retour aux détails",
+ "backToAdmin": "Retour à l'administration",
+ "backToArchiveOrders": "Retour aux demandes d'archives",
"backToHomePage": "Retour à la page d'accueil",
+ "backToJobDetail": "Retour au détail du job",
"backToList": "Retour à la liste",
+ "backToNotification": "Retour à la notification",
+ "backToPreservationPlanning": "Retour à l'espace de préservation",
+ "backToStoragionList": "Retour à la liste des storagions",
"cancel": "Annuler",
"changeDataCategoryType": "Changement de données Catégorie / Type",
"check": "Vérifier",
@@ -947,6 +936,7 @@
"download": "Télécharger",
"downloadFolder": "Dossier de téléchargement",
"edit": "Modifier",
+ "exitEditMode": "Quitter le mode édition",
"extendTheRetention": "Prolonger la rétention",
"goToAip": "Aller à l'AIP",
"init": "Initialiser",
@@ -1137,6 +1127,7 @@
"metadataVersion": "Version des métadonnées",
"monitoring": "Surveillance",
"myOrders": "Mes demandes",
+ "name": "Nom",
"newSubDirectory": "Nouveau sous-répertoire",
"noFiltering": "Pas de filtrage",
"notification": "Notification",
@@ -1880,4 +1871,4 @@
"required": "Ce champ est obligatoire"
}
}
-}
+}
\ No newline at end of file
--
GitLab