Merge pull request #375 from hotwax/#373

Fixed: Save button while creating a batch for broker order service does not work (#373)

src/components/BatchModal.vue

@@ -72,7 +72,8 @@ import { defineComponent } from 'vue';
 import { closeOutline, checkmarkDoneOutline } from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { DateTime } from 'luxon';
-import { handleDateTimeInput, isFutureDate } from '@/utils';
+import { handleDateTimeInput, isFutureDate, showToast } from '@/utils';
+import { translate } from '@/i18n'
 export default defineComponent({
   name: 'BatchModal',
   components: {
@@ -143,6 +144,7 @@ export default defineComponent({
       const job = this.currentBatch ? this.currentBatch : this.getJob(batchJobEnum)?.find((job: any) => job.status === 'SERVICE_DRAFT');
 
       if (!job) {
+        showToast(translate('Configuration missing'))
         return;
       }
 

src/store/modules/job/actions.ts

@@ -345,7 +345,6 @@ const actions: ActionTree<JobState, RootState> = {
     // Earlier we were having ORing on status only, but now we want to add condition for shopId as well
     // Instead of complicating the query, we have made 2 separate call with status conditions and merged them
 
-
     // Fetching the draft jobs first
     const fetchJobRequests = [];
     let params = {
@@ -397,8 +396,11 @@ const actions: ActionTree<JobState, RootState> = {
     // If query is for single systemJobEnumId only update it 
     if (typeof payload.inputFields.systemJobEnumId === "string" && batchJobEnumIds.includes(payload.inputFields.systemJobEnumId)) {
       batchJobEnumIds = [ payload.inputFields.systemJobEnumId ];
-    } else if (typeof payload.inputFields.systemJobEnumId === "object") {
+    } else if (payload.inputFields.systemJobEnumId && typeof payload.inputFields.systemJobEnumId === "object") {
       batchJobEnumIds = batchJobEnumIds.filter((batchJobEnumId: any) => payload.inputFields.systemJobEnumId.includes(batchJobEnumId));
+    } else {
+      // If we are not explicitly getting the batch jobs skip updating it in cache
+      batchJobEnumIds = [];
     }
     batchJobEnumIds.map((batchBrokeringJobEnum: any) => {
       cached[batchBrokeringJobEnum] = responseJobs.filter((job: any) => job.systemJobEnumId === batchBrokeringJobEnum).reduce((batchBrokeringJobs: any, job: any) => {

src/views/Orders.vue

@@ -456,19 +456,19 @@ export default defineComponent({
         });
       return jobAlert.present();
     },
-    fetchJobs(){
-      this.store.dispatch("job/fetchJobs", {
+    async fetchJobs(){
+      this.store.dispatch('webhook/fetchWebhooks')
+      await this.store.dispatch("job/fetchJobs", {
         "inputFields": {
           "enumTypeId": "ORDER_SYS_JOB"
         }
       });
-      this.store.dispatch("job/fetchJobs", {
+      await this.store.dispatch("job/fetchJobs", {
         "inputFields": {
           "systemJobEnumId": Object.values(this.batchJobEnums).map((jobEnum: any) => jobEnum.id),
           "systemJobEnumId_op": "in"
         }
       });
-      this.store.dispatch('webhook/fetchWebhooks')
       if (this.currentEComStore.productStoreId) {
         this.getAutoCancelDays();
       }