Merge branch '475-remove-v3-in-components' into 'dev'

refactor: remove v3 in components names

See merge request !723

src/app/admin/components/manage-employers/manage-employers.component.html

@@ -44,16 +44,16 @@
   </form>
 </div>
 
-<app-v3-modal
+<app-modal
   *ngIf="employerToDelete"
   [title]="'ATTENTION'"
   [opened]="deleteModalOpened"
   (closed)="deleteEmployer(employerToDelete, $event)"
 >
   Voulez-vous vraiment supprimer l'employeur <b>{{ employerToDelete.name }}</b> &nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="mergeOpe.newEmployer"
   [opened]="mergeEmployerModalOpened"
   [title]="'ATTENTION'"
@@ -61,4 +61,4 @@
 >
   Voulez-vous vraiment fusionner cet employeur avec <b>{{ mergeOpe.newEmployer.name }}</b
   >&nbsp;?
-</app-v3-modal>
+</app-modal>

src/app/admin/components/manage-jobs/manage-jobs.component.html

@@ -68,29 +68,29 @@
   </form>
 </div>
 
-<app-v3-modal
+<app-modal
   *ngIf="jobToDelete"
   [title]="'ATTENTION'"
   [opened]="deleteModalOpened"
   (closed)="deleteJob(jobToDelete, $event)"
 >
   Voulez-vous vraiment supprimer la fonction {{ jobToDelete.name }}&nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="mergeOpe.newJob"
   [title]="'ATTENTION'"
   [opened]="mergeJobModalOpened"
   (closed)="mergeJob(mergeOpe.newJob._id, mergeOpe.formerId, $event, contextRow)"
 >
   Voulez-vous vraiment fusionner cette fonction avec {{ mergeOpe.newJob.name }}&nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="jobsGroupToDelete"
   [title]="'ATTENTION'"
   [opened]="deleteJobsGroupModalOpened"
   (closed)="deleteJobsGroup(jobsGroupToDelete, $event)"
 >
   Voulez-vous vraiment supprimer le groupe de fonctions {{ jobsGroupToDelete.name }}&nbsp;?
-</app-v3-modal>
+</app-modal>

src/app/admin/components/manage-users/manage-users.component.html

@@ -25,7 +25,7 @@
 
   <h3 *ngIf="unAttachedUsers" class="title inline">
     Utilisateurs non rattachés ({{ unAttachedUsers.length }})
-    <app-v3-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('unattached')" />
+    <app-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('unattached')" />
   </h3>
 
   <ag-grid-angular
@@ -44,7 +44,7 @@
 
   <h3 *ngIf="attachedUsers" class="title inline">
     Utilisateurs rattachés ({{ attachedUsers.length }})
-    <app-v3-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('attached')" />
+    <app-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('attached')" />
   </h3>
   <ag-grid-angular
     *ngIf="validatedJobs && validatedEmployers"
@@ -75,16 +75,16 @@
   />
 </div>
 
-<app-v3-modal
+<app-modal
   *ngIf="userToDelete"
   [title]="'ATTENTION'"
   [opened]="deleteModalOpened"
   (closed)="deleteUser(userToDelete, $event)"
 >
   Voulez-vous vraiment supprimer l'utilisateur <b>{{ userToDelete.email }}</b> &nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="changingJobs && changingJobs[0] !== null"
   [title]="'ATTENTION'"
   [opened]="editJobModalOpened"
@@ -92,18 +92,18 @@
 >
   Voulez-vous vraiment changer la fonction de cet utilisateur ({{ changingJobs[1].name }}) par
   {{ changingJobs[0].name }}&nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="changingJobs && changingJobs[0] === null"
   [title]="'ATTENTION'"
   [opened]="editJobModalOpened"
   (closed)="editJob(changingJobs[0], changingJobs[1], $event, contextRow)"
 >
   Voulez-vous vraiment supprimer la fonction de cet utilisateur&nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="changingEmployers && changingEmployers[0] !== null"
   [title]="'ATTENTION'"
   [opened]="editEmployerModalOpened"
@@ -111,13 +111,13 @@
 >
   Voulez-vous vraiment changer l'employeur de cet utilisateur ({{ changingEmployers[1].name }}) par
   {{ changingEmployers[0].name }}&nbsp;?
-</app-v3-modal>
+</app-modal>
 
-<app-v3-modal
+<app-modal
   *ngIf="changingEmployers && changingEmployers[0] === null"
   [title]="'ATTENTION'"
   [opened]="editEmployerModalOpened"
   (closed)="editEmployer(changingEmployers[0], changingEmployers[1], $event, contextRow)"
 >
   Voulez-vous vraiment supprimer l'employeur de cet utilisateur&nbsp;?
-</app-v3-modal>
+</app-modal>

src/app/admin/components/nav-bar/nav-bar.component.html

 <header>
   <h1>Administration</h1>
   <nav>
-    <app-v3-button
+    <app-button
       [label]="'Revendication structure'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.pendingStructures.link)"
     />
-    <app-v3-button
+    <app-button
       [label]="'Liste structures'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.structuresList.link)"
     />
-    <app-v3-button
+    <app-button
       [label]="'Structures supprimées'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.deletedStructures.link)"
     />
-    <app-v3-button
+    <app-button
       [label]="'Gestion des utilisateurs'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.manageUsers.link)"
     />
-    <app-v3-button [label]="'Fonctions'" [variant]="'secondary'" (click)="router.navigateByUrl(routes.jobsList.link)" />
-    <app-v3-button
+    <app-button [label]="'Fonctions'" [variant]="'secondary'" (click)="router.navigateByUrl(routes.jobsList.link)" />
+    <app-button
       [label]="'Employeurs'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.employersList.link)"
     />
-    <app-v3-button
+    <app-button
       [label]="'CNFS Espace Coop'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.espaceCoopCNFS.link)"
     />
-    <app-v3-button
+    <app-button
       [label]="'Infos covid'"
       [variant]="'secondary'"
       (click)="router.navigateByUrl(routes.lockdownInfo.link)"
     />
-    <app-v3-button [variant]="'tertiary'" [label]="'Ghost'" (click)="openGhost()" />
+    <app-button [variant]="'tertiary'" [label]="'Ghost'" (click)="openGhost()" />
   </nav>
 </header>

src/app/annuaire/annuaire-header/annuaire-header.component.html

 <div class="searchContainer">
   <div class="searchBarAndFilters">
-    <app-v3-search-bar [(value)]="searchInput" (search)="applyFilter()" />
+    <app-search-bar [(value)]="searchInput" (search)="applyFilter()" />
     <div class="filters isntPhoneContent" (appClickOutside)="closeModal()">
       <app-collapsable-filter
         [label]="'Fonction'"
@@ -27,7 +27,7 @@
   </div>
   <div *ngIf="searchService.checkedFilterList.length" class="filterTags isntPhoneContent">
     <div class="title">Filtres :</div>
-    <app-v3-tag-item
+    <app-tag-item
       *ngFor="let filter of searchService.checkedFilterList"
       [label]="filter"
       [size]="'small'"
@@ -37,7 +37,7 @@
       [clickable]="true"
       (action)="removeFilter(filter)"
     />
-    <app-v3-tag-item
+    <app-tag-item
       [label]="'Réinitialiser les filtres'"
       [size]="'small'"
       [color]="'white'"

src/app/annuaire/annuaire-header/annuaire-header.component.ts

 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { forkJoin, lastValueFrom } from 'rxjs';
-import { ButtonType } from '../../shared/components/button/buttonType.enum';
 import { SearchService } from '../../structure-list/services/search.service';
 import { TypeModal } from '../enums/TypeModal.enum';
 import { SearchQuery } from '../models/searchQuery.model';
@@ -18,7 +17,6 @@ export class AnnuaireHeaderComponent implements OnInit, OnChanges {
   @Output() shouldLoad = new EventEmitter<boolean>();
 
   public addStructureFormModal = false;
-  public buttonTypeEnum = ButtonType;
   public modalTypeOpened: TypeModal;
   public employersFiltersActive = false;
   public jobsFiltersActive = false;

src/app/annuaire/filter-modal/filter-modal.component.html

 <div *ngIf="modalType" [ngClass]="['filterModal', getModalType()]">
   <div class="filterModalContainer">
     <div class="modalContent">
-      <app-v3-label-checkbox
+      <app-label-checkbox
         *ngFor="let filter of filtersTypes"
         [label]="filter"
         [for]="filter"
@@ -12,8 +12,8 @@
     </div>
 
     <div class="modalFooter">
-      <app-v3-button [variant]="'secondary'" [label]="'Effacer'" (click)="clearFilters()" />
-      <app-v3-button [variant]="'primary'" [label]="'Appliquer'" (click)="onSubmitFilters()" />
+      <app-button [variant]="'secondary'" [label]="'Effacer'" (click)="clearFilters()" />
+      <app-button [variant]="'primary'" [label]="'Appliquer'" (click)="onSubmitFilters()" />
     </div>
   </div>
 </div>

src/app/annuaire/result-list/result-list.component.html

@@ -22,7 +22,7 @@
           />
           <div *ngIf="showPagination" class="pagination">
             <p>{{ userList.length }} membres affichés sur {{ totalUserResult }}</p>
-            <app-v3-button
+            <app-button
               [label]="'Voir plus'"
               [variant]="'primaryBlack'"
               [size]="'medium'"
@@ -34,7 +34,7 @@
         <ng-container *ngIf="userList.length === 0">
           <p class="noResult">Aucun résultat ne correspond à vos filtres</p>
           <p class="filtersInfo">Merci de réinitialiser ou modifier les filtres afin d'élargir votre recherche</p>
-          <app-v3-button
+          <app-button
             tabindex="0"
             [variant]="'primary'"
             [wide]="true"
@@ -60,8 +60,8 @@
         veuillez vous connecter ou vous créer un compte.
       </div>
       <div class="buttons">
-        <app-v3-button [label]="'Créer un compte'" [variant]="'secondary'" (action)="goRegister()" />
-        <app-v3-button [label]="'Se connecter'" [variant]="'primary'" (action)="goLogin()" />
+        <app-button [label]="'Créer un compte'" [variant]="'secondary'" (action)="goRegister()" />
+        <app-button [label]="'Se connecter'" [variant]="'primary'" (action)="goLogin()" />
       </div>
     </div>
   </ng-container>

src/app/carto/carto.component.html

@@ -20,7 +20,7 @@
       (structureRDVSelected)="selectStructureRDV($event)"
     />
     <div class="btnSwitch">
-      <app-v3-button
+      <app-button
         [variant]="'primaryBlack'"
         [label]="isMapPhone ? 'Liste' : 'Carte'"
         [size]="'large'"

src/app/contact/contact.component.html

@@ -111,8 +111,8 @@
       </div>
     </div>
     <div class="buttons">
-      <app-v3-button [variant]="'secondary'" [label]="'Annuler'" [routerLink]="'/home'" />
-      <app-v3-button
+      <app-button [variant]="'secondary'" [label]="'Annuler'" [routerLink]="'/home'" />
+      <app-button
         [type]="'submit'"
         [variant]="'primary'"
         [label]="'Envoyer'"

src/app/form/footer-form/footer-form.component.html

 <div class="footerForm">
-  <app-v3-button
+  <app-button
     *ngIf="!isLastFormStep && !isNextFormTransition && !isStructureLastPage() && !isPersonalOfferFirstPage()"
     [variant]="'secondary'"
     [label]="!isEditMode ? 'Précédent' : 'Annuler'"
@@ -7,7 +7,7 @@
     (action)="prevPage()"
   />
 
-  <app-v3-button
+  <app-button
     *ngIf="!isLastFormStep && !isNextFormTransition && !isEditMode"
     [variant]="'primary'"
     [label]="'Suivant'"
@@ -18,7 +18,7 @@
     (action)="nextPage()"
   />
 
-  <app-v3-button
+  <app-button
     *ngIf="isEditMode"
     [variant]="'primary'"
     [label]="'Valider'"

src/app/form/form-view/form-view.component.html

 <div class="formView">
-  <app-v3-modal
+  <app-modal
     [title]="'Attention'"
     [opened]="showConfirmationModal"
     [validateLabel]="'Quitter'"
@@ -9,7 +9,7 @@
     <div class="modalContent emphasized">
       Si vous quittez le formulaire maintenant, toutes les informations saisies seront perdues
     </div>
-  </app-v3-modal>
+  </app-modal>
   <app-progress-bar
     *ngIf="!isEditMode"
     [formType]="formType[routeParam]"

src/app/form/form-view/global-components/information-step/information-step.component.html

@@ -5,7 +5,7 @@
       <img src="../../assets/form/emailVerification.svg" alt="" />
       <h3>Un email vous a été envoyé afin de finaliser votre inscription</h3>
       <div class="btnContainer">
-        <app-v3-button [variant]="'primary'" [wide]="true" [label]="'Terminer'" (click)="goToHome()" />
+        <app-button [variant]="'primary'" [wide]="true" [label]="'Terminer'" (click)="goToHome()" />
       </div>
     </div>
   </ng-container>
@@ -17,8 +17,8 @@
       <h3>Pour compléter votre profil, nous aimerions vous poser quelques questions</h3>
       <div class="btnContainer">
         <div class="btnGroup">
-          <app-v3-button [label]="'Plus tard'" [variant]="'secondary'" (click)="goToHome()" />
-          <app-v3-button [label]="'C\'est parti !'" [variant]="'primary'" (click)="goToNextPage()" />
+          <app-button [label]="'Plus tard'" [variant]="'secondary'" (click)="goToHome()" />
+          <app-button [label]="'C\'est parti !'" [variant]="'primary'" (click)="goToNextPage()" />
         </div>
       </div>
     </div>
@@ -76,7 +76,7 @@
         donner accès au numérique
       </p>
       <div class="btnContainer">
-        <app-v3-button [variant]="'primary'" [wide]="true" [label]="'J\'ai compris'" (click)="goBackProfile()" />
+        <app-button [variant]="'primary'" [wide]="true" [label]="'J\'ai compris'" (click)="goBackProfile()" />
       </div>
     </div>
   </ng-container>
@@ -98,7 +98,7 @@
       <img src="../../assets/form/profileUpdated.svg" alt="" />
       <h3>Merci, les informations de votre profil ont été mises à jour</h3>
       <div class="btnContainer">
-        <app-v3-button [variant]="'primary'" [wide]="true" [label]="'Voir mon compte'" (click)="goBackProfile()" />
+        <app-button [variant]="'primary'" [wide]="true" [label]="'Voir mon compte'" (click)="goBackProfile()" />
       </div>
     </div>
   </ng-container>

src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html

@@ -5,7 +5,7 @@
   </div>
   <div fxLayout="column" fxLayoutGap="32px">
     <div class="btn-grid">
-      <app-v3-tag-item
+      <app-tag-item
         *ngFor="let job of jobs"
         [iconFolder]="'ico'"
         [iconName]="isSelectedJob(job) ? 'check' : null"

src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html

 <form>
   <h2 class="title">Dans quelle structure travaillez-vous ?</h2>
   <div class="content">
-    <app-v3-search-bar
+    <app-search-bar
       placeholder="Rechercher une structure"
       [(value)]="searchString"
       (valueChange)="onSearchChange($event)"
@@ -55,7 +55,7 @@
               Cette structure n’existe pas encore sur Rés'in.<br />
               <span class="question">Souhaitez-vous la référencer ?</span>
             </div>
-            <app-v3-button
+            <app-button
               [label]="'Créer une structure'"
               [variant]="'primaryBlack'"
               [wide]="true"

src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html

@@ -5,7 +5,7 @@
     <p>Facultatif - Plusieurs choix possibles</p>
   </div>
   <div class="btn-grid">
-    <app-v3-tag-item
+    <app-tag-item
       *ngFor="let accompaniment of onlineProcedures.modules"
       [iconName]="isInArray(accompaniment.id) ? 'check' : null"
       [label]="accompaniment.name"

src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.ts

 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
 import { Category } from '../../../../structure-list/models/category.model';
 
 @Component({
@@ -14,8 +13,6 @@ export class StructureDigitalHelpingAccompanimentComponent implements OnInit {
   @Output() updateChoice = new EventEmitter<any>();
   @Output() validateForm = new EventEmitter<any>();
 
-  public buttonTypeEnum = ButtonType;
-
   ngOnInit(): void {
     this.validateForm.emit();
   }

src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html

@@ -11,7 +11,7 @@
 
         <div class="inputSection">
           <ng-container *ngIf="equipment.module.id === 'computer'">
-            <app-v3-icon-button
+            <app-icon-button
               [variant]="'primaryBlack'"
               [iconFolder]="'form'"
               [iconName]="'hide'"
@@ -32,7 +32,7 @@
             />
           </ng-container>
           <ng-container *ngIf="equipment.module.id === 'printer'">
-            <app-v3-icon-button
+            <app-icon-button
               [variant]="'primaryBlack'"
               [iconFolder]="'form'"
               [iconName]="'hide'"
@@ -53,7 +53,7 @@
             />
           </ng-container>
           <ng-container *ngIf="equipment.module.id === 'scanner'">
-            <app-v3-icon-button
+            <app-icon-button
               [variant]="'primaryBlack'"
               [iconFolder]="'form'"
               [iconName]="'hide'"
@@ -73,7 +73,7 @@
               (input)="setValidationsForm()"
             />
           </ng-container>
-          <app-v3-icon-button
+          <app-icon-button
             [variant]="'primaryBlack'"
             [iconFolder]="'form'"
             [iconName]="'show'"

src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.ts

 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { AbstractControl, UntypedFormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
 
 @Component({
   selector: 'app-structure-public-target-other',
@@ -12,8 +11,6 @@ export class StructureDigitalHelpingAccompanimentOtherComponent implements OnIni
   @Output() updateChoice = new EventEmitter<any>();
   @Output() validateForm = new EventEmitter<any>();
 
-  public buttonTypeEnum = ButtonType;
-
   ngOnInit(): void {
     this.validateForm.emit();
   }

src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html

@@ -18,7 +18,7 @@
     <div *ngIf="languageAndIlliteracy" class="title" style="gap: 12px">
       <h4>Langue et illettrisme</h4>
       <div class="btn-grid">
-        <app-v3-tag-item
+        <app-tag-item
           *ngFor="let choice of languageAndIlliteracy.modules"
           [iconName]="isInArray(choice.id, 'languageAndIlliteracy') ? 'check' : null"
           [label]="choice.name"
@@ -31,7 +31,7 @@
     <div *ngIf="handicaps" class="title" style="gap: 12px">
       <h4>Handicaps</h4>
       <div class="btn-grid">
-        <app-v3-tag-item
+        <app-tag-item
           *ngFor="let choice of handicaps.modules"
           [iconName]="isInArray(choice.id, 'handicaps') ? 'check' : null"
           [label]="choice.name"
@@ -44,7 +44,7 @@
     <div *ngIf="genre" class="title" style="gap: 12px">
       <h4>Genre</h4>
       <div class="btn-grid">
-        <app-v3-tag-item
+        <app-tag-item
           *ngFor="let choice of genre.modules"
           [iconName]="isInArray(choice.id, 'genre') ? 'check' : null"
           [label]="choice.name"
@@ -60,7 +60,7 @@
     <div *ngIf="age" class="title" style="gap: 12px">
       <h4>Âge</h4>
       <div class="btn-grid">
-        <app-v3-tag-item
+        <app-tag-item
           *ngFor="let choice of age.modules"
           [iconName]="isInArray(choice.id, 'age') ? 'check' : null"
           [label]="choice.name"