From 214b588975c9ce91c64363a311ef5e92be19f5f6 Mon Sep 17 00:00:00 2001
From: prashant singh rathore <prashantsinghrathore29@gmail.com>
Date: Wed, 3 Aug 2022 11:32:09 +0530
Subject: [PATCH 1/8] Implemented: additional job actions, to job config
 component(#364tt29)

---
 src/components/JobConfiguration.vue | 108 ++++++++++++++++++++++++++--
 1 file changed, 104 insertions(+), 4 deletions(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index c38eeb53..5a854bff 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -70,13 +70,40 @@
       <ion-button expand="block" @click="saveChanges()">{{ $t("Save changes") }}</ion-button>
     </div>
   </section>
+  <ion-list class="row">
+    <ion-item class="column" slot="start" @click="viewJobHistory(currentJob)" button>
+      <ion-icon slot="start" :icon="timeOutline" />
+      {{ $t("History") }}
+    </ion-item>
+
+    <ion-item class="column" slot="end" @click="runNow(title, currentJob)" button>
+      <ion-icon slot="start" :icon="flashOutline" />
+      {{ $t("Run now") }}
+    </ion-item>
+  </ion-list>
+
+  <ion-list class="row">
+    <ion-item class="column" slot="start" @click="copyJobInformation(currentJob)" button>
+      <ion-icon slot="start"  :icon="copyOutline" />
+      {{ $t("Copy details") }}
+    </ion-item>
+
+    <ion-item class="column" slot="end" @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
+      <ion-icon slot="start" :icon="pinOutline" />
+      {{ $t("Pin job") }}
+      <ion-checkbox updatePinnedJobs :checked=checked slot="end"></ion-checkbox>
+    </ion-item>
+  </ion-list>
+
 </template>
 
 <script lang="ts">
 import { defineComponent } from "vue";
 import {
+  alertController,
   IonBadge,
   IonButton,
+  IonCheckbox,
   IonContent,
   IonDatetime,
   IonIcon,
@@ -86,15 +113,20 @@ import {
   IonModal,
   IonSelect,
   IonSelectOption,
-  alertController
+  modalController,
 } from "@ionic/vue";
 import {
   calendarClearOutline,
+  flashOutline,
+  copyOutline,
   timeOutline,
   timerOutline,
   syncOutline,
-  personCircleOutline
+  personCircleOutline,
+  pinOutline,
 } from "ionicons/icons";
+import JobHistoryModal from '@/components/JobHistoryModal.vue'
+import { Plugins } from '@capacitor/core';
 import { handleDateTimeInput, showToast } from "@/utils";
 import { mapGetters, useStore } from "vuex";
 import { DateTime } from 'luxon';
@@ -115,7 +147,8 @@ export default defineComponent({
     IonList,
     IonModal,
     IonSelect,
-    IonSelectOption
+    IonSelectOption,
+    IonCheckbox
   },
   data() {
     return {
@@ -127,6 +160,9 @@ export default defineComponent({
   props: ["title", "status", "type"],
   computed: {
     ...mapGetters({
+      getEnumDescription: 'job/getEnumDescription',
+      getEnumName: 'job/getEnumName',
+      getPinnedJobs: 'user/getPinnedJobs',
       getJobStatus: 'job/getJobStatus',
       getJob: 'job/getJob',
       shopifyConfigId: 'user/getShopifyConfigId',
@@ -286,6 +322,60 @@ export default defineComponent({
       if (job) {
         job.runTime = handleDateTimeInput(ev['detail'].value)
       }
+    },
+    async viewJobHistory(job: any) {
+      const jobHistoryModal = await modalController.create({
+        component: JobHistoryModal,
+        componentProps: { currentJob: job }
+      });
+      await jobHistoryModal.present();
+      jobHistoryModal.onDidDismiss().then(() => {
+        jobHistoryModal.dismiss({ dismissed: true });
+      })
+    },
+    async runNow(header: string, job: any) {
+      const jobAlert = await alertController
+        .create({
+          header,
+          message: this.$t('This job will be scheduled to run as soon as possible. There may not be enough time to revert this action.', {space: '<br/><br/>'}),
+          buttons: [
+            {
+              text: this.$t("Cancel"),
+              role: 'cancel',
+            },
+            {
+              text: this.$t('Run now'),
+              handler: () => {
+                if (job) {
+                  this.store.dispatch('job/runServiceNow', job)
+                }
+              }
+            }
+          ]
+        });
+
+      return jobAlert.present();
+    },
+    async copyJobInformation(job: any) {
+      const { Clipboard } = Plugins;
+      const jobDetails = `jobId: ${job.jobId}, jobName: ${this.getEnumName(job.systemJobEnumId)}, jobDescription: ${this.getEnumDescription(job.systemJobEnumId)}`;
+
+      await Clipboard.write({
+        string: jobDetails
+      }).then(() => {
+        showToast(this.$t("Copied job details to clipboard"));
+      })
+    },
+    async updatePinnedJobs(enumId: any) {
+      const pinnedJobs = new Set(this.getPinnedJobs);
+      if(pinnedJobs.has(enumId)) {
+        pinnedJobs.delete(enumId);
+        await this.store.dispatch('user/updatePinnedJobs', { pinnedJobs: [...pinnedJobs] });
+        emitter.emit("pinnedJobsUpdated", enumId);
+      } else {
+        pinnedJobs.add(enumId);
+        await this.store.dispatch('user/updatePinnedJobs', { pinnedJobs: [...pinnedJobs] });
+      }
     }
   },
   setup() {
@@ -294,12 +384,15 @@ export default defineComponent({
 
     return {
       calendarClearOutline,
+      copyOutline,
+      flashOutline,
       timeOutline,
       timerOutline,
       store,
       router,
       syncOutline,
-      personCircleOutline
+      personCircleOutline,
+      pinOutline
     };
   }
 });
@@ -310,6 +403,13 @@ ion-list {
   margin: var(--spacer-base) 0;
 }
 
+.row {
+  display: flex;
+}
+.column {
+  flex: 50%;
+}
+
 .actions > ion-button {
   margin: var(--spacer-sm);
 }

From c71605b33613c93ef866a084df699c29941f2e3f Mon Sep 17 00:00:00 2001
From: prashant singh rathore <prashantsinghrathore29@gmail.com>
Date: Wed, 3 Aug 2022 12:20:08 +0530
Subject: [PATCH 2/8] Improved: check to pin and unpin job from job config
 component(#364tt29)

---
 src/components/JobConfiguration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index 5a854bff..b5c7b2de 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -91,7 +91,7 @@
     <ion-item class="column" slot="end" @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
       <ion-icon slot="start" :icon="pinOutline" />
       {{ $t("Pin job") }}
-      <ion-checkbox updatePinnedJobs :checked=checked slot="end"></ion-checkbox>
+      <ion-checkbox :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" slot="end"></ion-checkbox>
     </ion-item>
   </ion-list>
 

From 1eb3ea16017d2f3d3c725a764adb044ccb77e39f Mon Sep 17 00:00:00 2001
From: prashant singh rathore <prashantsinghrathore29@gmail.com>
Date: Wed, 3 Aug 2022 17:21:59 +0530
Subject: [PATCH 3/8] Improved: markup and its css property(#364tt29)

---
 src/components/JobConfiguration.vue | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index b5c7b2de..a99141ce 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -70,37 +70,31 @@
       <ion-button expand="block" @click="saveChanges()">{{ $t("Save changes") }}</ion-button>
     </div>
   </section>
-  <ion-list class="row">
-    <ion-item class="column" slot="start" @click="viewJobHistory(currentJob)" button>
+  <div class="job-actions">
+    <ion-item slot="start" @click="viewJobHistory(currentJob)" button>
       <ion-icon slot="start" :icon="timeOutline" />
       {{ $t("History") }}
     </ion-item>
-
-    <ion-item class="column" slot="end" @click="runNow(title, currentJob)" button>
+    <ion-item slot="end" @click="runNow(title, currentJob)" button>
       <ion-icon slot="start" :icon="flashOutline" />
       {{ $t("Run now") }}
     </ion-item>
-  </ion-list>
-
-  <ion-list class="row">
-    <ion-item class="column" slot="start" @click="copyJobInformation(currentJob)" button>
+    <ion-item slot="start" @click="copyJobInformation(currentJob)" button>
       <ion-icon slot="start"  :icon="copyOutline" />
       {{ $t("Copy details") }}
     </ion-item>
-
-    <ion-item class="column" slot="end" @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
+    <ion-item slot="end" @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
       <ion-icon slot="start" :icon="pinOutline" />
       {{ $t("Pin job") }}
       <ion-checkbox :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" slot="end"></ion-checkbox>
     </ion-item>
-  </ion-list>
+  </div>
 
 </template>
 
 <script lang="ts">
 import { defineComponent } from "vue";
 import {
-  alertController,
   IonBadge,
   IonButton,
   IonCheckbox,
@@ -113,6 +107,7 @@ import {
   IonModal,
   IonSelect,
   IonSelectOption,
+  alertController,
   modalController,
 } from "@ionic/vue";
 import {
@@ -403,13 +398,6 @@ ion-list {
   margin: var(--spacer-base) 0;
 }
 
-.row {
-  display: flex;
-}
-.column {
-  flex: 50%;
-}
-
 .actions > ion-button {
   margin: var(--spacer-sm);
 }
@@ -428,7 +416,19 @@ ion-list {
 
   .mobile-only {
     display: none;
-  }  
+  }
+  .job-actions {
+  margin-top: var(--spacer-sm);
+  row-gap: var(--spacer-sm);
+  display: flex;
+  flex-wrap: wrap;
+}
+.job-actions > ion-item {
+  flex-basis: 50%;
+}
+.job-actions > ion-item > ion-checkbox{
+ margin: unset;
+}
 }
 
 ion-label:nth-child(3) {

From 8036f1f2cc20c7f2ea802ea3708d53db67bccc72 Mon Sep 17 00:00:00 2001
From: prashant singh rathore <prashantsinghrathore29@gmail.com>
Date: Wed, 3 Aug 2022 18:37:51 +0530
Subject: [PATCH 4/8] Improved: indentation and apply self closing tag for
 ion-checkbox(#364tt29)

---
 src/components/JobConfiguration.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index a99141ce..581605dd 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -86,7 +86,7 @@
     <ion-item slot="end" @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
       <ion-icon slot="start" :icon="pinOutline" />
       {{ $t("Pin job") }}
-      <ion-checkbox :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" slot="end"></ion-checkbox>
+      <ion-checkbox :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" slot="end" />
     </ion-item>
   </div>
 
@@ -418,17 +418,17 @@ ion-list {
     display: none;
   }
   .job-actions {
-  margin-top: var(--spacer-sm);
-  row-gap: var(--spacer-sm);
-  display: flex;
-  flex-wrap: wrap;
-}
-.job-actions > ion-item {
-  flex-basis: 50%;
-}
-.job-actions > ion-item > ion-checkbox{
- margin: unset;
-}
+    margin-top: var(--spacer-sm);
+    row-gap: var(--spacer-sm);
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .job-actions > ion-item {
+    flex-basis: 50%;
+  }
+  .job-actions > ion-item > ion-checkbox{
+    margin: unset;
+  }
 }
 
 ion-label:nth-child(3) {

From 497af0b884a438d7f6bcda244ca508990c204877 Mon Sep 17 00:00:00 2001
From: prashant singh rathore <prashantsinghrathore29@gmail.com>
Date: Mon, 8 Aug 2022 11:49:53 +0530
Subject: [PATCH 5/8] Improved: css property and Arrange code in the right
 manner (#364tt29) Implemented 'align-items: end' property instead of 'margin:
 unset'

---
 src/components/JobConfiguration.vue | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index 581605dd..72d6d058 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -70,23 +70,23 @@
       <ion-button expand="block" @click="saveChanges()">{{ $t("Save changes") }}</ion-button>
     </div>
   </section>
-  <div class="job-actions">
-    <ion-item slot="start" @click="viewJobHistory(currentJob)" button>
+  <div class="more-actions">
+    <ion-item @click="viewJobHistory(currentJob)" button>
       <ion-icon slot="start" :icon="timeOutline" />
       {{ $t("History") }}
     </ion-item>
-    <ion-item slot="end" @click="runNow(title, currentJob)" button>
+    <ion-item @click="runNow(title, currentJob)" button>
       <ion-icon slot="start" :icon="flashOutline" />
       {{ $t("Run now") }}
     </ion-item>
-    <ion-item slot="start" @click="copyJobInformation(currentJob)" button>
+    <ion-item @click="copyJobInformation(currentJob)" button>
       <ion-icon slot="start"  :icon="copyOutline" />
       {{ $t("Copy details") }}
     </ion-item>
-    <ion-item slot="end" @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
+    <ion-item @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
       <ion-icon slot="start" :icon="pinOutline" />
       {{ $t("Pin job") }}
-      <ion-checkbox :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" slot="end" />
+      <ion-checkbox slot="end" :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" />
     </ion-item>
   </div>
 
@@ -417,18 +417,16 @@ ion-list {
   .mobile-only {
     display: none;
   }
-  .job-actions {
-    margin-top: var(--spacer-sm);
-    row-gap: var(--spacer-sm);
+  .more-actions {
     display: flex;
     flex-wrap: wrap;
+    align-items: end;
+    row-gap: var(--spacer-sm);
+    margin-top: var(--spacer-sm);
   }
-  .job-actions > ion-item {
+  .more-actions > ion-item {
     flex-basis: 50%;
   }
-  .job-actions > ion-item > ion-checkbox{
-    margin: unset;
-  }
 }
 
 ion-label:nth-child(3) {

From b5e19375d46a5cedfd2d56e6c7a1be95d949be8c Mon Sep 17 00:00:00 2001
From: Disha Talreja <dishatalreja1202@gmail.com>
Date: Tue, 16 Aug 2022 11:30:59 +0530
Subject: [PATCH 6/8] Fixed: error in console when there are no pinned
 jobs(#364tt29)

---
 src/components/JobConfiguration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index 72d6d058..345ed440 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -86,7 +86,7 @@
     <ion-item @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
       <ion-icon slot="start" :icon="pinOutline" />
       {{ $t("Pin job") }}
-      <ion-checkbox slot="end" :checked="getPinnedJobs.includes(currentJob.systemJobEnumId)" />
+      <ion-checkbox slot="end" :checked="getPinnedJobs ? getPinnedJobs.includes(currentJob.systemJobEnumId) : false" />
     </ion-item>
   </div>
 

From 1c65532d64d3a6909fb252d71899490ca8b5518d Mon Sep 17 00:00:00 2001
From: Disha Talreja <dishatalreja1202@gmail.com>
Date: Thu, 18 Aug 2022 11:27:54 +0530
Subject: [PATCH 7/8] Updated css to select all items in more-actions(#364tt29)

---
 src/components/JobConfiguration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index 345ed440..d36257d4 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -424,7 +424,7 @@ ion-list {
     row-gap: var(--spacer-sm);
     margin-top: var(--spacer-sm);
   }
-  .more-actions > ion-item {
+  .more-actions > * {
     flex-basis: 50%;
   }
 }

From 88ac79436bda15dce006232d8fd5f450673fb20d Mon Sep 17 00:00:00 2001
From: Disha Talreja <dishatalreja1202@gmail.com>
Date: Fri, 26 Aug 2022 15:32:03 +0530
Subject: [PATCH 8/8] Improved variable name and updated condition for
 pinnedJobs(#364tt29)

---
 src/components/JobConfiguration.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
index d36257d4..e18b5c68 100644
--- a/src/components/JobConfiguration.vue
+++ b/src/components/JobConfiguration.vue
@@ -86,7 +86,7 @@
     <ion-item @click="updatePinnedJobs(currentJob?.systemJobEnumId)" button>
       <ion-icon slot="start" :icon="pinOutline" />
       {{ $t("Pin job") }}
-      <ion-checkbox slot="end" :checked="getPinnedJobs ? getPinnedJobs.includes(currentJob.systemJobEnumId) : false" />
+      <ion-checkbox slot="end" :checked="pinnedJobs && pinnedJobs.includes(currentJob.systemJobEnumId)" />
     </ion-item>
   </div>
 
@@ -157,7 +157,7 @@ export default defineComponent({
     ...mapGetters({
       getEnumDescription: 'job/getEnumDescription',
       getEnumName: 'job/getEnumName',
-      getPinnedJobs: 'user/getPinnedJobs',
+      pinnedJobs: 'user/getPinnedJobs',
       getJobStatus: 'job/getJobStatus',
       getJob: 'job/getJob',
       shopifyConfigId: 'user/getShopifyConfigId',
@@ -362,7 +362,7 @@ export default defineComponent({
       })
     },
     async updatePinnedJobs(enumId: any) {
-      const pinnedJobs = new Set(this.getPinnedJobs);
+      const pinnedJobs = new Set(this.pinnedJobs);
       if(pinnedJobs.has(enumId)) {
         pinnedJobs.delete(enumId);
         await this.store.dispatch('user/updatePinnedJobs', { pinnedJobs: [...pinnedJobs] });