Merge pull request #2309 from ProgrammeVitam/cp_7.0_14026

CP 7.0 - bug #14026 : agents services creation forbid only whitespace
ProgrammeVitam · Dec 13, 2024 · 7b2a029 · 7b2a029
2 parents ce26ba9 + 3cb5256
commit 7b2a029
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 5 deletions.
diff --git a/...i-frontend/projects/referential/src/app/agency/agency-create/agency-create.component.html b/...i-frontend/projects/referential/src/app/agency/agency-create/agency-create.component.html
@@ -28,6 +28,9 @@ <h5 i18n="Create agency title@@agencyCreateTitle2">Informations</h5>
                 i18n="Identfier exists error hint@@formErrorIdentifierExists"
                 >Identifiant déjà utilisé</vitamui-common-input-error
               >
+              <vitamui-common-input-error *ngIf="!!form.get('identifier')?.errors?.onlyWhitespaces">{{
+                'COMMON.INVALID_FIELD' | translate
+              }}</vitamui-common-input-error>
             </ng-container>
           </vitamui-common-input>
         </div>
@@ -49,6 +52,9 @@ <h5 i18n="Create agency title@@agencyCreateTitle2">Informations</h5>
               <vitamui-common-input-error *ngIf="!!form?.get('name')?.errors?.nameExists" i18n="Name exists error hint@@formErrorNameExists"
                 >Nom déjà utilisé</vitamui-common-input-error
               >
+              <vitamui-common-input-error *ngIf="!!form.get('name')?.errors?.onlyWhitespaces">{{
+                'COMMON.INVALID_FIELD' | translate
+              }}</vitamui-common-input-error>
             </ng-container>
           </vitamui-common-input>
         </div>

diff --git a/...rontend/projects/referential/src/app/agency/agency-create/agency-create.component.spec.ts b/...rontend/projects/referential/src/app/agency/agency-create/agency-create.component.spec.ts
@@ -104,6 +104,7 @@ describe('AgencyCreateComponent', () => {
     const agencyValidatorSpy = jasmine.createSpyObj('AgencyCreateValidators', {
       uniqueIdentifier: () => of(null),
       uniqueName: () => of(null),
+      onlyWhitespaces: () => {},
     });
     TestBed.configureTestingModule({
       imports: [

diff --git a/ui/ui-frontend/projects/referential/src/app/agency/agency-create/agency-create.component.ts b/ui/ui-frontend/projects/referential/src/app/agency/agency-create/agency-create.component.ts
@@ -77,8 +77,12 @@ export class AgencyCreateComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.form = this.formBuilder.group({
-      name: [null, Validators.required],
-      identifier: [null, Validators.required, this.agencyCreateValidators.uniqueIdentifier()],
+      name: [null, [Validators.required, this.agencyCreateValidators.onlyWhitespaces]],
+      identifier: [
+        null,
+        [Validators.required, this.agencyCreateValidators.onlyWhitespaces],
+        this.agencyCreateValidators.uniqueIdentifier(),
+      ],
       description: [null],
     });
 

diff --git a/...ontend/projects/referential/src/app/agency/agency-create/agency-create.validators.spec.ts b/...ontend/projects/referential/src/app/agency/agency-create/agency-create.validators.spec.ts
@@ -80,6 +80,14 @@ describe('Agency Create Validators', () => {
       expect(agencyServiceSpy.existsProperties).toHaveBeenCalledWith({ name: '123456' });
     }));
 
+    it('should return { onlyWhitespaces: true }', fakeAsync(() => {
+      const agencyServiceSpy = jasmine.createSpyObj('AgencyService', ['']);
+      const agencyCreateValidators = new AgencyCreateValidators(agencyServiceSpy);
+      expect(agencyCreateValidators.onlyWhitespaces(new FormControl('   '))).toEqual({
+        onlyWhitespaces: true,
+      });
+    }));
+
     it('should not call the service', fakeAsync(() => {
       const agencyServiceSpy = jasmine.createSpyObj('AgencyService', ['existsProperties']);
       agencyServiceSpy.existsProperties.and.returnValue(of(true));

diff --git a/ui/ui-frontend/projects/referential/src/app/agency/agency-create/agency-create.validators.ts b/ui/ui-frontend/projects/referential/src/app/agency/agency-create/agency-create.validators.ts
@@ -35,7 +35,7 @@
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
 import { Injectable } from '@angular/core';
-import { AbstractControl, AsyncValidatorFn } from '@angular/forms';
+import { AbstractControl, AsyncValidatorFn, ValidatorFn } from '@angular/forms';
 
 import { of, timer } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
@@ -55,6 +55,11 @@ export class AgencyCreateValidators {
     return this.uniqueFields('identifier', 'identifierExists', identifierToIgnore);
   };
 
+  onlyWhitespaces: ValidatorFn = (control: AbstractControl) => {
+    const regExp = /^\s+$/;
+    return regExp.test(control.value) ? { onlyWhitespaces: true } : null;
+  };
+
   private uniqueFields(field: string, existTag: string, valueToIgnore?: string) {
     return (control: AbstractControl) => {
       const properties: any = {};

diff --git a/ui/ui-frontend/projects/referential/src/assets/i18n/en.json b/ui/ui-frontend/projects/referential/src/assets/i18n/en.json
@@ -4,7 +4,8 @@
     "SUBMIT": "Confirm",
     "UPDATE": "Update",
     "APPLY_UPDATE": "Apply changes",
-    "REQUIRED": "Required field"
+    "REQUIRED": "Required field",
+    "INVALID_FIELD": "Invalid field"
   },
   "CONTRACT_MANAGEMENT": {
     "CONTRACT_PAGE": {

diff --git a/ui/ui-frontend/projects/referential/src/assets/i18n/fr.json b/ui/ui-frontend/projects/referential/src/assets/i18n/fr.json
@@ -4,7 +4,8 @@
     "SUBMIT": "Confirmer",
     "UPDATE": "Modifier",
     "APPLY_UPDATE": "Appliquer les modifications ",
-    "REQUIRED": "Champ requis"
+    "REQUIRED": "Champ requis",
+    "INVALID_FIELD": "Champ invalide"
   },
   "CONTRACT_MANAGEMENT": {
     "CONTRACT_PAGE": {