fix(Inbox): add 'civilite' in search filters

Magic-Fishes · Nov 16, 2024 · 90cca8a · 90cca8a
1 parent d26c354
commit 90cca8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/components/app/Messaging/Inbox.jsx b/src/components/app/Messaging/Inbox.jsx
@@ -64,7 +64,7 @@ export default function Inbox({ selectedMessage, setSelectedMessage, selectedFol
         try {
             // regexp = new RegExp(removeAccents(search.toLowerCase()));
         } catch { return -1 }
-        const filterBy = [message.subject, message.from.nom, message.content?.content, message.files?.map((file) => file.name)].flat();
+        const filterBy = [message.subject, message.from?.civilite + " " + message.from?.nom, message.content?.content, message.files?.map((file) => file.name)].flat();
         for (let filter of filterBy) {
             if (filter) {
                 filter = removeAccents(filter.toLowerCase());

diff --git a/src/components/app/Messaging/MessageReader.jsx b/src/components/app/Messaging/MessageReader.jsx
@@ -171,36 +171,30 @@ export default function MessageReader({ selectedMessage, fetchMessageMarkAsUnrea
                                         </ul>
                                     </TooltipContent>
                                 </TooltipContent></Tooltip>
-                            ) : (
-                                null
-                            )}
+                            ) : null}
                             {parsedHashFolder === -2 ? (
                                 <Tooltip className="action-button-main"><TooltipTrigger><button className="action-button" onClick={
                                     () => {
                                         unarchiveMessage(message.id);
                                         setSelectedMessage(null);
                                     }
                                 }><InboxIcon /></button></TooltipTrigger><TooltipContent>Désarchiver</TooltipContent></Tooltip>
-                            ) : parsedHashFolder != -1 && parsedHashFolder != -4 ? (
+                            ) : parsedHashFolder !== -1 && parsedHashFolder !== -4 ? (
                                 <Tooltip className="action-button-main"><TooltipTrigger><button className="action-button" onClick={
                                     () => {
                                         archiveMessage(message.id);
                                         setSelectedMessage(null);
                                     }
                                 }><ArchiveIcon /></button></TooltipTrigger><TooltipContent>Archiver</TooltipContent></Tooltip>
-                            ) : (
-                                null
-                            )}
+                            ) : null}
                             {parsedHashFolder === -4 ? (
                                 <Tooltip className="action-button-main"><TooltipTrigger><button className="action-button" onClick={
                                     () => {
                                         deleteMessage(message.id);
                                         setSelectedMessage(null);
                                     }
                                 }><DeleteIcon /></button></TooltipTrigger><TooltipContent>Supprimer</TooltipContent></Tooltip>
-                            ) : (
-                                null
-                            )}
+                            ) : null}
                             <Tooltip className="action-button-main"><TooltipTrigger><button className="action-button" onClick={(event) => handleMarkAsUnread(event, message)}><MarkAsUnread /></button></TooltipTrigger><TooltipContent>Marquer comme non lu</TooltipContent></Tooltip>
                         </div>
                     </div>