From 08e587796c0ceaf6fc7768ca2020122634f1fe0a Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 31 Oct 2023 12:05:31 +0530
Subject: [PATCH 1/3] Improved: job fetching query when clicking on a job to
 open configuration (#619)

---
 src/views/Brokering.vue   | 5 ++++-
 src/views/Fulfillment.vue | 5 ++++-
 src/views/Orders.vue      | 5 ++++-
 src/views/Product.vue     | 7 +++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/Brokering.vue b/src/views/Brokering.vue
index 1f8149b7..5073a3ac 100644
--- a/src/views/Brokering.vue
+++ b/src/views/Brokering.vue
@@ -222,7 +222,10 @@ export default defineComponent({
         this.currentJob.runTime = ''
       }
 
-      await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
+      const job = await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob, jobId: this.jobEnums[jobInformation.id] });
+
+      if(job) this.currentJob = job;
+
       if(!this.isDesktop && this.currentJob) {
         this.router.push({ name: 'JobDetails', params: { jobId: this.currentJob.jobId, category: "orders" } });
         return;
diff --git a/src/views/Fulfillment.vue b/src/views/Fulfillment.vue
index b18b7fed..5ceee002 100644
--- a/src/views/Fulfillment.vue
+++ b/src/views/Fulfillment.vue
@@ -249,7 +249,10 @@ export default defineComponent({
         this.currentJob.runTime = ''
       }
 
-      await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
+      const job = await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob, jobId: this.jobEnums[jobInformation.id] });
+
+      if(job) this.currentJob = job;
+
       if(!this.isDesktop && this.currentJob) {
         this.router.push({ name: 'JobDetails', params: { jobId: this.currentJob.jobId, category: "orders" } });
         return;
diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index 8b15633e..8803b123 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -241,7 +241,10 @@ export default defineComponent({
         this.currentJob.runTime = ''
       }
 
-      await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
+      const job = await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob, jobId: this.jobEnums[jobInformation.id] });
+
+      if(job) this.currentJob = job;
+
       if(!this.isDesktop && this.currentJob) {
         this.router.push({ name: 'JobDetails', params: { jobId: this.currentJob.jobId, category: "orders" } });
         return;
diff --git a/src/views/Product.vue b/src/views/Product.vue
index 7fd59746..1e17b100 100644
--- a/src/views/Product.vue
+++ b/src/views/Product.vue
@@ -40,7 +40,7 @@
               <ion-toggle slot="end" :disabled="!hasPermission(Actions.APP_JOB_UPDATE)" :checked="deleteProductsWebhook" @ionChange="updateWebhook($event['detail'].checked, 'DELETE_PRODUCTS')" color="secondary" />
             </ion-item>
           </ion-card>
-          <MoreJobs v-if="getMoreJobs({...jobEnums, ...initialLoadJobEnums}, enumTypeId).length" :jobs="getMoreJobs({...jobEnums, ...initialLoadJobEnums}, enumTypeId).length" />
+          <MoreJobs v-if="getMoreJobs({...jobEnums, ...initialLoadJobEnums}, enumTypeId).length" :jobs="getMoreJobs({...jobEnums, ...initialLoadJobEnums}, enumTypeId)" />
         </section>
 
         <aside class="desktop-only" v-if="isDesktop" v-show="currentJob">
@@ -157,7 +157,10 @@ export default defineComponent({
       this.currentJobStatus = jobInformation.status;
       this.freqType = jobInformation.id && this.jobFrequencyType[jobInformation.id]
 
-      await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
+      const job = await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob, jobId: this.jobEnums[jobInformation.id] });
+
+      if(job) this.currentJob = job;
+
       if(!this.isDesktop && this.currentJob) {
         this.router.push({ name: 'JobDetails', params: { jobId: this.currentJob.jobId, category: "product" } });
         return;

From 854d1794caff0829415441bc5106169999023646 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 1 Nov 2023 10:38:19 +0530
Subject: [PATCH 2/3] Improved: code to handle action call without jobId (#619)

---
 src/store/modules/job/actions.ts | 4 ++++
 src/views/InitialLoad.vue        | 9 +++------
 src/views/Inventory.vue          | 4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts
index c0225028..06293dc7 100644
--- a/src/store/modules/job/actions.ts
+++ b/src/store/modules/job/actions.ts
@@ -767,6 +767,10 @@ const actions: ActionTree<JobState, RootState> = {
       return currentJob;
     }
 
+    if(!payload.jobId) {
+      return;
+    }
+
     let resp;
     try {
       const params = {
diff --git a/src/views/InitialLoad.vue b/src/views/InitialLoad.vue
index 11b035e9..e5962a92 100644
--- a/src/views/InitialLoad.vue
+++ b/src/views/InitialLoad.vue
@@ -179,11 +179,6 @@ export default defineComponent({
       this.currentSelectedJobModal = label;
       this.job = this.getJob(id);
 
-      if (!this.job) {
-        showToast(translate('Configuration missing'))
-        return;
-      }
-
       if(this.job?.runtimeData?.sinceId?.length >= 0) {
         this.lastShopifyOrderId = this.job.runtimeData.sinceId !== 'null' ? this.job.runtimeData.sinceId : ''
       }
@@ -192,7 +187,9 @@ export default defineComponent({
         this.job.runTime = ''
       }
 
-      await this.store.dispatch('job/updateCurrentJob', { job: this.job });
+      const job = await this.store.dispatch('job/updateCurrentJob', { job: this.job, jobId: id });
+      if(job) this.job = job;
+
       if(!this.isDesktop && this.job) {
         this.router.push({ name: 'JobDetails', params: { jobId: this.job.jobId, category: "initial-load" } });
         return;
diff --git a/src/views/Inventory.vue b/src/views/Inventory.vue
index 869b23af..e66a591c 100644
--- a/src/views/Inventory.vue
+++ b/src/views/Inventory.vue
@@ -185,7 +185,9 @@ export default defineComponent({
       this.currentJobStatus = jobInformation.status;
       this.freqType = jobInformation.id && this.jobFrequencyType[jobInformation.id]
 
-      await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob });
+      const job = await this.store.dispatch('job/updateCurrentJob', { job: this.currentJob, jobId: this.jobEnums[jobInformation.id] });
+      if(job) this.currentJob = job;
+
       if(!this.isDesktop && this.currentJob) {
         this.router.push({ name: 'JobDetails', params: { jobId: this.currentJob.jobId, category: "inventory" } });
         return;

From 6d4b8182ed1ad7bc82700f0d24448b60cd0d0014 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 1 Nov 2023 10:43:11 +0530
Subject: [PATCH 3/3] Improved: check for jobId before job finding logic (#619)

---
 src/store/modules/job/actions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts
index 06293dc7..727b945e 100644
--- a/src/store/modules/job/actions.ts
+++ b/src/store/modules/job/actions.ts
@@ -759,6 +759,10 @@ const actions: ActionTree<JobState, RootState> = {
       return payload?.job;
     }
 
+    if(!payload.jobId) {
+      return;
+    }
+
     let currentJob = pendingJobs.find((job: any) => job.jobId === payload.jobId);
     currentJob = currentJob ? currentJob : cachedJobs[payload?.jobId];
 
@@ -767,10 +771,6 @@ const actions: ActionTree<JobState, RootState> = {
       return currentJob;
     }
 
-    if(!payload.jobId) {
-      return;
-    }
-
     let resp;
     try {
       const params = {