Merge branch 'main' into hotwax#254

ymaheshwari1 · Dec 2, 2024 · ae113bf · ae113bf
2 parents 6d4252c + 945fd05
commit ae113bf
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 20 deletions.
diff --git a/firebase.json b/firebase.json
@@ -11,8 +11,25 @@
       "rewrites": [ {
         "source": "**",
         "destination": "/index.html"
-      } ]
-
+      } ],
+      "headers": [ {
+        "source": "**",
+        "headers": [ {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN"
+        },
+        {
+          "key": "Content-Security-Policy",
+          "value": "default-src 'self';font-src 'self' data: *;script-src 'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com;img-src 'self' 'unsafe-inline' *.shopify.com javascript: ;style-src 'self' 'unsafe-inline' *; connect-src 'self' *"
+        },
+        {
+          "key": "strict-transport-security",
+          "value": "max-age=31536000; includeSubDomains"
+        },{
+          "key": "Permissions-Policy",
+          "value": "camera=self"
+        } ]
+      }]
     },
     {
       "target": "dev",
@@ -25,8 +42,25 @@
       "rewrites": [ {
         "source": "**",
         "destination": "/index.html"
-      } ]
-
+      } ],
+      "headers": [ {
+        "source": "**",
+        "headers": [ {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN"
+        },
+        {
+          "key": "Content-Security-Policy",
+          "value": "default-src 'self';font-src 'self' data: *;script-src 'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com;img-src 'self' 'unsafe-inline' *.shopify.com javascript: ;style-src 'self' 'unsafe-inline' *; connect-src 'self' *"
+        },
+        {
+          "key": "strict-transport-security",
+          "value": "max-age=31536000; includeSubDomains"
+        },{
+          "key": "Permissions-Policy",
+          "value": "camera=self"
+        } ]
+      }]
     },
     {
       "target": "uat",
@@ -39,7 +73,25 @@
       "rewrites": [ {
         "source": "**",
         "destination": "/index.html"
-      } ]
+      } ],
+      "headers": [ {
+        "source": "**",
+        "headers": [ {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN"
+        },
+        {
+          "key": "Content-Security-Policy",
+          "value": "default-src 'self';font-src 'self' data: *;script-src 'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com;img-src 'self' 'unsafe-inline' *.shopify.com javascript: ;style-src 'self' 'unsafe-inline' *; connect-src 'self' *"
+        },
+        {
+          "key": "strict-transport-security",
+          "value": "max-age=31536000; includeSubDomains"
+        },{
+          "key": "Permissions-Policy",
+          "value": "camera=self"
+        } ]
+      }]
     }
   ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "order-routing-rules",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "description": "An Ionic project",
   "scripts": {

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -62,6 +62,7 @@
   "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 update rule information": "Failed to update rule information",
   "Failed to schedule service": "Failed to schedule service",
   "Fetching filters and inventory rules": "Fetching filters and inventory rules",
   "Fetching runs": "Fetching runs",
@@ -114,6 +115,7 @@
   "Order priority": "Order priority",
   "Order Rule Filters": "Order Rule Filters",
   "Order Rule Sort": "Order Rule Sort",
+  "Order rule information updated": "Order rule information updated",
   "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.",
   "Origin Facility Group": "Origin Facility Group",

diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
@@ -34,12 +34,14 @@ const actions: ActionTree<UtilState, RootState> = {
 
         if(enums["ORD_FILTER_PRM_TYPE"]) {
           Object.values(enums["ORD_FILTER_PRM_TYPE"]).reduce((filters: any, filter: any) => {
-            filters[filter.enumId + "_EXCLUDED"] = {
-              "enumId": filter.enumId + "_EXCLUDED",
-              "enumTypeId": filter.enumTypeId,
-              "enumCode": filter.enumCode + "_excluded",
-              "sequenceNum": 5,
-              "description": filter.description
+            if (!filter.enumId.includes("_EXCLUDED")) {
+              filters[filter.enumId + "_EXCLUDED"] = {
+                "enumId": filter.enumId + "_EXCLUDED",
+                "enumTypeId": filter.enumTypeId,
+                "enumCode": filter.enumCode + "_excluded",
+                "sequenceNum": 5,
+                "description": filter.description
+              }
             }
 
             return filters;

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
@@ -790,9 +790,9 @@ async function addInventoryRule() {
 
 function isFacilityGroupSelected(facilityGroupId: string, type: string) {
   if(type === "excluded") {
-    return facilityGroupId == getFilterValue(inventoryRuleFilterOptions.value, conditionFilterEnums, 'FACILITY_GROUP').fieldValue
+    return facilityGroupId == getFilterValue(inventoryRuleFilterOptions.value, conditionFilterEnums, 'FACILITY_GROUP')?.fieldValue
   } else {
-    return facilityGroupId == getFilterValue(inventoryRuleFilterOptions.value, conditionFilterEnums, 'FACILITY_GROUP_EXCLUDED').fieldValue
+    return facilityGroupId == getFilterValue(inventoryRuleFilterOptions.value, conditionFilterEnums, 'FACILITY_GROUP_EXCLUDED')?.fieldValue
   }
 }
 
@@ -1084,14 +1084,34 @@ async function editRuleName() {
   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
+async function updateRuleName(routingRuleId: string) {
+  let isUpdateRequired = false;
+
   currentRouting.value["rules"].map((inventoryRule: any) => {
     if(inventoryRule.routingRuleId === routingRuleId && inventoryRule.ruleName.trim() !== selectedRoutingRule.value.ruleName.trim()) {
-      hasUnsavedChanges.value = true
+      isUpdateRequired = true
     }
   })
-  isRuleNameUpdating.value = false;
+
+  if(isUpdateRequired) {
+    emitter.emit("presentLoader", { message: "Updating...", backdropDismiss: false })
+
+    let ruleId = await store.dispatch("orderRouting/updateRule", {
+      routingRuleId,
+      orderRoutingId: props.orderRoutingId,
+      ruleName: selectedRoutingRule.value.ruleName.trim()
+    })
+
+    if(ruleId) {
+      showToast(translate("Order rule information updated"))
+    } else {
+      showToast(translate("Failed to update rule information"))
+    }
+
+    emitter.emit("dismissLoader")
+  }
+
+  isRuleNameUpdating.value = false
 }
 
 async function cloneRule() {