fix resolve

Author: marandaneto

apps/array/src/renderer/features/code-editor/components/CodeEditorPanel.tsx

@@ -86,6 +86,7 @@ export function CodeEditorPanel({
         filePath={absolutePath}
         readOnly
         prNumber={prNumber}
+        directoryPath={repoPath}
       />
     </Box>
   );

apps/array/src/renderer/features/code-editor/components/CodeMirrorEditor.tsx

@@ -9,6 +9,7 @@ interface CodeMirrorEditorProps {
   readOnly?: boolean;
   enableComments?: boolean;
   prNumber?: number;
+  directoryPath?: string;
 }
 
 export function CodeMirrorEditor({
@@ -18,11 +19,13 @@ export function CodeMirrorEditor({
   readOnly = false,
   enableComments = false,
   prNumber,
+  directoryPath,
 }: CodeMirrorEditorProps) {
   const extensions = useEditorExtensions(filePath, readOnly, {
     enableComments,
     fileId: fileId || filePath,
     prNumber,
+    directoryPath,
   });
   const options = useMemo(
     () => ({ doc: content, extensions, filePath }),

apps/array/src/renderer/features/code-editor/components/DiffEditorPanel.tsx

@@ -145,6 +145,7 @@ export function DiffEditorPanel({
           readOnly
           enableComments
           prNumber={prNumber}
+          directoryPath={repoPath}
         />
       )}
     </Box>

apps/array/src/renderer/features/code-editor/hooks/useEditorExtensions.ts

@@ -104,7 +104,12 @@ export function useEditorExtensions(
       );
       // Inline comment display
       extensions.push(
-        commentWidgetExtension(() => getCommentsForFile(fileId), showComments),
+        commentWidgetExtension(
+          () => getCommentsForFile(fileId),
+          showComments,
+          prNumber,
+          directoryPath,
+        ),
       );
     }
 
@@ -121,5 +126,7 @@ export function useEditorExtensions(
     handleSubmitComment,
     closeComposer,
     composerState,
+    directoryPath,
+    prNumber,
   ]);
 }

apps/array/src/renderer/features/comments/components/CommentBubble.tsx

@@ -17,6 +17,7 @@ import { isCurrentUser } from "../utils/currentUser";
 interface CommentBubbleProps {
   comment: Comment;
   isReply?: boolean;
+  directoryPath?: string;
 }
 
 function formatRelativeTime(date: Date): string {
@@ -45,6 +46,7 @@ function getInitials(name: string): string {
 export function CommentBubble({
   comment,
   isReply = false,
+  directoryPath,
 }: CommentBubbleProps) {
   const [isEditing, setIsEditing] = useState(false);
   const [editContent, setEditContent] = useState(comment.content);
@@ -66,17 +68,18 @@ export function CommentBubble({
 
   const handleSaveEdit = useCallback(async () => {
     const trimmed = editContent.trim();
-    if (!trimmed) return;
+    if (!trimmed || !directoryPath) return;
 
-    await updateComment(comment.id, trimmed, ""); // TODO: Get actual directory path from context
+    await updateComment(comment.id, trimmed, directoryPath);
     setIsEditing(false);
-  }, [editContent, comment.id, updateComment]);
+  }, [editContent, comment.id, updateComment, directoryPath]);
 
   const handleDelete = useCallback(async () => {
+    if (!directoryPath) return;
     if (window.confirm("Delete this comment? This action cannot be undone.")) {
-      await deleteComment(comment.id, ""); // TODO: Get actual directory path from context
+      await deleteComment(comment.id, directoryPath);
     }
-  }, [comment.id, deleteComment]);
+  }, [comment.id, deleteComment, directoryPath]);
 
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent) => {

apps/array/src/renderer/features/comments/components/CommentThread.tsx

@@ -8,9 +8,15 @@ import { CommentBubble } from "./CommentBubble";
 
 interface CommentThreadProps {
   comment: Comment;
+  prNumber?: number;
+  directoryPath?: string;
 }
 
-export function CommentThread({ comment: initialComment }: CommentThreadProps) {
+export function CommentThread({
+  comment: initialComment,
+  prNumber,
+  directoryPath,
+}: CommentThreadProps) {
   const [isReplying, setIsReplying] = useState(false);
   const [replyContent, setReplyContent] = useState("");
   const [isCollapsed, setIsCollapsed] = useState(false);
@@ -35,28 +41,33 @@ export function CommentThread({ comment: initialComment }: CommentThreadProps) {
 
   const handleSubmitReply = useCallback(async () => {
     const trimmed = replyContent.trim();
-    if (!trimmed || !comment) return;
+    if (!trimmed || !comment || !prNumber || !directoryPath) return;
 
     const input: CreateReplyInput = {
       parentId: comment.id,
-      prNumber: 0, // TODO: Get actual PR number from context
-      directoryPath: "", // TODO: Get actual directory path from context
+      prNumber,
+      directoryPath,
       content: trimmed,
     };
 
     await createReply(input);
     setReplyContent("");
     setIsReplying(false);
-  }, [replyContent, comment, createReply]);
+  }, [replyContent, comment, createReply, prNumber, directoryPath]);
 
   const handleToggleResolved = useCallback(async () => {
-    if (!comment) return;
-    await resolveComment(comment.id, !comment.resolved, "", 0); // TODO: Get actual directory path and PR number from context
+    if (!comment || !directoryPath || !prNumber) return;
+    await resolveComment(
+      comment.id,
+      !comment.resolved,
+      directoryPath,
+      prNumber,
+    );
     // Auto-collapse when resolving
     if (!comment.resolved) {
       setIsCollapsed(true);
     }
-  }, [comment, resolveComment]);
+  }, [comment, resolveComment, directoryPath, prNumber]);
 
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
@@ -120,11 +131,16 @@ export function CommentThread({ comment: initialComment }: CommentThreadProps) {
       }}
     >
       <Flex direction="column" gap="2">
-        <CommentBubble comment={comment} />
+        <CommentBubble comment={comment} directoryPath={directoryPath} />
 
         {/* Replies */}
         {comment.replies.map((reply) => (
-          <CommentBubble key={reply.id} comment={reply} isReply />
+          <CommentBubble
+            key={reply.id}
+            comment={reply}
+            isReply
+            directoryPath={directoryPath}
+          />
         ))}
 
         {/* Reply composer */}

apps/array/src/renderer/features/comments/extensions/commentWidgetExtension.ts

@@ -16,7 +16,11 @@ import { CommentThread } from "../components/CommentThread";
 class CommentWidget extends WidgetType {
   private root: Root | null = null;
 
-  constructor(readonly comment: Comment) {
+  constructor(
+    readonly comment: Comment,
+    readonly prNumber?: number,
+    readonly directoryPath?: string,
+  ) {
     super();
   }
 
@@ -38,7 +42,13 @@ class CommentWidget extends WidgetType {
 
     // Use React to render the CommentThread
     this.root = createRoot(container);
-    this.root.render(createElement(CommentThread, { comment: this.comment }));
+    this.root.render(
+      createElement(CommentThread, {
+        comment: this.comment,
+        prNumber: this.prNumber,
+        directoryPath: this.directoryPath,
+      }),
+    );
 
     return container;
   }
@@ -62,6 +72,8 @@ class CommentWidget extends WidgetType {
 function createCommentDecorations(
   comments: Comment[],
   doc: { lines: number; line: (n: number) => { to: number } },
+  prNumber?: number,
+  directoryPath?: string,
 ): DecorationSet {
   const decorations: Array<{ pos: number; widget: CommentWidget }> = [];
 
@@ -71,7 +83,7 @@ function createCommentDecorations(
     if (lineNum < 1 || lineNum > doc.lines) continue;
 
     const line = doc.line(lineNum);
-    const widget = new CommentWidget(comment);
+    const widget = new CommentWidget(comment, prNumber, directoryPath);
 
     decorations.push({
       pos: line.to,
@@ -105,10 +117,14 @@ export type CommentsFacetValue = Comment[];
  *
  * @param getComments - Function to get comments for the current file
  * @param showComments - Whether to show comments
+ * @param prNumber - Pull request number if available
+ * @param directoryPath - Repository directory path
  */
 export function commentWidgetExtension(
   getComments: () => Comment[],
   showComments: boolean,
+  prNumber?: number,
+  directoryPath?: string,
 ): Extension {
   // If comments are disabled, return an empty extension
   if (!showComments) {
@@ -118,12 +134,22 @@ export function commentWidgetExtension(
   const commentField = StateField.define<DecorationSet>({
     create(state) {
       const comments = getComments();
-      return createCommentDecorations(comments, state.doc);
+      return createCommentDecorations(
+        comments,
+        state.doc,
+        prNumber,
+        directoryPath,
+      );
     },
     update(decorations, tr) {
       if (tr.docChanged) {
         const comments = getComments();
-        return createCommentDecorations(comments, tr.state.doc);
+        return createCommentDecorations(
+          comments,
+          tr.state.doc,
+          prNumber,
+          directoryPath,
+        );
       }
       return decorations;
     },