Merge pull request #372 from amansinghbais/#371

Improved: operator to be used in rule condition for facilities / channels selection (#371)
hotwax · Sep 2, 2024 · 88043ec · 88043ec
2 parents b9eb606 + 8ff154f
commit 88043ec
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/components/RuleItem.vue b/src/components/RuleItem.vue
@@ -48,13 +48,13 @@
               <ion-label>{{ translate("Facilities") }}</ion-label>
             </ion-item-divider>
 
-            <ion-item v-if="isRuleConditionAvailable('ENTCT_ATP_FAC_GROUPS', 'facilityGroupId', 'contains')">
+            <ion-item v-if="isRuleConditionAvailable('ENTCT_ATP_FAC_GROUPS', 'facilityGroupId', 'in')">
               <ion-icon slot="start" :icon="checkmarkDoneCircleOutline"/>
-              <ion-label class="ion-text-wrap">{{ getRuleConditions("ENTCT_ATP_FAC_GROUPS", "facilityGroupId", "contains") }}</ion-label>
+              <ion-label class="ion-text-wrap">{{ getRuleConditions("ENTCT_ATP_FAC_GROUPS", "facilityGroupId", "in") }}</ion-label>
             </ion-item>
-            <ion-item lines="full" v-if="isRuleConditionAvailable('ENTCT_ATP_FAC_GROUPS', 'facilityGroupId', 'not-contains')">
+            <ion-item lines="full" v-if="isRuleConditionAvailable('ENTCT_ATP_FAC_GROUPS', 'facilityGroupId', 'not-in')">
               <ion-icon slot="start" :icon="closeCircleOutline"/>
-              <ion-label class="ion-text-wrap">{{ getRuleConditions("ENTCT_ATP_FAC_GROUPS", "facilityGroupId", "not-contains") }}</ion-label>
+              <ion-label class="ion-text-wrap">{{ getRuleConditions("ENTCT_ATP_FAC_GROUPS", "facilityGroupId", "not-in") }}</ion-label>
             </ion-item>
           </template>
 

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -109,15 +109,15 @@ const generateRuleConditions = (ruleId: string, conditionTypeEnumId: string, app
       "ruleId": ruleId,
       conditionTypeEnumId,
       "fieldName": conditionTypeEnumId === "ENTCT_ATP_FACILITIES" ? "facilityId" : "facilityGroupId",
-      "operator": "contains",
+      "operator": "in",
       "fieldValue": "ALL"
     })
   } else if(conditionTypeEnumId === "ENTCT_ATP_FACILITIES") {
     conditions.push({
       "ruleId": ruleId,
       conditionTypeEnumId,
       "fieldName": "facilityId",
-      "operator": "contains",
+      "operator": "in",
       "fieldValue": selectedFac.length ? selectedFac.join(",") : ""
     })
   } else {
@@ -127,7 +127,7 @@ const generateRuleConditions = (ruleId: string, conditionTypeEnumId: string, app
         "ruleId": ruleId,
         "conditionTypeEnumId": "ENTCT_ATP_FAC_GROUPS",
         "fieldName": "facilityGroupId",
-        "operator": "contains",
+        "operator": "in",
         "fieldValue": includedFacilityGroupIds.join(",")
       })
     }
@@ -138,7 +138,7 @@ const generateRuleConditions = (ruleId: string, conditionTypeEnumId: string, app
         "ruleId": ruleId,
         "conditionTypeEnumId": "ENTCT_ATP_FAC_GROUPS",
         "fieldName": "facilityGroupId",
-        "operator": "not-contains",
+        "operator": "not-in",
         "fieldValue": excludedFacilityGroupIds.join(",")
       })
     }

diff --git a/src/views/CreateUpdateSafetyStockRule.vue b/src/views/CreateUpdateSafetyStockRule.vue
@@ -139,13 +139,13 @@ onIonViewDidEnter(async () => {
         formData.value.ruleName = currentRule.value.ruleName;
         formData.value.safetyStock = currentRule.value.ruleActions[0]?.fieldValue ? currentRule.value.ruleActions[0].fieldValue : ''
 
-        const includedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "contains")
+        const includedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "in")
         if(includedGroups?.fieldValue === "ALL") formData.value.areAllFacilitiesSelected = true;
         else {
           const includedGroupIds = includedGroups?.fieldValue ? includedGroups.fieldValue.split(",") : []
           formData.value.selectedFacilityGroups.included = facilityGroups.value.filter((group: any) => includedGroupIds.includes(group.facilityGroupId));
 
-          const excludedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "not-contains")
+          const excludedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "not-in")
           const excludedGroupIds = excludedGroups?.fieldValue ? excludedGroups.fieldValue.split(",") : []
           formData.value.selectedFacilityGroups.excluded = facilityGroups.value.filter((group: any) => excludedGroupIds.includes(group.facilityGroupId));
         }

diff --git a/src/views/CreateUpdateShippingRule.vue b/src/views/CreateUpdateShippingRule.vue
@@ -162,13 +162,13 @@ onIonViewDidEnter(async () => {
         formData.value.isBrokeringAllowed = currentRule.value.ruleActions[0]?.fieldValue === "Y" ? true : false;
 
         if(selectedSegment.value === "RG_SHIPPING_FACILITY") {
-          const includedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "contains")
+          const includedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "in")
           if(includedGroups?.fieldValue === "ALL") formData.value.areAllSelected = true
           else {
             const includedGroupIds = includedGroups?.fieldValue ? includedGroups.fieldValue.split(",") : []
             formData.value.selectedFacilityGroups.included = facilityGroups.value.filter((group: any) => includedGroupIds.includes(group.facilityGroupId));
 
-            const excludedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "not-contains")
+            const excludedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "not-in")
             const excludedGroupIds = excludedGroups?.fieldValue ? excludedGroups.fieldValue.split(",") : []
             formData.value.selectedFacilityGroups.excluded = facilityGroups.value.filter((group: any) => excludedGroupIds.includes(group.facilityGroupId));
           }

diff --git a/src/views/CreateUpdateStorePickupRule.vue b/src/views/CreateUpdateStorePickupRule.vue
@@ -163,13 +163,13 @@ onIonViewDidEnter(async () => {
         formData.value.isPickupAllowed = currentRule.value.ruleActions[0]?.fieldValue === "Y" ? true : false;
 
         if(selectedSegment.value === "RG_PICKUP_FACILITY") {
-          const includedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "contains")
+          const includedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "in")
           if(includedGroups?.fieldValue === "ALL") formData.value.areAllSelected = true
           else {
             const includedGroupIds = includedGroups?.fieldValue ? includedGroups.fieldValue.split(",") : []
             formData.value.selectedFacilityGroups.included = facilityGroups.value.filter((group: any) => includedGroupIds.includes(group.facilityGroupId));
 
-            const excludedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "not-contains")
+            const excludedGroups = currentRule.value.ruleConditions.find((condition: any) => condition.conditionTypeEnumId === "ENTCT_ATP_FAC_GROUPS" && condition.operator === "not-in")
             const excludedGroupIds = excludedGroups?.fieldValue ? excludedGroups.fieldValue.split(",") : []
             formData.value.selectedFacilityGroups.excluded = facilityGroups.value.filter((group: any) => excludedGroupIds.includes(group.facilityGroupId));
           }