From 6d4c4d2c7466556aee626f71938b198e7c342204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sat, 25 Oct 2025 01:06:29 +0200
Subject: [PATCH] Refactor entity handling in TypeUser.vue and PickEntity.vue
 for improved consistency and type safety.

- Adjusted `TypeUser.vue` to correctly reference `props.item.result` and removed unused `hasParent` logic.
- Updated `PickEntity.vue` to include handling for households with new `isEntityHousehold` utility.
- Added `isEntityHousehold` function to `types.ts` for reusable type checks.
---
 .../public/vuejs/PickEntity/PickEntity.vue       | 16 +++++++++++++---
 .../ChillPersonBundle/Resources/public/types.ts  |  4 ++++
 .../vuejs/_components/AddPersons/TypeUser.vue    |  9 ++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 3d246d5f2..b92f47319 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -12,13 +12,20 @@
           >{{ trans(USER_CURRENT_USER) }}</span
         >
         <span
-          v-else
+          v-else-if="!isEntityHousehold(p)"
           :class="getBadgeClass(p)"
           class="chill_denomination"
           :style="getBadgeStyle(p)"
         >
           {{ p.text }}
         </span>
+        <span v-else
+              :class="getBadgeClass(p)"
+              class="chill_denomination"
+              :style="getBadgeStyle(p)"
+        >
+          Ménage n°{{ p.id }}
+        </span>
       </li>
     </ul>
     <ul class="record_actions mb-0">
@@ -54,9 +61,12 @@
         @click="addNewSuggested(s)"
         style="margin: 0"
       >
-        <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
+        <span v-if="!isEntityHousehold(s)" :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
           {{ s.text }}
         </span>
+        <span v-else>
+          Ménage n°{{ s.id }}
+        </span>
       </li>
     </ul>
   </div>
@@ -75,7 +85,7 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import {
   Entities,
   EntitiesOrMe,
-  EntityType,
+  EntityType, isEntityHousehold,
   SearchOptions,
   Suggestion,
 } from "ChillPersonAssets/types";
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index eb36d6bd7..6241b4b50 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -392,6 +392,10 @@ export type EntityType =
 
 export type Entities = (UserGroup | User | Person | Thirdparty | Household);
 
+export function isEntityHousehold(e: Entities): e is Household {
+  return e.type === "household";
+}
+
 export type EntitiesOrMe = "me" | Entities;
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
index 1d1568813..9daf3219f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="container usercontainer">
     <div class="user-identification">
-      <UserRenderBoxBadge :user="item.result" />
+      <UserRenderBoxBadge :user="props.item.result" />
     </div>
   </div>
   <div class="right_actions">
-    <BadgeEntity :entity="item.result" :options="{ displayLong: true }" />
+    <BadgeEntity :entity="props.item.result" :options="{ displayLong: true }" />
   </div>
 </template>
 
@@ -22,11 +22,6 @@ interface TypeUserProps {
 
 const props = defineProps<TypeUserProps>();
 
-const hasParent = computed(() => props.item.result.parent !== null);
-
-defineExpose({
-  hasParent,
-});
 </script>
 
 <style lang="scss" scoped>