Merge pull request #1040 from gisaia/feat/cut-explanation

Feat/cut explanation

package.json

@@ -35,7 +35,7 @@
     "ajv": "8.8.2",
     "ajv-keywords": "5.1.0",
     "ang-jsoneditor": "3.1.0",
-    "arlas-wui-toolkit": "27.0.0-rc.10",
+    "arlas-wui-toolkit": "27.0.0-rc.11",
     "arlas-maplibre": "27.0.0-rc.7",
     "file-saver": "^2.0.2",
     "jsoneditor": "9.10.2",

src/app/modules/analytics-config/components/tabs/tabs.component.html

@@ -35,7 +35,7 @@
                 <arlas-groups [contentFg]="getTab(index).controls.contentFg" *ngIf="index === selectedIndex">
                 </arlas-groups>
             </mat-tab>
-            <mat-tab>
+            <mat-tab labelClass="last-tab">
                 <ng-template mat-tab-label>
                     <button mat-icon-button (click)="addTab()">
                         <mat-icon>add</mat-icon>

src/app/modules/analytics-config/components/tabs/tabs.component.scss

@@ -19,17 +19,15 @@
 @import "variables.scss";
 
 :host ::ng-deep {
-  .tab-wrapper {
-    .mat-mdc-tab-labels .mdc-tab:last-child {
-      .mdc-tab__text-label {
-        min-width: 0;
-        color: unset;
-        opacity: unset;
-      }
+  .last-tab {
+    .mdc-tab__text-label {
+      min-width: 0;
+      color: unset;
+      opacity: unset;
+    }
 
-      .mdc-tab-indicator {
-        display: none;
-      }
+    .mdc-tab-indicator {
+      display: none;
     }
   }
 }

src/app/modules/analytics-config/services/metric-form-builder/metric-form-builder.service.ts

@@ -80,6 +80,7 @@ export class MetricFormGroup extends WidgetConfigFormGroup {
             '',
             marker('Function'),
             marker('metric function description'),
+            '',
             undefined,
             {
               optional: true,

src/app/modules/analytics-config/services/resultlist-form-builder/resultlist-form-builder.service.ts

@@ -200,6 +200,7 @@ export class ResultlistConfigForm extends WidgetConfigFormGroup {
               '',
               marker('Transformation title'),
               marker('Transformation title description'),
+              '',
               1,
               {
                 optional: true,
@@ -232,6 +233,7 @@ export class ResultlistConfigForm extends WidgetConfigFormGroup {
               '',
               marker('Transformation tooltip'),
               marker('Transformation tooltip description'),
+              '',
               1,
               {
                 optional: true,
@@ -453,6 +455,7 @@ export class ResultlistColumnFormGroup extends CollectionConfigFormGroup {
           '',
           marker('Transformation'),
           '',
+          '',
           1,
           {
             optional: true,
@@ -589,8 +592,9 @@ export class ResultlistDetailFieldFormGroup extends FormGroup {
       ),
       process: new TextareaFormControl(
         '',
-        marker('Transformation'),
+        marker('Apply a calculation in javascript'),
         '',
+        marker('e.g : result+\'$\''),
         1,
         {
           optional: true,

src/app/modules/result-list-config/components/global-result-list/global-result-list.component.html

@@ -14,7 +14,7 @@
         </ng-template>
         <arlas-config-form-group [configFormGroup]="listFg" defaultKey="resultlists"></arlas-config-form-group>
     </mat-tab>
-    <mat-tab>
+    <mat-tab labelClass="last-tab">
         <ng-template mat-tab-label>
             <button mat-icon-button matTooltip="{{'Add a data table' | translate}}" matTooltipPosition="right" (click)="addResultList()">
                 <mat-icon>add</mat-icon>

src/app/modules/result-list-config/components/global-result-list/global-result-list.component.scss

@@ -18,8 +18,7 @@
  */
 
 :host ::ng-deep {
-  .list-tab-group {
-    .mat-mdc-tab-labels .mdc-tab:last-child {
+    .last-tab {
       .mdc-tab__text-label {
         min-width: 0;
         color: unset;
@@ -30,7 +29,6 @@
         display: none;
       }
     }
-  }
 }
 
 

src/app/shared/components/config-form-control/config-form-control.component.html

@@ -473,6 +473,7 @@
     <mat-form-field>
         <mat-label *ngIf="showLabel">{{ typedControl.label | translate}}</mat-label>
         <textarea matInput [formControl]="typedControl" [required]="!typedControl.optional"
+                  [placeholder]="typedControl.placeHolder | translate"
             [rows]="typedControl.nbRows"></textarea>
             <span *ngIf="typedControl?.errors">
                 <mat-error>{{ 'Process error message' | translate }}</mat-error>

src/app/shared/models/config-form.ts

@@ -1032,6 +1032,7 @@ export class TextareaFormControl extends ConfigFormControl {
     formState: any,
     label: string,
     description: string,
+    public placeHolder: string = '',
     public nbRows?: number,
     optionalParams?: ControlOptionalParams
   ) {

src/assets/i18n/en.json

@@ -144,6 +144,8 @@
 	"Column field": "Column field",
 	"Unit of the column": "Unit (optional)",
 	"Transformation": "Apply a calculation in javascript (e.g : result*1000).\n'result' being the javascript variable to transform",
+	"Apply a calculation in javascript": "Apply a calculation in javascript.",
+	"e.g : result+'$'": "e.g : result+'$'. 'result' will be replaced",
 	"Colorize": "Colorize",
 	"At least one column is required": "At least one column is required",
 	"Add a column": "Add a column",

src/assets/i18n/fr.json

@@ -144,6 +144,8 @@
 	"Column field": "Champ de la colonne",
 	"Unit of the column": "Unité (optionnel)",
 	"Transformation": "Calcul en javascript ( ex: result*1000).\n'result' étant la variable javascript à transformer",
+	"Apply a calculation in javascript": "Appliquer un calcul en javascript.",
+	"e.g : result+'$'": "ex: result+'€'. 'result' sera remplacé",
 	"Colorize": "Colorer",
 	"At least one column is required": "Au moins une colonne est nécessaire",
 	"Add a column": "Ajouter une colonne",