Improved: set multivalued to always 'Y' and fetching ruleGroup with a…

…ctive status (hotwax#299)
amansinghbais · May 8, 2024 · a9b94cf · a9b94cf
1 parent 46c4895
commit a9b94cf
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/src/components/SelectConfigFacilitiesModal.vue b/src/components/SelectConfigFacilitiesModal.vue
@@ -101,7 +101,7 @@ async function saveFacilities() {
       "fieldName": "facilities",
       "operator": "in",
       "fieldValue": selectedFacilityValues.length > 1 ? selectedFacilityValues.join(",") : selectedFacilityValues[0],
-      "multiValued": selectedFacilityValues.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 

diff --git a/src/components/UpdateFacilityGroupModal.vue b/src/components/UpdateFacilityGroupModal.vue
@@ -130,7 +130,7 @@ async function saveFacilityGroups() {
       "fieldName": "facilityGroups",
       "operator": "in",
       "fieldValue": includedGroups.value?.length > 1 ? includedGroups.value.join(",") : includedGroups.value[0],
-      "multiValued": includedGroups.value?.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 
@@ -144,7 +144,7 @@ async function saveFacilityGroups() {
       "fieldName": "facilityGroups",
       "operator": "not-in",
       "fieldValue": excludedGroups.value?.length > 1 ? excludedGroups.value.join(",") : excludedGroups.value[0],
-      "multiValued": excludedGroups.value?.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 

diff --git a/src/components/UpdateProductFiltersModal.vue b/src/components/UpdateProductFiltersModal.vue
@@ -178,7 +178,7 @@ async function saveFilters() {
       "fieldName": props.searchfield,
       "operator": "in",
       "fieldValue": includedFilters.value?.length > 1 ? includedFilters.value.join(",") : includedFilters.value[0],
-      "multiValued": includedFilters.value?.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 
@@ -192,7 +192,7 @@ async function saveFilters() {
       "fieldName": props.searchfield,
       "operator": "not-in",
       "fieldValue": excludedFilters.value?.length > 1 ? excludedFilters.value.join(",") : excludedFilters.value[0],
-      "multiValued": excludedFilters.value?.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 

diff --git a/src/store/modules/rule/actions.ts b/src/store/modules/rule/actions.ts
@@ -15,7 +15,7 @@ const actions: ActionTree<RuleState, RootState> = {
     let resp;
 
     try {
-      resp = await RuleService.fetchRuleGroup({ ...payload, productStoreId: productStore.productStoreId })
+      resp = await RuleService.fetchRuleGroup({ ...payload, productStoreId: productStore.productStoreId, statusId: "ATP_RG_ACTIVE" })
 
       if(!hasError(resp) && resp.data.length) {
         ruleGroup = resp.data[0]

diff --git a/src/views/CreateSafetyStockRule.vue b/src/views/CreateSafetyStockRule.vue
@@ -153,7 +153,7 @@ function generateRuleConditions(ruleId: string) {
       "fieldName": "facilities",
       "operator": "in",
       "fieldValue": includedFacilityGroupIds.length > 1 ? includedFacilityGroupIds.join(",") : includedFacilityGroupIds[0],
-      "multiValued": includedFacilityGroupIds.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 
@@ -165,7 +165,7 @@ function generateRuleConditions(ruleId: string) {
       "fieldName": "facilities",
       "operator": "not-in",
       "fieldValue": excludedFacilityGroupIds.length > 1 ? excludedFacilityGroupIds.join(",") : excludedFacilityGroupIds[0],
-      "multiValued": excludedFacilityGroupIds.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 
@@ -178,7 +178,7 @@ function generateRuleConditions(ruleId: string) {
           "fieldName": filter,
           "operator": type === "included" ? "in" : "not-in",
           "fieldValue": value.length > 1 ? value.join(",") : value[0],
-          "multiValued": value.length > 1 ? "Y" : "N"
+          "multiValued": "Y"
         })
       }
     })

diff --git a/src/views/CreateShippingRule.vue b/src/views/CreateShippingRule.vue
@@ -247,7 +247,7 @@ function generateRuleConditions(ruleId: string) {
         "fieldName": "facilityGroups",
         "operator": "in",
         "fieldValue": includedFacilityGroupIds.length > 1 ? includedFacilityGroupIds.join(",") : includedFacilityGroupIds[0],
-        "multiValued": includedFacilityGroupIds.length > 1 ? "Y" : "N"
+        "multiValued": "Y"
       })
     }
 
@@ -259,7 +259,7 @@ function generateRuleConditions(ruleId: string) {
         "fieldName": "facilityGroups",
         "operator": "not-in",
         "fieldValue": excludedFacilityGroupIds.length > 1 ? excludedFacilityGroupIds.join(",") : excludedFacilityGroupIds[0],
-        "multiValued": excludedFacilityGroupIds.length > 1 ? "Y" : "N"
+        "multiValued": "Y"
       })
     }
   } else {
@@ -271,7 +271,7 @@ function generateRuleConditions(ruleId: string) {
         "fieldName": "facilities",
         "operator": "in",
         "fieldValue": selectedFacilites.length > 1 ? selectedFacilites.join(",") : selectedFacilites[0],
-        "multiValued": selectedFacilites.length > 1 ? "Y" : "N"
+        "multiValued": "Y"
       })
     }
   }
@@ -285,7 +285,7 @@ function generateRuleConditions(ruleId: string) {
           "fieldName": filter,
           "operator": type === "included" ? "in" : "not-in",
           "fieldValue": value.length > 1 ? value.join(",") : value[0],
-          "multiValued": value.length > 1 ? "Y" : "N"
+          "multiValued": "Y"
         })
       }
     })

diff --git a/src/views/CreateStorePickupRule.vue b/src/views/CreateStorePickupRule.vue
@@ -247,7 +247,7 @@ function generateRuleConditions(ruleId: string) {
         "fieldName": "facilities",
         "operator": "in",
         "fieldValue": includedFacilityGroupIds.length > 1 ? includedFacilityGroupIds.join(",") : includedFacilityGroupIds[0],
-        "multiValued": includedFacilityGroupIds.length > 1 ? "Y" : "N"
+        "multiValued": "Y"
       })
     }
 
@@ -259,7 +259,7 @@ function generateRuleConditions(ruleId: string) {
         "fieldName": "facilities",
         "operator": "not-in",
         "fieldValue": excludedFacilityGroupIds.length > 1 ? excludedFacilityGroupIds.join(",") : excludedFacilityGroupIds[0],
-        "multiValued": excludedFacilityGroupIds.length > 1 ? "Y" : "N"
+        "multiValued": "Y"
       })
     }
   } else {
@@ -271,7 +271,7 @@ function generateRuleConditions(ruleId: string) {
         "fieldName": "facilities",
         "operator": "in",
         "fieldValue": selectedFacilites.length > 1 ? selectedFacilites.join(",") : selectedFacilites[0],
-        "multiValued": selectedFacilites.length > 1 ? "Y" : "N"
+        "multiValued": "Y"
       })
     }
   }
@@ -285,7 +285,7 @@ function generateRuleConditions(ruleId: string) {
           "fieldName": filter,
           "operator": type === "included" ? "in" : "not-in",
           "fieldValue": value.length > 1 ? value.join(",") : value[0],
-          "multiValued": value.length > 1 ? "Y" : "N"
+          "multiValued": "Y"
         })
       }
     })

diff --git a/src/views/CreateThresholdRule.vue b/src/views/CreateThresholdRule.vue
@@ -141,7 +141,7 @@ function generateRuleConditions(ruleId: string) {
       "fieldName": "facilities",
       "operator": "in",
       "fieldValue": selectedFacilites.length > 1 ? selectedFacilites.join(",") : selectedFacilites[0],
-      "multiValued": selectedFacilites.length > 1 ? "Y" : "N"
+      "multiValued": "Y"
     })
   }
 
@@ -154,7 +154,7 @@ function generateRuleConditions(ruleId: string) {
           "fieldName": filter,
           "operator": type === "included" ? "in" : "not-in",
           "fieldValue": value.length > 1 ? value.join(",") : value[0],
-          "multiValued": value.length > 1 ? "Y" : "N"
+          "multiValued": "Y"
         })
       }
     })