add spinner ref

projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/services/app.service.ts

@@ -2,6 +2,7 @@ import {Location as LocationService} from '@angular/common';
 import {HttpParams} from '@angular/common/http';
 import {computed, Injectable, Signal, signal} from '@angular/core';
 import {AbstractControl, FormBuilder, Validators} from '@angular/forms';
+import {MatDialogRef} from '@angular/material/dialog';
 import {ActivatedRoute} from '@angular/router';
 import {
   AwsService,
@@ -9,7 +10,11 @@ import {
   JobStatus,
   TerminateJobRequestData,
 } from '@ghsc/nshmp-lib-ng/aws';
-import {NshmpService, SpinnerService} from '@ghsc/nshmp-lib-ng/nshmp';
+import {
+  NshmpLibNgSpinnerComponent,
+  NshmpService,
+  SpinnerService,
+} from '@ghsc/nshmp-lib-ng/nshmp';
 import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
 import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils';
 import {EC2} from 'aws-sdk';
@@ -126,9 +131,10 @@ export class AppService implements AppServiceModel<AppState, ControlForm> {
    */
   callService(showSpinner = true): void {
     const {id} = this.formGroup.getRawValue();
+    let spinnerRef: MatDialogRef<NshmpLibNgSpinnerComponent> = undefined;
 
     if (showSpinner) {
-      this.spinnerService.show(`Getting logs for job ${id}`);
+      spinnerRef = this.spinnerService.show(`Getting logs for job ${id}`);
     }
 
     const url = `${this.baseUrl}${this.hazardLogsService}/${id}`;
@@ -139,9 +145,10 @@ export class AppService implements AppServiceModel<AppState, ControlForm> {
     this.nshmpService
       .callService$<Response<GetLogsRequestData, GetLogsResponseData>>(url)
       .pipe(catchError((error: Error) => this.nshmpService.throwError$(error)))
-      .subscribe(serviceResponse =>
-        this.handleServiceResponse(serviceResponse, showSpinner),
-      );
+      .subscribe(serviceResponse => {
+        this.handleServiceResponse(serviceResponse);
+        spinnerRef?.close();
+      });
   }
 
   defaultFormValues(): ControlForm {
@@ -212,7 +219,6 @@ export class AppService implements AppServiceModel<AppState, ControlForm> {
    */
   private handleServiceResponse(
     serviceResponse: Response<GetLogsRequestData, GetLogsResponseData>,
-    showSpinner: boolean,
   ): void {
     const {autoRefresh} = this.formGroup.getRawValue();
     const status = serviceResponse.response.jobStatus;
@@ -224,11 +230,6 @@ export class AppService implements AppServiceModel<AppState, ControlForm> {
       setTimeout(() => this.callService(false), 3000);
     }
 
-    if (showSpinner) {
-      this.spinnerService.remove();
-    }
-    this.spinnerService.remove();
-
     this.updateState({
       serviceLoading: false,
       serviceResponse,