feat: fix aws store dispatch

Terraform-Canvas · Aug 10, 2023 · 6455fe0 · 6455fe0
1 parent 8b42372
commit 6455fe0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 25 deletions.
diff --git a/src/components/aws/DrawerInput.vue b/src/components/aws/DrawerInput.vue
@@ -18,19 +18,10 @@ import PublicSubnetDrawer from '@/components/aws/drawer/PublicSubnetDrawer.vue';
 import SGDrawer from '@/components/aws/drawer/SGDrawer.vue';
 import VPCDrawer from '@/components/aws/drawer/VPCDrawer.vue';
 
-let instance_items = [];
 let currentNodeData = reactive({});
 const nodeType = ref('');
 const props = defineProps(['drawer']);
 
-store.dispatch('aws/getInstanceTypes').then((res) => {
-    const instance_type = store.state.aws.instance_types;
-    for (let value of instance_type) {
-        instance_items.push(value.InstanceType);
-    }
-    instance_items.sort();
-});
-
 const emit = defineEmits(['handleRightDrawer']);
 
 const closeForm = () => {

diff --git a/src/components/aws/drawer/ASGDrawer.vue b/src/components/aws/drawer/ASGDrawer.vue
@@ -20,14 +20,7 @@ const handleClose = () => {
 
 onMounted(() => {
     tempNodeData = reactive({ ...props.currentNodeData });
-    store.dispatch('aws/getInstanceTypes').then((res) => {
-        const instance_type = store.state.aws.instance_types;
-        for (let value of instance_type) {
-            instance_items.push(value.InstanceType);
-        }
-        instance_items.sort();
-    });
-    store.dispatch('aws/getAMI');
+    instance_items = store.getters['aws/getInstanceValue'];
 });
 
 const handleUpdate = (newTextValue, arg, type) => {

diff --git a/src/components/aws/drawer/EC2Drawer.vue b/src/components/aws/drawer/EC2Drawer.vue
@@ -20,13 +20,7 @@ const handleClose = () => {
 
 onMounted(() => {
     tempNodeData = reactive({ ...props.currentNodeData });
-    store.dispatch('aws/getInstanceTypes').then((res) => {
-        const instance_type = store.state.aws.instance_types;
-        for (let value of instance_type) {
-            instance_items.push(value.InstanceType);
-        }
-        instance_items.sort();
-    });
+    instance_items = store.getters['aws/getInstanceValue'];
 });
 
 const handleUpdate = (newTextValue, arg, type) => {

diff --git a/src/components/node/NodePlane.vue b/src/components/node/NodePlane.vue
@@ -47,6 +47,15 @@ const {
     nodes: [],
 });
 
+onMounted(() => {
+    if (!store.getters['aws/getInstanceValue']) {
+        store.dispatch('aws/getInstanceTypes');
+    }
+    if (!store.getters['aws/getAMIValue']) {
+        store.dispatch('aws/getAMI');
+    }
+});
+
 onNodeClick((MouseEvent) => {
     nodeClicked();
     store.dispatch('node/setSelectedNode', getSelectedNodes.value[0]);

diff --git a/src/store/modules/aws.js b/src/store/modules/aws.js
@@ -10,7 +10,12 @@ const state = () => ({
 // 외부에서 가져갈 수 있는 get 부분
 const getters = {
     getInstanceValue: function (state) {
-        return state.instance_types;
+        let instance_items = [];
+        for (let value of state.instance_types) {
+            instance_items.push(value.InstanceType);
+        }
+        instance_items.sort();
+        return instance_items;
     },
     getAMIValue: function (state) {
         return state.ami;