Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Implement initial version of board view

Hakan Shehudfa614fdb52f
diff --git a/desktop/src/components/databases/boards/board-view-card.tsx b/desktop/src/components/databases/boards/board-view-card.tsx
new file mode 100644
index 00000000..1437a44a
--- /dev/null
+++ b/desktop/src/components/databases/boards/board-view-card.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import { useWorkspace } from '@/contexts/workspace';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import {
+ RecordNode,
+ SelectFieldNode,
+ SelectOptionNode,
+} from '@/types/databases';
+import { useDrag } from 'react-dnd';
+
+interface BoardViewCardProps {
+ record: RecordNode;
+}
+
+interface DragResult {
+ option: SelectOptionNode;
+ field: SelectFieldNode;
+}
+
+export const BoardViewCard = ({ record }: BoardViewCardProps) => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useNodeAttributeUpsertMutation();
+
+ const [, drag] = useDrag({
+ type: 'board-record',
+ item: { id: record.id },
+ end: (item, monitor) => {
+ const dropResult = monitor.getDropResult<DragResult>();
+ if (dropResult != null) {
+ if (isPending) return;
+ const optionId = dropResult.option.id;
+ const fieldId = dropResult.field.id;
+
+ const currentOptionId = record.attributes?.find(
+ (v) => v.type === fieldId && v.foreignNodeId === optionId,
+ )?.foreignNodeId;
+
+ if (currentOptionId === optionId) {
+ return;
+ }
+
+ mutate({
+ nodeId: record.id,
+ type: fieldId,
+ key: '1',
+ foreignNodeId: optionId,
+ textValue: null,
+ numberValue: null,
+ });
+ }
+ },
+ });
+
+ const buttonRef = React.useRef<HTMLButtonElement>(null);
+ const dragRef = drag(buttonRef);
+
+ return (
+ <button
+ ref={dragRef as any}
+ role="presentation"
+ key={record.id}
+ className="animate-fade-in flex cursor-pointer flex-col gap-1 rounded-md border p-2 hover:bg-gray-50"
+ onClick={() => workspace.openModal(record.id)}
+ >
+ <p>{record.name}</p>
+ </button>
+ );
+};
diff --git a/desktop/src/components/databases/boards/board-view-column-header.tsx b/desktop/src/components/databases/boards/board-view-column-header.tsx
new file mode 100644
index 00000000..ab107871
--- /dev/null
+++ b/desktop/src/components/databases/boards/board-view-column-header.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectOptionNode } from '@/types/databases';
+
+interface BoardViewColumnHeaderProps {
+ option: SelectOptionNode;
+}
+
+export const BoardViewColumnHeader = ({
+ option,
+}: BoardViewColumnHeaderProps) => {
+ return (
+ <div className="flex flex-row items-center gap-2">
+ <SelectOptionBadge name={option.name} color={option.color} />
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/boards/board-view-column-records.tsx b/desktop/src/components/databases/boards/board-view-column-records.tsx
new file mode 100644
index 00000000..9e80e585
--- /dev/null
+++ b/desktop/src/components/databases/boards/board-view-column-records.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { useDatabase } from '@/contexts/database';
+import { useRecordsQuery } from '@/queries/use-records-query';
+import {
+ BoardViewNode,
+ SelectFieldNode,
+ SelectOptionNode,
+} from '@/types/databases';
+import { BoardViewCard } from '@/components/databases/boards/board-view-card';
+
+interface BoardViewColumnRecordsProps {
+ view: BoardViewNode;
+ field: SelectFieldNode;
+ option: SelectOptionNode;
+}
+
+export const BoardViewColumnRecords = ({
+ view,
+ field,
+ option,
+}: BoardViewColumnRecordsProps) => {
+ const database = useDatabase();
+
+ const filters = [
+ ...view.filters,
+ {
+ id: '1',
+ fieldId: field.id,
+ operator: 'is_in',
+ values: [
+ {
+ textValue: null,
+ numberValue: null,
+ foreignNodeId: option.id,
+ },
+ ],
+ },
+ ];
+ const { data, isPending, isFetchingNextPage, fetchNextPage, hasNextPage } =
+ useRecordsQuery(database.id, filters);
+
+ const records = data ?? [];
+ return (
+ <div className="mt-3 flex flex-col gap-2">
+ {records.map((record) => {
+ return <BoardViewCard key={record.id} record={record} />;
+ })}
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/boards/board-view-column.tsx b/desktop/src/components/databases/boards/board-view-column.tsx
new file mode 100644
index 00000000..aeb52dd3
--- /dev/null
+++ b/desktop/src/components/databases/boards/board-view-column.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { getSelectOptionLightColorClass } from '@/lib/databases';
+import { cn } from '@/lib/utils';
+import {
+ BoardViewNode,
+ SelectFieldNode,
+ SelectOptionNode,
+} from '@/types/databases';
+import { useDrop } from 'react-dnd';
+import { BoardViewColumnHeader } from '@/components/databases/boards/board-view-column-header';
+import { BoardViewColumnRecords } from '@/components/databases/boards/board-view-column-records';
+
+interface BoardViewColumnProps {
+ view: BoardViewNode;
+ field: SelectFieldNode;
+ option: SelectOptionNode;
+}
+
+export const BoardViewColumn = ({
+ view,
+ field,
+ option,
+}: BoardViewColumnProps) => {
+ const [{ isDragging }, drop] = useDrop({
+ accept: 'board-record',
+ drop: () => ({
+ option: option,
+ field: field,
+ }),
+ collect: (monitor) => ({
+ isDragging: monitor.isOver(),
+ }),
+ });
+
+ const divRef = React.useRef<HTMLDivElement>(null);
+ const dropRef = drop(divRef);
+
+ const lightClass = getSelectOptionLightColorClass(option.color ?? 'gray');
+ return (
+ <div
+ ref={dropRef as any}
+ className={cn('min-h-[400px] border-r p-1', isDragging && lightClass)}
+ style={{
+ minWidth: '250px',
+ maxWidth: '250px',
+ width: '250px',
+ }}
+ >
+ <BoardViewColumnHeader option={option} />
+ <BoardViewColumnRecords view={view} field={field} option={option} />
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/boards/board-view.tsx b/desktop/src/components/databases/boards/board-view.tsx
index 3bee7028..bedd9858 100644
--- a/desktop/src/components/databases/boards/board-view.tsx
+++ b/desktop/src/components/databases/boards/board-view.tsx
@@ -1,19 +1,57 @@
import React from 'react';
import { BoardViewNode } from '@/types/databases';
import { ViewTabs } from '@/components/databases/view-tabs';
+import { useDatabase } from '@/contexts/database';
+import { ViewActionButton } from '@/components/databases/view-action-button';
+import { ViewFilters } from '@/components/databases/filters/view-filters';
+import { BoardViewColumn } from '@/components/databases/boards/board-view-column';
interface BoardViewProps {
node: BoardViewNode;
}
export const BoardView = ({ node }: BoardViewProps) => {
+ const database = useDatabase();
+ const [openFilters, setOpenFilters] = React.useState(true);
+ const [openSort, setOpenSort] = React.useState(false);
+
+ const groupByField = database.fields.find(
+ (field) => field.id === node.groupBy,
+ );
+
+ console.log(node.groupBy, database.fields);
+
+ if (!groupByField || groupByField.dataType !== 'select') {
+ return null;
+ }
+
return (
<React.Fragment>
<div className="mt-2 flex flex-row justify-between border-b">
<ViewTabs />
+ <div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
+ <ViewActionButton
+ icon="sort-desc"
+ onClick={() => setOpenSort((prev) => !prev)}
+ />
+ <ViewActionButton
+ icon="filter-line"
+ onClick={() => setOpenFilters((prev) => !prev)}
+ />
+ </div>
</div>
- <div className="mt-2 w-full min-w-full max-w-full overflow-auto pr-5">
- board view {node.id}
+ {openFilters && <ViewFilters viewId={node.id} filters={node.filters} />}
+ <div className="mt-2 flex w-full min-w-full max-w-full flex-row gap-2 overflow-auto pr-5">
+ {groupByField.options.map((option) => {
+ return (
+ <BoardViewColumn
+ key={option.id}
+ view={node}
+ field={groupByField}
+ option={option}
+ />
+ );
+ })}
</div>
</React.Fragment>
);
diff --git a/desktop/src/components/databases/fields/field-select.tsx b/desktop/src/components/databases/fields/field-select.tsx
new file mode 100644
index 00000000..8a194650
--- /dev/null
+++ b/desktop/src/components/databases/fields/field-select.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/components/ui/popover';
+import { Button } from '@/components/ui/button';
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+} from '@/components/ui/command';
+import { Icon } from '@/components/ui/icon';
+import { getFieldIcon } from '@/lib/databases';
+import { FieldDataType, FieldNode } from '@/types/databases';
+import { cn } from '@/lib/utils';
+
+interface FieldSelectProps {
+ fields: FieldNode[];
+ value: string | null;
+ onChange: (field: string) => void;
+}
+
+export const FieldSelect = ({ fields, value, onChange }: FieldSelectProps) => {
+ const [open, setOpen] = React.useState(false);
+ const selectedField = fields.find((field) => field.id === value);
+
+ return (
+ <Popover open={open} onOpenChange={setOpen} modal={true}>
+ <PopoverTrigger asChild>
+ <Button
+ variant="outline"
+ role="combobox"
+ aria-expanded={open}
+ className="w-full justify-between p-2"
+ >
+ <span className="flex flex-row items-center gap-1">
+ <Icon
+ name={getFieldIcon(selectedField?.dataType as FieldDataType)}
+ />
+ {value ? selectedField?.name : 'Select field...'}
+ </span>
+ <Icon
+ name="expand-up-down-line"
+ className="ml-2 h-4 w-4 shrink-0 opacity-50"
+ />
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="w-96 p-1">
+ <Command className="min-h-min">
+ <CommandInput placeholder="Search field types..." className="h-9" />
+ <CommandEmpty>No field type found.</CommandEmpty>
+ <CommandList>
+ <CommandGroup className="h-min max-h-96">
+ {fields.map((field) => (
+ <CommandItem
+ key={field.id}
+ onSelect={() => {
+ onChange(field.id);
+ setOpen(false);
+ }}
+ >
+ <div className="flex w-full flex-row items-center gap-2">
+ <Icon name={getFieldIcon(field.dataType)} />
+ <p>{field.name}</p>
+ <Icon
+ name="check-line"
+ className={cn(
+ 'ml-auto h-4 w-4',
+ value === field.id ? 'opacity-100' : 'opacity-0',
+ )}
+ />
+ </div>
+ </CommandItem>
+ ))}
+ </CommandGroup>
+ </CommandList>
+ </Command>
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/desktop/src/components/databases/view-create-dialog.tsx b/desktop/src/components/databases/view-create-dialog.tsx
index 08436ab5..3702a2fe 100644
--- a/desktop/src/components/databases/view-create-dialog.tsx
+++ b/desktop/src/components/databases/view-create-dialog.tsx
@@ -27,10 +27,13 @@ import { useTableViewCreateMutation } from '@/mutations/use-table-view-create-mu
import { useBoardViewCreateMutation } from '@/mutations/use-board-view-create-mutation';
import { useCalendarViewCreateMutation } from '@/mutations/use-calendar-view-create-mutation';
import { useDatabase } from '@/contexts/database';
+import { FieldSelect } from '@/components/databases/fields/field-select';
+import { toast } from '@/components/ui/use-toast';
const formSchema = z.object({
name: z.string().min(3, 'Name must be at least 3 characters long.'),
type: z.enum(['TABLE', 'BOARD', 'CALENDAR']),
+ groupBy: z.string().optional(),
});
interface ViewTypeOption {
@@ -71,6 +74,11 @@ export const ViewCreateDialog = ({
const boardViewCreateMutation = useBoardViewCreateMutation();
const calendarViewCreateMutation = useCalendarViewCreateMutation();
+ const isPending =
+ tableViewCreateMutation.isPending ||
+ boardViewCreateMutation.isPending ||
+ calendarViewCreateMutation.isPending;
+
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
@@ -78,11 +86,7 @@ export const ViewCreateDialog = ({
type: 'TABLE',
},
});
-
- const isPending =
- tableViewCreateMutation.isPending ||
- boardViewCreateMutation.isPending ||
- calendarViewCreateMutation.isPending;
+ const type = form.watch('type');
const handleCancel = () => {
form.reset();
@@ -108,10 +112,21 @@ export const ViewCreateDialog = ({
},
);
} else if (values.type === 'BOARD') {
+ if (!values.groupBy) {
+ toast({
+ title: 'Failed to create board view',
+ description:
+ 'You need to specify a group by field to create a board view',
+ variant: 'destructive',
+ });
+ return;
+ }
+
boardViewCreateMutation.mutate(
{
databaseId: database.id,
name: values.name,
+ groupBy: values.groupBy,
},
{
onSuccess: () => {
@@ -121,10 +136,21 @@ export const ViewCreateDialog = ({
},
);
} else if (values.type === 'CALENDAR') {
+ if (!values.groupBy) {
+ toast({
+ title: 'Failed to create calendar view',
+ description:
+ 'You need to specify a group by field to create a calendar view',
+ variant: 'destructive',
+ });
+ return;
+ }
+
calendarViewCreateMutation.mutate(
{
databaseId: database.id,
name: values.name,
+ groupBy: values.groupBy,
},
{
onSuccess: () => {
@@ -189,6 +215,49 @@ export const ViewCreateDialog = ({
</div>
)}
/>
+ {type === 'BOARD' && (
+ <FormField
+ control={form.control}
+ name="groupBy"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Group by</FormLabel>
+ <FormControl>
+ <FieldSelect
+ fields={database.fields.filter(
+ (field) => field.dataType === 'select',
+ )}
+ value={field.value}
+ onChange={field.onChange}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ )}
+ {type === 'CALENDAR' && (
+ <FormField
+ control={form.control}
+ name="groupBy"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Group by</FormLabel>
+ <FormControl>
+ <FieldSelect
+ fields={database.fields.filter(
+ (field) =>
+ field.dataType === 'date' ||
+ field.dataType === 'created_at',
+ )}
+ value={field.value}
+ onChange={field.onChange}
+ />
+ </FormControl>
+ </FormItem>
+ )}
+ />
+ )}
</div>
<DialogFooter>
<Button variant="outline" onClick={handleCancel}>
diff --git a/desktop/src/lib/constants.ts b/desktop/src/lib/constants.ts
index 1caf3c5b..968c253c 100644
--- a/desktop/src/lib/constants.ts
+++ b/desktop/src/lib/constants.ts
@@ -82,4 +82,5 @@ export const AttributeTypes = {
FieldId: 'field_id',
Operator: 'operator',
Value: 'value',
+ GroupBy: 'group_by',
};
diff --git a/desktop/src/lib/databases.ts b/desktop/src/lib/databases.ts
index 03d4b6ad..7d1c25fe 100644
--- a/desktop/src/lib/databases.ts
+++ b/desktop/src/lib/databases.ts
@@ -94,6 +94,7 @@ interface SelectOptionColor {
label: string;
value: string;
class: string;
+ lightClass: string;
}
export const selectOptionColors: SelectOptionColor[] = [
@@ -101,41 +102,49 @@ export const selectOptionColors: SelectOptionColor[] = [
label: 'Gray',
value: 'gray',
class: 'bg-gray-200',
+ lightClass: 'bg-gray-50',
},
{
label: 'Orange',
value: 'orange',
class: 'bg-orange-200',
+ lightClass: 'bg-orange-50',
},
{
label: 'Yellow',
value: 'yellow',
class: 'bg-yellow-200',
+ lightClass: 'bg-yellow-50',
},
{
label: 'Green',
value: 'green',
class: 'bg-green-200',
+ lightClass: 'bg-green-50',
},
{
label: 'Blue',
value: 'blue',
class: 'bg-blue-200',
+ lightClass: 'bg-blue-50',
},
{
label: 'Purple',
value: 'purple',
class: 'bg-purple-200',
+ lightClass: 'bg-purple-50',
},
{
label: 'Pink',
value: 'pink',
class: 'bg-pink-200',
+ lightClass: 'bg-pink-50',
},
{
label: 'Red',
value: 'red',
class: 'bg-red-200',
+ lightClass: 'bg-red-50',
},
];
@@ -143,6 +152,10 @@ export const getSelectOptionColorClass = (color: string): string => {
return selectOptionColors.find((c) => c.value === color)?.class || '';
};
+export const getSelectOptionLightColorClass = (color: string): string => {
+ return selectOptionColors.find((c) => c.value === color)?.lightClass || '';
+};
+
export const getRandomSelectOptionColor = (): string => {
return selectOptionColors[
Math.floor(Math.random() * selectOptionColors.length)
diff --git a/desktop/src/mutations/use-board-view-create-mutation.tsx b/desktop/src/mutations/use-board-view-create-mutation.tsx
index d39aad5e..4a8ef2f3 100644
--- a/desktop/src/mutations/use-board-view-create-mutation.tsx
+++ b/desktop/src/mutations/use-board-view-create-mutation.tsx
@@ -8,6 +8,7 @@ import { useMutation } from '@tanstack/react-query';
interface BoardViewCreateInput {
databaseId: string;
name: string;
+ groupBy: string;
}
export const useBoardViewCreateMutation = () => {
@@ -50,20 +51,34 @@ export const useBoardViewCreateMutation = () => {
})
.compile();
- const insertBoardViewNameQuery = workspace.schema
+ const insertBoardViewAttributesQuery = workspace.schema
.insertInto('node_attributes')
- .values({
- node_id: boardViewId,
- type: AttributeTypes.Name,
- key: '1',
- text_value: input.name,
- created_at: new Date().toISOString(),
- created_by: workspace.userId,
- version_id: NeuronId.generate(NeuronId.Type.Version),
- })
+ .values([
+ {
+ node_id: boardViewId,
+ type: AttributeTypes.Name,
+ key: '1',
+ text_value: input.name,
+ created_at: new Date().toISOString(),
+ created_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ },
+ {
+ node_id: boardViewId,
+ type: AttributeTypes.GroupBy,
+ key: '1',
+ foreign_node_id: input.groupBy,
+ created_at: new Date().toISOString(),
+ created_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ },
+ ])
.compile();
- await workspace.mutate([insertBoardViewQuery, insertBoardViewNameQuery]);
+ await workspace.mutate([
+ insertBoardViewQuery,
+ insertBoardViewAttributesQuery,
+ ]);
return boardViewId;
},
});
diff --git a/desktop/src/mutations/use-calendar-view-create-mutation.tsx b/desktop/src/mutations/use-calendar-view-create-mutation.tsx
index b956a816..7be748fb 100644
--- a/desktop/src/mutations/use-calendar-view-create-mutation.tsx
+++ b/desktop/src/mutations/use-calendar-view-create-mutation.tsx
@@ -8,6 +8,7 @@ import { useMutation } from '@tanstack/react-query';
interface CalendarViewCreateInput {
databaseId: string;
name: string;
+ groupBy: string;
}
export const useCalendarViewCreateMutation = () => {
@@ -50,22 +51,33 @@ export const useCalendarViewCreateMutation = () => {
})
.compile();
- const insertCalendarViewNameQuery = workspace.schema
+ const insertCalendarViewAttributesQuery = workspace.schema
.insertInto('node_attributes')
- .values({
- node_id: calendarViewId,
- type: AttributeTypes.Name,
- key: '1',
- text_value: input.name,
- created_at: new Date().toISOString(),
- created_by: workspace.userId,
- version_id: NeuronId.generate(NeuronId.Type.Version),
- })
+ .values([
+ {
+ node_id: calendarViewId,
+ type: AttributeTypes.Name,
+ key: '1',
+ text_value: input.name,
+ created_at: new Date().toISOString(),
+ created_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ },
+ {
+ node_id: calendarViewId,
+ type: AttributeTypes.GroupBy,
+ key: '1',
+ foreign_node_id: input.groupBy,
+ created_at: new Date().toISOString(),
+ created_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ },
+ ])
.compile();
await workspace.mutate([
insertCalendarViewQuery,
- insertCalendarViewNameQuery,
+ insertCalendarViewAttributesQuery,
]);
return calendarViewId;
},
diff --git a/desktop/src/queries/use-database-views-query.tsx b/desktop/src/queries/use-database-views-query.tsx
index 11f5b4a6..8e7d6fb6 100644
--- a/desktop/src/queries/use-database-views-query.tsx
+++ b/desktop/src/queries/use-database-views-query.tsx
@@ -182,6 +182,10 @@ const buildBoardViewNode = (
(attribute) => attribute.type === AttributeTypes.Name,
)?.textValue;
+ const groupBy = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.GroupBy,
+ )?.foreignNodeId;
+
const viewFilters = filters.map(buildViewFilterNode);
return {
@@ -189,6 +193,7 @@ const buildBoardViewNode = (
name: name ?? 'Unnamed',
type: 'board_view',
filters: viewFilters,
+ groupBy,
};
};
diff --git a/desktop/src/queries/use-records-query.tsx b/desktop/src/queries/use-records-query.tsx
index 9ed591e5..9c73a2ca 100644
--- a/desktop/src/queries/use-records-query.tsx
+++ b/desktop/src/queries/use-records-query.tsx
@@ -197,7 +197,7 @@ const buildFiltersQuery = (
SELECT na.node_id
FROM node_attributes na
${joinQueries.join(' ')}
- WHERE ${whereQueries.join(' AND ')}
+ ${whereQueries.length > 0 ? `WHERE ${whereQueries.join(' AND ')}` : ''}
)
`;
};
@@ -578,12 +578,12 @@ const buildSelectFilterQuery = (
switch (filter.operator) {
case 'is_in':
return {
- joinQuery: `${buildJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id IN (${ids.join(',')})`,
+ joinQuery: `${buildJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id IN (${joinIds(ids)})`,
whereQuery: null,
};
case 'is_not_in':
return {
- joinQuery: `${buildJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id NOT IN (${ids.join(',')})`,
+ joinQuery: `${buildJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id NOT IN (${joinIds(ids)})`,
whereQuery: null,
};
default:
@@ -615,12 +615,12 @@ const buildMultiSelectFilterQuery = (
switch (filter.operator) {
case 'is_in':
return {
- joinQuery: `${buildJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id IN (${ids.join(',')})`,
+ joinQuery: `${buildJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id IN (${joinIds(ids)})`,
whereQuery: null,
};
case 'is_not_in':
return {
- joinQuery: `${buildLeftJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id IN (${ids.join(',')})`,
+ joinQuery: `${buildLeftJoinQuery(filter.id, field.id)} AND na_${filter.id}.foreign_node_id IN (${joinIds(ids)})`,
whereQuery: `na_${filter.id}.node_id IS NULL`,
};
default:
@@ -655,3 +655,7 @@ const buildJoinQuery = (filterId: string, fieldId: string): string => {
const buildLeftJoinQuery = (filterId: string, fieldId: string): string => {
return `LEFT JOIN node_attributes na_${filterId} ON na_${filterId}.node_id = na.node_id AND na_${filterId}.type = '${fieldId}'`;
};
+
+const joinIds = (ids: string[]): string => {
+ return ids.map((id) => `'${id}'`).join(',');
+};
diff --git a/desktop/src/types/databases.ts b/desktop/src/types/databases.ts
index 835895a3..1715ed72 100644
--- a/desktop/src/types/databases.ts
+++ b/desktop/src/types/databases.ts
@@ -26,6 +26,7 @@ export type BoardViewNode = {
name: string;
type: 'board_view';
filters: ViewFilterNode[];
+ groupBy: string | null;
};
export type CalendarViewNode = {