From 32c45520b474f4dad8961fdcb470d7f7bc94b6ed Mon Sep 17 00:00:00 2001 From: Aldo Mihasi Date: Mon, 25 Sep 2023 10:36:04 +0300 Subject: [PATCH] make router link for add description buttons pointing to dmp editor --- dmp-frontend/src/app/ui/dashboard/dashboard.component.ts | 2 +- .../src/app/ui/dashboard/drafts/drafts.component.html | 4 ++-- .../recent-edited-activity.component.html | 2 +- .../recent-edited-dmp-activity.component.html | 2 +- .../app/ui/dataset/listing/dataset-listing.component.ts | 2 +- .../dmp-editor-blueprint.component.html | 8 ++++---- .../listing/listing-item/dmp-listing-item.component.html | 2 +- .../src/app/ui/dmp/overview/dmp-overview.component.html | 2 +- dmp-frontend/src/assets/i18n/de.json | 1 + dmp-frontend/src/assets/i18n/en.json | 1 + dmp-frontend/src/assets/i18n/es.json | 1 + dmp-frontend/src/assets/i18n/gr.json | 1 + dmp-frontend/src/assets/i18n/hr.json | 1 + dmp-frontend/src/assets/i18n/pl.json | 1 + dmp-frontend/src/assets/i18n/pt.json | 1 + dmp-frontend/src/assets/i18n/sk.json | 1 + dmp-frontend/src/assets/i18n/sr.json | 1 + dmp-frontend/src/assets/i18n/tr.json | 1 + 18 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index ed6f36cdc..9897d725a 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -302,7 +302,7 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC if (result.startNewDmp) { this.openNewDmpDialog(); } else { - this.router.navigate(['/datasets', 'new', result.formGroup.get('dmp').value.id]); + this.router.navigate(['/plans', 'edit', result.formGroup.get('dmp').value.id]); // Save dataset direct but missing title and template // this.datasetWizardService.createDataset(result.formGroup.getRawValue()) // .pipe(takeUntil(this._destroyed)) diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html index b35b6b4c8..6ffe6c375 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -45,7 +45,7 @@ . {{ 'DMP-LISTING.GRANT' | translate }}: {{activity.grant}} -
{{'DMP-LISTING.CONTAINED-DATASETS' | translate}}: ({{ getDatasets(activity).length }}) +
{{'DMP-LISTING.CONTAINED-DESCRIPTIONS' | translate}}: ({{ getDatasets(activity).length }})
@@ -58,7 +58,7 @@
open_in_new{{'DMP-LISTING.ACTIONS.EXPORT' | translate}} - add{{'DMP-LISTING.ACTIONS.ADD-DATASET-SHORT' | translate}} + add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} group_add{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}} filter_none{{'DMP-LISTING.ACTIONS.CLONE' | translate}} library_books{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index b44ec5d2c..75d48c7d0 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -61,7 +61,7 @@
open_in_new{{'DMP-LISTING.ACTIONS.EXPORT' | translate}} - add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} + add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} group_add{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}} filter_none{{'DMP-LISTING.ACTIONS.CLONE' | translate}} library_books{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html index 36dd0045b..5bc4c55fe 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html @@ -55,7 +55,7 @@
open_in_new{{'DMP-LISTING.ACTIONS.EXPORT' | translate}} - add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} + add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} group_add{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}} filter_none{{'DMP-LISTING.ACTIONS.CLONE' | translate}} library_books{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index f4f90fb18..0a1e89bdc 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -430,7 +430,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB if (result.startNewDmp) { this.openNewDmpDialog(); } else { - this.router.navigate(['/datasets', 'new', result.formGroup.get('dmp').value.id]); + this.router.navigate(['/plans', 'edit', result.formGroup.get('dmp').value.id]); } } }); diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html index 14c836714..7ddfbb9d0 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html @@ -54,7 +54,7 @@ @@ -72,9 +72,9 @@ chevron_right
- + -
@@ -326,7 +326,7 @@
-->
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html index 495dc022a..1527c2c8d 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html @@ -29,7 +29,7 @@
open_in_new{{'DMP-LISTING.ACTIONS.EXPORT' | translate}} - add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} + add{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} group_add{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}} filter_none{{'DMP-LISTING.ACTIONS.CLONE' | translate}} library_books{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 77a5e3435..a29352f1a 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -106,7 +106,7 @@
- + add {{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index e5e758d0e..ede5f82f9 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Invite", "ADD-DATASET": "Datensatzbeschreibung zum DMP hinzufügen", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Alle DMP-Datensatzbeschreibungen auflisten", "NEW-VERSION": "Neue Version", "START-NEW-VERSION": "Start New Version", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index ed899b777..18d93532a 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Invite", "ADD-DATASET": "Add Dataset To DMP", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "List All DMP Datasets", "NEW-VERSION": "New Version", "START-NEW-VERSION": "Start New Version", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 3a7d4d58a..1a97b87e2 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Invitar", "ADD-DATASET": "Añadir la descripción del dataset al PGD", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Listar todas las descripciones de los dataset", "NEW-VERSION": "Nueva versión", "START-NEW-VERSION": "Iniciar una nueva versión", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index fa9afce17..25f81be6d 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Πρόσκληση", "ADD-DATASET": "Προσθήκη Περιγραφής Συνόλου Δεδομένων στο Σχέδιο Διαχείρισης Δεδομένων", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Κατάλογος όλων των Περιγραφών Συνόλου Δεδομένων", "NEW-VERSION": "Νέα Έκδοση", "START-NEW-VERSION": "Νέα Έκδοση", diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json index 6c4b1674a..96f80dfbe 100644 --- a/dmp-frontend/src/assets/i18n/hr.json +++ b/dmp-frontend/src/assets/i18n/hr.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Pozovi", "ADD-DATASET": "Dodaj skup podataka u Plan", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Prikaži sve skupove podataka", "NEW-VERSION": "Nova verzija", "START-NEW-VERSION": "Započni novu verziju", diff --git a/dmp-frontend/src/assets/i18n/pl.json b/dmp-frontend/src/assets/i18n/pl.json index 0f0455723..5518c82bf 100644 --- a/dmp-frontend/src/assets/i18n/pl.json +++ b/dmp-frontend/src/assets/i18n/pl.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Zaproś", "ADD-DATASET": "Dodaj zbiór danych do DMP", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Wyświetl na liście wszystkie zbiory danych DMP", "NEW-VERSION": "Nowa wersja", "START-NEW-VERSION": "Rozpocznij nową wersję", diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index b7428e391..5b2b35a8f 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Convidar", "ADD-DATASET": "Adicionar Dataset ao PGD", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Listar todos os Datasets do PGD", "NEW-VERSION": "Nova Versão", "START-NEW-VERSION": "Iniciar Nova Versão", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index fe5829a3f..40df8e640 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Pozvať", "ADD-DATASET": "Pridať súbor dát do DMP", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Uviesť všetky súbory dát DMP", "NEW-VERSION": "Nová verzia", "START-NEW-VERSION": "Začať novú verziu", diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index 712f339c2..4985eb72d 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Pozovite", "ADD-DATASET": "Dodajte skup podataka u Plan", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Prikažite sve skupove podataka", "NEW-VERSION": "Nova verzija", "START-NEW-VERSION": "Započnite novu verziju", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 518a45bc8..aa0c256ff 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -651,6 +651,7 @@ "INVITE-SHORT": "Davet Et", "ADD-DATASET": "VYP'na Veri Seti Ekle", "ADD-DESCRIPTION-SHORT": "Add Description", + "ADD-DESCRIPTION-FOR-SECTION": "Add Description", "DATASETS": "Tüm VYP Veri Seti Tanımlarını Listele", "NEW-VERSION": "Yeni Sürüm", "START-NEW-VERSION": "Yeni Sürümü Başlat",