Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html

@@ -49,9 +49,9 @@
 	<mat-horizontal-stepper [linear]="true" #stepper class="stepper" (selectionChange)="onMatStepperSelectionChange($event)" style="padding-left: 8px; padding-right: 15px;">
 
 		<!-- IMPORTANT TO BE !INVALID (WHEN THE TEMPLATE IS FINALIZED THE CONTORLS ARE DISABLED) -->
-		<mat-step [label]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.TITLE' | translate" [completed]="(!formGroup.get('label').invalid && !formGroup.get('description').invalid && !formGroup.get('language').invalid)">
 			<!-- <ng-template matStepLabel>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.TITLE' | translate}}
 				</ng-template> -->
+		<mat-step [label]="generalInfoStepperLabel" [completed]="(!formGroup.get('label').invalid && !formGroup.get('description').invalid && !formGroup.get('language').invalid)">
 			<div class="col-9">
 				<div class="col">
 					<div class="col-12">
@@ -169,7 +169,7 @@
 					</div> -->
 			</div>
 		</mat-step>
-		<mat-step [label]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.TITLE' | translate" [completed]="formGroup.valid">
+		<mat-step [label]="fromStepperLabel" [completed]="formGroup.valid">
 			<div class="row">
 
 				<!-- TABLE -->

dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts

@@ -86,6 +86,15 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 	previewPropertiesFormGroup: UntypedFormGroup = null;
 	finalPreviewDescriptionTemplatePersist: DescriptionTemplatePersist;
 
+
+	get generalInfoStepperLabel(): string {
+		return '1 ' + this.language.instant('DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.TITLE');
+	}
+
+	get fromStepperLabel(): string {
+		return '2 ' + this.language.instant('DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.TITLE');
+	}
+
 	protected get canDelete(): boolean {
 		return !this.isDeleted && !this.isNew && this.hasPermission(this.authService.permissionEnum.DeleteDescriptionTemplate);
 	}