From 1daf749ea3e7cf8dc12babd9cbf34675631f2f14 Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Mon, 29 Aug 2022 11:35:16 -0600
Subject: [PATCH] Make weblog accessible in failed/error states.
---
.../capability-data-access.component.html | 4 ++++
.../capability-data-access.component.ts | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.html b/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.html
index 6b90fbfa7..55ccae497 100644
--- a/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.html
+++ b/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.html
@@ -27,6 +27,10 @@
</a>
<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 id="warning-container" class="d-flex justify-content-center py-3" *ngIf="shouldHaveWeblog &&
+ (currentVersion.current_execution.state_name === 'Failed' || currentVersion.current_execution.state_name === 'Error')">
+ <em>Warning: This request is in an Error or Failed state, weblog might not exist.</em>
+ </div>
</div>
<ng-template #processingNotCompleteMessage> <em>No actions available. This version is still processing or has not been submitted.</em> </ng-template>
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.ts b/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.ts
index 15ba0631a..7456dacb3 100644
--- a/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.ts
+++ b/apps/web/src/app/workspaces/components/capability-request/components/capability-data-access/capability-data-access.component.ts
@@ -22,7 +22,6 @@ import { Capability } from "../../../../model/capability";
import {CapabilityVersion} from "../../../../model/capability-version";
import {WorkflowService} from "../../../../services/workflow.service";
import {CapabilityRequestService} from "../../../../services/capability-request.service";
-import { JsonObject } from "@angular/compiler-cli/ngcc/src/packages/entry_point";
@Component({
selector: "app-capability-data-access",
@@ -89,7 +88,7 @@ export class CapabilityDataAccessComponent implements OnInit {
const request = this.capabilityRequest;
const version = this.currentVersion;
const names = ["std_calibration", "std_cms_imaging", "restore_cms", "std_restore_imaging"];
- const states = ["Awaiting QA", "AoD Review", "Complete", "Failed", "QA Closed"];
+ const states = ["Awaiting QA", "AoD Review", "Complete", "Error", "Failed", "QA Closed"];
if (states.includes(version.current_execution.state_name)) {
return names.includes(request.capability_name);
--
GitLab