From 52b337bce7ed4725a392db35802c61c2ac366069 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 19 Apr 2024 11:45:07 +0530
Subject: [PATCH 01/22] Improved: UI to remove the block button to fab button
 for saving changes(#197)

---
 src/views/BrokeringQuery.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 6d10f1f..9e29084 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -10,7 +10,6 @@
               <ion-icon :icon="chevronUpOutline" />
             </ion-chip>
           </ion-item>
-          <ion-button class="ion-margin" expand="block" :disabled="!hasUnsavedChanges" @click="save">{{ translate("Save changes") }}</ion-button>
           <ion-item>
             <ion-icon slot="start" :icon="pulseOutline" />
             <ion-select :label="translate('Status')" interface="popover" :interface-options="{ subHeader: translate('Status') }" :value="routingStatus" @ionChange="updateOrderRouting($event.detail.value)">
@@ -259,13 +258,19 @@
           </ion-button>
         </section>
       </main>
+
+      <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+        <ion-fab-button :disabled="!hasUnsavedChanges" @click="save">
+          <ion-icon :icon="saveOutline" />
+        </ion-fab-button>
+      </ion-fab>
     </ion-content>
   </ion-page>
 </template>
 
 <script setup lang="ts">
-import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonChip, IonContent, IonIcon, IonInput, IonItem, IonItemDivider, IonItemGroup, IonLabel, IonList, IonNote, IonPage, IonReorder, IonReorderGroup, IonSelect, IonSelectOption, IonToggle, alertController, modalController, onIonViewWillEnter, popoverController } from "@ionic/vue";
-import { addCircleOutline, bookmarkOutline, chevronUpOutline, copyOutline, filterOutline, golfOutline, optionsOutline, playForwardOutline, pulseOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
+import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonChip, IonContent, IonFab, IonFabButton, IonIcon, IonInput, IonItem, IonItemDivider, IonItemGroup, IonLabel, IonList, IonNote, IonPage, IonReorder, IonReorderGroup, IonSelect, IonSelectOption, IonToggle, alertController, modalController, onIonViewWillEnter, popoverController } from "@ionic/vue";
+import { addCircleOutline, bookmarkOutline, chevronUpOutline, copyOutline, filterOutline, golfOutline, optionsOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
 import { onBeforeRouteLeave, useRouter } from "vue-router";
 import { computed, defineProps, ref } from "vue";
 import store from "@/store";

From a547bc67621ec639ae0b04230d251126288ddc30 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 19 Apr 2024 12:57:20 +0530
Subject: [PATCH 02/22] Improved: UI for the rules page as per the figma(#197)

- Added support to rename the routing name
- Moved the style to change the input background to app level styling file
- Added icons to rename rules button
---
 src/theme/variables.css      |  4 ++
 src/views/BrokeringQuery.vue | 81 +++++++++++++++++++++++++++++++-----
 src/views/BrokeringRoute.vue |  6 +--
 3 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/src/theme/variables.css b/src/theme/variables.css
index fe2d458..c4dafed 100644
--- a/src/theme/variables.css
+++ b/src/theme/variables.css
@@ -262,6 +262,10 @@ http://ionicframework.com/docs/theming/ */
   text-align: center;
 }
 
+ion-input.name {
+  --background: var(--ion-color-light)
+}
+
 .pointer {
   cursor: pointer;
 }
diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 9e29084..bb7a6d1 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -4,12 +4,24 @@
       <main>
         <section id="order-filters" class="menu">
           <ion-item lines="none">
-            <ion-label><h1>{{ currentRouting.routingName }}</h1></ion-label>
+            <ion-label>
+              <h1 v-show="!isRouteNameUpdating">{{ currentRouting.routingName }}</h1>
+              <!-- Added class as we can't change the background of ion-input with css property, and we need to change the background to show the user that now this value is editable -->
+              <ion-input ref="routeNameRef" :class="isRouteNameUpdating ? 'name' : ''" v-show="isRouteNameUpdating" aria-label="route name" v-model="routeName"></ion-input>
+            </ion-label>
             <ion-chip slot="end" outline @click="router.go(-1)">
               {{ getRouteIndex() }}
               <ion-icon :icon="chevronUpOutline" />
             </ion-chip>
           </ion-item>
+          <ion-button class="ion-margin-start" color="medium" fill="outline" size="small" @click="isRouteNameUpdating ? updateRouteName() : editRouteName()">
+            <ion-icon slot="start" :icon="isRouteNameUpdating ? saveOutline : pencilOutline" />
+            {{ isRouteNameUpdating ? translate("Save") : translate("Rename") }}
+          </ion-button>
+          <!-- <ion-button color="medium" fill="outline" size="small">
+            <ion-icon slot="start" :icon="copyOutline" />
+            {{ translate("Clone") }}
+          </ion-button> -->
           <ion-item>
             <ion-icon slot="start" :icon="pulseOutline" />
             <ion-select :label="translate('Status')" interface="popover" :interface-options="{ subHeader: translate('Status') }" :value="routingStatus" @ionChange="updateOrderRouting($event.detail.value)">
@@ -113,7 +125,7 @@
                   <h1 v-show="!isRuleNameUpdating">{{ selectedRoutingRule.ruleName }}</h1>
                 </ion-label>
                 <!-- Added class as we can't change the background of ion-input with css property, and we need to change the background to show the user that now this value is editable -->
-                <ion-input :class="isRuleNameUpdating ? 'ruleName' : ''" v-show="isRuleNameUpdating" aria-label="rule name" v-model="selectedRoutingRule.ruleName"></ion-input>
+                <ion-input :class="isRuleNameUpdating ? 'name' : ''" v-show="isRuleNameUpdating" aria-label="rule name" v-model="selectedRoutingRule.ruleName"></ion-input>
               </ion-item>
               <div>
                 <ion-item>
@@ -125,7 +137,10 @@
                   </ion-select>
                 </ion-item>
                 <ion-item>
-                  <ion-button slot="end" size="small" @click="isRuleNameUpdating = !isRuleNameUpdating; updateRuleName(selectedRoutingRule.routingRuleId)" fill="outline">{{ isRuleNameUpdating ? translate("Save") : translate("Rename") }}</ion-button>
+                  <ion-button slot="end" size="small" @click="isRuleNameUpdating = !isRuleNameUpdating; updateRuleName(selectedRoutingRule.routingRuleId)" fill="outline">
+                    <ion-icon slot="start" :icon="isRuleNameUpdating ? saveOutline : pencilOutline" />
+                    {{ isRuleNameUpdating ? translate("Save") : translate("Rename") }}
+                  </ion-button>
                   <ion-button slot="end" size="small" @click="cloneRule" fill="outline">
                     <ion-icon slot="start" :icon="copyOutline"/>
                     {{ translate("Clone") }}
@@ -270,12 +285,12 @@
 
 <script setup lang="ts">
 import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonChip, IonContent, IonFab, IonFabButton, IonIcon, IonInput, IonItem, IonItemDivider, IonItemGroup, IonLabel, IonList, IonNote, IonPage, IonReorder, IonReorderGroup, IonSelect, IonSelectOption, IonToggle, alertController, modalController, onIonViewWillEnter, popoverController } from "@ionic/vue";
-import { addCircleOutline, bookmarkOutline, chevronUpOutline, copyOutline, filterOutline, golfOutline, optionsOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
+import { addCircleOutline, bookmarkOutline, chevronUpOutline, copyOutline, filterOutline, golfOutline, optionsOutline, pencilOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
 import { onBeforeRouteLeave, useRouter } from "vue-router";
-import { computed, defineProps, ref } from "vue";
+import { computed, defineProps, nextTick, ref } from "vue";
 import store from "@/store";
 import AddInventoryFilterOptionsModal from "@/components/AddInventoryFilterOptionsModal.vue";
-import { getDateAndTimeShort, showToast, sortSequence } from "@/utils";
+import { getDateAndTimeShort, hasError, showToast, sortSequence } from "@/utils";
 import { Rule } from "@/types";
 import AddOrderRouteFilterOptions from "@/components/AddOrderRouteFilterOptions.vue"
 import PromiseFilterPopover from "@/components/PromiseFilterPopover.vue"
@@ -284,6 +299,7 @@ import { DateTime } from "luxon";
 import emitter from "@/event-bus";
 import { translate } from "@/i18n";
 import RoutingHistoryModal from "@/components/RoutingHistoryModal.vue"
+import { OrderRoutingService } from "@/services/RoutingService";
 
 const router = useRouter();
 const props = defineProps({
@@ -319,7 +335,10 @@ let rulesInformation = ref({}) as any
 let hasUnsavedChanges = ref(false)
 let isRuleNameUpdating = ref(false)
 let routingStatus = ref("")
+let routeName = ref("")
+let isRouteNameUpdating = ref(false)
 
+const routeNameRef = ref()
 const operatorRef = ref()
 const measurementRef = ref()
 
@@ -343,6 +362,8 @@ onIonViewWillEnter(async () => {
     await fetchRuleInformation(currentRuleId.value || inventoryRules.value[0].routingRuleId);
   }
 
+  routeName.value = currentRouting.value["routingName"] ? currentRouting.value["routingName"] : ""
+
   routingStatus.value = currentRouting.value.statusId
   emitter.emit("dismissLoader")
 })
@@ -444,6 +465,50 @@ async function initializeInventoryRules(rule: any) {
   }) || ""
 }
 
+async function editRouteName() {
+  isRouteNameUpdating.value = !isRouteNameUpdating.value;
+  // Waiting for DOM updations before focus inside the text-area, as it is conditionally rendered in the DOM
+  await nextTick()
+  routeNameRef.value.$el.setFocus();
+}
+
+async function updateRouteName() {
+  if(routeName.value.trim() && routeName.value.trim() !== currentRouting.value.routingName.trim()) {
+
+    emitter.emit("presentLoader", { message: "Updating...", backdropDismiss: false })
+
+    const payload = {
+      orderRoutingId: props.orderRoutingId,
+      routingName: routeName.value
+    }
+
+    let orderRoutingId = ''
+    try {
+      const resp = await OrderRoutingService.updateRouting(payload);
+
+      if(!hasError(resp) && resp.data.orderRoutingId) {
+        orderRoutingId = resp.data.orderRoutingId
+        showToast(translate("Order routing information updated"))
+      } else {
+        throw resp.data
+      }
+    } catch(err) {
+      showToast(translate("Failed to update routing information"))
+      logger.error(err);
+    }
+
+    if(orderRoutingId) {
+      await store.dispatch("orderRouting/setCurrentOrderRouting", { ...currentRouting.value, routingName: routeName.value })
+    } else {
+      routeName.value = currentRouting.value.routingName.trim()
+    }
+
+    emitter.emit("dismissLoader")
+  }
+
+  isRouteNameUpdating.value = false
+}
+
 async function fetchRuleInformation(routingRuleId: string) {
   // Changing the value to false, as when fetching the information initially or after changing the rule we should stop the process of name updation
   isRuleNameUpdating.value = false
@@ -1251,10 +1316,6 @@ ion-chip > ion-select {
   min-height: unset;
 }
 
-ion-input.ruleName {
-  --background: var(--ion-color-light)
-}
-
 .empty-state {
   text-align: center;
 }
diff --git a/src/views/BrokeringRoute.vue b/src/views/BrokeringRoute.vue
index ec99dea..8919835 100644
--- a/src/views/BrokeringRoute.vue
+++ b/src/views/BrokeringRoute.vue
@@ -17,7 +17,7 @@
                 <ion-label>
                   <h1 v-show="!isGroupNameUpdating">{{ groupName }}</h1>
                   <!-- Added class as we can't change the background of ion-input with css property, and we need to change the background to show the user that now this value is editable -->
-                  <ion-input ref="groupNameRef" :class="isGroupNameUpdating ? 'groupName' : ''" v-show="isGroupNameUpdating" aria-label="group name" v-model="groupName"></ion-input>
+                  <ion-input ref="groupNameRef" :class="isGroupNameUpdating ? 'name' : ''" v-show="isGroupNameUpdating" aria-label="group name" v-model="groupName"></ion-input>
                   <p>{{ currentRoutingGroup.routingGroupId }}</p>
                 </ion-label>
                 <div>
@@ -913,8 +913,4 @@ ion-card > ion-button[expand="block"] {
   margin-inline: var(--spacer-sm);
   margin-bottom: var(--spacer-sm);
 }
-
-ion-input.groupName {
-  --background: var(--ion-color-light)
-}
 </style>

From 3041753eab35572049757003799bea225dfb2569 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 19 Apr 2024 14:19:57 +0530
Subject: [PATCH 03/22] Improved: check for auto cancel days to not allow empty
 values(#197)

---
 src/views/BrokeringQuery.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index bb7a6d1..3bde815 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -698,7 +698,8 @@ async function updateAutoCancelDays() {
     {
       text: translate("Save"),
       handler: (data) => {
-        if(data?.autoCancelDays || data.autoCancelDays === 0) {
+        // Added check for `>= 0` as we not need to allow negative values for autoCancelDays value
+        if(data?.autoCancelDays && data.autoCancelDays >= 0) {
           if(inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id]?.actionValue) {
             inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id].actionValue = data.autoCancelDays
           } else {

From f0363a7ab3856eb80a72b89920e54665d3f20ee5 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 19 Apr 2024 14:37:12 +0530
Subject: [PATCH 04/22] Implemented: functionality to clear the
 autoCancelDays(#197)

---
 src/views/BrokeringQuery.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 3bde815..3ed9340 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -253,11 +253,19 @@
                     </ion-select>
                   </ion-item>
                   <ion-item lines="none">
-                    <ion-toggle :checked="inventoryRuleActions[actionEnums['RM_AUTO_CANCEL_DATE'].id]?.actionValue" @ionChange="updateClearAutoCancelDays($event.detail.checked)">{{ translate("Clear auto cancel days") }}</ion-toggle>
+                    <ion-toggle :checked="inventoryRuleActions[actionEnums['RM_AUTO_CANCEL_DATE'].id]?.actionValue" @ionChange="clearAutoCancelDays($event.detail.checked)">{{ translate("Clear auto cancel days") }}</ion-toggle>
                   </ion-item>
                   <ion-item lines="none" v-show="!inventoryRuleActions[actionEnums['RM_AUTO_CANCEL_DATE'].id]?.actionValue">
                     <ion-label>{{ translate("Auto cancel days") }}</ion-label>
-                    <ion-chip outline @click="updateAutoCancelDays()">{{ inventoryRuleActions[actionEnums["AUTO_CANCEL_DAYS"].id]?.actionValue ? `${inventoryRuleActions[actionEnums["AUTO_CANCEL_DAYS"].id].actionValue} days` : translate("select days") }}</ion-chip>
+                    <ion-chip outline @click="updateAutoCancelDays()">
+                      <template v-if="inventoryRuleActions[actionEnums['AUTO_CANCEL_DAYS'].id]?.actionValue">
+                        <ion-icon :icon="closeCircleOutline" @click.stop="removeAutoCancelDays()"/>
+                        <ion-label>{{ `${inventoryRuleActions[actionEnums["AUTO_CANCEL_DAYS"].id].actionValue} days` }}</ion-label>
+                      </template>
+                      <template v-else>
+                        {{ translate("select days") }}
+                      </template>
+                    </ion-chip>
                   </ion-item>
                 </ion-card>
               </div>
@@ -285,7 +293,7 @@
 
 <script setup lang="ts">
 import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonChip, IonContent, IonFab, IonFabButton, IonIcon, IonInput, IonItem, IonItemDivider, IonItemGroup, IonLabel, IonList, IonNote, IonPage, IonReorder, IonReorderGroup, IonSelect, IonSelectOption, IonToggle, alertController, modalController, onIonViewWillEnter, popoverController } from "@ionic/vue";
-import { addCircleOutline, bookmarkOutline, chevronUpOutline, copyOutline, filterOutline, golfOutline, optionsOutline, pencilOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
+import { addCircleOutline, bookmarkOutline, chevronUpOutline, closeCircleOutline, copyOutline, filterOutline, golfOutline, optionsOutline, pencilOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
 import { onBeforeRouteLeave, useRouter } from "vue-router";
 import { computed, defineProps, nextTick, ref } from "vue";
 import store from "@/store";
@@ -681,6 +689,11 @@ function updateRuleActionValue(value: string) {
   updateRule()
 }
 
+async function removeAutoCancelDays() {
+  delete inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id]
+  updateRule()
+}
+
 async function updateAutoCancelDays() {
   const alert = await alertController.create({
     header: translate("Auto cancel days"),
@@ -860,7 +873,7 @@ function updateRuleFilterValue(event: CustomEvent, id: string) {
   updateRule()
 }
 
-function updateClearAutoCancelDays(checked: any) {
+function clearAutoCancelDays(checked: any) {
   if(inventoryRuleActions.value[actionEnums["RM_AUTO_CANCEL_DATE"].id]) {
     inventoryRuleActions.value[actionEnums["RM_AUTO_CANCEL_DATE"].id].actionValue = checked
   } else {

From 48b6bd9339fd17788f83b818525da49342941889 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 19 Apr 2024 15:02:50 +0530
Subject: [PATCH 05/22] Improved: the button positioning for inventory
 rules(#197)

---
 src/views/BrokeringQuery.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 3ed9340..60bda94 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -137,14 +137,16 @@
                   </ion-select>
                 </ion-item>
                 <ion-item>
-                  <ion-button slot="end" size="small" @click="isRuleNameUpdating = !isRuleNameUpdating; updateRuleName(selectedRoutingRule.routingRuleId)" fill="outline">
-                    <ion-icon slot="start" :icon="isRuleNameUpdating ? saveOutline : pencilOutline" />
-                    {{ isRuleNameUpdating ? translate("Save") : translate("Rename") }}
-                  </ion-button>
-                  <ion-button slot="end" size="small" @click="cloneRule" fill="outline">
-                    <ion-icon slot="start" :icon="copyOutline"/>
-                    {{ translate("Clone") }}
-                  </ion-button>
+                  <div slot="end">
+                    <ion-button size="small" @click="isRuleNameUpdating = !isRuleNameUpdating; updateRuleName(selectedRoutingRule.routingRuleId)" fill="outline">
+                      <ion-icon slot="start" :icon="isRuleNameUpdating ? saveOutline : pencilOutline" />
+                      {{ isRuleNameUpdating ? translate("Save") : translate("Rename") }}
+                    </ion-button>
+                    <ion-button size="small" @click="cloneRule" fill="outline">
+                      <ion-icon slot="start" :icon="copyOutline"/>
+                      {{ translate("Clone") }}
+                    </ion-button>
+                  </div>
                 </ion-item>
               </div>
             </ion-card>

From 86a11b269139c36ba5ab50f48827a1629fa99c6b Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 22 Apr 2024 14:19:03 +0530
Subject: [PATCH 06/22] Implemented: support to autofocus on the input when
 updating rule name

---
 src/views/BrokeringQuery.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 60bda94..f4b2b09 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -125,7 +125,7 @@
                   <h1 v-show="!isRuleNameUpdating">{{ selectedRoutingRule.ruleName }}</h1>
                 </ion-label>
                 <!-- Added class as we can't change the background of ion-input with css property, and we need to change the background to show the user that now this value is editable -->
-                <ion-input :class="isRuleNameUpdating ? 'name' : ''" v-show="isRuleNameUpdating" aria-label="rule name" v-model="selectedRoutingRule.ruleName"></ion-input>
+                <ion-input ref="ruleNameRef" :class="isRuleNameUpdating ? 'name' : ''" v-show="isRuleNameUpdating" aria-label="rule name" v-model="selectedRoutingRule.ruleName"></ion-input>
               </ion-item>
               <div>
                 <ion-item>
@@ -138,7 +138,7 @@
                 </ion-item>
                 <ion-item>
                   <div slot="end">
-                    <ion-button size="small" @click="isRuleNameUpdating = !isRuleNameUpdating; updateRuleName(selectedRoutingRule.routingRuleId)" fill="outline">
+                    <ion-button size="small" @click="isRuleNameUpdating ? updateRuleName(selectedRoutingRule.routingRuleId) : editRuleName()" fill="outline">
                       <ion-icon slot="start" :icon="isRuleNameUpdating ? saveOutline : pencilOutline" />
                       {{ isRuleNameUpdating ? translate("Save") : translate("Rename") }}
                     </ion-button>
@@ -351,6 +351,7 @@ let isRouteNameUpdating = ref(false)
 const routeNameRef = ref()
 const operatorRef = ref()
 const measurementRef = ref()
+const ruleNameRef = ref()
 
 onIonViewWillEnter(async () => {
   emitter.emit("presentLoader", { message: "Fetching filters and inventory rules", backdropDismiss: false })
@@ -902,6 +903,13 @@ function updateRuleStatus(event: CustomEvent, routingRuleId: string) {
   hasUnsavedChanges.value = true
 }
 
+async function editRuleName() {
+  isRuleNameUpdating.value = !isRuleNameUpdating.value;
+  // Waiting for DOM updations before focus inside the text-area, as it is conditionally rendered in the DOM
+  await nextTick()
+  ruleNameRef.value.$el.setFocus();
+}
+
 function updateRuleName(routingRuleId: string) {
   // Checking the updated name with the original object, as we have reference to inventoryRules that will also gets updated on updating selectedRoutingRule
   currentRouting.value["rules"].map((inventoryRule: any) => {
@@ -909,6 +917,7 @@ function updateRuleName(routingRuleId: string) {
       hasUnsavedChanges.value = true
     }
   })
+  isRuleNameUpdating.value = false;
 }
 
 async function cloneRule() {

From 419e0dadc0fe8274f8b79a27d98df6c8d3533466 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 22 Apr 2024 16:42:42 +0530
Subject: [PATCH 07/22] Fixed: case to have a default value for cronExpression
 when updating group status and cron expresssion is not present

---
 src/views/BrokeringRoute.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/BrokeringRoute.vue b/src/views/BrokeringRoute.vue
index 8919835..125be4f 100644
--- a/src/views/BrokeringRoute.vue
+++ b/src/views/BrokeringRoute.vue
@@ -477,12 +477,14 @@ async function updateGroupStatus(event: CustomEvent) {
 
   const payload = {
     routingGroupId: props.routingGroupId,
-    paused: job.value.paused
+    paused: job.value.paused,
+    cronExpression: job.value.cronExpression || "0 0 0 * * ?"
   }
 
   try {
     const resp = await OrderRoutingService.scheduleBrokering(payload)
     if(!hasError(resp)){
+      job.value.cronExpression = job.value.cronExpression || "0 0 0 * * ?"
       showToast(translate("Group status updated"))
     } else {
       throw resp.data

From cbea8d4d758818e1662b9687f524d88c593ffff8 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 22 Apr 2024 17:51:58 +0530
Subject: [PATCH 08/22] Improved: app version in package and lock file for
 minor release(v1.2.0)

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e7d429..a4ed432 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "order-routing-rules",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "order-routing-rules",
-      "version": "1.1.0",
+      "version": "1.2.0",
       "dependencies": {
         "@capacitor/android": "^2.4.7",
         "@capacitor/core": "^2.4.7",
diff --git a/package.json b/package.json
index 482601e..4fe6de6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "order-routing-rules",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "description": "An Ionic project",
   "scripts": {

From 0adadce4bb468933e9124c8a853feec3430cb773 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Thu, 25 Apr 2024 15:26:54 +0530
Subject: [PATCH 09/22] Fixed: issue regarding decimal numbers can be entered
 in alert input(#197)

---
 src/views/BrokeringQuery.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index f4b2b09..1f799cb 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -705,7 +705,13 @@ async function updateAutoCancelDays() {
       placeholder: translate("auto cancel days"),
       type: "number",
       min: 0,
-      value: inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id]?.actionValue
+      value: inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id]?.actionValue,
+      attributes: {
+        // Added check to not allow mainly .(period) and other special characters to be entered in the alert input
+        onkeydown: ($event: any) => {
+          if(/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
+        }
+      }
     }],
     buttons: [{
       text: translate("Cancel"),
@@ -726,10 +732,8 @@ async function updateAutoCancelDays() {
             }
           }
         } else {
-          // If we have received an empty/undefined value for autoCancelDays then considered that it needs to be removed
-          if(inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id]?.actionValue) {
-            delete inventoryRuleActions.value[actionEnums["AUTO_CANCEL_DAYS"].id]
-          }
+          showToast(translate("Enter a valid value"))
+          return false;
         }
         updateRule()
       }

From 8f1bd2f799c4e4aaa0b5aed114ca0a35f8921d84 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Thu, 25 Apr 2024 15:45:52 +0530
Subject: [PATCH 10/22] Fixed: issue in alert input to not allow entering
 special character and updated the condition to prefill the alert input for
 promise date filter(#197)

---
 src/components/PromiseFilterPopover.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/PromiseFilterPopover.vue b/src/components/PromiseFilterPopover.vue
index 21b391b..694619e 100644
--- a/src/components/PromiseFilterPopover.vue
+++ b/src/components/PromiseFilterPopover.vue
@@ -53,7 +53,13 @@ async function updatePromiseDate(header = '', isPastDuration = false) {
       placeholder: translate("duration"),
       min: 0,
       type: "number",
-      value: props.value?.replace("-", "")
+      value: props.value > 0 && !isPastDuration ? props.value : props.value < 0 && isPastDuration ? props.value?.replace("-", "") : '', // Prefill the value only when the previously selected option and current selection matches
+      attributes: {
+        // Added check to not allow mainly .(period) and other special characters to be entered in the alert input
+        onkeydown: ($event: any) => {
+          if(/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
+        }
+      }
     }]
   })
 

From ebc02bdf199a9c7d977096fc302ed85cb48ff804 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Thu, 25 Apr 2024 16:54:18 +0530
Subject: [PATCH 11/22] Fixed: archived routing cards to be dispalyed correctly
 after unarchiving a rule(#181)

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

diff --git a/src/components/ArchivedRoutingModal.vue b/src/components/ArchivedRoutingModal.vue
index 35ae17a..b03afda 100644
--- a/src/components/ArchivedRoutingModal.vue
+++ b/src/components/ArchivedRoutingModal.vue
@@ -72,6 +72,6 @@ async function updateOrderRouting(routing: Route, fieldToUpdate: string, value:
   props.saveRoutings([{
     ...routing,
     [fieldToUpdate]: value
-  }])
+  }, ...routings.value])
 }
 </script>

From 8d2f7dc8f25c46c13f9e00c2c5a7bdb167d39842 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Thu, 25 Apr 2024 17:29:42 +0530
Subject: [PATCH 12/22] Improved: app version in package and lock file for
 patch release(v1.2.1)

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4ed432..2c4e7d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "order-routing-rules",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "order-routing-rules",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "dependencies": {
         "@capacitor/android": "^2.4.7",
         "@capacitor/core": "^2.4.7",
diff --git a/package.json b/package.json
index 4fe6de6..4a2b531 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "order-routing-rules",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "description": "An Ionic project",
   "scripts": {

From ebf073a47c1fa6e997c4c9ed876500bef060fa92 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 26 Apr 2024 18:48:28 +0530
Subject: [PATCH 13/22] Fixed: case to handle the case when enum data is
 missing for specific type

Added empty state in option selection modal when the enum data is missing
Added check to display the code if the enum label is missing
---
 src/components/AddInventoryFilterOptionsModal.vue | 7 +++++--
 src/components/AddOrderRouteFilterOptions.vue     | 7 +++++--
 src/views/BrokeringQuery.vue                      | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/AddInventoryFilterOptionsModal.vue b/src/components/AddInventoryFilterOptionsModal.vue
index 48130d8..9c3753f 100644
--- a/src/components/AddInventoryFilterOptionsModal.vue
+++ b/src/components/AddInventoryFilterOptionsModal.vue
@@ -9,7 +9,10 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <ion-list>
+      <div v-if="!enumerations.length" class="empty-state">
+        <p>{{ translate(`Failed to fetch ${props.label?.toLowerCase()} options`) }}</p>
+      </div>
+      <ion-list v-else>
         <ion-item v-for="condition in enumerations" :key="condition.enumId">
           <ion-checkbox :checked="isConditionOptionSelected(condition.enumCode)" @ionChange="addConditionOption(condition)">{{ condition.description || condition.enumCode }}</ion-checkbox>
         </ion-item>
@@ -66,7 +69,7 @@ const associatedOptions = { IIP_PROXIMITY: { enum: "IIP_MSMNT_SYSTEM", defaultVa
 
 onMounted(() => {
   inventoryRuleConditions.value = props.ruleConditions ? JSON.parse(JSON.stringify(props.ruleConditions)) : {}
-  enumerations.value = Object.values(enums.value[props.parentEnumId]).filter((enumeration: any) => !hiddenOptions.includes(enumeration.enumId))
+  enumerations.value = enums.value[props.parentEnumId] ? Object.values(enums.value[props.parentEnumId]).filter((enumeration: any) => !hiddenOptions.includes(enumeration.enumId)) : []
 })
 
 function checkFilters() {
diff --git a/src/components/AddOrderRouteFilterOptions.vue b/src/components/AddOrderRouteFilterOptions.vue
index a173721..1f6b913 100644
--- a/src/components/AddOrderRouteFilterOptions.vue
+++ b/src/components/AddOrderRouteFilterOptions.vue
@@ -9,8 +9,11 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <ion-list>
-        <ion-item v-for="sort in Object.values(enums[props.parentEnumId] ? enums[props.parentEnumId] : {})" :key="sort.enumId">
+      <div v-if="!enums[props.parentEnumId]" class="empty-state">
+        <p>{{ translate(`Failed to fetch ${$props.label?.toLowerCase()} options`) }}</p>
+      </div>
+      <ion-list v-else>
+        <ion-item v-for="sort in Object.values(enums[props.parentEnumId])" :key="sort.enumId">
           <ion-checkbox :checked="isSortOptionSelected(sort.enumCode)" @ionChange="addSortOption(sort)">{{ sort.description || sort.enumCode }}</ion-checkbox>
         </ion-item>
       </ion-list>
diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 1f799cb..1b44ee1 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -793,7 +793,7 @@ function getSelectedValue(options: any, enumerations: any, parameter: string) {
 
 function getLabel(parentType: string, code: string) {
   const enumerations = enums.value[parentType]
-  const enumInfo: any = Object.values(enumerations).find((enumeration: any) => enumeration.enumCode === code)
+  const enumInfo: any = enumerations ? Object.values(enumerations).find((enumeration: any) => enumeration.enumCode === code) : null
 
   return enumInfo?.description
 }

From 676cf56354ee13f6387f79b5ab77e2feb007af79 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 26 Apr 2024 18:57:35 +0530
Subject: [PATCH 14/22] Improved: locale file to include static text

---
 src/locales/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/locales/en.json b/src/locales/en.json
index ea01790..202b698 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -48,6 +48,8 @@
   "Failed to create brokering run": "Failed to create brokering run",
   "Failed to create inventory rule": "Failed to create inventory rule",
   "Failed to create order routing": "Failed to create order routing",
+  "Failed to fetch filter options": "Failed to fetch filter options",
+  "Failed to fetch sort options": "Failed to fetch sort options",
   "Failed to update group information": "Failed to update group information",
   "Failed to update group status": "Failed to update group status",
   "Failed to schedule service": "Failed to schedule service",

From 4993d4b5fd3f3333ac782464c938b24a5c8c5742 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 26 Apr 2024 19:08:05 +0530
Subject: [PATCH 15/22] Improved: check for finding the enum data before
 fetching the value

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

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 1b44ee1..27d6813 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -770,7 +770,7 @@ function getPromiseDateValue() {
 }
 
 function getFilterValue(options: any, enums: any, parameter: string) {
-  return options?.[enums[parameter].code]
+  return enums[parameter] ? options?.[enums[parameter].code] : undefined
 }
 
 function getSelectedValue(options: any, enumerations: any, parameter: string) {

From 63fafdb2eee1adc775a9e7e1f368673e4d387d28 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 29 Apr 2024 12:41:36 +0530
Subject: [PATCH 16/22] Fixed: issue in reordering the inventory rules

---
 src/store/modules/orderRouting/actions.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/orderRouting/actions.ts b/src/store/modules/orderRouting/actions.ts
index 67f6f17..23bb8a5 100644
--- a/src/store/modules/orderRouting/actions.ts
+++ b/src/store/modules/orderRouting/actions.ts
@@ -164,13 +164,14 @@ const actions: ActionTree<OrderRoutingState, RootState> = {
   },
 
   async fetchCurrentOrderRouting({ dispatch }, orderRoutingId) {
-    let currentRoute = {}
+    let currentRoute = {} as any
 
     try {
       const resp = await OrderRoutingService.fetchOrderRouting(orderRoutingId);
 
       if(!hasError(resp) && resp.data) {
         currentRoute = resp.data
+        currentRoute["rules"] = sortSequence(currentRoute["rules"])
       } else {
         throw resp.data
       }

From 7f6c7286aa4c42292440cd44550f9560089fcb00 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 29 Apr 2024 12:51:10 +0530
Subject: [PATCH 17/22] Fixed: condition to add a null check before sorting
 rules

---
 src/store/modules/orderRouting/actions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/orderRouting/actions.ts b/src/store/modules/orderRouting/actions.ts
index 23bb8a5..96a8a51 100644
--- a/src/store/modules/orderRouting/actions.ts
+++ b/src/store/modules/orderRouting/actions.ts
@@ -171,7 +171,7 @@ const actions: ActionTree<OrderRoutingState, RootState> = {
 
       if(!hasError(resp) && resp.data) {
         currentRoute = resp.data
-        currentRoute["rules"] = sortSequence(currentRoute["rules"])
+        currentRoute["rules"] = currentRoute["rules"]?.length ? sortSequence(currentRoute["rules"]) : []
       } else {
         throw resp.data
       }

From 273eaf0a1707a01c14d60db0ac311119359d8866 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 10 May 2024 11:10:55 +0530
Subject: [PATCH 18/22] Improved: UI for back feature from the query page(#124)

Removed the back button feature from the chip
Added header with a standard back button and displayed routing name inside the header
Added default href for back button to move to the group details page
---
 src/views/BrokeringQuery.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 27d6813..a9dbe65 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -1,5 +1,13 @@
 <template>
   <ion-page>
+    <ion-header>
+      <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-back-button :default-href="`/tabs/brokering/${currentRoutingGroup.routingGroupId}/routes`" />
+        </ion-buttons>
+        <ion-title>{{ currentRouting.routingName }}</ion-title>
+      </ion-toolbar>
+    </ion-header>
     <ion-content>
       <main>
         <section id="order-filters" class="menu">
@@ -9,9 +17,8 @@
               <!-- Added class as we can't change the background of ion-input with css property, and we need to change the background to show the user that now this value is editable -->
               <ion-input ref="routeNameRef" :class="isRouteNameUpdating ? 'name' : ''" v-show="isRouteNameUpdating" aria-label="route name" v-model="routeName"></ion-input>
             </ion-label>
-            <ion-chip slot="end" outline @click="router.go(-1)">
+            <ion-chip slot="end" outline>
               {{ getRouteIndex() }}
-              <ion-icon :icon="chevronUpOutline" />
             </ion-chip>
           </ion-item>
           <ion-button class="ion-margin-start" color="medium" fill="outline" size="small" @click="isRouteNameUpdating ? updateRouteName() : editRouteName()">
@@ -294,8 +301,8 @@
 </template>
 
 <script setup lang="ts">
-import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonChip, IonContent, IonFab, IonFabButton, IonIcon, IonInput, IonItem, IonItemDivider, IonItemGroup, IonLabel, IonList, IonNote, IonPage, IonReorder, IonReorderGroup, IonSelect, IonSelectOption, IonToggle, alertController, modalController, onIonViewWillEnter, popoverController } from "@ionic/vue";
-import { addCircleOutline, bookmarkOutline, chevronUpOutline, closeCircleOutline, copyOutline, filterOutline, golfOutline, optionsOutline, pencilOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
+import { IonBackButton, IonButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardTitle, IonChip, IonContent, IonFab, IonFabButton, IonHeader, IonIcon, IonInput, IonItem, IonItemDivider, IonItemGroup, IonLabel, IonList, IonNote, IonPage, IonReorder, IonReorderGroup, IonSelect, IonSelectOption, IonTitle, IonToggle, IonToolbar, alertController, modalController, onIonViewWillEnter, popoverController } from "@ionic/vue";
+import { addCircleOutline, bookmarkOutline, closeCircleOutline, copyOutline, filterOutline, golfOutline, optionsOutline, pencilOutline, playForwardOutline, pulseOutline, saveOutline, swapVerticalOutline, timeOutline } from "ionicons/icons"
 import { onBeforeRouteLeave, useRouter } from "vue-router";
 import { computed, defineProps, nextTick, ref } from "vue";
 import store from "@/store";

From 1023d639f12764f62866ec23de2fb2562e883114 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 10 May 2024 11:20:57 +0530
Subject: [PATCH 19/22] Improved: rule add button to add slot end on the
 icon(#124)

---
 src/locales/en.json          | 3 ++-
 src/views/BrokeringQuery.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 202b698..037607f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -48,7 +48,7 @@
   "Failed to create brokering run": "Failed to create brokering run",
   "Failed to create inventory rule": "Failed to create inventory rule",
   "Failed to create order routing": "Failed to create order routing",
-  "Failed to fetch filter options": "Failed to fetch filter options",
+  "Failed to fetch filters options": "Failed to fetch filters options",
   "Failed to fetch sort options": "Failed to fetch sort options",
   "Failed to update group information": "Failed to update group information",
   "Failed to update group status": "Failed to update group status",
@@ -98,6 +98,7 @@
   "Order priority": "Order priority",
   "Order Rule Filters": "Order Rule Filters",
   "Order Rule Sort": "Order Rule Sort",
+  "Order routing information updated": "Order routing information updated",
   "Orders will be brokered based on order date if no sorting is specified.": "Orders will be brokered based on order date if no sorting is specified.",
   "operator": "operator",
   "Partial allocation cannot be disabled. Orders are filtered by item when filtering by promise date.": "Partial allocation cannot be disabled. Orders are filtered by item when filtering by promise date.",
diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index a9dbe65..85c784c 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -121,7 +121,7 @@
             </ion-list>
             <ion-button fill="outline" @click="addInventoryRule">
               {{ translate("Add inventory rule") }}
-              <ion-icon :icon="addCircleOutline"/>
+              <ion-icon :icon="addCircleOutline" slot="end"/>
             </ion-button>
           </section>
           <div v-if="selectedRoutingRule?.routingRuleId">

From 7009b5e82f13c0324b664c8a87fb42faa345c10d Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 13 May 2024 12:42:12 +0530
Subject: [PATCH 20/22] Implemented: support to fetch the latest routing
 history and fetch the history by startDate

---
 src/services/RoutingService.ts            | 10 ++++++----
 src/store/modules/orderRouting/actions.ts | 11 ++---------
 src/views/BrokeringRoute.vue              |  3 ++-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/services/RoutingService.ts b/src/services/RoutingService.ts
index e8ac61e..a8f426e 100644
--- a/src/services/RoutingService.ts
+++ b/src/services/RoutingService.ts
@@ -22,17 +22,19 @@ const fetchRoutingScheduleInformation = async (routingGroupId: string): Promise<
   });
 }
 
-const fetchRoutingHistory = async (routingGroupId: string): Promise<any> => {
+const fetchRoutingHistory = async (routingGroupId: string, params: any): Promise<any> => {
   return api({
     url: `groups/${routingGroupId}/routingRuns`,
-    method: "GET"
+    method: "GET",
+    params
   });
 }
 
-const fetchGroupHistory = async (jobName: string): Promise<any> => {
+const fetchGroupHistory = async (jobName: string, params: any): Promise<any> => {
   return api({
     url: `serviceJobRuns/${jobName}`,
-    method: "GET"
+    method: "GET",
+    params
   });
 }
 
diff --git a/src/store/modules/orderRouting/actions.ts b/src/store/modules/orderRouting/actions.ts
index 96a8a51..ffd93ea 100644
--- a/src/store/modules/orderRouting/actions.ts
+++ b/src/store/modules/orderRouting/actions.ts
@@ -186,18 +186,11 @@ const actions: ActionTree<OrderRoutingState, RootState> = {
     commit(types.ORDER_ROUTING_CURRENT_ROUTE_UPDATED, payload)
   },
 
-  async fetchRoutingHistory({ commit, state }, routingGroupId) {
-    const history = Object.values(state.routingHistory)[0] as any
-
-    // If the routing history for the current group is already available then don't fetch the history again
-    if(history?.length && history[0].routingGroupId === routingGroupId) {
-      return;
-    }
-
+  async fetchRoutingHistory({ commit }, routingGroupId) {
     let routingHistory = {}
 
     try {
-      const resp = await OrderRoutingService.fetchRoutingHistory(routingGroupId)
+      const resp = await OrderRoutingService.fetchRoutingHistory(routingGroupId, { orderByField: "startDate DESC" })
   
       if(!hasError(resp)) {
         // Sorting the history based on startTime, as we does not get the records in sorted order from api
diff --git a/src/views/BrokeringRoute.vue b/src/views/BrokeringRoute.vue
index 125be4f..804c0c7 100644
--- a/src/views/BrokeringRoute.vue
+++ b/src/views/BrokeringRoute.vue
@@ -338,7 +338,7 @@ async function fetchGroupHistory() {
   }
 
   try {
-    const resp = await OrderRoutingService.fetchGroupHistory(currentRoutingGroup.value.jobName)
+    const resp = await OrderRoutingService.fetchGroupHistory(currentRoutingGroup.value.jobName, { orderByField: "startTime DESC" })
 
     if(!hasError(resp)) {
       // Sorting the history based on startTime, as we does not get the records in sorted order from api
@@ -641,6 +641,7 @@ async function openArchivedRoutingModal() {
 }
 
 async function openRoutingHistoryModal(orderRoutingId: string, routingName: string) {
+  await store.dispatch("orderRouting/fetchRoutingHistory", props.routingGroupId)
   const routingHistoryModal = await modalController.create({
     component: RoutingHistoryModal,
     componentProps: { routingHistory: routingHistory.value[orderRoutingId], routingName, groupName: currentRoutingGroup.value.groupName }

From 36c5e3da0cff181f92a73e3e1d4a44c55238cd5c Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Mon, 13 May 2024 18:55:26 +0530
Subject: [PATCH 21/22] Fixed: issue of duplicate filters getting applied on
 the rules

Fetched the latest information after updating a rule so to pass the seqId when updating the same filter again
---
 src/views/BrokeringQuery.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 85c784c..ded1297 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -527,7 +527,7 @@ async function updateRouteName() {
   isRouteNameUpdating.value = false
 }
 
-async function fetchRuleInformation(routingRuleId: string) {
+async function fetchRuleInformation(routingRuleId: string, forceUpdate = false) {
   // Changing the value to false, as when fetching the information initially or after changing the rule we should stop the process of name updation
   isRuleNameUpdating.value = false
 
@@ -535,12 +535,12 @@ async function fetchRuleInformation(routingRuleId: string) {
 
   // When clicking the same enum again do not fetch its information
   // TODO: check behaviour when creating a new rule, when no rule exist and when already some rule exist and a rule is open
-  if(selectedRoutingRule.value.routingRuleId === routingRuleId) {
+  if(selectedRoutingRule.value.routingRuleId === routingRuleId && !forceUpdate) {
     return;
   }
 
   // Only fetch the rules information, if already not present, as we are updating rule values
-  if(!rulesInformation.value[routingRuleId]) {
+  if(!rulesInformation.value[routingRuleId] || forceUpdate) {
     rulesInformation.value[routingRuleId] = await store.dispatch("orderRouting/fetchInventoryRuleInformation", routingRuleId)
   }
 
@@ -1307,7 +1307,9 @@ async function save() {
   // Added check to not fetch any rule related information as when a new route will be created no rule will be available thus no need to fetch any other information
   if(currentRouting.value["rules"]?.length) {
     inventoryRules.value = sortSequence(JSON.parse(JSON.stringify(currentRouting.value["rules"])))
-    await fetchRuleInformation(currentRuleId.value);
+    // Passed true as when updating an existing rule we get seqIds in the response so to fetch the latest seqIds for the rule calling rule api again by passing true
+    // TODO: Need to update this logic by just updating the state instead of making an api call, this can also be handled when in the update api call we will get latest information again
+    await fetchRuleInformation(currentRuleId.value, true);
   }
 
   hasUnsavedChanges.value = false

From 5529ed8b72147430e3ec6ee0735982881b449bba Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Thu, 16 May 2024 11:23:53 +0530
Subject: [PATCH 22/22] Improved: code to fetch the latest group history on
 clicking view all button

---
 src/views/BrokeringRoute.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/BrokeringRoute.vue b/src/views/BrokeringRoute.vue
index 804c0c7..c1574c8 100644
--- a/src/views/BrokeringRoute.vue
+++ b/src/views/BrokeringRoute.vue
@@ -725,6 +725,7 @@ async function updateRoutingGroup(payload: any) {
 }
 
 async function showGroupHistory() {
+  await fetchGroupHistory()
   const groupHistoryModal = await modalController.create({
     component: GroupHistoryModal,
     componentProps: { groupHistory: groupHistory.value }