removed „fetched“ prefix from mutation and state

7 files changed, 18 insertions, 21 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 3af7cd07237..2ab1e48488c 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
@@ -42,8 +42,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType']),
-    ...mapState({ machineTypes: 'fetchedMachineTypes' }),
+    ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType', 'machineTypes']),
     ...mapGetters(['hasProject', 'hasZone', 'hasMachineType']),
     isDisabled() {
       return !this.selectedProject || !this.selectedZone;
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 92d69f7288a..f813f784d47 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
@@ -45,8 +45,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['selectedProject']),
-    ...mapState({ projects: 'fetchedProjects' }),
+    ...mapState(['selectedProject', 'projects']),
     ...mapGetters(['hasProject']),
     hasOneProject() {
       return this.projects.length === 1;
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 b33f8f8f519..7ba949b6989 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
@@ -42,8 +42,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['selectedProject', 'selectedZone']),
-    ...mapState({ zones: 'fetchedZones' }),
+    ...mapState(['selectedProject', 'selectedZone', 'zones']),
     ...mapGetters(['hasProject']),
     isDisabled() {
       return !this.hasProject;
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js
index 3ad5543a4f7..507cc5f8b62 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js
@@ -29,7 +29,7 @@ export const getProjects = ({ commit }) =>
 
     return request.then(
       resp => {
-        commit(types.SET_FETCHED_PROJECTS, resp.result.projects);
+        commit(types.SET_PROJECTS, resp.result.projects);
 
         resolve();
       },
@@ -60,7 +60,7 @@ export const getZones = ({ commit, state }) =>
 
     return request.then(
       resp => {
-        commit(types.SET_FETCHED_ZONES, resp.result.items);
+        commit(types.SET_ZONES, resp.result.items);
 
         resolve();
       },
@@ -90,7 +90,7 @@ export const getMachineTypes = ({ commit, state }) =>
 
     return request.then(
       resp => {
-        commit(types.SET_FETCHED_MACHINE_TYPES, resp.result.items);
+        commit(types.SET_MACHINE_TYPES, resp.result.items);
 
         resolve();
       },
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js
index af6d89f5966..ec71a49c97a 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js
@@ -17,8 +17,8 @@ export default new Vuex.Store({
     },
     selectedZone: '',
     selectedMachineType: '',
-    fetchedProjects: [],
-    fetchedZones: [],
-    fetchedMachineTypes: [],
+    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
index 47f61a178ca..6577612b4cd 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js
@@ -1,6 +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_FETCHED_PROJECTS = 'SET_FETCHED_PROJECTS';
-export const SET_FETCHED_ZONES = 'SET_FETCHED_ZONES';
-export const SET_FETCHED_MACHINE_TYPES = 'SET_FETCHED_MACHINE_TYPES';
+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
index 5ae2170115f..95b7ed68053 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js
@@ -10,13 +10,13 @@ export default {
   [types.SET_MACHINE_TYPE](state, selectedMachineType) {
     Object.assign(state, { selectedMachineType });
   },
-  [types.SET_FETCHED_PROJECTS](state, fetchedProjects) {
-    Object.assign(state, { fetchedProjects });
+  [types.SET_PROJECTS](state, projects) {
+    Object.assign(state, { projects });
   },
-  [types.SET_FETCHED_ZONES](state, fetchedZones) {
-    Object.assign(state, { fetchedZones });
+  [types.SET_ZONES](state, zones) {
+    Object.assign(state, { zones });
   },
-  [types.SET_FETCHED_MACHINE_TYPES](state, fetchedMachineTypes) {
-    Object.assign(state, { fetchedMachineTypes });
+  [types.SET_MACHINE_TYPES](state, machineTypes) {
+    Object.assign(state, { machineTypes });
   },
 };