Merge branch 'release/2.4.1-RC1' into 'main'

Merge 2.4.1 into main (UI)

See merge request !15

src/app/app.module.ts

@@ -33,6 +33,7 @@ import {JobspecTargetComponent} from './jobspecs/jobspec/jobspec-detail/jobspec-
 import {JobspecInputComponent} from './jobspecs/jobspec/jobspec-detail/jobspec-input/jobspec-input.component';
 import {JobspecExecutionComponent} from './jobspecs/jobspec/jobspec-detail/jobspec-execution/jobspec-execution.component';
 import {ExecutionDetailComponent} from './executions/execution/execution-detail/execution-detail.component';
+import {ExecutionDetailPlanesComponent} from './executions/execution/execution-detail/execution-detail-planes/execution-detail-planes.component';
 import {FontAwesomeModule} from "@fortawesome/angular-fontawesome";
 import {LoadingComponent} from './loading/loading.component';
 import {QueueSettingsComponent} from './settings/queue-settings/queue-settings.component';
@@ -76,6 +77,7 @@ export function init_app(configService: ConfigurationService) {
     JobspecInputComponent,
     JobspecExecutionComponent,
     ExecutionDetailComponent,
+    ExecutionDetailPlanesComponent,
     LoadingComponent,
     QueueSettingsComponent,
     FutureProductComponent,

src/app/executions/execution/execution-detail/execution-detail-planes/execution-detail-planes.component.html

+<form [formGroup]="planesFormGroup" (ngSubmit)="acceptPlanes()" class="mb-2">
+  <h4 class="pt-2 border-top">
+    Planes
+  </h4>
+
+  <div class="w-100" *ngFor="let plane of getPlaneKeys()">
+    <label><input type="checkbox" [formControlName]="plane" value="{{plane}}" checked/>{{plane}}</label>
+  </div>
+
+  <button type="submit" class="btn btn-success btn-sm">
+    Accept &amp; Archive Selected Planes
+  </button>
+</form>

src/app/executions/execution/execution-detail/execution-detail-planes/execution-detail-planes.component.spec.ts

+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {ExecutionDetailPlanesComponent} from './execution-detail-planes.component';
+
+describe('ExecutionDetailPlanesComponent', () => {
+  let component: ExecutionDetailPlanesComponent;
+  let fixture: ComponentFixture<ExecutionDetailPlanesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ExecutionDetailPlanesComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ExecutionDetailPlanesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/executions/execution/execution-detail/execution-detail-planes/execution-detail-planes.component.ts

+import {Component, EventEmitter, Input, Output, OnDestroy, OnInit} from '@angular/core';
+import {FormControl, FormGroup} from '@angular/forms';
+import {AlertService} from '../../../../services/alert.service';
+import {JobsService} from '../../../../services/jobs.service';
+import {Job} from '../../../../model/job';
+import {Observable} from 'rxjs';
+
+@Component({
+  selector: 'app-execution-detail-planes',
+  templateUrl: './execution-detail-planes.component.html',
+  styleUrls: ['./execution-detail-planes.component.scss']
+})
+export class ExecutionDetailPlanesComponent implements OnInit, OnDestroy {
+
+  @Input() job: Job;
+  @Output() planesWritten: EventEmitter<any> = new EventEmitter();
+  planes: Observable<string>;
+  planeKeys: string[];
+  planesFormGroup: FormGroup;
+
+  constructor(
+    private jobService: JobsService,
+    private alertService: AlertService
+  ) {
+    // Form group to contain the plane checkboxes
+    this.planesFormGroup = new FormGroup({});
+    this.planeKeys = null;
+  }
+
+  ngOnInit(): void {
+
+  }
+
+  ngOnDestroy(): void {
+
+  }
+
+  // Reads plane names from a JSON file and returns them in a list
+  getPlaneKeys(): string[] {
+    // Return the plane names if we already fetched them
+    if (this.planeKeys !== null) {
+      return this.planeKeys;
+    }
+
+    this.planeKeys = [];
+
+    // Get the plane names from the spectral window numbers in the planes.json file
+    this.jobService.getPlanes(this.job.job_id).subscribe(response => {
+      this.planeKeys = Object.keys(response.body);
+
+      // Create a form control for each of the plane checkboxes and add them into the same group
+      this.planeKeys.forEach(control => this.planesFormGroup.addControl(control, new FormControl(true)));
+
+      // Set the planes data here to signal that the controls are done being added and the HTML can finish loading
+      this.planes = response.body;
+    },
+      error => {
+      this.alertService.error('Could not retrieve planes from planes.json. ' + error);
+    });
+
+    return this.planeKeys;
+  }
+
+  // Writes to a file in lustre to flag planes to be accepted
+  acceptPlanes(): void {
+    this.alertService.info('Flagging accepted planes to be cached');
+
+    // Collect the selected planes and write their names separated by a newline
+    let planesText = '';
+    const planes = this.planesFormGroup.value;
+    Object.keys(planes).forEach(key => {
+      if (planes[key] === true) {
+        planesText += key + '\n';
+      }
+    });
+    planesText = planesText.trim();
+
+    // Write out the planes string if any are selected
+    if (planesText.length > 0) {
+      this.jobService.writePlanes(this.job.job_id, planesText).subscribe(() => {
+          // Trigger acceptQa on the parent
+          this.planesWritten.emit();
+
+          this.alertService.success('Planes Saved');
+        },
+        error => {
+          this.alertService.error('Planes did not save. ' + error);
+        });
+    }
+  }
+
+}

src/app/executions/execution/execution-detail/execution-detail.component.html

 <ng-container *ngIf="jobDetail; else loading">
-  <div class="row no-gutters" *ngIf="canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)">
+  <div class="row no-gutters" *ngIf="jobDetail.queueName !== 'se_coarse_cube_imaging' && canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)">
     <div class="col">
       <button type="button" class="btn btn-success btn-sm" (click)="acceptQa()">Accept &amp; Archive</button>
     </div>
@@ -43,6 +43,12 @@
            formControlName="notes" style="max-height: 400px; overflow-y: scroll; overflow-x: hidden;"></div>
     </div>
   </form>
+
+  <app-execution-detail-planes [job]="job"
+                               (planesWritten)="acceptQa()"
+                               *ngIf="jobDetail.queueName === 'se_coarse_cube_imaging' && canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)">
+  </app-execution-detail-planes>
+
   <h4 class="pt-2 border-top">
     <fa-icon [icon]="faList"></fa-icon>
     Job

src/app/services/jobs.service.ts

@@ -163,6 +163,22 @@ export class JobsService {
       }));
   }
 
+  // Returns a JSON encoded string of plane information
+  public getPlanes(id: number): Observable<any> {
+    return this.http.get(this.configService.config.url + this.endPoint + 'jobs/' + id + '/planes', {observe: 'response'}).pipe(
+      map(response => {
+        return response;
+      }));
+  }
+
+  // Writes a string of plane names
+  public writePlanes(id: number, planes: string): Observable<any> {
+    return this.http.put(this.configService.config.url + this.endPoint + 'jobs/' + id + '/writePlanes', {planes}, {observe: 'response'}).pipe(
+      map(response => {
+        return status;
+      }));
+  }
+
   public performQA(id: number, status: string, queue: string) {
     return this.http.put(this.configService.config.url + this.endPoint + 'jobs/' + id + '/status?status=' + status + '&queue=' + queue, {}, {observe: "response"}).pipe(
       switchMap(response => {