Commit b0af30f3 authored by Alex ORLUC's avatar Alex ORLUC

fix loader

parent 9cead15b
......@@ -38,7 +38,7 @@
<div class="title-divider"></div>
</div>
<div class="content">
<app-history-workflow-resume *ngIf="!loading" [resId]="currentResourceInformations.resId"
<app-history-workflow-resume [resId]="currentResourceInformations.resId"
(goTo)="currentTool = 'history'">
</app-history-workflow-resume>
</div>
......@@ -49,7 +49,7 @@
<div class="title-divider"></div>
</div>
<div class="content">
<app-note-resume *ngIf="!loading" [resId]="currentResourceInformations.resId"
<app-note-resume [resId]="currentResourceInformations.resId"
(goTo)="currentTool = 'notes'"></app-note-resume>
</div>
</div>
......@@ -59,7 +59,7 @@
<div class="title-divider"></div>
</div>
<div class="content">
<app-attachments-resume *ngIf="!loading" [resId]="currentResourceInformations.resId"
<app-attachments-resume [resId]="currentResourceInformations.resId"
(goTo)="currentTool = 'attachments'">
</app-attachments-resume>
</div>
......@@ -70,7 +70,7 @@
<div class="title-divider"></div>
</div>
<div class="content">
<app-mail-resume *ngIf="!loading" [resId]="currentResourceInformations.resId"
<app-mail-resume [resId]="currentResourceInformations.resId"
(goTo)="currentTool = 'mails'"></app-mail-resume>
</div>
</div>
......@@ -177,8 +177,8 @@
</div>
</ng-container>
<ng-template #elseInfoRes>
<div>
<div class="loadingBanner">
<mat-spinner diameter="35"></mat-spinner>
</div>
</ng-template>
</div>
......
......@@ -169,6 +169,12 @@
z-index: 2;
}
.loadingBanner {
display: flex;
align-items: center;
justify-content: center;
}
::ng-deep.menuAction {
min-width: 350px !important;
}
......@@ -329,7 +335,6 @@
}
}
.modal-module {
background: white;
position: absolute;
......@@ -366,16 +371,16 @@
}
}
.openedModal {
display: flex;
flex-direction: column;
height: 100%;
justify-content: center;
align-items: center;
font-size: 30px;
font-weight: bold;
opacity: 0.2;
display: flex;
flex-direction: column;
height: 100%;
justify-content: center;
align-items: center;
font-size: 30px;
font-weight: bold;
opacity: 0.2;
}
.largeModal {
width: 560px;
}
\ No newline at end of file
}
......@@ -12,7 +12,7 @@ import { FiltersListService } from '../../service/filtersList.service';
import { Overlay } from '@angular/cdk/overlay';
import { AppService } from '../../service/app.service';
import { ActionsService } from '../actions/actions.service';
import { tap, catchError, map } from 'rxjs/operators';
import { tap, catchError, map, finalize } from 'rxjs/operators';
import { of } from 'rxjs';
import { DocumentViewerComponent } from '../viewer/document-viewer.component';
......@@ -144,8 +144,6 @@ export class ProcessComponent implements OnInit {
this.lockResource();
this.loading = false;
this.loadResource();
this.http.get(`../../rest/resourcesList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/actions?resId=${this.currentResourceInformations.resId}`).pipe(
......@@ -181,6 +179,7 @@ export class ProcessComponent implements OnInit {
this.currentResourceInformations = data;
this.headerService.setHeader(this.lang.eventProcessDoc, this.lang[this.currentResourceInformations.categoryId]);
}),
finalize(() => this.loading = false),
catchError((err: any) => {
this.notify.handleErrors(err);
return of(false);
......
Markdown is supported
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