fix(portails): utilisation clé fonction

Author: hbalty

.talismanrc

@@ -1,3 +1,11 @@
+threshold: medium
+
+file_ignore_config:
+  - "**/*.test.ts"
+  - "**/*.spec.ts"
+  - "**/test/**"
+  - "**/tests/**"
+
 fileignoreconfig:
 - filename: _docs/dev/0.run-local-env.md
   checksum: 855b6f29ace746c86597d36382dbe7e40f771137734e3bf5eb53c948d6592a74
@@ -27,5 +35,4 @@ fileignoreconfig:
   checksum: 0daf325477c634ee72587c4ab1210fdc5fd8dea1aa67a905f8842b7b6d13c6ca
 - filename: yarn.lock
   checksum: 08b8e5aa34abdbe885acc6d64dd693197644d94d976f0e1832760c3ed227c836
-threshold: medium
 version: "1.0"

packages/backend/src/_common/mocks/POST_USER_STRUCTURE_BODY.mock.ts

@@ -12,7 +12,7 @@ export const POST_USER_STRUCTURE_BODY: Partial<UserStructure> = {
   nom: "TEST",
   prenom: "TEST",
   role: "admin" as UserStructureRole,
-  fonction: "Président" as UserFonction,
+  fonction: UserFonction.PRESIDENT,
   fonctionDetail: null,
   structure: {
     id: 100,

packages/backend/src/modules/portail-admin/dto/register-user-structure-admin.dto.ts

@@ -11,12 +11,7 @@ import {
 } from "class-validator";
 import { Transform, TransformFnParams } from "class-transformer";
 import { LowerCaseTransform } from "../../../_common/decorators";
-import {
-  UserStructureRole,
-  USER_FONCTION_LABELS_LIST,
-  UserFonction,
-  USER_FONCTION_LABELS,
-} from "@domifa/common";
+import { UserStructureRole, UserFonction } from "@domifa/common";
 
 export class RegisterUserStructureAdminDto {
   @ApiProperty({
@@ -52,7 +47,7 @@ export class RegisterUserStructureAdminDto {
   @MinLength(2)
   @MaxLength(100)
   @IsNotEmpty()
-  @IsIn(USER_FONCTION_LABELS_LIST)
+  @IsIn(Object.keys(UserFonction))
   public readonly fonction!: UserFonction;
 
   @ApiProperty({
@@ -61,7 +56,7 @@ export class RegisterUserStructureAdminDto {
   @MinLength(2)
   @MaxLength(100)
   @IsString()
-  @ValidateIf((u) => u.fonction === USER_FONCTION_LABELS.AUTRE)
+  @ValidateIf((u) => u.fonction === UserFonction.AUTRE)
   @IsNotEmpty()
   @Transform(({ value }: TransformFnParams) => {
     if (value) {

packages/backend/src/modules/users/dto/user-edit.dto.ts

@@ -1,8 +1,4 @@
-import {
-  USER_FONCTION_LABELS,
-  USER_FONCTION_LABELS_LIST,
-  UserFonction,
-} from "@domifa/common";
+import { UserFonction } from "@domifa/common";
 import { ApiProperty } from "@nestjs/swagger";
 import { Transform, TransformFnParams } from "class-transformer";
 import {
@@ -48,7 +44,7 @@ export class UserEditDto {
   })
   @MinLength(2)
   @MaxLength(100)
-  @IsIn(USER_FONCTION_LABELS_LIST)
+  @IsIn(Object.keys(UserFonction))
   @IsString()
   public readonly fonction!: UserFonction;
 
@@ -58,7 +54,7 @@ export class UserEditDto {
   @MinLength(2)
   @MaxLength(255)
   @IsString()
-  @ValidateIf((u) => u.fonction === USER_FONCTION_LABELS.AUTRE)
+  @ValidateIf((u) => u.fonction === UserFonction.AUTRE)
   @IsNotEmpty()
   @Transform(({ value }: TransformFnParams) => {
     if (value) {

packages/backend/src/modules/users/dto/user.dto.ts

@@ -10,12 +10,7 @@ import {
   ValidateIf,
 } from "class-validator";
 import { IsValidPassword, Trim } from "../../../_common/decorators";
-import {
-  StructureCommon,
-  USER_FONCTION_LABELS,
-  USER_FONCTION_LABELS_LIST,
-  UserFonction,
-} from "@domifa/common";
+import { StructureCommon, UserFonction } from "@domifa/common";
 
 export class UserDto {
   @MinLength(2)
@@ -36,14 +31,14 @@ export class UserDto {
 
   @MinLength(2)
   @MaxLength(100)
-  @IsIn(USER_FONCTION_LABELS_LIST)
+  @IsIn(Object.keys(UserFonction))
   @IsString()
   public readonly fonction!: UserFonction;
 
   @MinLength(2)
   @MaxLength(255)
   @IsString()
-  @ValidateIf((u) => u.fonction === USER_FONCTION_LABELS.AUTRE)
+  @ValidateIf((u) => u.fonction === UserFonction.AUTRE)
   @IsNotEmpty()
   public readonly fonctionDetail: string | null;
 

packages/common/src/users/user-structure/constants/USER_FONCTION_LABELS.const.ts

@@ -23,5 +23,3 @@ export const USER_FONCTION_LABELS: {
   BENEVOLE: "Bénévole",
   AUTRE: "Autre",
 };
-
-export const USER_FONCTION_LABELS_LIST = Object.values(USER_FONCTION_LABELS);

packages/frontend/src/app/modules/manage-users/components/edit-user/edit-user.component.html

@@ -99,7 +99,7 @@ <h2>Informations personnelles</h2>
         >
           <span class="question">Fonction</span>
           <span class="valeur">
-            {{ me.fonction }}
+            {{ USER_FONCTION_LABELS[me.fonction] }}
           </span>
         </p>
         <p *ngIf="me.fonctionDetail" class="col-md-6 reponses">

packages/frontend/src/app/modules/manage-users/components/edit-user/edit-user.component.ts

@@ -20,7 +20,7 @@ import { map, takeUntil } from "rxjs/operators";
 
 import { EmailValidator, NoWhiteSpaceValidator } from "../../../../shared";
 import { AuthService, CustomToastService } from "../../../shared/services";
-import { UserStructure } from "@domifa/common";
+import { USER_FONCTION_LABELS, UserStructure } from "@domifa/common";
 import { format } from "date-fns";
 import {
   UsagerLight,
@@ -59,7 +59,7 @@ export class EditUserComponent implements OnInit, OnDestroy {
 
   private subscription = new Subscription();
   private unsubscribe: Subject<void> = new Subject();
-
+  public readonly USER_FONCTION_LABELS = USER_FONCTION_LABELS;
   public get f(): { [key: string]: AbstractControl } {
     return this.userForm.controls;
   }

packages/frontend/src/app/modules/manage-users/components/user-profil/user-profil.component.html

@@ -119,7 +119,7 @@ <h2>Utilisateurs enregistrés: {{ users.length }} utilisateurs</h2>
                   </select>
                 </ng-container>
               </td>
-              <td>{{ user.fonction }}</td>
+              <td>{{ USER_FONCTION_LABELS[user.fonction] }}</td>
               <td *ngIf="me.role === 'admin'">
                 <button
                   type="button"

packages/frontend/src/app/modules/manage-users/components/user-profil/user-profil.component.ts

@@ -20,6 +20,7 @@ import {
   UserStructure,
   UserStructureRole,
   USER_STRUCTURE_ROLES_LABELS,
+  USER_FONCTION_LABELS,
 } from "@domifa/common";
 import { ManageUsersService } from "../../services/manage-users.service";
 
@@ -42,6 +43,7 @@ export class UserProfilComponent implements OnInit, OnDestroy {
   public expectedRole: UserStructureRole | null = null;
 
   public readonly USER_STRUCTURE_ROLES_LABELS = USER_STRUCTURE_ROLES_LABELS;
+  public readonly USER_FONCTION_LABELS = USER_FONCTION_LABELS;
 
   @ViewChild("deleteUserConfirmation", { static: true })
   public deleteUserConfirmation!: TemplateRef<NgbModalRef>;