From 88ecb25c7b5d361afabb441195bfeae2dffd1ba1 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Fri, 10 May 2024 10:11:59 +0200
Subject: [PATCH] [DURACOM-258]  Allow submitters to accept/ignore suggestions

---
 .../events/quality-assurance-events.component.html | 14 ++++++++++++--
 .../events/quality-assurance-events.component.ts   |  7 +++++++
 src/assets/i18n/ar.json5                           |  4 ++--
 src/assets/i18n/en.json5                           |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index fa2ec3b008..4341764d1c 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -156,7 +156,7 @@
                     </div>
                   </td>
                   <td>
-                    <div *ngIf="(isAdmin$ | async)" class="btn-group button-width">
+                    <div *ngIf="(isAdmin$ | async) || !isReinstateWithdrawnRequest" class="btn-group button-width">
                       <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
@@ -187,6 +187,7 @@
                         <i class="fas fa-ban"></i>
                       </button>
                       <button class="btn btn-outline-danger btn-sm button-width"
+                              *ngIf="(isAdmin$ | async)"
                               ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
                               container="body"
                               [disabled]="eventElement.isRunning"
@@ -195,8 +196,17 @@
                       >
                         <i class="fas fa-trash-alt"></i>
                       </button>
+                      <button class="btn btn-outline-danger btn-sm button-width"
+                              *ngIf="(isAdmin$ | async) === false"
+                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                              (click)="openModal('UNDO', eventElement, undoModal)">
+                        <i class="fas fa-trash-alt"></i>
+                      </button>
                     </div>
-                    <div *ngIf="(isAdmin$ | async) !== true" class="btn-group button-width">
+                    <div *ngIf="(isAdmin$ | async) !== true && isReinstateWithdrawnRequest" class="btn-group button-width">
                       <button class="btn btn-outline-danger btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
                               container="body"
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 5f137acc01..6276226c69 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -257,6 +257,13 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
     );
   }
 
+  /**
+   * Checks if the current topic is related to a reinstate or withdrawn request.
+   */
+  public get isReinstateWithdrawnRequest(): boolean {
+    return this.showTopic.indexOf('/WITHDRAWN') !== -1 || this.showTopic.indexOf('/REINSTATE') !== -1;
+  }
+
   /**
    * Open a modal or run the executeAction directly based on the presence of the project.
    *
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index cf7f7b05bd..fe4eb56ee8 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -5465,9 +5465,9 @@
   // "quality-assurance.event.action.ignore": "Ignore suggestion",
   "quality-assurance.event.action.ignore": "تجاهل الاقتراح",
 
-  // "quality-assurance.event.action.undo": "DELETE",
+  // "quality-assurance.event.action.undo": "Delete",
   // TODO New key - Add a translation
-  "quality-assurance.event.action.undo": "DELETE",
+  "quality-assurance.event.action.undo": "Delete",
 
   // "quality-assurance.event.action.reject": "Reject suggestion",
   "quality-assurance.event.action.reject": "رفض الاقتراح",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index fa956491c6..0ad788f058 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3552,7 +3552,7 @@
 
   "quality-assurance.event.action.ignore": "Ignore suggestion",
 
-  "quality-assurance.event.action.undo": "DELETE",
+  "quality-assurance.event.action.undo": "Delete",
 
   "quality-assurance.event.action.reject": "Reject suggestion",