Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-90667 || No 'Email server is disabled' message is displayed for Member/Operator/Customer users #3811

Merged
merged 4 commits into from
Apr 29, 2024
Merged

EPMRPP-90667 || No 'Email server is disabled' message is displayed for Member/Operator/Customer users #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7436b88
EPMRPP 90667 || No 'Email server is disabled' message is displayed …
maria-hambardzumian Apr 26, 2024
95db049
EPMRPP 90667 || grammar fix
maria-hambardzumian Apr 26, 2024
a1a52bc
EPMRPP 90667 || optional chaining for typed rules
maria-hambardzumian Apr 26, 2024
62ae5ed
EPMRPP 90667 || Code review fixes
maria-hambardzumian Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
48 changes: 26 additions & 22 deletions ...c/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -246,25 +250,24 @@ export const RuleGroup = ({ pluginName, typedRules, notifications, isPluginEnabl
</Toggle>
</div>
</FieldElement>
{isUpdateSettingAvailable &&
(!isPluginEnabled ? (
<div className={cx('disabled-plugin')}>
<p>
<span className={cx('capitalized')}>{pluginName}</span>{' '}
{formatMessage(messages.disabledPlugin, { pluginName })}
</p>
<RuleItemDisabledTooltip
className={cx('info-tooltip')}
tooltipContent={formatMessage(messages.disabledContactInfo)}
>
<i className={cx('icon', 'about-icon')}>{Parser(AboutIcon)}</i>
</RuleItemDisabledTooltip>
</div>
) : (
pluginName === EMAIL &&
!isEmailIntegrationAvailable && (
<div className={cx('integrate-configurations')}>
<p>{formatMessage(messages.notConfiguredIntegration)}</p>
{isDisabledTooltipActivationRequired ? (
maria-hambardzumian marked this conversation as resolved.
Show resolved Hide resolved
<div className={cx('disabled-plugin')}>
<p>
<span className={cx('capitalized')}>{pluginName}</span>{' '}
{formatMessage(messages.disabledPlugin, { pluginName })}
</p>
<RuleItemDisabledTooltip
className={cx('info-tooltip')}
tooltipContent={formatMessage(messages.disabledContactInfo)}
>
<i className={cx('icon', 'about-icon')}>{Parser(AboutIcon)}</i>
</RuleItemDisabledTooltip>
</div>
) : (
isEmailIntegrationRequired && (
<div className={cx('integrate-configurations')}>
<p>{formatMessage(messages.notConfiguredIntegration)}</p>
{isUpdateSettingAvailable && (
<LinkComponent
to={{
type: PROJECT_SETTINGS_TAB_PAGE,
Expand All @@ -278,9 +281,10 @@ export const RuleGroup = ({ pluginName, typedRules, notifications, isPluginEnabl
>
{formatMessage(messages.configureIntegration)}
</LinkComponent>
</div>
)
))}
)}
</div>
)
)}
</div>

<div className={cx('notifications-container')}>
Expand Down
Loading