Merge branch '334732-propagate-time-changes-on-rule-update' into 'master'

Escalation rule updates do not trigger request parameters recalculation

See merge request gitlab-org/gitlab!65063

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

 <script>
 import { GlModal, GlAlert } from '@gitlab/ui';
-import { set, isEqual } from 'lodash';
+import { isEqual } from 'lodash';
 import { s__, __ } from '~/locale';
 import {
   updateStoreOnEscalationPolicyCreate,
@@ -103,7 +103,7 @@ export default {
       };
     },
     updateForm({ field, value }) {
-      set(this.form, field, value);
+      this.form = { ...this.form, [field]: value };
       this.validateForm(field);
     },
     createEscalationPolicy() {

ee/spec/frontend/escalation_policies/add_edit_escalation_policy_modal_spec.js

@@ -110,6 +110,7 @@ describe('AddEditsEscalationPolicyModal', () => {
 
     it('clears the form on modal cancel', async () => {
       updateForm();
+      await wrapper.vm.$nextTick();
       expect(findEscalationPolicyForm().props('form')).toMatchObject({
         name: updatedName,
         description: updatedDescription,
@@ -180,6 +181,7 @@ describe('AddEditsEscalationPolicyModal', () => {
 
     it('clears the form on modal cancel', async () => {
       updateForm();
+      await wrapper.vm.$nextTick();
       const getForm = () => findEscalationPolicyForm().props('form');
       expect(getForm()).toMatchObject({
         name: updatedName,