From d574f549417fdf3a1885032ffee6276fc0548368 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 5 Dec 2024 11:43:56 +0530
Subject: [PATCH] Improved: UI of the misc jobs, enumDescription to be shown in
 the history modal (#734)

---
 src/components/JobHistoryModal.vue |  3 +-
 src/views/Miscellaneous.vue        | 49 +++++++++++++++---------------
 src/views/Orders.vue               |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/components/JobHistoryModal.vue b/src/components/JobHistoryModal.vue
index 016cf98c..b58aab58 100644
--- a/src/components/JobHistoryModal.vue
+++ b/src/components/JobHistoryModal.vue
@@ -6,7 +6,8 @@
           <ion-icon slot="icon-only" :icon="closeOutline" />
         </ion-button>
       </ion-buttons>
-      <ion-title>{{ currentJob?.enumName ? currentJob.enumName : currentJob?.jobName ? currentJob.jobName : currentJob?.description }}</ion-title>
+      <ion-title v-if="isMaargJob">{{ currentJob?.enumDescription ? currentJob.enumDescription : currentJob.jobName }}</ion-title>
+      <ion-title v-else>{{ currentJob?.enumName ? currentJob.enumName : currentJob?.description }}</ion-title>
     </ion-toolbar>
   </ion-header>
 
diff --git a/src/views/Miscellaneous.vue b/src/views/Miscellaneous.vue
index b35a4ff8..2c4cc11a 100644
--- a/src/views/Miscellaneous.vue
+++ b/src/views/Miscellaneous.vue
@@ -24,6 +24,30 @@
           <div v-else>
             <ion-list>
               <ion-list-header>{{ translate("Miscellaneous jobs") }}</ion-list-header>
+
+              <ion-card>
+                <ion-card-header>
+                  <ion-card-title>{{ translate("Shopify bulk query") }}</ion-card-title>
+                </ion-card-header>
+
+                <ion-item button detail :disabled="!isMaargJobFound('BLK_SYS_MESS_SHPFY')" @click="viewMaargJobConfiguration('BLK_SYS_MESS_SHPFY')">
+                  <ion-label>{{ translate("Send next bulk query system message in queue") }}</ion-label>
+                  <ion-note slot="end" >{{ isMaargJobFound('BLK_SYS_MESS_SHPFY') ? getMaargJobStatus("BLK_SYS_MESS_SHPFY") : translate("Not found") }}</ion-note>
+                </ion-item>
+                <ion-item button detail :disabled="!isMaargJobFound('BLK_RSLT_SHPFY')" @click="viewMaargJobConfiguration('BLK_RSLT_SHPFY')">
+                  <ion-label>{{ translate("Poll current bulk operation query result") }}</ion-label>
+                  <ion-note slot="end" >{{ isMaargJobFound('BLK_RSLT_SHPFY') ? getMaargJobStatus("BLK_RSLT_SHPFY") : translate("Not found") }}</ion-note>
+                </ion-item>
+                <ion-item button detail :disabled="!isMaargJobFound('ALL_RCVD_SYS_MSG')" @click="viewMaargJobConfiguration('ALL_RCVD_SYS_MSG')">
+                  <ion-label>{{ translate("Consume All Received System Messages") }}</ion-label>
+                  <ion-note slot="end" >{{ isMaargJobFound('ALL_RCVD_SYS_MSG') ? getMaargJobStatus("ALL_RCVD_SYS_MSG") : translate("Not found") }}</ion-note>
+                </ion-item>
+                <ion-item button detail :disabled="!isMaargJobFound('ALL_PRDCD_SYS_MSG')" @click="viewMaargJobConfiguration('ALL_PRDCD_SYS_MSG')">
+                  <ion-label>{{ translate("Send All Produced System Messages") }}</ion-label>
+                  <ion-note slot="end" >{{ isMaargJobFound('ALL_PRDCD_SYS_MSG') ? getMaargJobStatus("ALL_PRDCD_SYS_MSG") : translate("Not found") }}</ion-note>
+                </ion-item>
+              </ion-card>
+
               <ion-item v-for="job in prepareMiscJobs" :key="job.jobId" @click="viewJobConfiguration(job)" detail button>
                 <ion-label>{{ job.jobName }}</ion-label>
                 <ion-note slot="end">{{ getJobRuntime(job) }}</ion-note>
@@ -34,31 +58,6 @@
               <ion-infinite-scroll-content loading-spinner="crescent" :loading-text="translate('Loading')"/>
             </ion-infinite-scroll>
           </div>
-
-          <div>
-            <ion-card>
-              <ion-card-header>
-                <ion-card-title>{{ translate("Shopify bulk query") }}</ion-card-title>
-              </ion-card-header>
-
-              <ion-item button detail :disabled="!isMaargJobFound('BLK_SYS_MESS_SHPFY')" @click="viewMaargJobConfiguration('BLK_SYS_MESS_SHPFY')">
-                <ion-label class="ion-text-wrap">{{ translate("Send next bulk query system message in queue") }}</ion-label>
-                <ion-label slot="end" >{{ isMaargJobFound('BLK_SYS_MESS_SHPFY') ? getMaargJobStatus("BLK_SYS_MESS_SHPFY") : translate("Not found") }}</ion-label>
-              </ion-item>
-              <ion-item button detail :disabled="!isMaargJobFound('BLK_RSLT_SHPFY')" @click="viewMaargJobConfiguration('BLK_RSLT_SHPFY')">
-                <ion-label class="ion-text-wrap">{{ translate("Poll current bulk operation query result") }}</ion-label>
-                <ion-label slot="end" >{{ isMaargJobFound('BLK_RSLT_SHPFY') ? getMaargJobStatus("BLK_RSLT_SHPFY") : translate("Not found") }}</ion-label>
-              </ion-item>
-              <ion-item button detail :disabled="!isMaargJobFound('ALL_RCVD_SYS_MSG')" @click="viewMaargJobConfiguration('ALL_RCVD_SYS_MSG')">
-                <ion-label class="ion-text-wrap">{{ translate("Consume All Received System Messages") }}</ion-label>
-                <ion-label slot="end" >{{ isMaargJobFound('ALL_RCVD_SYS_MSG') ? getMaargJobStatus("ALL_RCVD_SYS_MSG") : translate("Not found") }}</ion-label>
-              </ion-item>
-              <ion-item button detail :disabled="!isMaargJobFound('ALL_PRDCD_SYS_MSG')" @click="viewMaargJobConfiguration('ALL_PRDCD_SYS_MSG')">
-                <ion-label class="ion-text-wrap">{{ translate("Send All Produced System Messages") }}</ion-label>
-                <ion-label slot="end" >{{ isMaargJobFound('ALL_PRDCD_SYS_MSG') ? getMaargJobStatus("ALL_PRDCD_SYS_MSG") : translate("Not found") }}</ion-label>
-              </ion-item>
-            </ion-card>
-          </div>
         </section>
 
         <aside class="desktop-only" v-if="isDesktop" v-show="currentJob || Object.keys(currentMaargJob).length">
diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index 6349debd..655b34a0 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -95,7 +95,7 @@
 
           <ion-card>
             <ion-card-header>
-              <ion-card-title>{{ translate("Generate Feed") }}</ion-card-title>
+              <ion-card-title>{{ translate("Feed") }}</ion-card-title>
             </ion-card-header>
             <ion-item button detail :disabled="!isMaargJobFound('GEN_BRKD_ORDITM_FEED')" @click="viewMaargJobConfiguration('GEN_BRKD_ORDITM_FEED')">
               <ion-label class="ion-text-wrap">{{ translate("Generate Brokered order items feed") }}</ion-label>