feat:virus and file format info at deposit datafile detail

src/app/features/deposit/components/dialogs/deposit-file-detail/deposit-file-detail.dialog.html

@@ -37,26 +37,35 @@
   </div>
 
   <mat-list>
+    <h2 mat-dialog-title>{{'deposit.file.details.delimiter.fileInfo' | translate}} </h2>
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.createDate' | translate}}</span>
-        <span class="value">{{data.depositDataFile.creation.when | date}}</span>
+        <span class="key">{{'deposit.file.detail.data.fileName' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileName}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.status' | translate}}</span>
-        <span class="value">{{data.depositDataFile.status}}</span>
+        <span class="key">{{'deposit.file.detail.data.location' | translate}}</span>
+        <span class="value">{{data.depositDataFile.relativeLocation}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.statusMessage' | translate}}</span>
-        <span class="value">{{data.depositDataFile.statusMessage}}</span>
+        <span class="key">{{'deposit.file.detail.data.smartSize' | translate}}</span>
+        <span class="value">{{data.depositDataFile.smartSize}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.fileSize' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileSize | filesize}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
@@ -77,6 +86,48 @@
     </mat-list-item>
     <mat-divider></mat-divider>
 
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.mimeType' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.contentType}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.fileSize' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileSize | filesize}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.fileFormat' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.format}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.puid' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.puid}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.checksums' | translate}}</span>
+        <span class="value">{{data.depositDataFile.checksums === undefined || data.depositDataFile.checksums === null ||
+        data.depositDataFile.checksums.length === 0 ? 'no' :
+            'yes'}}</span>
+      </div>
+    </mat-list-item>
+
+    <h2 mat-dialog-title>{{'deposit.file.details.delimiter.complianceLevel' | translate }}</h2>
     <mat-list-item>
       <div class="item-content">
         <span class="key">{{'deposit.file.detail.data.complianceLevel' | translate}}</span>
@@ -85,63 +136,87 @@
     </mat-list-item>
     <mat-divider></mat-divider>
 
+    <h2 mat-dialog-title>{{'deposit.file.details.delimiter.analyticalTool' | translate }}</h2>
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.smartSize' | translate}}</span>
-        <span class="value">{{data.depositDataFile.smartSize}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.name' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.tool.name}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.available' | translate}}</span>
-        <span class="value">{{data.depositDataFile.available}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.version' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.tool.version}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.fileFormat' | translate}}</span>
-        <span class="value">{{data.depositDataFile.fileFormat}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.description' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.tool.description}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.virusCheck' | translate}}</span>
-        <span class="value">{{data.depositDataFile.virusCheck}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.puid' | translate}}</span>
+        <span class="value">{{data.depositDataFile.fileFormat.tool.puid}}</span>
+      </div>
+    </mat-list-item>
+
+    <h2 mat-dialog-title>{{'deposit.file.details.delimiter.antivirus' | translate }}</h2>
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.tool.name' | translate}}</span>
+        <span class="value">{{data.depositDataFile.virusCheck.tool.name}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.initialPath' | translate}}</span>
-        <span class="value">{{data.depositDataFile.initialPath}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.description' | translate}}</span>
+        <span class="value">{{data.depositDataFile.virusCheck.tool.description}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.fileSize' | translate}}</span>
-        <span class="value">{{data.depositDataFile.fileSize | filesize}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.version' | translate}}</span>
+        <span class="value">{{data.depositDataFile.virusCheck.tool.version}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
 
     <mat-list-item>
       <div class="item-content">
-        <span class="key">{{'deposit.file.detail.data.checksums' | translate}}</span>
-        <span class="value">{{data.depositDataFile.checksums === undefined || data.depositDataFile.checksums === null ||
-        data.depositDataFile.checksums.length === 0 ? 'no' :
-          'yes'}}</span>
+        <span class="key">{{'deposit.file.detail.data.tool.puid' | translate}}</span>
+        <span class="value">{{data.depositDataFile.virusCheck.tool.puid}}</span>
       </div>
     </mat-list-item>
     <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.virusCheck.checkDate' | translate}}</span>
+        <span class="value">{{data.depositDataFile.virusCheck.checkDate}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
+    <mat-list-item>
+      <div class="item-content">
+        <span class="key">{{'deposit.file.detail.data.virusCheck.details' | translate}}</span>
+        <span class="value">{{data.depositDataFile.virusCheck.details}}</span>
+      </div>
+    </mat-list-item>
+    <mat-divider></mat-divider>
+
   </mat-list>
 </div>
 <div mat-dialog-actions>

src/app/features/deposit/components/dialogs/deposit-file-detail/deposit-file-detail.dialog.scss

 @import "../../../../../../sass/abstracts/variables";
 @import "../../../../../../sass/abstracts/mixins";
 
+.mat-list h2{
+  font-weight: bold;
+  margin-top: 10px;
+
+}
 .item-content {
   display: flex;
   justify-content: flex-end;

src/app/features/deposit/models/deposit-data-file.model.ts

 import {Checksum} from "@app/features/deposit/models/checksum.model";
 import {FileFormat} from "@app/features/deposit/models/file-format.model";
-import {ChangeInfo} from "@app/generated-api";
+import {
+  AipVirusCheck,
+  ChangeInfo,
+} from "@app/generated-api";
+import {VirusCheck} from "@deposit/models/virus-check.model";
 
 export enum DepositDataFileStateEnum {
   IN_ERROR = "IN_ERROR",
@@ -29,7 +33,7 @@ export interface DepositDataFile {
   dataType?: string; // Enum get with ApiActionEnum.LIST_DATA_TYPE
   complianceLevel?: string;
   fileFormat?: FileFormat;
-  virusCheck?: any;
+  virusCheck?: VirusCheck;
   fileName?: string;
   initialPath?: string;
   smartSize?: string;

src/app/features/deposit/models/file-format.model.ts

+import {Tool} from "@deposit/models/tool.model";
+
 export interface FileFormat {
   contentType?: string;
   format?: string;
@@ -5,4 +7,5 @@ export interface FileFormat {
   puid?: string;
   md5?: string;
   details?: string;
+  tool?: Tool;
 }

src/app/features/deposit/models/tool.model.ts

+export interface Tool {
+  name?: string;
+  description?: string;
+  version?: string;
+  puid?: string;
+}

src/app/features/deposit/models/virus-check.model.ts

+import {Tool} from "@deposit/models/tool.model";
+
+export interface VirusCheck {
+  checkDate?: string;
+  details?: string;
+  tool?: Tool;
+}

src/assets/i18n/en.json

@@ -717,17 +717,35 @@
           "createDate": "Creation date",
           "fileFormat": "File format",
           "fileSize": "File size",
+          "fileName": "File name",
           "initialPath": "Initial path",
           "smartSize": "Smart size",
-          "status": "Status",
-          "statusMessage": "Status message",
           "type": "Type",
-          "virusCheck": "Virus check"
+          "virusCheck": {
+            "checkDate": "Virus Checkdate",
+            "details": "Virus details"
+          },
+          "location": "Location",
+          "filename": "Filename",
+          "mimeType": "MimeType",
+          "puid": "Puid",
+          "tool": {
+            "name": "Tool name",
+            "description": "Tool description",
+            "version": "Tool version",
+            "puid": "Tool Puid"
+          }
         }
       },
       "details": {
         "close": "Close",
-        "title": "Details of file \"{{name}}\""
+        "title": "Details of file \"{{name}}\"",
+        "delimiter": {
+          "fileInfo": "File Info",
+          "complianceLevel": "Compliance Level",
+          "analyticalTool": "Analytical Tool",
+          "antivirus": "Antivirus"
+        }
       },
       "inProgress": {
         "noFile": "There is currently no file upload in progress."

src/assets/i18n/fr.json

@@ -717,20 +717,38 @@
           "createDate": "Date de création",
           "fileFormat": "Format de fichier",
           "fileSize": "Taille du fichier",
+          "fileName": "Nom du fichier",
           "initialPath": "Chemin initial",
           "smartSize": "Smart size",
-          "status": "Statut",
-          "statusMessage": "Message du statut",
           "type": "Type",
-          "virusCheck": "Vérification virus"
+          "virusCheck": {
+            "checkDate": "Date de vérification",
+            "details": "Virus détails"
+          },
+          "location": "Location",
+          "filename": "Filename",
+          "mimeType": "MimeType",
+          "puid": "Puid",
+          "tool": {
+            "name": "Nom d'outil",
+            "description": "Description",
+            "version": "Version",
+            "puid": "Puid d'outil"
+          }
         }
       },
       "details": {
         "close": "Fermer",
-        "title": "Détails du fichier \"{{name}}\""
+        "title": "Détails du fichier \"{{name}}\"",
+        "delimiter": {
+          "fileInfo": "Informations sut le fichier",
+          "complianceLevel": "Niveau de conformité",
+          "analyticalTool": "Outil d'analyse",
+          "antivirus": "Antivirus"
+        }
       },
       "inProgress": {
-        "noFile": "Il n'y a pour l'instant aucun envoi de fichier en cours."
+        "noFile": "Il n'y a pour l'instant aucun envoi de fichsier en cours."
       },
       "modal": {
         "button": {