Merge branch 'catch_up_with_main' into 'release/2.4.2-RC1'

Catch up with main

See merge request !16

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

-import {Component, Input, OnDestroy, OnInit} from '@angular/core';
+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';
@@ -13,6 +13,7 @@ import {Observable} from 'rxjs';
 export class ExecutionDetailPlanesComponent implements OnInit, OnDestroy {
 
   @Input() job: Job;
+  @Output() planesWritten: EventEmitter<any> = new EventEmitter();
   planes: Observable<string>;
   planeKeys: string[];
   planesFormGroup: FormGroup;
@@ -77,6 +78,9 @@ export class ExecutionDetailPlanesComponent implements OnInit, OnDestroy {
     // 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 => {

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>
@@ -44,7 +44,10 @@
     </div>
   </form>
 
-  <app-execution-detail-planes [job]="job" *ngIf="jobDetail.queueName === 'se_coarse_cube_imaging' && canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)"></app-execution-detail-planes>
+  <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>