Merge pull request #241 from k2maan/#2tzh44d

Refactored: setEcomStore and setShopifyConfig actions to accept ID. (#2tzh44d)
hotwax · Oct 10, 2022 · e9360e9 · e9360e9
2 parents 3db5f61 + e5385f1
commit e9360e9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
@@ -130,13 +130,18 @@ const actions: ActionTree<UserState, RootState> = {
   /**
    * update current eComStore information
    */
-  async setEcomStore({ commit, dispatch }, payload) {
+  async setEcomStore({ state, commit, dispatch }, payload) {
     dispatch('job/clearJobState', null, { root: true });
-    commit(types.USER_CURRENT_ECOM_STORE_UPDATED, payload.eComStore);
-    dispatch('getShopifyConfig', payload.eComStore.productStoreId);
+    let productStore = payload.productStore;
+    if(!productStore) {
+      productStore = this.state.user.current.stores.find((store: any) => store.productStoreId === payload.productStoreId);
+    }
+
+    commit(types.USER_CURRENT_ECOM_STORE_UPDATED, productStore);
+    dispatch('getShopifyConfig',  productStore.productStoreId);
     await UserService.setUserPreference({
       'userPrefTypeId': 'SELECTED_BRAND',
-      'userPrefValue': payload.eComStore.productStoreId
+      'userPrefValue': productStore.productStoreId
     });
   },
   /**
@@ -204,7 +209,12 @@ const actions: ActionTree<UserState, RootState> = {
   /**
    * update current shopify config id
    */
-  async setCurrentShopifyConfig({ commit, dispatch }, shopifyConfig) {
+  async setCurrentShopifyConfig({ commit, dispatch, state }, payload) {
+    let shopifyConfig = payload.shopifyConfig;
+    if(!shopifyConfig) {
+      shopifyConfig = state.shopifyConfigs.find((configs: any) => configs.shopifyConfigId === payload.shopifyConfigId)
+    }
+
     commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, shopifyConfig ? shopifyConfig : {});
     dispatch('job/clearJobState', null, { root: true });
   },
@@ -297,4 +307,4 @@ const actions: ActionTree<UserState, RootState> = {
   }
 }
 
-export default actions;
+export default actions;
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -86,16 +86,13 @@ export default defineComponent({
     })
   },
   methods: {
-    setEComStore(store: any) {
+    setEComStore(event: any) {
       if(this.userProfile) {
-        this.store.dispatch('user/setEcomStore', {
-          'eComStore': this.userProfile.stores.find((str: any) => str.productStoreId == store['detail'].value)
-        })
+        this.store.dispatch('user/setEcomStore', { 'productStoreId': event.detail.value })
       }
     },
     setShopifyConfig(event: any){
-      const shopifyConfig = this.shopifyConfigs.find((shopifyConfig: any) => shopifyConfig.shopifyConfigId === event.detail.value)
-      this.store.dispatch('user/setCurrentShopifyConfig', shopifyConfig);
+      this.store.dispatch('user/setCurrentShopifyConfig', { 'shopifyConfigId': event.detail.value });
     },
     async changeTimeZone() {
       const timeZoneModal = await modalController.create({