Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 20 deletions

diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue
index 835b75e1fcb..c3c94351503 100644
--- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue
+++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue
@@ -3,7 +3,7 @@ import { GlFormGroup, GlFormInput, GlModal, GlSprintf, GlLink } from '@gitlab/ui
 import { mapActions, mapState } from 'vuex';
 import { mapComputed } from '~/vuex_shared/bindings';
 import { __ } from '~/locale';
-import { MODAL_ID } from '../constants';
+import { MODAL_ID } from '../utils/constants';
 import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue';
 import { isValidCron } from 'cron-validator';
 
diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_table.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_table.vue
index b80df5d4f1e..c1a007c42de 100644
--- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_table.vue
+++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_table.vue
@@ -2,7 +2,7 @@
 import { GlTable, GlButton, GlModalDirective, GlSprintf } from '@gitlab/ui';
 import { s__, __ } from '~/locale';
 import { mapState, mapActions } from 'vuex';
-import { MODAL_ID } from '../constants';
+import { MODAL_ID } from '../utils/constants';
 
 export default {
   modalId: MODAL_ID,
diff --git a/app/assets/javascripts/deploy_freeze/store/actions.js b/app/assets/javascripts/deploy_freeze/store/actions.js
index 7c042c17c05..720ef822b2f 100644
--- a/app/assets/javascripts/deploy_freeze/store/actions.js
+++ b/app/assets/javascripts/deploy_freeze/store/actions.js
@@ -2,7 +2,6 @@ import * as types from './mutation_types';
 import Api from '~/api';
 import createFlash from '~/flash';
 import { __ } from '~/locale';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
 export const requestAddFreezePeriod = ({ commit }) => {
   commit(types.REQUEST_ADD_FREEZE_PERIOD);
@@ -35,26 +34,12 @@ export const addFreezePeriod = ({ state, dispatch, commit }) => {
     });
 };
 
-export const requestFreezePeriods = ({ commit }) => {
+export const fetchFreezePeriods = ({ commit, state }) => {
   commit(types.REQUEST_FREEZE_PERIODS);
-};
-export const receiveFreezePeriodsSuccess = ({ state, commit }, freezePeriods) => {
-  const addTimezoneIdentifier = freezePeriod =>
-    convertObjectPropsToCamelCase({
-      ...freezePeriod,
-      cron_timezone: state.timezoneData.find(tz => tz.identifier === freezePeriod.cron_timezone)
-        ?.name,
-    });
-
-  commit(types.RECEIVE_FREEZE_PERIODS_SUCCESS, freezePeriods.map(addTimezoneIdentifier));
-};
-
-export const fetchFreezePeriods = ({ dispatch, state }) => {
-  dispatch('requestFreezePeriods');
 
   return Api.freezePeriods(state.projectId)
     .then(({ data }) => {
-      dispatch('receiveFreezePeriodsSuccess', convertObjectPropsToCamelCase(data));
+      commit(types.RECEIVE_FREEZE_PERIODS_SUCCESS, data);
     })
     .catch(() => {
       createFlash(__('There was an error fetching the deploy freezes.'));
diff --git a/app/assets/javascripts/deploy_freeze/store/mutations.js b/app/assets/javascripts/deploy_freeze/store/mutations.js
index 57b4b226b16..89ce1dc5428 100644
--- a/app/assets/javascripts/deploy_freeze/store/mutations.js
+++ b/app/assets/javascripts/deploy_freeze/store/mutations.js
@@ -1,5 +1,12 @@
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import * as types from './mutation_types';
 
+const formatTimezoneName = (freezePeriod, timezoneList) =>
+  convertObjectPropsToCamelCase({
+    ...freezePeriod,
+    cron_timezone: timezoneList.find(tz => tz.identifier === freezePeriod.cron_timezone)?.name,
+  });
+
 export default {
   [types.REQUEST_FREEZE_PERIODS](state) {
     state.isLoading = true;
@@ -7,7 +14,9 @@ export default {
 
   [types.RECEIVE_FREEZE_PERIODS_SUCCESS](state, freezePeriods) {
     state.isLoading = false;
-    state.freezePeriods = freezePeriods;
+    state.freezePeriods = freezePeriods.map(freezePeriod =>
+      formatTimezoneName(freezePeriod, state.timezoneData),
+    );
   },
 
   [types.REQUEST_ADD_FREEZE_PERIOD](state) {
diff --git a/app/assets/javascripts/deploy_freeze/constants.js b/app/assets/javascripts/deploy_freeze/utils/constants.js
index 79e556e0b55..79e556e0b55 100644
--- a/app/assets/javascripts/deploy_freeze/constants.js
+++ b/app/assets/javascripts/deploy_freeze/utils/constants.js