diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 15:09:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 15:09:26 +0300 |
commit | fa6c2426a5beed14dd7cfd0b4c493ff7ec886837 (patch) | |
tree | 58238851ff949fafbc162e03610602df8c0924a2 /app/assets/javascripts/vuex_shared | |
parent | 38de2aa494589f6e250a1b11862cbab83c2ae4d1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vuex_shared')
6 files changed, 0 insertions, 134 deletions
diff --git a/app/assets/javascripts/vuex_shared/modules/members/actions.js b/app/assets/javascripts/vuex_shared/modules/members/actions.js deleted file mode 100644 index 4c31b3c9744..00000000000 --- a/app/assets/javascripts/vuex_shared/modules/members/actions.js +++ /dev/null @@ -1,44 +0,0 @@ -import * as types from './mutation_types'; -import axios from '~/lib/utils/axios_utils'; -import { formatDate } from '~/lib/utils/datetime_utility'; - -export const updateMemberRole = async ({ state, commit }, { memberId, accessLevel }) => { - try { - await axios.put( - state.memberPath.replace(/:id$/, memberId), - state.requestFormatter({ accessLevel: accessLevel.integerValue }), - ); - - commit(types.RECEIVE_MEMBER_ROLE_SUCCESS, { memberId, accessLevel }); - } catch (error) { - commit(types.RECEIVE_MEMBER_ROLE_ERROR); - - throw error; - } -}; - -export const showRemoveGroupLinkModal = ({ commit }, groupLink) => { - commit(types.SHOW_REMOVE_GROUP_LINK_MODAL, groupLink); -}; - -export const hideRemoveGroupLinkModal = ({ commit }) => { - commit(types.HIDE_REMOVE_GROUP_LINK_MODAL); -}; - -export const updateMemberExpiration = async ({ state, commit }, { memberId, expiresAt }) => { - try { - await axios.put( - state.memberPath.replace(':id', memberId), - state.requestFormatter({ expires_at: expiresAt ? formatDate(expiresAt, 'isoDate') : '' }), - ); - - commit(types.RECEIVE_MEMBER_EXPIRATION_SUCCESS, { - memberId, - expiresAt: expiresAt ? formatDate(expiresAt, 'isoUtcDateTime') : null, - }); - } catch (error) { - commit(types.RECEIVE_MEMBER_EXPIRATION_ERROR); - - throw error; - } -}; diff --git a/app/assets/javascripts/vuex_shared/modules/members/index.js b/app/assets/javascripts/vuex_shared/modules/members/index.js deleted file mode 100644 index 586d52a5288..00000000000 --- a/app/assets/javascripts/vuex_shared/modules/members/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import createState from 'ee_else_ce/vuex_shared/modules/members/state'; -import mutations from 'ee_else_ce/vuex_shared/modules/members/mutations'; -import * as actions from 'ee_else_ce/vuex_shared/modules/members/actions'; - -export default initialState => ({ - namespaced: true, - state: createState(initialState), - actions, - mutations, -}); diff --git a/app/assets/javascripts/vuex_shared/modules/members/mutation_types.js b/app/assets/javascripts/vuex_shared/modules/members/mutation_types.js deleted file mode 100644 index 77307aa745b..00000000000 --- a/app/assets/javascripts/vuex_shared/modules/members/mutation_types.js +++ /dev/null @@ -1,10 +0,0 @@ -export const RECEIVE_MEMBER_ROLE_SUCCESS = 'RECEIVE_MEMBER_ROLE_SUCCESS'; -export const RECEIVE_MEMBER_ROLE_ERROR = 'RECEIVE_MEMBER_ROLE_ERROR'; - -export const RECEIVE_MEMBER_EXPIRATION_SUCCESS = 'RECEIVE_MEMBER_EXPIRATION_SUCCESS'; -export const RECEIVE_MEMBER_EXPIRATION_ERROR = 'RECEIVE_MEMBER_EXPIRATION_ERROR'; - -export const HIDE_ERROR = 'HIDE_ERROR'; - -export const SHOW_REMOVE_GROUP_LINK_MODAL = 'SHOW_REMOVE_GROUP_LINK_MODAL'; -export const HIDE_REMOVE_GROUP_LINK_MODAL = 'HIDE_REMOVE_GROUP_LINK_MODAL'; diff --git a/app/assets/javascripts/vuex_shared/modules/members/mutations.js b/app/assets/javascripts/vuex_shared/modules/members/mutations.js deleted file mode 100644 index 2415e744290..00000000000 --- a/app/assets/javascripts/vuex_shared/modules/members/mutations.js +++ /dev/null @@ -1,48 +0,0 @@ -import Vue from 'vue'; -import { s__ } from '~/locale'; -import * as types from './mutation_types'; -import { findMember } from './utils'; - -export default { - [types.RECEIVE_MEMBER_ROLE_SUCCESS](state, { memberId, accessLevel }) { - const member = findMember(state, memberId); - - if (!member) { - return; - } - - Vue.set(member, 'accessLevel', accessLevel); - }, - [types.RECEIVE_MEMBER_ROLE_ERROR](state) { - state.errorMessage = s__( - "Members|An error occurred while updating the member's role, please try again.", - ); - state.showError = true; - }, - [types.RECEIVE_MEMBER_EXPIRATION_SUCCESS](state, { memberId, expiresAt }) { - const member = findMember(state, memberId); - - if (!member) { - return; - } - - Vue.set(member, 'expiresAt', expiresAt); - }, - [types.RECEIVE_MEMBER_EXPIRATION_ERROR](state) { - state.errorMessage = s__( - "Members|An error occurred while updating the member's expiration date, please try again.", - ); - state.showError = true; - }, - [types.HIDE_ERROR](state) { - state.showError = false; - state.errorMessage = ''; - }, - [types.SHOW_REMOVE_GROUP_LINK_MODAL](state, groupLink) { - state.removeGroupLinkModalVisible = true; - state.groupLinkToRemove = groupLink; - }, - [types.HIDE_REMOVE_GROUP_LINK_MODAL](state) { - state.removeGroupLinkModalVisible = false; - }, -}; diff --git a/app/assets/javascripts/vuex_shared/modules/members/state.js b/app/assets/javascripts/vuex_shared/modules/members/state.js deleted file mode 100644 index ab3ebb34616..00000000000 --- a/app/assets/javascripts/vuex_shared/modules/members/state.js +++ /dev/null @@ -1,21 +0,0 @@ -export default ({ - members, - sourceId, - currentUserId, - tableFields, - tableAttrs, - memberPath, - requestFormatter, -}) => ({ - members, - sourceId, - currentUserId, - tableFields, - tableAttrs, - memberPath, - requestFormatter, - showError: false, - errorMessage: '', - removeGroupLinkModalVisible: false, - groupLinkToRemove: null, -}); diff --git a/app/assets/javascripts/vuex_shared/modules/members/utils.js b/app/assets/javascripts/vuex_shared/modules/members/utils.js deleted file mode 100644 index 7dcd33111e8..00000000000 --- a/app/assets/javascripts/vuex_shared/modules/members/utils.js +++ /dev/null @@ -1 +0,0 @@ -export const findMember = (state, memberId) => state.members.find(member => member.id === memberId); |