Merge pull request #425 from ProgrammeVitam/vas_bug_8045_vitamui_bugs

[VAS] Bug 8045 : Correct VitamUI bugs

api/api-referential/referential-internal/src/main/java/fr/gouv/vitamui/referential/internal/server/logbookmanagement/LogbookManagementOperationInternalService.java

@@ -49,6 +49,8 @@ import org.springframework.stereotype.Service;
 public class LogbookManagementOperationInternalService {
 
     private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(LogbookManagementOperationInternalService.class);
+    private static final String START_MAX_DATE  = "30/12/2999";
+    private static final String START_MIN_DATE = "01/01/1900";
 
     private ObjectMapper objectMapper;
 
@@ -62,6 +64,13 @@ public class LogbookManagementOperationInternalService {
 
     public ProcessDetailDto searchOperationsDetails(VitamContext vitamContext, ProcessQuery processQuery) throws VitamClientException, JsonProcessingException {
         LOGGER.info("Get Operations Details with processQuery = {}",processQuery);
+        if( processQuery.getStartDateMax() == null) {
+            processQuery.setStartDateMax(START_MAX_DATE);
+        }
+        if(processQuery.getStartDateMin() == null) {
+            processQuery.setStartDateMin(START_MIN_DATE);
+        }
+
         JsonNode response = vitamOperationService.listOperationsDetails(vitamContext,processQuery).toJsonNode();
         final VitamUIProcessDetailResponseDto processDetailResponse =
             objectMapper.treeToValue(response, VitamUIProcessDetailResponseDto.class);

ui/ui-frontend/projects/ingest/src/app/ingest/ingest-list/ingest-list.component.html

@@ -3,80 +3,88 @@
     <div class="vitamui-table-head">
       <div class="row col-1"><i class="vitamui-icon vitamui-icon-ingest vitamui-row-icon"></i></div>
       <div class="col-5" i18n="ingest identifier column header@@ingestListIdentifierHeader">
-        <span>{{'INGEST_LIST.ID' | translate}}</span>
-        <vitamui-common-order-by-button orderByKey="#id" [(orderBy)]="orderBy" [(direction)]="direction"
-          (orderChange)="emitOrderChange()">
+        <span>{{ 'INGEST_LIST.ID' | translate }}</span>
+        <vitamui-common-order-by-button orderByKey="#id" [(orderBy)]="orderBy" [(direction)]="direction" (orderChange)="emitOrderChange()">
         </vitamui-common-order-by-button>
       </div>
       <div class="col-2" i18n="ingest createdDate column header@@ingestListCreatedDateHeader">
-        <span>{{'INGEST_LIST.START_DATE' | translate}}</span>
-        <vitamui-common-order-by-button orderByKey="evDateTime" [(orderBy)]="orderBy" [(direction)]="direction"
-          (orderChange)="emitOrderChange()">
+        <span>{{ 'INGEST_LIST.START_DATE' | translate }}</span>
+        <vitamui-common-order-by-button
+          orderByKey="evDateTime"
+          [(orderBy)]="orderBy"
+          [(direction)]="direction"
+          (orderChange)="emitOrderChange()"
+        >
         </vitamui-common-order-by-button>
       </div>
       <div class="col-2" i18n="ingest createdDate column header@@ingestListCreatedDateHeader">
-        <span>{{'INGEST_LIST.END_DATE' | translate}}</span>
-        <vitamui-common-order-by-button orderByKey="evDateTime" [(orderBy)]="orderBy" [(direction)]="direction"
-          (orderChange)="emitOrderChange()">
+        <span>{{ 'INGEST_LIST.END_DATE' | translate }}</span>
+        <vitamui-common-order-by-button
+          orderByKey="evDateTime"
+          [(orderBy)]="orderBy"
+          [(direction)]="direction"
+          (orderChange)="emitOrderChange()"
+        >
         </vitamui-common-order-by-button>
       </div>
-      <div class="col-2" i18n="Ingest name@@IngestStatus">{{'INGEST_LIST.STATUS' | translate}}</div>
+      <div class="col-2" i18n="Ingest name@@IngestStatus">{{ 'INGEST_LIST.STATUS' | translate }}</div>
     </div>
     <div class="vitamui-table-body">
-      <div class="vitamui-table-rows" *ngFor="let ingest of dataSource; let index = index"
-        (click)="ingestClick.emit(ingest)">
+      <div class="vitamui-table-rows" *ngFor="let ingest of dataSource; let index = index" (click)="ingestClick.emit(ingest)">
         <div class="vitamui-row d-flex align-items-center clickable">
           <div class="row col-1">
             <ng-container [ngSwitch]="ingestStatus(ingest)">
               <div *ngSwitchCase="'OK'">
-                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-green"
-                  [style.fontSize.px]="30"></i>
+                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-green" [style.fontSize.px]="30"></i>
               </div>
               <div *ngSwitchCase="'En cours'">
-                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-grey"
-                  [style.fontSize.px]="30"></i>
+                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-grey" [style.fontSize.px]="30"></i>
               </div>
               <div *ngSwitchCase="'WARNING'">
-                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-orange"
-                  [style.fontSize.px]="30"></i>
+                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-orange" [style.fontSize.px]="30"></i>
               </div>
               <div *ngSwitchCase="'FATAL'">
-                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-black"
-                  [style.fontSize.px]="30"></i>
+                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-black" [style.fontSize.px]="30"></i>
               </div>
               <div *ngSwitchCase="'KO'">
-                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-red"
-                  [style.fontSize.px]="30"></i>
+                <i class="vitamui-icon vitamui-icon-box vitamui-row-icon status-badge status-badge-red" [style.fontSize.px]="30"></i>
               </div>
             </ng-container>
           </div>
           <div class="col-5">{{ ingest?.obIdIn }}</div>
           <div class="col-2">
-            <div> {{ ingest?.evDateTime | date: 'dd/MM/yyyy'  }} </div> <span class="date">
-              {{ ingest?.evDateTime | date: 'hh:mm:ss' }}
+            <div>{{ ingest?.evDateTime | date: 'dd/MM/yyyy' }}</div>
+            <span class="date">
+              {{ ingest?.evDateTime | date: 'HH:mm:ss':'-2000' }}
             </span>
           </div>
           <div class="col-2">
-            <div> {{ ingest?.evDateTime | date: 'dd/MM/yyyy'  }} </div> <span class="date">
-              {{ ingestEndDate(ingest) | date: 'hh:mm:ss'  }}
+            <div>{{ ingest?.evDateTime | date: 'dd/MM/yyyy' }}</div>
+            <span class="date">
+              {{ ingestEndDate(ingest) | date: 'HH:mm:ss':'-2000' }}
             </span>
           </div>
           <div class="col-2">
             <ng-container [ngSwitch]="ingestStatus(ingest)">
               <div *ngSwitchCase="'OK'">
-                <span class="status">{{'INGEST_LIST.RESULT_STATUS.FINISHED' | translate}}</span><br/><span class="text-green">{{'INGEST_LIST.RESULT.OK' | translate}}</span>
+                <span class="status">{{ 'INGEST_LIST.RESULT_STATUS.FINISHED' | translate }}</span
+                ><br /><span class="text-green">{{ 'INGEST_LIST.RESULT.OK' | translate }}</span>
               </div>
               <div *ngSwitchCase="'En cours'">
-                <span class="status">{{'INGEST_LIST.RESULT.STARTED' | translate}}</span><br/><span class="text-grey">....</span>
+                <span class="status">{{ 'INGEST_LIST.RESULT.STARTED' | translate }}</span
+                ><br /><span class="text-grey">....</span>
               </div>
               <div *ngSwitchCase="'WARNING'">
-                <span class="status">{{'INGEST_LIST.RESULT_STATUS.FINISHED' | translate}}</span><br /><span class="text-orange">{{'INGEST_LIST.RESULT.WARNING' | translate}}</span>
+                <span class="status">{{ 'INGEST_LIST.RESULT_STATUS.FINISHED' | translate }}</span
+                ><br /><span class="text-orange">{{ 'INGEST_LIST.RESULT.WARNING' | translate }}</span>
               </div>
               <div *ngSwitchCase="'FATAL'">
-                <span class="status">{{'INGEST_LIST.RESULT_STATUS.BREAK' | translate}}</span><br /><span class="text-red">{{'INGEST_LIST.RESULT.FATAL' | translate}}</span>
+                <span class="status">{{ 'INGEST_LIST.RESULT_STATUS.BREAK' | translate }}</span
+                ><br /><span class="text-red">{{ 'INGEST_LIST.RESULT.FATAL' | translate }}</span>
               </div>
               <div *ngSwitchCase="'KO'">
-                <span class="status">{{'INGEST_LIST.RESULT_STATUS.FINISHED' | translate}}</span><br /><span class="text-red">{{'INGEST_LIST.RESULT.KO' | translate}}</span>
+                <span class="status">{{ 'INGEST_LIST.RESULT_STATUS.FINISHED' | translate }}</span
+                ><br /><span class="text-red">{{ 'INGEST_LIST.RESULT.KO' | translate }}</span>
               </div>
             </ng-container>
           </div>
@@ -84,7 +92,7 @@
       </div>
     </div>
   </div>
-  <div *ngIf="!pending && !ingestService.canLoadMore then resultfound else loadingSpinner"></div>
+  <div *ngIf="!pending && !ingestService.canLoadMore; then resultfound; else loadingSpinner"></div>
 </div>
 <ng-template #loadingSpinner>
   <div class="vitamui-min-content">
@@ -92,5 +100,5 @@
   </div>
 </ng-template>
 <ng-template #resultfound>
-  <div class="text-center">{{'INGEST_LIST.NORESULTS' | translate}}</div>
+  <div class="text-center">{{ 'INGEST_LIST.NORESULTS' | translate }}</div>
 </ng-template>

ui/ui-frontend/projects/ingest/src/app/ingest/ingest-preview/ingest-preview.component.html

@@ -8,7 +8,7 @@
       ? 'grey'
       : 'red'
   "
-  [title]="ingest?.obIdIn ? ingest?.obIdIn : ingest?.id"
+  [title]="(ingest?.obIdIn ? ingest?.obIdIn : ingest?.id) | truncate: 30"
   [icon]="'vitamui-icon-box vitamui-row-icon'"
   [hasToolTipOnTitle]="true"
   [toolTipTitleText]="ingest?.obIdIn ? ingest?.obIdIn : ingest?.id"

ui/ui-frontend/projects/ingest/src/sass/_tooltip.scss

@@ -3,43 +3,45 @@
 $arrow-size: 20px;
 
 .vitamui-tooltip.mat-tooltip {
-    background: #E1F3F0;
-    font-size: 13px;
-    font-weight: 600;
-    color: #666666;
-    border-radius: 15px;
-    border: 1px solid #E1F3F0;
-    padding: 5px 20px;
-    position: relative;
-    overflow: visible;
+  background: #e1f3f0;
+  font-size: 13px;
+  font-weight: 600;
+  color: #666666;
+  border-radius: 25px;
+  border: 1px solid #e1f3f0;
+  padding: 5px 20px;
+  position: relative;
+  overflow: visible;
+  white-space: pre-line;
+  min-width: 300px;
 
-    &:before {
-        content: '';
-        display: block;
-        position: absolute;
-        top: 0;
-        left: 50%;
-        border-color: transparent transparent #E1F3F0 transparent;
-        border-width: $arrow-size * 0.5;
-        border-style: solid;
-        width: $arrow-size;
-        height: $arrow-size;
-        margin-top: $arrow-size * -1;
-        margin-left: $arrow-size * -0.5;
-    }
+  &:before {
+    content: '';
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 50%;
+    border-color: transparent transparent #e1f3f0 transparent;
+    border-width: $arrow-size * 0.5;
+    border-style: solid;
+    width: $arrow-size;
+    height: $arrow-size;
+    margin-top: $arrow-size * -1;
+    margin-left: $arrow-size * -0.5;
+  }
 
-    &:after {
-        content: '';
-        display: block;
-        position: absolute;
-        top: 0;
-        left: 50%;
-        border-color: transparent transparent #E1F3F0 transparent;
-        border-width: ($arrow-size - 2px) * 0.5;
-        border-style: solid;
-        width: $arrow-size - 2px;
-        height: $arrow-size - 2px;
-        margin-top: ($arrow-size - 2px) * -1;
-        margin-left: ($arrow-size - 2px) * -0.5;
-    }
+  &:after {
+    content: '';
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 50%;
+    border-color: transparent transparent #e1f3f0 transparent;
+    border-width: ($arrow-size - 2px) * 0.5;
+    border-style: solid;
+    width: $arrow-size - 2px;
+    height: $arrow-size - 2px;
+    margin-top: ($arrow-size - 2px) * -1;
+    margin-left: ($arrow-size - 2px) * -0.5;
+  }
 }

ui/ui-frontend/projects/referential/src/app/core/api/operation-api.service.ts

@@ -34,37 +34,34 @@
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
-import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
-import {Inject, Injectable} from '@angular/core';
-import {Observable} from 'rxjs';
-import {tap} from 'rxjs/operators';
-import {BASE_URL, BaseHttpClient, Event, PageRequest, PaginatedResponse} from 'ui-frontend-common';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { Inject, Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { BaseHttpClient, BASE_URL, Event, PageRequest, PaginatedResponse } from 'ui-frontend-common';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class OperationApiService extends BaseHttpClient<Event> {
-
   constructor(http: HttpClient, @Inject(BASE_URL) baseUrl: string) {
     super(http, baseUrl + '/operation');
   }
 
   getAllByParams(params: HttpParams, headers?: HttpHeaders) {
-    return super.getAllByParams(params, headers).pipe(
-      tap(result => result.map(ev => ev.parsedData = (ev.data != null) ? JSON.parse(ev.data) : null))
-    );
+    return super
+      .getAllByParams(params, headers)
+      .pipe(tap((result) => result.map((ev) => (ev.parsedData = ev.data != null ? JSON.parse(ev.data) : null))));
   }
 
   getAllPaginated(pageRequest: PageRequest, embedded?: string, headers?: HttpHeaders): Observable<PaginatedResponse<any>> {
-    return super.getAllPaginated(pageRequest, embedded, headers).pipe(
-      tap(result => result.values.map(ev => ev.parsedData = (ev.data != null) ? JSON.parse(ev.data) : null))
-    );
+    return super
+      .getAllPaginated(pageRequest, embedded, headers)
+      .pipe(tap((result) => result.values.map((ev) => (ev.parsedData = ev.data != null ? JSON.parse(ev.data) : null))));
   }
 
   getOne(id: string, headers?: HttpHeaders): Observable<any> {
-    return super.getOne(id, headers).pipe(
-      tap(ev => ev.parsedData = (ev.data != null) ? JSON.parse(ev.data) : null)
-    );
+    return super.getOne(id, headers).pipe(tap((ev) => (ev.parsedData = ev.data != null ? JSON.parse(ev.data) : null)));
   }
 
   checkTraceabilityOperation(id: string, accessContract: string): Observable<any> {
@@ -77,7 +74,7 @@ export class OperationApiService extends BaseHttpClient<Event> {
   }
 
   downloadOperation(id: string, type: string, headers?: HttpHeaders): Observable<Blob> {
-    return this.http.get(`${this.apiUrl}/${id}/download/${type}`, {responseType: 'blob', headers});
+    return this.http.get(`${this.apiUrl}/${id}/download/${type}`, { responseType: 'blob', headers });
   }
 
   runAudit(audit: any, headers?: HttpHeaders): Observable<any> {
@@ -85,12 +82,13 @@ export class OperationApiService extends BaseHttpClient<Event> {
   }
 
   runProbativeValue(probativeValue: any, headers?: HttpHeaders): Observable<any> {
-    return this.http.post(this.apiUrl + '/probativeValue', probativeValue, {headers});
+    return this.http.post(this.apiUrl + '/probativeValue', probativeValue, { headers });
   }
 
-  downloadProbativeValue(id: string, headers?: HttpHeaders): Observable<any> {
+  downloadProbativeValue(id: string, headers?: HttpHeaders): Observable<Blob> {
     console.log('Download probative value ', this.apiUrl, id, headers);
-    return this.http.get(this.apiUrl + '/probativeValue/' + id, {responseType: 'blob', headers});
+    return this.http.get(`${this.apiUrl}/probativeValue/${id}`, { responseType: 'blob', headers });
   }
 
+  // return this.http.get(`${this.apiUrl}/downloadobjectfromunit/${id}`, { headers: headers, observe: 'response', responseType: 'blob' });
 }

ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-list/logbook-management-operation-list.component.html

@@ -147,7 +147,7 @@
             <div class="col-2">
               <div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div>
               <span class="date">
-                {{ operation?.processDate | date: 'hh:mm:ss':'+0000' }}
+                {{ operation?.processDate | date: 'hh:mm:ss':'-1000' }}
               </span>
             </div>
 

ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html

@@ -13,10 +13,12 @@
 
       <th>
         <div class="vitamui-table-header">
-
-          <button class="vitamui-filter-button" [vitamuiCommonTableFilter]="operationCategoriesFilterTemplate"
-          [class.active]="filterMap['operationCategories'] && filterMap['operationCategories'].length > 0">
-          <i class="material-icons vitamui-row-icon">filter_list</i>
+          <button
+            class="vitamui-filter-button"
+            [vitamuiCommonTableFilter]="operationCategoriesFilterTemplate"
+            [class.active]="filterMap['operationCategories'] && filterMap['operationCategories'].length > 0"
+          >
+            <i class="material-icons vitamui-row-icon">filter_list</i>
           </button>
 
           <ng-template #operationCategoriesFilterTemplate>
@@ -62,11 +64,15 @@
           <span i18n="@@logbookOperationListStepHeader">Étape</span>
         </div>
       </th>
-
     </tr>
   </thead>
   <tbody>
-    <tr *ngFor="let event of dataSource; let index = index" (click)="selectEvent(event)" class="vitamui-table-row" [ngStyle] = "{'cursor':'pointer'}"> 
+    <tr
+      *ngFor="let event of dataSource; let index = index"
+      (click)="selectEvent(event)"
+      class="vitamui-table-row"
+      [ngStyle]="{ cursor: 'pointer' }"
+    >
       <td class="no-first-cell-padding width60">
         <div class="vitamui-cell-icon aligned">
           <div class="status-badge" [ngClass]="event | eventTypeBadgeClass">
@@ -74,31 +80,51 @@
           </div>
         </div>
       </td>
-      <td><div class="vitamui-cell-content break-content" [title]="event.id">{{ event?.id }}</div></td>
-      <td><div class="vitamui-cell-content" [ngClass]="event | eventTypeColorClass"><vitamui-common-event-type-label [key]="event.typeProc"></vitamui-common-event-type-label></div></td>
-      <td><div class="vitamui-cell-content" [ngClass]="event | eventTypeColorClass"><vitamui-common-event-type-label [key]="event.type"></vitamui-common-event-type-label></div></td>
       <td>
-        <div class="vitamui-cell-content">{{ event?.dateTime | date:'dd/MM/yyyy' }}</div>
+        <div class="vitamui-cell-content break-content" [title]="event.id">{{ event?.id }}</div>
+      </td>
+      <td>
+        <div class="vitamui-cell-content" [ngClass]="event | eventTypeColorClass">
+          <vitamui-common-event-type-label [key]="event.typeProc"></vitamui-common-event-type-label>
+        </div>
+      </td>
+      <td>
+        <div class="vitamui-cell-content" [ngClass]="event | eventTypeColorClass">
+          <vitamui-common-event-type-label [key]="event.type"></vitamui-common-event-type-label>
+        </div>
+      </td>
+      <td>
+        <div class="vitamui-cell-content">{{ event?.dateTime | date: 'dd/MM/yyyy' }}</div>
         <div class="vitamui-cell-sub-content cell-content-bold">
-          <span>{{ event?.dateTime | date:'hh:mm:ss' }}</span>
+          <span>{{ event?.dateTime | date: 'HH:mm:ss':'-2000' }}</span>
         </div>
       </td>
       <td>
-        <div class="vitamui-cell-content">{{ (event | lastEvent)?.dateTime | date:'dd/MM/yyyy' }}</div>
+        <div class="vitamui-cell-content">{{ (event | lastEvent)?.dateTime | date: 'dd/MM/yyyy' }}</div>
         <div class="vitamui-cell-sub-content cell-content-bold">
-          <span>{{ (event | lastEvent)?.dateTime | date:'hh:mm:ss' }}</span>
+          <span>{{ (event | lastEvent)?.dateTime | date: 'HH:mm:ss':'-2000' }}</span>
+        </div>
+      </td>
+      <td>
+        <div class="vitamui-cell-content" [ngClass]="event | eventTypeColorClass">{{ (event | lastEvent)?.outcome }}</div>
+      </td>
+      <td>
+        <div class="vitamui-cell-content cell-content-bold break-content" [ngClass]="event | eventTypeColorClass">
+          {{ (event | lastEvent)?.type }}
         </div>
       </td>
-      <td><div class="vitamui-cell-content" [ngClass]="event | eventTypeColorClass">{{ (event | lastEvent)?.outcome }}</div></td>
-      <td><div class="vitamui-cell-content cell-content-bold break-content" [ngClass]="event | eventTypeColorClass">{{ (event | lastEvent)?.type }}</div></td>
     </tr>
   </tbody>
 </table>
 
 <div class="vitamui-table-footer">
   <mat-spinner *ngIf="pending" diameter="50" color="accent"></mat-spinner>
-  <button *ngIf="!pending && infiniteScrollDisabled && logbookSearchService.canLoadMore" (click)="loadMore()" class="btn"
-    i18n="Show more results@@tableMoreResultButton">
+  <button
+    *ngIf="!pending && infiniteScrollDisabled && logbookSearchService.canLoadMore"
+    (click)="loadMore()"
+    class="btn"
+    i18n="Show more results@@tableMoreResultButton"
+  >
     Afficher plus de résultats...
   </button>
 </div>

ui/ui-frontend/projects/referential/src/app/probative-value/probative-value-preview/probative-value-preview.component.ts

@@ -54,7 +54,6 @@ export class ProbativeValuePreviewComponent implements OnInit, OnDestroy {
   @Output() previewClose: EventEmitter<any> = new EventEmitter();
 
   accessContracts: AccessContract[];
-  accessContractId: string;
   hasAccessContract: boolean;
 
   accessContractSub: Subscription;
@@ -111,6 +110,6 @@ export class ProbativeValuePreviewComponent implements OnInit, OnDestroy {
   }
 
   downloadReport() {
-    this.probativeValueService.export(this.probativeValue.id, this.accessContractId);
+    this.probativeValueService.export(this.probativeValue.id, this.accessContract);
   }
 }