Skip to content

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

Use tanstack query for queries

Hakan Shehuc20d0290a636
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 4e0b241b..bd6710ca 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -44,6 +44,7 @@
"@radix-ui/react-tooltip": "^1.1.3",
"@radix-ui/react-visually-hidden": "^1.1.0",
"@react-oauth/google": "^0.12.1",
+ "@tanstack/react-query": "^5.59.20",
"@tiptap/core": "^2.9.1",
"@tiptap/extension-blockquote": "^2.9.1",
"@tiptap/extension-bold": "^2.9.1",
diff --git a/apps/desktop/src/main/handlers/queries/file-list.ts b/apps/desktop/src/main/handlers/queries/file-list.ts
index a9cba360..e26cb24b 100644
--- a/apps/desktop/src/main/handlers/queries/file-list.ts
+++ b/apps/desktop/src/main/handlers/queries/file-list.ts
@@ -76,7 +76,7 @@ export class FileListQueryHandler implements QueryHandler<FileListQueryInput> {
input.userId
);
- const offset = input.page * input.count;
+ const offset = (input.page - 1) * input.count;
const files = await workspaceDatabase
.selectFrom('nodes')
.leftJoin('downloads', (join) =>
diff --git a/apps/desktop/src/main/handlers/queries/icons-get.ts b/apps/desktop/src/main/handlers/queries/icons-get.ts
index 1feb7f4f..583c1668 100644
--- a/apps/desktop/src/main/handlers/queries/icons-get.ts
+++ b/apps/desktop/src/main/handlers/queries/icons-get.ts
@@ -11,9 +11,7 @@ export class IconsGetQueryHandler implements QueryHandler<IconsGetQueryInput> {
public async handleQuery(
_: IconsGetQueryInput
): Promise<QueryResult<IconsGetQueryInput>> {
- console.time('icons_get');
const data = assetManager.getIconData();
- console.timeEnd('icons_get');
return {
output: data,
diff --git a/apps/desktop/src/main/handlers/queries/message-list.ts b/apps/desktop/src/main/handlers/queries/message-list.ts
index 9d940a98..9c904d9e 100644
--- a/apps/desktop/src/main/handlers/queries/message-list.ts
+++ b/apps/desktop/src/main/handlers/queries/message-list.ts
@@ -79,7 +79,7 @@ export class MessageListQueryHandler
input.userId
);
- const offset = input.page * input.count;
+ const offset = (input.page - 1) * input.count;
const messages = await workspaceDatabase
.selectFrom('nodes')
.selectAll()
diff --git a/apps/desktop/src/main/handlers/queries/record-list.ts b/apps/desktop/src/main/handlers/queries/record-list.ts
index a52b0570..99e4e3af 100644
--- a/apps/desktop/src/main/handlers/queries/record-list.ts
+++ b/apps/desktop/src/main/handlers/queries/record-list.ts
@@ -97,7 +97,7 @@ export class RecordListQueryHandler
);
const orderByQuery = `ORDER BY ${input.sorts.length > 0 ? this.buildSortOrdersQuery(input.sorts, database.attributes.fields) : 'n."index" ASC'}`;
- const offset = input.page * input.count;
+ const offset = (input.page - 1) * input.count;
const query = sql<SelectNode>`
WITH record_nodes AS (
SELECT n.*, ROW_NUMBER() OVER (${sql.raw(orderByQuery)}) AS order_number
diff --git a/apps/desktop/src/main/handlers/queries/workspace-user-list.ts b/apps/desktop/src/main/handlers/queries/workspace-user-list.ts
index f82faf6e..bf94f32d 100644
--- a/apps/desktop/src/main/handlers/queries/workspace-user-list.ts
+++ b/apps/desktop/src/main/handlers/queries/workspace-user-list.ts
@@ -70,7 +70,7 @@ export class WorkspaceUserListQueryHandler
input.userId
);
- const offset = input.page * input.count;
+ const offset = (input.page - 1) * input.count;
const rows = await workspaceDatabase
.selectFrom('nodes')
.selectAll()
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 fe8e16a3..3552ceb3 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
@@ -1,15 +1,11 @@
-import { useDatabase } from '@/renderer/contexts/database';
-import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
import {
SelectFieldAttributes,
SelectOptionAttributes,
ViewFilterAttributes,
} from '@colanode/core';
import { BoardViewCard } from '@/renderer/components/databases/boards/board-view-card';
-import { useWorkspace } from '@/renderer/contexts/workspace';
import { useView } from '@/renderer/contexts/view';
-
-const RECORDS_PER_PAGE = 50;
+import { useRecordsQuery } from '@/renderer/hooks/user-records-query';
interface BoardViewColumnRecordsProps {
field: SelectFieldAttributes;
@@ -20,8 +16,6 @@ export const BoardViewColumnRecords = ({
field,
option,
}: BoardViewColumnRecordsProps) => {
- const workspace = useWorkspace();
- const database = useDatabase();
const view = useView();
const filters: ViewFilterAttributes[] = [
@@ -34,39 +28,7 @@ export const BoardViewColumnRecords = ({
value: [option.id],
},
];
- const { data } = useInfiniteQuery({
- initialPageInput: {
- type: 'record_list',
- databaseId: database.id,
- filters: filters,
- sorts: view.sorts,
- page: 0,
- count: RECORDS_PER_PAGE,
- userId: workspace.userId,
- },
- getNextPageInput(page, pages) {
- if (page > pages.length) {
- return undefined;
- }
-
- const lastPage = pages[page - 1];
- if (lastPage.length < RECORDS_PER_PAGE) {
- return undefined;
- }
-
- return {
- type: 'record_list',
- databaseId: database.id,
- filters: filters,
- sorts: Object.values(view.sorts),
- page: page,
- count: RECORDS_PER_PAGE,
- userId: workspace.userId,
- };
- },
- });
-
- const records = data?.flatMap((page) => page) ?? [];
+ const { records } = useRecordsQuery(filters, view.sorts);
return (
<div className="mt-3 flex flex-col gap-2">
{records.map((record) => {
diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx
index db89f924..e7e3cbec 100644
--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx
+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx
@@ -4,22 +4,18 @@ import { cn, getDisplayedDates, toUTCDate } from '@/lib/utils';
import { DayPicker, DayProps } from 'react-day-picker';
import { CalendarViewDay } from '@/renderer/components/databases/calendars/calendar-view-day';
import { FieldAttributes, ViewFilterAttributes } from '@colanode/core';
-import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
-import { useDatabase } from '@/renderer/contexts/database';
+import { useRecordsQuery } from '@/renderer/hooks/user-records-query';
import { filterRecords } from '@/lib/databases';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { ChevronLeft, ChevronRight } from 'lucide-react';
import { useView } from '@/renderer/contexts/view';
-const RECORDS_PER_PAGE = 50;
-
interface CalendarViewGridProps {
field: FieldAttributes;
}
export const CalendarViewGrid = ({ field }: CalendarViewGridProps) => {
const workspace = useWorkspace();
- const database = useDatabase();
const view = useView();
const [month, setMonth] = React.useState(new Date());
@@ -43,43 +39,8 @@ export const CalendarViewGrid = ({ field }: CalendarViewGridProps) => {
},
];
- const { data, isPending } = useInfiniteQuery({
- initialPageInput: {
- type: 'record_list',
- databaseId: database.id,
- filters: filters,
- sorts: view.sorts,
- page: 0,
- count: RECORDS_PER_PAGE,
- userId: workspace.userId,
- },
- getNextPageInput(page, pages) {
- if (page > pages.length) {
- return undefined;
- }
-
- const lastPage = pages[page - 1];
- if (lastPage.length < RECORDS_PER_PAGE) {
- return undefined;
- }
-
- return {
- type: 'record_list',
- databaseId: database.id,
- filters: filters,
- sorts: Object.values(view.sorts),
- page: page,
- count: RECORDS_PER_PAGE,
- userId: workspace.userId,
- };
- },
- });
-
- if (isPending) {
- return null;
- }
+ const { records } = useRecordsQuery(filters, view.sorts);
- const records = data?.flatMap((page) => page) ?? [];
return (
<DayPicker
showOutsideDays
diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx
index 76d4cb88..0d01e131 100644
--- a/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx
+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx
@@ -1,67 +1,24 @@
-import { useDatabase } from '@/renderer/contexts/database';
import { TableViewRow } from '@/renderer/components/databases/tables/table-view-row';
import { TableViewEmptyPlaceholder } from '@/renderer/components/databases/tables/table-view-empty-placeholder';
import { TableViewLoadMoreRow } from '@/renderer/components/databases/tables/table-view-load-more-row';
-import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
+import { useRecordsQuery } from '@/renderer/hooks/user-records-query';
import { useView } from '@/renderer/contexts/view';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-
-const RECORDS_PER_PAGE = 50;
export const TableViewBody = () => {
- const workspace = useWorkspace();
- const database = useDatabase();
const view = useView();
+ const { records, hasMore, loadMore, isPending } = useRecordsQuery(
+ view.filters,
+ view.sorts
+ );
- const { data, isPending, isFetchingNextPage, fetchNextPage, hasNextPage } =
- useInfiniteQuery({
- initialPageInput: {
- type: 'record_list',
- databaseId: database.id,
- filters: view.filters,
- sorts: view.sorts,
- page: 0,
- count: RECORDS_PER_PAGE,
- userId: workspace.userId,
- },
- getNextPageInput(page, pages) {
- if (page > pages.length) {
- return undefined;
- }
-
- const lastPage = pages[page - 1];
- if (lastPage.length < RECORDS_PER_PAGE) {
- return undefined;
- }
-
- return {
- type: 'record_list',
- databaseId: database.id,
- filters: view.filters,
- sorts: view.sorts,
- page: page,
- count: RECORDS_PER_PAGE,
- userId: workspace.userId,
- };
- },
- });
-
- const records = data?.flatMap((page) => page) ?? [];
return (
<div className="border-t">
{records.length === 0 && <TableViewEmptyPlaceholder />}
{records.map((record, index) => (
<TableViewRow key={record.id} index={index} record={record} />
))}
- {!isPending && hasNextPage && (
- <TableViewLoadMoreRow
- isPending={isFetchingNextPage}
- onClick={() => {
- if (hasNextPage && !isFetchingNextPage) {
- fetchNextPage();
- }
- }}
- />
+ {hasMore && (
+ <TableViewLoadMoreRow isPending={isPending} onClick={loadMore} />
)}
</div>
);
diff --git a/apps/desktop/src/renderer/components/folders/folder-files.tsx b/apps/desktop/src/renderer/components/folders/folder-files.tsx
index a7b5cef9..cee8cac6 100644
--- a/apps/desktop/src/renderer/components/folders/folder-files.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-files.tsx
@@ -1,12 +1,14 @@
+import React from 'react';
import { match } from 'ts-pattern';
import { FolderContext } from '@/renderer/contexts/folder';
import { FolderLayoutType } from '@/types/folders';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
+import { useQueries } from '@/renderer/hooks/use-queries';
import { GridLayout } from '@/renderer/components/folders/grids/grid-layout';
import { ListLayout } from '@/renderer/components/folders/lists/list-layout';
import { GalleryLayout } from '@/renderer/components/folders/galleries/gallery-layout';
import { getIdType, IdType } from '@colanode/core';
+import { FileListQueryInput } from '@/operations/queries/file-list';
const FILES_PER_PAGE = 100;
@@ -18,35 +20,19 @@ interface FolderFilesProps {
export const FolderFiles = ({ id, name, layout }: FolderFilesProps) => {
const workspace = useWorkspace();
- const { data } = useInfiniteQuery({
- initialPageInput: {
- type: 'file_list',
- userId: workspace.userId,
- parentId: id,
- count: FILES_PER_PAGE,
- page: 0,
- },
- getNextPageInput: (page, pages) => {
- if (page > pages.length) {
- return undefined;
- }
+ const [lastPage] = React.useState<number>(1);
+ const inputs: FileListQueryInput[] = Array.from({
+ length: lastPage,
+ }).map((_, i) => ({
+ type: 'file_list',
+ userId: workspace.userId,
+ parentId: id,
+ count: FILES_PER_PAGE,
+ page: i + 1,
+ }));
- const lastPage = pages[page - 1];
- if (lastPage.length < FILES_PER_PAGE) {
- return undefined;
- }
-
- return {
- type: 'file_list',
- userId: workspace.userId,
- parentId: id,
- count: FILES_PER_PAGE,
- page: page + 1,
- };
- },
- });
-
- const files = data?.flatMap((page) => page) ?? [];
+ const result = useQueries(inputs);
+ const files = result.flatMap((data) => data.data ?? []);
return (
<FolderContext.Provider
diff --git a/apps/desktop/src/renderer/components/messages/message-list.tsx b/apps/desktop/src/renderer/components/messages/message-list.tsx
index 44fda0a6..6b2482ce 100644
--- a/apps/desktop/src/renderer/components/messages/message-list.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-list.tsx
@@ -1,10 +1,11 @@
import React from 'react';
import { InView } from 'react-intersection-observer';
import { Message } from '@/renderer/components/messages/message';
-import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { compareString } from '@/lib/utils';
import { MessageNode } from '@/types/messages';
+import { useQueries } from '@/renderer/hooks/use-queries';
+import { MessageListQueryInput } from '@/operations/queries/message-list';
interface MessageListProps {
conversationId: string;
@@ -21,39 +22,27 @@ export const MessageList = ({
}: MessageListProps) => {
const workspace = useWorkspace();
const lastMessageId = React.useRef<string | null>(null);
+ const [lastPage, setLastPage] = React.useState<number>(1);
- const { data, isPending, isFetchingNextPage, fetchNextPage, hasNextPage } =
- useInfiniteQuery({
- initialPageInput: {
- type: 'message_list',
- conversationId: conversationId,
- userId: workspace.userId,
- page: 0,
- count: MESSAGES_PER_PAGE,
- },
- getNextPageInput: (page, pages) => {
- if (page > pages.length) {
- return undefined;
- }
+ const inputs: MessageListQueryInput[] = Array.from({
+ length: lastPage,
+ }).map((_, i) => ({
+ type: 'message_list',
+ conversationId: conversationId,
+ userId: workspace.userId,
+ page: i + 1,
+ count: MESSAGES_PER_PAGE,
+ }));
- const lastPage = pages[page - 1];
- if (lastPage.length < MESSAGES_PER_PAGE) {
- return undefined;
- }
+ const result = useQueries(inputs);
+ const messages = result
+ .flatMap((data) => data.data ?? [])
+ .sort((a, b) => compareString(a.id, b.id));
- return {
- type: 'message_list',
- conversationId: conversationId,
- userId: workspace.userId,
- page: page,
- count: MESSAGES_PER_PAGE,
- };
- },
- });
+ const isPending = result.some((data) => data.isPending);
- const messages = (data?.flatMap((page) => page) ?? []).sort((a, b) =>
- compareString(a.id, b.id)
- );
+ const hasMore =
+ !isPending && messages.length === lastPage * MESSAGES_PER_PAGE;
React.useEffect(() => {
if (messages.length > 0) {
@@ -63,19 +52,15 @@ export const MessageList = ({
onLastMessageIdChange(lastMessageId.current);
}
}
- }, [data]);
-
- if (isPending) {
- return null;
- }
+ }, [messages]);
return (
<React.Fragment>
<InView
rootMargin="200px"
onChange={(inView) => {
- if (inView && hasNextPage && !isFetchingNextPage) {
- fetchNextPage();
+ if (inView && hasMore && !isPending) {
+ setLastPage(lastPage + 1);
}
}}
></InView>
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
index 0417a156..a5bac185 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
+import { useQueries } from '@/renderer/hooks/use-queries';
import { Separator } from '@/renderer/components/ui/separator';
import { WorkspaceUserInvite } from '@/renderer/components/workspaces/workspace-user-invite';
import { Avatar } from '@/renderer/components/avatars/avatar';
@@ -8,45 +8,29 @@ import { InView } from 'react-intersection-observer';
import { WorkspaceUserRoleDropdown } from '@/renderer/components/workspaces/workspace-user-role-dropdown';
import { WorkspaceRole } from '@colanode/core';
import { useWorkspace } from '@/renderer/contexts/workspace';
+import { WorkspaceUserListQueryInput } from '@/operations/queries/workspace-user-list';
const USERS_PER_PAGE = 50;
export const WorkspaceUsers = () => {
const workspace = useWorkspace();
const canEditUsers = workspace.role === 'owner' || workspace.role === 'admin';
+ const [lastPage, setLastPage] = React.useState<number>(1);
- const { data, isPending, hasNextPage, fetchNextPage, isFetchingNextPage } =
- useInfiniteQuery({
- initialPageInput: {
- type: 'workspace_user_list',
- page: 0,
- count: USERS_PER_PAGE,
- userId: workspace.userId,
- },
- getNextPageInput(page, pages) {
- if (page > pages.length) {
- return undefined;
- }
+ const inputs: WorkspaceUserListQueryInput[] = Array.from({
+ length: lastPage,
+ }).map((_, i) => ({
+ type: 'workspace_user_list',
+ page: i + 1,
+ count: USERS_PER_PAGE,
+ userId: workspace.userId,
+ }));
- const lastPage = pages[page - 1];
- if (lastPage.length < USERS_PER_PAGE) {
- return undefined;
- }
+ const result = useQueries(inputs);
+ const users = result.flatMap((data) => data.data ?? []);
+ const isPending = result.some((data) => data.isPending);
+ const hasMore = !isPending && users.length === lastPage * USERS_PER_PAGE;
- return {
- type: 'workspace_user_list',
- page: page,
- count: USERS_PER_PAGE,
- userId: workspace.userId,
- };
- },
- });
-
- if (isPending) {
- return null;
- }
-
- const users = data?.flatMap((page) => page) ?? [];
return (
<div className="flex flex-col space-y-4">
{canEditUsers && (
@@ -90,13 +74,13 @@ export const WorkspaceUsers = () => {
);
})}
<div className="flex items-center justify-center space-x-3">
- {isFetchingNextPage && <Spinner />}
+ {isPending && <Spinner />}
</div>
<InView
rootMargin="200px"
onChange={(inView) => {
- if (inView && hasNextPage && !isFetchingNextPage) {
- fetchNextPage();
+ if (inView && hasMore && !isPending) {
+ setLastPage(lastPage + 1);
}
}}
></InView>
diff --git a/apps/desktop/src/renderer/hooks/use-infinite-query.tsx b/apps/desktop/src/renderer/hooks/use-infinite-query.tsx
deleted file mode 100644
index c54c4217..00000000
--- a/apps/desktop/src/renderer/hooks/use-infinite-query.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import React from 'react';
-import { QueryInput, QueryMap } from '@/operations/queries';
-import { sha256 } from 'js-sha256';
-import { useEventBus } from '@/renderer/hooks/use-event-bus';
-import { generateId, IdType } from '@colanode/core';
-
-export const useInfiniteQuery = <T extends QueryInput>({
- initialPageInput,
- getNextPageInput,
-}: {
- initialPageInput: T;
- getNextPageInput: (
- page: number,
- pages: Array<QueryMap[T['type']]['output']>
- ) => T | undefined;
-}) => {
- const eventBus = useEventBus();
-
- const [pages, setPages] = React.useState<
- Array<QueryMap[T['type']]['output']>
- >([]);
- const [isPending, setIsPending] = React.useState(true);
- const [isFetchingNextPage, setIsFetchingNextPage] = React.useState(false);
- const [hasNextPage, setHasNextPage] = React.useState(true);
-
- const subscriberIdsRef = React.useRef<
- Array<{ queryId: string; subscriberId: string }>
- >([]);
-
- const initialInputHash = sha256(JSON.stringify(initialPageInput));
-
- // Function to clean up existing subscriptions
- const cleanupSubscriptions = React.useCallback(() => {
- subscriberIdsRef.current.forEach(({ queryId, subscriberId }) => {
- window.colanode.unsubscribeQuery(queryId);
- eventBus.unsubscribe(subscriberId);
- });
- subscriberIdsRef.current = [];
- }, []);
-
- // Function to subscribe to query result updates
- const subscribeToQueryResult = React.useCallback(
- (queryId: string, pageIndex: number) => {
- const subscriberId = eventBus.subscribe((event) => {
- if (
- event.event === 'query_result_updated' &&
- event.payload?.id === queryId &&
- event.payload?.result
- ) {
- setPages((prevPages) => {
- const newPages = [...prevPages];
- newPages[pageIndex] = event.payload.result;
- return newPages;
- });
- }
- });
- subscriberIdsRef.current.push({ queryId, subscriberId });
- },
- [eventBus]
- );
-
- // Function to fetch a page
- const fetchPage = React.useCallback(
- async (input: T, pageIndex: number) => {
- const queryId = generateId(IdType.Query);
-
- try {
- const result = await window.colanode.executeQueryAndSubscribe(
- queryId,
- input
- );
-
- // Update pages state
- setPages((prevPages) => {
- const newPages = [...prevPages];
- newPages[pageIndex] = result;
- return newPages;
- });
-
- // Check for the next page
- const futureNextPageInput = getNextPageInput(pageIndex + 1, [
- ...pages,
- result,
- ]);
- setHasNextPage(!!futureNextPageInput);
-
- // Subscribe to updates for this query
- subscribeToQueryResult(queryId, pageIndex);
- } catch (error) {
- console.error('Error executing query:', error);
- }
- },
- [pages, getNextPageInput, subscribeToQueryResult]
- );
-
- // Fetch the initial page
- const fetchInitialPage = React.useCallback(async () => {
- setPages([]);
- setIsPending(true);
- setHasNextPage(false);
-
- cleanupSubscriptions();
-
- await fetchPage(initialPageInput, 0);
-
- setIsPending(false);
- }, [initialPageInput, fetchPage]);
-
- React.useEffect(() => {
- fetchInitialPage();
-
- return () => {
- cleanupSubscriptions();
- };
- }, [initialInputHash]);
-
- // Function to fetch the next page
- const fetchNextPage = React.useCallback(async () => {
- if (!hasNextPage || isFetchingNextPage) return;
-
- setIsFetchingNextPage(true);
-
- const nextPageNumber = pages.length;
- const nextPageInput = getNextPageInput(nextPageNumber, pages);
-
- if (!nextPageInput) {
- setIsFetchingNextPage(false);
- setHasNextPage(false);
- return;
- }
-
- await fetchPage(nextPageInput, nextPageNumber);
-
- setIsFetchingNextPage(false);
- }, [pages, hasNextPage, isFetchingNextPage, getNextPageInput, fetchPage]);
-
- return {
- data: pages,
- isPending,
- hasNextPage,
- isFetchingNextPage,
- fetchNextPage,
- };
-};
diff --git a/apps/desktop/src/renderer/hooks/use-queries.tsx b/apps/desktop/src/renderer/hooks/use-queries.tsx
new file mode 100644
index 00000000..6aa55e99
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/use-queries.tsx
@@ -0,0 +1,17 @@
+import { QueryInput } from '@/operations/queries';
+import { sha256 } from 'js-sha256';
+import { useQueries as useTanstackQueries } from '@tanstack/react-query';
+
+export const useQueries = <T extends QueryInput>(inputs: T[]) => {
+ const result = useTanstackQueries({
+ queries: inputs.map((input) => {
+ const hash = sha256(JSON.stringify(input));
+ return {
+ queryKey: [hash],
+ queryFn: () => window.colanode.executeQueryAndSubscribe(hash, input),
+ };
+ }),
+ });
+
+ return result;
+};
diff --git a/apps/desktop/src/renderer/hooks/use-query.tsx b/apps/desktop/src/renderer/hooks/use-query.tsx
index bbaf8b4f..e56b6e8e 100644
--- a/apps/desktop/src/renderer/hooks/use-query.tsx
+++ b/apps/desktop/src/renderer/hooks/use-query.tsx
@@ -1,55 +1,15 @@
-import React from 'react';
-import { QueryInput, QueryMap } from '@/operations/queries';
+import { QueryInput } from '@/operations/queries';
import { sha256 } from 'js-sha256';
-import { useEventBus } from '@/renderer/hooks/use-event-bus';
-import { generateId, IdType } from '@colanode/core';
+import { useQuery as useTanstackQuery } from '@tanstack/react-query';
export const useQuery = <T extends QueryInput>(input: T) => {
- const eventBus = useEventBus();
-
const inputJson = JSON.stringify(input);
const hash = sha256(inputJson);
- const [isPending, setIsPending] = React.useState(true);
- const [data, setData] = React.useState<
- QueryMap[T['type']]['output'] | undefined
- >(undefined);
-
- React.useEffect(() => {
- setIsPending(true);
- setData(undefined);
- const queryId = generateId(IdType.Query);
- const fetchData = async () => {
- try {
- const result = await window.colanode.executeQueryAndSubscribe(
- queryId,
- input
- );
- setData(result);
- } catch (error) {
- console.error('Error executing query:', error);
- } finally {
- setIsPending(false);
- }
- };
-
- fetchData();
-
- const subscriberId = eventBus.subscribe((event) => {
- if (
- event.event === 'query_result_updated' &&
- event.payload?.id === queryId &&
- event.payload?.result
- ) {
- setData(event.payload.result);
- }
- });
-
- return () => {
- window.colanode.unsubscribeQuery(queryId);
- eventBus.unsubscribe(subscriberId);
- };
- }, [hash]);
+ const { data, isPending } = useTanstackQuery({
+ queryKey: [hash],
+ queryFn: () => window.colanode.executeQueryAndSubscribe(hash, input),
+ });
return {
isPending,
diff --git a/apps/desktop/src/renderer/hooks/user-records-query.tsx b/apps/desktop/src/renderer/hooks/user-records-query.tsx
new file mode 100644
index 00000000..53f36031
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/user-records-query.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { useDatabase } from '@/renderer/contexts/database';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { ViewFilterAttributes, ViewSortAttributes } from '@colanode/core';
+import { RecordListQueryInput } from '@/operations/queries/record-list';
+import { useQueries } from '@/renderer/hooks/use-queries';
+
+const RECORDS_PER_PAGE = 50;
+
+export const useRecordsQuery = (
+ filters: ViewFilterAttributes[],
+ sorts: ViewSortAttributes[]
+) => {
+ const workspace = useWorkspace();
+ const database = useDatabase();
+
+ const [lastPage, setLastPage] = React.useState<number>(1);
+
+ const inputs: RecordListQueryInput[] = Array.from({
+ length: lastPage,
+ }).map((_, i) => ({
+ type: 'record_list',
+ databaseId: database.id,
+ filters: filters,
+ sorts: sorts,
+ page: i + 1,
+ count: RECORDS_PER_PAGE,
+ userId: workspace.userId,
+ }));
+
+ const result = useQueries(inputs);
+ const records = result.flatMap((data) => data.data ?? []);
+ const isPending = result.some((data) => data.isPending);
+ const hasMore = !isPending && records.length === lastPage * RECORDS_PER_PAGE;
+
+ const loadMore = React.useCallback(() => {
+ if (hasMore && !isPending) {
+ setLastPage(lastPage + 1);
+ }
+ }, [hasMore, isPending, lastPage]);
+
+ return {
+ records,
+ isPending,
+ hasMore,
+ loadMore,
+ };
+};
diff --git a/apps/desktop/src/renderer/root.tsx b/apps/desktop/src/renderer/root.tsx
index 7c47534c..fb97affa 100644
--- a/apps/desktop/src/renderer/root.tsx
+++ b/apps/desktop/src/renderer/root.tsx
@@ -1,4 +1,5 @@
import '@/renderer/styles/index.css';
+import React from 'react';
import { createRoot } from 'react-dom/client';
import { App } from '@/renderer/app';
import { TooltipProvider } from '@/renderer/components/ui/tooltip';
@@ -11,6 +12,8 @@ import { Container } from '@/renderer/components/workspaces/containers/container
import { DndProvider } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
import { Login } from '@/renderer/components/accounts/login';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { useEventBus } from '@/renderer/hooks/use-event-bus';
const router = createHashRouter([
{
@@ -43,14 +46,66 @@ const router = createHashRouter([
},
]);
+const queryClient = new QueryClient();
+
const Root = () => {
+ const eventBus = useEventBus();
+
+ React.useEffect(() => {
+ const id = eventBus.subscribe((event) => {
+ if (
+ event.event === 'query_result_updated' &&
+ event.payload &&
+ event.payload.id &&
+ event.payload.result
+ ) {
+ const result = event.payload.result;
+ const queryId = event.payload.id;
+
+ if (!result) {
+ return;
+ }
+
+ if (!queryId) {
+ return;
+ }
+
+ const existingData = queryClient.getQueryData<any>([queryId]);
+
+ if (!existingData) {
+ window.colanode.unsubscribeQuery(queryId);
+ return;
+ } else {
+ queryClient.setQueryData([queryId], result);
+ }
+ }
+ });
+
+ queryClient.getQueryCache().subscribe(async (event) => {
+ if (
+ event.type === 'removed' &&
+ event.query &&
+ event.query.queryKey &&
+ event.query.queryKey.length > 0
+ ) {
+ await window.colanode.unsubscribeQuery(event.query.queryKey[0]);
+ }
+ });
+
+ return () => {
+ eventBus.unsubscribe(id);
+ };
+ }, []);
+
return (
- <DndProvider backend={HTML5Backend}>
- <TooltipProvider>
- <RouterProvider router={router} />
- </TooltipProvider>
- <Toaster />
- </DndProvider>
+ <QueryClientProvider client={queryClient}>
+ <DndProvider backend={HTML5Backend}>
+ <TooltipProvider>
+ <RouterProvider router={router} />
+ </TooltipProvider>
+ <Toaster />
+ </DndProvider>
+ </QueryClientProvider>
);
};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index df8354c1..4581911d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -99,6 +99,9 @@ importers:
'@react-oauth/google':
specifier: ^0.12.1
+ '@tanstack/react-query':
+ specifier: ^5.59.20
+ version: 5.59.20([email protected])
'@tiptap/core':
specifier: ^2.9.1
version: 2.9.1(@tiptap/[email protected])
@@ -2231,6 +2234,14 @@ packages:
resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
engines: {node: '>=10'}
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-e8vw0lf7KwfGe1if4uPFhvZRWULqHjFcz3K8AebtieXvnMOz5FSzlZe3mTLlPuUBcydCnBRqYs2YJ5ys68wwLg==}
+
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-Zly0egsK0tFdfSbh5/mapSa+Zfc3Et0Zkar7Wo5sQkFzWyB3p3uZWOHR2wrlAEEV2L953eLuDBtbgFvMYiLvUw==}
+ peerDependencies:
+ react: ^18 || ^19
+
'@tiptap/[email protected]':
resolution: {integrity: sha512-tifnLL/ARzQ6/FGEJjVwj9UT3v+pENdWHdk9x6F3X0mB1y0SeCjV21wpFLYESzwNdBPAj8NMp8Behv7dBnhIfw==}
peerDependencies:
@@ -6592,7 +6603,7 @@ snapshots:
'@babel/traverse': 7.25.9
'@babel/types': 7.26.0
convert-source-map: 2.0.0
- debug: 4.3.7
+ debug: 4.3.7([email protected])
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -6680,7 +6691,7 @@ snapshots:
'@babel/parser': 7.26.2
'@babel/template': 7.25.9
'@babel/types': 7.26.0
- debug: 4.3.7
+ debug: 4.3.7([email protected])
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -6745,7 +6756,7 @@ snapshots:
'@electron/[email protected]':
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
env-paths: 2.2.1
fs-extra: 8.1.0
got: 11.8.6
@@ -6759,7 +6770,7 @@ snapshots:
'@electron/[email protected]':
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
fs-extra: 9.1.0
promise-retry: 2.0.1
transitivePeerDependencies:
@@ -6768,7 +6779,7 @@ snapshots:
'@electron/[email protected]':
dependencies:
compare-version: 0.1.2
- debug: 4.3.7
+ debug: 4.3.7([email protected])
fs-extra: 10.1.0
isbinaryfile: 4.0.10
minimist: 1.2.8
@@ -6780,7 +6791,7 @@ snapshots:
dependencies:
'@electron/asar': 3.2.16
'@malept/cross-spawn-promise': 1.1.1
- debug: 4.3.7
+ debug: 4.3.7([email protected])
dir-compare: 3.3.0
fs-extra: 9.1.0
minimatch: 3.1.2
@@ -6944,7 +6955,7 @@ snapshots:
'@eslint/[email protected]':
dependencies:
ajv: 6.12.6
- debug: 4.3.7
+ debug: 4.3.7([email protected])
espree: 9.6.1
globals: 13.24.0
ignore: 5.3.2
@@ -6981,7 +6992,7 @@ snapshots:
'@humanwhocodes/[email protected]':
dependencies:
'@humanwhocodes/object-schema': 2.0.3
- debug: 4.3.7
+ debug: 4.3.7([email protected])
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@@ -7109,7 +7120,7 @@ snapshots:
'@malept/[email protected]':
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
fs-extra: 9.1.0
lodash: 4.17.21
tmp-promise: 3.0.3
@@ -8084,6 +8095,13 @@ snapshots:
dependencies:
defer-to-connect: 2.0.1
+ '@tanstack/[email protected]': {}
+
+ dependencies:
+ '@tanstack/query-core': 5.59.20
+ react: 18.3.1
+
dependencies:
'@tiptap/pm': 2.9.1
@@ -8476,7 +8494,7 @@ snapshots:
'@typescript-eslint/scope-manager': 5.62.0
'@typescript-eslint/type-utils': 5.62.0([email protected])([email protected])
'@typescript-eslint/utils': 5.62.0([email protected])([email protected])
- debug: 4.3.7
+ debug: 4.3.7([email protected])
eslint: 8.57.1
graphemer: 1.4.0
ignore: 5.3.2
@@ -8511,7 +8529,7 @@ snapshots:
'@typescript-eslint/scope-manager': 5.62.0
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/typescript-estree': 5.62.0([email protected])
- debug: 4.3.7
+ debug: 4.3.7([email protected])
eslint: 8.57.1
optionalDependencies:
typescript: 5.6.3
@@ -8524,7 +8542,7 @@ snapshots:
'@typescript-eslint/types': 7.18.0
'@typescript-eslint/typescript-estree': 7.18.0([email protected])
'@typescript-eslint/visitor-keys': 7.18.0
- debug: 4.3.7
+ debug: 4.3.7([email protected])
eslint: 8.57.1
optionalDependencies:
typescript: 5.6.3
@@ -8545,7 +8563,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 5.62.0([email protected])
'@typescript-eslint/utils': 5.62.0([email protected])([email protected])
- debug: 4.3.7
+ debug: 4.3.7([email protected])
eslint: 8.57.1
tsutils: 3.21.0([email protected])
optionalDependencies:
@@ -8557,7 +8575,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 7.18.0([email protected])
'@typescript-eslint/utils': 7.18.0([email protected])([email protected])
- debug: 4.3.7
+ debug: 4.3.7([email protected])
eslint: 8.57.1
ts-api-utils: 1.4.0([email protected])
optionalDependencies:
@@ -8573,7 +8591,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/visitor-keys': 5.62.0
- debug: 4.3.7
+ debug: 4.3.7([email protected])
globby: 11.1.0
is-glob: 4.0.3
semver: 7.6.3
@@ -8587,7 +8605,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 7.18.0
'@typescript-eslint/visitor-keys': 7.18.0
- debug: 4.3.7
+ debug: 4.3.7([email protected])
globby: 11.1.0
is-glob: 4.0.3
minimatch: 9.0.5
@@ -8746,7 +8764,7 @@ snapshots:
builder-util: 24.13.1
builder-util-runtime: 9.2.4
chromium-pickle-js: 0.2.0
- debug: 4.3.7
+ debug: 4.3.7([email protected])
dmg-builder: 24.13.3([email protected])
ejs: 3.1.10
electron-builder-squirrel-windows: 24.13.3([email protected])
@@ -9020,14 +9038,14 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
sax: 1.4.1
transitivePeerDependencies:
- supports-color
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
sax: 1.4.1
transitivePeerDependencies:
- supports-color
@@ -9041,7 +9059,7 @@ snapshots:
builder-util-runtime: 9.2.4
chalk: 4.1.2
cross-spawn: 7.0.3
- debug: 4.3.7
+ debug: 4.3.7([email protected])
fs-extra: 10.1.0
http-proxy-agent: 5.0.0
https-proxy-agent: 5.0.1
@@ -9321,10 +9339,6 @@ snapshots:
dependencies:
ms: 2.1.3
- dependencies:
- ms: 2.1.3
-
dependencies:
ms: 2.1.3
@@ -9817,7 +9831,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.3
- debug: 4.3.7
+ debug: 4.3.7([email protected])
doctrine: 3.0.0
escape-string-regexp: 4.0.0
eslint-scope: 7.2.2
@@ -9925,7 +9939,7 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
get-stream: 5.2.0
yauzl: 2.10.0
optionalDependencies:
@@ -10249,7 +10263,7 @@ snapshots:
dependencies:
'@tootallnate/once': 2.0.0
agent-base: 6.0.2
- debug: 4.3.7
+ debug: 4.3.7([email protected])
transitivePeerDependencies:
- supports-color
@@ -11815,7 +11829,7 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.7([email protected])
transitivePeerDependencies:
- supports-color