Updated front-end yet again; this time, to use the newly created

submit_capability_request view

apps/web/src/app/workspaces/services/capability-launcher.service.ts

@@ -21,7 +21,7 @@ export class CapabilityLauncherService {
   createRequest(
     capabilityName: string,
     parameters: string
-  ): Observable<string> {
+  ): Observable<CapabilityRequest> {
     const url =
       environment.workspacesUrl +
       this.endpoint +
@@ -30,15 +30,18 @@ export class CapabilityLauncherService {
     const requestParams = JSON.stringify({
       parameters: parameters,
     });
-    return this.httpClient.post<string>(url, requestParams);
+    return this.httpClient.post<CapabilityRequest>(url, requestParams);
   }
 
   /**
    * Submit capability request
    * @param: requestId  ID of capability request to submit
    */
-  submit(requestId: string): Observable<CapabilityExecution> {
-    const url = `${environment.workspacesUrl}${this.endpoint}request/${requestId}/submit`;
+  submit(
+    capabilityName: string,
+    requestId: string
+  ): Observable<CapabilityExecution> {
+    const url = `${environment.workspacesUrl}${this.endpoint}${capabilityName}/request/${requestId}/submit`;
     return this.httpClient.post<CapabilityExecution>(url, null);
   }
 }

apps/web/src/app/workspaces/workspaces.component.ts

@@ -42,19 +42,20 @@ export class WorkspacesComponent implements OnInit {
     // Create capability request
     this.capabilityLauncher.createRequest(capabilityName, parameters).subscribe(
       (requestResponse) => {
-        const capabilityRequest = JSON.parse(requestResponse);
-        this.capabilityRequests.push(capabilityRequest);
-        if (capabilityRequest.id) {
+        this.capabilityRequests.push(requestResponse);
+        if (requestResponse.id) {
           // Capability request created; ID found
           // Submit capability request
-          this.capabilityLauncher.submit(capabilityRequest.id).subscribe(
-            (submitResponse) => {
-              this.capabilityExecutions.push(submitResponse);
-            },
-            (error) => {
-              console.log(error);
-            }
-          );
+          this.capabilityLauncher
+            .submit(capabilityName, requestResponse.id)
+            .subscribe(
+              (submitResponse) => {
+                this.capabilityExecutions.push(submitResponse);
+              },
+              (error) => {
+                console.log(error);
+              }
+            );
         }
       },
       (error) => {