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
Show the count and a list of records that have no value for calendar group field (#124)
Hakan Shehu7c0d421bc2f3
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 df55e154..d7033128 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@@ -35,7 +35,7 @@ export class RecordFieldValueCountQueryHandler) {return {hasChanges: true,- result: { values: [], nullCount: 0 },+ result: { values: [], noValueCount: 0 },};}@@ -91,7 +91,7 @@ export class RecordFieldValueCountQueryHandler) {return {hasChanges: true,- result: { values: [], nullCount: 0 },+ result: { values: [], noValueCount: 0 },};}@@ -121,7 +121,7 @@ export class RecordFieldValueCountQueryHandlerif (!field) {return {values: [],- nullCount: 0,+ noValueCount: 0,};}@@ -141,12 +141,12 @@ export class RecordFieldValueCountQueryHandlerconst output: RecordFieldValueCountQueryOutput = {values: [],- nullCount: 0,+ noValueCount: 0,};for (const row of result.rows) {if (row.value === 'null') {- output.nullCount = row.count;+ output.noValueCount = row.count;} else {output.values.push({value: row.value,diff --git a/packages/client/src/queries/records/record-field-value-count.ts b/packages/client/src/queries/records/record-field-value-count.tsindex 1d64a6e4..74b999be 100644--- a/packages/client/src/queries/records/record-field-value-count.ts+++ b/packages/client/src/queries/records/record-field-value-count.ts@@ -16,7 +16,7 @@ export type RecordFieldValueCount = {export type RecordFieldValueCountQueryOutput = {values: RecordFieldValueCount[];- nullCount: number;+ noValueCount: number;};declare module '@colanode/client/queries' {diff --git a/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx b/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsxindex 29d642c5..4b28a9d2 100644--- a/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx+++ b/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx@@ -46,7 +46,7 @@ export const BoardViewColumnsCollaborator = ({fieldId: field.id,operator: 'is_empty',};- const noValueCount = collaboratorCountQuery.data?.nullCount ?? 0;+ const noValueCount = collaboratorCountQuery.data?.noValueCount ?? 0;return (<>diff --git a/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx b/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsxindex 7a1a8ba7..e2ddc576 100644--- a/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx+++ b/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx@@ -45,7 +45,7 @@ export const BoardViewColumnsMultiSelect = ({};const selectOptionCount = selectOptionCountQuery.data?.values ?? [];- const noValueCount = selectOptionCountQuery.data?.nullCount ?? 0;+ const noValueCount = selectOptionCountQuery.data?.noValueCount ?? 0;const noValueDraggingClass = getSelectOptionLightColorClass('gray');diff --git a/packages/ui/src/components/databases/boards/board-view-columns-select.tsx b/packages/ui/src/components/databases/boards/board-view-columns-select.tsxindex 282b5380..56c045c6 100644--- a/packages/ui/src/components/databases/boards/board-view-columns-select.tsx+++ b/packages/ui/src/components/databases/boards/board-view-columns-select.tsx@@ -44,7 +44,7 @@ export const BoardViewColumnsSelect = ({};const selectOptionCount = selectOptionCountQuery.data?.values ?? [];- const noValueCount = selectOptionCountQuery.data?.nullCount ?? 0;+ const noValueCount = selectOptionCountQuery.data?.noValueCount ?? 0;const noValueDraggingClass = getSelectOptionLightColorClass('gray');diff --git a/packages/ui/src/components/databases/calendars/calendar-view-day.tsx b/packages/ui/src/components/databases/calendars/calendar-view-day.tsxindex fd9218eb..4fb223af 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-day.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-day.tsx@@ -42,7 +42,11 @@ export const CalendarViewDay = ({/></div>)}- <p className={isToday ? 'rounded-md bg-red-500 p-0.5 text-white' : ''}>+ <p+ className={+ isToday ? 'rounded-md bg-red-500 py-1 px-2 text-white' : ''+ }+ >{date.getDate()}</p></div>diff --git a/packages/ui/src/components/databases/calendars/calendar-view-grid.tsx b/packages/ui/src/components/databases/calendars/calendar-view-grid.tsxindex b11a8b25..94542247 100644--- a/packages/ui/src/components/databases/calendars/calendar-view-grid.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view-grid.tsx@@ -76,12 +76,12 @@ export const CalendarViewGrid = ({ field }: CalendarViewGridProps) => {),button_previous: cn(buttonVariants({ variant: 'ghost' }),- 'size-(--cell-size) aria-disabled:opacity-50 p-0 select-none',+ 'size-(--cell-size) aria-disabled:opacity-50 p-0 select-none size-7',defaultClassNames.button_previous),button_next: cn(buttonVariants({ variant: 'ghost' }),- 'size-(--cell-size) aria-disabled:opacity-50 p-0 select-none',+ 'size-(--cell-size) aria-disabled:opacity-50 p-0 select-none size-7',defaultClassNames.button_next),month_caption: cn(diff --git a/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx b/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsxnew file mode 100644index 00000000..19307668--- /dev/null+++ b/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx@@ -0,0 +1,76 @@+import { CircleDashed } from 'lucide-react';++import { DatabaseViewFilterAttributes, FieldAttributes } from '@colanode/core';+import { CalendarViewNoValueList } from '@colanode/ui/components/databases/calendars/calendar-view-no-value-list';+import {+ Dialog,+ DialogTrigger,+ DialogContent,+ DialogHeader,+ DialogTitle,+ DialogDescription,+} from '@colanode/ui/components/ui/dialog';+import { useDatabase } from '@colanode/ui/contexts/database';+import { useDatabaseView } from '@colanode/ui/contexts/database-view';+import { useWorkspace } from '@colanode/ui/contexts/workspace';+import { useQuery } from '@colanode/ui/hooks/use-query';++interface CalendarViewNoValueCountProps {+ field: FieldAttributes;+}++export const CalendarViewNoValueCount = ({+ field,+}: CalendarViewNoValueCountProps) => {+ const workspace = useWorkspace();+ const database = useDatabase();+ const view = useDatabaseView();++ const filters: DatabaseViewFilterAttributes[] = [+ ...view.filters,+ {+ id: 'no_value',+ type: 'field',+ fieldId: field.id,+ operator: 'is_empty',+ },+ ];++ const noValueCountQuery = useQuery({+ type: 'record.field.value.count',+ databaseId: database.id,+ filters: filters,+ fieldId: field.id,+ accountId: workspace.accountId,+ workspaceId: workspace.id,+ });++ const noValueCount = noValueCountQuery.data?.noValueCount ?? 0;+ if (noValueCount === 0) {+ return null;+ }++ return (+ <Dialog>+ <DialogTrigger asChild>+ <div+ className="flex flex-row items-center gap-1 text-sm mr-2 hover:bg-muted hover:cursor-pointer rounded-md p-1"+ role="presentation"+ >+ <CircleDashed className="size-4" />+ <p>No {field.name}</p>+ <p>({noValueCount.toLocaleString()})</p>+ </div>+ </DialogTrigger>+ <DialogContent className="w-128 min-w-128 min-h-40 max-h-128 overflow-auto p-4">+ <DialogHeader>+ <DialogTitle>{view.name}</DialogTitle>+ <DialogDescription>+ Record with no {field.name} value ({noValueCount.toLocaleString()})+ </DialogDescription>+ </DialogHeader>+ <CalendarViewNoValueList filters={filters} field={field} />+ </DialogContent>+ </Dialog>+ );+};diff --git a/packages/ui/src/components/databases/calendars/calendar-view-no-value-list.tsx b/packages/ui/src/components/databases/calendars/calendar-view-no-value-list.tsxnew file mode 100644index 00000000..fa2981ec--- /dev/null+++ b/packages/ui/src/components/databases/calendars/calendar-view-no-value-list.tsx@@ -0,0 +1,63 @@+import { InView } from 'react-intersection-observer';++import { DatabaseViewFilterAttributes, FieldAttributes } from '@colanode/core';+import { Avatar } from '@colanode/ui/components/avatars/avatar';+import { useDatabaseView } from '@colanode/ui/contexts/database-view';+import { useLayout } from '@colanode/ui/contexts/layout';+import { useRecordsQuery } from '@colanode/ui/hooks/use-records-query';++interface CalendarViewNoValueListProps {+ filters: DatabaseViewFilterAttributes[];+ field: FieldAttributes;+}++export const CalendarViewNoValueList = ({+ filters,+ field,+}: CalendarViewNoValueListProps) => {+ const view = useDatabaseView();+ const layout = useLayout();++ const { records, hasMore, loadMore, isPending } = useRecordsQuery(+ filters,+ view.sorts+ );++ return (+ <div className="flex flex-col gap-2 overflow-y-auto">+ {records.length === 0 && (+ <div className="text-center text-sm text-muted-foreground">+ No records with no {field.name} value+ </div>+ )}+ {records.map((record) => {+ const name = record.attributes.name ?? 'Unnamed';+ return (+ <div+ key={record.id}+ className="flex flex-row items-center border rounded-md p-1 gap-2 cursor-pointer hover:bg-muted"+ onClick={() => {+ layout.previewLeft(record.id, true);+ }}+ >+ <Avatar+ id={record.id}+ name={name}+ avatar={record.attributes.avatar}+ size="small"+ />+ <p>{name}</p>+ </div>+ );+ })}+ <InView+ rootMargin="200px"+ onChange={(inView) => {+ if (inView && hasMore && !isPending) {+ loadMore();+ }+ }}+ ></InView>+ </div>+ );+};diff --git a/packages/ui/src/components/databases/calendars/calendar-view.tsx b/packages/ui/src/components/databases/calendars/calendar-view.tsxindex 11bc6741..3f497c1b 100644--- a/packages/ui/src/components/databases/calendars/calendar-view.tsx+++ b/packages/ui/src/components/databases/calendars/calendar-view.tsx@@ -2,6 +2,7 @@ import { Fragment } from 'react';import { CalendarViewGrid } from '@colanode/ui/components/databases/calendars/calendar-view-grid';import { CalendarViewNoGroup } from '@colanode/ui/components/databases/calendars/calendar-view-no-group';+import { CalendarViewNoValueCount } from '@colanode/ui/components/databases/calendars/calendar-view-no-value-count';import { CalendarViewSettings } from '@colanode/ui/components/databases/calendars/calendar-view-settings';import { ViewFilterButton } from '@colanode/ui/components/databases/search/view-filter-button';import { ViewSearchBar } from '@colanode/ui/components/databases/search/view-search-bar';@@ -23,6 +24,7 @@ export const CalendarView = () => {<div className="flex flex-row justify-between border-b"><ViewTabs /><div className="invisible flex flex-row items-center justify-end group-hover/database:visible">+ {groupByField && <CalendarViewNoValueCount field={groupByField} />}<CalendarViewSettings /><ViewSortButton /><ViewFilterButton />