feedback on pr review

XavierM · XavierM · commit 6a173eb54bc8 · 2023-04-25T17:36:40.000-04:00
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/validate_actions.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/validate_actions.test.ts
@@ -164,7 +164,7 @@ describe('validateActions', () => {
         false
       )
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      '"Failed to validate actions due to the following error: Action throttle cannot be shorter than the schedule interval of 1m: default (1s)"'
+      '"Failed to validate actions due to the following error: Action frequency cannot be shorter than the schedule interval of 1m: default (1s)"'
     );
   });
 
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/validate_actions.ts b/x-pack/plugins/alerting/server/rules_client/lib/validate_actions.ts
@@ -175,7 +175,7 @@ export async function validateActions(
     errors.push(
       i18n.translate('xpack.alerting.rulesClient.validateActions.actionsWithInvalidThrottles', {
         defaultMessage:
-          'Action throttle cannot be shorter than the schedule interval of {scheduleIntervalText}: {groups}',
+          'Action frequency cannot be shorter than the schedule interval of {scheduleIntervalText}: {groups}',
         values: {
           scheduleIntervalText: data.schedule.interval,
           groups: actionsWithInvalidThrottles
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
@@ -3045,7 +3045,7 @@ describe('create()', () => {
       ],
     });
     await expect(rulesClient.create({ data })).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"Failed to validate actions due to the following error: Action throttle cannot be shorter than the schedule interval of 3h: default (1h), group2 (3m)"`
+      `"Failed to validate actions due to the following error: Action frequency cannot be shorter than the schedule interval of 3h: default (1h), group2 (3m)"`
     );
     expect(unsecuredSavedObjectsClient.create).not.toHaveBeenCalled();
     expect(taskManager.schedule).not.toHaveBeenCalled();
@@ -3122,7 +3122,7 @@ describe('create()', () => {
     await expect(rulesClient.create({ data })).rejects.toThrowErrorMatchingInlineSnapshot(`
       "Failed to validate actions due to the following 2 errors:
       - Actions missing frequency parameters: group3
-      - Action throttle cannot be shorter than the schedule interval of 3h: default (1h), group2 (3m)"
+      - Action frequency cannot be shorter than the schedule interval of 3h: default (1h), group2 (3m)"
     `);
     expect(unsecuredSavedObjectsClient.create).not.toHaveBeenCalled();
     expect(taskManager.schedule).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
@@ -61,7 +61,7 @@ export const ActionAlertsFilterQuery: React.FC<ActionAlertsFilterQueryProps> = (
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.actionTypeForm.ActionAlertsFilterQueryToggleLabel',
           {
-            defaultMessage: 'Send alert notification only if alert fields match a query',
+            defaultMessage: 'if alert matches a query',
           }
         )}
         checked={queryEnabled}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_timeframe.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_timeframe.tsx
@@ -49,7 +49,7 @@ const useDefaultTimezone = () => {
 const useTimeframe = (initialTimeframe?: AlertsFilterTimeframe) => {
   const timezone = useDefaultTimezone();
   const DEFAULT_TIMEFRAME = {
-    days: [],
+    days: ISO_WEEKDAYS,
     timezone,
     hours: {
       start: '00:00',
@@ -114,7 +114,9 @@ export const ActionAlertsFilterTimeframe: React.FC<ActionAlertsFilterTimeframePr
       const newDays = previouslyHasDay
         ? timeframe.days.filter((d) => d !== day)
         : [...timeframe.days, day];
-      updateTimeframe({ days: newDays });
+      if (newDays.length !== 0) {
+        updateTimeframe({ days: newDays });
+      }
     },
     [timeframe, updateTimeframe]
   );
@@ -144,7 +146,7 @@ export const ActionAlertsFilterTimeframe: React.FC<ActionAlertsFilterTimeframePr
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.actionTypeForm.ActionAlertsFilterTimeframeToggleLabel',
           {
-            defaultMessage: 'Send alert notification within the selected time frame only',
+            defaultMessage: 'if alert is generated during timeframe',
           }
         )}
         checked={timeframeEnabled}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_notify_when.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_notify_when.tsx
@@ -330,7 +330,7 @@ export const ActionNotifyWhen = ({
                       prepend={i18n.translate(
                         'xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label',
                         {
-                          defaultMessage: 'Every',
+                          defaultMessage: 'Run action every',
                         }
                       )}
                       onChange={(e) => {

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ describe('validateActions', () => {`
`164`	`164`	`false`
`165`	`165`	`)`
`166`	`166`	`).rejects.toThrowErrorMatchingInlineSnapshot(`
`167`		`- '"Failed to validate actions due to the following error: Action throttle cannot be shorter than the schedule interval of 1m: default (1s)"'`
	`167`	`+ '"Failed to validate actions due to the following error: Action frequency cannot be shorter than the schedule interval of 1m: default (1s)"'`
`168`	`168`	`);`
`169`	`169`	`});`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export const ActionAlertsFilterQuery: React.FC<ActionAlertsFilterQueryProps> = (`
`61`	`61`	`label={i18n.translate(`
`62`	`62`	`'xpack.triggersActionsUI.sections.actionTypeForm.ActionAlertsFilterQueryToggleLabel',`
`63`	`63`	`{`
`64`		`- defaultMessage: 'Send alert notification only if alert fields match a query',`
	`64`	`+ defaultMessage: 'if alert matches a query',`
`65`	`65`	`}`
`66`	`66`	`)}`
`67`	`67`	`checked={queryEnabled}`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ export const ActionNotifyWhen = ({`
`330`	`330`	`prepend={i18n.translate(`
`331`	`331`	`'xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label',`
`332`	`332`	`{`
`333`		`- defaultMessage: 'Every',`
	`333`	`+ defaultMessage: 'Run action every',`
`334`	`334`	`}`
`335`	`335`	`)}`
`336`	`336`	`onChange={(e) => {`