Merge pull request #87 from oneteme/release/v3.1

Fix:  set correct condition for parent loading

Author: YoussefDahi

src/app/views/detail/session/rest/detail-session-rest.view.html

@@ -11,8 +11,8 @@
                     <mat-icon>call_received</mat-icon>
                     {{ session.name || 'N/A' }}
                 </a>
-                <div class="right">
-                    <mat-progress-spinner *ngIf="!sessionParent" style="display:inline-flex !important;" diameter="24" mode="indeterminate"
+                <div class="right">        
+                    <mat-progress-spinner *ngIf="parentLoading && !sessionParent" style="display:inline-flex !important;" diameter="24" mode="indeterminate"
                                           matTooltip="Chargement de l'appel parent" TooltipPosition="below"></mat-progress-spinner> 
                     <button mat-icon-button (click)="navigate($event,'parent')" matTooltip="Détail de l'appel parent"
                             [hidden]="!sessionParent">

src/app/views/detail/session/rest/detail-session-rest.view.ts

@@ -23,6 +23,7 @@ export class DetailSessionRestView implements OnInit, OnDestroy {
     completedSession: InstanceRestSession
     sessionParent: { id: string, type: string };
     isLoading: boolean = false;
+    parentLoading: boolean =false;
     subscriptions: Array<Subscription> = [];
     queryBySchema: any[];
     env: string;
@@ -42,11 +43,12 @@ export class DetailSessionRestView implements OnInit, OnDestroy {
 
     getSession(id: string) {
         this.isLoading = true;
+        this.parentLoading = true;
         this.session = null;
         this.completedSession =null;
         this.queryBySchema = null;
         this.sessionParent=null;
-        this._traceService.getSessionParent(id).pipe(catchError(() => of(null))).subscribe(d=>this.sessionParent=d) 
+        this._traceService.getSessionParent(id).pipe(catchError(() => of(null)),finalize(()=>(this.parentLoading = false))).subscribe(d=>this.sessionParent=d) 
         this._traceService.getRestSession(id)
             .pipe(
                 switchMap(s => {