@agent-native/core 0.91.1 → 0.91.2

package/corpus/templates/content/app/components/editor/database/filter-sort.ts

@@ -53,13 +53,12 @@ export function applyDatabaseView(
   const activeFilters = filters.filter(isActiveFilter);
   const filtered = activeFilters.length
     ? searched.filter((item) =>
-        filterMode === "or"
-          ? activeFilters.some((filter) =>
-              databaseItemMatchesFilter(item, properties, filter),
-            )
-          : activeFilters.every((filter) =>
-              databaseItemMatchesFilter(item, properties, filter),
-            ),
+        databaseItemMatchesFilterTree(
+          item,
+          properties,
+          activeFilters,
+          filterMode,
+        ),
       )
     : searched;
 
@@ -79,6 +78,53 @@ export function applyDatabaseView(
   });
 }
 
+function databaseItemMatchesFilterTree(
+  item: ContentDatabaseItem,
+  properties: DocumentProperty[],
+  filters: DatabaseFilter[],
+  filterMode: DatabaseFilterMode,
+) {
+  const rootFilters = filters.filter((filter) => !filter.parentFilterGroupId);
+  const nestedGroups = nestedDatabaseFilterGroups(filters);
+  const matches = [
+    ...rootFilters.map((filter) =>
+      databaseItemMatchesFilter(item, properties, filter),
+    ),
+    ...nestedGroups.map((group) =>
+      combineDatabaseFilterMatches(
+        group.map((filter) =>
+          databaseItemMatchesFilter(item, properties, filter),
+        ),
+        filterMode,
+      ),
+    ),
+  ];
+
+  return combineDatabaseFilterMatches(matches, filterMode);
+}
+
+function nestedDatabaseFilterGroups(filters: DatabaseFilter[]) {
+  const groups = new Map<string, DatabaseFilter[]>();
+  for (const filter of filters) {
+    if (!filter.parentFilterGroupId || !filter.filterGroupId) continue;
+    groups.set(filter.filterGroupId, [
+      ...(groups.get(filter.filterGroupId) ?? []),
+      filter,
+    ]);
+  }
+  return [...groups.values()].filter((group) => group.length > 0);
+}
+
+function combineDatabaseFilterMatches(
+  matches: boolean[],
+  filterMode: DatabaseFilterMode,
+) {
+  if (matches.length === 0) return true;
+  return filterMode === "or"
+    ? matches.some((matched) => matched)
+    : matches.every((matched) => matched);
+}
+
 export function defaultDatabaseSort(): DatabaseSort {
   return {
     key: "name",
@@ -284,15 +330,27 @@ function databaseFilterDefaultValueForNewItem(
   if (filter.operator === "is_unchecked") {
     return property.definition.type === "checkbox" ? false : undefined;
   }
+  if (property.definition.type === "multi_select") {
+    if (filter.operator !== "equals" && filter.operator !== "contains") {
+      return undefined;
+    }
+    const values = databaseFilterSelectedValues(filter.value);
+    if (values.length === 0) return undefined;
+    return values.map(
+      (value) =>
+        databasePropertyOptionIdForFilterValue(property, value) ?? value,
+    );
+  }
+  if (property.definition.type === "person" && filter.operator === "contains") {
+    const values = databaseFilterSelectedValues(filter.value);
+    return values.length > 0 ? values : undefined;
+  }
   if (filter.operator !== "equals") return undefined;
 
   const value = filter.value.trim();
   if (!value) return undefined;
 
   const optionValue = databasePropertyOptionIdForFilterValue(property, value);
-  if (property.definition.type === "multi_select") {
-    return [optionValue ?? value];
-  }
   if (
     property.definition.type === "select" ||
     property.definition.type === "status"
@@ -320,6 +378,47 @@ function databasePropertyOptionIdForFilterValue(
   )?.id;
 }
 
+function databaseFilterSelectedValues(value: string) {
+  const trimmed = value.trim();
+  if (!trimmed) return [];
+  try {
+    const parsed = JSON.parse(trimmed) as unknown;
+    if (!Array.isArray(parsed)) return [trimmed];
+    return [
+      ...new Set(
+        parsed
+          .filter((item): item is string => typeof item === "string")
+          .map((item) => item.trim())
+          .filter(Boolean),
+      ),
+    ];
+  } catch {
+    return [trimmed];
+  }
+}
+
+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 databaseFilterDateRangeValue(value: string): [number, number] | null {
+  const [startValue, endValue] = databaseFilterDateRangeValues(value);
+  const start = new Date(startValue).getTime();
+  const end = new Date(endValue).getTime();
+  if (!Number.isFinite(start) || !Number.isFinite(end)) return null;
+  return start <= end ? [start, end] : [end, start];
+}
+
 function databaseItemMatchesFilter(
   item: ContentDatabaseItem,
   properties: DocumentProperty[],
@@ -343,10 +442,20 @@ function databaseItemMatchesFilter(
       : current < target;
   }
 
-  if (filter.operator === "before" || filter.operator === "after") {
+  if (
+    filter.operator === "before" ||
+    filter.operator === "after" ||
+    filter.operator === "between"
+  ) {
     const current = propertyDateValue(property);
+    if (!Number.isFinite(current)) return false;
+    if (filter.operator === "between") {
+      const range = databaseFilterDateRangeValue(filter.value);
+      if (!range) return false;
+      return current >= range[0] && current <= range[1];
+    }
     const target = new Date(filter.value.trim()).getTime();
-    if (!Number.isFinite(current) || !Number.isFinite(target)) return false;
+    if (!Number.isFinite(target)) return false;
     return filter.operator === "before" ? current < target : current > target;
   }
 
@@ -355,8 +464,31 @@ function databaseItemMatchesFilter(
     properties,
     filter.key,
   ).map((candidate) => candidate.trim().toLowerCase());
+  const selectedFilterValues = databaseFilterSelectedValues(filter.value).map(
+    (candidate) => candidate.trim().toLowerCase(),
+  );
   const normalizedValue = value.trim().toLowerCase();
-  const normalizedFilter = filter.value.trim().toLowerCase();
+  const normalizedFilter = selectedFilterValues[0] ?? "";
+  const usesDiscreteValues =
+    property?.definition.type === "select" ||
+    property?.definition.type === "status" ||
+    property?.definition.type === "multi_select" ||
+    property?.definition.type === "person";
+
+  if (
+    usesDiscreteValues &&
+    (filter.operator === "equals" || filter.operator === "contains")
+  ) {
+    return selectedFilterValues.some((filterValue) =>
+      candidateValues.includes(filterValue),
+    );
+  }
+  if (usesDiscreteValues && filter.operator === "does_not_equal") {
+    return selectedFilterValues.every(
+      (filterValue) => !candidateValues.includes(filterValue),
+    );
+  }
+
   if (filter.operator === "equals") {
     return candidateValues.includes(normalizedFilter);
   }
@@ -529,9 +661,66 @@ export function propertyNumberValue(
 export function databaseFilterOptionChoices(
   key: string,
   properties: DocumentProperty[],
+  items: ContentDatabaseItem[] = [],
 ) {
-  const property = databaseFilterOptionPropertyForKey(key, properties);
-  return property?.definition.options.options ?? [];
+  const property = databaseFilterPropertyForKey(key, properties);
+  if (property?.definition.type === "person") {
+    return databaseFilterPersonChoices(property.definition.id, items);
+  }
+  const optionProperty = databaseFilterOptionPropertyForKey(key, properties);
+  return optionProperty?.definition.options.options ?? [];
+}
+
+function databaseFilterPersonChoices(
+  propertyId: string,
+  items: ContentDatabaseItem[],
+) {
+  const people = new Map<string, string>();
+  for (const item of items) {
+    const property = item.properties.find(
+      (candidate) => candidate.definition.id === propertyId,
+    );
+    for (const person of databasePersonItems(property?.value ?? null)) {
+      const key = person.trim().toLowerCase();
+      if (!people.has(key)) people.set(key, person);
+    }
+  }
+  return Array.from(people.values()).map((person) => ({
+    id: person,
+    name: databasePersonLabel(person),
+    color: "gray" as const,
+  }));
+}
+
+function databasePersonItems(value: DocumentProperty["value"]) {
+  const rawItems = Array.isArray(value)
+    ? value
+    : typeof value === "string"
+      ? value.split(/[\n,]+/)
+      : [];
+  const seen = new Set<string>();
+  return rawItems
+    .map((item) => item.trim())
+    .filter((item) => {
+      if (!item) return false;
+      const key = item.toLowerCase();
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    });
+}
+
+function databasePersonLabel(value: string) {
+  const trimmed = value.trim();
+  if (!trimmed) return "Empty";
+  return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(trimmed)
+    ? trimmed
+        .split("@")[0]
+        .split(/[._-]+/)
+        .filter(Boolean)
+        .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+        .join(" ")
+    : trimmed;
 }
 
 export function databaseFilterOptionPropertyForKey(
@@ -543,7 +732,8 @@ export function databaseFilterOptionPropertyForKey(
   if (
     property.definition.type !== "select" &&
     property.definition.type !== "status" &&
-    property.definition.type !== "multi_select"
+    property.definition.type !== "multi_select" &&
+    property.definition.type !== "person"
   ) {
     return null;
   }
@@ -554,6 +744,11 @@ function databaseFilterValueLabel(
   filter: DatabaseFilter,
   properties: DocumentProperty[],
 ) {
+  if (filter.operator === "between") {
+    const [start, end] = databaseFilterDateRangeValues(filter.value);
+    if (start && end) return `${start} to ${end}`;
+    return start || end || "Choose dates";
+  }
   const option = databaseFilterOptionChoices(filter.key, properties).find(
     (candidate) =>
       candidate.id === filter.value || candidate.name === filter.value,
@@ -593,6 +788,7 @@ export const FILTER_OPERATOR_LABELS: Record<FilterOperator, string> = {
   less_than: "Less than",
   before: "Before",
   after: "After",
+  between: "Between",
   is_checked: "Checked",
   is_unchecked: "Unchecked",
   is_empty: "Is empty",
@@ -609,8 +805,13 @@ export function filterOperatorsForKey(
     return ["is_checked", "is_unchecked"];
   }
 
-  if (type === "select" || type === "status" || type === "multi_select") {
-    return ["equals", "does_not_equal", "is_empty", "is_not_empty"];
+  if (
+    type === "select" ||
+    type === "status" ||
+    type === "multi_select" ||
+    type === "person"
+  ) {
+    return ["contains", "does_not_equal", "is_empty", "is_not_empty"];
   }
 
   if (type === "number") {
@@ -634,6 +835,7 @@ export function filterOperatorsForKey(
       "does_not_equal",
       "before",
       "after",
+      "between",
       "is_empty",
       "is_not_empty",
     ];

package/corpus/templates/content/app/hooks/use-content-database.ts

@@ -6,6 +6,7 @@ import type {
   BuilderCmsModelsResponse,
   ChangeContentDatabaseSourceRoleRequest,
   ContentDatabaseResponse,
+  ContentDatabasePersonalViewResponse,
   ContentDatabaseSourceFieldMapping,
   CreateInlineDatabaseRequest,
   CreateInlineDatabaseResponse,
@@ -34,6 +35,7 @@ import type {
   StageBuilderSourceBulkUpdateResponse,
   StageBuilderRevisionRequest,
   SuggestSourceJoinKeyResponse,
+  UpdateContentDatabasePersonalViewRequest,
   UpdateContentDatabaseViewRequest,
   ValidateBuilderSourceExecutionRequest,
 } from "@shared/api";
@@ -614,6 +616,36 @@ export function useUpdateContentDatabaseView(documentId: string) {
   });
 }
 
+export function useContentDatabasePersonalView(databaseId: string | null) {
+  return useActionQuery<ContentDatabasePersonalViewResponse>(
+    "get-content-database-personal-view",
+    databaseId ? { databaseId } : undefined,
+    {
+      enabled: !!databaseId,
+      retry: false,
+      placeholderData: (previous) => previous,
+    },
+  );
+}
+
+export function useUpdateContentDatabasePersonalView(
+  databaseId: string | null,
+) {
+  const queryClient = useQueryClient();
+  return useActionMutation<
+    ContentDatabasePersonalViewResponse,
+    UpdateContentDatabasePersonalViewRequest
+  >("update-content-database-personal-view", {
+    onSuccess: (data) => {
+      if (!databaseId) return;
+      queryClient.setQueryData(
+        ["action", "get-content-database-personal-view", { databaseId }],
+        data,
+      );
+    },
+  });
+}
+
 export function useAttachContentDatabaseSource(documentId: string) {
   const queryClient = useQueryClient();
   return useActionMutation<

package/corpus/templates/content/app/i18n/zh-TW.ts

@@ -655,9 +655,18 @@ const messages = {
     failedToMoveRow: "行動行失敗",
     failedToSavePageIcon: "儲存頁面圖示失敗",
     failedToSavePagePreview: "儲存頁面預覽失敗",
+    failedToSaveView: "儲存檢視失敗",
     failedToUpdateCheckbox: "更新核取方塊失敗",
     failedToUpdateEverySelectedRow: "未能更新所有選取行",
     filter: "篩選",
+    filterBy: "篩選條件...",
+    addAdvancedFilter: "新增進階篩選器",
+    addFilterRule: "新增篩選規則",
+    addFilterGroup: "新增篩選群組",
+    nestedFilterGroupUnavailable: "巢狀篩選群組需要資料模型更新",
+    deleteFilter: "刪除篩選器",
+    where: "條件",
+    sortBy: "排序依據...",
     group: "分組",
     click: "點選",
     column: "列",
@@ -665,6 +674,7 @@ const messages = {
     clearColumn: "清空列",
     clearRow: "清空行",
     deleteColumn: "刪除列",
+    deleteSort: "刪除排序",
     drag: "拖動",
     headerColumn: "標題列",
     headerRow: "標題行",
@@ -675,6 +685,8 @@ const messages = {
     insertRight: "在右側插入",
     layout: "布局",
     matchExistingItemsToDetails: "將現有項目比對到詳細資料",
+    moveFilterDown: "下移",
+    moveFilterUp: "上移",
     name: "名稱",
     nameColumnMenu: "名稱列選單",
     newBoardGroupName: "新看板分組名稱",
@@ -691,19 +703,23 @@ const messages = {
     noRowsMatchThisView: "沒有行匹配此檢視",
     editFilesForSelectedRows: "編輯所選行的檔案",
     oneFileOrMediaLinkPerLine: "每行一個檔案或媒體連結",
+    personalViewChanges: "僅自己可見",
     previewPageTitle: "預覽頁面標題",
     previousDatabasePage: "上一頁面資料庫頁面",
     previousMonth: "上個月",
     previousTimelineRange: "上一個時間線範圍",
     propertyVisibility: "屬性可見性",
+    reset: "重設",
     resizeNameColumn: "調整名稱列寬",
     row: "行",
     rowOptions: "行選項",
     search: "搜尋",
+    saveForEveryone: "為所有人儲存",
     searchBuilderModels: "搜尋 Builder 模型",
     searchGroupProperties: "搜尋分組屬性",
     searchModels: "搜尋模型",
     searchOptions: "搜尋選項",
+    searchForAProperty: "搜尋屬性...",
     searchProperties: "搜尋屬性",
     somethingWentWrong: "出了點問題",
     sort: "排序",