diff --git a/src/app/job/job.component.html b/src/app/job/job.component.html index 654941a718428e3132fac5353c7f6af37a14f2bc..2dd24fda00632fd3dda318049632f38488be94c6 100644 --- a/src/app/job/job.component.html +++ b/src/app/job/job.component.html @@ -17,7 +17,7 @@ Cancel </button> </div> - <div fxFlex *ngIf="jobdata.state == 'RUNNING'"> + <div fxFlex *ngIf="jobdata.state == 'RUNNING' && jobdata.app !== null && jobdata.app.client !== null"> <button mat-button (click)="onConnect()"> Connect </button> diff --git a/src/app/tes.service.ts b/src/app/tes.service.ts index c1ea14d3bf11b1f37094d80d4b86441c18986aa7..fe92df191c705a9d81061b5ca68ada7914707354 100644 --- a/src/app/tes.service.ts +++ b/src/app/tes.service.ts @@ -234,6 +234,17 @@ public setStatusMsg(statusMsg: BehaviorSubject<any>) { this.busy.next(false); } } + cancelError(error: any) { + console.log('error canceling job',error); + if (error.status != 0) { + if ('error' in error && 'message' in error.error) { + this.statusMsg.next(error.error.message); + } else { + this.statusMsg.next('Job submission failed'); + } + this.busy.next(false); + } + } buildBody(app: Strudelapp, appparams?: string) { return JSON.stringify({'app': app, 'appparams': appparams}); @@ -257,6 +268,7 @@ public setStatusMsg(statusMsg: BehaviorSubject<any>) { } submitted(resp: any, identity: Identity ) { + console.log('submitted',resp); this.busy.next(false); this.getJobs(identity); } @@ -271,8 +283,8 @@ public setStatusMsg(statusMsg: BehaviorSubject<any>) { bi.cancelcmd = job.identity.site.cancelcmd; let paramstr = this.buildParams(job.app,job.identity,bi); this.http.delete<any>(this.Base+'/cancel/'+job.jobid+'?'+paramstr, options) - .pipe(catchError(this.handleError)) - .subscribe(resp => this.submitted(resp,job.identity)); + .subscribe(resp => this.submitted(resp,job.identity), + error => this.cancelError(error)); } public watchAppwindow(appwindow, dialogRef) { diff --git a/src/assets/config/m3apps.dev.json b/src/assets/config/m3apps.dev.json index 426c6f0476d7bf659f1c54bee83f0ed27091c594..8cbbaeb6591eefa37a90ce87406b1e2df80bb550 100644 --- a/src/assets/config/m3apps.dev.json +++ b/src/assets/config/m3apps.dev.json @@ -18,8 +18,8 @@ }, { "url": "transfer", "name": "Transfer files", - "startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/copytool.py\n", - "paramscmd": "/usr/local/sv2/desktop/params.py", + "startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/dev/copytool.py\n", + "paramscmd": null, "client": {"cmd": null, "redir": null }, "localbind": true, "applist": null diff --git a/src/assets/config/m3apps.json b/src/assets/config/m3apps.json index 426c6f0476d7bf659f1c54bee83f0ed27091c594..539ae6e1d07cfbb951b0cf0efa84d916f2968e7a 100644 --- a/src/assets/config/m3apps.json +++ b/src/assets/config/m3apps.json @@ -18,9 +18,9 @@ }, { "url": "transfer", "name": "Transfer files", - "startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/copytool.py\n", + "startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/dev/copytool.py\n", "paramscmd": "/usr/local/sv2/desktop/params.py", - "client": {"cmd": null, "redir": null }, + "client": null, "localbind": true, "applist": null }, diff --git a/src/assets/config/m3apps.test.json b/src/assets/config/m3apps.test.json index 426c6f0476d7bf659f1c54bee83f0ed27091c594..b89fc5b3e468fcae168e0c0ad9ea05719b227058 100644 --- a/src/assets/config/m3apps.test.json +++ b/src/assets/config/m3apps.test.json @@ -19,8 +19,8 @@ { "url": "transfer", "name": "Transfer files", "startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/copytool.py\n", - "paramscmd": "/usr/local/sv2/desktop/params.py", - "client": {"cmd": null, "redir": null }, + "paramscmd": null, + "client": null, "localbind": true, "applist": null },