Skip to content
Snippets Groups Projects
Commit 3f049216 authored by Chris Hines's avatar Chris Hines
Browse files

fix for #138

parent d1a2d4b9
No related branches found
No related tags found
4 merge requests!106if stat fails, display the error instead of immediately refreshing...,!99Dev,!61Test,!60fix for https://gitlab.erc.monash.edu.au/hpc-team/strudelv2_spa/-/issues/138
Pipeline #10435 passed
...@@ -43,6 +43,7 @@ export class LaunchDialogComponent implements OnInit { ...@@ -43,6 +43,7 @@ export class LaunchDialogComponent implements OnInit {
configtoggle: boolean; configtoggle: boolean;
configwindow: any; configwindow: any;
public readyToLaunch: boolean; public readyToLaunch: boolean;
private openWindowSub: Subscription;
//constructor( public dialogRef: MatDialogRef<LaunchDialogComponent>, //constructor( public dialogRef: MatDialogRef<LaunchDialogComponent>,
constructor( constructor(
...@@ -59,7 +60,6 @@ export class LaunchDialogComponent implements OnInit { ...@@ -59,7 +60,6 @@ export class LaunchDialogComponent implements OnInit {
this.height=0; this.height=0;
this.submitcmd.subscribe(() => this.canILaunch()); this.submitcmd.subscribe(() => this.canILaunch());
this.appData.subscribe(() => this.canILaunch()); this.appData.subscribe(() => this.canILaunch());
this.tesService.openWindow$.subscribe((v) => { this.browserWindowService.openAppWindow(v.job,v.url,v.usebasicauth,v.action,v.appinst)})
this.browserWindowService.cancelJob$.subscribe((v) => this.tesService.cancel(v)) this.browserWindowService.cancelJob$.subscribe((v) => this.tesService.cancel(v))
} }
...@@ -69,6 +69,7 @@ export class LaunchDialogComponent implements OnInit { ...@@ -69,6 +69,7 @@ export class LaunchDialogComponent implements OnInit {
this.setFocus = false; this.setFocus = false;
this.updateURLs(); this.updateURLs();
this.clearInfo(); this.clearInfo();
this.openWindowSub = this.tesService.openWindow$.subscribe((v) => { this.browserWindowService.openAppWindow(v.job,v.url,v.usebasicauth,v.action,v.appinst)})
this.subscriptions.push(this.appSubject.subscribe(() => { this.app = this.appSubject.value; this.updateURLs() ; this.clearInfo()})); this.subscriptions.push(this.appSubject.subscribe(() => { this.app = this.appSubject.value; this.updateURLs() ; this.clearInfo()}));
} }
...@@ -109,6 +110,7 @@ export class LaunchDialogComponent implements OnInit { ...@@ -109,6 +110,7 @@ export class LaunchDialogComponent implements OnInit {
for (let s of this.subscriptions) { for (let s of this.subscriptions) {
s.unsubscribe(); s.unsubscribe();
} }
this.openWindowSub.unsubscribe();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment