diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts index fafcd4f0f..4a9246688 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts @@ -23,7 +23,6 @@ import * as FileSaver from 'file-saver'; import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { DialogConfirmationUploadDatasetProfiles } from './criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; -import { ParseStatus } from './pipe/parse-status.pipe'; @Component({ selector: 'app-dataset-profile-listing-component', @@ -104,6 +103,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI refresh() { this.dataSource = new DatasetDataSource(this.datasetService, this._paginator, this.sort, this.criteria, this.itemId); + this._paginator.pageIndex = 0; } rowClick(rowId: String) { @@ -293,7 +293,8 @@ export class DatasetDataSource extends DataSource { }), map(result => { if (!result) { return []; } - if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } + // if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } + this.totalCount = result.totalCount; return result.data; })); } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index 3a6d2fa3b..c420ad23c 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -8,9 +8,14 @@
-
{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}
-
{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}
-
{{ formGroup.get('label').value }} ({{'DMP-EDITOR.CHANGES' | translate}})
+ +
{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}
+
{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}
+
{{ formGroup.get('label').value }} ({{'DMP-EDITOR.CHANGES' | translate}})
+
+ +
{{'DMP-EDITOR.TITLE.PREVIEW-DATASET' | translate}}
+
{{'DATASET-LISTING.TOOLTIP.TO-DMP' | translate}}
: {{ formGroup.get('dmp').value.label }}
@@ -21,7 +26,7 @@
-
+
- -
+
{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-ADD' | translate }}
- +
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index fc32448f5..ca5cd4282 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -281,7 +281,7 @@ } .stepper-options { - height: calc(100vh - 520px); + height: calc(100vh - 600px); overflow-y: auto; .main-info { padding-left: .2rem; diff --git a/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.html b/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.html index 91a1c74f9..7cdd40f3b 100644 --- a/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.html +++ b/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.html @@ -12,7 +12,7 @@
- Are those options not enough? Start new DMP + {{'DASHBOARD.ADD-NEW-DATASET.OPTIONS-NOT-ENOUGH' | translate}} {{'DASHBOARD.ADD-NEW-DATASET.START-NEW-DMP' | translate}}
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 7599fb4d4..4dfa5fba9 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Clone", "NEW-VERSION": "New Version", "CREATE-DATASET": "Creating Dataset Description", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Previewing Dataset" }, "FIELDS": { "NAME": "Titel", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index d3cf97f6e..8ca742e8a 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Clone", "NEW-VERSION": "New Version", "CREATE-DATASET": "Creating Dataset", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Previewing Dataset" }, "FIELDS": { "NAME": "Title of DMP", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 1c367155c..0902b7807 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Clone", "NEW-VERSION": "New Version", "CREATE-DATASET": "Creating Dataset Description", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Previewing Dataset" }, "FIELDS": { "NAME": "Título", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index fab88b588..a41bf4fbe 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Κλώνος", "NEW-VERSION": "Νέα Έκδοση", "CREATE-DATASET": "Δημιουργία Συνόλου Δεδομένων", - "SUBTITLE": "Μονοσήμαντο Αναγνωριστικό Ψηφιακού Αντικειμένου (DOI)" + "SUBTITLE": "Μονοσήμαντο Αναγνωριστικό Ψηφιακού Αντικειμένου (DOI)", + "PREVIEW-DATASET": "Προβολή Συνόλου Δεδομένων" }, "FIELDS": { "NAME": "Τίτλος", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index 8ce4d7faa..2fd6ede35 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Duplicar", "NEW-VERSION": "Nova Versão", "CREATE-DATASET": "Criar Dataset", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Pré-visualização do conjunto de dados" }, "FIELDS": { "NAME": "Título do PGD", @@ -1119,7 +1120,7 @@ "NEW": "Novo Plano de Gestão de Dados", "EDIT": "Editar", "INTRO": "Um Plano de Gestão de Dados (PGD) permite uma maior proximidade com o local onde os seus dados são gerados, analisados e armazenados. O Argos é uma ferramenta aberta, extensível e colaborativa que disponibiliza Planos de Gestão de Dados FAIR e Abertos.", - "INTRO-TIP": "Dica: Adicione tantos conjuntos de dados quantos os que tiver para descrever, para não gerar confusão na descrição da informação." + "INTRO-TIP": "Dica: Adicione novos modelos de dados para descrever diferentes tipos de dados ou áreas temáticas." }, "FIELDS": { "NAME": "Designação do Dataset", @@ -1147,12 +1148,12 @@ "DELETE": "Eliminar", "UPDATE": "Atualizar", "DISCARD":{ - "DISCARD-NEW-MESSAGE":"All changes made will be discarded and you will be redirected back to DMP Editor. Would you like to proceed?", - "DISCARD-NEW-CONFIRM":"Yes, discard and remove dataset.", - "DISCARD-NEW-DENY":"No.", + "DISCARD-NEW-MESSAGE":"Todas as alterações irão ser descartadas e será redirecionado para o editor do PGD. Pretende continuar?", + "DISCARD-NEW-CONFIRM":"Sim, pretendo descartar e remover este modelo de dados.", + "DISCARD-NEW-DENY":"Não", "DISCARD-EDITED-MESSAGE":"All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM":"Yes, revert changes and go back.", - "DISCARD-EDITED-DENY":"No." + "DISCARD-EDITED-DENY":"Não" } }, "PLACEHOLDER": { @@ -1160,7 +1161,7 @@ "EXTERNAL-LINK": "Forneça uma ligação URL externa" }, "HINT": { - "DESCRIPTION": "Descrever brevemente o contexto e o objetivo do conjunto de dados", + "DESCRIPTION": "Descrever brevemente o contexto e o objetivo", "TITLE": "Uma breve descrição do que o/a ", "TITLE-REST": "é sobre o seu âmbito e objetivos." }, @@ -1500,10 +1501,14 @@ "START-NEW": "Crie o seu PGD através do botão “Iniciar novo PGD”.", "IMPORT-DMP": "Aqui pode importar um PGD pré-existente...", "START-WIZARD": "... ou criar um novo no Argos!", - "DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.", - "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", + "DATASET": "Aqui pode visualizar e editar todos os Modelos de Dados para os quais tenha contribuído ou criado.", + "NEW-DATASET": "Através do botão “Adicionar um Modelo de Dados” pode em qualquer altura do processo de investigação adicionar e preencher um novo modelo de dados.", "GOT-IT":"Ok, entendi!", - "LEAVE-TOUR":"Saltar a Apresentação" + "LEAVE-TOUR":"Fechar" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Não pretende selecionar nenhum destes PGD?", + "START-NEW-DMP":"Criar novo PGD" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index c0fb71a62..757b7ed09 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Klonovať", "NEW-VERSION": "Nová verzia", "CREATE-DATASET": "Vytvorenie súboru dát", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Previewing Dataset" }, "FIELDS": { "NAME": "Názov", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index 0fb69363b..26d49d8dd 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Napravite kopiju", "NEW-VERSION": "Nova verzija", "CREATE-DATASET": "Kreiranje skupa podataka", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Previewing Dataset" }, "FIELDS": { "NAME": "Naslov Plana", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 6bb23785d..158cb4ab6 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -916,7 +916,8 @@ "CLONE-DMP": "Clone", "NEW-VERSION": "New Version", "CREATE-DATASET": "Creating Dataset", - "SUBTITLE": "DOI" + "SUBTITLE": "DOI", + "PREVIEW-DATASET": "Previewing Dataset" }, "FIELDS": { "NAME": "Başlık", @@ -1504,6 +1505,10 @@ "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "GOT-IT":"Got it!", "LEAVE-TOUR":"Leave Tour" + }, + "ADD-NEW-DATASET":{ + "OPTIONS-NOT-ENOUGH":"Are those options not enough?", + "START-NEW-DMP":"Start new DMP" } }, "USER-DIALOG": { diff --git a/dmp-frontend/src/assets/resources/skipDisable.json b/dmp-frontend/src/assets/resources/skipDisable.json index 52c3be7b1..7cde08f3d 100644 --- a/dmp-frontend/src/assets/resources/skipDisable.json +++ b/dmp-frontend/src/assets/resources/skipDisable.json @@ -1,4 +1,5 @@ [ + "DatasetProfileEditorModel.description", "DatasetProfileEditorModel.label", "SectionEditorModel.title", "SectionEditorModel.description",