Improved: added support to show DataManagerLogs for mobile view(hotwa…

…x#680)
R-Sourabh · Nov 13, 2024 · 0e6ba95 · 0e6ba95
1 parent 2c9dd31
commit 0e6ba95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/views/DataManagerLogDetails.vue b/src/views/DataManagerLogDetails.vue
@@ -83,12 +83,12 @@
           </ion-item>
 
           <ion-label>
-            {{ getDateTime(log.startDateTime) }}
+            {{ log.startDateTime ? getDateTime(log.startDateTime) : '-' }}
             <p>{{ translate('Started') }}</p>
           </ion-label>
 
           <ion-label>
-            {{ getDateTime(log.finishDateTime) }}
+            {{ log.finishDateTime ? getDateTime(log.finishDateTime) : '-' }}
             <p>{{ translate('Finished') }}</p>
           </ion-label>
 

diff --git a/src/views/JobDetails.vue b/src/views/JobDetails.vue
@@ -9,7 +9,7 @@
 
     <ion-content>
       <InitialJobConfiguration v-if="jobCategory === 'initial-load'" :type='type' :shopifyOrderId='lastShopifyOrderId' :key="currentJob" />
-      <JobConfiguration v-else :status="currentJob?.status === 'SERVICE_DRAFT' ? currentJob?.status : currentJob?.tempExprId" :type="freqType" :key="currentJob"/>
+      <JobConfiguration v-else :status="currentJob?.status === 'SERVICE_DRAFT' ? currentJob?.status : currentJob?.tempExprId" :type="freqType" :key="currentJob" :historyJobConfig="checkJobStatus(currentJob?.statusId)"/>
     </ion-content>
   </ion-page>
 </template>
@@ -87,6 +87,10 @@ export default defineComponent({
         const jobFreqTypeId = (Object.keys(this.jobFrequencyType).find((enumId: any) => enumId === id)) as any;
         this.freqType = (id && jobFreqTypeId) && this.jobFrequencyType[jobFreqTypeId];
       }
+    },
+    checkJobStatus(statusId: string) {
+      const statuses = ["SERVICE_CANCELLED", "SERVICE_CRASHED", "SERVICE_FAILED", "SERVICE_FINISHED", "SERVICE_RUNNING", "SERVICE_QUEUED"];
+      return statuses.includes(statusId);
     }
   },
   mounted() {

diff --git a/src/views/Pipeline.vue b/src/views/Pipeline.vue
@@ -608,7 +608,7 @@ export default defineComponent({
       this.freqType = appFreqType ? appFreqType[1] : "default"
 
       await this.store.dispatch('job/updateCurrentJob', { job });
-      if (!this.isDesktop && this.segmentSelected === 'history' && job.runtimeData?.configId) {
+      if(this.segmentSelected === 'history' && job.runtimeData?.configId) {
         await this.store.dispatch('job/fetchDataManagerLogs', job.jobId)
       }
       if(!this.isDesktop && job?.jobId) {