-
Notifications
You must be signed in to change notification settings - Fork 32
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.
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
Added shop selector to menu footer (#2a7ymj3) #283
Changes from all commits
94fb58e
e02e479
973e3cf
9b96946
8df5946
60e4a02
c173227
7fd343d
77df679
39bdbc4
220ee76
8099cc7
102dc74
1ee9478
50cf09a
7ec6cf5
e85443a
e635e8c
ceda856
12e477e
a6524cc
5db51f0
553d042
c097cc6
72a7d02
7137435
792f198
2240067
9f64c50
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,7 +37,7 @@ | |
<div v-if="pendingJobs?.length === 0"> | ||
<p class="ion-text-center">{{ $t("There are no jobs pending right now")}}</p> | ||
<div class="ion-text-center"> | ||
<ion-button fill="outline" @click="refreshJobs()"> | ||
<ion-button fill="outline" @click="refreshJobs(undefined, true)"> | ||
{{ $t('retry') }} | ||
<ion-spinner v-if="isRetrying" name="crescent" /> | ||
</ion-button> | ||
|
@@ -97,7 +97,7 @@ | |
<div v-if="runningJobs?.length === 0"> | ||
<p class="ion-text-center">{{ $t("There are no jobs running right now")}}</p> | ||
<div class="ion-text-center"> | ||
<ion-button fill="outline" @click="refreshJobs()"> | ||
<ion-button fill="outline" @click="refreshJobs(undefined, true)"> | ||
{{ $t('retry') }} | ||
<ion-spinner slot="end" v-if="isRetrying" name="crescent" /> | ||
</ion-button> | ||
|
@@ -167,7 +167,7 @@ | |
<div v-if="jobHistory?.length === 0"> | ||
<p class="ion-text-center">{{ $t("No jobs have run yet")}}</p> | ||
<div class="ion-text-center"> | ||
<ion-button fill="outline" @click="refreshJobs()"> | ||
<ion-button fill="outline" @click="refreshJobs(undefined, true)"> | ||
{{ $t('retry') }} | ||
<ion-spinner v-if="isRetrying" name="crescent" /> | ||
</ion-button> | ||
|
@@ -457,8 +457,8 @@ export default defineComponent({ | |
event.target.complete(); | ||
}) | ||
}, | ||
async refreshJobs(event: any) { | ||
this.isRetrying = true; | ||
async refreshJobs(event: any, isRetrying = false ) { | ||
this.isRetrying = isRetrying; | ||
if(this.segmentSelected === 'pending') { | ||
this.getPendingJobs().then(() => { | ||
if(event) event.target.complete(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Check if it is not breaking pull to refresh (ion-refresher) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I tried "pull to refresh" on Pipeline page & loader keeps on spinning. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, it's running infinitely. How should I proceed now? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could pass event as undefined for all the other cases then pull to refresh There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done sir. |
||
|
@@ -589,9 +589,11 @@ export default defineComponent({ | |
await this.store.dispatch('job/updateCurrentJob', { job: {} }); | ||
}, | ||
mounted(){ | ||
emitter.on("productStoreChanged", this.refreshJobs); | ||
emitter.on("pinnedJobsUpdated", (this as any).updateSelectedPinnedJob); | ||
}, | ||
unmounted(){ | ||
emitter.off("productStoreChanged", this.refreshJobs); | ||
emitter.off('jobUpdated', this.updateJobs); | ||
emitter.off("pinnedJobsUpdated", (this as any).updateSelectedPinnedJob); | ||
}, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think batch jobs should have enumTypeId as ORDER_SYS_JOB and we are already fetching those jobs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sir, the More Jobs section is not visible if we remove the code.