Jobs should be fetched and scheduled based upon the selected Shop(#2r65b1c) #228
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fyConfigId is available in runtimeData when scheduling service(#2r65b1c)
Passed shopId in jobFields when scheduling service(#2r65b1c)
adityasharma7
suggested changes
Aug 29, 2022
src/store/modules/user/actions.ts
Outdated
| const shopifyConfigs = resp.data.docs; | ||
| commit(types.USER_SHOPIFY_CONFIG_LIST_UPDATED, shopifyConfigs); | ||
| commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, shopifyConfigs.length > 0 ? shopifyConfigs[0].shopifyConfigId : ""); | ||
| if (resp.status === 200 && !hasError(resp) && resp.data?.docs.length > 0) { |
There was a problem hiding this comment.
I think we should null for docs as well
src/store/modules/user/index.ts
Outdated
| @@ -11,8 +11,8 @@ const userModule: Module<UserState, RootState> = { | |||
| token: '', | |||
| current: null, | |||
| instanceUrl: '', | |||
| shopifyConfigs: [], | |||
| currentShopifyConfigId: "", | |||
| shopifyConfigs: {}, | |||
There was a problem hiding this comment.
I think this should be array only
| @@ -3,6 +3,6 @@ export const USER_TOKEN_CHANGED = SN_USER + '/TOKEN_CHANGED' | |||
| export const USER_END_SESSION = SN_USER + '/END_SESSION' | |||
| export const USER_INFO_UPDATED = SN_USER + '/INFO_UPDATED' | |||
| export const USER_INSTANCE_URL_UPDATED = SN_USER + '/INSTANCE_URL_UPDATED' | |||
| export const USER_SHOPIFY_CONFIG_LIST_UPDATED = SN_USER + '/SHOPIFY_CONFIG_LIST_UPDATED' | |||
| export const USER_SHOPIFY_CONFIGS_UPDATED = SN_USER + '/SHOPIFY_CONFIG_LIST_UPDATED' | |||
There was a problem hiding this comment.
Suggested change
| export const USER_SHOPIFY_CONFIGS_UPDATED = SN_USER + '/SHOPIFY_CONFIG_LIST_UPDATED' | |
| export const USER_SHOPIFY_CONFIGS_UPDATED = SN_USER + '/SHOPIFY_CONFIGS_UPDATED' |
… and added null check for shopifyConfig resp(#2r65b1c)
ymaheshwari1
requested changes
Aug 30, 2022
src/store/modules/job/actions.ts
Outdated
| 'statusId': "SERVICE_PENDING", | ||
| 'systemJobEnumId': job.systemJobEnumId | ||
| } as any | ||
|
|
||
| if(job?.runtimeData?.shopifyConfigId) { | ||
| payload['shopifyConfigId'] = this.state.user.currentShopifyConfig?.shopifyConfigId |
There was a problem hiding this comment.
Store this.state.user.currentShopifyConfig in a variable and check for it's value in if condition itself and remove optional chaining.
adityasharma7
suggested changes
Sep 1, 2022
src/store/modules/job/actions.ts
Outdated
| @@ -529,13 +540,13 @@ const actions: ActionTree<JobState, RootState> = { | |||
| 'systemJobEnumId': job.systemJobEnumId, | |||
| 'tempExprId': job.jobStatus, // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, currently kept it for backward compatibility | |||
| 'parentJobId': job.parentJobId, | |||
| 'recurrenceTimeZone': this.state.user.current.userTimeZone | |||
| 'recurrenceTimeZone': this.state.user.current.userTimeZone, | |||
| 'shopId': job.status === "SERVICE_PENDING" ? job.shopId : this.state.user.currentShopifyConfig.shopId, | |||
There was a problem hiding this comment.
Suggested change
| 'shopId': job.status === "SERVICE_PENDING" ? job.shopId : this.state.user.currentShopifyConfig.shopId, | |
| 'shopId': job.runtimeData?.shopifyConfigId && job.status === "SERVICE_PENDING" ? job.shopId : this.state.user.currentShopifyConfig.shopId, |
There was a problem hiding this comment.
Updated the condition.
src/store/modules/job/actions.ts
Outdated
| }, | ||
| 'shopifyConfigId': job.status === "SERVICE_PENDING" ? job.runtimeData?.shopifyConfigId : this.state.user.currentShopifyConfigId, | ||
| 'shopifyConfigId': job.status === "SERVICE_PENDING" ? job.runtimeData?.shopifyConfigId : this.state.user.currentShopifyConfig.shopifyConfigId, |
There was a problem hiding this comment.
Suggested change
| 'shopifyConfigId': job.status === "SERVICE_PENDING" ? job.runtimeData?.shopifyConfigId : this.state.user.currentShopifyConfig.shopifyConfigId, | |
| 'shopifyConfigId': job.runtimeData?.shopifyConfigId && job.status === "SERVICE_PENDING" ? job.runtimeData?.shopifyConfigId : this.state.user.currentShopifyConfig.shopifyConfigId, |
There was a problem hiding this comment.
Updated the condition.
adityasharma7
approved these changes
Sep 1, 2022
adityasharma7
approved these changes
Sep 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issues
Closes #
Short Description and Why It's Useful
Screenshots of Visual Changes before/after (If There Are Any)
IMPORTANT NOTICE - Remember to add changelog entry
Contribution and Currently Important Rules Acceptance