Skip to content
Snippets Groups Projects
Commit febd6557 authored by Andrew Kapuscinski's avatar Andrew Kapuscinski
Browse files

Removed conditional request-operations component

changed currentVersion name to latestVersion
added latest version number to Submit Latest Version button on UI
parent ff419fb3
No related branches found
No related tags found
1 merge request!676WS-813: Removed conditional request-operations component
Pipeline #3769 passed
......@@ -153,17 +153,7 @@
class="pt-2"
[capability]="this.capability"
[capabilityRequest]="this.capabilityRequest"
[currentVersion]="currentVersion"
*ngIf="currentVersion !== undefined"
(cartaLaunched)="alertMessage($event)"
></app-request-operations>
<app-request-operations
id="operations"
class="pt-2"
[capability]="this.capability"
[capabilityRequest]="this.capabilityRequest"
[currentVersion]="latestVersion"
*ngIf="currentVersion === undefined"
[latestVersion]="latestVersion"
(cartaLaunched)="alertMessage($event)"
></app-request-operations>
</div>
......
......@@ -46,7 +46,7 @@
<span class="fas fa-image"></span><span class="pl-2">Launch CARTA</span>
</button>
</div>
<div class="col-auto d-flex" *ngIf="currentVersion.state === 'Created'">
<div class="col-auto d-flex" *ngIf="latestVersion.state === 'Created'">
<button
id="submit-button"
type="button"
......@@ -55,7 +55,7 @@
capabilityLauncherService.submit(capabilityRequest.id).subscribe(submitRequestObserver)
"
>
<span class="fas fa-paper-plane"></span><span class="pl-2">Submit Request</span>
<span class="fas fa-paper-plane"></span><span class="pl-2">Submit Latest Version (Version {{latestVersion.version_number}})</span>
</button>
</div>
</div>
......
......@@ -37,7 +37,7 @@ export class RequestOperationsComponent implements OnInit {
private capabilityRequestService: CapabilityRequestService,
) {}
@Input() capabilityRequest: CapabilityRequest;
@Input() currentVersion: CapabilityVersion;
@Input() latestVersion: CapabilityVersion;
@Input() capability: Capability;
public capabilityExecution: CapabilityExecution;
@Output() cartaLaunched: EventEmitter<any> = new EventEmitter<any>();
......
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