Skip to content
Snippets Groups Projects
Commit c3a64373 authored by Jim Sheckard's avatar Jim Sheckard
Browse files

FE tweaks to get population behaving

parent b6f3e80f
No related branches found
Tags 2.5.0-rc10
3 merge requests!1059Catchup 2.7 with main,!1058Draft: Rebase 2.7 on main,!1029FE tweaks to get population behaving
Pipeline #6350 passed
Pipeline: workspaces

#6352

    Pipeline: workspaces

    #6351

      ......@@ -25,7 +25,7 @@
      /requests/{{this.currentVersion.current_execution.current_workflow_request_id}}/weblog">
      <span class="fas fa-eye"></span> View Weblog
      </a>
      <app-editor *ngIf="shouldHaveWeblog() && !capabilityRequest.ingested && capability.requires_qa" style="margin-left: 150px" modalTitleText="Edit QA Notes" [textToEdit]="qaNotes" (newEditEvent)="emitEditEventToParent($event)"><span class="fas fa-edit"></span> Edit QA Notes</app-editor>
      <app-editor *ngIf="shouldHaveWeblog() && !capabilityRequest.ingested && capability.requires_qa" style="margin-left: 150px" modalTitleText="Edit QA Notes" [textToEdit]="qaNotes" (editorOpenEvent)="getQaNotesURL()" (newEditEvent)="emitEditEventToParent($event)"><span class="fas fa-edit"></span> Edit QA Notes</app-editor>
      </div>
      </div>
      ......
      ......@@ -45,17 +45,16 @@ export class CapabilityDataAccessComponent implements OnInit {
      ngOnInit(): void {
      }
      // Observer for capability objects
      private qaObserver = {
      next: (capability) => {
      this.capability = capability;
      if (!this.qaNotes && this.shouldHaveWeblog() && this.currentVersion.current_execution) {
      this.getQaNotesURL();
      }
      next: (notes) => {
      this.qaNotes = notes["resp"];
      },
      error: (error) => console.error("Error when retrieving capability:" + error),
      };
      private saveQaNotesObserver = {
      next: () => {
      },
      ......@@ -63,12 +62,11 @@ export class CapabilityDataAccessComponent implements OnInit {
      };
      // Get qa_notes.html contents for editing
      private async getQaNotesURL() {
      getQaNotesURL() {
      var curCapabilityName = this.capability.name;
      var curCapabilityRequestId = this.currentVersion.current_execution.current_workflow_request_id;
      this.qaNotes = await new Promise<string>(resolve =>
      this.workflowService.retrieveQaNotes(curCapabilityName, curCapabilityRequestId)
      .subscribe(notes => resolve(notes['resp'])));
      this.workflowService.retrieveQaNotes(curCapabilityName, curCapabilityRequestId)
      .subscribe(this.qaObserver);
      }
      emitEditEventToParent(edits: string): void {
      ......@@ -76,7 +74,6 @@ export class CapabilityDataAccessComponent implements OnInit {
      var curCapabilityRequestId = this.currentVersion.current_execution.current_workflow_request_id;
      this.workflowService.saveQaNotes(curCapabilityName, curCapabilityRequestId, edits)
      .subscribe(this.saveQaNotesObserver);
      this.getQaNotesURL();
      }
      /**
      ......
      ......@@ -25,7 +25,7 @@ edu.nrao.workspaces.CapabilitySettings.externalServiceUrl = http://capability:34
      edu.nrao.workspaces.ProcessingSettings.useCasa = false
      edu.nrao.workspaces.ProcessingSettings.rootDirectory = /lustre/aoc/cluster/pipeline/docker/workspaces/spool
      edu.nrao.workspaces.ProcessingSettings.scriptLocation = /lustre/aoc/cluster/pipeline/docker/workspaces/sbin
      edu.nrao.workspaces.ProcessingSettings.ramInGb = 0.2G
      edu.nrao.workspaces.ProcessingSettings.ramInGb = 0.23G
      edu.nrao.workspaces.ProcessingSettings.autoGenerateStandardCals = False
      edu.nrao.workspaces.ProcessingSettings.CasaVersion.vlassSeci = /home/casa/packages/pipeline/casa-6.1.3-3-pipeline-2021.1.1.32
      ......
      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