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 date fields and filters
Hakan Shehu8f474f531453
diff --git a/desktop/package-lock.json b/desktop/package-lock.jsonindex 957b542f..78e51e98 100644--- a/desktop/package-lock.json+++ b/desktop/package-lock.json@@ -60,6 +60,7 @@"class-variance-authority": "^0.7.0","clsx": "^2.1.1","cmdk": "^1.0.0",+ "date-fns": "^3.6.0","electron-squirrel-startup": "^1.0.1","fractional-indexing-jittered": "^0.9.1","is-hotkey": "^0.2.0",@@ -69,7 +70,7 @@"lowlight": "^3.1.0","re-resizable": "^6.9.18","react": "^18.3.1",- "react-day-picker": "^9.0.9",+ "react-day-picker": "^8.10.1","react-dnd": "^16.0.1","react-dnd-html5-backend": "^16.0.1","react-dom": "^18.3.1",@@ -11273,19 +11274,17 @@}},"node_modules/react-day-picker": {- "version": "9.0.9",- "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.0.9.tgz",- "integrity": "sha512-Sj+1UuuUmdxSKPmJlQFb6h1wKw9N7gG0K4db9mQtHm/qzd94t6LT9X8cGwDHaW9Pdb9dua4/sLhUSW06A1Xqkg==",+ "version": "8.10.1",+ "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.1.tgz",+ "integrity": "sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==","license": "MIT",- "dependencies": {- "date-fns": "^3.6.0"- },"funding": {"type": "individual","url": "https://github.com/sponsors/gpbl"},"peerDependencies": {- "react": ">=16.8.0"+ "date-fns": "^2.28.0 || ^3.0.0",+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0"}},"node_modules/react-dnd": {diff --git a/desktop/package.json b/desktop/package.jsonindex 82365d2e..fb4a009e 100644--- a/desktop/package.json+++ b/desktop/package.json@@ -100,6 +100,7 @@"class-variance-authority": "^0.7.0","clsx": "^2.1.1","cmdk": "^1.0.0",+ "date-fns": "^3.6.0","electron-squirrel-startup": "^1.0.1","fractional-indexing-jittered": "^0.9.1","is-hotkey": "^0.2.0",@@ -109,7 +110,7 @@"lowlight": "^3.1.0","re-resizable": "^6.9.18","react": "^18.3.1",- "react-day-picker": "^9.0.9",+ "react-day-picker": "^8.10.1","react-dnd": "^16.0.1","react-dnd-html5-backend": "^16.0.1","react-dom": "^18.3.1",diff --git a/desktop/src/components/databases/calendars/calendar-view-day.tsx b/desktop/src/components/databases/calendars/calendar-view-day.tsxindex a0d865ee..0629f83b 100644--- a/desktop/src/components/databases/calendars/calendar-view-day.tsx+++ b/desktop/src/components/databases/calendars/calendar-view-day.tsx@@ -7,32 +7,27 @@ import { CalendarViewCard } from '@/components/databases/calendars/calendar-viewinterface CalendarViewDayProps {date: Date;month: Date;- outside: boolean;records: RecordNode[];}export const CalendarViewDay = ({date,month,- outside,records,}: CalendarViewDayProps) => {const isToday = isSameDay(date, new Date());const canCreateRecord = false;+ const dateMonth = date.getMonth();+ const displayMonth = month.getMonth();+ const isOutside = dateMonth !== displayMonth;+return (- <td- className={cn(- 'relative h-40 flex-1 p-2 text-right text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent',- '[&:has([aria-selected])]:rounded-md',- 'overflow-auto border-r border-gray-100 first:border-l',- 'group flex flex-col gap-1',- )}- >+ <div className="animate-fade-in group flex h-full w-full flex-col gap-1"><divclassName={cn('flex justify-between text-sm',- outside ? 'text-muted-foreground' : '',+ isOutside ? 'text-muted-foreground' : '',)}><Icon@@ -54,6 +49,6 @@ export const CalendarViewDay = ({{records.map((record) => {return <CalendarViewCard key={record.id} record={record} />;})}- </td>+ </div>);};diff --git a/desktop/src/components/databases/calendars/calendar-view-grid.tsx b/desktop/src/components/databases/calendars/calendar-view-grid.tsxindex cba8f076..bc9aec75 100644--- a/desktop/src/components/databases/calendars/calendar-view-grid.tsx+++ b/desktop/src/components/databases/calendars/calendar-view-grid.tsx@@ -1,7 +1,7 @@import React from 'react';import { buttonVariants } from '@/components/ui/button';import { Icon } from '@/components/ui/icon';-import { cn, getDisplayedDates } from '@/lib/utils';+import { cn, getDisplayedDates, toUTCDate } from '@/lib/utils';import { DayPicker, DayProps } from 'react-day-picker';import { CalendarViewDay } from '@/components/databases/calendars/calendar-view-day';import { CalendarViewNode, FieldNode, ViewFilterNode } from '@/types/databases';@@ -70,36 +70,33 @@ export const CalendarViewGrid = ({ view, field }: CalendarViewGridProps) => {months:'flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0 w-full',month: 'space-y-4 w-full',- month_caption: 'flex justify-center pt-1 relative items-center',+ caption: 'flex justify-center pt-1 relative items-center',caption_label: 'text-sm font-medium',nav: 'space-x-1 flex items-center',- button_previous: cn(+ nav_button: cn(buttonVariants({ variant: 'outline' }),'h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100',- 'absolute left-1',),- button_next: cn(- buttonVariants({ variant: 'outline' }),- 'h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100',- 'absolute right-1',- ),- month_grid: 'w-full border-collapse space-y-1',- weekdays: 'flex flex-row mb-2',- weekday:+ nav_button_previous: 'absolute left-1',+ nav_button_next: 'absolute right-1',+ table: 'w-full border-collapse space-y-1',+ head_row: 'flex flex-row mb-2',+ head_cell:'text-muted-foreground rounded-md flex-1 font-normal text-[0.8rem]',- week: 'flex flex-row w-full border-b first:border-t',+ row: 'flex flex-row w-full border-b first:border-t',+ cell: cn(+ 'relative flex-1 h-40 p-2 text-right text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent',+ '[&:has([aria-selected])]:rounded-md',+ 'border-r first:border-l border-gray-100 overflow-auto',+ ),}}components={{- Chevron: (props) => {- if (props.orientation === 'left') {- return (- <Icon name="arrow-left-s-line" className="h-4 w-4" {...props} />- );- }- return (- <Icon name="arrow-right-s-line" className="h-4 w-4" {...props} />- );- },+ IconLeft: ({ ...props }) => (+ <Icon name="arrow-left-s-line" className="h-4 w-4" {...props} />+ ),+ IconRight: ({ ...props }) => (+ <Icon name="arrow-right-s-line" className="h-4 w-4" {...props} />+ ),Day: (props: DayProps) => {const filter: ViewFilterNode = {id: 'calendar_filter',@@ -107,7 +104,7 @@ export const CalendarViewGrid = ({ view, field }: CalendarViewGridProps) => {operator: 'is_equal_to',values: [{- textValue: props.day.date.toISOString(),+ textValue: props.date.toISOString(),numberValue: null,foreignNodeId: null,},@@ -123,9 +120,8 @@ export const CalendarViewGrid = ({ view, field }: CalendarViewGridProps) => {return (<CalendarViewDay- date={props.day.date}- month={props.day.displayMonth}- outside={props.day.outside}+ date={toUTCDate(props.date)}+ month={props.displayMonth}records={dayRecords}/>);diff --git a/desktop/src/components/databases/filters/view-created-at-field-fitler.tsx b/desktop/src/components/databases/filters/view-created-at-field-fitler.tsxnew file mode 100644index 00000000..63c98e91--- /dev/null+++ b/desktop/src/components/databases/filters/view-created-at-field-fitler.tsx@@ -0,0 +1,140 @@+import React from 'react';+import { CreatedAtFieldNode, ViewFilterNode } from '@/types/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Button } from '@/components/ui/button';+import { Icon } from '@/components/ui/icon';+import { getFieldIcon, dateFieldFilterOperators } from '@/lib/databases';+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';+import { AttributeTypes } from '@/lib/constants';+import { useNodeDeleteMutation } from '@/mutations/use-node-delete-mutation';+import { DatePicker } from '@/components/ui/date-picker';++interface ViewCreatedAtFieldFilterProps {+ field: CreatedAtFieldNode;+ filter: ViewFilterNode;+}++export const ViewCreatedAtFieldFilter = ({+ field,+ filter,+}: ViewCreatedAtFieldFilterProps) => {+ const [open, setOpen] = React.useState(false);+ const { mutate: upsertAttribute } = useNodeAttributeUpsertMutation();+ const { mutate: deleteAttribute } = useNodeAttributeDeleteMutation();+ const { mutate: deleteFilter } = useNodeDeleteMutation();++ const operator =+ dateFieldFilterOperators.find(+ (operator) => operator.value === filter.operator,+ ) ?? dateFieldFilterOperators[0];++ const dateTextValue =+ filter.values.length > 0 ? filter.values[0].textValue : null;+ const dateValue = dateTextValue ? new Date(dateTextValue) : null;++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <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">+ <Icon name={getFieldIcon(field.dataType)} className="h-4 w-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 hover:cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <Icon+ name="arrow-down-s-line"+ className="h-4 w-4 text-muted-foreground"+ />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {dateFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Operator,+ key: '1',+ textValue: operator.value,+ numberValue: null,+ foreignNodeId: null,+ });++ if (+ operator.value === 'is_empty' ||+ operator.value === 'is_not_empty'+ ) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ });+ }+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ deleteFilter(filter.id);+ }}+ >+ <Icon name="delete-bin-line" className="h-4 w-4" />+ </Button>+ </div>+ <DatePicker+ value={dateValue}+ onChange={(newValue) => {+ if (newValue === null || newValue === undefined) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ });+ } else {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ textValue: newValue.toISOString(),+ numberValue: null,+ foreignNodeId: null,+ });+ }+ }}+ 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/desktop/src/components/databases/filters/view-date-field-filter.tsx b/desktop/src/components/databases/filters/view-date-field-filter.tsxnew file mode 100644index 00000000..6d9103f3--- /dev/null+++ b/desktop/src/components/databases/filters/view-date-field-filter.tsx@@ -0,0 +1,145 @@+import React from 'react';+import { DateFieldNode, ViewFilterNode } from '@/types/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Button } from '@/components/ui/button';+import { Icon } from '@/components/ui/icon';+import { getFieldIcon, dateFieldFilterOperators } from '@/lib/databases';+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';+import { AttributeTypes } from '@/lib/constants';+import { useNodeDeleteMutation } from '@/mutations/use-node-delete-mutation';+import { DatePicker } from '@/components/ui/date-picker';++interface ViewDateFieldFilterProps {+ field: DateFieldNode;+ filter: ViewFilterNode;+}++export const ViewDateFieldFilter = ({+ field,+ filter,+}: ViewDateFieldFilterProps) => {+ const [open, setOpen] = React.useState(false);+ const { mutate: upsertAttribute } = useNodeAttributeUpsertMutation();+ const { mutate: deleteAttribute } = useNodeAttributeDeleteMutation();+ const { mutate: deleteFilter } = useNodeDeleteMutation();++ const operator =+ dateFieldFilterOperators.find(+ (operator) => operator.value === filter.operator,+ ) ?? dateFieldFilterOperators[0];++ const dateTextValue =+ filter.values.length > 0 ? filter.values[0].textValue : null;+ const dateValue = dateTextValue ? new Date(dateTextValue) : null;++ const hideInput =+ operator.value === 'is_empty' || operator.value === 'is_not_empty';++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <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">+ <Icon name={getFieldIcon(field.dataType)} className="h-4 w-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 hover:cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <Icon+ name="arrow-down-s-line"+ className="h-4 w-4 text-muted-foreground"+ />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {dateFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Operator,+ key: '1',+ textValue: operator.value,+ numberValue: null,+ foreignNodeId: null,+ });++ if (+ operator.value === 'is_empty' ||+ operator.value === 'is_not_empty'+ ) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ });+ }+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ deleteFilter(filter.id);+ }}+ >+ <Icon name="delete-bin-line" className="h-4 w-4" />+ </Button>+ </div>+ {!hideInput && (+ <DatePicker+ value={dateValue}+ onChange={(newValue) => {+ if (newValue === null || newValue === undefined) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ });+ } else {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ textValue: newValue.toISOString(),+ numberValue: null,+ foreignNodeId: null,+ });+ }+ }}+ 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/desktop/src/components/databases/filters/view-filters.tsx b/desktop/src/components/databases/filters/view-filters.tsxindex 1f496cbe..fd9f9656 100644--- a/desktop/src/components/databases/filters/view-filters.tsx+++ b/desktop/src/components/databases/filters/view-filters.tsx@@ -9,6 +9,8 @@ import { ViewPhoneFieldFilter } from '@/components/databases/filters/view-phone-import { ViewBooleanFieldFilter } from '@/components/databases/filters/view-boolean-field-filter';import { ViewSelectFieldFilter } from '@/components/databases/filters/view-select-field-filter';import { ViewMultiSelectFieldFilter } from '@/components/databases/filters/view-multi-select-field-filter';+import { ViewDateFieldFilter } from '@/components/databases/filters/view-date-field-filter';+import { ViewCreatedAtFieldFilter } from '@/components/databases/filters/view-created-at-field-fitler';import { ViewFilterAddPopover } from '@/components/databases/filters/view-filter-add-popover';import { Icon } from '@/components/ui/icon';@@ -44,11 +46,23 @@ export const ViewFilters = ({ viewId, filters }: ViewFiltersProps) => {case 'collaborator':return null;case 'created_at':- return null;+ return (+ <ViewCreatedAtFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );case 'created_by':return null;case 'date':- return null;+ return (+ <ViewDateFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );case 'email':return (<ViewEmailFieldFilterdiff --git a/desktop/src/components/databases/tables/cells/table-view-date-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-date-cell.tsxnew file mode 100644index 00000000..6176d11b--- /dev/null+++ b/desktop/src/components/databases/tables/cells/table-view-date-cell.tsx@@ -0,0 +1,59 @@+import React from 'react';+import { RecordNode, EmailFieldNode, DateFieldNode } from '@/types/databases';+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';+import { DatePicker } from '@/components/ui/date-picker';++const getDateValue = (+ record: RecordNode,+ field: DateFieldNode,+): Date | null => {+ const attribute = record.attributes.find((attr) => attr.type === field.id);+ return attribute?.textValue ? new Date(attribute.textValue) : null;+};++interface TableViewDateCellProps {+ record: RecordNode;+ field: DateFieldNode;+}++export const TableViewDateCell = ({+ record,+ field,+}: TableViewDateCellProps) => {+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =+ useNodeAttributeUpsertMutation();+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =+ useNodeAttributeDeleteMutation();++ const canEdit = true;+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;++ return (+ <DatePicker+ value={getDateValue(record, field)}+ onChange={(newValue) => {+ if (isPending) return;+ if (!canEdit) return;++ if (newValue === null || newValue === undefined) {+ deleteNodeAttribute({+ nodeId: record.id,+ type: field.id,+ key: '1',+ });+ } else {+ upsertNodeAttribute({+ nodeId: record.id,+ type: field.id,+ key: '1',+ textValue: newValue.toISOString(),+ numberValue: null,+ foreignNodeId: null,+ });+ }+ }}+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"+ />+ );+};diff --git a/desktop/src/components/databases/tables/table-view-field-cell.tsx b/desktop/src/components/databases/tables/table-view-field-cell.tsxindex ff011253..4cd6b646 100644--- a/desktop/src/components/databases/tables/table-view-field-cell.tsx+++ b/desktop/src/components/databases/tables/table-view-field-cell.tsx@@ -10,6 +10,7 @@ import { TableViewPhoneCell } from '@/components/databases/tables/cells/table-viimport { TableViewEmailCell } from '@/components/databases/tables/cells/table-view-email-cell';import { TableViewUrlCell } from '@/components/databases/tables/cells/table-view-url-cell';import { TableViewMultiSelectCell } from '@/components/databases/tables/cells/table-view-multi-select-cell';+import { TableViewDateCell } from '@/components/databases/tables/cells/table-view-date-cell';interface TableViewFieldCellProps {record: RecordNode;@@ -41,5 +42,13 @@ export const TableViewFieldCell = ({return <TableViewUrlCell record={record} field={field} />;case 'multi_select':return <TableViewMultiSelectCell record={record} field={field} />;+ case 'collaborator':+ return null;+ case 'date':+ return <TableViewDateCell record={record} field={field} />;+ case 'file':+ return null;+ default:+ return null;}};diff --git a/desktop/src/components/ui/calendar.tsx b/desktop/src/components/ui/calendar.tsxnew file mode 100644index 00000000..66a23ccb--- /dev/null+++ b/desktop/src/components/ui/calendar.tsx@@ -0,0 +1,70 @@+import * as React from "react"+import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons"+import { DayPicker } from "react-day-picker"++import { cn } from "@/lib/utils"+import { buttonVariants } from "@/components/ui/button"++export type CalendarProps = React.ComponentProps<typeof DayPicker>++function Calendar({+ className,+ classNames,+ showOutsideDays = true,+ ...props+}: CalendarProps) {+ return (+ <DayPicker+ showOutsideDays={showOutsideDays}+ className={cn("p-3", className)}+ classNames={{+ months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",+ month: "space-y-4",+ caption: "flex justify-center pt-1 relative items-center",+ caption_label: "text-sm font-medium",+ nav: "space-x-1 flex items-center",+ nav_button: cn(+ buttonVariants({ variant: "outline" }),+ "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100"+ ),+ nav_button_previous: "absolute left-1",+ nav_button_next: "absolute right-1",+ table: "w-full border-collapse space-y-1",+ head_row: "flex",+ head_cell:+ "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",+ row: "flex w-full mt-2",+ cell: cn(+ "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",+ props.mode === "range"+ ? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"+ : "[&:has([aria-selected])]:rounded-md"+ ),+ day: cn(+ buttonVariants({ variant: "ghost" }),+ "h-8 w-8 p-0 font-normal aria-selected:opacity-100"+ ),+ day_range_start: "day-range-start",+ day_range_end: "day-range-end",+ day_selected:+ "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",+ day_today: "bg-accent text-accent-foreground",+ day_outside:+ "day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30",+ day_disabled: "text-muted-foreground opacity-50",+ day_range_middle:+ "aria-selected:bg-accent aria-selected:text-accent-foreground",+ day_hidden: "invisible",+ ...classNames,+ }}+ components={{+ IconLeft: ({ ...props }) => <ChevronLeftIcon className="h-4 w-4" />,+ IconRight: ({ ...props }) => <ChevronRightIcon className="h-4 w-4" />,+ }}+ {...props}+ />+ )+}+Calendar.displayName = "Calendar"++export { Calendar }diff --git a/desktop/src/components/ui/date-picker.tsx b/desktop/src/components/ui/date-picker.tsxnew file mode 100644index 00000000..836e512d--- /dev/null+++ b/desktop/src/components/ui/date-picker.tsx@@ -0,0 +1,52 @@+import React from 'react';+import { Calendar } from '@/components/ui/calendar';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';+import { cn, toUTCDate } from '@/lib/utils';++interface DatePickerProps {+ value: Date | null;+ className?: string;+ onChange: (date: Date | null) => void;+ placeholder?: string;+}++export const DatePicker = ({+ value,+ className,+ onChange,+ placeholder,+}: DatePickerProps) => {+ const [open, setOpen] = React.useState(false);+ const dateObj = value ? new Date(value) : undefined;+ const placeHolderText = placeholder ?? '';++ return (+ <Popover open={open} onOpenChange={setOpen} modal={true}>+ <PopoverTrigger asChild>+ <div+ className={cn(!dateObj && 'text-sm text-muted-foreground', className)}+ >+ {dateObj ? dateObj.toLocaleDateString() : placeHolderText}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-auto p-0" align="start">+ <Calendar+ mode="single"+ selected={dateObj ?? undefined}+ onSelect={(date) => {+ if (!date) {+ onChange(null);+ } else {+ onChange(toUTCDate(date));+ }+ }}+ initialFocus+ />+ </PopoverContent>+ </Popover>+ );+};diff --git a/desktop/src/lib/databases.ts b/desktop/src/lib/databases.tsindex b1bcac51..8006fcc2 100644--- a/desktop/src/lib/databases.ts+++ b/desktop/src/lib/databases.ts@@ -265,6 +265,22 @@ export const dateFieldFilterOperators: FieldFilterOperator[] = [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',diff --git a/desktop/src/lib/utils.ts b/desktop/src/lib/utils.tsindex e9ad0fd4..1710357b 100644--- a/desktop/src/lib/utils.ts+++ b/desktop/src/lib/utils.ts@@ -180,3 +180,10 @@ export const isSameDay = (return d1.getDate() === d2.getDate() && d1.getMonth() === d2.getMonth();};++export const toUTCDate = (dateParam: Date | string): Date => {+ const date = typeof dateParam === 'string' ? new Date(dateParam) : dateParam;+ return new Date(+ Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()),+ );+};diff --git a/desktop/src/queries/use-records-query.tsx b/desktop/src/queries/use-records-query.tsxindex fa9645bf..3ba10216 100644--- a/desktop/src/queries/use-records-query.tsx+++ b/desktop/src/queries/use-records-query.tsx@@ -7,6 +7,7 @@ import { compareString } from '@/lib/utils';import {BooleanFieldNode,CreatedAtFieldNode,+ DateFieldNode,EmailFieldNode,FieldNode,MultiSelectFieldNode,@@ -239,7 +240,7 @@ const buildFilterQuery = (case 'created_by':return null;case 'date':- return null;+ return buildDateFilterQuery(filter, field);case 'email':return buildEmailFilterQuery(filter, field);case 'file':@@ -641,6 +642,69 @@ const buildMultiSelectFilterQuery = (}};+const buildDateFilterQuery = (+ filter: ViewFilterNode,+ field: DateFieldNode,+): FilterQuery | null => {+ if (filter.operator === 'is_empty') {+ return buildIsEmptyFilterQuery(filter.id, field.id);+ }++ if (filter.operator === 'is_not_empty') {+ return buildIsNotEmptyFilterQuery(filter.id, field.id);+ }++ if (filter.values.length === 0) {+ return null;+ }++ const value = filter.values[0].textValue;+ if (value === null) {+ return null;+ }++ const date = new Date(value);+ if (isNaN(date.getTime())) {+ return null;+ }++ const dateString = date.toISOString().split('T')[0];+ switch (filter.operator) {+ case 'is_equal_to':+ return {+ joinQuery: `${buildFilterJoinNodeAttributesQuery(filter.id, field.id)} AND DATE(na_${filter.id}.text_value) = '${dateString}'`,+ whereQuery: null,+ };+ case 'is_not_equal_to':+ return {+ joinQuery: `${buildFilterLeftJoinNodeAttributesQuery(filter.id, field.id)} AND DATE(na_${filter.id}.text_value) != '${dateString}'`,+ whereQuery: null,+ };+ case 'is_on_or_after':+ return {+ joinQuery: `${buildFilterJoinNodeAttributesQuery(filter.id, field.id)} AND DATE(na_${filter.id}.text_value) >= '${dateString}'`,+ whereQuery: null,+ };+ case 'is_on_or_before':+ return {+ joinQuery: `${buildFilterJoinNodeAttributesQuery(filter.id, field.id)} AND DATE(na_${filter.id}.text_value) <= '${dateString}'`,+ whereQuery: null,+ };+ case 'is_after':+ return {+ joinQuery: `${buildFilterJoinNodeAttributesQuery(filter.id, field.id)} AND DATE(na_${filter.id}.text_value) > '${dateString}'`,+ whereQuery: null,+ };+ case 'is_before':+ return {+ joinQuery: `${buildFilterJoinNodeAttributesQuery(filter.id, field.id)} AND DATE(na_${filter.id}.text_value) < '${dateString}'`,+ whereQuery: null,+ };+ default:+ return null;+ }+};+const buildCreatedAtFilterQuery = (filter: ViewFilterNode,field: CreatedAtFieldNode,