From f0c0d63703ddf07315efdf0addc74de5cc9caef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 29 Jun 2021 16:58:42 +0300
Subject: [PATCH] RED-1722: Disable approval for files with requests

---
 apps/red-ui/src/app/services/permissions.service.ts |  2 +-
 apps/red-ui/src/assets/i18n/de.json                 |  2 +-
 apps/red-ui/src/assets/i18n/en.json                 | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index 8b49841df..24ede6ba0 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -129,7 +129,7 @@ export class PermissionsService {
     }
 
     canApprove(fileStatus = this._activeFile): boolean {
-        return !fileStatus?.analysisRequired;
+        return !fileStatus?.analysisRequired && !fileStatus.hasRequests;
     }
 
     canSetUnderApproval(fileStatus = this._activeFile): boolean {
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index e5a2b4c22..8e85ddc57 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -204,7 +204,7 @@
     "download-file-disabled": "Das Herunterladen ist nur für genehmigte Dateien zulässig",
     "under-approval": "Zur Genehmigung",
     "approve": "Genehmigen",
-    "approve-disabled": "Die Datei kann erst genehmigt werden, wenn sie mit den neuesten Wörterbüchern analysiert und alle Vorschläge verarbeitet wurden",
+    "approve-disabled": "Die Datei kann erst genehmigt werden, wenn sie mit den neuesten Wörterbüchern analysiert und alle Vorschläge verarbeitet wurden.",
     "under-review": "Wird überprüft",
     "upload-files": "Ziehen",
     "upload-files-btn": "Daten hochladen",
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 62132e841..388b6e8e5 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -256,7 +256,7 @@
     "download-file-disabled": "Download is only permitted for approved files",
     "under-approval": "For Approval",
     "approve": "Approve",
-    "approve-disabled": "File can only be approved once it has been analysed with the latest dictionaries and all suggestions have been processed",
+    "approve-disabled": "File can only be approved once it has been analysed with the latest dictionaries and all suggestions have been processed.",
     "under-review": "Under Review",
     "upload-files": "Drag & drop files anywhere...",
     "upload-files-btn": "Upload Files",
@@ -433,6 +433,14 @@
           "success": "Redaction added!",
           "error": "Failed to save redaction: {{error}}"
         },
+        "approve": {
+          "success": "Suggestion approved.",
+          "error": "Failed to approve suggestion: {{error}}"
+        },
+        "decline": {
+          "success": "Suggestion declined.",
+          "error": "Failed to decline suggestion: {{error}}"
+        },
         "search": "Document name..."
       },
       "dictionary": {