diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 18:08:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 18:08:47 +0000 |
commit | 3832718d895bf8268f3e3aac85948e2792769345 (patch) | |
tree | 4a322399af568b6203e732ae2e2f3efc39b23a67 /app/assets/javascripts | |
parent | 180cd023a11c0eb413ad0de124d9758ea25672bd (diff) | |
download | gitlab-ce-3832718d895bf8268f3e3aac85948e2792769345.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/self_monitor/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/self_monitor/store/actions.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/self_monitor/store/state.js | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/self_monitor/index.js b/app/assets/javascripts/self_monitor/index.js index 42c94e11989..7db87b4c627 100644 --- a/app/assets/javascripts/self_monitor/index.js +++ b/app/assets/javascripts/self_monitor/index.js @@ -4,15 +4,12 @@ import SelfMonitorForm from './components/self_monitor_form.vue'; export default () => { const el = document.querySelector('.js-self-monitoring-settings'); - let selfMonitorProjectCreated; if (el) { - selfMonitorProjectCreated = el.dataset.selfMonitoringProjectExists; // eslint-disable-next-line no-new new Vue({ el, store: store({ - projectEnabled: selfMonitorProjectCreated, ...el.dataset, }), render(createElement) { diff --git a/app/assets/javascripts/self_monitor/store/actions.js b/app/assets/javascripts/self_monitor/store/actions.js index f8430a9b136..10deec6921c 100644 --- a/app/assets/javascripts/self_monitor/store/actions.js +++ b/app/assets/javascripts/self_monitor/store/actions.js @@ -52,7 +52,7 @@ export const requestCreateProjectStatus = ({ dispatch, state }, jobId) => { }); }; -export const requestCreateProjectSuccess = ({ commit }, selfMonitorData) => { +export const requestCreateProjectSuccess = ({ commit, dispatch }, selfMonitorData) => { commit(types.SET_LOADING, false); commit(types.SET_PROJECT_URL, selfMonitorData.project_full_path); commit(types.SET_ALERT_CONTENT, { @@ -62,6 +62,7 @@ export const requestCreateProjectSuccess = ({ commit }, selfMonitorData) => { }); commit(types.SET_SHOW_ALERT, true); commit(types.SET_PROJECT_CREATED, true); + dispatch('setSelfMonitor', true); }; export const requestCreateProjectError = ({ commit }, error) => { diff --git a/app/assets/javascripts/self_monitor/store/state.js b/app/assets/javascripts/self_monitor/store/state.js index b8b4a4af614..a0ce88ff58c 100644 --- a/app/assets/javascripts/self_monitor/store/state.js +++ b/app/assets/javascripts/self_monitor/store/state.js @@ -1,8 +1,8 @@ import { parseBoolean } from '~/lib/utils/common_utils'; export default (initialState = {}) => ({ - projectEnabled: parseBoolean(initialState.projectEnabled) || false, - projectCreated: parseBoolean(initialState.selfMonitorProjectCreated) || false, + projectEnabled: parseBoolean(initialState.selfMonitoringProjectExists) || false, + projectCreated: parseBoolean(initialState.selfMonitoringProjectExists) || false, createProjectEndpoint: initialState.createSelfMonitoringProjectPath || '', deleteProjectEndpoint: initialState.deleteSelfMonitoringProjectPath || '', createProjectStatusEndpoint: initialState.statusCreateSelfMonitoringProjectPath || '', |