@alpaca-editor/core 1.0.4105 → 1.0.4106

package/src/editor/reviews/Comments.tsx

@@ -11,19 +11,19 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "../../components/ui/popover";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "../../components/ui/tooltip";
 import {
   FileDiff,
-  SquarePen,
   CheckCircle,
   CheckCircle2,
-  MessageSquareMore,
   Plus,
-  GitBranch,
   Tags,
   Lightbulb,
 } from "lucide-react";
-import { getChildren } from "../services/contentService";
-import { getComments as getCommentsApi } from "../services/reviewsService";
 
 // Define a union type for feedback items:
 export type FeedbackItem = CommentType | SuggestedEdit;
@@ -44,17 +44,6 @@ export function Comments() {
       return [];
     }
   });
-  const [scope, setScope] = useState<"all" | "itemOnly">(() => {
-    try {
-      const raw =
-        typeof window !== "undefined"
-          ? localStorage.getItem("editor.comments.scope")
-          : null;
-      return raw === "itemOnly" ? "itemOnly" : "all";
-    } catch {
-      return "all";
-    }
-  });
   const availableTags = editContext?.availableCommentTags || [];
 
   useEffect(() => {
@@ -73,77 +62,8 @@ export function Comments() {
       // Start with main page comments and suggestions
       let allComments: CommentType[] = [...mainComments];
 
-      // If including children, fetch comments for descendant pages and merge
+      // Base page context
       const basePageId = editContext?.currentItemDescriptor?.id;
-      const baseLanguage = editContext?.currentItemDescriptor?.language;
-      const baseVersion = editContext?.currentItemDescriptor?.version;
-
-      if (scope === "all" && basePageId && baseLanguage && baseVersion) {
-        try {
-          const sessionId = editContext?.sessionId || "";
-
-          // BFS to collect all descendant nodes
-          const queue: string[] = [basePageId];
-          const visited = new Set<string>();
-          const descendantPages: {
-            id: string;
-            language: string;
-            version: number;
-            hasChildren: boolean;
-          }[] = [];
-
-          while (queue.length > 0) {
-            const parentId = queue.shift()!;
-            if (visited.has(parentId)) continue;
-            visited.add(parentId);
-
-            const children = await getChildren(
-              parentId,
-              sessionId,
-              [],
-              false,
-              baseLanguage,
-              undefined,
-            );
-
-            for (const child of children) {
-              // Enqueue for deeper traversal when it has children
-              if (child.hasChildren) queue.push(child.id);
-              // Only pages (hasLayout) contribute comments
-              if (child.hasLayout) {
-                descendantPages.push({
-                  id: child.id,
-                  language: child.language,
-                  version: child.version,
-                  hasChildren: child.hasChildren,
-                });
-              }
-            }
-          }
-
-          // Fetch comments for all descendant pages in parallel
-          const results = await Promise.all(
-            descendantPages.map((p) =>
-              getCommentsApi(p.id, p.language, p.version),
-            ),
-          );
-
-          const childComments = results
-            .map((r) => (r.data || []) as CommentType[])
-            .flat();
-
-          // Merge unique by id
-          const existingIds = new Set(allComments.map((c) => c.id));
-          for (const c of childComments) {
-            if (!existingIds.has(c.id)) {
-              allComments.push(c);
-              existingIds.add(c.id);
-            }
-          }
-        } catch {
-          // Ignore child-loading errors to avoid blocking main list
-        }
-      }
 
       // Combine with suggestions
       let combined: FeedbackItem[] = [
@@ -151,8 +71,8 @@ export function Comments() {
         ...filteredSuggestedEdits,
       ];
 
-      // Apply scope filter for item-only: keep only items whose mainItemId is the current page
-      if (scope === "itemOnly" && basePageId) {
+      // Only keep items whose mainItemId is the current page
+      if (basePageId) {
         combined = combined.filter(
           (item: any) => item.mainItemId === basePageId,
         );
@@ -187,7 +107,7 @@ export function Comments() {
     return () => {
       cancelled = true;
     };
-  }, [editContext, hideAppliedSuggestions, scope, selectedTagsFilter]);
+  }, [editContext, hideAppliedSuggestions, selectedTagsFilter]);
 
   useEffect(() => {
     try {
@@ -199,13 +119,6 @@ export function Comments() {
     } catch {}
   }, [selectedTagsFilter]);
 
-  useEffect(() => {
-    try {
-      if (typeof window !== "undefined")
-        localStorage.setItem("editor.comments.scope", scope);
-    } catch {}
-  }, [scope]);
-
   // Tags are provided once via editContext.availableCommentTags
 
   return (
@@ -243,17 +156,6 @@ export function Comments() {
             editContext?.addComment();
           }}
         />
-        <SimpleIconButton
-          selected={editContext?.showComments}
-          icon={
-            <MessageSquareMore size={16} strokeWidth={1} className="p-0.5" />
-          }
-          label="Show Comments"
-          onClick={() => {
-            editContext?.setShowComments((x) => !x);
-          }}
-        />
-
         <SimpleIconButton
           selected={!!editContext?.showResolvedComments}
           icon={<CheckCircle2 size={16} strokeWidth={1} className="p-0.5" />}
@@ -266,15 +168,7 @@ export function Comments() {
             editContext?.setShowResolvedComments((x) => !x);
           }}
         />
-        <SimpleIconButton
-          selected={editContext?.showSuggestedEdits}
-          icon={<Lightbulb size={16} strokeWidth={1} className="p-0.5" />}
-          label="Show Suggestions"
-          data-testid="show-suggestions-button"
-          onClick={() => {
-            editContext?.setShowSuggestedEdits((x) => !x);
-          }}
-        />
+
         {editContext?.showSuggestedEdits && (
           <SimpleIconButton
             selected={editContext?.showSuggestedEditsDiff}
@@ -306,77 +200,75 @@ export function Comments() {
           }}
         />
         <div className="ml-auto flex items-center gap-2">
-          <SimpleIconButton
-            selected={scope === "all"}
-            icon={<GitBranch size={16} strokeWidth={1} className="p-0.5" />}
-            label={
-              scope === "all"
-                ? "Include Children (on)"
-                : "Include Children (off)"
-            }
-            onClick={() => setScope(scope === "all" ? "itemOnly" : "all")}
-          />
-
           {availableTags.length > 0 && (
-            <Popover>
-              <PopoverTrigger asChild>
-                <SimpleIconButton
-                  showTooltip={false}
-                  selected={selectedTagsFilter.length > 0}
-                  icon={<Tags size={16} strokeWidth={1} className="p-0.5" />}
-                  label={
-                    selectedTagsFilter.length > 0
-                      ? `Tags (${selectedTagsFilter.length})`
-                      : "Tags"
-                  }
-                  onClick={() => {}}
-                />
-              </PopoverTrigger>
-              <PopoverContent className="w-72 p-3" align="start">
-                <div className="mb-2 text-xs text-gray-600">Filter by tags</div>
-                <div className="flex flex-wrap gap-2">
-                  {availableTags.map((tag) => {
-                    const isSelected = selectedTagsFilter.includes(tag.label);
-                    return (
+            <Tooltip delayDuration={500}>
+              <Popover>
+                <PopoverTrigger asChild>
+                  <TooltipTrigger asChild>
+                    <SimpleIconButton
+                      showTooltip={false}
+                      selected={selectedTagsFilter.length > 0}
+                      icon={
+                        <Tags size={16} strokeWidth={1} className="p-0.5" />
+                      }
+                      label={
+                        selectedTagsFilter.length > 0
+                          ? `Tags (${selectedTagsFilter.length})`
+                          : "Tags"
+                      }
+                      onClick={() => {}}
+                    />
+                  </TooltipTrigger>
+                </PopoverTrigger>
+                <PopoverContent className="w-72 p-3" align="start">
+                  <div className="mb-2 text-xs text-gray-600">
+                    Filter by tags
+                  </div>
+                  <div className="flex flex-wrap gap-2">
+                    {availableTags.map((tag) => {
+                      const isSelected = selectedTagsFilter.includes(tag.label);
+                      return (
+                        <Button
+                          key={tag.label}
+                          type="button"
+                          size="sm"
+                          variant={isSelected ? "secondary" : "outline"}
+                          className="h-6 px-2 text-xs"
+                          onClick={() => {
+                            setSelectedTagsFilter((prev) =>
+                              prev.includes(tag.label)
+                                ? prev.filter((l) => l !== tag.label)
+                                : [...prev, tag.label],
+                            );
+                          }}
+                          style={{
+                            borderColor: isSelected ? tag.color : undefined,
+                            backgroundColor: isSelected
+                              ? tag.color + "22"
+                              : undefined,
+                          }}
+                        >
+                          {tag.label}
+                        </Button>
+                      );
+                    })}
+                  </div>
+                  {selectedTagsFilter.length > 0 && (
+                    <div className="mt-3 text-right">
                       <Button
-                        key={tag.label}
-                        type="button"
                         size="sm"
-                        variant={isSelected ? "secondary" : "outline"}
+                        variant="ghost"
                         className="h-6 px-2 text-xs"
-                        onClick={() => {
-                          setSelectedTagsFilter((prev) =>
-                            prev.includes(tag.label)
-                              ? prev.filter((l) => l !== tag.label)
-                              : [...prev, tag.label],
-                          );
-                        }}
-                        style={{
-                          borderColor: isSelected ? tag.color : undefined,
-                          backgroundColor: isSelected
-                            ? tag.color + "22"
-                            : undefined,
-                        }}
+                        onClick={() => setSelectedTagsFilter([])}
                       >
-                        {tag.label}
+                        Clear
                       </Button>
-                    );
-                  })}
-                </div>
-                {selectedTagsFilter.length > 0 && (
-                  <div className="mt-3 text-right">
-                    <Button
-                      size="sm"
-                      variant="ghost"
-                      className="h-6 px-2 text-xs"
-                      onClick={() => setSelectedTagsFilter([])}
-                    >
-                      Clear
-                    </Button>
-                  </div>
-                )}
-              </PopoverContent>
-            </Popover>
+                    </div>
+                  )}
+                </PopoverContent>
+              </Popover>
+              <TooltipContent>Filter by tags</TooltipContent>
+            </Tooltip>
           )}
         </div>
       </SimpleToolbar>

package/src/editor/reviews/SuggestedEdit.tsx

@@ -1,5 +1,5 @@
 import { SuggestedEdit as SuggestedEditType } from "../../types";
-import { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useEditContext, useFieldsEditContext } from "../client/editContext";
 import {
   deleteSuggestedEdit,
@@ -100,21 +100,27 @@ export function SuggestedEditComponent({ edit }: { edit: SuggestedEditType }) {
 
   // Render contextual info by retrieving item and field names from the loaded item.
   const renderContextInfo = () => {
-    const itemName = item ? item.name : null;
+    const pageName = editContext?.currentItemDescriptor?.name;
+    const itemName = item ? item.name : undefined;
     const fieldName =
       item && item.fields
         ? item.fields.find(
             (f: { id: string; name?: string }) => f.id === edit.fieldId,
-          )?.name
-        : null;
-    if (!itemName && !fieldName) return null;
+          )?.name || undefined
+        : undefined;
+
+    const segments = [pageName, itemName, fieldName].filter(
+      (x): x is string => !!x && x.length > 0,
+    );
+    if (segments.length === 0) return null;
     return (
       <div className="mt-3 flex items-center border-t pt-3 text-xs">
-        {itemName && <div className="text-2xs text-gray-500">{itemName}</div>}
-        {fieldName && itemName && (
-          <div className="text-2xs mx-2 text-gray-500">&gt;</div>
-        )}
-        {fieldName && <div className="text-2xs text-gray-500">{fieldName}</div>}
+        {segments.map((seg, idx) => (
+          <React.Fragment key={idx}>
+            {idx > 0 && <div className="text-2xs mx-2 text-gray-500">&gt;</div>}
+            <div className="text-2xs text-gray-500">{seg}</div>
+          </React.Fragment>
+        ))}
       </div>
     );
   };

package/src/editor/reviews/SuggestionDisplayPopover.tsx

@@ -208,23 +208,28 @@ export function SuggestionDisplayPopover({
   };
 
   const renderContextInfo = () => {
-    const itemName = item ? item.name : null;
+    const pageName = editContext?.currentItemDescriptor?.name;
+    const itemName = item ? item.name : undefined;
     const fieldName =
       item && item.fields
         ? item.fields.find(
             (f: { id: string; name?: string }) => f.id === suggestion.fieldId,
-          )?.name
-        : null;
+          )?.name || undefined
+        : undefined;
 
-    if (!itemName && !fieldName) return null;
+    const segments = [pageName, itemName, fieldName].filter(
+      (x): x is string => !!x && x.length > 0,
+    );
+    if (segments.length === 0) return null;
 
     return (
       <div className="mt-3 flex items-center border-t pt-3 text-xs">
-        {itemName && <div className="text-xs text-gray-500">{itemName}</div>}
-        {fieldName && itemName && (
-          <div className="mx-2 text-xs text-gray-500">&gt;</div>
-        )}
-        {fieldName && <div className="text-xs text-gray-500">{fieldName}</div>}
+        {segments.map((seg, idx) => (
+          <React.Fragment key={idx}>
+            {idx > 0 && <div className="mx-2 text-xs text-gray-500">&gt;</div>}
+            <div className="text-xs text-gray-500">{seg}</div>
+          </React.Fragment>
+        ))}
       </div>
     );
   };

package/src/editor/services/reviewsService.ts

@@ -12,6 +12,16 @@ export function getComments(itemId: string, language: string, version: number) {
   );
 }
 
+// Latest comments across the system, already filtered by backend for user access.
+export function getLatestComments(take?: number) {
+  const params = new URLSearchParams();
+  if (take && take > 0) params.set("take", take.toString());
+  const query = params.toString();
+  return get<Comment[]>(
+    `/alpaca/editor/comments/latest${query ? `?${query}` : ""}`,
+  );
+}
+
 export function resolveComment(comment: Comment) {
   return post(`/alpaca/editor/comments/resolve?commentId=${comment.id}`, {});
 }

package/src/editor/services/suggestedEditsService.ts

@@ -21,6 +21,16 @@ export function getSuggestedEdits(
   );
 }
 
+// Latest suggested edits across the system, already filtered by backend for user access.
+export function getLatestSuggestedEdits(take?: number) {
+  const params = new URLSearchParams();
+  if (take && take > 0) params.set("take", take.toString());
+  const query = params.toString();
+  return get<SuggestedEdit[]>(
+    `/alpaca/editor/suggested-edits/latest${query ? `?${query}` : ""}`,
+  );
+}
+
 /**
  * Retrieves a single suggested edit by its unique identifier.
  */

package/src/revision.ts

@@ -1,2 +1,2 @@
-export const version = "1.0.4105";
-export const buildDate = "2025-09-23 15:04:32";
+export const version = "1.0.4106";
+export const buildDate = "2025-09-23 20:25:39";

package/src/types.ts

@@ -260,6 +260,7 @@ export type IndexStatus = {
   rebuilding: boolean;
   batches: EmbeddingBatch[];
   latestEmbeddedItems?: LatestEmbeddedItem[];
+  messages?: SystemStatusMessage[];
 };
 
 export type EmbeddingBatch = {
@@ -337,6 +338,7 @@ export type Comment = {
   isNew: boolean;
   itemId: string;
   itemName?: string;
+  mainItemName?: string;
   mainItemId: string;
   language: string;
   version: number;
@@ -408,7 +410,9 @@ export interface SuggestedEdit {
   mainItemId: string;
   mainItemLanguage: string;
   mainItemVersion: number;
+  mainItemName?: string;
   itemId: string;
+  itemName?: string;
   fieldId: string;
   oldValue: string;
   newValue: string;