From 3d6ff61a065687d670f92fc9dc685fbbe47b23c2 Mon Sep 17 00:00:00 2001 From: Aleksandr Gorodetskii <41908792+AleksandrGorodetskii@users.noreply.github.com> Date: Tue, 30 May 2023 15:52:31 +0300 Subject: [PATCH] =?UTF-8?q?GUI=20Issue=20#3221:=20LONG=5FINIT=20-=20chage?= =?UTF-8?q?=20terminate=20to=20stop=20action.=20Add=20BILL=E2=80=A6=20(#32?= =?UTF-8?q?53)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * GUI Issue #3221: LONG_INIT - chage terminate to stop action. Add BILLING_QUOTA_EXCEEDING actions * GUI Issue #3221: Remove actions control for issue type notifications --- .../main/notification/notification-actions/index.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/components/main/notification/notification-actions/index.js b/client/src/components/main/notification/notification-actions/index.js index 939635bd3d..04fae9f3bb 100644 --- a/client/src/components/main/notification/notification-actions/index.js +++ b/client/src/components/main/notification/notification-actions/index.js @@ -41,6 +41,9 @@ class NotificationActions extends React.Component { entityInfoRequest; groupedActions = { + [NOTIFICATION_TYPES.BILLING_QUOTA_EXCEEDING]: [ + ACTIONS.viewBilling + ], [NOTIFICATION_TYPES.IDLE_RUN]: [ ACTIONS.viewRun, ACTIONS.pauseRun, @@ -59,7 +62,7 @@ class NotificationActions extends React.Component { ], [NOTIFICATION_TYPES.LONG_INIT]: [ ACTIONS.viewRun, - ACTIONS.terminateRun + ACTIONS.stopRun ], [NOTIFICATION_TYPES.LONG_PAUSED]: [ ACTIONS.viewRun, @@ -119,9 +122,12 @@ class NotificationActions extends React.Component { get showActionsControl () { const {type} = this.notificationDetails; - return type && type !== NOTIFICATION_TYPES.INACTIVE_USERS && + return type && + type !== NOTIFICATION_TYPES.INACTIVE_USERS && type !== NOTIFICATION_TYPES.LDAP_BLOCKED_POSTPONED_USERS && - type !== NOTIFICATION_TYPES.LDAP_BLOCKED_USERS; + type !== NOTIFICATION_TYPES.LDAP_BLOCKED_USERS && + type !== NOTIFICATION_TYPES.NEW_ISSUE && + type !== NOTIFICATION_TYPES.NEW_ISSUE_COMMENT; } fetchEntityInfo = () => {