Merge branch 'improve_inline_error_message_334740' into 'master'

Improve inline error message for elapsed time field in policy model

See merge request gitlab-org/gitlab!65775

ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue

@@ -26,9 +26,7 @@ export const i18n = {
       emptyScheduleValidationMsg: s__(
         'EscalationPolicies|A schedule is required for adding an escalation policy.',
       ),
-      invalidTimeValidationMsg: s__(
-        'EscalationPolicies|Elapsed time must be greater than or equal to zero.',
-      ),
+      invalidTimeValidationMsg: s__('EscalationPolicies|Minutes must be between 0 and 1440.'),
     },
   },
 };

ee/app/assets/javascripts/escalation_policies/utils.js

@@ -16,8 +16,9 @@ export const isNameFieldValid = (name) => {
  */
 export const getRulesValidationState = (rules) => {
   return rules.map((rule) => {
+    const minutes = parseInt(rule.elapsedTimeMinutes, 10);
     return {
-      isTimeValid: parseInt(rule.elapsedTimeMinutes, 10) >= 0,
+      isTimeValid: minutes >= 0 && minutes <= 1440,
       isScheduleValid: Boolean(rule.oncallScheduleIid),
     };
   });

locale/gitlab.pot

@@ -13081,9 +13081,6 @@ msgstr ""
 msgid "EscalationPolicies|Edit escalation policy"
 msgstr ""
 
-msgid "EscalationPolicies|Elapsed time must be greater than or equal to zero."
-msgstr ""
-
 msgid "EscalationPolicies|Email on-call user in schedule"
 msgstr ""
 
@@ -13102,6 +13099,9 @@ msgstr ""
 msgid "EscalationPolicies|IF alert is not %{alertStatus} in %{minutes} minutes"
 msgstr ""
 
+msgid "EscalationPolicies|Minutes must be between 0 and 1440."
+msgstr ""
+
 msgid "EscalationPolicies|Remove escalation rule"
 msgstr ""