Merge remote-tracking branch 'origin/Development' into Development

dmp-frontend/src/app/core/services/culture/language-info-service.ts

@@ -29,6 +29,7 @@ export class LanguageInfoService {
 	getLanguageInfoValues(): LanguageInfo[] {
 		const values: LanguageInfo[] = [];
 		this.languageInfoValues.forEach((value) => values.push(value));
+		values.sort((a,b)=> a.name.localeCompare(b.name));
 		return values;
 	}
 

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<DatasetListingModel> {
 			}),
 			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;
 			}));
 	}

dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html

@@ -8,9 +8,14 @@
 					<div class="col">
 						<div class="row">
 							<div class="col info">
-								<div *ngIf="isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}</div>
+								<ng-container *ngIf="!viewOnly else viewOnlyTemplate">
-								<div *ngIf="!isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}</div>
+									<div *ngIf="isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}</div>
-								<div class="dataset-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="dataset-changes">({{'DMP-EDITOR.CHANGES' | translate}})</span></div>
+									<div *ngIf="!isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}</div>
+									<div class="dataset-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="dataset-changes">({{'DMP-EDITOR.CHANGES' | translate}})</span></div>
+								</ng-container>
+								<ng-template #viewOnlyTemplate>
+									<div class="dataset-title">{{'DMP-EDITOR.TITLE.PREVIEW-DATASET' | translate}}</div>
+								</ng-template>
 								<div class="d-flex flex-direction-row dmp-info">
 									<div class="col-auto dataset-to-dmp">{{'DATASET-LISTING.TOOLTIP.TO-DMP' | translate}}</div>
 									<div class="dmp-title p-0">:&nbsp;{{ formGroup.get('dmp').value.label }}</div>
@@ -21,7 +26,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="row">
+							<div class="row" *ngIf="!viewOnly">
 								<div class="col-auto d-flex align-items-center p-0">
 									<button *ngIf="isDirty()" type="button" mat-raised-button class="dataset-discard-btn" (click)="discardChanges()">
 										{{'DMP-EDITOR.ACTIONS.DISCARD' | translate}}
@@ -59,7 +64,7 @@
 						</div>
 					</div>
 					<div class="stepper-actions">
-						<div mat-raised-button type="button" class="col-auto previous stepper-btn mr-2 ml-auto" [ngClass]="{'previous-disabled': this.step === 0}" (click)="previousStep()">
+						<div mat-raised-button type="button" class="col-auto previous stepper-btn mr-2" [ngClass]="{'previous-disabled': this.step === 0}" (click)="previousStep()">
 							<span class="material-icons">chevron_left</span>
 							<div>{{'DMP-EDITOR.STEPPER.PREVIOUS' | translate}}</div>
 						</div>
@@ -71,12 +76,12 @@
 							<span class="material-icons">chevron_right</span>
 							<div>{{'DMP-EDITOR.STEPPER.NEXT' | translate}}</div>
 						</div>
-						<div *ngIf="this.step === this.maxStep && !lockStatus && formGroup.get('profile').value" mat-raised-button type="button" class="col-auto stepper-btn add-dataset-btn ml-auto">
+						<div *ngIf="(this.step === this.maxStep) && !lockStatus && formGroup.get('profile').value && !viewOnly" mat-raised-button type="button" class="col-auto stepper-btn add-dataset-btn ml-auto">
 							<div (click)="save(saveAnd.addNew)">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-ADD' | translate }}</div>
 						</div>
 					</div>
 					<div class="col-auto pr-0">
-						<app-form-progress-indication class="col-12" *ngIf="formGroup" [formGroup]="formGroup" [isDatasetEditor]="true"></app-form-progress-indication>
+						<app-form-progress-indication class="col-12" *ngIf="formGroup && !viewOnly" [formGroup]="formGroup" [isDatasetEditor]="true"></app-form-progress-indication>
 					</div>
 				</div>
 				<div class="col-auto form" id="dataset-editor-form">

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;

dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.html

@@ -12,7 +12,7 @@
 	</div>
 	<div class="row">
 		<div class="col-auto pb-4">
-			<span>Are those options not enough?</span>&nbsp;<span class="new-dmp" (click)="startNewDmp()">Start new DMP</span>
+			<span>{{'DASHBOARD.ADD-NEW-DATASET.OPTIONS-NOT-ENOUGH' | translate}}</span>&nbsp;<span class="new-dmp" (click)="startNewDmp()">{{'DASHBOARD.ADD-NEW-DATASET.START-NEW-DMP' | translate}}</span>
 		</div>
 	</div>
 	<div class="row">

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": {

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": {

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": {

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": {

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-MESSAGE":"Todas as alterações irão ser descartadas e será redirecionado para o editor do PGD. Pretende continuar?",
-				"DISCARD-NEW-CONFIRM":"Yes, discard and remove dataset.",
+				"DISCARD-NEW-CONFIRM":"Sim, pretendo descartar e remover este modelo de dados.",
-				"DISCARD-NEW-DENY":"No.",
+				"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.",
+			"DATASET": "Aqui pode visualizar e editar todos os Modelos de Dados para os quais tenha contribuído ou criado.",
-			"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
+			"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": {

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": {

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": {

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": {

dmp-frontend/src/assets/resources/skipDisable.json

@@ -1,4 +1,5 @@
 [
+	"DatasetProfileEditorModel.description",
 	"DatasetProfileEditorModel.label",
 	"SectionEditorModel.title",
 	"SectionEditorModel.description",