From a17320b8619f63553b7ddd3d2e39a0a155164079 Mon Sep 17 00:00:00 2001 From: lethemanh Date: Wed, 18 Mar 2026 19:59:32 +0700 Subject: [PATCH] #654 assign icon based on icon property (#662) Co-authored-by: lethemanh --- src/components/Attendees/PeopleSearch.tsx | 2 +- src/components/Attendees/ResourceIcon.tsx | 57 ++++--------------- src/components/Attendees/ResourceSearch.tsx | 2 +- src/components/Calendar/CalendarResources.tsx | 2 +- 4 files changed, 15 insertions(+), 48 deletions(-) diff --git a/src/components/Attendees/PeopleSearch.tsx b/src/components/Attendees/PeopleSearch.tsx index 77cec0c..e74d657 100644 --- a/src/components/Attendees/PeopleSearch.tsx +++ b/src/components/Attendees/PeopleSearch.tsx @@ -295,7 +295,7 @@ export function PeopleSearch({ {isResource ? ( - + ) : ( = { - "Astreinte OSSA": PeopleAltOutlinedIcon, - "Chômage Partiel": CalendarMonthOutlinedIcon, - Congés: CalendarMonthOutlinedIcon, - COPIL: CalendarMonthOutlinedIcon, - "Iphone 11 Pro Max": PhoneIphoneOutlinedIcon, - "Note de Service": DescriptionOutlinedIcon, - "OSS Events": CalendarMonthOutlinedIcon, - "Permanence OSSA": PeopleAltOutlinedIcon, - "Projo salle 404": VideoCameraBackOutlinedIcon, - "Salle-bat-A-S215-visio-15p": MeetingRoomOutlinedIcon, - "Salle-bat-A-S216-ecran-5p": MeetingRoomOutlinedIcon, - "Salle-bat-B-S217-10p": MeetingRoomOutlinedIcon, - "Salle-bat-C-S218-ecran-20p": MeetingRoomOutlinedIcon, - "Salle-bat-D-S218-visio-amphi-200p": MeetingRoomOutlinedIcon, - Télétravail: LayersOutlinedIcon, - "TV - VN": TvOutlinedIcon, - "Veille COPIL": LayersOutlinedIcon, - "White Board - VN": ViewComfyAltOutlinedIcon, -}; - -function getIconForDisplayName(displayName: string): SvgIconComponent { - return RESOURCE_ICON_MAP[displayName] ?? LayersOutlinedIcon; -} interface ResourceIconProps { - displayName: string; + avatarUrl?: string; } -export function ResourceIcon({ displayName }: ResourceIconProps) { - const IconComponent = getIconForDisplayName(displayName); - - return ( - - +export function ResourceIcon({ avatarUrl }: ResourceIconProps) { + return avatarUrl ? ( + + ) : ( + + ); } diff --git a/src/components/Attendees/ResourceSearch.tsx b/src/components/Attendees/ResourceSearch.tsx index 2bf5178..d63affc 100644 --- a/src/components/Attendees/ResourceSearch.tsx +++ b/src/components/Attendees/ResourceSearch.tsx @@ -290,7 +290,7 @@ export function ResourceSearch({ disableGutters > - + diff --git a/src/components/Calendar/CalendarResources.tsx b/src/components/Calendar/CalendarResources.tsx index 8ea8232..21d708e 100644 --- a/src/components/Calendar/CalendarResources.tsx +++ b/src/components/Calendar/CalendarResources.tsx @@ -46,7 +46,7 @@ function CalendarItem({ gap={2} > - + {renameDefault(cal.cal["dav:name"], cal.owner.displayName, t, false)}