Skip to content
Snippets Groups Projects
Unverified Commit d38647b2 authored by Zerouali's avatar Zerouali Committed by GitHub
Browse files

Fixe archive referential redirection issue (#429)

parent 7c9296f6
No related branches found
No related tags found
1 merge request!51Merge mis a jour vitam-ui
...@@ -72,7 +72,7 @@ ui-archive-search: ...@@ -72,7 +72,7 @@ ui-archive-search:
portal: "https://dev.vitamui.com:4200" portal: "https://dev.vitamui.com:4200"
archives-search: "https://dev.vitamui.com:4209/archive-search" archives-search: "https://dev.vitamui.com:4209/archive-search"
ingest: "https://dev.vitamui.com:4208/ingest" ingest: "https://dev.vitamui.com:4208/ingest"
referential: "https://dev.vitamui.com:4202/referential" referential: "https://dev.vitamui.com:4202"
portal-categories: portal-categories:
ingest_and_consultation: ingest_and_consultation:
......
...@@ -950,6 +950,9 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy { ...@@ -950,6 +950,9 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy {
if (action) { if (action) {
this.listOfUACriteriaSearch = []; this.listOfUACriteriaSearch = [];
this.itemSelected++; this.itemSelected++;
if (this.itemSelected === this.totalResults) {
this.isIndeterminate = false;
}
this.listOfUAIdToInclude.push({ value: id, id }); this.listOfUAIdToInclude.push({ value: id, id });
this.listOfUAIdToExclude.splice(0, this.listOfUAIdToExclude.length); this.listOfUAIdToExclude.splice(0, this.listOfUAIdToExclude.length);
} else { } else {
...@@ -1094,13 +1097,7 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy { ...@@ -1094,13 +1097,7 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy {
if (this.eliminationAnalysisResponse && this.eliminationAnalysisResponse[0].itemId) { if (this.eliminationAnalysisResponse && this.eliminationAnalysisResponse[0].itemId) {
const guid = this.eliminationAnalysisResponse[0].itemId; const guid = this.eliminationAnalysisResponse[0].itemId;
const message = this.translateService.instant('ARCHIVE_SEARCH.ELIMINATION.ELIMINATION_LAUNCHED'); const message = this.translateService.instant('ARCHIVE_SEARCH.ELIMINATION.ELIMINATION_LAUNCHED');
const index = this.startupService.getReferentialUrl().lastIndexOf('/'); const serviceUrl = this.startupService.getReferentialUrl() + '/logbook-operation/tenant/' + this.tenantIdentifier + '?guid=' + guid;
const serviceUrl =
this.startupService.getReferentialUrl().substring(0, index) +
'/logbook-operation/tenant/' +
this.tenantIdentifier +
'?guid=' +
guid;
this.openSnackBarForWorkflow(message, serviceUrl); this.openSnackBarForWorkflow(message, serviceUrl);
} }
......
...@@ -117,13 +117,8 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy { ...@@ -117,13 +117,8 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy {
this.archiveService.exportDIPService(exportDIPCriteriaList, this.data.accessContract).subscribe( this.archiveService.exportDIPService(exportDIPCriteriaList, this.data.accessContract).subscribe(
(response) => { (response) => {
this.dialogRef.close(true); this.dialogRef.close(true);
const index = this.startupService.getReferentialUrl().lastIndexOf('/');
const serviceUrl = const serviceUrl =
this.startupService.getReferentialUrl().substring(0, index) + this.startupService.getReferentialUrl() + '/logbook-operation/tenant/' + this.data.tenantIdentifier + '?guid=' + response;
'/logbook-operation/tenant/' +
this.data.tenantIdentifier +
'?guid=' +
response;
this.archiveService.openSnackBarForWorkflow(this.translate.instant('ARCHIVE_SEARCH.DIP.REQUEST_MESSAGE'), serviceUrl); this.archiveService.openSnackBarForWorkflow(this.translate.instant('ARCHIVE_SEARCH.DIP.REQUEST_MESSAGE'), serviceUrl);
}, },
......
...@@ -86,9 +86,6 @@ export class OperationApiService extends BaseHttpClient<Event> { ...@@ -86,9 +86,6 @@ export class OperationApiService extends BaseHttpClient<Event> {
} }
downloadProbativeValue(id: string, headers?: HttpHeaders): Observable<Blob> { 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' });
} }
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<div class="col-2"> <div class="col-2">
<div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div> <div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div>
<span class="date"> <span class="date">
{{ operation?.processDate | date: 'hh:mm:ss':'-1000' }} {{ operation?.processDate | date: 'HH:mm:ss' }}
</span> </span>
</div> </div>
......
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
<label> {{ 'LOGBOOK_OPERATION_INFORMATIONS.OPERATION_DATE' | translate }}</label> <label> {{ 'LOGBOOK_OPERATION_INFORMATIONS.OPERATION_DATE' | translate }}</label>
<div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div> <div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div>
<span class="date"> <span class="date">
{{ operation?.processDate | date: 'hh:mm:ss':'+0000' }} {{ operation?.processDate | date: 'HH:mm:ss' }}
</span> </span>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<label> {{ 'LOGBOOK_OPERATION_INFORMATIONS.FINAL_DATE' | translate }}</label> <label> {{ 'LOGBOOK_OPERATION_INFORMATIONS.FINAL_DATE' | translate }}</label>
<div>{{ getEventEndDate(event)?.dateTime | date: 'dd/MM/yyyy' }}</div> <div>{{ getEventEndDate(event)?.dateTime | date: 'dd/MM/yyyy' }}</div>
<span class="date"> <span class="date">
{{ getEventEndDate(event)?.dateTime | date: 'hh:mm:ss' }} {{ getEventEndDate(event)?.dateTime | date: 'HH:mm:ss':'-2000' }}
</span> </span>
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment