@agent-native/core-corpus 0.210.2 → 0.211.0

package/corpus/templates/content/app/components/editor/database/DatabaseView.tsx

@@ -46,7 +46,12 @@ import {
 } from "@shared/api";
 import { contentRecentHref } from "@shared/content-personal-navigation";
 import { contentDatabaseFormQuestions } from "@shared/database-form";
-import { applyContentDatabaseTableQuery } from "@shared/database-query";
+import {
+  applyContentDatabaseTableQuery,
+  contentDatabaseFilterDateRangeValues,
+  contentDatabaseFilterOperatorNeedsValue,
+  contentDatabaseFilterOperatorsForType,
+} from "@shared/database-query";
 import {
   databaseTableColumnIds,
   databaseFrozenColumnIds,
@@ -296,8 +301,8 @@ import {
   useContentTableSelectionGutter,
 } from "./ContentTable";
 import { databaseCanCreateItems, databaseCreateTarget } from "./create-target";
+import { DatabaseCellComments } from "./database-cell-comments";
 import {
-  DatabaseCellCommentMarker,
   DatabaseItemCommentsContext,
   DatabaseRowCommentCount,
   type OpenDatabaseItemComments,
@@ -1926,7 +1931,11 @@ function DatabaseTable({
   }
 
   // Opens the row with its Comments showing, from a count or a cell marker.
-  const previewItemComments: OpenDatabaseItemComments = (item, threadId) => {
+  const previewItemComments: OpenDatabaseItemComments = (
+    item,
+    threadId,
+    propertyId,
+  ) => {
     if (openWorkspaceFiles(item)) return;
     seedDatabaseItemDocumentCaches(queryClient, item);
     prioritizeBuilderBodyHydrationForItem(item);
@@ -1936,18 +1945,19 @@ function DatabaseTable({
         databaseId,
         document.id,
       );
-      runPreviewTransition(
-        () =>
-          void navigate(
-            threadId ? `${path}&comment=${encodeURIComponent(threadId)}` : path,
-          ),
-      );
+      const link = threadId
+        ? `${path}&comment=${encodeURIComponent(threadId)}`
+        : propertyId
+          ? `${path}&commentProperty=${encodeURIComponent(propertyId)}`
+          : path;
+      runPreviewTransition(() => void navigate(link));
       return;
     }
     const intent: PageCommentIntent = {
       key: ++previewCommentIntentSequenceRef.current,
       documentId: item.document.id,
       threadId,
+      propertyId,
     };
     if (item.document.id === previewDocumentId) {
       setPreviewCommentIntent(intent);
@@ -3667,7 +3677,12 @@ function DatabaseTable({
           onOpenPage={openItemPage}
         />
       ) : (
-        <DatabaseItemCommentsContext.Provider value={previewItemComments}>
+        // The read-only ChatGPT widget can't read or write Comments.
+        <DatabaseItemCommentsContext.Provider
+          value={
+            document.mcpDirectoryWidgetReadOnly ? null : previewItemComments
+          }
+        >
           <DatabaseTableView
             startupAnchored={renderMode === "page"}
             columnOrderIds={activeView.tableColumnOrderIds ?? []}
@@ -6858,7 +6873,7 @@ function DatabaseInlineSortControl({
   );
 }
 
-function DatabaseAddFilterButton({
+export function DatabaseAddFilterButton({
   open,
   filters,
   properties,
@@ -6873,19 +6888,10 @@ function DatabaseAddFilterButton({
   onAddFilter: (key: "name" | (string & {}), label: string) => void;
   onAddAdvancedFilter: (key: "name" | (string & {}), label: string) => void;
 }) {
-  const excludedFilterKeys = useMemo(
-    () => new Set(filters.filter(isActiveFilter).map((filter) => filter.key)),
-    [filters],
+  const advancedFilterCandidate = databaseFilterRuleCandidate(
+    properties,
+    filters.filter(isActiveFilter),
   );
-  const advancedFilterCandidate =
-    databasePropertyPickerItems(properties, "", {
-      includeName: false,
-      excludeKeys: excludedFilterKeys,
-    })[0] ??
-    databasePropertyPickerItems(properties, "", {
-      includeName: true,
-      excludeKeys: excludedFilterKeys,
-    })[0];
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
@@ -6905,17 +6911,14 @@ function DatabaseAddFilterButton({
           <DatabasePropertyPickerMenuItems
             properties={properties}
             includeName
-            excludeKeys={excludedFilterKeys}
             placeholder={dbText("filterBy")}
             closeOnSelect
             onSelect={onAddFilter}
           />
           <DropdownMenuSeparator />
           <DropdownMenuItem
-            disabled={!advancedFilterCandidate}
             onSelect={(event) => {
               event.preventDefault();
-              if (!advancedFilterCandidate) return;
               onAddAdvancedFilter(
                 advancedFilterCandidate.key,
                 advancedFilterCandidate.label,
@@ -7011,19 +7014,10 @@ function DatabaseAdvancedFilterGroupControl({
     ({ filter }) => !filter.parentFilterGroupId,
   );
   const nestedGroupEntries = advancedNestedFilterGroups(filterEntries);
-  const advancedKeys = useMemo(
-    () => new Set(advancedFilters.map((filter) => filter.key)),
-    [advancedFilters],
-  );
-  const addRuleCandidate =
-    databasePropertyPickerItems(properties, "", {
-      includeName: false,
-      excludeKeys: advancedKeys,
-    })[0] ??
-    databasePropertyPickerItems(properties, "", {
-      includeName: true,
-      excludeKeys: advancedKeys,
-    })[0];
+  const addRuleCandidate = databaseFilterRuleCandidate(
+    properties,
+    advancedFilters,
+  );
 
   function updateFilterAt(index: number, next: Partial<DatabaseFilter>) {
     const nextFilters = [...filters];
@@ -7035,7 +7029,7 @@ function DatabaseAdvancedFilterGroupControl({
       filterGroupId: next.filterGroupId ?? currentFilter.filterGroupId,
       parentFilterGroupId:
         next.parentFilterGroupId ?? currentFilter.parentFilterGroupId,
-      value: filterOperatorNeedsValue(nextOperator)
+      value: contentDatabaseFilterOperatorNeedsValue(nextOperator)
         ? (next.value ?? currentFilter.value)
         : "",
     };
@@ -7158,10 +7152,8 @@ function DatabaseAdvancedFilterGroupControl({
             </DropdownMenuSubTrigger>
             <DropdownMenuSubContent className="w-56">
               <DropdownMenuItem
-                disabled={!addRuleCandidate}
                 onSelect={(event) => {
                   event.preventDefault();
-                  if (!addRuleCandidate) return;
                   addAdvancedRule(addRuleCandidate.key, addRuleCandidate.label);
                 }}
               >
@@ -7169,10 +7161,8 @@ function DatabaseAdvancedFilterGroupControl({
                 {dbText("addFilterRule")}
               </DropdownMenuItem>
               <DropdownMenuItem
-                disabled={!addRuleCandidate}
                 onSelect={(event) => {
                   event.preventDefault();
-                  if (!addRuleCandidate) return;
                   addNestedFilterGroup(
                     addRuleCandidate.key,
                     addRuleCandidate.label,
@@ -7344,7 +7334,7 @@ function DatabaseAdvancedFilterRuleRow({
             </DropdownMenuContent>
           </DropdownMenu>
 
-          {filterOperatorNeedsValue(filter.operator) ? (
+          {contentDatabaseFilterOperatorNeedsValue(filter.operator) ? (
             <div className="min-w-0 flex-[1.35] [&>div>div:first-child]:px-0 [&>input]:h-9 [&>input]:text-xs">
               <DatabaseFilterValueControl
                 documentId={documentId}
@@ -7415,19 +7405,10 @@ function DatabaseAdvancedNestedFilterGroup({
   onRemoveFilter: (index: number) => void;
   onRemoveGroup: () => void;
 }) {
-  const nestedKeys = useMemo(
-    () => new Set(group.entries.map(({ filter }) => filter.key)),
-    [group.entries],
-  );
-  const addRuleCandidate =
-    databasePropertyPickerItems(properties, "", {
-      includeName: false,
-      excludeKeys: nestedKeys,
-    })[0] ??
-    databasePropertyPickerItems(properties, "", {
-      includeName: true,
-      excludeKeys: nestedKeys,
-    })[0];
+  const addRuleCandidate = databaseFilterRuleCandidate(
+    properties,
+    group.entries.map(({ filter }) => filter),
+  );
 
   return (
     <div className="flex items-start gap-2">
@@ -7506,10 +7487,8 @@ function DatabaseAdvancedNestedFilterGroup({
           </DropdownMenuTrigger>
           <DropdownMenuContent align="start" className="w-56">
             <DropdownMenuItem
-              disabled={!addRuleCandidate}
               onSelect={(event) => {
                 event.preventDefault();
-                if (!addRuleCandidate) return;
                 onAddNestedFilterRule(
                   group.id,
                   addRuleCandidate.key,
@@ -7581,7 +7560,7 @@ function DatabaseInlineFilterControl({
     nextFilters[filterIndex] = {
       ...currentFilter,
       ...next,
-      value: filterOperatorNeedsValue(nextOperator)
+      value: contentDatabaseFilterOperatorNeedsValue(nextOperator)
         ? (next.value ?? currentFilter.value)
         : "",
     };
@@ -7598,7 +7577,7 @@ function DatabaseInlineFilterControl({
   }
 
   const filterIsComplete =
-    !filterOperatorNeedsValue(filter.operator) ||
+    !contentDatabaseFilterOperatorNeedsValue(filter.operator) ||
     filter.value.trim().length > 0;
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
@@ -7753,7 +7732,7 @@ function DatabaseInlineFilterControl({
             </DropdownMenu>
           </div>
 
-          {filterOperatorNeedsValue(filter.operator) ? (
+          {contentDatabaseFilterOperatorNeedsValue(filter.operator) ? (
             <DatabaseFilterValueControl
               autoFocus={!filter.value}
               documentId={documentId}
@@ -11599,6 +11578,12 @@ type DatabasePropertyPickerOption = {
   type: DocumentPropertyType | "name";
 };
 
+const DATABASE_NAME_PICKER_OPTION: DatabasePropertyPickerOption = {
+  key: "name",
+  label: "Name",
+  type: "name",
+};
+
 export function databasePropertyPickerItems(
   properties: DocumentProperty[],
   query: string,
@@ -11609,9 +11594,7 @@ export function databasePropertyPickerItems(
 ): DatabasePropertyPickerOption[] {
   const normalizedQuery = query.trim().toLowerCase();
   const items: DatabasePropertyPickerOption[] = [
-    ...(includeName
-      ? [{ key: "name", label: "Name", type: "name" as const }]
-      : []),
+    ...(includeName ? [DATABASE_NAME_PICKER_OPTION] : []),
     ...properties.map((property) => ({
       key: property.definition.id,
       label: property.definition.name,
@@ -11627,6 +11610,23 @@ export function databasePropertyPickerItems(
   );
 }
 
+// Filters may repeat a property, so used properties are only deprioritized.
+// Excluding them would disable the add-rule actions once every one is used.
+export function databaseFilterRuleCandidate(
+  properties: DocumentProperty[],
+  filters: readonly DatabaseFilter[],
+): DatabasePropertyPickerOption {
+  const usedKeys = new Set(filters.map((filter) => filter.key));
+  const candidates = [
+    ...databasePropertyPickerItems(properties, "", { includeName: false }),
+    DATABASE_NAME_PICKER_OPTION,
+  ];
+  return (
+    candidates.find((candidate) => !usedKeys.has(candidate.key)) ??
+    candidates[0]
+  );
+}
+
 function DatabasePropertyPickerSearch({
   value,
   onChange,
@@ -11683,7 +11683,6 @@ function DatabasePropertyPickerMenuItems({
   properties,
   selectedKey,
   includeName,
-  excludeKeys,
   placeholder,
   closeOnSelect,
   onSelect,
@@ -11691,7 +11690,6 @@ function DatabasePropertyPickerMenuItems({
   properties: DocumentProperty[];
   selectedKey?: string;
   includeName?: boolean;
-  excludeKeys?: ReadonlySet<string>;
   placeholder?: string;
   closeOnSelect?: boolean;
   onSelect: (key: string, label: string) => void;
@@ -11699,7 +11697,6 @@ function DatabasePropertyPickerMenuItems({
   const [query, setQuery] = useState("");
   const items = databasePropertyPickerItems(properties, query, {
     includeName,
-    excludeKeys,
   });
 
   return (
@@ -17270,7 +17267,7 @@ function isActiveFilter(
   filter: DatabaseFilter | null,
 ): filter is DatabaseFilter {
   if (!filter) return false;
-  if (filterOperatorNeedsValue(filter.operator)) {
+  if (contentDatabaseFilterOperatorNeedsValue(filter.operator)) {
     return databaseFilterSelectedValues(filter.value).length > 0;
   }
   return true;
@@ -17295,11 +17292,18 @@ export function databasePropertyValuesForNewItem(
     );
     if (!property?.editable) continue;
     if (isComputedPropertyType(property.definition.type)) continue;
-    if (propertyValues[property.definition.id] !== undefined) continue;
 
     const value = databaseFilterDefaultValueForNewItem(filter, property);
-    if (value !== undefined) {
+    if (value === undefined) continue;
+    const current = propertyValues[property.definition.id];
+    if (current === undefined) {
       propertyValues[property.definition.id] = value;
+    } else if (Array.isArray(current) && Array.isArray(value)) {
+      // "Tags contains A" and "Tags contains B" both have to match, so a
+      // new row gets every value; one value would drop it from the view.
+      propertyValues[property.definition.id] = [
+        ...new Set([...current, ...value]),
+      ];
     }
   }
 
@@ -17627,7 +17631,7 @@ function SortFieldIcon({
   return <Icon className="mr-2 size-4 text-muted-foreground" />;
 }
 
-function FilterMenu({
+export function FilterMenu({
   filters,
   properties,
   inlineOpen,
@@ -17646,19 +17650,10 @@ function FilterMenu({
 }) {
   const activeFilters = filters.filter(isActiveFilter);
   const active = activeFilters.length > 0 || inlineOpen;
-  const excludedFilterKeys = useMemo(
-    () => new Set(activeFilters.map((filter) => filter.key)),
-    [activeFilters],
-  );
-  const advancedFilterCandidate =
-    databasePropertyPickerItems(properties, "", {
-      includeName: false,
-      excludeKeys: excludedFilterKeys,
-    })[0] ??
-    databasePropertyPickerItems(properties, "", {
-      includeName: true,
-      excludeKeys: excludedFilterKeys,
-    })[0];
+  const advancedFilterCandidate = databaseFilterRuleCandidate(
+    properties,
+    activeFilters,
+  );
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
@@ -17681,17 +17676,14 @@ function FilterMenu({
           <DatabasePropertyPickerMenuItems
             properties={properties}
             includeName
-            excludeKeys={excludedFilterKeys}
             placeholder={dbText("filterBy")}
             closeOnSelect
             onSelect={onAddFilter}
           />
           <DropdownMenuSeparator />
           <DropdownMenuItem
-            disabled={!advancedFilterCandidate}
             onSelect={(event) => {
               event.preventDefault();
-              if (!advancedFilterCandidate) return;
               onAddAdvancedFilter(
                 advancedFilterCandidate.key,
                 advancedFilterCandidate.label,
@@ -17982,6 +17974,8 @@ const FILTER_OPERATOR_LABELS: Record<FilterOperator, string> = {
   does_not_equal: "Is not",
   greater_than: "Greater than",
   less_than: "Less than",
+  greater_than_or_equal: "Greater than or equal to",
+  less_than_or_equal: "Less than or equal to",
   before: "Before",
   after: "After",
   between: "Between",
@@ -18020,50 +18014,10 @@ function databaseFilterOperatorInlineLabel(
 function filterOperatorsForKey(
   key: string,
   properties: DocumentProperty[],
-): FilterOperator[] {
-  const type = filterPropertyTypeForKey(key, properties);
-
-  if (type === "checkbox") {
-    return ["is_checked", "is_unchecked"];
-  }
-
-  if (
-    type === "select" ||
-    type === "status" ||
-    type === "multi_select" ||
-    type === "person"
-  ) {
-    return ["contains", "does_not_equal", "is_empty", "is_not_empty"];
-  }
-
-  if (type === "number") {
-    return [
-      "equals",
-      "does_not_equal",
-      "greater_than",
-      "less_than",
-      "is_empty",
-      "is_not_empty",
-    ];
-  }
-
-  if (
-    type === "date" ||
-    type === "created_time" ||
-    type === "last_edited_time"
-  ) {
-    return [
-      "equals",
-      "does_not_equal",
-      "before",
-      "after",
-      "between",
-      "is_empty",
-      "is_not_empty",
-    ];
-  }
-
-  return ["contains", "equals", "does_not_equal", "is_empty", "is_not_empty"];
+): readonly FilterOperator[] {
+  return contentDatabaseFilterOperatorsForType(
+    filterPropertyTypeForKey(key, properties),
+  );
 }
 
 function defaultFilterOperatorForKey(
@@ -18084,12 +18038,6 @@ function filterPropertyTypeForKey(
   );
 }
 
-function filterOperatorNeedsValue(operator: FilterOperator) {
-  return !["is_empty", "is_not_empty", "is_checked", "is_unchecked"].includes(
-    operator,
-  );
-}
-
 function filterValuePlaceholder(key: string, properties: DocumentProperty[]) {
   const type = filterPropertyTypeForKey(key, properties);
   if (type === "number") return "Number";
@@ -18127,7 +18075,7 @@ function DatabaseBetweenDateFilterValueControl({
   filter: DatabaseFilter;
   onValueChange: (value: string) => void;
 }) {
-  const [start, end] = databaseFilterDateRangeValues(filter.value);
+  const [start, end] = contentDatabaseFilterDateRangeValues(filter.value);
   const updateRange = (nextStart: string, nextEnd: string) => {
     onValueChange(databaseFilterEncodeDateRangeValues(nextStart, nextEnd));
   };
@@ -18244,7 +18192,7 @@ function databaseFilterValueLabel(
   properties: DocumentProperty[],
 ) {
   if (filter.operator === "between") {
-    const [start, end] = databaseFilterDateRangeValues(filter.value);
+    const [start, end] = contentDatabaseFilterDateRangeValues(filter.value);
     if (start && end) return `${start} to ${end}`;
     return start || end || "Choose dates";
   }
@@ -18283,20 +18231,6 @@ function databaseFilterSelectedValues(value: string) {
   }
 }
 
-function databaseFilterDateRangeValues(value: string): [string, string] {
-  const trimmed = value.trim();
-  if (!trimmed) return ["", ""];
-  try {
-    const parsed = JSON.parse(trimmed) as unknown;
-    if (!Array.isArray(parsed)) return [trimmed, ""];
-    const start = typeof parsed[0] === "string" ? parsed[0].trim() : "";
-    const end = typeof parsed[1] === "string" ? parsed[1].trim() : "";
-    return [start, end];
-  } catch {
-    return [trimmed, ""];
-  }
-}
-
 function databaseFilterEncodeDateRangeValues(start: string, end: string) {
   const normalizedStart = start.trim();
   const normalizedEnd = end.trim();
@@ -18329,17 +18263,62 @@ export function databaseInlineFilterLabel(
   filter: DatabaseFilter,
   properties: DocumentProperty[],
 ) {
-  if (!filterOperatorNeedsValue(filter.operator)) {
-    return `${filter.label}: ${databaseFilterOperatorLabel(
-      filter.operator,
-      filter.key,
-      properties,
-    )}`;
+  const operator = databaseFilterChipOperatorLabel(
+    filter.operator,
+    filter.key,
+    properties,
+  );
+  if (!contentDatabaseFilterOperatorNeedsValue(filter.operator)) {
+    return `${filter.label}: ${operator}`;
   }
   if (databaseFilterSelectedValues(filter.value).length === 0) {
     return filter.label;
   }
-  return `${filter.label}: ${databaseFilterValueLabel(filter, properties)}`;
+  const value = databaseFilterValueLabel(filter, properties);
+  return `${filter.label}: ${operator ? `${operator} ${value}` : value}`;
+}
+
+// Empty only for operators that read as a plain match ("Status: Done"). The
+// `never` default makes a new operator choose its wording; at runtime it
+// still catches unknown operators in saved views.
+function databaseFilterChipOperatorLabel(
+  operator: FilterOperator,
+  key: string,
+  properties: DocumentProperty[],
+): string {
+  const type = filterPropertyTypeForKey(key, properties);
+  switch (operator) {
+    case "contains":
+    case "between":
+      return "";
+    case "equals":
+      if (type === "number") return "=";
+      return databaseFilterOptionPropertyForKey(key, properties) ? "" : "is";
+    case "does_not_equal":
+      if (type === "number") return "≠";
+      return type === "multi_select" || type === "person"
+        ? "does not contain"
+        : "is not";
+    case "greater_than":
+      return ">";
+    case "less_than":
+      return "<";
+    case "greater_than_or_equal":
+      return "≥";
+    case "less_than_or_equal":
+      return "≤";
+    case "before":
+    case "after":
+    case "is_checked":
+    case "is_unchecked":
+    case "is_empty":
+    case "is_not_empty":
+      return databaseFilterOperatorInlineLabel(operator, key, properties);
+    default: {
+      const savedOperator: never = operator;
+      return databaseFilterOperatorInlineLabel(savedOperator, key, properties);
+    }
+  }
 }
 
 function databaseFilterPropertyForKey(
@@ -18718,7 +18697,7 @@ function DatabaseTableRow({
           <div
             key={property.definition.id}
             className={cn(
-              "flex min-w-0 hover:bg-muted/25",
+              "group/cell relative flex min-w-0 hover:bg-muted/25",
               databaseTableCellDensityClass(rowDensity),
               wrapCells ? "items-start" : "items-center",
             )}
@@ -18747,10 +18726,15 @@ function DatabaseTableRow({
             ) : (
               value
             )}
-            <DatabaseCellCommentMarker
+            <DatabaseCellComments
               item={item}
-              propertyId={itemProperty.definition.id}
-              propertyName={itemProperty.definition.name}
+              property={itemProperty}
+              rowSelected={selected}
+              besideEditButton={
+                canEdit &&
+                itemProperty.editable &&
+                itemProperty.definition.type === "relation"
+              }
             />
           </div>
         );