Fix Tasks and Activities - Part 1 (#2624)

Fixed

front/src/modules/activities/components/ActivityComments.tsx

@@ -6,21 +6,15 @@ import { v4 } from 'uuid';
 import { Comment } from '@/activities/comment/Comment';
 import { Activity } from '@/activities/types/Activity';
 import { Comment as CommentType } from '@/activities/types/Comment';
-import { currentUserState } from '@/auth/states/currentUserState';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
+import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
 import {
   AutosizeTextInput,
   AutosizeTextInputVariant,
 } from '@/ui/input/components/AutosizeTextInput';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
-type ActivityCommentsProps = {
-  activity: Pick<Activity, 'id'> & {
-    comments: Array<CommentType>;
-  };
-  scrollableContainerRef: React.RefObject<HTMLDivElement>;
-};
-
 const StyledThreadItemListContainer = styled.div`
   align-items: flex-start;
   border-top: 1px solid ${({ theme }) => theme.border.color.light};
@@ -57,16 +51,31 @@ const StyledThreadCommentTitle = styled.div`
   text-transform: uppercase;
 `;
 
+type ActivityCommentsProps = {
+  activity: Pick<Activity, 'id'>;
+  scrollableContainerRef: React.RefObject<HTMLDivElement>;
+};
+
 export const ActivityComments = ({
   activity,
   scrollableContainerRef,
 }: ActivityCommentsProps) => {
-  const currentUser = useRecoilValue(currentUserState);
   const { createOneObject } = useCreateOneObjectRecord({
     objectNameSingular: 'comment',
   });
 
-  if (!currentUser) {
+  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
+
+  const { objects: comments } = useFindManyObjectRecords({
+    objectNamePlural: 'comments',
+    filter: {
+      activityId: {
+        eq: activity?.id ?? '',
+      },
+    },
+  });
+
+  if (!currentWorkspaceMember) {
     return <></>;
   }
 
@@ -76,10 +85,10 @@ export const ActivityComments = ({
     }
 
     createOneObject?.({
-      commentId: v4(),
-      authorId: currentUser?.id ?? '',
+      id: v4(),
+      authorId: currentWorkspaceMember?.id ?? '',
       activityId: activity?.id ?? '',
-      commentText: commentText,
+      body: commentText,
       createdAt: new Date().toISOString(),
     });
   };
@@ -93,26 +102,28 @@ export const ActivityComments = ({
     });
   };
 
+  console.log('asd', { activity, comments });
+
   return (
     <>
-      {activity?.comments.length > 0 && (
+      {comments.length > 0 && (
         <>
           <StyledThreadItemListContainer>
             <StyledThreadCommentTitle>Comments</StyledThreadCommentTitle>
-            {activity?.comments?.map((comment) => (
-              <Comment key={comment.id} comment={comment} />
+            {comments?.map((comment) => (
+              <Comment key={comment.id} comment={comment as CommentType} />
             ))}
           </StyledThreadItemListContainer>
         </>
       )}
 
       <StyledCommentActionBar>
-        {currentUser && (
+        {currentWorkspaceMember && (
           <AutosizeTextInput
             onValidate={handleSendComment}
             onFocus={handleFocus}
             variant={AutosizeTextInputVariant.Button}
-            placeholder={activity?.comments.length > 0 ? 'Reply...' : undefined}
+            placeholder={comments.length > 0 ? 'Reply...' : undefined}
           />
         )}
       </StyledCommentActionBar>