From ba4b6a24bf8c3c263d5df6217e68296badc7a317 Mon Sep 17 00:00:00 2001 From: nhertz <nhertz@nrao.edu> Date: Wed, 4 Aug 2021 10:18:01 -0600 Subject: [PATCH] Renamed `status-buttons` to `status-badges;` removed icons from status badges to reduce confusion --- .../status-badges/status-badge.component.html | 24 +++++++++++++ .../status-badge.component.scss | 0 .../status-badge.component.spec.ts | 0 .../status-badge.component.ts | 0 .../status-badge.component.html | 36 ------------------- 5 files changed, 24 insertions(+), 36 deletions(-) create mode 100644 apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html rename apps/web/src/app/workspaces/components/capability-request/components/{status-buttons => status-badges}/status-badge.component.scss (100%) rename apps/web/src/app/workspaces/components/capability-request/components/{status-buttons => status-badges}/status-badge.component.spec.ts (100%) rename apps/web/src/app/workspaces/components/capability-request/components/{status-buttons => status-badges}/status-badge.component.ts (100%) delete mode 100644 apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html 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 new file mode 100644 index 000000000..c57d0b4c2 --- /dev/null +++ b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html @@ -0,0 +1,24 @@ +<span + id="request-status-badge-complete" + class="badge badge-pill badge-success py-2" + *ngIf="capabilityRequest.state === 'Complete'" + ><span id="request-status-badge-txt-complete">{{ capabilityRequest.state.toUpperCase() }}</span> +</span> +<span + id="request-status-badge-running" + class="badge badge-pill badge-primary py-2" + *ngIf="capabilityRequest.state === 'Submitted'" + ><span id="request-status-badge-txt-running">{{ capabilityRequest.state.toUpperCase() }}</span> +</span> +<span + id="request-status-badge-ready" + class="badge badge-pill badge-secondary py-2" + *ngIf="capabilityRequest.state === 'Created'" + ><span id="request-status-badge-txt-ready">{{ capabilityRequest.state.toUpperCase() }}</span> +</span> +<span + id="request-status-badge-failed" + class="badge badge-pill badge-danger py-2" + *ngIf="capabilityRequest.state === 'Failed'" + ><span id="request-status-badge-txt-failed">{{ capabilityRequest.state.toUpperCase() }}</span> +</span> diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.scss b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.scss similarity index 100% rename from apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.scss rename to apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.scss diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.spec.ts b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.spec.ts similarity index 100% rename from apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.spec.ts rename to apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.spec.ts diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.ts b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts similarity index 100% rename from apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.ts rename to apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html b/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html deleted file mode 100644 index ca37d1775..000000000 --- a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html +++ /dev/null @@ -1,36 +0,0 @@ -<span - id="request-status-badge-complete" - class="badge badge-pill badge-success py-2" - *ngIf="capabilityRequest.state === 'Complete'" - ><span class="fas fa-check"></span - ><span id="request-status-badge-txt-complete" class="pl-2">{{ - capabilityRequest.state.toUpperCase() - }}</span> -</span> -<span - id="request-status-badge-running" - class="badge badge-pill badge-primary py-2" - *ngIf="capabilityRequest.state === 'Submitted'" - ><span class="fas fa-play"></span - ><span id="request-status-badge-txt-running" class="pl-2">{{ - capabilityRequest.state.toUpperCase() - }}</span> -</span> -<span - id="request-status-badge-ready" - class="badge badge-pill badge-secondary py-2" - *ngIf="capabilityRequest.state === 'Created'" - ><span class="fas fa-dot-circle"></span - ><span id="request-status-badge-txt-ready" class="pl-2">{{ - capabilityRequest.state.toUpperCase() - }}</span> -</span> -<span - id="request-status-badge-failed" - class="badge badge-pill badge-danger py-2" - *ngIf="capabilityRequest.state === 'Failed'" - ><span class="fas fa-times"></span - ><span id="request-status-badge-txt-failed" class="pl-2">{{ - capabilityRequest.state.toUpperCase() - }}</span> -</span> -- GitLab