+ {!shown && value?.length ? formatMessage(messages.attributesNotActive) : attributesNote}
+
- {item.launchNames.length > 0 && (
+ {launchNames.length > 0 && (
<>
{formatMessage(messages.launchNameLabel)}
-
{item.launchNames.join(SEPARATOR)}
+
{launchNames.join(SEPARATOR)}
>
)}
{formatMessage(messages.inCaseLabel)}
-
{inCaseOptions[item.sendCase]}
+
{inCaseOptions[sendCase]}
{formatMessage(messages.recipientsLabel)}
-
{recipients.join(SEPARATOR)}
- {item.attributes.length > 0 && (
+
{recipientsValue.join(SEPARATOR)}
+ {attributes.length > 0 && (
<>
-
{formatMessage(messages.attributesLabel)}
+
{getAttributesFieldText()}
>
)}
@@ -118,5 +140,6 @@ NotificationRuleContent.propTypes = {
recipients: PropTypes.array,
attributes: PropTypes.array,
informOwner: PropTypes.bool,
+ attributesOperator: PropTypes.oneOf([ATTRIBUTES_OPERATORS.AND, ATTRIBUTES_OPERATORS.OR]),
}).isRequired,
};
diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/elements/notificationRuleContent/notificationRuleContent.scss b/app/src/pages/inside/projectSettingsPageContainer/content/elements/notificationRuleContent/notificationRuleContent.scss
index e7f4d58d89..c3473753b3 100644
--- a/app/src/pages/inside/projectSettingsPageContainer/content/elements/notificationRuleContent/notificationRuleContent.scss
+++ b/app/src/pages/inside/projectSettingsPageContainer/content/elements/notificationRuleContent/notificationRuleContent.scss
@@ -37,3 +37,7 @@
color: $COLOR--almost-black;
margin-bottom: 16px;
}
+
+.attributes-text {
+ text-transform: none;
+}
diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js
index 73ee4d474d..623a783b03 100644
--- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js
+++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/messages.js
@@ -58,10 +58,6 @@ export const messages = defineMessages({
id: 'NotificationCase.attributesLabel',
defaultMessage: 'Attributes (and)',
},
- attributesNote: {
- id: 'NotificationCase.attributesNote',
- defaultMessage: 'Send notifications about launches containing specified attributes',
- },
[LAUNCH_CASES.ALWAYS]: {
id: 'NotificationCase.dropdownValueAlways',
defaultMessage: 'Always',
diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx
index 239c5795a5..9317baa831 100644
--- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx
+++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx
@@ -112,10 +112,6 @@ const messages = defineMessages({
id: 'AddEditNotificationCaseModal.attributesLabel',
defaultMessage: 'Attributes',
},
- attributesNote: {
- id: 'AddEditNotificationCaseModal.attributesNote',
- defaultMessage: 'Send notifications about launches containing specified attributes',
- },
attributesNotActive: {
id: 'AddEditNotificationCaseModal.attributesNotActive',
defaultMessage: 'Attributes are non active. To activate please select checkbox ‘Attributes’',
@@ -184,6 +180,10 @@ const messages = defineMessages({
id: 'NotificationsEnableForm.attributes',
defaultMessage: 'Attributes',
},
+ attributesNote: {
+ id: 'AddEditNotificationCaseModal.attributesNote',
+ defaultMessage: 'Notify if the launch has all/at least one of specified attributes',
+ },
});
const FIELD = 'Field';
@@ -377,6 +377,7 @@ const AddEditNotificationModal = ({
setShowEditor={setShowEditor}
shown={isEditorShown}
changeValue={change}
+ attributesNote={formatMessage(messages.attributesNote)}
/>
{attributesValue.length > 0 && (