apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html

@@ -13,7 +13,7 @@
       *ngIf="
         capabilityRequest.state === 'Complete' &&
         (capabilityRequest.capability_name === 'std_calibration' ||
-          capabilityRequest.capability_name === 'restore_cms')
+          capabilityRequest.capability_name === 'restore_cms') && selectedVersion.current_execution
       "
     >
       <button
@@ -37,7 +37,7 @@
         (capabilityRequest.state === 'Complete' ||
           (selectedVersion.current_execution && selectedVersion.current_execution.state_name === 'Awaiting QA') ||
           (selectedVersion.current_execution && selectedVersion.current_execution.state_name === 'AoD Review')
-          )
+          ) && selectedVersion.current_execution
       "
     >
       <button

services/capability/capability/views/capability_request.py

@@ -25,6 +25,8 @@ concerning capability requests
 
 import json
 
+from pycapo import CapoConfig
+
 from capability.views.capability_version import submit_capability_version
 from pyramid.httpexceptions import HTTPBadRequest, HTTPNotFound, HTTPPreconditionFailed
 from pyramid.request import Request
@@ -142,7 +144,8 @@ def create_follow_on_capability_request(request: Request) -> Response:
     version_number = int(request.matchdict["version"])
     current_version = capability_info.lookup_version(request_id, version_number)
     parameters = current_version.parameters
-    user_email = parameters["user_email"] if "user_email" in parameters else None
+    analyst_list = CapoConfig().settings("edu.nrao.workspaces.NotificationSettings").analystEmail
+    user_email = parameters["user_email"] if "user_email" in parameters else analyst_list
 
     previous_workflow_id = current_version.current_execution.current_workflow_request_id
     capability_name = current_version.capability.name

shared/workspaces/workspaces/capability/schema.py

@@ -562,11 +562,14 @@ class QaPass(Action):
     def run_qa_fail_workflow(version: CapabilityVersion):
         workflow_service_url = CapoConfig().settings(WORKFLOW_SETTINGS_KEY).serviceUrl
         logger.info(f"QA Failing version: {version.__json__()}")
-        if version.current_execution.current_workflow_request_id:
-            requests.post(
-                f"{workflow_service_url}/workflows/{version.capability.name}/requests/"
-                f"{version.current_execution.current_workflow_request_id}/qa_fail"
-            )
+        # check if version is submitted
+        if version.current_execution:
+            # check if workflow is submitted
+            if version.current_execution.current_workflow_request_id:
+                requests.post(
+                    f"{workflow_service_url}/workflows/{version.capability.name}/requests/"
+                    f"{version.current_execution.current_workflow_request_id}/qa_fail"
+                )
 
     @staticmethod
     def abort_running_execution(version: CapabilityVersion):