From 61364b1925a67e5c0dc326a0b2d95bf597560fb6 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 7 Apr 2021 00:37:16 +0300 Subject: [PATCH] add status bar color, update permissions for excluded files --- apps/red-ui/src/app/services/permissions.service.ts | 1 + apps/red-ui/src/assets/i18n/en.json | 1 + apps/red-ui/src/assets/styles/red-components.scss | 5 +++++ apps/red-ui/src/assets/styles/red-variables.scss | 1 + 4 files changed, 8 insertions(+) diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 7ea8c5ad1..e99c6f761 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -207,6 +207,7 @@ export class PermissionsService { this.isProjectMember() && !fileStatus.isProcessing && !fileStatus.isError && + !fileStatus.isExcluded && !fileStatus.isApprovedOrUnderApproval && (this.isManagerAndOwner() || !this.isFileReviewer(fileStatus)) ); diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 433c8be3d..e56107129 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -464,6 +464,7 @@ "UNDER_REVIEW": "Under Review", "UNDER_APPROVAL": "Under Approval", "APPROVED": "Approved", + "EXCLUDED": "Excluded", "by": "by", "efsa": "EFSA Approval", "finished": "Finished", diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index 13236f052..2b32fd661 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -141,6 +141,11 @@ background-color: $grey-1; } +.EXCLUDED { + stroke: $pink-1; + background-color: $pink-1; +} + .ERROR { stroke: lighten($red-1, 25%); background-color: lighten($red-1, 25%); diff --git a/apps/red-ui/src/assets/styles/red-variables.scss b/apps/red-ui/src/assets/styles/red-variables.scss index 0a64ed393..98936e9bc 100644 --- a/apps/red-ui/src/assets/styles/red-variables.scss +++ b/apps/red-ui/src/assets/styles/red-variables.scss @@ -21,6 +21,7 @@ $yellow-2: #fdbd00; $green-1: #00ff00; $green-2: #5ce594; $orange-1: #ff801a; +$pink-1: #F125DE; $primary: $red-1; $accent: $grey-1;