From 08cb13a5de37ce5c3f1a79f0724d82a9eb02d43c Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Fri, 11 May 2018 14:45:27 +0200 Subject: rename vuex dir to store --- .../components/gke_dropdown_mixin.js | 2 +- .../gke_cluster_dropdowns/store/actions.js | 84 ++++++++++++++++++++++ .../gke_cluster_dropdowns/store/getters.js | 3 + .../projects/gke_cluster_dropdowns/store/index.js | 24 +++++++ .../gke_cluster_dropdowns/store/mutation_types.js | 6 ++ .../gke_cluster_dropdowns/store/mutations.js | 22 ++++++ .../gke_cluster_dropdowns/stores/actions.js | 84 ---------------------- .../gke_cluster_dropdowns/stores/getters.js | 3 - .../projects/gke_cluster_dropdowns/stores/index.js | 24 ------- .../gke_cluster_dropdowns/stores/mutation_types.js | 6 -- .../gke_cluster_dropdowns/stores/mutations.js | 22 ------ .../components/gke_machine_type_dropdown_spec.js | 2 +- .../components/gke_project_id_dropdown_spec.js | 2 +- .../components/gke_zone_dropdown_spec.js | 2 +- .../gke_cluster_dropdowns/stores/actions_spec.js | 4 +- .../gke_cluster_dropdowns/stores/getters_spec.js | 2 +- .../gke_cluster_dropdowns/stores/mutations_spec.js | 2 +- 17 files changed, 147 insertions(+), 147 deletions(-) create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/store/getters.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutation_types.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutations.js delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js index 26dc329ad1f..eea0c4c61eb 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js @@ -4,7 +4,7 @@ import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_searc import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; -import store from '../stores'; +import store from '../store'; export default { store, diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js new file mode 100644 index 00000000000..60bfae456c3 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js @@ -0,0 +1,84 @@ +/* global gapi */ +import Flash from '~/flash'; +import { s__, sprintf } from '~/locale'; + +import * as types from './mutation_types'; + +export const setProject = ({ commit }, selectedProject) => { + commit(types.SET_PROJECT, selectedProject); +}; + +export const setZone = ({ commit }, selectedZone) => { + commit(types.SET_ZONE, selectedZone); +}; + +export const setMachineType = ({ commit }, selectedMachineType) => { + commit(types.SET_MACHINE_TYPE, selectedMachineType); +}; + +const displayError = (resp, errorMessage) => { + if (resp.result && resp.result.error) { + Flash(sprintf(s__(errorMessage), { error: resp.result.error.message })); + } +}; + +const gapiRequest = ({ service, params, commit, mutation, payloadKey, errorMessage }) => + new Promise((resolve, reject) => { + const request = service.list(params); + + return request.then( + resp => { + const { result } = resp; + + commit(mutation, result[payloadKey]); + + resolve(); + }, + resp => { + displayError(resp, errorMessage); + + reject(); + }, + ); + }); + +export const getProjects = ({ commit }) => + gapiRequest({ + service: gapi.client.cloudresourcemanager.projects, + params: {}, + commit, + mutation: types.SET_PROJECTS, + payloadKey: 'projects', + errorMessage: + 'ClusterIntegration|An error occured while trying to fetch your projects: %{error}', + }); + +export const getZones = ({ commit, state }) => + gapiRequest({ + service: gapi.client.compute.zones, + params: { + project: state.selectedProject.projectId, + }, + commit, + mutation: types.SET_ZONES, + payloadKey: 'items', + errorMessage: + 'ClusterIntegration|An error occured while trying to fetch project zones: %{error}', + }); + +export const getMachineTypes = ({ commit, state }) => + gapiRequest({ + service: gapi.client.compute.machineTypes, + params: { + project: state.selectedProject.projectId, + zone: state.selectedZone, + }, + commit, + mutation: types.SET_MACHINE_TYPES, + payloadKey: 'items', + errorMessage: + 'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', + }); + +// prevent babel-plugin-rewire from generating an invalid default during karma tests +export default () => {}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/getters.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/getters.js new file mode 100644 index 00000000000..e39f02d0894 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/getters.js @@ -0,0 +1,3 @@ +export const hasProject = state => !!state.selectedProject.projectId; +export const hasZone = state => !!state.selectedZone; +export const hasMachineType = state => !!state.selectedMachineType; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js new file mode 100644 index 00000000000..ec71a49c97a --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js @@ -0,0 +1,24 @@ +import Vue from 'vue'; +import Vuex from 'vuex'; +import * as actions from './actions'; +import * as getters from './getters'; +import mutations from './mutations'; + +Vue.use(Vuex); + +export default new Vuex.Store({ + actions, + getters, + mutations, + state: { + selectedProject: { + projectId: '', + name: '', + }, + selectedZone: '', + selectedMachineType: '', + projects: [], + zones: [], + machineTypes: [], + }, +}); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutation_types.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutation_types.js new file mode 100644 index 00000000000..6577612b4cd --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutation_types.js @@ -0,0 +1,6 @@ +export const SET_PROJECT = 'SET_PROJECT'; +export const SET_ZONE = 'SET_ZONE'; +export const SET_MACHINE_TYPE = 'SET_MACHINE_TYPE'; +export const SET_PROJECTS = 'SET_PROJECTS'; +export const SET_ZONES = 'SET_ZONES'; +export const SET_MACHINE_TYPES = 'SET_MACHINE_TYPES'; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutations.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutations.js new file mode 100644 index 00000000000..95b7ed68053 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutations.js @@ -0,0 +1,22 @@ +import * as types from './mutation_types'; + +export default { + [types.SET_PROJECT](state, selectedProject) { + Object.assign(state, { selectedProject }); + }, + [types.SET_ZONE](state, selectedZone) { + Object.assign(state, { selectedZone }); + }, + [types.SET_MACHINE_TYPE](state, selectedMachineType) { + Object.assign(state, { selectedMachineType }); + }, + [types.SET_PROJECTS](state, projects) { + Object.assign(state, { projects }); + }, + [types.SET_ZONES](state, zones) { + Object.assign(state, { zones }); + }, + [types.SET_MACHINE_TYPES](state, machineTypes) { + Object.assign(state, { machineTypes }); + }, +}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js deleted file mode 100644 index 60bfae456c3..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js +++ /dev/null @@ -1,84 +0,0 @@ -/* global gapi */ -import Flash from '~/flash'; -import { s__, sprintf } from '~/locale'; - -import * as types from './mutation_types'; - -export const setProject = ({ commit }, selectedProject) => { - commit(types.SET_PROJECT, selectedProject); -}; - -export const setZone = ({ commit }, selectedZone) => { - commit(types.SET_ZONE, selectedZone); -}; - -export const setMachineType = ({ commit }, selectedMachineType) => { - commit(types.SET_MACHINE_TYPE, selectedMachineType); -}; - -const displayError = (resp, errorMessage) => { - if (resp.result && resp.result.error) { - Flash(sprintf(s__(errorMessage), { error: resp.result.error.message })); - } -}; - -const gapiRequest = ({ service, params, commit, mutation, payloadKey, errorMessage }) => - new Promise((resolve, reject) => { - const request = service.list(params); - - return request.then( - resp => { - const { result } = resp; - - commit(mutation, result[payloadKey]); - - resolve(); - }, - resp => { - displayError(resp, errorMessage); - - reject(); - }, - ); - }); - -export const getProjects = ({ commit }) => - gapiRequest({ - service: gapi.client.cloudresourcemanager.projects, - params: {}, - commit, - mutation: types.SET_PROJECTS, - payloadKey: 'projects', - errorMessage: - 'ClusterIntegration|An error occured while trying to fetch your projects: %{error}', - }); - -export const getZones = ({ commit, state }) => - gapiRequest({ - service: gapi.client.compute.zones, - params: { - project: state.selectedProject.projectId, - }, - commit, - mutation: types.SET_ZONES, - payloadKey: 'items', - errorMessage: - 'ClusterIntegration|An error occured while trying to fetch project zones: %{error}', - }); - -export const getMachineTypes = ({ commit, state }) => - gapiRequest({ - service: gapi.client.compute.machineTypes, - params: { - project: state.selectedProject.projectId, - zone: state.selectedZone, - }, - commit, - mutation: types.SET_MACHINE_TYPES, - payloadKey: 'items', - errorMessage: - 'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', - }); - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js deleted file mode 100644 index e39f02d0894..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js +++ /dev/null @@ -1,3 +0,0 @@ -export const hasProject = state => !!state.selectedProject.projectId; -export const hasZone = state => !!state.selectedZone; -export const hasMachineType = state => !!state.selectedMachineType; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js deleted file mode 100644 index ec71a49c97a..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js +++ /dev/null @@ -1,24 +0,0 @@ -import Vue from 'vue'; -import Vuex from 'vuex'; -import * as actions from './actions'; -import * as getters from './getters'; -import mutations from './mutations'; - -Vue.use(Vuex); - -export default new Vuex.Store({ - actions, - getters, - mutations, - state: { - selectedProject: { - projectId: '', - name: '', - }, - selectedZone: '', - selectedMachineType: '', - projects: [], - zones: [], - machineTypes: [], - }, -}); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js deleted file mode 100644 index 6577612b4cd..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js +++ /dev/null @@ -1,6 +0,0 @@ -export const SET_PROJECT = 'SET_PROJECT'; -export const SET_ZONE = 'SET_ZONE'; -export const SET_MACHINE_TYPE = 'SET_MACHINE_TYPE'; -export const SET_PROJECTS = 'SET_PROJECTS'; -export const SET_ZONES = 'SET_ZONES'; -export const SET_MACHINE_TYPES = 'SET_MACHINE_TYPES'; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js deleted file mode 100644 index 95b7ed68053..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js +++ /dev/null @@ -1,22 +0,0 @@ -import * as types from './mutation_types'; - -export default { - [types.SET_PROJECT](state, selectedProject) { - Object.assign(state, { selectedProject }); - }, - [types.SET_ZONE](state, selectedZone) { - Object.assign(state, { selectedZone }); - }, - [types.SET_MACHINE_TYPE](state, selectedMachineType) { - Object.assign(state, { selectedMachineType }); - }, - [types.SET_PROJECTS](state, projects) { - Object.assign(state, { projects }); - }, - [types.SET_ZONES](state, zones) { - Object.assign(state, { zones }); - }, - [types.SET_MACHINE_TYPES](state, machineTypes) { - Object.assign(state, { machineTypes }); - }, -}; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js index b6c1c454b2b..a30a54c7864 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -4,7 +4,7 @@ import { SET_PROJECT, SET_ZONE, SET_MACHINE_TYPES, -} from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +} from '~/projects/gke_cluster_dropdowns/store/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js index 98c21c009dd..cab1ebff802 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import GkeProjectIdDropdown from '~/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue'; -import { SET_PROJECTS } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import { SET_PROJECTS } from '~/projects/gke_cluster_dropdowns/store/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js index c99816cd13c..a3c23354b47 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import GkeZoneDropdown from '~/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue'; -import { SET_PROJECT, SET_ZONES } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import { SET_PROJECT, SET_ZONES } from '~/projects/gke_cluster_dropdowns/store/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js index 501113d7f33..e246c77e36a 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js @@ -1,6 +1,6 @@ import testAction from 'spec/helpers/vuex_action_helper'; -import * as actions from '~/projects/gke_cluster_dropdowns/stores/actions'; -import store from '~/projects/gke_cluster_dropdowns/stores'; +import * as actions from '~/projects/gke_cluster_dropdowns/store/actions'; +import store from '~/projects/gke_cluster_dropdowns/store'; import { resetStore, gapi } from '../helpers'; import { selectedProjectMock, selectedZoneMock, selectedMachineTypeMock } from '../mock_data'; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/getters_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/getters_spec.js index 8612550141d..6f89158f807 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/getters_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/getters_spec.js @@ -1,4 +1,4 @@ -import * as getters from '~/projects/gke_cluster_dropdowns/stores/getters'; +import * as getters from '~/projects/gke_cluster_dropdowns/store/getters'; import { selectedProjectMock, selectedZoneMock, selectedMachineTypeMock } from '../mock_data'; describe('GCP Cluster Dropdown Store Getters', () => { diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js index 5569f88467f..167cc36fe8b 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js @@ -1,4 +1,4 @@ -import mutations from '~/projects/gke_cluster_dropdowns/stores/mutations'; +import mutations from '~/projects/gke_cluster_dropdowns/store/mutations'; import { selectedProjectMock, selectedZoneMock, -- cgit v1.2.1