Merge remote-tracking branch 'origin/staging'

dataesr · Feb 4, 2025 · b5eabfd · b5eabfd
2 parents 3d141fd + 1188d25
commit b5eabfd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/client/src/pages/contact-contributionbyobject-page/components/staff-action.tsx b/client/src/pages/contact-contributionbyobject-page/components/staff-action.tsx
@@ -17,13 +17,21 @@ const StaffActions: React.FC<StaffActionsProps> = ({ data, refetch }) => {
       ?.replace(/De:.*$/s, "")
       ?.replace(/Objet :.*$/s, "")
       ?.replace(/Envoyé :.*$/s, "")
+      ?.replace(/> Le.*/s, "")
       ?.replace(/Le lun.*$/s, "")
       ?.replace(/Le mar.*$/s, "")
       ?.replace(/Le mer.*$/s, "")
       ?.replace(/Le jeu.*$/s, "")
       ?.replace(/Le ven.*$/s, "")
       ?.replace(/Le sam.*$/s, "")
       ?.replace(/Le dim.*$/s, "")
+      ?.replace(/On Monda.*$/s, "")
+      ?.replace(/On Tuesd.*$/s, "")
+      ?.replace(/On Wedne.*$/s, "")
+      ?.replace(/On Thurs.*$/s, "")
+      ?.replace(/On Frida.*$/s, "")
+      ?.replace(/On Satur.*$/s, "")
+      ?.replace(/On Sunda.*$/s, "")
       ?.replace(/--[a-fA-F0-9_-]+--/g, "")
       .replace(/Content-Type:.*$/gs, "")
       .replace(/Content-Disposition:.*$/gs, "")

diff --git a/client/src/pages/contact-contributionbyobject-page/components/styles.scss b/client/src/pages/contact-contributionbyobject-page/components/styles.scss
@@ -26,6 +26,8 @@
   margin-right: 50px;
   margin-top: 10px;
   margin-bottom: 10px;
+  word-wrap: break-word;
+  overflow: hidden;
 }
 
 .staffSide {

diff --git a/client/src/pages/home/components/generate-links.tsx b/client/src/pages/home/components/generate-links.tsx
@@ -22,12 +22,13 @@ export function generateLinkFromAllDatas(
   };
 
   let basePath = "";
+
   if (productions?.length > 0 && message === undefined) {
     basePath = "/scanr-apioperations";
   } else if (objectId) {
     basePath = "/scanr-contributionPage";
-  } else if (fromApplication) {
-    basePath = "/scanr-contact";
+  } else if (fromApplication && basePathMap.contacts[fromApplication]) {
+    basePath = basePathMap.contacts[fromApplication];
   } else {
     basePath = (basePathMap[collectionName] as string) || "";
   }

diff --git a/server/routes/receive-email/index.ts b/server/routes/receive-email/index.ts
@@ -228,7 +228,6 @@ export async function fetchEmails() {
       source: true,
       envelope: true,
     });
-
     const messageList: {
       date: string;
       source: string;
@@ -243,10 +242,14 @@ export async function fetchEmails() {
       const messageSource = message.source.toString();
       const date = formatDate(message.envelope.date?.toISOString() || null);
       const subject = message.envelope.subject || "";
+      const cleanSubject = subject
+        .replace(/Re:\s*|\[?[*]?PUB[*]?\]?/gi, "")
+        .trim();
 
-      const referenceMatch = subject.match(
-        /référence\s+([a-zA-Z0-9_-]+)-([a-zA-Z0-9]+)/
+      const referenceMatch = cleanSubject.match(
+        /référence[\s:]+([a-zA-Z0-9_-]+)-([a-fA-F0-9]{24})/i
       );
+
       let referenceId = referenceMatch ? referenceMatch[2] : null;
       let collectionPrefix = referenceMatch ? referenceMatch[1] : "contacts";
 
@@ -269,7 +272,6 @@ export async function fetchEmails() {
     for (let message of sortedMessages) {
       const { referenceId, collectionPrefix, source } = message;
       const collectionName = determineCollectionName(collectionPrefix);
-
       if (referenceId) {
         await updateContribution(
           referenceId,