Commit 60d78a79 authored by Chris Hines's avatar Chris Hines
Browse files

make sure we can display apps that don't have an explicit start command like CryoEM

parent 10baa2e5
......@@ -4,8 +4,8 @@
<!--<iframe *ngIf="appconfigurl != null" fxGrow=10 fxFlex [src]="appconfigsafeurl" style="border: none"></iframe>
<iframe *ngIf="appconfigurl != null" [src]="batchcmdsafeurl" style="height: 1px; min-height: 0px; border: none" #batchbuilderiframe></iframe>-->
<div *ngIf="(appSubject | async ) !== null" style="width: 100%">
<iframe [src]="batchcmdsafeurl" style="border: none; border-style: none; border-width: 0px; width: 100%; overflow: auto" [style.height]="height+'px'" #batchbuilderiframe></iframe>
<div *ngIf="appSubject | async as app" style="width: 100%">
<iframe *ngIf="app.startscript !== null" [src]="batchcmdsafeurl" style="border: none; border-style: none; border-width: 0px; width: 100%; overflow: auto" [style.height]="height+'px'" #batchbuilderiframe></iframe>
<!--<div *ngIf="appconfigsafeurl !== null && configtoggle">
<iframe [src]="appconfigsafeurl" style="border: none; border-style: none; border-width: 0px; width: 100%" [style.height]="appconfigheight+'px'" #batchbuilderiframe></iframe>
</div>-->
......@@ -13,7 +13,7 @@
<div *ngIf="appSubject | async as app">
<div fxLayout="row" fxLayoutAlign="space-around">
<button *ngIf="appconfigsafeurl !== null" mat-flat-button (click)="configdialog()" color="primary">Configure</button>
<button mat-flat-button (click)="launch()" color="primary" #launchbtn [disabled]="!readyToLaunch">Launch</button>
<button *ngIf="app.startscript !== null" mat-flat-button (click)="launch()" color="primary" #launchbtn [disabled]="!readyToLaunch">Launch</button>
<button *ngFor="let action of app.appactions" mat-flat-button (click)="runaction(action)" color="primary" >{{ action.name }}</button>
</div>
</div>
......
......@@ -163,6 +163,7 @@ export class LaunchDialogComponent implements OnInit {
job.jobid='1';
newaction = new AppAction();
newaction.paramscmd = action.paramscmd.replace(/\{submitcmd\}/,submitcmd);
newaction.client = action.client;
console.log('really runAction');
console.log(newaction.paramscmd);
this.tesService.connect(job,newaction);
......
<div *ngFor="let app of applist | async" >
<mat-list-item *ngIf="app.startscript != null" style="width: 100%">
<!--<mat-list-item *ngIf="app.startscript != null" style="width: 100%">-->
<mat-list-item style="width: 100%">
<button mat-button style="width: 100%; text-align: left"
[routerLink]="['/launch',identity.displayName(),app.name]"
routerLinkActive #rla="routerLinkActive">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment