Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored: setEcomStore and setShopifyConfig actions to accept ID. (#2tzh44d) #241

Merged
merged 11 commits into from
Oct 10, 2022
Merged

Refactored: setEcomStore and setShopifyConfig actions to accept ID. (#2tzh44d) #241

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
383b385
Implemented: Validation on runtime set by user to accept only future …
k2maan Sep 13, 2022
25b04b9
Fixed: Indentations
k2maan Sep 13, 2022
06f37a2
Improved: Removed unnecessary code (method and getter) (#2tzb5w4)
k2maan Sep 13, 2022
87dc4ed
Refactored: setEcomStore and setCurrentShopifyConfig actions to accep…
k2maan Sep 20, 2022
0fd3d5c
Reverting: pushed unwanted file
k2maan Sep 20, 2022
c7c082d
Added find function with the desired usage
k2maan Sep 26, 2022
8d22484
Refactored by removing and modifying unnecessary code
k2maan Oct 7, 2022
57fe77e
Refactored code, improved variable names and used state instead of ge…
k2maan Oct 10, 2022
e064808
Refactored code and improved readability
k2maan Oct 10, 2022
a41a43a
Renamed: variable name for shopifyConfig as per the pattern (#2tzh44d))
adityasharma7 Oct 10, 2022
e5385f1
Reverted: unwanted spaces (#2tzh44d)
adityasharma7 Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions src/store/modules/user/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,20 @@ const actions: ActionTree<UserState, RootState> = {
/**
* update current eComStore information
*/
async setEcomStore({ commit, dispatch }, payload) {
async setEcomStore({ commit, dispatch, getters }, payload) {
dispatch('job/clearJobState', null, { root: true });
commit(types.USER_CURRENT_ECOM_STORE_UPDATED, payload.eComStore);
dispatch('getShopifyConfig', payload.eComStore.productStoreId);
let productStore;

if(payload.productStore) {
commit(types.USER_CURRENT_ECOM_STORE_UPDATED, payload.productStore);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should commit in both the cases, here we should assign productStore with payload.productStore

} else {
productStore = getters.getUserProfile.stores.find((store: any) => store.productStoreId === payload.productStoreId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to use getter, I think we could directly access the state

}

dispatch('getShopifyConfig', productStore ? productStore.productStoreId : payload.productStore.productStoreId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once we have productStore set for both the cases, we will not need this ternary operation we could use productStore.productStoreId for both the cases

await UserService.setUserPreference({
'userPrefTypeId': 'SELECTED_BRAND',
'userPrefValue': payload.eComStore.productStoreId
'userPrefValue': productStore ? productStore.productStoreId : payload.productStore.productStoreId
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. refer my previous comment

});
},
/**
Expand Down Expand Up @@ -204,9 +211,16 @@ const actions: ActionTree<UserState, RootState> = {
/**
* update current shopify config id
*/
async setCurrentShopifyConfig({ commit, dispatch }, shopifyConfig) {
commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, shopifyConfig ? shopifyConfig : {});
dispatch('job/clearJobState', null, { root: true });
async setCurrentShopifyConfig({ commit, dispatch, state }, payload) {
if(payload.shopifyConfig) {
commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, payload.shopifyConfig);
} else {
const shopifyConfigs = state.shopifyConfigs;
const currentShopifyConfig = shopifyConfigs.find((configs: any) => configs.shopifyConfigId === payload.shopifyConfigId)
commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, currentShopifyConfig);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest following code for better readability

Suggested change
if(payload.shopifyConfig) {
commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, payload.shopifyConfig);
} else {
const shopifyConfigs = state.shopifyConfigs;
const currentShopifyConfig = shopifyConfigs.find((configs: any) => configs.shopifyConfigId === payload.shopifyConfigId)
commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, currentShopifyConfig);
}
let currentShopifyConfig = payload.shopifyConfig;
if(!currentShopifyConfig) {
currentShopifyConfig = state.shopifyConfigs.find((shopifyConfig: any) => shopifyConfig.shopifyConfigId === payload.shopifyConfigId)
}
commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, currentShopifyConfig ? currentShopifyConfig : {});


dispatch('job/clearJobState', null, { root: true });
},

/**
Expand Down
10 changes: 5 additions & 5 deletions src/views/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ export default defineComponent({
methods: {
setEComStore(store: any) {
if(this.userProfile) {
this.store.dispatch('user/setEcomStore', {
'eComStore': this.userProfile.stores.find((str: any) => str.productStoreId == store['detail'].value)
})
const productStoreId = store['detail'].value
this.store.dispatch('user/setEcomStore', { 'productStoreId': productStoreId })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not?

Suggested change
const productStoreId = store['detail'].value
this.store.dispatch('user/setEcomStore', { 'productStoreId': productStoreId })
this.store.dispatch('user/setEcomStore', { 'productStoreId': store['detail'].value })

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we could rename store to event like setShopifyConfig() method and access directly event.detail.value

}
},
setShopifyConfig(event: any){
const shopifyConfig = this.shopifyConfigs.find((shopifyConfig: any) => shopifyConfig.shopifyConfigId === event.detail.value)
this.store.dispatch('user/setCurrentShopifyConfig', shopifyConfig);
// const currentShopifyConfig = this.shopifyConfigs.find((shopifyConfig: any) => shopifyConfig.shopifyConfigId === event.detail.value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unwanted code

const shopifyConfigId = event.detail.value;
this.store.dispatch('user/setCurrentShopifyConfig', { 'shopifyConfigId': shopifyConfigId });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not?

Suggested change
const shopifyConfigId = event.detail.value;
this.store.dispatch('user/setCurrentShopifyConfig', { 'shopifyConfigId': shopifyConfigId });
this.store.dispatch('user/setCurrentShopifyConfig', { 'shopifyConfigId': event.detail.value });

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented the changes, sir, please review.

},
async changeTimeZone() {
const timeZoneModal = await modalController.create({
Expand Down