Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client into dev

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

 import { Component } from '@angular/core';
-import { ColDef, CsvExportParams, GridApi, GridReadyEvent } from 'ag-grid-community';
+import { ColDef, CsvExportParams, GridApi, GridReadyEvent, ProcessCellForExportParams } from 'ag-grid-community';
 import { Employer } from '../../../models/employer.model';
 import { Job } from '../../../models/job.model';
+import { Structure } from '../../../models/structure.model';
 import { User } from '../../../models/user.model';
 import { NotificationService } from '../../../services/notification.service';
 import { ButtonType } from '../../../shared/components/button/buttonType.enum';
@@ -85,6 +86,7 @@ export class ManageUsersComponent {
         structures: 'structures',
       },
       minWidth: 350,
+      field: 'structures',
     },
     {
       headerName: 'Fonction',
@@ -338,19 +340,51 @@ export class ManageUsersComponent {
   }
 
   public exportUsers(status: UsersStatus): void {
+    const gridApi = status === 'attached' ? this.gridApiAttached : this.gridApiUnattached;
+
+    if (!gridApi) {
+      throw new Error('Grid API not found for the selected status.');
+    }
+
     const exportParams: CsvExportParams = {
-      columnKeys: ['name', 'surname', 'email'],
+      columnKeys: ['name', 'surname', 'email', 'job', 'structures'],
+      processCellCallback: (params) => this.formatCells(params),
+      fileName: `RESIN - export utilisateurs ${status === 'attached' ? 'rattachés' : 'non rattachés'}`,
     };
-    if (status === 'attached') {
-      this.gridApiAttached.exportDataAsCsv({
-        ...exportParams,
-        fileName: 'RESIN - export utilisateurs rattachés',
-      });
-    } else if (status === 'unattached') {
-      this.gridApiUnattached.exportDataAsCsv({
-        ...exportParams,
-        fileName: 'RESIN - export utilisateurs non rattachés',
-      });
+
+    gridApi.exportDataAsCsv(exportParams);
+  }
+
+  private formatCells(params: ProcessCellForExportParams): string {
+    const cellRenderer = params.column.getColDef().cellRenderer;
+
+    if (!cellRenderer) {
+      return this.formatRegularCell(params);
+    }
+
+    switch (cellRenderer) {
+      case 'jobRenderer':
+        return this.formatJobCell(params.value);
+      case 'administredStructuresComponent':
+        return this.formatStructureCell(params.value);
+      default:
+        return params.value;
+    }
+  }
+
+  private formatRegularCell(params: any): string {
+    return params?.value;
+  }
+
+  private formatJobCell(params: any): string {
+    return params?.name || '';
+  }
+
+  private formatStructureCell(params: any[]): string {
+    if (params?.length > 0) {
+      const structureNames = params.map((structure: Structure) => structure.structureName);
+      return structureNames.join(', ');
     }
+    return '';
   }
 }

src/app/login/login.component.html

@@ -17,11 +17,13 @@
           </svg>
         </div>
         <div *ngIf="authFailed" class="incorrectId">Identifiant ou mot de passe invalide</div>
-        <div *ngIf="isUnverifiedEmail" class="incorrectId">
-          Votre email n'a jamais été validé.
-          <a tabindex="0" (click)="resendConfirmationEmail()" (keyup.enter)="resendConfirmationEmail()"
-            >Renvoyer l'email de confirmation</a
-          >
+        <div *ngIf="isUnverifiedEmail">
+          <div class="incorrectId">Votre adresse email n’a jamais été validée</div>
+          <p class="resendEmail">
+            <a tabindex="0" (click)="resendConfirmationEmail()" (keyup.enter)="resendConfirmationEmail()"
+              >Renvoyer l'email de confirmation</a
+            >
+          </p>
         </div>
       </div>
       <div class="form-group password" fxLayout="column">

src/app/login/login.component.scss

@@ -50,6 +50,13 @@
     @include lato-regular-14;
     color: $orange-warning;
   }
+  .resendEmail {
+    margin: 0;
+    a {
+      @include lato-bold-14;
+      text-decoration: underline;
+    }
+  }
 
   .form-group {
     margin: 1.5rem 0;