diff --git a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html index d5eb259726729ecb7cab1a57d25f77f6577d2e5c..8d7bc76a5909a6934e35ba335380a37555290577 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html +++ b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html @@ -21,7 +21,7 @@ class="btn btn-warning" (click)=" capabilityLauncherService - .createImageRequestFromPreviousCal('std_cms_imaging', capabilityRequest.id) + .createImageRequestFromPreviousCal('std_cms_imaging', capabilityRequest.id, selectedVersion.version_number) .subscribe(followonRequestObserver) " > diff --git a/apps/web/src/app/workspaces/model/capability-request.ts b/apps/web/src/app/workspaces/model/capability-request.ts index 2488048d1f31eb139b50517ac4813e22b94ea989..1528d27f25bd87c4c1a43edd344b55da30936a9b 100644 --- a/apps/web/src/app/workspaces/model/capability-request.ts +++ b/apps/web/src/app/workspaces/model/capability-request.ts @@ -27,7 +27,6 @@ export interface CapabilityRequest { capability: Capability; state: string; versions: Array<CapabilityVersion>; - current_execution: CapabilityExecution; ingested: boolean; created_at: string; updated_at: string; diff --git a/apps/web/src/app/workspaces/services/capability-launcher.service.ts b/apps/web/src/app/workspaces/services/capability-launcher.service.ts index 63abf5a55ca056b32f29fba02ec13ba4b3b7361a..bbf79060b9efdb06b913be1491f8476f397d06f0 100644 --- a/apps/web/src/app/workspaces/services/capability-launcher.service.ts +++ b/apps/web/src/app/workspaces/services/capability-launcher.service.ts @@ -49,8 +49,9 @@ export class CapabilityLauncherService { createImageRequestFromPreviousCal( followonType: string, requestId: string, + versionNumber: number, ): Observable<CapabilityRequest> { - const url = this.endpoint + "request/" + requestId + "/followon/" + followonType; + const url = this.endpoint + "request/" + requestId + + "/version/" + versionNumber + "/followon/" + followonType; return this.httpClient.post<CapabilityRequest>(url, null); } diff --git a/services/capability/capability/routes.py b/services/capability/capability/routes.py index ba4d5f0551d11cdc77ef1c8e946aa0cbae7f5c43..231dfda5b76302e17efdfba5b23f3bb132179b42 100644 --- a/services/capability/capability/routes.py +++ b/services/capability/capability/routes.py @@ -93,9 +93,12 @@ def capability_request_routes(config: Configurator): pattern="capability/{capability_name}/request/calibration-from-ingestion-details", request_method="POST", ) + + version_url = request_url + "/version/{version}" + followon_pattern = f"{version_url}" + "/followon/{followon_type}" config.add_route( name="create_follow_on_capability_request", - pattern=f"{request_url}" + "/followon/{followon_type}", + pattern=followon_pattern, request_method="POST", ) config.add_route( diff --git a/services/capability/test/test_capability_version_views.py b/services/capability/test/test_capability_version_views.py index 4969dc36c17a7d77ac95f1e1132cbec8797290d8..547dc2e8fa4dfc916dac938afc15aba32e73e7bc 100644 --- a/services/capability/test/test_capability_version_views.py +++ b/services/capability/test/test_capability_version_views.py @@ -27,7 +27,6 @@ from pyramid.testing import DummyRequest # pylint: disable=C0415, E0401 -# @pytest.mark.skip("Broken by addition of current_execution to version json") def test_view_latest_version(request_null_capability: DummyRequest): from capability.views.capability_version import view_latest_version