EPMRPP-90888 || Possible to create 2 Slack notification rules (#3828)

* EPMRPP-90888 || Possible to create 2 Slack notification rules * EPMRPP-90888 || Possible to create 2 Slack notification rules * EPMRPP-90888 || Code Review fix - 1 * EPMRPP-90888 || Code Review fix - 2
reportportal · May 13, 2024 · 0634b8d · 0634b8d
1 parent f284ca2
commit 0634b8d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/...ettingsPageContainer/content/elements/notificationRuleContent/notificationRuleContent.jsx b/...ettingsPageContainer/content/elements/notificationRuleContent/notificationRuleContent.jsx
@@ -92,8 +92,8 @@ export const NotificationRuleContent = ({
     launchNames,
     sendCase,
     ruleDetails,
-    ruleFields,
   },
+  ruleFields,
 }) => {
   const { formatMessage } = useIntl();
 
@@ -132,7 +132,7 @@ export const NotificationRuleContent = ({
     else {
       return (
         ruleDetails &&
-        ruleFields.reduce((acc, field) => {
+        ruleFields?.reduce((acc, field) => {
           if (ruleDetails[field.name]) {
             acc.push(
               <Fragment key={field.name}>
@@ -179,7 +179,7 @@ NotificationRuleContent.propTypes = {
     attributes: PropTypes.array,
     informOwner: PropTypes.bool,
     ruleDetails: PropTypes.object,
-    ruleFields: PropTypes.arrayOf(ruleField),
     attributesOperator: PropTypes.oneOf([ATTRIBUTES_OPERATORS.AND, ATTRIBUTES_OPERATORS.OR]),
   }).isRequired,
+  ruleFields: PropTypes.arrayOf(ruleField),
 };
diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/elements/ruleList/propTypes.js b/app/src/pages/inside/projectSettingsPageContainer/content/elements/ruleList/propTypes.js
@@ -6,6 +6,7 @@ export const ruleListPropTypes = {
   onToggle: PropTypes.func,
   disabled: PropTypes.bool,
   ruleItemContent: PropTypes.elementType,
+  ruleItemContentProps: PropTypes.object,
   handleRuleItemClick: PropTypes.func,
   onRuleNameClick: PropTypes.oneOfType([PropTypes.func, PropTypes.instanceOf(null)]),
 };
@@ -14,6 +15,7 @@ export const ruleListDefaultProps = {
   onToggle: () => {},
   disabled: true,
   ruleItemContent: null,
+  ruleItemContentProps: [],
   handleRuleItemClick: () => {},
   onRuleNameClick: null,
 };
diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/elements/ruleList/ruleList.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/elements/ruleList/ruleList.jsx
@@ -33,6 +33,7 @@ const PlainRuleList = ({
   handleRuleItemClick,
   onRuleNameClick,
   className,
+  ruleItemContentProps,
 }) => {
   const Content = ruleItemContent;
   return (
@@ -44,7 +45,7 @@ const PlainRuleList = ({
           actions={actions}
           onToggle={onToggle}
           disabled={disabled}
-          content={ruleItemContent && <Content item={item} />}
+          content={ruleItemContent && <Content item={item} {...ruleItemContentProps} />}
           onClick={handleRuleItemClick}
           onRuleNameClick={onRuleNameClick}
           className={className}

diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/constants.js b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/constants.js
@@ -17,6 +17,7 @@
 export const LABEL_WIDTH = 140;
 
 export const RULE_NAME_FIELD_KEY = 'ruleName';
+export const RULE_DETAILS_FIELD_KEY = 'ruleDetails';
 export const RECIPIENTS_FIELD_KEY = 'recipients';
 export const INFORM_OWNER_FIELD_KEY = 'informOwner';
 export const SEND_CASE_FIELD_KEY = 'sendCase';

diff --git a/...tainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx b/...tainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx
@@ -61,6 +61,7 @@ import {
   SEND_CASE_FIELD_KEY,
   FIELD_TYPE_TEXT,
   FIELD_TYPE_MULTILINE_TEXT,
+  RULE_DETAILS_FIELD_KEY,
 } from '../../constants';
 import styles from './addEditNotificationModal.scss';
 
@@ -369,7 +370,7 @@ const AddEditNotificationModal = ({
             const TypedComponent = fieldByType[field.type];
             return (
               <FieldElement
-                name={field.name}
+                name={`${RULE_DETAILS_FIELD_KEY}.${field.name}`}
                 key={field.name}
                 type={field.type}
                 className={cx('dynamicField')}

diff --git a/...c/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx b/...c/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx
@@ -304,11 +304,11 @@ export const RuleGroup = ({ pluginName, ruleDescription, rules, isPluginEnabled,
                 data={rules.map((rule) => ({
                   name: rule.ruleName,
                   ...rule,
-                  ruleFields,
                 }))}
                 actions={actions}
                 onToggle={onToggleHandler}
                 ruleItemContent={NotificationRuleContent}
+                ruleItemContentProps={{ ruleFields }}
                 handleRuleItemClick={handleRuleItemClick}
                 dataAutomationId="notificationsRulesList"
                 className={cx('rule-group-list')}

diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/utils.js b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/utils.js
@@ -29,7 +29,7 @@ export const convertNotificationCaseForSubmission = (obj) => {
     enabled = true,
     attributesOperator,
     type,
-    ...ruleDetails
+    ruleDetails,
   } = obj;
   const dynamicField =
     type === EMAIL