Skip to content

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

Improve calendar and board view card

Hakan Shehu9ad756fd90c2
diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx
index db591487..3e34e513 100644
--- a/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx
+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx
@@ -4,12 +4,13 @@ import {
SelectOptionAttributes,
ViewFilterAttributes,
} from '@colanode/core';
-import { BoardViewRecord } from '@/renderer/components/databases/boards/board-view-record';
+import { BoardViewRecordCard } from '@/renderer/components/databases/boards/board-view-record-card';
import { useView } from '@/renderer/contexts/view';
import { useRecordsQuery } from '@/renderer/hooks/user-records-query';
import { RecordProvider } from '@/renderer/components/records/record-provider';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useDatabase } from '@/renderer/contexts/database';
+import { BoardViewRecordCreateCard } from '@/renderer/components/databases/boards/board-view-record-create-card';
interface BoardViewColumnRecordsProps {
field: SelectFieldAttributes;
@@ -24,16 +25,16 @@ export const BoardViewColumnRecords = ({
const database = useDatabase();
const view = useView();
- const filters: ViewFilterAttributes[] = [
- ...view.filters,
- {
- id: '1',
- type: 'field',
- fieldId: field.id,
- operator: 'is_in',
- value: [option.id],
- },
- ];
+ const filter: ViewFilterAttributes = {
+ id: '1',
+ type: 'field',
+ fieldId: field.id,
+ operator: 'is_in',
+ value: [option.id],
+ };
+
+ const filters: ViewFilterAttributes[] = [...view.filters, filter];
+
const { records } = useRecordsQuery(filters, view.sorts);
return (
<div className="mt-3 flex flex-col gap-2">
@@ -42,10 +43,11 @@ export const BoardViewColumnRecords = ({
return (
<RecordProvider key={record.id} record={record} role={role}>
- <BoardViewRecord />
+ <BoardViewRecordCard />
</RecordProvider>
);
})}
+ <BoardViewRecordCreateCard filters={filters} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-record.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsx
similarity index 96%
rename from apps/desktop/src/renderer/components/databases/boards/board-view-record.tsx
rename to apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsx
index e266be85..ef17499a 100644
--- a/apps/desktop/src/renderer/components/databases/boards/board-view-record.tsx
+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsx
@@ -11,7 +11,7 @@ interface DragResult {
field: SelectFieldAttributes;
}
-export const BoardViewRecord = () => {
+export const BoardViewRecordCard = () => {
const workspace = useWorkspace();
const view = useView();
const record = useRecord();
@@ -54,7 +54,7 @@ export const BoardViewRecord = () => {
onClick={() => workspace.openInModal(record.id)}
>
<p className={hasName ? '' : 'text-muted-foreground'}>
- {name ?? 'Unnamed'}
+ {hasName ? name : 'Unnamed'}
</p>
{view.fields.length > 0 && (
<div className="flex flex-col gap-1 mt-2">
diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsx
new file mode 100644
index 00000000..d9bab615
--- /dev/null
+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsx
@@ -0,0 +1,30 @@
+import { useDatabase } from '@/renderer/contexts/database';
+import { Plus } from 'lucide-react';
+import { useView } from '@/renderer/contexts/view';
+import { ViewFilterAttributes } from '@colanode/core';
+
+interface BoardViewRecordCreateCardProps {
+ filters: ViewFilterAttributes[];
+}
+
+export const BoardViewRecordCreateCard = ({
+ filters,
+}: BoardViewRecordCreateCardProps) => {
+ const database = useDatabase();
+ const view = useView();
+
+ if (!database.canCreateRecord) {
+ return null;
+ }
+
+ return (
+ <button
+ type="button"
+ className="animate-fade-in flex h-8 w-full cursor-pointer flex-row items-center gap-1 text-muted-foreground hover:bg-gray-50 mt-2"
+ onClick={() => view.createRecord(filters)}
+ >
+ <Plus className="size-4" />
+ <span className="text-sm">Add record</span>
+ </button>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx
index 6d01ff5e..25962208 100644
--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx
+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx
@@ -1,6 +1,6 @@
import { cn, isSameDay } from '@/shared/lib/utils';
import { extractNodeRole, RecordNode } from '@colanode/core';
-import { CalendarViewRecord } from '@/renderer/components/databases/calendars/calendar-view-record';
+import { CalendarViewRecordCard } from '@/renderer/components/databases/calendars/calendar-view-record-card';
import { Plus } from 'lucide-react';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useDatabase } from '@/renderer/contexts/database';
@@ -52,7 +52,7 @@ export const CalendarViewDay = ({
return (
<RecordProvider key={record.id} record={record} role={role}>
- <CalendarViewRecord />
+ <CalendarViewRecordCard />
</RecordProvider>
);
})}
diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsx
similarity index 96%
rename from apps/desktop/src/renderer/components/databases/calendars/calendar-view-record.tsx
rename to apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsx
index fb3bce43..faea2c3b 100644
--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record.tsx
+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsx
@@ -3,7 +3,7 @@ import { useRecord } from '@/renderer/contexts/record';
import { useView } from '@/renderer/contexts/view';
import { RecordFieldValue } from '@/renderer/components/records/record-field-value';
-export const CalendarViewRecord = () => {
+export const CalendarViewRecordCard = () => {
const workspace = useWorkspace();
const view = useView();
const record = useRecord();