diff --git a/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html b/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html index 499e04eacb4e24824a461c6b1e0f5317924d31b0..1781d9a84b321855a311b9a9dfdbc9db0abc6d85 100644 --- a/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html +++ b/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html @@ -1,6 +1,6 @@ <div *ngIf="this.capabilityRequest"> <header> - <app-request-header [capabilityRequest]="capabilityRequest" [latestVersion]="latestVersion"></app-request-header> + <app-request-header [capability]="capability" [capabilityRequest]="capabilityRequest" [latestVersion]="latestVersion"></app-request-header> </header> <div class="row" style="justify-content: center" id="sys-msg-container" *ngIf="this.capabilityRequest.system_messages"> <div *ngFor="let msg of this.capabilityRequest.system_messages | keyvalue"> diff --git a/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.html b/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.html index 32e970b92fb9d806d87ac6dad53c2fa3eee1d3e6..c60da015e2a40090f160edda0d6478f660b0bb12 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.html +++ b/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.html @@ -5,6 +5,7 @@ <app-status-badge id="request-status" class="d-flex p-2" + [capability]="capability" [capabilityRequest]="capabilityRequest" ></app-status-badge> </h5> diff --git a/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.ts b/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.ts index e2f620892d76d0a0bbd0d18a29eddb94d0d2d239..20f791b829fcbaaff13e48cf5a68c0713d66d024 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.ts +++ b/apps/web/src/app/workspaces/components/capability-request/components/request-header/request-header.component.ts @@ -23,12 +23,14 @@ import { CapabilityVersion } from "../../../../model/capability-version"; import * as dayjs from 'dayjs'; import * as relativeTime from 'dayjs/plugin/relativeTime'; import * as localizedFormat from 'dayjs/plugin/localizedFormat'; +import {Capability} from "../../../../model/capability"; @Component({ selector: "app-request-header", templateUrl: "./request-header.component.html", styleUrls: ["./request-header.component.scss"], }) export class RequestHeaderComponent implements OnInit { + @Input() capability: Capability; @Input() capabilityRequest: CapabilityRequest; @Input() latestVersion: CapabilityVersion; createdAt; @@ -74,10 +76,10 @@ export class RequestHeaderComponent implements OnInit { isCancellable(): boolean { return !( this.latestVersion && ( - this.latestVersion.state != 'Cancelled' && - this.latestVersion.state != 'Complete' && - this.latestVersion.state != 'Failed' && - this.latestVersion.state != 'Error' + this.latestVersion.state !== 'Cancelled' && + this.latestVersion.state !== 'Complete' && + this.latestVersion.state !== 'Failed' && + this.latestVersion.state !== 'Error' ) ) } diff --git a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.ts b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.ts index 2f541bed31d17ce3ff2f9fdc8bf2f1e075e408ee..77af92466f219cdb75f5ddfb94f18a47848a2fec 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.ts +++ b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.ts @@ -159,6 +159,7 @@ export class RequestOperationsComponent implements OnInit { this.selectedVersion && (this.selectedVersion.state === 'Error' || this.selectedVersion.state === 'Failed') && (this.selectedVersion.current_execution.state_name === 'Error' || this.selectedVersion.current_execution.state_name === 'Failed') + && !this.capabilityRequest.sealed ); } diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html index 42da97d455a862f23b3bf3810e21ad2c5c0a2c90..639525f483457097f2ebf06fdec897e2120fb960 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html +++ b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html @@ -28,3 +28,10 @@ *ngIf="capabilityRequest.state === 'Cancelled'" ><span id="request-status-badge-txt-cancelled">{{ capabilityRequest.state.toUpperCase() }}</span> </span> + +<span + id="request-sealed-badge" + class="badge badge-pill badge-danger py-2" + *ngIf="capabilityRequest.sealed === true && capabilityRequest.state !== 'Complete' && capability.state_machine !== 'simple'" + ><span id="request-sealed-badge-txt">SEALED</span> +</span> diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts index 5c1747ba1edad477385e95c669b8369697c11d6e..ec4798fbb59dc5d6d1f71f58ba60571f9abac1bf 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts +++ b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts @@ -18,6 +18,7 @@ */ import { Component, Input, OnInit } from "@angular/core"; import { CapabilityRequest } from "../../../../model/capability-request"; +import {Capability} from "../../../../model/capability"; @Component({ selector: "app-status-badge", @@ -25,6 +26,7 @@ import { CapabilityRequest } from "../../../../model/capability-request"; styleUrls: ["./status-badge.component.scss"], }) export class StatusBadgeComponent implements OnInit { + @Input() capability: Capability; @Input() capabilityRequest: CapabilityRequest; constructor() {}