Commit 8bcaecf4 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

code housekeeping & toast dialog correction when the execution of primitive is canceled.

parent 610b670c

src/app/p_services/admin/serviceActivationAndConfiguration/execute-mano-service-primitive/execute-mano-service-primitive.component.ts

+1 −1
Changes for src/app/p_services/admin/serviceActivationAndConfiguration/execute-mano-service-primitive/execute-mano-service-primitive.component.ts: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ export class ExecuteManoServicePrimitiveComponent implements OnInit { 
    this.serviceService.patchService({service: serviceUpdate, id: this.data.serviceToBeUpdated.id}).subscribe(

    this.serviceService.patchService({service: serviceUpdate, id: this.data.serviceToBeUpdated.id}).subscribe(

      data => { },

      data => { },

      error => { console.error(error); this.dialogRef.close(error)},

      error => { console.error(error); this.dialogRef.close(error)},

      () => { this.dialogRef.close('updated') }

      () => { this.dialogRef.close("updated") }

    )

    )

  }

  }

}
 
}

src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts

+3 −1
Changes for src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts: 3 added lines, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -100,7 +100,6 @@ export class PreviewServiceComponent implements OnInit { 
    this.serviceService.retrieveService({id: this.serviceID}).subscribe(

    this.serviceService.retrieveService({id: this.serviceID}).subscribe(

      data => {

      data => {

        this.service = data

        this.service = data

        // this.service = dummyService

      },

      },

      error => {

      error => {

        console.error(error)

        console.error(error)
@@ -303,10 +302,13 @@ export class PreviewServiceComponent implements OnInit { 
        if (result instanceof HttpErrorResponse) {

        if (result instanceof HttpErrorResponse) {

          this.toast.error("An error occurred while attempting to queue the service primitive for execution")

          this.toast.error("An error occurred while attempting to queue the service primitive for execution")

        } else {

        } else {

          // check if something is returned from the dialog (updated service object) or the dialog is cancelled

          if (result) {

            this.toast.success("The service primitive was successfully queued for execution. Please check NSLCM for updates.")

            this.toast.success("The service primitive was successfully queued for execution. Please check NSLCM for updates.")

            this.retrieveService()

            this.retrieveService()

          }

          }

        }

        }

      }

    )

    )

  }

  }