Skip to content
Snippets Groups Projects
Commit 82621f3f authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

- make closed requests display visual feedback to user

- make 'close request' button disappear if request is already sealed
parent cc1b3a36
No related branches found
No related tags found
2 merge requests!1390Catch up with Main,!1341make closed requests display visual feedback to user
Pipeline #9765 passed
<div *ngIf="this.capabilityRequest"> <div *ngIf="this.capabilityRequest">
<header> <header>
<app-request-header [capabilityRequest]="capabilityRequest" [latestVersion]="latestVersion"></app-request-header> <app-request-header [capability]="capability" [capabilityRequest]="capabilityRequest" [latestVersion]="latestVersion"></app-request-header>
</header> </header>
<div class="row" style="justify-content: center" id="sys-msg-container" *ngIf="this.capabilityRequest.system_messages"> <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"> <div *ngFor="let msg of this.capabilityRequest.system_messages | keyvalue">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<app-status-badge <app-status-badge
id="request-status" id="request-status"
class="d-flex p-2" class="d-flex p-2"
[capability]="capability"
[capabilityRequest]="capabilityRequest" [capabilityRequest]="capabilityRequest"
></app-status-badge> ></app-status-badge>
</h5> </h5>
......
...@@ -23,12 +23,14 @@ import { CapabilityVersion } from "../../../../model/capability-version"; ...@@ -23,12 +23,14 @@ import { CapabilityVersion } from "../../../../model/capability-version";
import * as dayjs from 'dayjs'; import * as dayjs from 'dayjs';
import * as relativeTime from 'dayjs/plugin/relativeTime'; import * as relativeTime from 'dayjs/plugin/relativeTime';
import * as localizedFormat from 'dayjs/plugin/localizedFormat'; import * as localizedFormat from 'dayjs/plugin/localizedFormat';
import {Capability} from "../../../../model/capability";
@Component({ @Component({
selector: "app-request-header", selector: "app-request-header",
templateUrl: "./request-header.component.html", templateUrl: "./request-header.component.html",
styleUrls: ["./request-header.component.scss"], styleUrls: ["./request-header.component.scss"],
}) })
export class RequestHeaderComponent implements OnInit { export class RequestHeaderComponent implements OnInit {
@Input() capability: Capability;
@Input() capabilityRequest: CapabilityRequest; @Input() capabilityRequest: CapabilityRequest;
@Input() latestVersion: CapabilityVersion; @Input() latestVersion: CapabilityVersion;
createdAt; createdAt;
...@@ -74,10 +76,10 @@ export class RequestHeaderComponent implements OnInit { ...@@ -74,10 +76,10 @@ export class RequestHeaderComponent implements OnInit {
isCancellable(): boolean { isCancellable(): boolean {
return !( return !(
this.latestVersion && ( this.latestVersion && (
this.latestVersion.state != 'Cancelled' && this.latestVersion.state !== 'Cancelled' &&
this.latestVersion.state != 'Complete' && this.latestVersion.state !== 'Complete' &&
this.latestVersion.state != 'Failed' && this.latestVersion.state !== 'Failed' &&
this.latestVersion.state != 'Error' this.latestVersion.state !== 'Error'
) )
) )
} }
......
...@@ -159,6 +159,7 @@ export class RequestOperationsComponent implements OnInit { ...@@ -159,6 +159,7 @@ export class RequestOperationsComponent implements OnInit {
this.selectedVersion && this.selectedVersion &&
(this.selectedVersion.state === 'Error' || this.selectedVersion.state === 'Failed') && (this.selectedVersion.state === 'Error' || this.selectedVersion.state === 'Failed') &&
(this.selectedVersion.current_execution.state_name === 'Error' || this.selectedVersion.current_execution.state_name === 'Failed') (this.selectedVersion.current_execution.state_name === 'Error' || this.selectedVersion.current_execution.state_name === 'Failed')
&& !this.capabilityRequest.sealed
); );
} }
......
...@@ -28,3 +28,10 @@ ...@@ -28,3 +28,10 @@
*ngIf="capabilityRequest.state === 'Cancelled'" *ngIf="capabilityRequest.state === 'Cancelled'"
><span id="request-status-badge-txt-cancelled">{{ capabilityRequest.state.toUpperCase() }}</span> ><span id="request-status-badge-txt-cancelled">{{ capabilityRequest.state.toUpperCase() }}</span>
</span> </span>
&nbsp;&nbsp;&nbsp;
<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>
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
import { Component, Input, OnInit } from "@angular/core"; import { Component, Input, OnInit } from "@angular/core";
import { CapabilityRequest } from "../../../../model/capability-request"; import { CapabilityRequest } from "../../../../model/capability-request";
import {Capability} from "../../../../model/capability";
@Component({ @Component({
selector: "app-status-badge", selector: "app-status-badge",
...@@ -25,6 +26,7 @@ import { CapabilityRequest } from "../../../../model/capability-request"; ...@@ -25,6 +26,7 @@ import { CapabilityRequest } from "../../../../model/capability-request";
styleUrls: ["./status-badge.component.scss"], styleUrls: ["./status-badge.component.scss"],
}) })
export class StatusBadgeComponent implements OnInit { export class StatusBadgeComponent implements OnInit {
@Input() capability: Capability;
@Input() capabilityRequest: CapabilityRequest; @Input() capabilityRequest: CapabilityRequest;
constructor() {} constructor() {}
......
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