Sync single-sign-in branch with main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "order-routing-rules",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "private": true,
   "description": "An Ionic project",
   "scripts": {

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() {

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>

src/components/ArchivedRoutingModal.vue

@@ -72,6 +72,6 @@ async function updateOrderRouting(routing: Route, fieldToUpdate: string, value:
   props.saveRoutings([{
     ...routing,
     [fieldToUpdate]: value
-  }])
+  }, ...routings.value])
 }
 </script>

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();
+        }
+      }
     }]
   })
 

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 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",
   "Failed to schedule service": "Failed to schedule service",
@@ -96,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.",

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
   });
 }
 

src/store/modules/orderRouting/actions.ts

@@ -164,13 +164,14 @@
   },
 
   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"] = currentRoute["rules"]?.length ? sortSequence(currentRoute["rules"]) : []
       } else {
         throw resp.data
       }
@@ -185,18 +186,11 @@
     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
@@ -223,7 +217,7 @@
     commit(types.ORDER_ROUTING_HISTORY_UPDATED, routingHistory)
   },
 
   async deleteRoutingFilters({ dispatch }, payload) {
     let hasAllFiltersDeletedSuccessfully = true;
     try {
       // As discussed, we can't make parallel api calls, hence using for loop to make api calls
@@ -243,7 +237,7 @@
     return hasAllFiltersDeletedSuccessfully
   },
 
   async updateRouting({ dispatch }, payload) {
     let orderRoutingId = ''
     try {
       const resp = await OrderRoutingService.updateRouting(payload)
@@ -294,7 +288,7 @@
     return routingRuleId;
   },
 
   async deleteRuleConditions({ dispatch }, payload) {
     // TODO: check if we can call request in parallel for delete operation
     let hasAllConditionsDeletedSuccessfully = true;
     try {
@@ -314,7 +308,7 @@
     return hasAllConditionsDeletedSuccessfully
   },
 
   async deleteRuleActions({ dispatch }, payload) {
     // TODO: check if we can call request in parallel for delete operation
     let hasAllActionsDeletedSuccessfully = true;
     try {
@@ -377,7 +371,7 @@
     return rulesInformation[routingRuleId] ? JSON.parse(JSON.stringify(rulesInformation[routingRuleId])) : {}
   },
 
   async updateRule({ dispatch }, payload) {
     let routingRuleId = ''
     try {
       const resp = await OrderRoutingService.updateRule(payload)

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;
 }