diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
index b8f262f803f42282dbb91248933a51f80c9344d2..a4eb95569df16667c7aa3ff6944be9a0e770e94f 100644
--- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
+++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
@@ -72,6 +72,7 @@ import {UserActionAddPuaControlComponent} from '../../../user-actions/add-pua-co
const FILE_TREE_METADATA_TRANSLATE_PATH = 'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA';
+const ADD_PUA_CONTROL_TRANSLATE_PATH = 'USER_ACTION.ADD_PUA_CONTROL';
function constantToTranslate() {
this.notificationAjoutMetadonnee = this.translated('.NOTIFICATION_AJOUT_METADONNEE');
@@ -80,6 +81,9 @@ function constantToTranslate() {
this.popupSousTitre = this.translated('.POPUP_SOUS_TITRE');
this.popupValider = this.translated('.POPUP_VALIDER');
this.popupAnnuler = this.translated('.POPUP_ANNULER');
+ this.popupControlOkLabel = this.translated('.POPUP_CONTROL_OK_BUTTON_LABEL');
+ this.popupControlSubTitleDialog = this.translated('.POPUP_CONTROL_SUB_TITLE_DIALOG');
+ this.popupControlTitleDialog = this.translated('.POPUP_CONTROL_TITLE_DIALOG');
}
@Component({
@@ -575,16 +579,16 @@ export class FileTreeMetadataComponent {
}
setControlsVues(elements: string[]){
- if(elements.includes("Enumération")){
+ if((this.isStandalone && elements.includes("Enumération")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.ENUMERATIONS_LABEL'))){
this.enumerationControl = true;
}
- if(elements.includes("Expression régulière")){
+ if((this.isStandalone && elements.includes("Expression régulière")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.EXPRESSION_REGULIERE_LABEL'))){
this.expressionControl = true;
}
- if(elements.includes("Longueur Min/Max")){
+ if((this.isStandalone && elements.includes("Longueur Min/Max")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.LENGTH_MIN_MAX_LABEL'))){
this.lengthControl = true;
}
- if(elements.includes("Valeur Min/Max")){
+ if((this.isStandalone && elements.includes("Valeur Min/Max")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.VALUE_MIN_MAX_LABEL'))){
this.valueControl = true;
}
diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html
index 779edab7f787cd23c9fdbde08b714b1fc1723e68..8fd573863765111bb64d13b5c8170d27f775a7e9 100644
--- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html
+++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html
@@ -13,7 +13,7 @@
</div>
<!-- The list of items to be selected-->
- <mat-list *ngIf="allowedChildren?.length; else noItemsLeftToAdd" class="list-box-head">
+ <mat-list *ngIf="allowedChildren?.length" class="list-box-head">
<span class="list-box-content-title">
<span [ngStyle]="{'margin-top': atLeastOneIsSelected ? '40px' : '0px'}"
class="paragraph-metadata-subtitle">Les contrôles à ajouter</span>
diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts
index bce846d08b0c4c5541f8bc296465b989767cfdc8..5897e77ffe2b86671cf71c942fb6496b62227ab8 100644
--- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts
+++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts
@@ -35,17 +35,26 @@ same conditions as regards security.
The fact that you are presently reading this means that you have had
knowledge of the CeCILL-C license and that you accept its terms.
*/
-import { Component, OnInit, TemplateRef } from '@angular/core';
-import { SedaData, SedaElementConstants } from '../../models/seda-data';
-import { FileNode } from '../../models/file-node';
-import { FileService } from '../../core/services/file.service';
-import { SedaService } from '../../core/services/seda.service';
+import { Component, OnInit } from '@angular/core';
import { MatDialogRef } from '@angular/material/dialog';
import { PastisDialogConfirmComponent } from '../../shared/pastis-dialog/pastis-dialog-confirm/pastis-dialog-confirm.component';
import { PastisDialogData } from '../../shared/pastis-dialog/classes/pastis-dialog-data';
import { PopupService } from '../../core/services/popup.service';
-import { Subscription } from 'rxjs';
-import { PastisPopupMetadataLanguageService } from '../../shared/pastis-popup-metadata-language/pastis-popup-metadata-language.service';
+import { environment } from 'projects/pastis/src/environments/environment';
+import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
+
+
+const ADD_PUA_CONTROL_TRANSLATE_PATH = 'USER_ACTION.ADD_PUA_CONTROL';
+
+function constantToTranslate() {
+ this.enumerationsLabel = this.translated('.ENUMERATIONS_LABEL');
+ this.expressionReguliereLabel = this.translated('.EXPRESSION_REGULIERE_LABEL');
+ this.lengthMinMaxLabel = this.translated('.LENGTH_MIN_MAX_LABEL');
+ this.valueMinMaxLabel = this.translated('.VALUE_MIN_MAX_LABEL');
+ this.enumerationsDefinition = this.translated('.ENUMERATIONS_DEFINITION');
+ this.expressionReguliereDefinition = this.translated('.EXPRESSION_REGULIERE_DEFINITION');
+}
+
@Component({
selector: 'pastis-user-action-add-metadata',
@@ -55,46 +64,30 @@ import { PastisPopupMetadataLanguageService } from '../../shared/pastis-popup-me
export class UserActionAddPuaControlComponent implements OnInit {
btnIsDisabled: boolean;
-
- sedaData: SedaData;
enumerationsLabel: string = "Enumération";
expressionReguliereLabel: string = "Expression régulière";
lengthMinMaxLabel: string = "Longueur Min/Max";
valueMinMaxLabel: string = "Valeur Min/Max";
+ enumerationsDefinition: string = "Signaler les valeurs autorisées";
+ expressionReguliereDefinition: string = "Définir une expression régulière pour la valeur de la métadonnée";
allowedChildren: string[];
- namesFiltered: any = [];
- sedaNodeFound: SedaData;
- selectedSedaNode: SedaData;
addedItems: string[] = [];
dialogData: PastisDialogData;
atLeastOneIsSelected: boolean;
- customTemplate: TemplateRef<any>
- fileNode: FileNode;
- sedaLanguage: boolean;
- sedaLanguageSub: Subscription;
+ isStandalone: boolean = environment.standalone;
constructor(public dialogRef: MatDialogRef<PastisDialogConfirmComponent>,
- private fileService: FileService, private sedaService: SedaService,
- private popUpService: PopupService, private sedaLanguageService: PastisPopupMetadataLanguageService) {
+ private popUpService: PopupService, private translateService: TranslateService) {
+ if(!this.isStandalone){
+ constantToTranslate.call(this);
+ this.translatedOnChange();
+ }
this.refreshAllowedChildren();
}
ngOnInit() {
- this.sedaLanguageSub = this.sedaLanguageService.sedaLanguage.subscribe(
- (value: boolean) => {
- this.sedaLanguage = value;
- },
- (error) => {
- console.log(error)
- }
- );
- this.fileService.nodeChange.subscribe(fileNode => { this.fileNode = fileNode })
- this.sedaData = this.sedaService.sedaRules[0];
-
- this.sedaNodeFound = this.fileNode.sedaData;
-
// Subscribe observer to button status and
// set the inital state of the ok button to disabled
this.popUpService.btnYesShoudBeDisabled.subscribe(status => {
@@ -102,24 +95,15 @@ export class UserActionAddPuaControlComponent implements OnInit {
})
}
-
- isElementSelected(element: string) {
- if (this.addedItems) {
- return this.addedItems.includes(element);
- }
- }
-
onRemoveSelectedElement(element: string) {
if(this.isExclusive(element)){
this.refreshAllowedChildren();
}else{
let indexOfElement = this.addedItems.indexOf(element)
- console.log(indexOfElement)
if (indexOfElement >= 0) {
this.allowedChildren.push(this.addedItems.splice(indexOfElement, 1)[0])
}
}
- console.error(this.allowedChildren)
this.addedItems.length > 0 ? this.atLeastOneIsSelected = true : this.atLeastOneIsSelected = false
this.upateButtonStatusAndDataToSend();
}
@@ -140,32 +124,14 @@ export class UserActionAddPuaControlComponent implements OnInit {
this.popUpService.disableYesButton(!this.atLeastOneIsSelected)
}
- onAllItemsAdded() {
- return this.allowedChildren.length === this.addedItems.length;
- }
-
- isElementComplex(element: SedaData) {
- if (element) {
- return element.Element === SedaElementConstants.complex;
+ getDefinition(element: string): string {
+ if(element === this.enumerationsLabel){
+ return this.enumerationsDefinition
}
- }
-
- getDefinition(element: SedaData): string {
- return element ? element.Definition : '';
- }
-
- onYesClick(): void {
- console.log("Clicked ok on dialog : %o", this.selectedSedaNode);
-
- }
- onNoClick(): void {
- this.dialogRef.close();
- }
-
- ngOnDestroy(): void {
- if (this.sedaLanguageSub != null) {
- this.sedaLanguageSub.unsubscribe();
+ if(element === this.expressionReguliereLabel){
+ return this.expressionReguliereDefinition
}
+ return '';
}
isExclusive(element: string): boolean{
@@ -180,12 +146,22 @@ export class UserActionAddPuaControlComponent implements OnInit {
}else{
this.allowedChildren = [
this.enumerationsLabel,
- this.valueMinMaxLabel,
- this.lengthMinMaxLabel,
this.expressionReguliereLabel
];
this.addedItems = [];
}
}
+ translatedOnChange(): void {
+ this.translateService.onLangChange
+ .subscribe((event: LangChangeEvent) => {
+ constantToTranslate.call(this);
+ console.log(event.lang);
+ });
+ }
+
+ translated(nameOfFieldToTranslate: string): string {
+ return this.translateService.instant(ADD_PUA_CONTROL_TRANSLATE_PATH + nameOfFieldToTranslate);
+ }
+
}
diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json
index 7d701f8c2ccd079938f992e947e119d3ee1fd63b..d80d2fc91b5e4a3215449c9c0737b6cc98c73357 100644
--- a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json
+++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json
@@ -182,7 +182,10 @@
"NOM_ATTRIBUT": "Attribute name",
"VALEUR_FIXE": "Fixed value",
"COMMENTAIRE": "Comment"
- }
+ },
+ "POPUP_CONTROL_OK_BUTTON_LABEL": "ADD CONTROLS",
+ "POPUP_CONTROL_SUB_TITLE_DIALOG": "Add additional controls to",
+ "POPUP_CONTROL_TITLE_DIALOG": "Please select one or more controls"
}
},
"LIST_PROFILE": {
@@ -214,6 +217,14 @@
"METADATA_ADD": "The metadata to add",
"BOUTON_AJOUTER": "Add",
"MESSAGE_PLUS_METADONNEE": "There is no more metadata to add"
+ },
+ "ADD_PUA_CONTROL": {
+ "ENUMERATIONS_LABEL": "Enumeration",
+ "EXPRESSION_REGULIERE_LABEL": "Regular expression",
+ "LENGTH_MIN_MAX_LABEL": "Length Min/Max",
+ "VALUE_MIN_MAX_LABEL": "Value Min/Max",
+ "ENUMERATIONS_DEFINITION": "Report allowed values",
+ "EXPRESSION_REGULIERE_DEFINITION": "Define a regular expression for the metadata value"
}
},
"COMMON": {
diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json
index 03151e5ae0415921ee5b219c3de7489788922622..916462a4e8f7da95366554c5d62aab85212a813b 100644
--- a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json
+++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json
@@ -182,7 +182,10 @@
"NOM_ATTRIBUT": "Nom de l'attribut",
"VALEUR_FIXE": "Valeur fixe",
"COMMENTAIRE": "Commentaire"
- }
+ },
+ "POPUP_CONTROL_OK_BUTTON_LABEL": "AJOUTER LES CONTROLES",
+ "POPUP_CONTROL_SUB_TITLE_DIALOG": "Ajouter des contrôles supplémentaires à ",
+ "POPUP_CONTROL_TITLE_DIALOG": "Veuillez séléctionner un ou plusieurs contrôles"
}
},
"LIST_PROFILE": {
@@ -214,6 +217,14 @@
"METADATA_ADD": "Les métadonnées à ajouter",
"BOUTON_AJOUTER": "Ajouter",
"MESSAGE_PLUS_METADONNEE": "Il n'y a plus de métadonnées à ajouter"
+ },
+ "ADD_PUA_CONTROL": {
+ "ENUMERATIONS_LABEL": "Enumération",
+ "EXPRESSION_REGULIERE_LABEL": "Expression régulière",
+ "LENGTH_MIN_MAX_LABEL": "Longueur Min/Max",
+ "VALUE_MIN_MAX_LABEL": "Valeur Min/Max",
+ "ENUMERATIONS_DEFINITION": "Signaler les valeurs autorisées",
+ "EXPRESSION_REGULIERE_DEFINITION": "Définir une expression régulière pour la valeur de la métadonnée"
}
},
"COMMON": {