fix: filter issue with chips on CustomerParkScreen (#826)

* RM#87640
axelor · Dec 5, 2024 · 2cf0d78 · 2cf0d78
1 parent 380af1f
commit 2cf0d78
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/changelogs/unreleased/87640.json b/changelogs/unreleased/87640.json
@@ -0,0 +1,5 @@
+{
+  "title": "CustomerParkScreen: resolve filter issue with chips",
+  "type": "fix",
+  "packages": "intervention"
+}
diff --git a/packages/apps/intervention/src/api/equipment-api.js b/packages/apps/intervention/src/api/equipment-api.js
@@ -46,9 +46,29 @@ const createEquipmentsCriteria = ({
 
   if (inService != null) {
     criteria.push({
-      fieldName: 'inService',
-      operator: inService ? '=' : '!=',
-      value: true,
+      operator: 'or',
+      criteria: [
+        {
+          operator: 'and',
+          criteria: [
+            {
+              fieldName: 'typeSelect',
+              operator: '=',
+              value: Equipment?.typeSelect.Equipment,
+            },
+            {
+              fieldName: 'inService',
+              operator: inService ? '=' : '!=',
+              value: true,
+            },
+          ],
+        },
+        {
+          fieldName: 'typeSelect',
+          operator: '=',
+          value: Equipment?.typeSelect.Place,
+        },
+      ],
     });
   }
 
@@ -144,7 +164,7 @@ const createInterventionEquipmentToLinkCriteria = ({
 export async function searchEquipment({
   searchValue = null,
   page = 0,
-  inService,
+  inService = null,
   partnerId,
   parentPlaceId,
   noParent = false,

diff --git a/packages/apps/intervention/src/screens/equipment/CustomerParkScreen.tsx b/packages/apps/intervention/src/screens/equipment/CustomerParkScreen.tsx
@@ -89,7 +89,7 @@ const CustomerParkScreen = ({}) => {
         sliceFunctionDataNoParentName="noParent"
         fetchBranchData={branchId =>
           searchEquipmentApi({
-            inService: selectedStatus[0]?.key,
+            inService: selectedStatus[0]?.value,
             partnerId: customer?.id,
             parentPlaceId: branchId,
           })