fix(staffactions): small fixes

dataesr · Oct 9, 2024 · 5f63e6c · 5f63e6c
1 parent e9e16fd
commit 5f63e6c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 45 deletions.
diff --git a/client/src/components/items/contribution-item.tsx b/client/src/components/items/contribution-item.tsx
@@ -32,7 +32,7 @@ const ContributionItem: React.FC<ContributionItemProps> = ({
   };
 
   const firstThread = data?.threads?.[0];
-  const firstResponse = firstThread?.responses?.[0];
+  const firstResponse = firstThread?.responses?.[1];
 
   return (
     <>

diff --git a/client/src/components/items/staff-action.tsx b/client/src/components/items/staff-action.tsx
@@ -123,7 +123,6 @@ const StaffActions = ({
     <>
       {data?.threads?.length > 0 && (
         <Col className={contributorClassName}>
-          {/* Afficher le toggle uniquement s'il y a plus de 2 objets dans threads */}
           {data.threads.length > 2 && (
             <Toggle
               label="Marquer toutes les réponses comme lues"
@@ -132,49 +131,45 @@ const StaffActions = ({
             />
           )}
 
-          {data.threads.map((thread, threadIndex) =>
-            thread.responses.map((response, index) => {
-              const responseDate = new Date(
-                response.timestamp
-              ).toLocaleDateString();
-              const responseTime = new Date(
-                response.timestamp
-              ).toLocaleTimeString();
-
-              if (displayedDates.has(responseDate + responseTime)) {
-                return null;
-              }
-
-              displayedDates.add(responseDate + responseTime);
-
-              const responder = response.team.includes("user")
-                ? data.name
-                : response.team.join(", ");
-
-              return (
-                <div
-                  key={`${threadIndex}-${index}`}
-                  className="response-container"
-                >
-                  <Text
-                    size="sm"
-                    className={
-                      response.team.includes("user") ? "user-side" : "staffSide"
-                    }
-                  >
-                    {responder && (
-                      <>
-                        Réponse apportée par {responder} le {responseDate} à{" "}
-                        {responseTime} :
-                        <br />
-                        {response.responseMessage}
-                      </>
-                    )}
-                  </Text>
-                </div>
-              );
-            })
-          )}
+          {data.threads.map((thread, threadIndex) => {
+            const teamResponses = thread.responses.filter(
+              (response) => !response.team.includes("user")
+            );
+
+            return teamResponses.length > 0
+              ? teamResponses.map((response, index) => {
+                  const responseDate = new Date(
+                    response.timestamp
+                  ).toLocaleDateString();
+                  const responseTime = new Date(
+                    response.timestamp
+                  ).toLocaleTimeString();
+
+                  if (displayedDates.has(responseDate + responseTime)) {
+                    return null;
+                  }
+
+                  displayedDates.add(responseDate + responseTime);
+
+                  const responder = response.team.join(", ");
+
+                  return (
+                    <div key={`${threadIndex}-${index}`}>
+                      <Text size="sm" className="staffSide">
+                        {responder && (
+                          <>
+                            Réponse apportée par {responder} le {responseDate} à{" "}
+                            {responseTime} :
+                            <br />
+                            {response.responseMessage}
+                          </>
+                        )}
+                      </Text>
+                    </div>
+                  );
+                })
+              : null;
+          })}
         </Col>
       )}