diff options
5 files changed, 27 insertions, 27 deletions
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index d25df18658d..cc4d863a989 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -47,7 +47,7 @@ export default { selectedZone() { this.isLoading = true; - this.getMachineTypes() + this.fetchMachineTypes() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, @@ -56,7 +56,7 @@ export default { }, }, methods: { - ...mapActions(['getMachineTypes']), + ...mapActions(['fetchMachineTypes']), ...mapActions({ setItem: 'setMachineType' }), enableSubmit() { if (this.allDropdownsSelected) { diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index e1b15a1507d..a322b7c375e 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -76,12 +76,12 @@ export default { created() { this.isLoading = true; - this.getProjects() + this.fetchProjects() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, methods: { - ...mapActions(['getProjects']), + ...mapActions(['fetchProjects']), ...mapActions({ setItem: 'setProject' }), fetchSuccessHandler() { if (this.defaultValue) { diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index a63d9ae9125..46d84bbb751 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -38,13 +38,13 @@ export default { selectedProject() { this.isLoading = true; - this.getZones() + this.fetchZones() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, }, methods: { - ...mapActions(['getZones']), + ...mapActions(['fetchZones']), ...mapActions({ setItem: 'setZone' }), }, }; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js index 844eb1bc3cd..11bd04f5b01 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js @@ -1,18 +1,6 @@ /* global gapi */ 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 gapiRequest = ({ service, params, commit, mutation, payloadKey }) => new Promise((resolve, reject) => { const request = service.list(params); @@ -31,7 +19,19 @@ const gapiRequest = ({ service, params, commit, mutation, payloadKey }) => ); }); -export const getProjects = ({ commit }) => +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); +}; + +export const fetchProjects = ({ commit }) => gapiRequest({ service: gapi.client.cloudresourcemanager.projects, params: {}, @@ -40,7 +40,7 @@ export const getProjects = ({ commit }) => payloadKey: 'projects', }); -export const getZones = ({ commit, state }) => +export const fetchZones = ({ commit, state }) => gapiRequest({ service: gapi.client.compute.zones, params: { @@ -51,7 +51,7 @@ export const getZones = ({ commit, state }) => payloadKey: 'items', }); -export const getMachineTypes = ({ commit, state }) => +export const fetchMachineTypes = ({ commit, state }) => gapiRequest({ service: gapi.client.compute.machineTypes, params: { 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 e246c77e36a..02ce780e3fb 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js @@ -51,10 +51,10 @@ describe('GCP Cluster Dropdown Store Actions', () => { describe('async fetch methods', () => { window.gapi = gapi(); - describe('getProjects', () => { + describe('fetchProjects', () => { it('fetches projects from Google API', done => { store - .dispatch('getProjects') + .dispatch('fetchProjects') .then(() => { expect(store.state.projects[0].projectId).toEqual(selectedProjectMock.projectId); expect(store.state.projects[0].name).toEqual(selectedProjectMock.name); @@ -65,10 +65,10 @@ describe('GCP Cluster Dropdown Store Actions', () => { }); }); - describe('getZones', () => { + describe('fetchZones', () => { it('fetches zones from Google API', done => { store - .dispatch('getZones') + .dispatch('fetchZones') .then(() => { expect(store.state.zones[0].name).toEqual(selectedZoneMock); @@ -78,10 +78,10 @@ describe('GCP Cluster Dropdown Store Actions', () => { }); }); - describe('getMachineTypes', () => { + describe('fetchMachineTypes', () => { it('fetches machine types from Google API', done => { store - .dispatch('getMachineTypes') + .dispatch('fetchMachineTypes') .then(() => { expect(store.state.machineTypes[0].name).toEqual(selectedMachineTypeMock); |