Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Implement collaborator, created by, updated by and updated at field filters (#126)
Hakan Shehu5c95a031946d
diff --git a/packages/client/src/handlers/queries/records/record-field-value-count.ts b/packages/client/src/handlers/queries/records/record-field-value-count.tsindex d7033128..f72fdfe6 100644--- a/packages/client/src/handlers/queries/records/record-field-value-count.ts+++ b/packages/client/src/handlers/queries/records/record-field-value-count.ts@@ -115,6 +115,7 @@ export class RecordFieldValueCountQueryHandlerprivate async fetchFieldValueCounts(input: RecordFieldValueCountQueryInput): Promise<RecordFieldValueCountQueryOutput> {+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);const database = await this.fetchDatabase(input);const field = database.attributes.fields[input.fieldId];@@ -127,12 +128,11 @@ export class RecordFieldValueCountQueryHandlerconst filterQuery = buildFiltersQuery(input.filters,- database.attributes.fields+ database.attributes.fields,+ workspace.userId);const queryString = this.buildQuery(input.databaseId, field, filterQuery);-- const workspace = this.getWorkspace(input.accountId, input.workspaceId);const query = sql<RecordFieldValueCount>`${sql.raw(queryString)}`.compile(workspace.database);diff --git a/packages/client/src/handlers/queries/records/record-list.ts b/packages/client/src/handlers/queries/records/record-list.tsindex 8c296236..f83ecb2f 100644--- a/packages/client/src/handlers/queries/records/record-list.ts+++ b/packages/client/src/handlers/queries/records/record-list.ts@@ -133,13 +133,14 @@ export class RecordListQueryHandlerprivate async fetchRecords(input: RecordListQueryInput): Promise<SelectNode[]> {+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);const database = await this.fetchDatabase(input);const filterQuery = buildFiltersQuery(input.filters,- database.attributes.fields+ database.attributes.fields,+ workspace.userId);- const workspace = this.getWorkspace(input.accountId, input.workspaceId);const orderByQuery = `ORDER BY ${input.sorts.length > 0 ? buildSortOrdersQuery(input.sorts, database.attributes.fields) : 'n."id" ASC'}`;const offset = (input.page - 1) * input.count;const query = sql<SelectNode>`diff --git a/packages/client/src/handlers/queries/users/user-search.ts b/packages/client/src/handlers/queries/users/user-search.tsindex dd8ecb4d..a0a378a6 100644--- a/packages/client/src/handlers/queries/users/user-search.ts+++ b/packages/client/src/handlers/queries/users/user-search.ts@@ -85,7 +85,6 @@ export class UserSearchQueryHandlerlet queryBuilder = workspace.database.selectFrom('users').selectAll()- .where('id', '!=', workspace.userId).where('name', 'like', `%${input.searchQuery}%`);if (exclude.length > 0) {@@ -102,7 +101,6 @@ export class UserSearchQueryHandlerconst exclude = input.exclude ?? [];return workspace.database.selectFrom('users')- .where('id', '!=', workspace.userId).where('id', 'not in', exclude).selectAll().execute();diff --git a/packages/client/src/lib/records.ts b/packages/client/src/lib/records.tsindex c436539a..998be22e 100644--- a/packages/client/src/lib/records.ts+++ b/packages/client/src/lib/records.ts@@ -37,14 +37,15 @@ type SqliteOperator =export const buildFiltersQuery = (filters: DatabaseViewFilterAttributes[],- fields: Record<string, FieldAttributes>+ fields: Record<string, FieldAttributes>,+ userId: string): string => {if (filters.length === 0) {return '';}const filterQueries = filters- .map((filter) => buildFilterQuery(filter, fields))+ .map((filter) => buildFilterQuery(filter, fields, userId)).filter((query) => query !== null);if (filterQueries.length === 0) {@@ -56,7 +57,8 @@ export const buildFiltersQuery = (const buildFilterQuery = (filter: DatabaseViewFilterAttributes,- fields: Record<string, FieldAttributes>+ fields: Record<string, FieldAttributes>,+ userId: string): string | null => {if (filter.type === 'group') {return null;@@ -75,11 +77,11 @@ const buildFilterQuery = (case 'boolean':return buildBooleanFilterQuery(filter, field);case 'collaborator':- return buildCollaboratorFilterQuery(filter, field);+ return buildCollaboratorFilterQuery(filter, field, userId);case 'created_at':return buildCreatedAtFilterQuery(filter, field);case 'created_by':- return buildCreatedByFilterQuery(filter, field);+ return buildCreatedByFilterQuery(filter, field, userId);case 'date':return buildDateFilterQuery(filter, field);case 'email':@@ -101,7 +103,7 @@ const buildFilterQuery = (case 'updated_at':return buildUpdatedAtFilterQuery(filter, field);case 'updated_by':- return buildUpdatedByFilterQuery(filter, field);+ return buildUpdatedByFilterQuery(filter, field, userId);default:return null;}@@ -166,7 +168,8 @@ const buildBooleanFilterQuery = (const buildCollaboratorFilterQuery = (filter: DatabaseViewFieldFilterAttributes,- field: CollaboratorFieldAttributes+ field: CollaboratorFieldAttributes,+ userId: string): string | null => {if (filter.operator === 'is_empty') {return buildFieldArrayIsEmptyFilterQuery(field.id);@@ -176,6 +179,14 @@ const buildCollaboratorFilterQuery = (return buildFieldArrayIsNotEmptyFilterQuery(field.id);}+ if (filter.operator === 'is_me') {+ return buildArrayFieldContainsFilterQuery(field.id, [userId]);+ }++ if (filter.operator === 'is_not_me') {+ return buildArrayFieldDoesNotContainFilterQuery(field.id, [userId]);+ }+if (!isStringArray(filter.value)) {return null;}@@ -519,14 +530,6 @@ const buildCreatedAtFilterQuery = (filter: DatabaseViewFieldFilterAttributes,_: CreatedAtFieldAttributes): string | null => {- if (filter.operator === 'is_empty') {- return buildColumnFilterQuery('created_at', 'IS', 'NULL');- }-- if (filter.operator === 'is_not_empty') {- return buildColumnFilterQuery('created_at', 'IS NOT', 'NULL');- }-if (filter.value === null) {return null;}@@ -562,14 +565,15 @@ const buildCreatedAtFilterQuery = (const buildCreatedByFilterQuery = (filter: DatabaseViewFieldFilterAttributes,- _: CreatedByFieldAttributes+ _: CreatedByFieldAttributes,+ userId: string): string | null => {- if (filter.operator === 'is_empty') {- return buildColumnFilterQuery('created_by', 'IS', 'NULL');+ if (filter.operator === 'is_me') {+ return buildColumnFilterQuery('created_by', '=', `'${userId}'`);}- if (filter.operator === 'is_not_empty') {- return buildColumnFilterQuery('created_by', 'IS NOT', 'NULL');+ if (filter.operator === 'is_not_me') {+ return buildColumnFilterQuery('created_by', '!=', `'${userId}'`);}if (!isStringArray(filter.value)) {@@ -645,7 +649,8 @@ const buildUpdatedAtFilterQuery = (const buildUpdatedByFilterQuery = (filter: DatabaseViewFieldFilterAttributes,- _: UpdatedByFieldAttributes+ _: UpdatedByFieldAttributes,+ userId: string): string | null => {if (filter.operator === 'is_empty') {return buildColumnFilterQuery('updated_by', 'IS', 'NULL');@@ -655,6 +660,14 @@ const buildUpdatedByFilterQuery = (return buildColumnFilterQuery('updated_by', 'IS NOT', 'NULL');}+ if (filter.operator === 'is_me') {+ return buildColumnFilterQuery('updated_by', '=', `'${userId}'`);+ }++ if (filter.operator === 'is_not_me') {+ return buildColumnFilterQuery('updated_by', '!=', `'${userId}'`);+ }+if (!isStringArray(filter.value)) {return null;}diff --git a/packages/client/src/types/editor.ts b/packages/client/src/types/editor.tsindex 46a6535c..9d5d5f2a 100644--- a/packages/client/src/types/editor.ts+++ b/packages/client/src/types/editor.ts@@ -8,6 +8,7 @@ export type EditorCommandProps = {};export type EditorContext = {+ userId: string;documentId: string;accountId: string;workspaceId: string;diff --git a/packages/ui/src/components/chats/chat-create-popover.tsx b/packages/ui/src/components/chats/chat-create-popover.tsxindex 325f26a9..8552b76e 100644--- a/packages/ui/src/components/chats/chat-create-popover.tsx+++ b/packages/ui/src/components/chats/chat-create-popover.tsx@@ -26,6 +26,7 @@ export const ChatCreatePopover = () => {</PopoverTrigger><PopoverContent className="w-96 p-1"><UserSearch+ exclude={[workspace.userId]}onSelect={(user) => {if (isPending) return;diff --git a/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx b/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsxnew file mode 100644index 00000000..90ef8e42--- /dev/null+++ b/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx@@ -0,0 +1,238 @@+import { ChevronDown, Trash2, X } from 'lucide-react';++import { User } from '@colanode/client/types';+import {+ DatabaseViewFieldFilterAttributes,+ CollaboratorFieldAttributes,+} from '@colanode/core';+import { Avatar } from '@colanode/ui/components/avatars/avatar';+import { FieldIcon } from '@colanode/ui/components/databases/fields/field-icon';+import { Badge } from '@colanode/ui/components/ui/badge';+import { Button } from '@colanode/ui/components/ui/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@colanode/ui/components/ui/dropdown-menu';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@colanode/ui/components/ui/popover';+import { Separator } from '@colanode/ui/components/ui/separator';+import { UserSearch } from '@colanode/ui/components/users/user-search';+import { useDatabaseView } from '@colanode/ui/contexts/database-view';+import { useWorkspace } from '@colanode/ui/contexts/workspace';+import { useQueries } from '@colanode/ui/hooks/use-queries';+import {+ collaboratorFieldFilterOperators,+ createdByFieldFilterOperators,+} from '@colanode/ui/lib/databases';++interface ViewCollaboratorFieldFilterProps {+ field: CollaboratorFieldAttributes;+ filter: DatabaseViewFieldFilterAttributes;+}++const CollaboratorBadge = ({ collaborator }: { collaborator: User }) => {+ return (+ <div className="flex flex-row items-center gap-1 text-sm">+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ size="small"+ />+ <p>{collaborator.name}</p>+ </div>+ );+};++const isOperatorWithoutValue = (operator: string) => {+ return (+ operator === 'is_me' ||+ operator === 'is_not_me' ||+ operator === 'is_empty' ||+ operator === 'is_not_empty'+ );+};++export const ViewCollaboratorFieldFilter = ({+ field,+ filter,+}: ViewCollaboratorFieldFilterProps) => {+ const workspace = useWorkspace();+ const view = useDatabaseView();++ const operator =+ collaboratorFieldFilterOperators.find(+ (operator) => operator.value === filter.operator+ ) ?? collaboratorFieldFilterOperators[0]!;++ const collaboratorIds = (filter.value as string[]) ?? [];+ const results = useQueries(+ collaboratorIds.map((id) => ({+ type: 'user.get',+ userId: id,+ accountId: workspace.accountId,+ workspaceId: workspace.id,+ }))+ );++ const collaborators: User[] = [];+ for (const result of results) {+ if (result.data) {+ collaborators.push(result.data);+ }+ }+ const hideInput = isOperatorWithoutValue(operator.value);++ return (+ <Popover+ open={view.isFieldFilterOpened(filter.id)}+ onOpenChange={() => {+ if (view.isFieldFilterOpened(filter.id)) {+ view.closeFieldFilter(filter.id);+ } else {+ view.openFieldFilter(filter.id);+ }+ }}+ >+ <PopoverTrigger asChild>+ <Button+ type="button"+ variant="outline"+ size="sm"+ className="border-dashed text-xs text-muted-foreground"+ >+ {field.name}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="flex w-96 flex-col gap-2 p-2">+ <div className="flex flex-row items-center gap-3 text-sm">+ <div className="flex flex-row items-center gap-0.5 p-1">+ <FieldIcon type={field.type} className="size-4" />+ <p>{field.name}</p>+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <ChevronDown className="size-4 text-muted-foreground" />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {createdByFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ const value = isOperatorWithoutValue(operator.value)+ ? []+ : collaboratorIds;++ view.updateFilter(filter.id, {+ ...filter,+ operator: operator.value,+ value: value,+ });+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ view.removeFilter(filter.id);+ }}+ >+ <Trash2 className="size-4" />+ </Button>+ </div>+ {!hideInput && (+ <Popover>+ <PopoverTrigger asChild>+ <div className="flex h-full w-full cursor-pointer flex-row items-center gap-1 rounded-md border border-input p-2">+ {collaborators.slice(0, 1).map((collaborator) => (+ <CollaboratorBadge+ key={collaborator.id}+ collaborator={collaborator}+ />+ ))}+ {collaborators.length === 0 && (+ <p className="text-xs text-muted-foreground">+ No collaborators selected+ </p>+ )}+ {collaborators.length > 1 && (+ <Badge+ variant="outline"+ className="ml-2 text-xs px-1 text-muted-foreground"+ >+ +{collaborators.length - 1}+ </Badge>+ )}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-80 p-1">+ {collaborators.length > 0 && (+ <div className="flex flex-col flex-wrap gap-2 p-2">+ {collaborators.map((collaborator) => (+ <div+ key={collaborator.id}+ className="flex w-full flex-row items-center gap-2"+ >+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ className="h-7 w-7"+ />+ <div className="flex flex-grow flex-col">+ <p className="text-sm">{collaborator.name}</p>+ <p className="text-xs text-muted-foreground">+ {collaborator.email}+ </p>+ </div>+ <X+ className="size-4 cursor-pointer"+ onClick={() => {+ const newCollaborators = collaboratorIds.filter(+ (id) => id !== collaborator.id+ );++ view.updateFilter(filter.id, {+ ...filter,+ value: newCollaborators,+ });+ }}+ />+ </div>+ ))}+ <Separator className="w-full my-2" />+ </div>+ )}+ <UserSearch+ exclude={collaboratorIds}+ onSelect={(user) => {+ const newCollaborators = collaboratorIds.includes(user.id)+ ? collaboratorIds.filter((id) => id !== user.id)+ : [...collaboratorIds, user.id];++ view.updateFilter(filter.id, {+ ...filter,+ value: newCollaborators,+ });+ }}+ />+ </PopoverContent>+ </Popover>+ )}+ </PopoverContent>+ </Popover>+ );+};diff --git a/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsx b/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsxindex d99cf0a4..ea7fe2b1 100644--- a/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsx+++ b/packages/ui/src/components/databases/search/view-created-at-field-fitler.tsx@@ -19,7 +19,7 @@ import {PopoverTrigger,} from '@colanode/ui/components/ui/popover';import { useDatabaseView } from '@colanode/ui/contexts/database-view';-import { dateFieldFilterOperators } from '@colanode/ui/lib/databases';+import { createdAtFieldFilterOperators } from '@colanode/ui/lib/databases';interface ViewCreatedAtFieldFilterProps {field: CreatedAtFieldAttributes;@@ -33,9 +33,9 @@ export const ViewCreatedAtFieldFilter = ({const view = useDatabaseView();const operator =- dateFieldFilterOperators.find(+ createdAtFieldFilterOperators.find((operator) => operator.value === filter.operator- ) ?? dateFieldFilterOperators[0];+ ) ?? createdAtFieldFilterOperators[0];if (!operator) {return null;@@ -79,16 +79,11 @@ export const ViewCreatedAtFieldFilter = ({</div></DropdownMenuTrigger><DropdownMenuContent>- {dateFieldFilterOperators.map((operator) => (+ {createdAtFieldFilterOperators.map((operator) => (<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? null- : dateValue?.toISOString();-+ const value = dateValue?.toISOString();view.updateFilter(filter.id, {...filter,operator: operator.value,diff --git a/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx b/packages/ui/src/components/databases/search/view-created-by-field-filter.tsxnew file mode 100644index 00000000..6e5e522b--- /dev/null+++ b/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx@@ -0,0 +1,230 @@+import { ChevronDown, Trash2, X } from 'lucide-react';++import { User } from '@colanode/client/types';+import {+ DatabaseViewFieldFilterAttributes,+ CreatedByFieldAttributes,+} from '@colanode/core';+import { Avatar } from '@colanode/ui/components/avatars/avatar';+import { FieldIcon } from '@colanode/ui/components/databases/fields/field-icon';+import { Badge } from '@colanode/ui/components/ui/badge';+import { Button } from '@colanode/ui/components/ui/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@colanode/ui/components/ui/dropdown-menu';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@colanode/ui/components/ui/popover';+import { Separator } from '@colanode/ui/components/ui/separator';+import { UserSearch } from '@colanode/ui/components/users/user-search';+import { useDatabaseView } from '@colanode/ui/contexts/database-view';+import { useWorkspace } from '@colanode/ui/contexts/workspace';+import { useQueries } from '@colanode/ui/hooks/use-queries';+import { createdByFieldFilterOperators } from '@colanode/ui/lib/databases';++interface ViewCreatedByFieldFilterProps {+ field: CreatedByFieldAttributes;+ filter: DatabaseViewFieldFilterAttributes;+}++const CollaboratorBadge = ({ collaborator }: { collaborator: User }) => {+ return (+ <div className="flex flex-row items-center gap-1 text-sm">+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ size="small"+ />+ <p>{collaborator.name}</p>+ </div>+ );+};++const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_me' || operator === 'is_not_me';+};++export const ViewCreatedByFieldFilter = ({+ field,+ filter,+}: ViewCreatedByFieldFilterProps) => {+ const workspace = useWorkspace();+ const view = useDatabaseView();++ const operator =+ createdByFieldFilterOperators.find(+ (operator) => operator.value === filter.operator+ ) ?? createdByFieldFilterOperators[0]!;++ const collaboratorIds = (filter.value as string[]) ?? [];+ const results = useQueries(+ collaboratorIds.map((id) => ({+ type: 'user.get',+ userId: id,+ accountId: workspace.accountId,+ workspaceId: workspace.id,+ }))+ );++ const collaborators: User[] = [];+ for (const result of results) {+ if (result.data) {+ collaborators.push(result.data);+ }+ }+ const hideInput = isOperatorWithoutValue(operator.value);++ return (+ <Popover+ open={view.isFieldFilterOpened(filter.id)}+ onOpenChange={() => {+ if (view.isFieldFilterOpened(filter.id)) {+ view.closeFieldFilter(filter.id);+ } else {+ view.openFieldFilter(filter.id);+ }+ }}+ >+ <PopoverTrigger asChild>+ <Button+ type="button"+ variant="outline"+ size="sm"+ className="border-dashed text-xs text-muted-foreground"+ >+ {field.name}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="flex w-96 flex-col gap-2 p-2">+ <div className="flex flex-row items-center gap-3 text-sm">+ <div className="flex flex-row items-center gap-0.5 p-1">+ <FieldIcon type={field.type} className="size-4" />+ <p>{field.name}</p>+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <ChevronDown className="size-4 text-muted-foreground" />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {createdByFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ const value = isOperatorWithoutValue(operator.value)+ ? []+ : collaboratorIds;++ view.updateFilter(filter.id, {+ ...filter,+ operator: operator.value,+ value: value,+ });+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ view.removeFilter(filter.id);+ }}+ >+ <Trash2 className="size-4" />+ </Button>+ </div>+ {!hideInput && (+ <Popover>+ <PopoverTrigger asChild>+ <div className="flex h-full w-full cursor-pointer flex-row items-center gap-1 rounded-md border border-input p-2">+ {collaborators.slice(0, 1).map((collaborator) => (+ <CollaboratorBadge+ key={collaborator.id}+ collaborator={collaborator}+ />+ ))}+ {collaborators.length === 0 && (+ <p className="text-xs text-muted-foreground">+ No collaborators selected+ </p>+ )}+ {collaborators.length > 1 && (+ <Badge+ variant="outline"+ className="ml-2 text-xs px-1 text-muted-foreground"+ >+ +{collaborators.length - 1}+ </Badge>+ )}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-80 p-1">+ {collaborators.length > 0 && (+ <div className="flex flex-col flex-wrap gap-2 p-2">+ {collaborators.map((collaborator) => (+ <div+ key={collaborator.id}+ className="flex w-full flex-row items-center gap-2"+ >+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ className="h-7 w-7"+ />+ <div className="flex flex-grow flex-col">+ <p className="text-sm">{collaborator.name}</p>+ <p className="text-xs text-muted-foreground">+ {collaborator.email}+ </p>+ </div>+ <X+ className="size-4 cursor-pointer"+ onClick={() => {+ const newCollaborators = collaboratorIds.filter(+ (id) => id !== collaborator.id+ );++ view.updateFilter(filter.id, {+ ...filter,+ value: newCollaborators,+ });+ }}+ />+ </div>+ ))}+ <Separator className="w-full my-2" />+ </div>+ )}+ <UserSearch+ exclude={collaboratorIds}+ onSelect={(user) => {+ const newCollaborators = collaboratorIds.includes(user.id)+ ? collaboratorIds.filter((id) => id !== user.id)+ : [...collaboratorIds, user.id];++ view.updateFilter(filter.id, {+ ...filter,+ value: newCollaborators,+ });+ }}+ />+ </PopoverContent>+ </Popover>+ )}+ </PopoverContent>+ </Popover>+ );+};diff --git a/packages/ui/src/components/databases/search/view-date-field-filter.tsx b/packages/ui/src/components/databases/search/view-date-field-filter.tsxindex ce6fac93..40b41a88 100644--- a/packages/ui/src/components/databases/search/view-date-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-date-field-filter.tsx@@ -26,6 +26,10 @@ interface ViewDateFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewDateFieldFilter = ({field,filter,@@ -44,8 +48,7 @@ export const ViewDateFieldFilter = ({const dateTextValue = filter.value as string | null;const dateValue = dateTextValue ? new Date(dateTextValue) : null;- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -86,11 +89,9 @@ export const ViewDateFieldFilter = ({<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? null- : dateValue?.toISOString();+ const value = isOperatorWithoutValue(operator.value)+ ? null+ : dateValue?.toISOString();view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-email-field-filter.tsx b/packages/ui/src/components/databases/search/view-email-field-filter.tsxindex 6fa0905d..bee62466 100644--- a/packages/ui/src/components/databases/search/view-email-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-email-field-filter.tsx@@ -26,6 +26,10 @@ interface ViewEmailFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewEmailFieldFilter = ({field,filter,@@ -43,8 +47,7 @@ export const ViewEmailFieldFilter = ({const textValue = filter.value as string | null;- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -85,11 +88,9 @@ export const ViewEmailFieldFilter = ({<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? null- : textValue;+ const value = isOperatorWithoutValue(operator.value)+ ? null+ : textValue;view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-filters.tsx b/packages/ui/src/components/databases/search/view-filters.tsxindex df44bd1b..28d86b19 100644--- a/packages/ui/src/components/databases/search/view-filters.tsx+++ b/packages/ui/src/components/databases/search/view-filters.tsx@@ -2,7 +2,9 @@ import { Plus } from 'lucide-react';import { SpecialId } from '@colanode/core';import { ViewBooleanFieldFilter } from '@colanode/ui/components/databases/search/view-boolean-field-filter';+import { ViewCollaboratorFieldFilter } from '@colanode/ui/components/databases/search/view-collaborator-field-filter';import { ViewCreatedAtFieldFilter } from '@colanode/ui/components/databases/search/view-created-at-field-fitler';+import { ViewCreatedByFieldFilter } from '@colanode/ui/components/databases/search/view-created-by-field-filter';import { ViewDateFieldFilter } from '@colanode/ui/components/databases/search/view-date-field-filter';import { ViewEmailFieldFilter } from '@colanode/ui/components/databases/search/view-email-field-filter';import { ViewFilterAddPopover } from '@colanode/ui/components/databases/search/view-filter-add-popover';@@ -12,6 +14,8 @@ import { ViewNumberFieldFilter } from '@colanode/ui/components/databases/search/import { ViewPhoneFieldFilter } from '@colanode/ui/components/databases/search/view-phone-field-filter';import { ViewSelectFieldFilter } from '@colanode/ui/components/databases/search/view-select-field-filter';import { ViewTextFieldFilter } from '@colanode/ui/components/databases/search/view-text-field-filter';+import { ViewUpdatedAtFieldFilter } from '@colanode/ui/components/databases/search/view-updated-at-field-filter';+import { ViewUpdatedByFieldFilter } from '@colanode/ui/components/databases/search/view-updated-by-field-filter';import { ViewUrlFieldFilter } from '@colanode/ui/components/databases/search/view-url-field-filter';import { useDatabase } from '@colanode/ui/contexts/database';import { useDatabaseView } from '@colanode/ui/contexts/database-view';@@ -19,7 +23,6 @@ import { useDatabaseView } from '@colanode/ui/contexts/database-view';export const ViewFilters = () => {const database = useDatabase();const view = useDatabaseView();- console.log('view.filters', view.filters);return (<div className="flex flex-row items-center gap-2">@@ -51,7 +54,13 @@ export const ViewFilters = () => {/>);case 'collaborator':- return null;+ return (+ <ViewCollaboratorFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );case 'created_at':return (<ViewCreatedAtFieldFilter@@ -61,7 +70,13 @@ export const ViewFilters = () => {/>);case 'created_by':- return null;+ return (+ <ViewCreatedByFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );case 'date':return (<ViewDateFieldFilter@@ -129,6 +144,22 @@ export const ViewFilters = () => {filter={filter}/>);+ case 'updated_at':+ return (+ <ViewUpdatedAtFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );+ case 'updated_by':+ return (+ <ViewUpdatedByFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );default:return null;diff --git a/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsx b/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsxindex 30441d8b..68195f41 100644--- a/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-multi-select-field-filter.tsx@@ -27,6 +27,10 @@ interface ViewMultiSelectFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewMultiSelectFieldFilter = ({field,filter,@@ -47,8 +51,7 @@ export const ViewMultiSelectFieldFilter = ({selectOptionIds.includes(option.id));- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -89,11 +92,9 @@ export const ViewMultiSelectFieldFilter = ({<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? []- : selectOptionIds;+ const value = isOperatorWithoutValue(operator.value)+ ? []+ : selectOptionIds;view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-name-field-filter.tsx b/packages/ui/src/components/databases/search/view-name-field-filter.tsxindex 598f42dc..6bd2fbd9 100644--- a/packages/ui/src/components/databases/search/view-name-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-name-field-filter.tsx@@ -22,6 +22,10 @@ interface ViewNameFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewNameFieldFilter = ({ filter }: ViewNameFieldFilterProps) => {const database = useDatabase();const view = useDatabaseView();@@ -37,8 +41,7 @@ export const ViewNameFieldFilter = ({ filter }: ViewNameFieldFilterProps) => {const textValue = filter.value as string | null;- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -79,11 +82,9 @@ export const ViewNameFieldFilter = ({ filter }: ViewNameFieldFilterProps) => {<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? null- : textValue;+ const value = isOperatorWithoutValue(operator.value)+ ? null+ : textValue;view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-number-field-filter.tsx b/packages/ui/src/components/databases/search/view-number-field-filter.tsxindex f7470092..2b2d4920 100644--- a/packages/ui/src/components/databases/search/view-number-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-number-field-filter.tsx@@ -26,6 +26,10 @@ interface ViewNumberFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewNumberFieldFilter = ({field,filter,@@ -43,8 +47,7 @@ export const ViewNumberFieldFilter = ({const numberValue = filter.value as number | null;- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -85,11 +88,9 @@ export const ViewNumberFieldFilter = ({<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? null- : numberValue;+ const value = isOperatorWithoutValue(operator.value)+ ? null+ : numberValue;view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-phone-field-filter.tsx b/packages/ui/src/components/databases/search/view-phone-field-filter.tsxindex 03e1a511..5c356fe9 100644--- a/packages/ui/src/components/databases/search/view-phone-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-phone-field-filter.tsx@@ -26,6 +26,10 @@ interface ViewPhoneFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewPhoneFieldFilter = ({field,filter,@@ -43,8 +47,7 @@ export const ViewPhoneFieldFilter = ({const phoneValue = filter.value as string | null;- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -85,11 +88,9 @@ export const ViewPhoneFieldFilter = ({<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? null- : phoneValue;+ const value = isOperatorWithoutValue(operator.value)+ ? null+ : phoneValue;view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-select-field-filter.tsx b/packages/ui/src/components/databases/search/view-select-field-filter.tsxindex 6ef36942..f4bcdeb3 100644--- a/packages/ui/src/components/databases/search/view-select-field-filter.tsx+++ b/packages/ui/src/components/databases/search/view-select-field-filter.tsx@@ -27,6 +27,10 @@ interface ViewSelectFieldFilterProps {filter: DatabaseViewFieldFilterAttributes;}+const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};+export const ViewSelectFieldFilter = ({field,filter,@@ -47,8 +51,7 @@ export const ViewSelectFieldFilter = ({selectOptionIds.includes(option.id));- const hideInput =- operator.value === 'is_empty' || operator.value === 'is_not_empty';+ const hideInput = isOperatorWithoutValue(operator.value);return (<Popover@@ -89,11 +92,9 @@ export const ViewSelectFieldFilter = ({<DropdownMenuItemkey={operator.value}onSelect={() => {- const value =- operator.value === 'is_empty' ||- operator.value === 'is_not_empty'- ? []- : selectOptionIds;+ const value = isOperatorWithoutValue(operator.value)+ ? []+ : selectOptionIds;view.updateFilter(filter.id, {...filter,diff --git a/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsx b/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsxnew file mode 100644index 00000000..c3bfc888--- /dev/null+++ b/packages/ui/src/components/databases/search/view-updated-at-field-filter.tsx@@ -0,0 +1,137 @@+import { ChevronDown, Trash2 } from 'lucide-react';++import {+ DatabaseViewFieldFilterAttributes,+ UpdatedAtFieldAttributes,+} from '@colanode/core';+import { FieldIcon } from '@colanode/ui/components/databases/fields/field-icon';+import { Button } from '@colanode/ui/components/ui/button';+import { DatePicker } from '@colanode/ui/components/ui/date-picker';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@colanode/ui/components/ui/dropdown-menu';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@colanode/ui/components/ui/popover';+import { useDatabaseView } from '@colanode/ui/contexts/database-view';+import { updatedAtFieldFilterOperators } from '@colanode/ui/lib/databases';++interface ViewUpdatedAtFieldFilterProps {+ field: UpdatedAtFieldAttributes;+ filter: DatabaseViewFieldFilterAttributes;+}++const isOperatorWithoutValue = (operator: string) => {+ return operator === 'is_empty' || operator === 'is_not_empty';+};++export const ViewUpdatedAtFieldFilter = ({+ field,+ filter,+}: ViewUpdatedAtFieldFilterProps) => {+ const view = useDatabaseView();++ const operator =+ updatedAtFieldFilterOperators.find(+ (operator) => operator.value === filter.operator+ ) ?? updatedAtFieldFilterOperators[0];++ if (!operator) {+ return null;+ }++ const dateTextValue = (filter.value as string) ?? null;+ const dateValue = dateTextValue ? new Date(dateTextValue) : null;++ return (+ <Popover+ open={view.isFieldFilterOpened(filter.id)}+ onOpenChange={() => {+ if (view.isFieldFilterOpened(filter.id)) {+ view.closeFieldFilter(filter.id);+ } else {+ view.openFieldFilter(filter.id);+ }+ }}+ >+ <PopoverTrigger asChild>+ <Button+ type="button"+ variant="outline"+ size="sm"+ className="border-dashed text-xs text-muted-foreground"+ >+ {field.name}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="flex w-96 flex-col gap-2 p-2">+ <div className="flex flex-row items-center gap-3 text-sm">+ <div className="flex flex-row items-center gap-0.5 p-1">+ <FieldIcon type={field.type} className="size-4" />+ <p>{field.name}</p>+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <ChevronDown className="size-4 text-muted-foreground" />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {updatedAtFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ const value = isOperatorWithoutValue(operator.value)+ ? null+ : dateValue?.toISOString();++ view.updateFilter(filter.id, {+ ...filter,+ operator: operator.value,+ value: value ?? null,+ });+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ view.removeFilter(filter.id);+ }}+ >+ <Trash2 className="size-4" />+ </Button>+ </div>+ <DatePicker+ value={dateValue}+ onChange={(newValue) => {+ if (newValue === null || newValue === undefined) {+ view.updateFilter(filter.id, {+ ...filter,+ value: null,+ });+ } else {+ view.updateFilter(filter.id, {+ ...filter,+ value: newValue.toISOString(),+ });+ }+ }}+ placeholder="Select date"+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 rounded-md border border-input p-2 text-sm"+ />+ </PopoverContent>+ </Popover>+ );+};diff --git a/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx b/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsxnew file mode 100644index 00000000..5f7f3110--- /dev/null+++ b/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx@@ -0,0 +1,235 @@+import { ChevronDown, Trash2, X } from 'lucide-react';++import { User } from '@colanode/client/types';+import {+ DatabaseViewFieldFilterAttributes,+ UpdatedByFieldAttributes,+} from '@colanode/core';+import { Avatar } from '@colanode/ui/components/avatars/avatar';+import { FieldIcon } from '@colanode/ui/components/databases/fields/field-icon';+import { Badge } from '@colanode/ui/components/ui/badge';+import { Button } from '@colanode/ui/components/ui/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@colanode/ui/components/ui/dropdown-menu';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@colanode/ui/components/ui/popover';+import { Separator } from '@colanode/ui/components/ui/separator';+import { UserSearch } from '@colanode/ui/components/users/user-search';+import { useDatabaseView } from '@colanode/ui/contexts/database-view';+import { useWorkspace } from '@colanode/ui/contexts/workspace';+import { useQueries } from '@colanode/ui/hooks/use-queries';+import { updatedByFieldFilterOperators } from '@colanode/ui/lib/databases';++interface ViewUpdatedByFieldFilterProps {+ field: UpdatedByFieldAttributes;+ filter: DatabaseViewFieldFilterAttributes;+}++const CollaboratorBadge = ({ collaborator }: { collaborator: User }) => {+ return (+ <div className="flex flex-row items-center gap-1 text-sm">+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ size="small"+ />+ <p>{collaborator.name}</p>+ </div>+ );+};++const isOperatorWithoutValue = (operator: string) => {+ return (+ operator === 'is_me' ||+ operator === 'is_not_me' ||+ operator === 'is_empty' ||+ operator === 'is_not_empty'+ );+};++export const ViewUpdatedByFieldFilter = ({+ field,+ filter,+}: ViewUpdatedByFieldFilterProps) => {+ const workspace = useWorkspace();+ const view = useDatabaseView();++ const operator =+ updatedByFieldFilterOperators.find(+ (operator) => operator.value === filter.operator+ ) ?? updatedByFieldFilterOperators[0]!;++ const collaboratorIds = (filter.value as string[]) ?? [];+ const results = useQueries(+ collaboratorIds.map((id) => ({+ type: 'user.get',+ userId: id,+ accountId: workspace.accountId,+ workspaceId: workspace.id,+ }))+ );++ const collaborators: User[] = [];+ for (const result of results) {+ if (result.data) {+ collaborators.push(result.data);+ }+ }+ const hideInput = isOperatorWithoutValue(operator.value);++ return (+ <Popover+ open={view.isFieldFilterOpened(filter.id)}+ onOpenChange={() => {+ if (view.isFieldFilterOpened(filter.id)) {+ view.closeFieldFilter(filter.id);+ } else {+ view.openFieldFilter(filter.id);+ }+ }}+ >+ <PopoverTrigger asChild>+ <Button+ type="button"+ variant="outline"+ size="sm"+ className="border-dashed text-xs text-muted-foreground"+ >+ {field.name}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="flex w-96 flex-col gap-2 p-2">+ <div className="flex flex-row items-center gap-3 text-sm">+ <div className="flex flex-row items-center gap-0.5 p-1">+ <FieldIcon type={field.type} className="size-4" />+ <p>{field.name}</p>+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <ChevronDown className="size-4 text-muted-foreground" />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {updatedByFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ const value = isOperatorWithoutValue(operator.value)+ ? []+ : collaboratorIds;++ view.updateFilter(filter.id, {+ ...filter,+ operator: operator.value,+ value: value,+ });+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ view.removeFilter(filter.id);+ }}+ >+ <Trash2 className="size-4" />+ </Button>+ </div>+ {!hideInput && (+ <Popover>+ <PopoverTrigger asChild>+ <div className="flex h-full w-full cursor-pointer flex-row items-center gap-1 rounded-md border border-input p-2">+ {collaborators.slice(0, 1).map((collaborator) => (+ <CollaboratorBadge+ key={collaborator.id}+ collaborator={collaborator}+ />+ ))}+ {collaborators.length === 0 && (+ <p className="text-xs text-muted-foreground">+ No collaborators selected+ </p>+ )}+ {collaborators.length > 1 && (+ <Badge+ variant="outline"+ className="ml-2 text-xs px-1 text-muted-foreground"+ >+ +{collaborators.length - 1}+ </Badge>+ )}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-80 p-1">+ {collaborators.length > 0 && (+ <div className="flex flex-col flex-wrap gap-2 p-2">+ {collaborators.map((collaborator) => (+ <div+ key={collaborator.id}+ className="flex w-full flex-row items-center gap-2"+ >+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ className="h-7 w-7"+ />+ <div className="flex flex-grow flex-col">+ <p className="text-sm">{collaborator.name}</p>+ <p className="text-xs text-muted-foreground">+ {collaborator.email}+ </p>+ </div>+ <X+ className="size-4 cursor-pointer"+ onClick={() => {+ const newCollaborators = collaboratorIds.filter(+ (id) => id !== collaborator.id+ );++ view.updateFilter(filter.id, {+ ...filter,+ value: newCollaborators,+ });+ }}+ />+ </div>+ ))}+ <Separator className="w-full my-2" />+ </div>+ )}+ <UserSearch+ exclude={collaboratorIds}+ onSelect={(user) => {+ const newCollaborators = collaboratorIds.includes(user.id)+ ? collaboratorIds.filter((id) => id !== user.id)+ : [...collaboratorIds, user.id];++ view.updateFilter(filter.id, {+ ...filter,+ value: newCollaborators,+ });+ }}+ />+ </PopoverContent>+ </Popover>+ )}+ </PopoverContent>+ </Popover>+ );+};diff --git a/packages/ui/src/components/documents/document-editor.tsx b/packages/ui/src/components/documents/document-editor.tsxindex 0d7f577d..8a23a892 100644--- a/packages/ui/src/components/documents/document-editor.tsx+++ b/packages/ui/src/components/documents/document-editor.tsx@@ -169,6 +169,7 @@ export const DocumentEditor = ({FolderNode,FileNode.configure({context: {+ userId: workspace.userId,accountId: workspace.accountId,workspaceId: workspace.id,documentId: node.id,@@ -217,6 +218,7 @@ export const DocumentEditor = ({FolderCommand,],context: {+ userId: workspace.userId,documentId: node.id,accountId: workspace.accountId,workspaceId: workspace.id,diff --git a/packages/ui/src/components/messages/message-create.tsx b/packages/ui/src/components/messages/message-create.tsxindex 356e2dc7..4d2a9fe0 100644--- a/packages/ui/src/components/messages/message-create.tsx+++ b/packages/ui/src/components/messages/message-create.tsx@@ -153,6 +153,7 @@ export const MessageCreate = forwardRef<MessageCreateRefProps>((_, ref) => {<div className="max-h-72 flex-grow overflow-y-auto">{conversation.canCreateMessage ? (<MessageEditor+ userId={workspace.userId}accountId={workspace.accountId}workspaceId={workspace.id}ref={messageEditorRef}diff --git a/packages/ui/src/components/messages/message-editor.tsx b/packages/ui/src/components/messages/message-editor.tsxindex 403bd67d..ab82120f 100644--- a/packages/ui/src/components/messages/message-editor.tsx+++ b/packages/ui/src/components/messages/message-editor.tsx@@ -30,6 +30,7 @@ import {import { ToolbarMenu } from '@colanode/ui/editor/menus';interface MessageEditorProps {+ userId: string;accountId: string;workspaceId: string;conversationId: string;@@ -75,6 +76,7 @@ export const MessageEditor = forwardRef<FileNode,MentionExtension.configure({context: {+ userId: props.userId,accountId: props.accountId,workspaceId: props.workspaceId,documentId: props.conversationId,diff --git a/packages/ui/src/components/records/values/record-collaborator-value.tsx b/packages/ui/src/components/records/values/record-collaborator-value.tsxindex 9fa588c1..12f8a18e 100644--- a/packages/ui/src/components/records/values/record-collaborator-value.tsx+++ b/packages/ui/src/components/records/values/record-collaborator-value.tsx@@ -1,5 +1,5 @@import { X } from 'lucide-react';-import { Fragment, useState } from 'react';+import { useState } from 'react';import { User } from '@colanode/client/types';import { CollaboratorFieldAttributes } from '@colanode/core';@@ -83,55 +83,51 @@ export const RecordCollaboratorValue = ({</div></PopoverTrigger><PopoverContent className="w-80 p-1">- <div className="flex flex-col flex-wrap gap-2 p-2">- {collaborators.length > 0 ? (- <Fragment>- {collaborators.map((collaborator) => (- <div- key={collaborator.id}- className="flex w-full flex-row items-center gap-2"- >- <Avatar- id={collaborator.id}- name={collaborator.name}- avatar={collaborator.avatar}- className="h-7 w-7"- />- <div className="flex flex-grow flex-col">- <p className="text-sm">{collaborator.name}</p>- <p className="text-xs text-muted-foreground">- {collaborator.email}- </p>- </div>- {record.canEdit && !readOnly && (- <X- className="size-4 cursor-pointer"- onClick={() => {- if (!record.canEdit || readOnly) return;+ {collaborators.length > 0 && (+ <div className="flex flex-col flex-wrap gap-2 p-2">+ {collaborators.map((collaborator) => (+ <div+ key={collaborator.id}+ className="flex w-full flex-row items-center gap-2"+ >+ <Avatar+ id={collaborator.id}+ name={collaborator.name}+ avatar={collaborator.avatar}+ className="h-7 w-7"+ />+ <div className="flex flex-grow flex-col">+ <p className="text-sm">{collaborator.name}</p>+ <p className="text-xs text-muted-foreground">+ {collaborator.email}+ </p>+ </div>+ {record.canEdit && !readOnly && (+ <X+ className="size-4 cursor-pointer"+ onClick={() => {+ if (!record.canEdit || readOnly) return;- const newCollaborators = collaboratorIds.filter(- (id) => id !== collaborator.id- );+ const newCollaborators = collaboratorIds.filter(+ (id) => id !== collaborator.id+ );- if (newCollaborators.length === 0) {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'string_array',- value: newCollaborators,- });- }- }}- />- )}- </div>- ))}- <Separator className="w-full my-2" />- </Fragment>- ) : (- <p className="text-sm text-muted-foreground">No collaborators</p>- )}- </div>+ if (newCollaborators.length === 0) {+ record.removeFieldValue(field);+ } else {+ record.updateFieldValue(field, {+ type: 'string_array',+ value: newCollaborators,+ });+ }+ }}+ />+ )}+ </div>+ ))}+ <Separator className="w-full my-2" />+ </div>+ )}{record.canEdit && !readOnly && (<UserSearchexclude={collaboratorIds}diff --git a/packages/ui/src/editor/extensions/mention.tsx b/packages/ui/src/editor/extensions/mention.tsxindex 5264a6c3..a3d88640 100644--- a/packages/ui/src/editor/extensions/mention.tsx+++ b/packages/ui/src/editor/extensions/mention.tsx@@ -285,13 +285,14 @@ export const MentionExtension = Node.create<MentionOptions>({return;}- const { accountId, workspaceId } = this.options.context;+ const { accountId, workspaceId, userId } = this.options.context;window.colanode.executeQuery({type: 'user.search',accountId,workspaceId,searchQuery: query,+ exclude: [userId],}).then((users) => {resolve(users);diff --git a/packages/ui/src/lib/databases.ts b/packages/ui/src/lib/databases.tsindex ca02cc10..de912597 100644--- a/packages/ui/src/lib/databases.ts+++ b/packages/ui/src/lib/databases.ts@@ -500,6 +500,68 @@ export const urlFieldFilterOperators: FieldFilterOperator[] = [},];+export const updatedByFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Me',+ value: 'is_me',+ },+ {+ label: 'Is Not Me',+ value: 'is_not_me',+ },+ {+ label: 'Is In',+ value: 'is_in',+ },+ {+ label: 'Is Not In',+ value: 'is_not_in',+ },+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+];++export const updatedAtFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+ {+ label: 'Is on or after',+ value: 'is_on_or_after',+ },+ {+ label: 'Is on or before',+ value: 'is_on_or_before',+ },+ {+ label: 'Is After',+ value: 'is_after',+ },+ {+ label: 'Is Before',+ value: 'is_before',+ },+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+];+export const getFieldFilterOperators = (type: FieldType): FieldFilterOperator[] => {