diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 09:08:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 09:08:49 +0000 |
commit | 46b10c0fc884400941c17e2777b242ac54d111e5 (patch) | |
tree | 184bc49764f03791610c8ae716c03e0100ed45f5 /app/assets/javascripts/monitoring/stores | |
parent | 3358e1fdb8fe1e8f739024ee4f3d1071b296a010 (diff) | |
download | gitlab-ce-46b10c0fc884400941c17e2777b242ac54d111e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring/stores')
4 files changed, 17 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js index e26e1457f55..29000475bd4 100644 --- a/app/assets/javascripts/monitoring/stores/actions.js +++ b/app/assets/javascripts/monitoring/stores/actions.js @@ -32,8 +32,9 @@ export const setEndpoints = ({ commit }, endpoints) => { commit(types.SET_ENDPOINTS, endpoints); }; -export const setEnvironmentsSearchTerm = ({ commit }, searchTerm) => { - commit(types.SET_ENVIRONMENTS_SEARCH_TERM, searchTerm); +export const filterEnvironments = ({ commit, dispatch }, searchTerm) => { + commit(types.SET_ENVIRONMENTS_FILTER, searchTerm); + dispatch('fetchEnvironmentsData'); }; export const setShowErrorBanner = ({ commit }, enabled) => { @@ -56,6 +57,7 @@ export const receiveDeploymentsDataSuccess = ({ commit }, data) => commit(types.RECEIVE_DEPLOYMENTS_DATA_SUCCESS, data); export const receiveDeploymentsDataFailure = ({ commit }) => commit(types.RECEIVE_DEPLOYMENTS_DATA_FAILURE); +export const requestEnvironmentsData = ({ commit }) => commit(types.REQUEST_ENVIRONMENTS_DATA); export const receiveEnvironmentsDataSuccess = ({ commit }, data) => commit(types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS, data); export const receiveEnvironmentsDataFailure = ({ commit }) => @@ -189,8 +191,9 @@ export const fetchDeploymentsData = ({ state, dispatch }) => { }); }; -export const fetchEnvironmentsData = ({ state, dispatch }) => - gqClient +export const fetchEnvironmentsData = ({ state, dispatch }) => { + dispatch('requestEnvironmentsData'); + return gqClient .mutate({ mutation: getEnvironments, variables: { @@ -207,12 +210,14 @@ export const fetchEnvironmentsData = ({ state, dispatch }) => s__('Metrics|There was an error fetching the environments data, please try again'), ); } + dispatch('receiveEnvironmentsDataSuccess', environments); }) .catch(() => { dispatch('receiveEnvironmentsDataFailure'); createFlash(s__('Metrics|There was an error getting environments information.')); }); +}; /** * Set a new array of metrics to a panel group diff --git a/app/assets/javascripts/monitoring/stores/mutation_types.js b/app/assets/javascripts/monitoring/stores/mutation_types.js index 73d402ac6df..bdfaf42b35c 100644 --- a/app/assets/javascripts/monitoring/stores/mutation_types.js +++ b/app/assets/javascripts/monitoring/stores/mutation_types.js @@ -22,4 +22,4 @@ export const SET_NO_DATA_EMPTY_STATE = 'SET_NO_DATA_EMPTY_STATE'; export const SET_SHOW_ERROR_BANNER = 'SET_SHOW_ERROR_BANNER'; export const SET_PANEL_GROUP_METRICS = 'SET_PANEL_GROUP_METRICS'; -export const SET_ENVIRONMENTS_SEARCH_TERM = 'SET_ENVIRONMENTS_SEARCH_TERM'; +export const SET_ENVIRONMENTS_FILTER = 'SET_ENVIRONMENTS_FILTER'; diff --git a/app/assets/javascripts/monitoring/stores/mutations.js b/app/assets/javascripts/monitoring/stores/mutations.js index f0390bfc636..2a86a6a26d8 100644 --- a/app/assets/javascripts/monitoring/stores/mutations.js +++ b/app/assets/javascripts/monitoring/stores/mutations.js @@ -123,10 +123,15 @@ export default { [types.RECEIVE_DEPLOYMENTS_DATA_FAILURE](state) { state.deploymentData = []; }, + [types.REQUEST_ENVIRONMENTS_DATA](state) { + state.environmentsLoading = true; + }, [types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS](state, environments) { + state.environmentsLoading = false; state.environments = environments; }, [types.RECEIVE_ENVIRONMENTS_DATA_FAILURE](state) { + state.environmentsLoading = false; state.environments = []; }, @@ -195,7 +200,7 @@ export default { const panelGroup = state.dashboard.panel_groups.find(pg => payload.key === pg.key); panelGroup.panels = payload.panels; }, - [types.SET_ENVIRONMENTS_SEARCH_TERM](state, searchTerm) { + [types.SET_ENVIRONMENTS_FILTER](state, searchTerm) { state.environmentsSearchTerm = searchTerm; }, }; diff --git a/app/assets/javascripts/monitoring/stores/state.js b/app/assets/javascripts/monitoring/stores/state.js index 2a2a7c9c88d..9d3227e8aae 100644 --- a/app/assets/javascripts/monitoring/stores/state.js +++ b/app/assets/javascripts/monitoring/stores/state.js @@ -15,6 +15,7 @@ export default () => ({ deploymentData: [], environments: [], environmentsSearchTerm: '', + environmentsLoading: false, allDashboards: [], currentDashboard: null, projectPath: null, |