Fixed: Jobs repeatation in moreJobs sections on all pages(#2vjxdha) #296
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
shashwatbangar
changed the title
shashwatbangar
changed the title
ymaheshwari1
requested changes
Nov 23, 2022
src/views/Product.vue
Outdated
| @@ -40,7 +40,7 @@ | |||
| <ion-toggle slot="end" :checked="deleteProductsWebhook" @ionChange="updateWebhook($event['detail'].checked, 'DELETE_PRODUCTS')" color="secondary" /> | |||
| </ion-item> | |||
| </ion-card> | |||
| <MoreJobs v-if="moreJobs.length" :jobs="moreJobs" :jobEnums="jobEnums" /> | |||
| <MoreJobs v-if="getMoreJobs(jobEnums, 'PRODUCT_SYS_JOB').length" :jobs="getMoreJobs(jobEnums, 'PRODUCT_SYS_JOB').length" :jobEnums="jobEnums" /> | |||
There was a problem hiding this comment.
Define a local property to declare the enumTypeId value.
src/views/Orders.vue
Outdated
| @@ -500,7 +495,7 @@ export default defineComponent({ | |||
| if (this.currentEComStore.productStoreId) { | |||
| this.getAutoCancelDays(); | |||
| } | |||
| this.fetchMoreJobs(); | |||
| // this.moreJobs = this.getMoreJobs(this.jobEnums, "ORDER_SYS_JOB"); | |||
There was a problem hiding this comment.
Remove this comment if not needed.
src/store/modules/job/getters.ts
Outdated
|
|
||
| return Object.values(jobs) | ||
| return Object.keys(state.cached).reduce((orders: any, enumId: any) => { | ||
| if(orderJobEnumIds.indexOf(enumId) === -1 && state.cached[enumId]?.enumTypeId === enumTypeId) { |
There was a problem hiding this comment.
Instead in place of indexOf, I think using includes will be a good option.
src/store/modules/job/getters.ts
Outdated
| return Object.values(jobs) | ||
| return Object.keys(state.cached).reduce((orders: any, enumId: any) => { | ||
| if(orderJobEnumIds.indexOf(enumId) === -1 && state.cached[enumId]?.enumTypeId === enumTypeId) { | ||
| orders.push(state.cached[enumId]) |
There was a problem hiding this comment.
I think we should change order specific variable name, the same getter is being used on all pages.
There was a problem hiding this comment.
Right sir. Fixed it.
src/store/modules/job/getters.ts
Outdated
|
|
||
| return Object.values(jobs) | ||
| return Object.keys(state.cached).reduce((orders: any, enumId: any) => { |
There was a problem hiding this comment.
Suggested change
| return Object.keys(state.cached).reduce((orders: any, enumId: any) => { | |
| return Object.keys(state.cached).reduce((orders: any, enumId: string) => { |
…action payload(#2vjxdha-n)
adityasharma7
suggested changes
Nov 24, 2022
src/store/modules/job/getters.ts
Outdated
|
|
||
| return Object.values(jobs) | ||
| return Object.keys(state.cached).reduce((jobs: any, enumId: string) => { | ||
| if(!orderJobEnumIds.includes(enumId) && state.cached[enumId]?.enumTypeId === enumTypeId) { |
There was a problem hiding this comment.
We should first check enumTypeId as it will have many other types of jobs and it is better to avoid includes operation for other types
Suggested change
| if(!orderJobEnumIds.includes(enumId) && state.cached[enumId]?.enumTypeId === enumTypeId) { | |
| if(state.cached[enumId]?.enumTypeId === enumTypeId && !orderJobEnumIds.includes(enumId)) { |
src/views/Inventory.vue
Outdated
| "enumTypeId": "INVENTORY_SYS_JOB", | ||
| }, | ||
| }); | ||
| getMoreJobs(jobEnums: any, enumTypeId: string) { |
There was a problem hiding this comment.
Why this is needed? we could directly use moreJobs(jobEnums, enumTypeId)
There was a problem hiding this comment.
Yes sir. Fixed it.
src/store/modules/job/actions.ts
Outdated
| @@ -357,7 +357,7 @@ const actions: ActionTree<JobState, RootState> = { | |||
| ...payload.inputFields | |||
| }, | |||
| "noConditionFind": "Y", | |||
| "viewSize": (payload.inputFields?.systemJobEnumId?.length * 3) | |||
| "viewSize": (payload.inputFields?.systemJobEnumId?.length * 3) || 30 | |||
There was a problem hiding this comment.
We should increase this value
There was a problem hiding this comment.
Sure sir. Increased it to 50
…ier to show moreJobs we had a getter which is called inside a method, we can directly call that getter and pass values inside it(#2vjxdha-n)
…returns a value from getter, we should give it name starting with get(#2vjxdha-n)
adityasharma7
approved these changes
Nov 24, 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 #257
Short Description and Why It's Useful
We have hardcoded jobs at the top of pages & below we have moreJobs section, earlier hardCoded jobs were are shown in moreJobs section which is wrong. This happened because enumTypeId were same for both. Now fixed it.
Screenshots of Visual Changes before/after (If There Are Any)
IMPORTANT NOTICE - Remember to add changelog entry
Contribution and Currently Important Rules Acceptance