diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 21:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 21:07:54 +0000 |
commit | c4db541c1b2c97ab1eda354ea3899489fe5c33e5 (patch) | |
tree | 45d5d381232179082ea11136e3b53211b37349d5 /app/assets/javascripts/releases | |
parent | 603c7d4cac5e28bc1c75e50c23ed2cbe56f1aafc (diff) | |
download | gitlab-ce-c4db541c1b2c97ab1eda354ea3899489fe5c33e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/releases')
7 files changed, 22 insertions, 29 deletions
diff --git a/app/assets/javascripts/releases/mount_edit.js b/app/assets/javascripts/releases/mount_edit.js index 102c4367aac..44530e4961a 100644 --- a/app/assets/javascripts/releases/mount_edit.js +++ b/app/assets/javascripts/releases/mount_edit.js @@ -1,22 +1,20 @@ import Vue from 'vue'; import ReleaseEditApp from './components/app_edit.vue'; import createStore from './stores'; -import detailModule from './stores/modules/detail'; +import createDetailModule from './stores/modules/detail'; export default () => { const el = document.getElementById('js-edit-release-page'); const store = createStore({ modules: { - detail: detailModule, + detail: createDetailModule(el.dataset), }, featureFlags: { releaseShowPage: Boolean(gon.features?.releaseShowPage), }, }); - store.dispatch('detail/setInitialState', el.dataset); - return new Vue({ el, store, diff --git a/app/assets/javascripts/releases/mount_show.js b/app/assets/javascripts/releases/mount_show.js index 73e34869b21..7ddc8e786c1 100644 --- a/app/assets/javascripts/releases/mount_show.js +++ b/app/assets/javascripts/releases/mount_show.js @@ -1,17 +1,16 @@ import Vue from 'vue'; import ReleaseShowApp from './components/app_show.vue'; import createStore from './stores'; -import detailModule from './stores/modules/detail'; +import createDetailModule from './stores/modules/detail'; export default () => { const el = document.getElementById('js-show-release-page'); const store = createStore({ modules: { - detail: detailModule, + detail: createDetailModule(el.dataset), }, }); - store.dispatch('detail/setInitialState', el.dataset); return new Vue({ el, diff --git a/app/assets/javascripts/releases/stores/modules/detail/actions.js b/app/assets/javascripts/releases/stores/modules/detail/actions.js index 35901a654b0..1b77f01368e 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/actions.js +++ b/app/assets/javascripts/releases/stores/modules/detail/actions.js @@ -5,9 +5,6 @@ import { s__ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -export const setInitialState = ({ commit }, initialState) => - commit(types.SET_INITIAL_STATE, initialState); - export const requestRelease = ({ commit }) => commit(types.REQUEST_RELEASE); export const receiveReleaseSuccess = ({ commit }, data) => commit(types.RECEIVE_RELEASE_SUCCESS, data); diff --git a/app/assets/javascripts/releases/stores/modules/detail/index.js b/app/assets/javascripts/releases/stores/modules/detail/index.js index 243c2389d8c..b4430cff2ab 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/index.js +++ b/app/assets/javascripts/releases/stores/modules/detail/index.js @@ -1,10 +1,10 @@ import * as actions from './actions'; import mutations from './mutations'; -import state from './state'; +import createState from './state'; -export default { +export default initialState => ({ namespaced: true, actions, mutations, - state, -}; + state: createState(initialState), +}); diff --git a/app/assets/javascripts/releases/stores/modules/detail/mutation_types.js b/app/assets/javascripts/releases/stores/modules/detail/mutation_types.js index 75e1d78a645..51c0590012a 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/mutation_types.js +++ b/app/assets/javascripts/releases/stores/modules/detail/mutation_types.js @@ -1,5 +1,3 @@ -export const SET_INITIAL_STATE = 'SET_INITIAL_STATE'; - export const REQUEST_RELEASE = 'REQUEST_RELEASE'; export const RECEIVE_RELEASE_SUCCESS = 'RECEIVE_RELEASE_SUCCESS'; export const RECEIVE_RELEASE_ERROR = 'RECEIVE_RELEASE_ERROR'; diff --git a/app/assets/javascripts/releases/stores/modules/detail/mutations.js b/app/assets/javascripts/releases/stores/modules/detail/mutations.js index d739978d755..913db6c2b2a 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/mutations.js +++ b/app/assets/javascripts/releases/stores/modules/detail/mutations.js @@ -1,12 +1,6 @@ import * as types from './mutation_types'; export default { - [types.SET_INITIAL_STATE](state, initialState) { - Object.keys(state).forEach(key => { - state[key] = initialState[key]; - }); - }, - [types.REQUEST_RELEASE](state) { state.isFetchingRelease = true; }, diff --git a/app/assets/javascripts/releases/stores/modules/detail/state.js b/app/assets/javascripts/releases/stores/modules/detail/state.js index 7e3d975f1ae..a19e8d044e2 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/state.js +++ b/app/assets/javascripts/releases/stores/modules/detail/state.js @@ -1,10 +1,17 @@ -export default () => ({ - projectId: null, - tagName: null, - releasesPagePath: null, - markdownDocsPath: null, - markdownPreviewPath: null, - updateReleaseApiDocsPath: null, +export default ({ + projectId, + tagName, + releasesPagePath, + markdownDocsPath, + markdownPreviewPath, + updateReleaseApiDocsPath, +}) => ({ + projectId, + tagName, + releasesPagePath, + markdownDocsPath, + markdownPreviewPath, + updateReleaseApiDocsPath, release: null, |