Merge pull request #3030 from 4Science/task/main/DURACOM-258

Allow submitter users to accept/ignore suggestions

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"

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.
    *

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": "رفض الاقتراح",

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",