diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js index c4007985fc..8cabfe6d91 100644 --- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js +++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js @@ -158,7 +158,7 @@ export const messages = defineMessages({ }, notConfiguredIntegration: { id: 'NotificationsEnableForm.notConfiguredIntegration', - defaultMessage: 'Integration not configured yet', + defaultMessage: 'Integration is not configured yet', }, configureIntegration: { id: 'NotificationsEnableForm.configureIntegration', diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx index 424ac20377..edf2a11b19 100644 --- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx +++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx @@ -95,6 +95,10 @@ export const RuleGroup = ({ pluginName, typedRules, notifications, isPluginEnabl const isUpdateSettingAvailable = canUpdateSettings(userRole, projectRole); const isReadOnly = !isUpdateSettingAvailable || !isPluginEnabled; + const isActivationRequired = isUpdateSettingAvailable || typedRules?.length > 0; + const isDisabledTooltipActivationRequired = !isPluginEnabled && isActivationRequired; + const isEmailIntegrationRequired = + pluginName === EMAIL && !isEmailIntegrationAvailable && isActivationRequired; const onToggleHandler = (isEnabled, notification) => { trackEvent(PROJECT_SETTINGS_NOTIFICATIONS_EVENTS.SWITCH_NOTIFICATION_RULE(isEnabled)); @@ -246,25 +250,24 @@ export const RuleGroup = ({ pluginName, typedRules, notifications, isPluginEnabl - {isUpdateSettingAvailable && - (!isPluginEnabled ? ( -
-

- {pluginName}{' '} - {formatMessage(messages.disabledPlugin, { pluginName })} -

- - {Parser(AboutIcon)} - -
- ) : ( - pluginName === EMAIL && - !isEmailIntegrationAvailable && ( -
-

{formatMessage(messages.notConfiguredIntegration)}

+ {isDisabledTooltipActivationRequired ? ( +
+

+ {pluginName}{' '} + {formatMessage(messages.disabledPlugin, { pluginName })} +

+ + {Parser(AboutIcon)} + +
+ ) : ( + isEmailIntegrationRequired && ( +
+

{formatMessage(messages.notConfiguredIntegration)}

+ {isUpdateSettingAvailable && ( {formatMessage(messages.configureIntegration)} -
- ) - ))} + )} +
+ ) + )}