update app and move ft-helm

numerique-gouv · Jun 3, 2024 · a60ae67 · a60ae67
1 parent 5ad4822
commit a60ae67
Show file tree

Hide file tree

Showing 43 changed files with 3,269 additions and 1,550 deletions.
diff --git a/...nsfert-core/src/main/java/fr/gouv/culture/francetransfert/core/services/RedisManager.java b/...nsfert-core/src/main/java/fr/gouv/culture/francetransfert/core/services/RedisManager.java
diff --git a/...pi/src/main/java/fr/gouv/culture/francetransfert/application/services/UploadServices.java b/...pi/src/main/java/fr/gouv/culture/francetransfert/application/services/UploadServices.java
@@ -259,9 +259,9 @@ public boolean uploadFile(int flowChunkNumber, int flowTotalChunks, String flowI
 		isUploaded = true;
 		long flowChuncksCounter = RedisUtils.incrementCounterOfUploadChunksPerFile(redisManager, hashFid);
 		LOGGER.debug("FlowChuncksCounter in redis {}", flowChuncksCounter);
-		LOGGER.info("Uploading File {} from enclosure {} - Chunk {}/{}", flowIdentifier, enclosureId,
-				flowChuncksCounter, flowTotalChunks);
-		if (flowTotalChunks >= flowChuncksCounter) {
+		LOGGER.info("Uploading File {} from enclosure {} - Chunk ({}) {}/{}", flowIdentifier, enclosureId,
+				flowChunkNumber, flowChuncksCounter, flowTotalChunks);
+		if (flowChuncksCounter >= flowTotalChunks) {
 			isUploaded = finishUploadFile(enclosureId, senderId, hashFid, bucketName, fileNameWithPath, uploadOsuId);
 		}
 		return isUploaded;

diff --git a/...d-api/src/main/java/fr/gouv/culture/francetransfert/domain/utils/RedisForUploadUtils.java b/...d-api/src/main/java/fr/gouv/culture/francetransfert/domain/utils/RedisForUploadUtils.java
@@ -299,6 +299,7 @@ public static void createContentFilesIds(RedisManager redisManager, FranceTransf
 				redisManager.insertHASH( // file:SHA1(GUID_pli:fid) => HASH { rel-obj-key: "Façade.jpg", size: "2",
 											// mul-id: "..." }
 						RedisKeysEnum.FT_FILE.getKey(shaFid), map);
+						redisManager.expire(RedisKeysEnum.FT_FILE.getKey(shaFid), 172800);
 			}
 		} catch (Exception e) {
 			LOGGER.error(e.getMessage(), e);

diff --git a/francetransfert-upload-download-gui/angular.json b/francetransfert-upload-download-gui/angular.json
@@ -40,6 +40,9 @@
               },
               {
                 "input": "./node_modules/tarteaucitronjs/css/tarteaucitron.css"
+              },
+              {
+                "input": "./node_modules/@gouvfr-lasuite/integration/dist/css/gaufre.css"
               }
             ],
             "scripts": [
@@ -179,4 +182,4 @@
   "cli": {
     "analytics": false
   }
-}
+}
diff --git a/francetransfert-upload-download-gui/package.json b/francetransfert-upload-download-gui/package.json
@@ -23,6 +23,7 @@
     "@angular/service-worker": "16.0.1",
     "@flowjs/flow.js": "2.14.1",
     "@flowjs/ngx-flow": "0.6.0",
+    "@gouvfr-lasuite/integration": "^0.1.7",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@types/flowjs": "2.13.9",

diff --git a/francetransfert-upload-download-gui/src/app/components/header/header.component.html b/francetransfert-upload-download-gui/src/app/components/header/header.component.html
@@ -2,14 +2,15 @@
   <mat-toolbar-row class="header-toolbar-row">
     <div class="header-toolbar-row-title">
       <div class="header-toolbar-logos-wrapper" *ngIf="!isMobile">
-        <button type="button" [routerLink]="['/upload#Formulaire']" mat-raised-button fragment="Formulaire" attr.aria-label="{{'EnvoiePli' | translate}}"
-         class="admin-card-actions-btn margin-button evit" *ngIf="screenWidth === 'lg'">{{'EnvoiePli' | translate}}</button>
+        <button type="button" [routerLink]="['/upload#Formulaire']" mat-raised-button fragment="Formulaire"
+          attr.aria-label="{{'EnvoiePli' | translate}}" class="admin-card-actions-btn margin-button evit"
+          *ngIf="screenWidth === 'lg'">{{'EnvoiePli' | translate}}</button>
 
         <a mat-button (click)="backToHome()" matTooltip="{{'Retour_Accueil' | translate}}" matSuffix>
           <img class="header-toolbar-logo rep-fr" alt="" aria-hidden="true"
-          src="assets/logos/republique_francaise_logo.svg" />
+            src="assets/logos/republique_francaise_logo.svg" />
           <img class="header-toolbar-logo ft" alt="Logo France transfert" aria-hidden="true"
-          src="assets/logos/france_transfert_logo.svg" />
+            src="assets/logos/france_transfert_logo.svg" />
         </a>
       </div>
       <div class="header-toolbar-logos-wrapper" *ngIf="isMobile">
@@ -20,6 +21,11 @@
             src="assets/logos/monogramme_ft.png" />
         </a>
       </div>
+      <button type="button" *ngIf="screenWidth !== 'lg'"
+        class="lasuite-gaufre-btn lasuite-gaufre-btn--vanilla js-lasuite-gaufre-btn lasuite-gaufre-btn--responsive"
+        title="Les services de La Suite numérique">
+        Les services de La Suite numérique
+      </button>
       <button mat-icon-button (click)="onToggleSidenav()" class="menu-icon" *ngIf="screenWidth !== 'lg'">
         <mat-icon attr.aria-label="{{'Ouvrir_Menu' | translate}}">menu</mat-icon>
       </button>
@@ -41,20 +47,22 @@
 
             <li *ngIf="isLoggedIn()">
               <mat-icon aria-hidden="true">person</mat-icon>
-              <a routerLink="/plis"  attr.aria-label="{{'Mon_Compte' | translate}}" class="link">{{'Mon_Compte' | translate}}</a>
-             <button
-              mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
-              <mat-icon attr.aria-label="{{'Menu' | translate}}">keyboard_arrow_down</mat-icon>
-             </button>
+              <a routerLink="/plis" attr.aria-label="{{'Mon_Compte' | translate}}" class="link">{{'Mon_Compte' |
+                translate}}</a>
+              <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
+                <mat-icon attr.aria-label="{{'Menu' | translate}}">keyboard_arrow_down</mat-icon>
+              </button>
 
               <mat-menu #menu="matMenu">
                 <button mat-menu-item routerLink="/plis">
-                  <mat-icon class="icon-position" aria-hidden="true" attr.aria-label="{{'Mes_Plis' | translate}}">email</mat-icon>
+                  <mat-icon class="icon-position" aria-hidden="true"
+                    attr.aria-label="{{'Mes_Plis' | translate}}">email</mat-icon>
                   <span class="font-size">{{'Mes_Plis' | translate}}</span>
                 </button>
 
                 <button mat-menu-item (click)="logout()">
-                  <mat-icon class="icon-position" aria-hidden="true" attr.aria-label="{{'MeDéconnecter' | translate}}">logout</mat-icon>
+                  <mat-icon class="icon-position" aria-hidden="true"
+                    attr.aria-label="{{'MeDéconnecter' | translate}}">logout</mat-icon>
                   <span class="font-size">{{'MeDéconnecter' | translate}}</span>
                 </button>
               </mat-menu>
@@ -63,7 +71,12 @@
               <mat-icon aria-hidden="true" attr.aria-label="{{'MeConnecter' | translate}}">person_outline</mat-icon>
               <a class="link" routerLink="/connect"> {{'MeConnecter' | translate}}</a>
             </li>
+            <span class="column-divider"></span>
           </ul>
+          <button type="button" class="lasuite-gaufre-btn lasuite-gaufre-btn--vanilla js-lasuite-gaufre-btn"
+            title="Les services de La Suite numérique">
+            Les services de La Suite numérique
+          </button>
         </nav>
       </div>