Skip to content

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

Optimize some mutations and improve some UI components

Hakan Shehua53c21479169
diff --git a/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx b/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx
index a092ebc3..032e90c4 100644
--- a/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx
@@ -13,27 +13,36 @@ export const ChannelContainerTab = ({
}: ChannelContainerTabProps) => {
const workspace = useWorkspace();
- const { data: entry } = useQuery({
+ const { data, isPending } = useQuery({
type: 'entry_get',
entryId: channelId,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
- const channel = entry as ChannelEntry;
+ if (isPending) {
+ return <p className="text-sm text-muted-foreground">Loading...</p>;
+ }
+
+ const channel = data as ChannelEntry;
if (!channel) {
- return <p>Not found</p>;
+ return <p className="text-sm text-muted-foreground">Not found</p>;
}
+ const name =
+ channel.attributes.name && channel.attributes.name.length > 0
+ ? channel.attributes.name
+ : 'Unnamed';
+
return (
<div className="flex items-center space-x-2">
<Avatar
size="small"
id={channel.id}
- name={channel.attributes.name}
+ name={name}
avatar={channel.attributes.avatar}
/>
- <span>{channel.attributes.name}</span>
+ <span>{name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
index 3c156c6b..5889c986 100644
--- a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
@@ -12,6 +12,7 @@ import { useLayout } from '@/renderer/contexts/layout';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface ChannelDeleteDialogProps {
open: boolean;
@@ -67,6 +68,7 @@ export const ChannelDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/databases/database-container-tab.tsx b/apps/desktop/src/renderer/components/databases/database-container-tab.tsx
index 6ffce43f..7f728e67 100644
--- a/apps/desktop/src/renderer/components/databases/database-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-container-tab.tsx
@@ -13,27 +13,36 @@ export const DatabaseContainerTab = ({
}: DatabaseContainerTabProps) => {
const workspace = useWorkspace();
- const { data: entry } = useQuery({
+ const { data, isPending } = useQuery({
type: 'entry_get',
entryId: databaseId,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
- const database = entry as DatabaseEntry;
+ if (isPending) {
+ return <p className="text-sm text-muted-foreground">Loading...</p>;
+ }
+
+ const database = data as DatabaseEntry;
if (!database) {
- return <p>Not found</p>;
+ return <p className="text-sm text-muted-foreground">Not found</p>;
}
+ const name =
+ database.attributes.name && database.attributes.name.length > 0
+ ? database.attributes.name
+ : 'Unnamed';
+
return (
<div className="flex items-center space-x-2">
<Avatar
size="small"
id={database.id}
- name={database.attributes.name}
+ name={name}
avatar={database.attributes.avatar}
/>
- <span>{database.attributes.name}</span>
+ <span>{name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
index 36eba5a3..6083a2c5 100644
--- a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
@@ -12,6 +12,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useLayout } from '@/renderer/contexts/layout';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface DatabaseDeleteDialogProps {
open: boolean;
@@ -67,6 +68,7 @@ export const DatabaseDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/databases/database.tsx b/apps/desktop/src/renderer/components/databases/database.tsx
index fcce4bd7..7006c25e 100644
--- a/apps/desktop/src/renderer/components/databases/database.tsx
+++ b/apps/desktop/src/renderer/components/databases/database.tsx
@@ -3,7 +3,6 @@ import React from 'react';
import { DatabaseContext } from '@/renderer/contexts/database';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
interface DatabaseProps {
@@ -14,8 +13,6 @@ interface DatabaseProps {
export const Database = ({ database, role, children }: DatabaseProps) => {
const workspace = useWorkspace();
- const { mutate } = useMutation();
-
const canEdit = hasEntryRole(role, 'editor');
const canCreateRecord = hasEntryRole(role, 'editor');
@@ -29,145 +26,127 @@ export const Database = ({ database, role, children }: DatabaseProps) => {
views: Object.values(database.attributes.views),
canEdit,
canCreateRecord,
- createField: (type, name) => {
- if (!canEdit) {
- return;
- }
+ createField: async (type, name) => {
+ if (!canEdit) return;
- mutate({
- input: {
- type: 'field_create',
- databaseId: database.id,
- name,
- fieldType: type,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to create field',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'field_create',
+ databaseId: database.id,
+ name,
+ fieldType: type,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
- },
- renameField: (id, name) => {
- if (!canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to create field',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ renameField: async (id, name) => {
+ if (!canEdit) return;
- mutate({
- input: {
- type: 'field_name_update',
- databaseId: database.id,
- fieldId: id,
- name,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to update field',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'field_name_update',
+ databaseId: database.id,
+ fieldId: id,
+ name,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
- },
- deleteField: (id) => {
- if (!canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update field',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ deleteField: async (id) => {
+ if (!canEdit) return;
- mutate({
- input: {
- type: 'field_delete',
- databaseId: database.id,
- fieldId: id,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to delete field',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'field_delete',
+ databaseId: database.id,
+ fieldId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
- },
- createSelectOption: (fieldId, name, color) => {
- if (!canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to delete field',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ createSelectOption: async (fieldId, name, color) => {
+ if (!canEdit) return;
- mutate({
- input: {
- type: 'select_option_create',
- databaseId: database.id,
- fieldId,
- name,
- color,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to create select option',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'select_option_create',
+ databaseId: database.id,
+ fieldId,
+ name,
+ color,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
- },
- updateSelectOption: (fieldId, attributes) => {
- if (!canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to create select option',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ updateSelectOption: async (fieldId, attributes) => {
+ if (!canEdit) return;
- mutate({
- input: {
- type: 'select_option_update',
- databaseId: database.id,
- fieldId,
- optionId: attributes.id,
- name: attributes.name,
- color: attributes.color,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to update select option',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'select_option_update',
+ databaseId: database.id,
+ fieldId,
+ optionId: attributes.id,
+ name: attributes.name,
+ color: attributes.color,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
- },
- deleteSelectOption: (fieldId, optionId) => {
- if (!canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update select option',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ deleteSelectOption: async (fieldId, optionId) => {
+ if (!canEdit) return;
- mutate({
- input: {
- type: 'select_option_delete',
- databaseId: database.id,
- fieldId,
- optionId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to delete select option',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'select_option_delete',
+ databaseId: database.id,
+ fieldId,
+ optionId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to delete select option',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
}}
>
diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
index dff9214c..8a1f0ade 100644
--- a/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
@@ -1,6 +1,6 @@
import { RecordEntry } from '@colanode/core';
import isHotkey from 'is-hotkey';
-import { Maximize2 } from 'lucide-react';
+import { SquareArrowOutUpRight } from 'lucide-react';
import React, { Fragment } from 'react';
import { Spinner } from '@/renderer/components/ui/spinner';
@@ -117,7 +117,7 @@ export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
layout.previewLeft(record.id, true);
}}
>
- <Maximize2 className="mr-1 size-4" /> <p>Open</p>
+ <SquareArrowOutUpRight className="mr-1 size-4" /> <p>Open</p>
</button>
{isPending && (
<span className="absolute right-2 text-muted-foreground">
diff --git a/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx
index f583a8c0..0e783092 100644
--- a/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx
@@ -12,6 +12,7 @@ import { useDatabase } from '@/renderer/contexts/database';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface ViewDeleteDialogProps {
id: string;
@@ -71,6 +72,7 @@ export const ViewDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/databases/view.tsx b/apps/desktop/src/renderer/components/databases/view.tsx
index e9be47e9..107db67f 100644
--- a/apps/desktop/src/renderer/components/databases/view.tsx
+++ b/apps/desktop/src/renderer/components/databases/view.tsx
@@ -15,7 +15,6 @@ import { TableView } from '@/renderer/components/databases/tables/table-view';
import { useDatabase } from '@/renderer/contexts/database';
import { ViewContext } from '@/renderer/contexts/view';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { useLayout } from '@/renderer/contexts/layout';
import {
generateFieldValuesFromFilters,
@@ -36,7 +35,6 @@ export const View = ({ view }: ViewProps) => {
const workspace = useWorkspace();
const database = useDatabase();
const layout = useLayout();
- const { mutate } = useMutation();
const fields: ViewField[] = React.useMemo(() => {
return database.fields
@@ -74,65 +72,55 @@ export const View = ({ view }: ViewProps) => {
nameWidth: view.nameWidth ?? getDefaultNameWidth(),
isSearchBarOpened,
isSortsOpened,
- rename: (name: string) => {
- if (!database.canEdit) {
- return;
- }
+ rename: async (name: string) => {
+ if (!database.canEdit) return;
const viewCopy = { ...view };
viewCopy.name = name;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
- },
- updateAvatar: (avatar: string) => {
- if (!database.canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ updateAvatar: async (avatar: string) => {
+ if (!database.canEdit) return;
const viewCopy = { ...view };
viewCopy.avatar = avatar;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
- },
- setFieldDisplay: (id: string, display: boolean) => {
- if (!database.canEdit) {
- return;
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
}
+ },
+ setFieldDisplay: async (id: string, display: boolean) => {
+ if (!database.canEdit) return;
const viewField = view.fields?.[id];
- if (viewField && viewField.display === display) {
- return;
- }
+ if (viewField && viewField.display === display) return;
const viewCopy = { ...view };
viewCopy.fields = viewCopy.fields ?? {};
@@ -145,24 +133,23 @@ export const View = ({ view }: ViewProps) => {
viewCopy.fields[id].display = display;
}
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
- resizeField: (id: string, width: number) => {
+ resizeField: async (id: string, width: number) => {
if (!database.canEdit) {
return;
}
@@ -183,24 +170,23 @@ export const View = ({ view }: ViewProps) => {
viewCopy.fields[id].width = width;
}
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
- resizeName: (width: number) => {
+ resizeName: async (width: number) => {
if (!database.canEdit) {
return;
}
@@ -212,24 +198,23 @@ export const View = ({ view }: ViewProps) => {
const viewCopy = { ...view };
viewCopy.nameWidth = width;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
- moveField: (id: string, after: string) => {
+ moveField: async (id: string, after: string) => {
if (!database.canEdit) {
return;
}
@@ -255,26 +240,25 @@ export const View = ({ view }: ViewProps) => {
viewCopy.fields[id].index = newIndex;
}
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
isFieldFilterOpened: (fieldId: string) =>
openedFieldFilters.includes(fieldId),
- initFieldFilter: (fieldId: string) => {
+ initFieldFilter: async (fieldId: string) => {
if (!database.canEdit) {
return;
}
@@ -301,28 +285,25 @@ export const View = ({ view }: ViewProps) => {
viewCopy.filters = viewCopy.filters ?? {};
viewCopy.filters[fieldId] = filter;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onSuccess() {
- setOpenedFieldFilters((prev) => [...prev, fieldId]);
- setIsSearchBarOpened(true);
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ setOpenedFieldFilters((prev) => [...prev, fieldId]);
+ }
},
- updateFilter: (id: string, filter: ViewFilterAttributes) => {
+ updateFilter: async (id: string, filter: ViewFilterAttributes) => {
if (!database.canEdit) {
return;
}
@@ -335,27 +316,25 @@ export const View = ({ view }: ViewProps) => {
viewCopy.filters = viewCopy.filters ?? {};
viewCopy.filters[id] = filter;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onSuccess() {
- setIsSearchBarOpened(true);
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ setIsSearchBarOpened(true);
+ }
},
- removeFilter: (id: string) => {
+ removeFilter: async (id: string) => {
if (!database.canEdit) {
return;
}
@@ -368,27 +347,25 @@ export const View = ({ view }: ViewProps) => {
viewCopy.filters = viewCopy.filters ?? {};
delete viewCopy.filters[id];
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onSuccess() {
- setIsSearchBarOpened(true);
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ setIsSearchBarOpened(true);
+ }
},
- initFieldSort: (fieldId: string, direction: SortDirection) => {
+ initFieldSort: async (fieldId: string, direction: SortDirection) => {
if (!database.canEdit) {
return;
}
@@ -413,28 +390,26 @@ export const View = ({ view }: ViewProps) => {
viewCopy.sorts = viewCopy.sorts ?? {};
viewCopy.sorts[fieldId] = sort;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onSuccess() {
- setIsSearchBarOpened(true);
- setIsSortsOpened(true);
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ setIsSearchBarOpened(true);
+ setIsSortsOpened(true);
+ }
},
- updateSort: (id: string, sort: ViewSortAttributes) => {
+ updateSort: async (id: string, sort: ViewSortAttributes) => {
if (!database.canEdit) {
return;
}
@@ -447,28 +422,26 @@ export const View = ({ view }: ViewProps) => {
viewCopy.sorts = viewCopy.sorts ?? {};
viewCopy.sorts[id] = sort;
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onSuccess() {
- setIsSearchBarOpened(true);
- setIsSortsOpened(true);
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ setIsSearchBarOpened(true);
+ setIsSortsOpened(true);
+ }
},
- removeSort: (id: string) => {
+ removeSort: async (id: string) => {
if (!database.canEdit) {
return;
}
@@ -481,25 +454,24 @@ export const View = ({ view }: ViewProps) => {
viewCopy.sorts = viewCopy.sorts ?? {};
delete viewCopy.sorts[id];
- mutate({
- input: {
- type: 'view_update',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- databaseId: database.id,
- view: viewCopy,
- },
- onSuccess() {
- setIsSearchBarOpened(true);
- },
- onError(error) {
- toast({
- title: 'Failed to update view',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'view_update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ databaseId: database.id,
+ view: viewCopy,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update view',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ setIsSearchBarOpened(true);
+ setIsSortsOpened(true);
+ }
},
openSearchBar: () => {
setIsSearchBarOpened(true);
@@ -519,7 +491,7 @@ export const View = ({ view }: ViewProps) => {
closeFieldFilter: (fieldId: string) => {
setOpenedFieldFilters((prev) => prev.filter((id) => id !== fieldId));
},
- createRecord: (filters?: ViewFilterAttributes[]) => {
+ createRecord: async (filters?: ViewFilterAttributes[]) => {
const viewFilters = Object.values(view.filters ?? {}) ?? [];
const extraFilters = filters ?? [];
@@ -530,25 +502,23 @@ export const View = ({ view }: ViewProps) => {
workspace.userId
);
- mutate({
- input: {
- type: 'record_create',
- databaseId: database.id,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- fields,
- },
- onSuccess: (output) => {
- layout.previewLeft(output.id, true);
- },
- onError(error) {
- toast({
- title: 'Failed to create record',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'record_create',
+ databaseId: database.id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ fields,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to create record',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ } else {
+ layout.previewLeft(result.output.id, true);
+ }
},
}}
>
diff --git a/apps/desktop/src/renderer/components/files/file-container-tab.tsx b/apps/desktop/src/renderer/components/files/file-container-tab.tsx
index d676ec87..785cd74f 100644
--- a/apps/desktop/src/renderer/components/files/file-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/files/file-container-tab.tsx
@@ -9,15 +9,20 @@ interface FileContainerTabProps {
export const FileContainerTab = ({ fileId }: FileContainerTabProps) => {
const workspace = useWorkspace();
- const { data: file } = useQuery({
+ const { data, isPending } = useQuery({
type: 'file_get',
id: fileId,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
+ if (isPending) {
+ return <p className="text-sm text-muted-foreground">Loading...</p>;
+ }
+
+ const file = data;
if (!file) {
- return <p>Not found</p>;
+ return <p className="text-sm text-muted-foreground">Not found</p>;
}
return (
diff --git a/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx b/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx
index 5585a855..6b17113c 100644
--- a/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx
@@ -11,6 +11,7 @@ import { Button } from '@/renderer/components/ui/button';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface FileDeleteDialogProps {
fileId: string;
@@ -64,6 +65,7 @@ export const FileDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/files/file-download.tsx b/apps/desktop/src/renderer/components/files/file-download.tsx
index 67c3f881..f9a6acc2 100644
--- a/apps/desktop/src/renderer/components/files/file-download.tsx
+++ b/apps/desktop/src/renderer/components/files/file-download.tsx
@@ -2,7 +2,6 @@ import { Download } from 'lucide-react';
import { Spinner } from '@/renderer/components/ui/spinner';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
import { DownloadStatus, FileWithState } from '@/shared/types/files';
import { formatBytes } from '@/shared/lib/files';
@@ -13,7 +12,6 @@ interface FileDownloadProps {
export const FileDownload = ({ file }: FileDownloadProps) => {
const workspace = useWorkspace();
- const { mutate } = useMutation();
const isDownloading = file.downloadStatus === DownloadStatus.Pending;
@@ -27,25 +25,24 @@ export const FileDownload = ({ file }: FileDownloadProps) => {
) : (
<div
className="flex cursor-pointer flex-col items-center gap-3 text-muted-foreground hover:text-primary"
- onClick={(e) => {
+ onClick={async (e) => {
e.stopPropagation();
e.preventDefault();
- mutate({
- input: {
- type: 'file_download',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- fileId: file.id,
- },
- onError(error) {
- toast({
- title: 'Failed to download file',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const result = await window.colanode.executeMutation({
+ type: 'file_download',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ fileId: file.id,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to download file',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
}}
>
<Download className="size-8" />
diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsx
index 98826624..f08ad4eb 100644
--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx
@@ -22,7 +22,6 @@ import {
import { Dropzone } from '@/renderer/components/ui/dropzone';
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { FolderLayoutType } from '@/shared/types/folders';
import { toast } from '@/renderer/hooks/use-toast';
@@ -61,7 +60,6 @@ interface FolderBodyProps {
export const FolderBody = ({ folder }: FolderBodyProps) => {
const workspace = useWorkspace();
- const { mutate } = useMutation();
const [layout, setLayout] = React.useState<FolderLayoutType>('grid');
const isDialogOpenedRef = React.useRef(false);
@@ -75,7 +73,7 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
}
isDialogOpenedRef.current = true;
- const result = await window.colanode.executeCommand({
+ const commandResult = await window.colanode.executeCommand({
type: 'file_dialog_open',
options: {
properties: ['openFile'],
@@ -84,37 +82,36 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
},
});
- if (result.canceled) {
+ if (commandResult.canceled) {
isDialogOpenedRef.current = false;
return;
}
- const filePath = result.filePaths[0];
+ const filePath = commandResult.filePaths[0];
if (!filePath) {
isDialogOpenedRef.current = false;
return;
}
- mutate({
- input: {
- type: 'file_create',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- filePath,
- parentId: folder.id,
- entryId: folder.id,
- rootId: folder.rootId,
- },
- onError(error) {
- toast({
- title: 'Failed to upload file',
- description: error.message,
- variant: 'destructive',
- });
- },
+ const mutationResult = await window.colanode.executeMutation({
+ type: 'file_create',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ filePath,
+ parentId: folder.id,
+ entryId: folder.id,
+ rootId: folder.rootId,
});
+ if (!mutationResult.success) {
+ toast({
+ title: 'Failed to upload file',
+ description: mutationResult.error.message,
+ variant: 'destructive',
+ });
+ }
+
isDialogOpenedRef.current = false;
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx b/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx
index e3ae8dd6..5f76ddd5 100644
--- a/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx
@@ -11,27 +11,36 @@ interface FolderContainerTabProps {
export const FolderContainerTab = ({ folderId }: FolderContainerTabProps) => {
const workspace = useWorkspace();
- const { data: entry } = useQuery({
+ const { data, isPending } = useQuery({
type: 'entry_get',
entryId: folderId,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
- const folder = entry as FolderEntry;
+ if (isPending) {
+ return <p className="text-sm text-muted-foreground">Loading...</p>;
+ }
+
+ const folder = data as FolderEntry;
if (!folder) {
- return <p>Not found</p>;
+ return <p className="text-sm text-muted-foreground">Not found</p>;
}
+ const name =
+ folder.attributes.name && folder.attributes.name.length > 0
+ ? folder.attributes.name
+ : 'Unnamed';
+
return (
<div className="flex items-center space-x-2">
<Avatar
size="small"
id={folder.id}
- name={folder.attributes.name}
+ name={name}
avatar={folder.attributes.avatar}
/>
- <span>{folder.attributes.name}</span>
+ <span>{name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
index 97b08fcd..8642173e 100644
--- a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
@@ -12,6 +12,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface FolderDeleteDialogProps {
open: boolean;
@@ -67,6 +68,7 @@ export const FolderDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/messages/message-delete-button.tsx b/apps/desktop/src/renderer/components/messages/message-delete-button.tsx
index c6abf9aa..79a4f422 100644
--- a/apps/desktop/src/renderer/components/messages/message-delete-button.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-delete-button.tsx
@@ -14,6 +14,7 @@ import { Button } from '@/renderer/components/ui/button';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface MessageDeleteButtonProps {
id: string;
@@ -67,6 +68,7 @@ export const MessageDeleteButton = ({ id }: MessageDeleteButtonProps) => {
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/pages/page-container-tab.tsx b/apps/desktop/src/renderer/components/pages/page-container-tab.tsx
index 5dcd7472..605d1cfe 100644
--- a/apps/desktop/src/renderer/components/pages/page-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-container-tab.tsx
@@ -11,27 +11,36 @@ interface PageContainerTabProps {
export const PageContainerTab = ({ pageId }: PageContainerTabProps) => {
const workspace = useWorkspace();
- const { data: entry } = useQuery({
+ const { data, isPending } = useQuery({
type: 'entry_get',
entryId: pageId,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
- const page = entry as PageEntry;
+ if (isPending) {
+ return <p className="text-sm text-muted-foreground">Loading...</p>;
+ }
+
+ const page = data as PageEntry;
if (!page) {
- return <p>Not found</p>;
+ return <p className="text-sm text-muted-foreground">Not found</p>;
}
+ const name =
+ page.attributes.name && page.attributes.name.length > 0
+ ? page.attributes.name
+ : 'Unnamed';
+
return (
<div className="flex items-center space-x-2">
<Avatar
size="small"
id={page.id}
- name={page.attributes.name}
+ name={name}
avatar={page.attributes.avatar}
/>
- <span>{page.attributes.name}</span>
+ <span>{name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
index 0d15aa50..8d20683a 100644
--- a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
@@ -12,7 +12,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
-
+import { Spinner } from '@/renderer/components/ui/spinner';
interface PageDeleteDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
@@ -67,6 +67,7 @@ export const PageDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/records/record-container-tab.tsx b/apps/desktop/src/renderer/components/records/record-container-tab.tsx
index 54ee615c..4195b9b6 100644
--- a/apps/desktop/src/renderer/components/records/record-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/records/record-container-tab.tsx
@@ -23,15 +23,20 @@ export const RecordContainerTab = ({ recordId }: RecordContainerTabProps) => {
return <p>Not found</p>;
}
+ const name =
+ record.attributes.name && record.attributes.name.length > 0
+ ? record.attributes.name
+ : 'Unnamed';
+
return (
<div className="flex items-center space-x-2">
<Avatar
size="small"
id={record.id}
- name={record.attributes.name}
+ name={name}
avatar={record.attributes.avatar}
/>
- <span>{record.attributes.name}</span>
+ <span>{name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
index ab9b215f..bff19223 100644
--- a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
@@ -12,6 +12,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface RecordDeleteDialogProps {
open: boolean;
@@ -67,6 +68,7 @@ export const RecordDeleteDialog = ({
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>
diff --git a/apps/desktop/src/renderer/components/records/record-provider.tsx b/apps/desktop/src/renderer/components/records/record-provider.tsx
index 5313c5ac..225d23e9 100644
--- a/apps/desktop/src/renderer/components/records/record-provider.tsx
+++ b/apps/desktop/src/renderer/components/records/record-provider.tsx
@@ -3,7 +3,6 @@ import React from 'react';
import { RecordContext } from '@/renderer/contexts/record';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
export const RecordProvider = ({
@@ -16,7 +15,6 @@ export const RecordProvider = ({
children: React.ReactNode;
}) => {
const workspace = useWorkspace();
- const { mutate } = useMutation();
const canEdit =
record.createdBy === workspace.userId || hasEntryRole(role, 'editor');
@@ -34,42 +32,40 @@ export const RecordProvider = ({
updatedAt: record.updatedAt,
databaseId: record.attributes.databaseId,
canEdit,
- updateFieldValue: (field, value) => {
- mutate({
- input: {
- type: 'record_field_value_set',
- recordId: record.id,
- fieldId: field.id,
- value,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to update record field value',
- description: error.message,
- variant: 'destructive',
- });
- },
+ updateFieldValue: async (field, value) => {
+ const result = await window.colanode.executeMutation({
+ type: 'record_field_value_set',
+ recordId: record.id,
+ fieldId: field.id,
+ value,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to update record field value',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
- removeFieldValue: (field) => {
- mutate({
- input: {
- type: 'record_field_value_delete',
- recordId: record.id,
- fieldId: field.id,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- onError(error) {
- toast({
- title: 'Failed to delete record field value',
- description: error.message,
- variant: 'destructive',
- });
- },
+ removeFieldValue: async (field) => {
+ const result = await window.colanode.executeMutation({
+ type: 'record_field_value_delete',
+ recordId: record.id,
+ fieldId: field.id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
});
+
+ if (!result.success) {
+ toast({
+ title: 'Failed to delete record field value',
+ description: result.error.message,
+ variant: 'destructive',
+ });
+ }
},
getBooleanValue: (field) => {
const fieldValue = record.attributes.fields[field.id];
diff --git a/apps/desktop/src/renderer/components/spaces/space-container-tab.tsx b/apps/desktop/src/renderer/components/spaces/space-container-tab.tsx
index 38bb6bee..217598cb 100644
--- a/apps/desktop/src/renderer/components/spaces/space-container-tab.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-container-tab.tsx
@@ -11,27 +11,36 @@ interface SpaceContainerTabProps {
export const SpaceContainerTab = ({ spaceId }: SpaceContainerTabProps) => {
const workspace = useWorkspace();
- const { data: entry } = useQuery({
+ const { data, isPending } = useQuery({
type: 'entry_get',
entryId: spaceId,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
- const space = entry as SpaceEntry;
+ if (isPending) {
+ return <p className="text-sm text-muted-foreground">Loading...</p>;
+ }
+
+ const space = data as SpaceEntry;
if (!space) {
- return <p>Not found</p>;
+ return <p className="text-sm text-muted-foreground">Not found</p>;
}
+ const name =
+ space.attributes.name && space.attributes.name.length > 0
+ ? space.attributes.name
+ : 'Unnamed';
+
return (
<div className="flex items-center space-x-2">
<Avatar
size="small"
id={space.id}
- name={space.attributes.name}
+ name={name}
avatar={space.attributes.avatar}
/>
- <span>{space.attributes.name}</span>
+ <span>{name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/spaces/space-delete-form.tsx b/apps/desktop/src/renderer/components/spaces/space-delete-form.tsx
index 6f6cb1cd..9d08a4e7 100644
--- a/apps/desktop/src/renderer/components/spaces/space-delete-form.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-delete-form.tsx
@@ -13,6 +13,7 @@ import {
AlertDialogHeader,
AlertDialogTitle,
} from '@/renderer/components/ui/alert-dialog';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface SpaceDeleteFormProps {
id: string;
@@ -88,6 +89,7 @@ export const SpaceDeleteForm = ({ id, onDeleted }: SpaceDeleteFormProps) => {
});
}}
>
+ {isPending && <Spinner className="mr-1" />}
Delete
</Button>
</AlertDialogFooter>