[DURACOM-258] Allow submitters to accept/ignore suggestions

This commit is contained in:
Alisa Ismailati
2024-05-10 10:11:59 +02:00
parent 6c4ff40020
commit 88ecb25c7b
4 changed files with 22 additions and 5 deletions

View File

@@ -156,7 +156,7 @@
</div> </div>
</td> </td>
<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" <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
class="btn btn-outline-success btn-sm button-width" class="btn btn-outline-success btn-sm button-width"
ngbTooltip="{{'quality-assurance.event.action.import' | translate}}" ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
@@ -187,6 +187,7 @@
<i class="fas fa-ban"></i> <i class="fas fa-ban"></i>
</button> </button>
<button class="btn btn-outline-danger btn-sm button-width" <button class="btn btn-outline-danger btn-sm button-width"
*ngIf="(isAdmin$ | async)"
ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}" ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
container="body" container="body"
[disabled]="eventElement.isRunning" [disabled]="eventElement.isRunning"
@@ -195,8 +196,17 @@
> >
<i class="fas fa-trash-alt"></i> <i class="fas fa-trash-alt"></i>
</button> </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>
<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" <button class="btn btn-outline-danger btn-sm button-width"
ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}" ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
container="body" container="body"

View File

@@ -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. * Open a modal or run the executeAction directly based on the presence of the project.
* *

View File

@@ -5465,9 +5465,9 @@
// "quality-assurance.event.action.ignore": "Ignore suggestion", // "quality-assurance.event.action.ignore": "Ignore suggestion",
"quality-assurance.event.action.ignore": "تجاهل الاقتراح", "quality-assurance.event.action.ignore": "تجاهل الاقتراح",
// "quality-assurance.event.action.undo": "DELETE", // "quality-assurance.event.action.undo": "Delete",
// TODO New key - Add a translation // 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": "Reject suggestion",
"quality-assurance.event.action.reject": "رفض الاقتراح", "quality-assurance.event.action.reject": "رفض الاقتراح",

View File

@@ -3552,7 +3552,7 @@
"quality-assurance.event.action.ignore": "Ignore suggestion", "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", "quality-assurance.event.action.reject": "Reject suggestion",