Skip to content

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

Workspace storage limits (#140)

Hakan Shehue1e503e7b2dc
diff --git a/apps/server/src/api/client/routes/workspaces/files/file-upload.ts b/apps/server/src/api/client/routes/workspaces/files/file-upload.ts
index b2cf0894..8b6e9368 100644
--- a/apps/server/src/api/client/routes/workspaces/files/file-upload.ts
+++ b/apps/server/src/api/client/routes/workspaces/files/file-upload.ts
@@ -47,6 +47,19 @@ export const fileUploadRoute: FastifyPluginCallbackZod = (
const { workspaceId, fileId } = request.params;
const user = request.user;
+ const workspace = await database
+ .selectFrom('workspaces')
+ .selectAll()
+ .where('id', '=', workspaceId)
+ .executeTakeFirst();
+
+ if (!workspace) {
+ return reply.code(404).send({
+ code: ApiErrorCode.WorkspaceNotFound,
+ message: 'Workspace not found.',
+ });
+ }
+
const node = await database
.selectFrom('nodes')
.selectAll()
@@ -88,18 +101,49 @@ export const fileUploadRoute: FastifyPluginCallbackZod = (
});
}
- const storageUsed = await fetchCounter(
+ if (file.attributes.size > BigInt(user.max_file_size)) {
+ return reply.code(400).send({
+ code: ApiErrorCode.FileUploadFailed,
+ message:
+ 'The file size exceeds the maximum allowed size for your account.',
+ });
+ }
+
+ if (workspace.max_file_size) {
+ if (file.attributes.size > BigInt(workspace.max_file_size)) {
+ return reply.code(400).send({
+ code: ApiErrorCode.FileUploadFailed,
+ message: 'The file size exceeds the maximum allowed size.',
+ });
+ }
+ }
+
+ const userStorageUsed = await fetchCounter(
database,
`${user.id}.storage.used`
);
- if (storageUsed >= BigInt(user.storage_limit)) {
+ if (userStorageUsed >= BigInt(user.storage_limit)) {
return reply.code(400).send({
- code: ApiErrorCode.FileUploadInitFailed,
+ code: ApiErrorCode.FileUploadFailed,
message: 'You have reached the maximum storage limit.',
});
}
+ if (workspace.storage_limit) {
+ const workspaceStorageUsed = await fetchCounter(
+ database,
+ `${workspaceId}.storage.used`
+ );
+
+ if (workspaceStorageUsed >= BigInt(workspace.storage_limit)) {
+ return reply.code(400).send({
+ code: ApiErrorCode.FileUploadFailed,
+ message: 'The workspace has reached the maximum storage limit.',
+ });
+ }
+ }
+
const path = buildFilePath(workspaceId, fileId, file.attributes);
const stream = request.raw;
diff --git a/apps/server/src/api/client/routes/workspaces/index.ts b/apps/server/src/api/client/routes/workspaces/index.ts
index 61f7ca6b..efb0b023 100644
--- a/apps/server/src/api/client/routes/workspaces/index.ts
+++ b/apps/server/src/api/client/routes/workspaces/index.ts
@@ -5,6 +5,7 @@ import { workspaceAuthenticator } from '@colanode/server/api/client/plugins/work
import { fileRoutes } from './files';
import { mutationsRoutes } from './mutations';
+import { storageRoutes } from './storage';
import { userRoutes } from './users';
import { workspaceCreateRoute } from './workspace-create';
import { workspaceDeleteRoute } from './workspace-delete';
@@ -27,6 +28,7 @@ export const workspaceRoutes: FastifyPluginCallback = (instance, _, done) => {
subInstance.register(fileRoutes, { prefix: '/files' });
subInstance.register(userRoutes, { prefix: '/users' });
subInstance.register(mutationsRoutes, { prefix: '/mutations' });
+ subInstance.register(storageRoutes, { prefix: '/storage' });
},
{
prefix: '/:workspaceId',
diff --git a/apps/server/src/api/client/routes/workspaces/storage/index.ts b/apps/server/src/api/client/routes/workspaces/storage/index.ts
new file mode 100644
index 00000000..3313d538
--- /dev/null
+++ b/apps/server/src/api/client/routes/workspaces/storage/index.ts
@@ -0,0 +1,9 @@
+import { FastifyPluginCallback } from 'fastify';
+
+import { workspaceStorageGetRoute } from './workspace-storage-get';
+
+export const storageRoutes: FastifyPluginCallback = (instance, _, done) => {
+ instance.register(workspaceStorageGetRoute);
+
+ done();
+};
diff --git a/apps/server/src/api/client/routes/workspaces/storage/workspace-storage-get.ts b/apps/server/src/api/client/routes/workspaces/storage/workspace-storage-get.ts
new file mode 100644
index 00000000..c839d31a
--- /dev/null
+++ b/apps/server/src/api/client/routes/workspaces/storage/workspace-storage-get.ts
@@ -0,0 +1,136 @@
+import { FastifyPluginCallbackZod } from 'fastify-type-provider-zod';
+import { sql } from 'kysely';
+import { z } from 'zod/v4';
+
+import {
+ ApiErrorCode,
+ apiErrorOutputSchema,
+ compareString,
+ extractFileSubtype,
+ FileSubtype,
+ workspaceStorageGetOutputSchema,
+} from '@colanode/core';
+import { database } from '@colanode/server/data/database';
+
+interface WorkspaceStorageAggregateRow {
+ mime_type: string;
+ total_size: string;
+}
+
+interface UserStorageRow {
+ id: string;
+ storage_limit: string;
+ storage_used: string | null;
+}
+
+export const workspaceStorageGetRoute: FastifyPluginCallbackZod = (
+ instance,
+ _,
+ done
+) => {
+ instance.route({
+ method: 'GET',
+ url: '/',
+ schema: {
+ params: z.object({
+ workspaceId: z.string(),
+ }),
+ response: {
+ 200: workspaceStorageGetOutputSchema,
+ 400: apiErrorOutputSchema,
+ 403: apiErrorOutputSchema,
+ 404: apiErrorOutputSchema,
+ },
+ },
+ handler: async (request, reply) => {
+ const workspaceId = request.params.workspaceId;
+ const user = request.user;
+
+ if (user.role !== 'owner' && user.role !== 'admin') {
+ return reply.code(403).send({
+ code: ApiErrorCode.UserInviteNoAccess,
+ message: 'You do not have access to get workspace storage.',
+ });
+ }
+
+ const workspace = await database
+ .selectFrom('workspaces')
+ .selectAll()
+ .where('id', '=', workspaceId)
+ .executeTakeFirstOrThrow();
+
+ if (!workspace) {
+ return reply.code(404).send({
+ code: ApiErrorCode.WorkspaceNotFound,
+ message: 'Workspace not found.',
+ });
+ }
+
+ const [subtypeAggregates, usersWithStorage] = await Promise.all([
+ sql<WorkspaceStorageAggregateRow>`
+ SELECT
+ mime_type,
+ SUM(size) as total_size
+ FROM uploads
+ WHERE workspace_id = ${workspaceId}
+ GROUP BY mime_type
+ `.execute(database),
+ sql<UserStorageRow>`
+ SELECT
+ u.id,
+ u.storage_limit,
+ COALESCE(c.value, '0') as storage_used
+ FROM users u
+ LEFT JOIN counters c ON c.key = CONCAT(u.id, '.storage.used')
+ WHERE u.workspace_id = ${workspaceId}
+ `.execute(database),
+ ]);
+
+ const subtypeGroups: Record<string, bigint> = {};
+ let totalUsed = 0n;
+ for (const row of subtypeAggregates.rows) {
+ const subtype = extractFileSubtype(row.mime_type);
+ const currentSize = subtypeGroups[subtype] || 0n;
+ subtypeGroups[subtype] = currentSize + BigInt(row.total_size);
+ totalUsed += BigInt(row.total_size);
+ }
+
+ const subtypes = Object.entries(subtypeGroups)
+ .sort((a, b) => {
+ const aSize = BigInt(a[1]);
+ const bSize = BigInt(b[1]);
+ return Number(bSize - aSize);
+ })
+ .map(([subtype, size]) => ({
+ subtype: subtype as FileSubtype,
+ size: size.toString(),
+ }));
+
+ const users = usersWithStorage.rows
+ .sort((a, b) => {
+ const aUsed = a.storage_used ? BigInt(a.storage_used) : 0n;
+ const bUsed = b.storage_used ? BigInt(b.storage_used) : 0n;
+ const diff = Number(aUsed - bUsed);
+ if (diff !== 0) {
+ return -diff;
+ }
+
+ return compareString(a.id, b.id);
+ })
+ .map((user) => ({
+ id: user.id,
+ used: user.storage_used ?? '0',
+ limit: user.storage_limit,
+ }));
+
+ return {
+ limit: workspace.storage_limit,
+ used: totalUsed.toString(),
+ subtypes: subtypes,
+ users: users,
+ };
+ },
+ });
+
+ done();
+};
diff --git a/apps/server/src/api/client/routes/workspaces/users/index.ts b/apps/server/src/api/client/routes/workspaces/users/index.ts
index a920e3a3..48932244 100644
--- a/apps/server/src/api/client/routes/workspaces/users/index.ts
+++ b/apps/server/src/api/client/routes/workspaces/users/index.ts
@@ -1,11 +1,13 @@
import { FastifyPluginCallback } from 'fastify';
import { userRoleUpdateRoute } from './user-role-update';
+import { userStorageUpdateRoute } from './user-storage-update';
import { usersCreateRoute } from './users-create';
export const userRoutes: FastifyPluginCallback = (instance, _, done) => {
instance.register(usersCreateRoute);
instance.register(userRoleUpdateRoute);
+ instance.register(userStorageUpdateRoute);
done();
};
diff --git a/apps/server/src/api/client/routes/workspaces/users/user-role-update.ts b/apps/server/src/api/client/routes/workspaces/users/user-role-update.ts
index 80eff9d9..c67c218c 100644
--- a/apps/server/src/api/client/routes/workspaces/users/user-role-update.ts
+++ b/apps/server/src/api/client/routes/workspaces/users/user-role-update.ts
@@ -66,7 +66,7 @@ export const userRoleUpdateRoute: FastifyPluginCallbackZod = (
role: input.role,
status,
updated_at: new Date(),
- updated_by: user.id,
+ updated_by: user.account_id,
})
.where('id', '=', userToUpdate.id)
.executeTakeFirst();
diff --git a/apps/server/src/api/client/routes/workspaces/users/user-storage-update.ts b/apps/server/src/api/client/routes/workspaces/users/user-storage-update.ts
new file mode 100644
index 00000000..9e6ea7a8
--- /dev/null
+++ b/apps/server/src/api/client/routes/workspaces/users/user-storage-update.ts
@@ -0,0 +1,102 @@
+import { FastifyPluginCallbackZod } from 'fastify-type-provider-zod';
+import { z } from 'zod/v4';
+
+import {
+ ApiErrorCode,
+ apiErrorOutputSchema,
+ userOutputSchema,
+ userStorageUpdateInputSchema,
+} from '@colanode/core';
+import { database } from '@colanode/server/data/database';
+import { eventBus } from '@colanode/server/lib/event-bus';
+
+export const userStorageUpdateRoute: FastifyPluginCallbackZod = (
+ instance,
+ _,
+ done
+) => {
+ instance.route({
+ method: 'PATCH',
+ url: '/:userId/storage',
+ schema: {
+ params: z.object({
+ userId: z.string(),
+ }),
+ body: userStorageUpdateInputSchema,
+ response: {
+ 200: userOutputSchema,
+ 400: apiErrorOutputSchema,
+ 403: apiErrorOutputSchema,
+ 404: apiErrorOutputSchema,
+ },
+ },
+ handler: async (request, reply) => {
+ const userId = request.params.userId;
+ const input = request.body;
+ const user = request.user;
+
+ if (user.role !== 'owner' && user.role !== 'admin') {
+ return reply.code(403).send({
+ code: ApiErrorCode.UserUpdateNoAccess,
+ message: 'You do not have access to update users to this workspace.',
+ });
+ }
+
+ const userToUpdate = await database
+ .selectFrom('users')
+ .selectAll()
+ .where('id', '=', userId)
+ .executeTakeFirst();
+
+ if (!userToUpdate) {
+ return reply.code(404).send({
+ code: ApiErrorCode.UserNotFound,
+ message: 'User not found.',
+ });
+ }
+
+ const limit = BigInt(input.limit);
+
+ const updatedUser = await database
+ .updateTable('users')
+ .returningAll()
+ .set({
+ storage_limit: limit.toString(),
+ updated_at: new Date(),
+ updated_by: user.account_id,
+ })
+ .where('id', '=', userToUpdate.id)
+ .executeTakeFirst();
+
+ if (!updatedUser) {
+ return reply.code(400).send({
+ code: ApiErrorCode.UserNotFound,
+ message: 'User not found.',
+ });
+ }
+
+ eventBus.publish({
+ type: 'user.updated',
+ userId: userToUpdate.id,
+ accountId: userToUpdate.account_id,
+ workspaceId: userToUpdate.workspace_id,
+ });
+
+ return {
+ id: updatedUser.id,
+ email: updatedUser.email,
+ name: updatedUser.name,
+ avatar: updatedUser.avatar,
+ role: updatedUser.role,
+ customName: updatedUser.custom_name,
+ customAvatar: updatedUser.custom_avatar,
+ createdAt: updatedUser.created_at.toISOString(),
+ updatedAt: updatedUser.updated_at?.toISOString() ?? null,
+ revision: updatedUser.revision,
+ status: updatedUser.status,
+ };
+ },
+ });
+
+ done();
+};
diff --git a/apps/server/src/data/migrations/00029-add-workspace-storage-limit-columns.ts b/apps/server/src/data/migrations/00029-add-workspace-storage-limit-columns.ts
new file mode 100644
index 00000000..f4325aca
--- /dev/null
+++ b/apps/server/src/data/migrations/00029-add-workspace-storage-limit-columns.ts
@@ -0,0 +1,18 @@
+import { Migration } from 'kysely';
+
+export const addWorkspaceStorageLimitColumns: Migration = {
+ up: async (db) => {
+ await db.schema
+ .alterTable('workspaces')
+ .addColumn('storage_limit', 'bigint')
+ .addColumn('max_file_size', 'bigint')
+ .execute();
+ },
+ down: async (db) => {
+ await db.schema
+ .alterTable('workspaces')
+ .dropColumn('storage_limit')
+ .dropColumn('max_file_size')
+ .execute();
+ },
+};
diff --git a/apps/server/src/data/migrations/00030-add-workspace-index-to-uploads.ts b/apps/server/src/data/migrations/00030-add-workspace-index-to-uploads.ts
new file mode 100644
index 00000000..321d7db3
--- /dev/null
+++ b/apps/server/src/data/migrations/00030-add-workspace-index-to-uploads.ts
@@ -0,0 +1,17 @@
+import { Migration } from 'kysely';
+
+export const addWorkspaceIndexToUploads: Migration = {
+ up: async (db) => {
+ await db.schema
+ .createIndex('uploads_workspace_id_idx')
+ .on('uploads')
+ .columns(['workspace_id'])
+ .execute();
+ },
+ down: async (db) => {
+ await db.schema
+ .dropIndex('uploads_workspace_id_idx')
+ .on('uploads')
+ .execute();
+ },
+};
diff --git a/apps/server/src/data/migrations/index.ts b/apps/server/src/data/migrations/index.ts
index 78638b5e..9612a48c 100644
--- a/apps/server/src/data/migrations/index.ts
+++ b/apps/server/src/data/migrations/index.ts
@@ -28,6 +28,8 @@ import { createWorkspaceUploadCounterTriggers } from './00025-create-workspace-u
import { createUserUploadCounterTriggers } from './00026-create-user-upload-counter-triggers';
import { removeNodeUpdateRevisionTrigger } from './00027-remove-node-update-revision-trigger';
import { removeDocumentUpdateRevisionTrigger } from './00028-remove-document-update-revision-trigger';
+import { addWorkspaceStorageLimitColumns } from './00029-add-workspace-storage-limit-columns';
+import { addWorkspaceIndexToUploads } from './00030-add-workspace-index-to-uploads';
export const databaseMigrations: Record<string, Migration> = {
'00001_create_accounts_table': createAccountsTable,
@@ -62,4 +64,6 @@ export const databaseMigrations: Record<string, Migration> = {
'00027_remove_node_update_revision_trigger': removeNodeUpdateRevisionTrigger,
'00028_remove_document_update_revision_trigger':
removeDocumentUpdateRevisionTrigger,
+ '00029_add_workspace_storage_limit_columns': addWorkspaceStorageLimitColumns,
+ '00030_add_workspace_index_to_uploads': addWorkspaceIndexToUploads,
};
diff --git a/apps/server/src/data/schema.ts b/apps/server/src/data/schema.ts
index 9d4588d1..7ed1509c 100644
--- a/apps/server/src/data/schema.ts
+++ b/apps/server/src/data/schema.ts
@@ -69,6 +69,8 @@ interface WorkspaceTable {
created_by: ColumnType<string, string, never>;
updated_by: ColumnType<string | null, string | null, string>;
status: ColumnType<number, number, number>;
+ storage_limit: ColumnType<string | null, string | null, string | null>;
+ max_file_size: ColumnType<string | null, string | null, string | null>;
}
export type SelectWorkspace = Selectable<WorkspaceTable>;
diff --git a/packages/client/src/handlers/mutations/index.ts b/packages/client/src/handlers/mutations/index.ts
index ec1c2f07..3d8de4fb 100644
--- a/packages/client/src/handlers/mutations/index.ts
+++ b/packages/client/src/handlers/mutations/index.ts
@@ -68,6 +68,7 @@ import { SpaceDeleteMutationHandler } from './spaces/space-delete';
import { SpaceDescriptionUpdateMutationHandler } from './spaces/space-description-update';
import { SpaceNameUpdateMutationHandler } from './spaces/space-name-update';
import { UserRoleUpdateMutationHandler } from './users/user-role-update';
+import { UserStorageUpdateMutationHandler } from './users/user-storage-update';
import { UsersCreateMutationHandler } from './users/users-create';
import { WorkspaceCreateMutationHandler } from './workspaces/workspace-create';
import { WorkspaceDeleteMutationHandler } from './workspaces/workspace-delete';
@@ -162,5 +163,6 @@ export const buildMutationHandlerMap = (
'email.password.reset.complete':
new EmailPasswordResetCompleteMutationHandler(app),
'workspace.delete': new WorkspaceDeleteMutationHandler(app),
+ 'user.storage.update': new UserStorageUpdateMutationHandler(app),
};
};
diff --git a/packages/client/src/handlers/mutations/users/user-storage-update.ts b/packages/client/src/handlers/mutations/users/user-storage-update.ts
new file mode 100644
index 00000000..d6891f39
--- /dev/null
+++ b/packages/client/src/handlers/mutations/users/user-storage-update.ts
@@ -0,0 +1,41 @@
+import { WorkspaceMutationHandlerBase } from '@colanode/client/handlers/mutations/workspace-mutation-handler-base';
+import { parseApiError } from '@colanode/client/lib/ky';
+import { MutationHandler } from '@colanode/client/lib/types';
+import { MutationError, MutationErrorCode } from '@colanode/client/mutations';
+import {
+ UserStorageUpdateMutationInput,
+ UserStorageUpdateMutationOutput,
+} from '@colanode/client/mutations/users/user-storage-update';
+import { UserOutput, UserStorageUpdateInput } from '@colanode/core';
+
+export class UserStorageUpdateMutationHandler
+ extends WorkspaceMutationHandlerBase
+ implements MutationHandler<UserStorageUpdateMutationInput>
+{
+ async handleMutation(
+ input: UserStorageUpdateMutationInput
+ ): Promise<UserStorageUpdateMutationOutput> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+
+ try {
+ const body: UserStorageUpdateInput = {
+ limit: input.limit,
+ };
+
+ const output = await workspace.account.client
+ .patch(`v1/workspaces/${workspace.id}/users/${input.userId}/storage`, {
+ json: body,
+ })
+ .json<UserOutput>();
+
+ await workspace.users.upsert(output);
+
+ return {
+ success: true,
+ };
+ } catch (error) {
+ const apiError = await parseApiError(error);
+ throw new MutationError(MutationErrorCode.ApiError, apiError.message);
+ }
+ }
+}
diff --git a/packages/client/src/handlers/queries/index.ts b/packages/client/src/handlers/queries/index.ts
index cae574d6..5e3389b0 100644
--- a/packages/client/src/handlers/queries/index.ts
+++ b/packages/client/src/handlers/queries/index.ts
@@ -40,9 +40,11 @@ import { SpaceListQueryHandler } from './spaces/space-list';
import { UserGetQueryHandler } from './users/user-get';
import { UserListQueryHandler } from './users/user-list';
import { UserSearchQueryHandler } from './users/user-search';
+import { UserStorageGetQueryHandler } from './users/user-storage-get';
import { WorkspaceGetQueryHandler } from './workspaces/workspace-get';
import { WorkspaceListQueryHandler } from './workspaces/workspace-list';
import { WorkspaceMetadataListQueryHandler } from './workspaces/workspace-metadata-list';
+import { WorkspaceStorageGetQueryHandler } from './workspaces/workspace-storage-get';
export type QueryHandlerMap = {
[K in keyof QueryMap]: QueryHandler<QueryMap[K]['input']>;
@@ -81,6 +83,7 @@ export const buildQueryHandlerMap = (app: AppService): QueryHandlerMap => {
'database.view.list': new DatabaseViewListQueryHandler(app),
'record.search': new RecordSearchQueryHandler(app),
'user.get': new UserGetQueryHandler(app),
+ 'user.storage.get': new UserStorageGetQueryHandler(app),
'file.state.get': new FileStateGetQueryHandler(app),
'file.download.request.get': new FileDownloadRequestGetQueryHandler(app),
'file.save.list': new FileSaveListQueryHandler(app),
@@ -91,5 +94,6 @@ export const buildQueryHandlerMap = (app: AppService): QueryHandlerMap => {
'document.state.get': new DocumentStateGetQueryHandler(app),
'document.updates.list': new DocumentUpdatesListQueryHandler(app),
'account.metadata.list': new AccountMetadataListQueryHandler(app),
+ 'workspace.storage.get': new WorkspaceStorageGetQueryHandler(app),
};
};
diff --git a/packages/client/src/handlers/queries/users/user-storage-get.ts b/packages/client/src/handlers/queries/users/user-storage-get.ts
new file mode 100644
index 00000000..a986950b
--- /dev/null
+++ b/packages/client/src/handlers/queries/users/user-storage-get.ts
@@ -0,0 +1,134 @@
+import { sql } from 'kysely';
+
+import { WorkspaceQueryHandlerBase } from '@colanode/client/handlers/queries/workspace-query-handler-base';
+import { ChangeCheckResult, QueryHandler } from '@colanode/client/lib';
+import {
+ UserStorageGetQueryInput,
+ UserStorageGetQueryOutput,
+} from '@colanode/client/queries/users/user-storage-get';
+import { Event } from '@colanode/client/types/events';
+import { FileStatus, FileSubtype } from '@colanode/core';
+
+interface UserStorageAggregateRow {
+ subtype: string;
+ total_size: string;
+}
+
+export class UserStorageGetQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<UserStorageGetQueryInput>
+{
+ public async handleQuery(
+ input: UserStorageGetQueryInput
+ ): Promise<UserStorageGetQueryOutput> {
+ const result = await this.fetchStorage(input);
+ return result;
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: UserStorageGetQueryInput,
+ _: UserStorageGetQueryOutput
+ ): Promise<ChangeCheckResult<UserStorageGetQueryInput>> {
+ if (
+ event.type === 'workspace.deleted' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ return {
+ hasChanges: true,
+ result: {
+ limit: '0',
+ used: '0',
+ subtypes: [],
+ },
+ };
+ }
+
+ if (
+ event.type === 'node.created' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.node.type === 'file' &&
+ event.node.attributes.status === FileStatus.Ready
+ ) {
+ const output = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: output,
+ };
+ }
+
+ if (
+ event.type === 'node.updated' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.node.type === 'file' &&
+ event.node.attributes.status === FileStatus.Ready
+ ) {
+ const output = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: output,
+ };
+ }
+
+ if (
+ event.type === 'node.deleted' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.node.type === 'file' &&
+ event.node.attributes.status === FileStatus.Ready
+ ) {
+ const output = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: output,
+ };
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+
+ private async fetchStorage(
+ input: UserStorageGetQueryInput
+ ): Promise<UserStorageGetQueryOutput> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+
+ const result = await sql<UserStorageAggregateRow>`
+ SELECT
+ json_extract(attributes, '$.subtype') as subtype,
+ SUM(COALESCE(CAST(json_extract(attributes, '$.size') as INTEGER), 0)) as total_size
+ FROM nodes
+ WHERE type = 'file'
+ AND created_by = ${workspace.userId}
+ AND json_extract(attributes, '$.status') = ${FileStatus.Ready}
+ GROUP BY json_extract(attributes, '$.subtype')
+ ORDER BY total_size DESC
+ `.execute(workspace.database);
+
+ const subtypes: {
+ subtype: FileSubtype;
+ size: string;
+ }[] = [];
+ let totalUsed = 0n;
+
+ for (const row of result.rows) {
+ const subtype = (row.subtype as FileSubtype) ?? 'other';
+ const sizeString = row.total_size || '0';
+ subtypes.push({
+ subtype,
+ size: sizeString,
+ });
+ totalUsed += BigInt(sizeString);
+ }
+
+ return {
+ limit: workspace.storageLimit,
+ used: totalUsed.toString(),
+ subtypes,
+ };
+ }
+}
diff --git a/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts b/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts
new file mode 100644
index 00000000..c2668fee
--- /dev/null
+++ b/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts
@@ -0,0 +1,87 @@
+import { WorkspaceQueryHandlerBase } from '@colanode/client/handlers/queries/workspace-query-handler-base';
+import {
+ ChangeCheckResult,
+ parseApiError,
+ QueryHandler,
+} from '@colanode/client/lib';
+import { QueryError, QueryErrorCode } from '@colanode/client/queries';
+import { WorkspaceStorageGetQueryInput } from '@colanode/client/queries/workspaces/workspace-storage-get';
+import { Event } from '@colanode/client/types/events';
+import { WorkspaceStorageGetOutput } from '@colanode/core';
+
+const EMPTY_STORAGE_OUTPUT: WorkspaceStorageGetOutput = {
+ limit: '0',
+ used: '0',
+ subtypes: [],
+ users: [],
+};
+
+export class WorkspaceStorageGetQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<WorkspaceStorageGetQueryInput>
+{
+ public async handleQuery(
+ input: WorkspaceStorageGetQueryInput
+ ): Promise<WorkspaceStorageGetOutput> {
+ return this.fetchWorkspaceStorage(input.accountId, input.workspaceId);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: WorkspaceStorageGetQueryInput,
+ _: WorkspaceStorageGetOutput
+ ): Promise<ChangeCheckResult<WorkspaceStorageGetQueryInput>> {
+ if (
+ event.type === 'workspace.created' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ const result = await this.fetchWorkspaceStorage(
+ input.accountId,
+ input.workspaceId
+ );
+
+ return {
+ hasChanges: true,
+ result,
+ };
+ }
+
+ if (
+ event.type === 'workspace.deleted' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ return {
+ hasChanges: true,
+ result: EMPTY_STORAGE_OUTPUT,
+ };
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+
+ private async fetchWorkspaceStorage(
+ accountId: string,
+ workspaceId: string
+ ): Promise<WorkspaceStorageGetOutput> {
+ const workspace = this.getWorkspace(accountId, workspaceId);
+ if (!workspace) {
+ return EMPTY_STORAGE_OUTPUT;
+ }
+
+ try {
+ const response = await workspace.account.client
+ .get(`v1/workspaces/${workspace.id}/storage`)
+ .json<WorkspaceStorageGetOutput>();
+
+ return response;
+ } catch (error) {
+ console.error(error);
+ const apiError = await parseApiError(error);
+ throw new QueryError(QueryErrorCode.ApiError, apiError.message);
+ }
+ }
+}
diff --git a/packages/client/src/mutations/index.ts b/packages/client/src/mutations/index.ts
index 2698b37e..58d8d01e 100644
--- a/packages/client/src/mutations/index.ts
+++ b/packages/client/src/mutations/index.ts
@@ -69,6 +69,7 @@ export * from './workspaces/workspace-metadata-delete';
export * from './workspaces/workspace-metadata-update';
export * from './workspaces/workspace-update';
export * from './users/user-role-update';
+export * from './users/user-storage-update';
export * from './users/users-create';
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
diff --git a/packages/client/src/mutations/users/user-storage-update.ts b/packages/client/src/mutations/users/user-storage-update.ts
new file mode 100644
index 00000000..5532676f
--- /dev/null
+++ b/packages/client/src/mutations/users/user-storage-update.ts
@@ -0,0 +1,20 @@
+export type UserStorageUpdateMutationInput = {
+ type: 'user.storage.update';
+ accountId: string;
+ workspaceId: string;
+ userId: string;
+ limit: string;
+};
+
+export type UserStorageUpdateMutationOutput = {
+ success: boolean;
+};
+
+declare module '@colanode/client/mutations' {
+ interface MutationMap {
+ 'user.storage.update': {
+ input: UserStorageUpdateMutationInput;
+ output: UserStorageUpdateMutationOutput;
+ };
+ }
+}
diff --git a/packages/client/src/queries/index.ts b/packages/client/src/queries/index.ts
index a95e5152..d589bd4a 100644
--- a/packages/client/src/queries/index.ts
+++ b/packages/client/src/queries/index.ts
@@ -34,11 +34,13 @@ export * from './spaces/space-list';
export * from './users/user-get';
export * from './users/user-list';
export * from './users/user-search';
+export * from './users/user-storage-get';
export * from './workspaces/workspace-get';
export * from './workspaces/workspace-list';
export * from './workspaces/workspace-metadata-list';
export * from './avatars/avatar-url-get';
export * from './records/record-field-value-count';
+export * from './workspaces/workspace-storage-get';
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface QueryMap {}
@@ -58,4 +60,5 @@ export enum QueryErrorCode {
Unknown = 'unknown',
AccountNotFound = 'account_not_found',
WorkspaceNotFound = 'workspace_not_found',
+ ApiError = 'api_error',
}
diff --git a/packages/client/src/queries/users/user-storage-get.ts b/packages/client/src/queries/users/user-storage-get.ts
new file mode 100644
index 00000000..5b6a450d
--- /dev/null
+++ b/packages/client/src/queries/users/user-storage-get.ts
@@ -0,0 +1,25 @@
+import { FileSubtype } from '@colanode/core';
+
+export type UserStorageGetQueryInput = {
+ type: 'user.storage.get';
+ accountId: string;
+ workspaceId: string;
+};
+
+export type UserStorageGetQueryOutput = {
+ limit: string;
+ used: string;
+ subtypes: {
+ subtype: FileSubtype;
+ size: string;
+ }[];
+};
+
+declare module '@colanode/client/queries' {
+ interface QueryMap {
+ 'user.storage.get': {
+ input: UserStorageGetQueryInput;
+ output: UserStorageGetQueryOutput;
+ };
+ }
+}
diff --git a/packages/client/src/queries/workspaces/workspace-storage-get.ts b/packages/client/src/queries/workspaces/workspace-storage-get.ts
new file mode 100644
index 00000000..370e553d
--- /dev/null
+++ b/packages/client/src/queries/workspaces/workspace-storage-get.ts
@@ -0,0 +1,16 @@
+import { WorkspaceStorageGetOutput } from '@colanode/core';
+
+export type WorkspaceStorageGetQueryInput = {
+ type: 'workspace.storage.get';
+ accountId: string;
+ workspaceId: string;
+};
+
+declare module '@colanode/client/queries' {
+ interface QueryMap {
+ 'workspace.storage.get': {
+ input: WorkspaceStorageGetQueryInput;
+ output: WorkspaceStorageGetOutput;
+ };
+ }
+}
diff --git a/packages/client/src/types/workspaces.ts b/packages/client/src/types/workspaces.ts
index 40155623..fbd91f23 100644
--- a/packages/client/src/types/workspaces.ts
+++ b/packages/client/src/types/workspaces.ts
@@ -67,6 +67,7 @@ export type WorkspaceMetadataMap = {
export enum SpecialContainerTabPath {
Downloads = 'downloads',
WorkspaceSettings = 'workspace/settings',
+ WorkspaceStorage = 'workspace/storage',
WorkspaceUsers = 'workspace/users',
WorkspaceDelete = 'workspace/delete',
AccountSettings = 'account/settings',
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 4b0c9bf3..8f9e7c56 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -38,3 +38,4 @@ export * from './types/mentions';
export * from './types/avatars';
export * from './types/build';
export * from './lib/servers';
+export * from './types/storage';
diff --git a/packages/core/src/lib/files.ts b/packages/core/src/lib/files.ts
index 7bdfda73..c372fb13 100644
--- a/packages/core/src/lib/files.ts
+++ b/packages/core/src/lib/files.ts
@@ -22,30 +22,32 @@ export const extractFileSubtype = (mimeType: string): FileSubtype => {
export const formatBytes = (
bytes: number | bigint,
- decimals?: number
+ maxDecimals: number = 2
): string => {
- if (bytes === 0) {
- return '0 Bytes';
- }
+ const UNITS = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] as const;
+ const BASE = 1024;
+
+ // Work with a bigint internally to stay safe for very large values.
+ let valueBig = typeof bytes === 'bigint' ? bytes : BigInt(bytes);
+ let unitIdx = 0;
- const bytesBigInt = BigInt(bytes);
- const k = BigInt(1024);
- const dm = decimals || 2;
- const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-
- // Find the largest power of k that's smaller than bytes
- let i = 0;
- let reducedBytes = bytesBigInt;
- while (reducedBytes >= k && i < sizes.length - 1) {
- reducedBytes = reducedBytes / k;
- i++;
+ // Find the most suitable unit (stop at YB to avoid overflow).
+ while (valueBig >= BigInt(BASE) && unitIdx < UNITS.length - 1) {
+ valueBig /= BigInt(BASE);
+ unitIdx++;
}
- // Convert to decimal representation with proper precision
- const factor = Math.pow(10, dm);
- const value = Number((reducedBytes * BigInt(factor)) / BigInt(factor));
+ // Convert the original byte value to a JS number **after** determining the unit,
+ // so it is safely within Number’s range for formatting.
+ const divisor = Math.pow(BASE, unitIdx);
+ const valueNum =
+ (typeof bytes === 'bigint' ? Number(bytes) : bytes) / divisor;
+
+ // Round to the requested precision, then trim superfluous zeros.
+ const rounded = valueNum.toFixed(maxDecimals);
+ const trimmed = rounded.replace(/\.?0+$/, '');
- return `${value.toFixed(dm)} ${sizes[i]}`;
+ return `${trimmed} ${UNITS[unitIdx]}`;
};
const mimeTypeNames: Record<string, string> = {
diff --git a/packages/core/src/types/api.ts b/packages/core/src/types/api.ts
index f2898fec..f6fc7d3a 100644
--- a/packages/core/src/types/api.ts
+++ b/packages/core/src/types/api.ts
@@ -33,6 +33,7 @@ export enum ApiErrorCode {
FileOwnerMismatch = 'file_owner_mismatch',
FileAlreadyUploaded = 'file_already_uploaded',
FileUploadInitFailed = 'file_upload_init_failed',
+ FileUploadFailed = 'file_upload_failed',
WorkspaceMismatch = 'workspace_mismatch',
FileError = 'file_error',
FileSizeMismatch = 'file_size_mismatch',
diff --git a/packages/core/src/types/storage.ts b/packages/core/src/types/storage.ts
new file mode 100644
index 00000000..57630588
--- /dev/null
+++ b/packages/core/src/types/storage.ts
@@ -0,0 +1,31 @@
+import { z } from 'zod/v4';
+
+import { fileSubtypeSchema } from '@colanode/core/types/files';
+
+export const workspaceStorageFileSubtypeSchema = z.object({
+ subtype: fileSubtypeSchema,
+ size: z.string(),
+});
+
+export type WorkspaceStorageFileSubtype = z.infer<
+ typeof workspaceStorageFileSubtypeSchema
+>;
+
+export const workspaceStorageUserSchema = z.object({
+ id: z.string(),
+ used: z.string(),
+ limit: z.string(),
+});
+
+export type WorkspaceStorageUser = z.infer<typeof workspaceStorageUserSchema>;
+
+export const workspaceStorageGetOutputSchema = z.object({
+ limit: z.string().nullable().optional(),
+ used: z.string(),
+ subtypes: z.array(workspaceStorageFileSubtypeSchema),
+ users: z.array(workspaceStorageUserSchema),
+});
+
+export type WorkspaceStorageGetOutput = z.infer<
+ typeof workspaceStorageGetOutputSchema
+>;
diff --git a/packages/core/src/types/workspaces.ts b/packages/core/src/types/workspaces.ts
index edb707b1..d0177788 100644
--- a/packages/core/src/types/workspaces.ts
+++ b/packages/core/src/types/workspaces.ts
@@ -86,7 +86,7 @@ export const userOutputSchema = z.object({
export type UserOutput = z.infer<typeof userOutputSchema>;
export const userCreateErrorOutputSchema = z.object({
- email: z.string().email(),
+ email: z.email(),
error: z.string(),
});
@@ -104,3 +104,11 @@ export const userRoleUpdateInputSchema = z.object({
});
export type UserRoleUpdateInput = z.infer<typeof userRoleUpdateInputSchema>;
+
+export const userStorageUpdateInputSchema = z.object({
+ limit: z.string(),
+});
+
+export type UserStorageUpdateInput = z.infer<
+ typeof userStorageUpdateInputSchema
+>;
diff --git a/packages/ui/src/components/accounts/account-logout-breadcrumb.tsx b/packages/ui/src/components/accounts/account-logout-breadcrumb.tsx
deleted file mode 100644
index 8681f051..00000000
--- a/packages/ui/src/components/accounts/account-logout-breadcrumb.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import {
- Breadcrumb,
- BreadcrumbItem,
- BreadcrumbList,
-} from '@colanode/ui/components/ui/breadcrumb';
-import { useAccount } from '@colanode/ui/contexts/account';
-
-export const AccountLogoutBreadcrumb = () => {
- const account = useAccount();
-
- return (
- <Breadcrumb className="flex-grow">
- <BreadcrumbList>
- <BreadcrumbItem className="cursor-pointer hover:text-foreground">
- <div className="flex items-center space-x-2">
- <Avatar
- id={account.id}
- name={account.name}
- avatar={account.avatar}
- className="size-4"
- />
- <span>{account.name} Logout</span>
- </div>
- </BreadcrumbItem>
- </BreadcrumbList>
- </Breadcrumb>
- );
-};
diff --git a/packages/ui/src/components/accounts/account-logout-tab.tsx b/packages/ui/src/components/accounts/account-logout-tab.tsx
index fb6684bc..ec9904eb 100644
--- a/packages/ui/src/components/accounts/account-logout-tab.tsx
+++ b/packages/ui/src/components/accounts/account-logout-tab.tsx
@@ -1,18 +1,10 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import { useAccount } from '@colanode/ui/contexts/account';
+import { LogOut } from 'lucide-react';
export const AccountLogoutTab = () => {
- const account = useAccount();
-
return (
<div className="flex items-center space-x-2">
- <Avatar
- id={account.id}
- name={account.name}
- avatar={account.avatar}
- size="small"
- />
- <span>{account.name} Logout</span>
+ <LogOut className="size-4" />
+ <span>Logout</span>
</div>
);
};
diff --git a/packages/ui/src/components/accounts/account-logout.tsx b/packages/ui/src/components/accounts/account-logout.tsx
index 45f8ec96..7daaa1ee 100644
--- a/packages/ui/src/components/accounts/account-logout.tsx
+++ b/packages/ui/src/components/accounts/account-logout.tsx
@@ -1,12 +1,7 @@
import { toast } from 'sonner';
-import { AccountLogoutBreadcrumb } from '@colanode/ui/components/accounts/account-logout-breadcrumb';
import { Button } from '@colanode/ui/components/ui/button';
-import {
- Container,
- ContainerBody,
- ContainerHeader,
-} from '@colanode/ui/components/ui/container';
+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';
import { Separator } from '@colanode/ui/components/ui/separator';
import { Spinner } from '@colanode/ui/components/ui/spinner';
import { useAccount } from '@colanode/ui/contexts/account';
@@ -18,46 +13,41 @@ export const AccountLogout = () => {
return (
<Container>
- <ContainerHeader>
- <AccountLogoutBreadcrumb />
- </ContainerHeader>
- <ContainerBody className="max-w-4xl">
- <div className="space-y-8">
- <div className="space-y-6">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">Logout</h2>
- <Separator className="mt-3" />
+ <ContainerBody className="max-w-4xl space-y-8">
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">Logout</h2>
+ <Separator className="mt-3" />
+ </div>
+ <div className="flex items-center justify-between gap-6">
+ <div className="flex-1 space-y-2">
+ <h3 className="font-semibold">Sign out of your account</h3>
+ <p className="text-sm text-muted-foreground">
+ All your data will be removed from this device. If there are
+ pending changes, they will be lost. If you login again, all the
+ data will be re-synced.
+ </p>
</div>
- <div className="flex items-center justify-between gap-6">
- <div className="flex-1 space-y-2">
- <h3 className="font-semibold">Sign out of your account</h3>
- <p className="text-sm text-muted-foreground">
- All your data will be removed from this device. If there are
- pending changes, they will be lost. If you login again, all
- the data will be re-synced.
- </p>
- </div>
- <div className="flex-shrink-0">
- <Button
- variant="destructive"
- disabled={isPending}
- className="w-20 cursor-pointer"
- onClick={async () => {
- mutate({
- input: {
- type: 'account.logout',
- accountId: account.id,
- },
- onError(error) {
- toast.error(error.message);
- },
- });
- }}
- >
- {isPending && <Spinner className="mr-1" />}
- Logout
- </Button>
- </div>
+ <div className="flex-shrink-0">
+ <Button
+ variant="destructive"
+ disabled={isPending}
+ className="w-20 cursor-pointer"
+ onClick={async () => {
+ mutate({
+ input: {
+ type: 'account.logout',
+ accountId: account.id,
+ },
+ onError(error) {
+ toast.error(error.message);
+ },
+ });
+ }}
+ >
+ {isPending && <Spinner className="mr-1" />}
+ Logout
+ </Button>
</div>
</div>
</div>
diff --git a/packages/ui/src/components/accounts/account-settings-breadcrumb.tsx b/packages/ui/src/components/accounts/account-settings-breadcrumb.tsx
deleted file mode 100644
index eb7ed5af..00000000
--- a/packages/ui/src/components/accounts/account-settings-breadcrumb.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import {
- Breadcrumb,
- BreadcrumbItem,
- BreadcrumbList,
-} from '@colanode/ui/components/ui/breadcrumb';
-import { useAccount } from '@colanode/ui/contexts/account';
-
-export const AccountSettingsBreadcrumb = () => {
- const account = useAccount();
-
- return (
- <Breadcrumb className="flex-grow">
- <BreadcrumbList>
- <BreadcrumbItem className="cursor-pointer hover:text-foreground">
- <div className="flex items-center space-x-2">
- <Avatar
- id={account.id}
- name={account.name}
- avatar={account.avatar}
- className="size-4"
- />
- <span>{account.name} Settings</span>
- </div>
- </BreadcrumbItem>
- </BreadcrumbList>
- </Breadcrumb>
- );
-};
diff --git a/packages/ui/src/components/accounts/account-settings-dialog.tsx b/packages/ui/src/components/accounts/account-settings-dialog.tsx
deleted file mode 100644
index 93048c4b..00000000
--- a/packages/ui/src/components/accounts/account-settings-dialog.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { VisuallyHidden } from '@radix-ui/react-visually-hidden';
-import { Info, Trash2 } from 'lucide-react';
-
-import { AccountUpdate } from '@colanode/ui/components/accounts/account-update';
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import {
- Dialog,
- DialogContent,
- DialogTitle,
-} from '@colanode/ui/components/ui/dialog';
-import {
- Tabs,
- TabsContent,
- TabsList,
- TabsTrigger,
-} from '@colanode/ui/components/ui/tabs';
-import { useAccount } from '@colanode/ui/contexts/account';
-
-interface AccountSettingsDialogProps {
- open: boolean;
- onOpenChange: (open: boolean) => void;
-}
-
-export const AccountSettingsDialog = ({
- open,
- onOpenChange,
-}: AccountSettingsDialogProps) => {
- const account = useAccount();
-
- return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent
- className="md:min-h-3/4 md:max-h-3/4 p-3 md:h-3/4 md:w-3/4 md:max-w-full"
- aria-describedby={undefined}
- >
- <VisuallyHidden>
- <DialogTitle>Workspace Settings</DialogTitle>
- </VisuallyHidden>
- <Tabs
- defaultValue="info"
- className="grid h-full max-h-full grid-cols-[240px_minmax(0,1fr)] overflow-hidden"
- >
- <TabsList className="flex w-full max-h-full flex-col items-start justify-start gap-1 rounded-none border-r border-r-gray-100 bg-white pr-3">
- <div className="mb-1 flex h-10 w-full items-center justify-between bg-gray-50 p-1 text-foreground/80">
- <div className="flex items-center gap-2">
- <Avatar
- id={account.id}
- name={account.name}
- avatar={account.avatar}
- size="small"
- />
- <span className="truncate font-semibold">{account.name}</span>
- </div>
- </div>
- <TabsTrigger
- key={`tab-trigger-info`}
- className="w-full justify-start p-2 hover:bg-gray-50 cursor-pointer"
- value="info"
- >
- <Info className="mr-2 size-4" />
- Info
- </TabsTrigger>
- <TabsTrigger
- key={`tab-trigger-delete`}
- className="w-full justify-start p-2 hover:bg-gray-50 cursor-pointer"
- value="delete"
- >
- <Trash2 className="mr-2 size-4" />
- Delete
- </TabsTrigger>
- </TabsList>
- <div className="overflow-auto p-4">
- <TabsContent
- key="tab-content-info"
- className="focus-visible:ring-0 focus-visible:ring-offset-0"
- value="info"
- >
- <AccountUpdate account={account} />
- </TabsContent>
- <TabsContent
- key="tab-content-delete"
- className="focus-visible:ring-0 focus-visible:ring-offset-0"
- value="delete"
- >
- <p>Coming soon.</p>
- </TabsContent>
- </div>
- </Tabs>
- </DialogContent>
- </Dialog>
- );
-};
diff --git a/packages/ui/src/components/accounts/account-settings-tab.tsx b/packages/ui/src/components/accounts/account-settings-tab.tsx
index f62a5bd7..864e23dd 100644
--- a/packages/ui/src/components/accounts/account-settings-tab.tsx
+++ b/packages/ui/src/components/accounts/account-settings-tab.tsx
@@ -1,18 +1,10 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import { useAccount } from '@colanode/ui/contexts/account';
+import { Settings } from 'lucide-react';
export const AccountSettingsTab = () => {
- const account = useAccount();
-
return (
<div className="flex items-center space-x-2">
- <Avatar
- id={account.id}
- name={account.name}
- avatar={account.avatar}
- size="small"
- />
- <span>{account.name} Settings</span>
+ <Settings className="size-4" />
+ <span>Account Settings</span>
</div>
);
};
diff --git a/packages/ui/src/components/accounts/account-settings.tsx b/packages/ui/src/components/accounts/account-settings.tsx
index aaab6052..250439f2 100644
--- a/packages/ui/src/components/accounts/account-settings.tsx
+++ b/packages/ui/src/components/accounts/account-settings.tsx
@@ -1,11 +1,6 @@
import { AccountDelete } from '@colanode/ui/components/accounts/account-delete';
-import { AccountSettingsBreadcrumb } from '@colanode/ui/components/accounts/account-settings-breadcrumb';
import { AccountUpdate } from '@colanode/ui/components/accounts/account-update';
-import {
- Container,
- ContainerBody,
- ContainerHeader,
-} from '@colanode/ui/components/ui/container';
+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';
import { Separator } from '@colanode/ui/components/ui/separator';
import { useAccount } from '@colanode/ui/contexts/account';
@@ -14,28 +9,23 @@ export const AccountSettings = () => {
return (
<Container>
- <ContainerHeader>
- <AccountSettingsBreadcrumb />
- </ContainerHeader>
- <ContainerBody className="max-w-4xl">
- <div className="space-y-8">
- <div className="space-y-6">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">General</h2>
- <Separator className="mt-3" />
- </div>
- <AccountUpdate account={account} />
+ <ContainerBody className="max-w-4xl space-y-8">
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">General</h2>
+ <Separator className="mt-3" />
</div>
+ <AccountUpdate account={account} />
+ </div>
- <div className="space-y-6">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">
- Danger Zone
- </h2>
- <Separator className="mt-3" />
- </div>
- <AccountDelete />
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">
+ Danger Zone
+ </h2>
+ <Separator className="mt-3" />
</div>
+ <AccountDelete />
</div>
</ContainerBody>
</Container>
diff --git a/packages/ui/src/components/accounts/account.tsx b/packages/ui/src/components/accounts/account.tsx
index dd1e6956..b11ac5ac 100644
--- a/packages/ui/src/components/accounts/account.tsx
+++ b/packages/ui/src/components/accounts/account.tsx
@@ -4,7 +4,7 @@ import { Account as AccountType } from '@colanode/client/types';
import { Workspace } from '@colanode/ui/components/workspaces/workspace';
import { WorkspaceCreate } from '@colanode/ui/components/workspaces/workspace-create';
import { AccountContext } from '@colanode/ui/contexts/account';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface AccountProps {
account: AccountType;
@@ -13,12 +13,12 @@ interface AccountProps {
export const Account = ({ account }: AccountProps) => {
const [openCreateWorkspace, setOpenCreateWorkspace] = useState(false);
- const accountMetadataListQuery = useQuery({
+ const accountMetadataListQuery = useLiveQuery({
type: 'account.metadata.list',
accountId: account.id,
});
- const workspaceListQuery = useQuery({
+ const workspaceListQuery = useLiveQuery({
type: 'workspace.list',
accountId: account.id,
});
diff --git a/packages/ui/src/components/accounts/google-login.tsx b/packages/ui/src/components/accounts/google-login.tsx
index ce95a8cb..ea1fe1ed 100644
--- a/packages/ui/src/components/accounts/google-login.tsx
+++ b/packages/ui/src/components/accounts/google-login.tsx
@@ -20,7 +20,6 @@ const GoogleLoginButton = ({ context, onSuccess }: GoogleLoginProps) => {
const login = useGoogleLogin({
onSuccess: async (response) => {
- console.log('response', response);
mutate({
input: {
type: 'google.login',
diff --git a/packages/ui/src/components/accounts/login.tsx b/packages/ui/src/components/accounts/login.tsx
index c6515868..cdff1114 100644
--- a/packages/ui/src/components/accounts/login.tsx
+++ b/packages/ui/src/components/accounts/login.tsx
@@ -1,12 +1,12 @@
import { LoginForm } from '@colanode/ui/components/accounts/login-form';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const Login = () => {
- const accountListQuery = useQuery({
+ const accountListQuery = useLiveQuery({
type: 'account.list',
});
- const serverListQuery = useQuery({
+ const serverListQuery = useLiveQuery({
type: 'server.list',
});
diff --git a/packages/ui/src/components/app.tsx b/packages/ui/src/components/app.tsx
index 3593ca2c..0b2b0967 100644
--- a/packages/ui/src/components/app.tsx
+++ b/packages/ui/src/components/app.tsx
@@ -8,7 +8,7 @@ import { RadarProvider } from '@colanode/ui/components/radar-provider';
import { ServerProvider } from '@colanode/ui/components/servers/server-provider';
import { DelayedComponent } from '@colanode/ui/components/ui/delayed-component';
import { AppContext } from '@colanode/ui/contexts/app';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface AppProps {
type: AppType;
@@ -18,11 +18,11 @@ export const App = ({ type }: AppProps) => {
const [initialized, setInitialized] = useState(false);
const [openLogin, setOpenLogin] = useState(false);
- const appMetadataListQuery = useQuery({
+ const appMetadataListQuery = useLiveQuery({
type: 'app.metadata.list',
});
- const accountListQuery = useQuery({
+ const accountListQuery = useLiveQuery({
type: 'account.list',
});
diff --git a/packages/ui/src/components/avatars/avatar-image.tsx b/packages/ui/src/components/avatars/avatar-image.tsx
index 30870b8f..3e754eb0 100644
--- a/packages/ui/src/components/avatars/avatar-image.tsx
+++ b/packages/ui/src/components/avatars/avatar-image.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
import { AvatarFallback } from '@colanode/ui/components/avatars/avatar-fallback';
import { useAccount } from '@colanode/ui/contexts/account';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { AvatarProps, getAvatarSizeClasses } from '@colanode/ui/lib/avatars';
import { cn } from '@colanode/ui/lib/utils';
@@ -10,7 +10,7 @@ export const AvatarImage = (props: AvatarProps) => {
const account = useAccount();
const [failed, setFailed] = useState(false);
- const { data, isPending } = useQuery(
+ const { data, isPending } = useLiveQuery(
{
type: 'avatar.url.get',
accountId: account.id,
diff --git a/packages/ui/src/components/channels/channel-container-tab.tsx b/packages/ui/src/components/channels/channel-container-tab.tsx
index f95a5485..71240cc8 100644
--- a/packages/ui/src/components/channels/channel-container-tab.tsx
+++ b/packages/ui/src/components/channels/channel-container-tab.tsx
@@ -3,7 +3,7 @@ import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { UnreadBadge } from '@colanode/ui/components/ui/unread-badge';
import { useRadar } from '@colanode/ui/contexts/radar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface ChannelContainerTabProps {
channelId: string;
@@ -17,7 +17,7 @@ export const ChannelContainerTab = ({
const workspace = useWorkspace();
const radar = useRadar();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: channelId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/chats/chat-breadcrumb-item.tsx b/packages/ui/src/components/chats/chat-breadcrumb-item.tsx
index 426b8a37..63ca1682 100644
--- a/packages/ui/src/components/chats/chat-breadcrumb-item.tsx
+++ b/packages/ui/src/components/chats/chat-breadcrumb-item.tsx
@@ -1,7 +1,7 @@
import { LocalChatNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface ChatBreadcrumbItemProps {
chat: LocalChatNode;
@@ -17,7 +17,7 @@ export const ChatBreadcrumbItem = ({ chat }: ChatBreadcrumbItemProps) => {
) ?? '')
: '';
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/chats/chat-container-tab.tsx b/packages/ui/src/components/chats/chat-container-tab.tsx
index 39fa3ff4..f08c03bc 100644
--- a/packages/ui/src/components/chats/chat-container-tab.tsx
+++ b/packages/ui/src/components/chats/chat-container-tab.tsx
@@ -3,7 +3,7 @@ import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { UnreadBadge } from '@colanode/ui/components/ui/unread-badge';
import { useRadar } from '@colanode/ui/contexts/radar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface ChatContainerTabProps {
chatId: string;
@@ -17,7 +17,7 @@ export const ChatContainerTab = ({
const workspace = useWorkspace();
const radar = useRadar();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: chatId,
accountId: workspace.accountId,
@@ -31,7 +31,7 @@ export const ChatContainerTab = ({
) ?? '')
: '';
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/chats/chat-sidebar-item.tsx b/packages/ui/src/components/chats/chat-sidebar-item.tsx
index ddef6dff..df725085 100644
--- a/packages/ui/src/components/chats/chat-sidebar-item.tsx
+++ b/packages/ui/src/components/chats/chat-sidebar-item.tsx
@@ -6,7 +6,7 @@ import { UnreadBadge } from '@colanode/ui/components/ui/unread-badge';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useRadar } from '@colanode/ui/contexts/radar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { cn } from '@colanode/ui/lib/utils';
interface ChatSidebarItemProps {
@@ -23,7 +23,7 @@ export const ChatSidebarItem = ({ chat }: ChatSidebarItemProps) => {
(id) => id !== workspace.userId
) ?? '';
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/collaborators/node-collaborator-audit.tsx b/packages/ui/src/components/collaborators/node-collaborator-audit.tsx
index 92898a9f..95aa506e 100644
--- a/packages/ui/src/components/collaborators/node-collaborator-audit.tsx
+++ b/packages/ui/src/components/collaborators/node-collaborator-audit.tsx
@@ -1,7 +1,7 @@
import { timeAgo } from '@colanode/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface NodeCollaboratorAuditProps {
collaboratorId: string;
@@ -14,7 +14,7 @@ export const NodeCollaboratorAudit = ({
}: NodeCollaboratorAuditProps) => {
const workspace = useWorkspace();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/collaborators/node-collaborator-search.tsx b/packages/ui/src/components/collaborators/node-collaborator-search.tsx
index fed77528..41cc993a 100644
--- a/packages/ui/src/components/collaborators/node-collaborator-search.tsx
+++ b/packages/ui/src/components/collaborators/node-collaborator-search.tsx
@@ -19,7 +19,7 @@ import {
PopoverTrigger,
} from '@colanode/ui/components/ui/popover';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface NodeCollaboratorSearchProps {
excluded: string[];
@@ -37,7 +37,7 @@ export const NodeCollaboratorSearch = ({
const [query, setQuery] = useState('');
const [open, setOpen] = useState(false);
- const userSearchQuery = useQuery({
+ const userSearchQuery = useLiveQuery({
type: 'user.search',
searchQuery: query,
exclude: excluded,
diff --git a/packages/ui/src/components/collaborators/node-collaborator.tsx b/packages/ui/src/components/collaborators/node-collaborator.tsx
index 15bf99cc..04bbf09b 100644
--- a/packages/ui/src/components/collaborators/node-collaborator.tsx
+++ b/packages/ui/src/components/collaborators/node-collaborator.tsx
@@ -5,8 +5,8 @@ import { NodeRole } from '@colanode/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { NodeCollaboratorRoleDropdown } from '@colanode/ui/components/collaborators/node-collaborator-role-dropdown';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { useMutation } from '@colanode/ui/hooks/use-mutation';
-import { useQuery } from '@colanode/ui/hooks/use-query';
interface NodeCollaboratorProps {
nodeId: string;
@@ -26,7 +26,7 @@ export const NodeCollaborator = ({
const workspace = useWorkspace();
const { mutate } = useMutation();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx b/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx
index 4b28a9d2..cae49086 100644
--- a/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx
+++ b/packages/ui/src/components/databases/boards/board-view-columns-collaborator.tsx
@@ -13,7 +13,7 @@ import { BoardViewContext } from '@colanode/ui/contexts/board-view';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface BoardViewColumnsCollaboratorProps {
field: CollaboratorFieldAttributes;
@@ -26,7 +26,7 @@ export const BoardViewColumnsCollaborator = ({
const database = useDatabase();
const view = useDatabaseView();
- const collaboratorCountQuery = useQuery({
+ const collaboratorCountQuery = useLiveQuery({
type: 'record.field.value.count',
databaseId: database.id,
filters: view.filters,
@@ -200,7 +200,7 @@ const BoardViewColumnCollaboratorHeader = ({
}: BoardViewColumnCollaboratorHeaderProps) => {
const workspace = useWorkspace();
- const userQuery = useQuery(
+ const userQuery = useLiveQuery(
{
type: 'user.get',
userId: collaborator ?? '',
diff --git a/packages/ui/src/components/databases/boards/board-view-columns-created-by.tsx b/packages/ui/src/components/databases/boards/board-view-columns-created-by.tsx
index 8c263eb7..f7036d98 100644
--- a/packages/ui/src/components/databases/boards/board-view-columns-created-by.tsx
+++ b/packages/ui/src/components/databases/boards/board-view-columns-created-by.tsx
@@ -11,7 +11,7 @@ import { BoardViewContext } from '@colanode/ui/contexts/board-view';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface BoardViewColumnsCreatedByProps {
field: CreatedByFieldAttributes;
@@ -24,7 +24,7 @@ export const BoardViewColumnsCreatedBy = ({
const database = useDatabase();
const view = useDatabaseView();
- const createdByCountQuery = useQuery({
+ const createdByCountQuery = useLiveQuery({
type: 'record.field.value.count',
databaseId: database.id,
filters: view.filters,
@@ -89,7 +89,7 @@ const BoardViewColumnCreatedByHeader = ({
}: BoardViewColumnCreatedByHeaderProps) => {
const workspace = useWorkspace();
- const userQuery = useQuery({
+ const userQuery = useLiveQuery({
type: 'user.get',
userId: createdBy,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx b/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx
index e2ddc576..f0f6983a 100644
--- a/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx
+++ b/packages/ui/src/components/databases/boards/board-view-columns-multi-select.tsx
@@ -13,7 +13,7 @@ import { BoardViewContext } from '@colanode/ui/contexts/board-view';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { getSelectOptionLightColorClass } from '@colanode/ui/lib/databases';
interface BoardViewColumnsMultiSelectProps {
@@ -27,7 +27,7 @@ export const BoardViewColumnsMultiSelect = ({
const database = useDatabase();
const view = useDatabaseView();
- const selectOptionCountQuery = useQuery({
+ const selectOptionCountQuery = useLiveQuery({
type: 'record.field.value.count',
databaseId: database.id,
filters: view.filters,
diff --git a/packages/ui/src/components/databases/boards/board-view-columns-select.tsx b/packages/ui/src/components/databases/boards/board-view-columns-select.tsx
index 56c045c6..6c7ad125 100644
--- a/packages/ui/src/components/databases/boards/board-view-columns-select.tsx
+++ b/packages/ui/src/components/databases/boards/board-view-columns-select.tsx
@@ -12,7 +12,7 @@ import { BoardViewContext } from '@colanode/ui/contexts/board-view';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { getSelectOptionLightColorClass } from '@colanode/ui/lib/databases';
interface BoardViewColumnsSelectProps {
@@ -26,7 +26,7 @@ export const BoardViewColumnsSelect = ({
const database = useDatabase();
const view = useDatabaseView();
- const selectOptionCountQuery = useQuery({
+ const selectOptionCountQuery = useLiveQuery({
type: 'record.field.value.count',
databaseId: database.id,
filters: view.filters,
diff --git a/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx b/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx
index 19307668..19953102 100644
--- a/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx
+++ b/packages/ui/src/components/databases/calendars/calendar-view-no-value-count.tsx
@@ -13,7 +13,7 @@ import {
import { useDatabase } from '@colanode/ui/contexts/database';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface CalendarViewNoValueCountProps {
field: FieldAttributes;
@@ -36,7 +36,7 @@ export const CalendarViewNoValueCount = ({
},
];
- const noValueCountQuery = useQuery({
+ const noValueCountQuery = useLiveQuery({
type: 'record.field.value.count',
databaseId: database.id,
filters: filters,
diff --git a/packages/ui/src/components/databases/database-container-tab.tsx b/packages/ui/src/components/databases/database-container-tab.tsx
index aa93f182..bdb96a78 100644
--- a/packages/ui/src/components/databases/database-container-tab.tsx
+++ b/packages/ui/src/components/databases/database-container-tab.tsx
@@ -1,7 +1,7 @@
import { LocalDatabaseNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface DatabaseContainerTabProps {
databaseId: string;
@@ -12,7 +12,7 @@ export const DatabaseContainerTab = ({
}: DatabaseContainerTabProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: databaseId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/databases/database-select.tsx b/packages/ui/src/components/databases/database-select.tsx
index dbd22d01..52f27247 100644
--- a/packages/ui/src/components/databases/database-select.tsx
+++ b/packages/ui/src/components/databases/database-select.tsx
@@ -17,7 +17,7 @@ import {
PopoverTrigger,
} from '@colanode/ui/components/ui/popover';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { cn } from '@colanode/ui/lib/utils';
interface DatabaseSelectProps {
@@ -29,7 +29,7 @@ export const DatabaseSelect = ({ id, onChange }: DatabaseSelectProps) => {
const workspace = useWorkspace();
const [open, setOpen] = useState(false);
- const databaseListQuery = useQuery({
+ const databaseListQuery = useLiveQuery({
type: 'database.list',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/databases/database-views.tsx b/packages/ui/src/components/databases/database-views.tsx
index 2514caac..1822330a 100644
--- a/packages/ui/src/components/databases/database-views.tsx
+++ b/packages/ui/src/components/databases/database-views.tsx
@@ -6,14 +6,14 @@ import { ScrollBar } from '@colanode/ui/components/ui/scroll-area';
import { useDatabase } from '@colanode/ui/contexts/database';
import { DatabaseViewsContext } from '@colanode/ui/contexts/database-views';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const DatabaseViews = () => {
const workspace = useWorkspace();
const database = useDatabase();
const [activeViewId, setActiveViewId] = useState<string | null>(null);
- const databaseViewListQuery = useQuery({
+ const databaseViewListQuery = useLiveQuery({
type: 'database.view.list',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx b/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx
index 90ef8e42..12d3fcf5 100644
--- a/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx
+++ b/packages/ui/src/components/databases/search/view-collaborator-field-filter.tsx
@@ -24,7 +24,7 @@ import { Separator } from '@colanode/ui/components/ui/separator';
import { UserSearch } from '@colanode/ui/components/users/user-search';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
import {
collaboratorFieldFilterOperators,
createdByFieldFilterOperators,
@@ -71,7 +71,7 @@ export const ViewCollaboratorFieldFilter = ({
) ?? collaboratorFieldFilterOperators[0]!;
const collaboratorIds = (filter.value as string[]) ?? [];
- const results = useQueries(
+ const results = useLiveQueries(
collaboratorIds.map((id) => ({
type: 'user.get',
userId: id,
diff --git a/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx b/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx
index 6e5e522b..e6032afd 100644
--- a/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx
+++ b/packages/ui/src/components/databases/search/view-created-by-field-filter.tsx
@@ -24,7 +24,7 @@ import { Separator } from '@colanode/ui/components/ui/separator';
import { UserSearch } from '@colanode/ui/components/users/user-search';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
import { createdByFieldFilterOperators } from '@colanode/ui/lib/databases';
interface ViewCreatedByFieldFilterProps {
@@ -63,7 +63,7 @@ export const ViewCreatedByFieldFilter = ({
) ?? createdByFieldFilterOperators[0]!;
const collaboratorIds = (filter.value as string[]) ?? [];
- const results = useQueries(
+ const results = useLiveQueries(
collaboratorIds.map((id) => ({
type: 'user.get',
userId: id,
diff --git a/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx b/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx
index 5f7f3110..b780c887 100644
--- a/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx
+++ b/packages/ui/src/components/databases/search/view-updated-by-field-filter.tsx
@@ -24,7 +24,7 @@ import { Separator } from '@colanode/ui/components/ui/separator';
import { UserSearch } from '@colanode/ui/components/users/user-search';
import { useDatabaseView } from '@colanode/ui/contexts/database-view';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
import { updatedByFieldFilterOperators } from '@colanode/ui/lib/databases';
interface ViewUpdatedByFieldFilterProps {
@@ -68,7 +68,7 @@ export const ViewUpdatedByFieldFilter = ({
) ?? updatedByFieldFilterOperators[0]!;
const collaboratorIds = (filter.value as string[]) ?? [];
- const results = useQueries(
+ const results = useLiveQueries(
collaboratorIds.map((id) => ({
type: 'user.get',
userId: id,
diff --git a/packages/ui/src/components/documents/document.tsx b/packages/ui/src/components/documents/document.tsx
index d92ac882..8b610439 100644
--- a/packages/ui/src/components/documents/document.tsx
+++ b/packages/ui/src/components/documents/document.tsx
@@ -3,7 +3,7 @@ import { FocusPosition } from '@tiptap/core';
import { LocalNode } from '@colanode/client/types';
import { DocumentEditor } from '@colanode/ui/components/documents/document-editor';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface DocumentProps {
node: LocalNode;
@@ -14,14 +14,14 @@ interface DocumentProps {
export const Document = ({ node, canEdit, autoFocus }: DocumentProps) => {
const workspace = useWorkspace();
- const documentStateQuery = useQuery({
+ const documentStateQuery = useLiveQuery({
type: 'document.state.get',
documentId: node.id,
accountId: workspace.accountId,
workspaceId: workspace.id,
});
- const documentUpdatesQuery = useQuery({
+ const documentUpdatesQuery = useLiveQuery({
type: 'document.updates.list',
documentId: node.id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/downloads/downloads-container-tab.tsx b/packages/ui/src/components/downloads/downloads-container-tab.tsx
index 7ef8c099..65f12213 100644
--- a/packages/ui/src/components/downloads/downloads-container-tab.tsx
+++ b/packages/ui/src/components/downloads/downloads-container-tab.tsx
@@ -2,12 +2,12 @@ import { Download } from 'lucide-react';
import { SaveStatus } from '@colanode/client/types';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const DownloadsContainerTab = () => {
const workspace = useWorkspace();
- const fileSaveListQuery = useQuery({
+ const fileSaveListQuery = useLiveQuery({
type: 'file.save.list',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/downloads/downloads-list.tsx b/packages/ui/src/components/downloads/downloads-list.tsx
index 26bcfa49..c3235f03 100644
--- a/packages/ui/src/components/downloads/downloads-list.tsx
+++ b/packages/ui/src/components/downloads/downloads-list.tsx
@@ -10,12 +10,12 @@ import {
TooltipTrigger,
} from '@colanode/ui/components/ui/tooltip';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const DownloadsList = () => {
const workspace = useWorkspace();
- const fileSaveListQuery = useQuery({
+ const fileSaveListQuery = useLiveQuery({
type: 'file.save.list',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/emojis/emoji-browser-items.tsx b/packages/ui/src/components/emojis/emoji-browser-items.tsx
index 80e6335b..ae2869f1 100644
--- a/packages/ui/src/components/emojis/emoji-browser-items.tsx
+++ b/packages/ui/src/components/emojis/emoji-browser-items.tsx
@@ -1,6 +1,6 @@
import { EmojiPickerItemsRow } from '@colanode/client/types';
import { EmojiPickerItem } from '@colanode/ui/components/emojis/emoji-picker-item';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface EmojiBrowserItemsProps {
row: EmojiPickerItemsRow;
@@ -8,7 +8,7 @@ interface EmojiBrowserItemsProps {
}
export const EmojiBrowserItems = ({ row, style }: EmojiBrowserItemsProps) => {
- const emojiListQuery = useQuery({
+ const emojiListQuery = useLiveQuery({
type: 'emoji.list',
category: row.category,
page: row.page,
diff --git a/packages/ui/src/components/emojis/emoji-browser.tsx b/packages/ui/src/components/emojis/emoji-browser.tsx
index eab49ab6..6a761a83 100644
--- a/packages/ui/src/components/emojis/emoji-browser.tsx
+++ b/packages/ui/src/components/emojis/emoji-browser.tsx
@@ -4,12 +4,12 @@ import { useMemo, useRef } from 'react';
import { EmojiPickerRowData } from '@colanode/client/types';
import { EmojiBrowserCategory } from '@colanode/ui/components/emojis/emoji-browser-category';
import { EmojiBrowserItems } from '@colanode/ui/components/emojis/emoji-browser-items';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
const EMOJIS_PER_ROW = 10;
export const EmojiBrowser = () => {
- const emojiCategoryListQuery = useQuery({
+ const emojiCategoryListQuery = useLiveQuery({
type: 'emoji.category.list',
});
diff --git a/packages/ui/src/components/emojis/emoji-search.tsx b/packages/ui/src/components/emojis/emoji-search.tsx
index 6b741a25..6cc00216 100644
--- a/packages/ui/src/components/emojis/emoji-search.tsx
+++ b/packages/ui/src/components/emojis/emoji-search.tsx
@@ -1,12 +1,12 @@
import { EmojiPickerItem } from '@colanode/ui/components/emojis/emoji-picker-item';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface EmojiSearchProps {
query: string;
}
export const EmojiSearch = ({ query }: EmojiSearchProps) => {
- const emojiSearchQuery = useQuery({
+ const emojiSearchQuery = useLiveQuery({
type: 'emoji.search',
query,
count: 100,
diff --git a/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx b/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx
index e5d3459c..4cce5e52 100644
--- a/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx
+++ b/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx
@@ -6,7 +6,7 @@ import {
PopoverContent,
PopoverTrigger,
} from '@colanode/ui/components/ui/popover';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { defaultEmojis } from '@colanode/ui/lib/assets';
interface EmojiSkinToneSelectorProps {
@@ -20,7 +20,7 @@ export const EmojiSkinToneSelector = ({
}: EmojiSkinToneSelectorProps) => {
const [open, setOpen] = useState<boolean>(false);
- const emojiGetQuery = useQuery({
+ const emojiGetQuery = useLiveQuery({
type: 'emoji.get',
id: defaultEmojis.hand,
});
diff --git a/packages/ui/src/components/files/file-block.tsx b/packages/ui/src/components/files/file-block.tsx
index 997dfdbf..873efb30 100644
--- a/packages/ui/src/components/files/file-block.tsx
+++ b/packages/ui/src/components/files/file-block.tsx
@@ -2,8 +2,8 @@ import { LocalFileNode } from '@colanode/client/types';
import { FilePreview } from '@colanode/ui/components/files/file-preview';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { useNodeRadar } from '@colanode/ui/hooks/use-node-radar';
-import { useQuery } from '@colanode/ui/hooks/use-query';
interface FileBlockProps {
id: string;
@@ -13,7 +13,7 @@ export const FileBlock = ({ id }: FileBlockProps) => {
const workspace = useWorkspace();
const layout = useLayout();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/files/file-container-tab.tsx b/packages/ui/src/components/files/file-container-tab.tsx
index 3b149828..03487696 100644
--- a/packages/ui/src/components/files/file-container-tab.tsx
+++ b/packages/ui/src/components/files/file-container-tab.tsx
@@ -1,7 +1,7 @@
import { LocalFileNode } from '@colanode/client/types';
import { FileThumbnail } from '@colanode/ui/components/files/file-thumbnail';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface FileContainerTabProps {
fileId: string;
@@ -10,7 +10,7 @@ interface FileContainerTabProps {
export const FileContainerTab = ({ fileId }: FileContainerTabProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: fileId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/files/file-preview.tsx b/packages/ui/src/components/files/file-preview.tsx
index 61708cd1..9379333c 100644
--- a/packages/ui/src/components/files/file-preview.tsx
+++ b/packages/ui/src/components/files/file-preview.tsx
@@ -7,8 +7,8 @@ import { FilePreviewAudio } from '@colanode/ui/components/files/previews/file-pr
import { FilePreviewImage } from '@colanode/ui/components/files/previews/file-preview-image';
import { FilePreviewVideo } from '@colanode/ui/components/files/previews/file-preview-video';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { useMutation } from '@colanode/ui/hooks/use-mutation';
-import { useQuery } from '@colanode/ui/hooks/use-query';
interface FilePreviewProps {
file: LocalFileNode;
@@ -18,7 +18,7 @@ export const FilePreview = ({ file }: FilePreviewProps) => {
const workspace = useWorkspace();
const mutation = useMutation();
- const fileStateQuery = useQuery({
+ const fileStateQuery = useLiveQuery({
type: 'file.state.get',
id: file.id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/files/file-save-button.tsx b/packages/ui/src/components/files/file-save-button.tsx
index 0952ae6f..db60a908 100644
--- a/packages/ui/src/components/files/file-save-button.tsx
+++ b/packages/ui/src/components/files/file-save-button.tsx
@@ -8,8 +8,8 @@ import { Spinner } from '@colanode/ui/components/ui/spinner';
import { useApp } from '@colanode/ui/contexts/app';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { useMutation } from '@colanode/ui/hooks/use-mutation';
-import { useQuery } from '@colanode/ui/hooks/use-query';
interface FileSaveButtonProps {
file: LocalFileNode;
@@ -22,7 +22,7 @@ export const FileSaveButton = ({ file }: FileSaveButtonProps) => {
const layout = useLayout();
const [isSaving, setIsSaving] = useState(false);
- const fileStateQuery = useQuery({
+ const fileStateQuery = useLiveQuery({
type: 'file.state.get',
id: file.id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/files/file-sidebar.tsx b/packages/ui/src/components/files/file-sidebar.tsx
index 0bdf7041..ab9771c8 100644
--- a/packages/ui/src/components/files/file-sidebar.tsx
+++ b/packages/ui/src/components/files/file-sidebar.tsx
@@ -5,7 +5,7 @@ import { formatBytes, formatDate } from '@colanode/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { FileThumbnail } from '@colanode/ui/components/files/file-thumbnail';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface FileSidebarProps {
file: LocalFileNode;
@@ -23,7 +23,7 @@ const FileMeta = ({ title, value }: { title: string; value: string }) => {
export const FileSidebar = ({ file }: FileSidebarProps) => {
const workspace = useWorkspace();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/files/file-thumbnail.tsx b/packages/ui/src/components/files/file-thumbnail.tsx
index 5d0c9cf4..9e441e71 100644
--- a/packages/ui/src/components/files/file-thumbnail.tsx
+++ b/packages/ui/src/components/files/file-thumbnail.tsx
@@ -1,7 +1,7 @@
import { LocalFileNode } from '@colanode/client/types';
import { FileIcon } from '@colanode/ui/components/files/file-icon';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { cn } from '@colanode/ui/lib/utils';
interface FileThumbnailProps {
@@ -12,7 +12,7 @@ interface FileThumbnailProps {
export const FileThumbnail = ({ file, className }: FileThumbnailProps) => {
const workspace = useWorkspace();
- const fileStateGetQuery = useQuery({
+ const fileStateGetQuery = useLiveQuery({
type: 'file.state.get',
id: file.id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/folders/folder-container-tab.tsx b/packages/ui/src/components/folders/folder-container-tab.tsx
index 1f666f36..8d33df1d 100644
--- a/packages/ui/src/components/folders/folder-container-tab.tsx
+++ b/packages/ui/src/components/folders/folder-container-tab.tsx
@@ -1,7 +1,7 @@
import { LocalFolderNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface FolderContainerTabProps {
folderId: string;
@@ -10,7 +10,7 @@ interface FolderContainerTabProps {
export const FolderContainerTab = ({ folderId }: FolderContainerTabProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: folderId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/folders/folder-files.tsx b/packages/ui/src/components/folders/folder-files.tsx
index f79704be..fceb5c7a 100644
--- a/packages/ui/src/components/folders/folder-files.tsx
+++ b/packages/ui/src/components/folders/folder-files.tsx
@@ -9,7 +9,7 @@ import { ListLayout } from '@colanode/ui/components/folders/lists/list-layout';
import { FolderContext } from '@colanode/ui/contexts/folder';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
const FILES_PER_PAGE = 100;
@@ -39,7 +39,7 @@ export const FolderFiles = ({
page: i + 1,
}));
- const result = useQueries(inputs);
+ const result = useLiveQueries(inputs);
const files = result.flatMap((data) => data.data ?? []);
return (
diff --git a/packages/ui/src/components/icons/icon-browser-items.tsx b/packages/ui/src/components/icons/icon-browser-items.tsx
index 0289d99d..112c0008 100644
--- a/packages/ui/src/components/icons/icon-browser-items.tsx
+++ b/packages/ui/src/components/icons/icon-browser-items.tsx
@@ -1,6 +1,6 @@
import { IconPickerItemsRow } from '@colanode/client/types';
import { IconPickerItem } from '@colanode/ui/components/icons/icon-picker-item';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface IconBrowserItemsProps {
row: IconPickerItemsRow;
@@ -8,7 +8,7 @@ interface IconBrowserItemsProps {
}
export const IconBrowserItems = ({ row, style }: IconBrowserItemsProps) => {
- const iconListQuery = useQuery({
+ const iconListQuery = useLiveQuery({
type: 'icon.list',
category: row.category,
page: row.page,
diff --git a/packages/ui/src/components/icons/icon-browser.tsx b/packages/ui/src/components/icons/icon-browser.tsx
index 121a0f9a..3460fe11 100644
--- a/packages/ui/src/components/icons/icon-browser.tsx
+++ b/packages/ui/src/components/icons/icon-browser.tsx
@@ -4,12 +4,12 @@ import { useMemo, useRef } from 'react';
import { IconPickerRowData } from '@colanode/client/types';
import { IconBrowserCategory } from '@colanode/ui/components/icons/icon-browser-category';
import { IconBrowserItems } from '@colanode/ui/components/icons/icon-browser-items';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
const ICONS_PER_ROW = 10;
export const IconBrowser = () => {
- const iconCategoryListQuery = useQuery({
+ const iconCategoryListQuery = useLiveQuery({
type: 'icon.category.list',
});
diff --git a/packages/ui/src/components/icons/icon-search.tsx b/packages/ui/src/components/icons/icon-search.tsx
index 8a7232a9..b7a681b4 100644
--- a/packages/ui/src/components/icons/icon-search.tsx
+++ b/packages/ui/src/components/icons/icon-search.tsx
@@ -1,12 +1,12 @@
import { IconPickerItem } from '@colanode/ui/components/icons/icon-picker-item';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface IconSearchProps {
query: string;
}
export const IconSearch = ({ query }: IconSearchProps) => {
- const iconSearchQuery = useQuery({
+ const iconSearchQuery = useLiveQuery({
type: 'icon.search',
query,
count: 100,
diff --git a/packages/ui/src/components/layouts/containers/container-tab-content.tsx b/packages/ui/src/components/layouts/containers/container-tab-content.tsx
index 6ba71b2f..f637ee91 100644
--- a/packages/ui/src/components/layouts/containers/container-tab-content.tsx
+++ b/packages/ui/src/components/layouts/containers/container-tab-content.tsx
@@ -16,6 +16,7 @@ import { RecordContainer } from '@colanode/ui/components/records/record-containe
import { SpaceContainer } from '@colanode/ui/components/spaces/space-container';
import { TabsContent } from '@colanode/ui/components/ui/tabs';
import { WorkspaceSettings } from '@colanode/ui/components/workspaces/workspace-settings';
+import { WorkspaceStorage } from '@colanode/ui/components/workspaces/workspace-storage';
import { WorkspaceUsers } from '@colanode/ui/components/workspaces/workspace-users';
interface ContainerTabContentProps {
@@ -43,6 +44,10 @@ const ContainerTabContentBody = ({ tab }: ContainerTabContentProps) => {
return <AccountLogout />;
}
+ if (tab.path === SpecialContainerTabPath.WorkspaceStorage) {
+ return <WorkspaceStorage />;
+ }
+
return match(getIdType(tab.path))
.with(IdType.Space, () => <SpaceContainer spaceId={tab.path} />)
.with(IdType.Channel, () => <ChannelContainer channelId={tab.path} />)
diff --git a/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx b/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx
index ceda42c3..19895568 100644
--- a/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx
+++ b/packages/ui/src/components/layouts/containers/container-tab-trigger.tsx
@@ -19,6 +19,7 @@ import { RecordContainerTab } from '@colanode/ui/components/records/record-conta
import { SpaceContainerTab } from '@colanode/ui/components/spaces/space-container-tab';
import { TabsTrigger } from '@colanode/ui/components/ui/tabs';
import { WorkspaceSettingsTab } from '@colanode/ui/components/workspaces/workspace-settings-tab';
+import { WorkspaceStorageTab } from '@colanode/ui/components/workspaces/workspace-storage-tab';
import { WorkspaceUsersTab } from '@colanode/ui/components/workspaces/workspace-users-tab';
import { cn } from '@colanode/ui/lib/utils';
@@ -50,6 +51,10 @@ const ContainerTabTriggerContent = ({ tab }: { tab: ContainerTab }) => {
return <AccountLogoutTab />;
}
+ if (tab.path === SpecialContainerTabPath.WorkspaceStorage) {
+ return <WorkspaceStorageTab />;
+ }
+
return match(getIdType(tab.path))
.with(IdType.Space, () => <SpaceContainerTab spaceId={tab.path} />)
.with(IdType.Channel, () => (
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx
index b0174778..3221c4b8 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-chats.tsx
@@ -3,14 +3,14 @@ import { ChatSidebarItem } from '@colanode/ui/components/chats/chat-sidebar-item
import { SidebarHeader } from '@colanode/ui/components/layouts/sidebars/sidebar-header';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { cn } from '@colanode/ui/lib/utils';
export const SidebarChats = () => {
const workspace = useWorkspace();
const layout = useLayout();
- const chatListQuery = useQuery({
+ const chatListQuery = useLiveQuery({
type: 'chat.list',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu-footer.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu-footer.tsx
index ce97f37f..78bd0845 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-menu-footer.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu-footer.tsx
@@ -15,7 +15,7 @@ import { UnreadBadge } from '@colanode/ui/components/ui/unread-badge';
import { AccountContext, useAccount } from '@colanode/ui/contexts/account';
import { useApp } from '@colanode/ui/contexts/app';
import { useRadar } from '@colanode/ui/contexts/radar';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export function SidebarMenuFooter() {
const app = useApp();
@@ -23,7 +23,7 @@ export function SidebarMenuFooter() {
const radar = useRadar();
const [open, setOpen] = useState(false);
- const accountListQuery = useQuery({
+ const accountListQuery = useLiveQuery({
type: 'account.list',
});
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu-header.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu-header.tsx
index 0aeac359..0319dd7f 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-menu-header.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu-header.tsx
@@ -14,7 +14,7 @@ import { UnreadBadge } from '@colanode/ui/components/ui/unread-badge';
import { useAccount } from '@colanode/ui/contexts/account';
import { useRadar } from '@colanode/ui/contexts/radar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const SidebarMenuHeader = () => {
const workspace = useWorkspace();
@@ -22,7 +22,7 @@ export const SidebarMenuHeader = () => {
const radar = useRadar();
const [open, setOpen] = useState(false);
- const workspaceListQuery = useQuery({
+ const workspaceListQuery = useLiveQuery({
type: 'workspace.list',
accountId: account.id,
});
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx
index 18b75408..44814b28 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-settings.tsx
@@ -1,4 +1,4 @@
-import { LogOut, Settings, Users } from 'lucide-react';
+import { Cylinder, LogOut, Settings, Users } from 'lucide-react';
import { SpecialContainerTabPath } from '@colanode/client/types';
import { SidebarHeader } from '@colanode/ui/components/layouts/sidebars/sidebar-header';
@@ -20,6 +20,11 @@ export const SidebarSettings = () => {
icon={Users}
path={SpecialContainerTabPath.WorkspaceUsers}
/>
+ <SidebarSettingsItem
+ title="Storage"
+ icon={Cylinder}
+ path={SpecialContainerTabPath.WorkspaceStorage}
+ />
</div>
<div className="flex w-full min-w-0 flex-col gap-1">
<SidebarHeader title="Account settings" />
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-spaces.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-spaces.tsx
index 49827219..32c55ad8 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-spaces.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-spaces.tsx
@@ -2,14 +2,14 @@ import { SidebarHeader } from '@colanode/ui/components/layouts/sidebars/sidebar-
import { SpaceCreateButton } from '@colanode/ui/components/spaces/space-create-button';
import { SpaceSidebarItem } from '@colanode/ui/components/spaces/space-sidebar-item';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const SidebarSpaces = () => {
const workspace = useWorkspace();
const canCreateSpace =
workspace.role !== 'guest' && workspace.role !== 'none';
- const spaceListQuery = useQuery({
+ const spaceListQuery = useLiveQuery({
type: 'space.list',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/messages/message-author-avatar.tsx b/packages/ui/src/components/messages/message-author-avatar.tsx
index a0f8ccdf..2153e3a4 100644
--- a/packages/ui/src/components/messages/message-author-avatar.tsx
+++ b/packages/ui/src/components/messages/message-author-avatar.tsx
@@ -1,7 +1,7 @@
import { LocalMessageNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface MessageAuthorAvatarProps {
message: LocalMessageNode;
@@ -13,7 +13,7 @@ export const MessageAuthorAvatar = ({
className,
}: MessageAuthorAvatarProps) => {
const workspace = useWorkspace();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/messages/message-author-name.tsx b/packages/ui/src/components/messages/message-author-name.tsx
index 6e5f2e8b..09f7d910 100644
--- a/packages/ui/src/components/messages/message-author-name.tsx
+++ b/packages/ui/src/components/messages/message-author-name.tsx
@@ -1,6 +1,6 @@
import { LocalMessageNode } from '@colanode/client/types';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { cn } from '@colanode/ui/lib/utils';
interface MessageAuthorNameProps {
@@ -14,7 +14,7 @@ export const MessageAuthorName = ({
}: MessageAuthorNameProps) => {
const workspace = useWorkspace();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/messages/message-list.tsx b/packages/ui/src/components/messages/message-list.tsx
index 541ba917..accfea23 100644
--- a/packages/ui/src/components/messages/message-list.tsx
+++ b/packages/ui/src/components/messages/message-list.tsx
@@ -6,7 +6,7 @@ import { compareString } from '@colanode/core';
import { Message } from '@colanode/ui/components/messages/message';
import { useConversation } from '@colanode/ui/contexts/conversation';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
const MESSAGES_PER_PAGE = 50;
@@ -28,7 +28,7 @@ export const MessageList = () => {
count: MESSAGES_PER_PAGE,
}));
- const result = useQueries(inputs);
+ const result = useLiveQueries(inputs);
const messages = result
.flatMap((data) => data.data ?? [])
.sort((a, b) => compareString(a.id, b.id));
diff --git a/packages/ui/src/components/messages/message-quick-reaction.tsx b/packages/ui/src/components/messages/message-quick-reaction.tsx
index 15ff572e..a237170f 100644
--- a/packages/ui/src/components/messages/message-quick-reaction.tsx
+++ b/packages/ui/src/components/messages/message-quick-reaction.tsx
@@ -1,5 +1,5 @@
import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface MessageQuickReactionProps {
emoji: string;
@@ -10,7 +10,7 @@ export const MessageQuickReaction = ({
emoji,
onClick,
}: MessageQuickReactionProps) => {
- const emojiGetQuery = useQuery({
+ const emojiGetQuery = useLiveQuery({
type: 'emoji.get',
id: emoji,
});
diff --git a/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx b/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx
index f29dee3d..85c80339 100644
--- a/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx
+++ b/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx
@@ -1,8 +1,8 @@
import { NodeReactionCount, LocalMessageNode } from '@colanode/client/types';
import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface MessageReactionCountTooltipContentProps {
message: LocalMessageNode;
@@ -15,12 +15,12 @@ export const MessageReactionCountTooltipContent = ({
}: MessageReactionCountTooltipContentProps) => {
const workspace = useWorkspace();
- const emojiGetQuery = useQuery({
+ const emojiGetQuery = useLiveQuery({
type: 'emoji.get.by.skin.id',
id: reactionCount.reaction,
});
- const nodeReactionListQuery = useQuery({
+ const nodeReactionListQuery = useLiveQuery({
type: 'node.reaction.list',
nodeId: message.id,
reaction: reactionCount.reaction,
@@ -34,7 +34,7 @@ export const MessageReactionCountTooltipContent = ({
nodeReactionListQuery.data?.map((reaction) => reaction.collaboratorId) ??
[];
- const results = useQueries(
+ const results = useLiveQueries(
userIds.map((userId) => ({
type: 'user.get',
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx b/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx
index 441ad0ad..00951219 100644
--- a/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx
+++ b/packages/ui/src/components/messages/message-reaction-counts-dialog-list.tsx
@@ -5,7 +5,7 @@ import { NodeReactionListQueryInput } from '@colanode/client/queries';
import { NodeReactionCount, LocalMessageNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
const REACTIONS_PER_PAGE = 20;
@@ -33,7 +33,7 @@ export const MessageReactionCountsDialogList = ({
count: REACTIONS_PER_PAGE,
}));
- const result = useQueries(inputs);
+ const result = useLiveQueries(inputs);
const reactions = result.flatMap((data) => data.data ?? []);
const isPending = result.some((data) => data.isPending);
const hasMore =
@@ -41,7 +41,7 @@ export const MessageReactionCountsDialogList = ({
const userIds = reactions?.map((reaction) => reaction.collaboratorId) ?? [];
- const results = useQueries(
+ const results = useLiveQueries(
userIds.map((userId) => ({
type: 'user.get',
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/messages/message-reaction-counts.tsx b/packages/ui/src/components/messages/message-reaction-counts.tsx
index 823917fc..a34d4948 100644
--- a/packages/ui/src/components/messages/message-reaction-counts.tsx
+++ b/packages/ui/src/components/messages/message-reaction-counts.tsx
@@ -6,8 +6,8 @@ import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';
import { MessageReactionCountTooltip } from '@colanode/ui/components/messages/message-reaction-count-tooltip';
import { MessageReactionCountsDialog } from '@colanode/ui/components/messages/message-reaction-counts-dialog';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { useMutation } from '@colanode/ui/hooks/use-mutation';
-import { useQuery } from '@colanode/ui/hooks/use-query';
import { cn } from '@colanode/ui/lib/utils';
interface MessageReactionCountsProps {
@@ -22,7 +22,7 @@ export const MessageReactionCounts = ({
const { mutate, isPending } = useMutation();
- const nodeReactionsAggregateQuery = useQuery({
+ const nodeReactionsAggregateQuery = useLiveQuery({
type: 'node.reactions.aggregate',
nodeId: message.id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/messages/message-reference.tsx b/packages/ui/src/components/messages/message-reference.tsx
index 699dcc17..f0dc5825 100644
--- a/packages/ui/src/components/messages/message-reference.tsx
+++ b/packages/ui/src/components/messages/message-reference.tsx
@@ -3,7 +3,7 @@ import { MessageAuthorAvatar } from '@colanode/ui/components/messages/message-au
import { MessageAuthorName } from '@colanode/ui/components/messages/message-author-name';
import { MessageContent } from '@colanode/ui/components/messages/message-content';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface MessageReferenceProps {
messageId: string;
@@ -11,7 +11,7 @@ interface MessageReferenceProps {
export const MessageReference = ({ messageId }: MessageReferenceProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: messageId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/messages/message-reply-banner.tsx b/packages/ui/src/components/messages/message-reply-banner.tsx
index 915196f3..9f5b83e7 100644
--- a/packages/ui/src/components/messages/message-reply-banner.tsx
+++ b/packages/ui/src/components/messages/message-reply-banner.tsx
@@ -2,7 +2,7 @@ import { CircleX } from 'lucide-react';
import { LocalMessageNode } from '@colanode/client/types';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface MessageReplyBannerProps {
message: LocalMessageNode;
@@ -14,7 +14,7 @@ export const MessageReplyBanner = ({
onCancel,
}: MessageReplyBannerProps) => {
const workspace = useWorkspace();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/pages/page-container-tab.tsx b/packages/ui/src/components/pages/page-container-tab.tsx
index b2a9665d..d6954e63 100644
--- a/packages/ui/src/components/pages/page-container-tab.tsx
+++ b/packages/ui/src/components/pages/page-container-tab.tsx
@@ -1,7 +1,7 @@
import { LocalPageNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface PageContainerTabProps {
pageId: string;
@@ -10,7 +10,7 @@ interface PageContainerTabProps {
export const PageContainerTab = ({ pageId }: PageContainerTabProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: pageId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/radar-provider.tsx b/packages/ui/src/components/radar-provider.tsx
index c9554f47..b546fdbd 100644
--- a/packages/ui/src/components/radar-provider.tsx
+++ b/packages/ui/src/components/radar-provider.tsx
@@ -1,13 +1,13 @@
import { getIdType, IdType } from '@colanode/core';
import { RadarContext } from '@colanode/ui/contexts/radar';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface RadarProviderProps {
children: React.ReactNode;
}
export const RadarProvider = ({ children }: RadarProviderProps) => {
- const radarDataQuery = useQuery({
+ const radarDataQuery = useLiveQuery({
type: 'radar.data.get',
});
diff --git a/packages/ui/src/components/records/record-container-tab.tsx b/packages/ui/src/components/records/record-container-tab.tsx
index f3d9b3ed..e2709b73 100644
--- a/packages/ui/src/components/records/record-container-tab.tsx
+++ b/packages/ui/src/components/records/record-container-tab.tsx
@@ -1,7 +1,7 @@
import { LocalRecordNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface RecordContainerTabProps {
recordId: string;
@@ -10,7 +10,7 @@ interface RecordContainerTabProps {
export const RecordContainerTab = ({ recordId }: RecordContainerTabProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: recordId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/records/record-database.tsx b/packages/ui/src/components/records/record-database.tsx
index 81c4a5ac..06804420 100644
--- a/packages/ui/src/components/records/record-database.tsx
+++ b/packages/ui/src/components/records/record-database.tsx
@@ -2,7 +2,7 @@ import { LocalDatabaseNode } from '@colanode/client/types';
import { NodeRole } from '@colanode/core';
import { Database } from '@colanode/ui/components/databases/database';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface RecordDatabaseProps {
id: string;
@@ -13,7 +13,7 @@ interface RecordDatabaseProps {
export const RecordDatabase = ({ id, role, children }: RecordDatabaseProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/records/record-search.tsx b/packages/ui/src/components/records/record-search.tsx
index 2e5b988f..098b2278 100644
--- a/packages/ui/src/components/records/record-search.tsx
+++ b/packages/ui/src/components/records/record-search.tsx
@@ -11,7 +11,7 @@ import {
CommandList,
} from '@colanode/ui/components/ui/command';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface RecordSearchProps {
exclude?: string[];
@@ -27,7 +27,7 @@ export const RecordSearch = ({
const workspace = useWorkspace();
const [query, setQuery] = useState('');
- const recordSearchQuery = useQuery({
+ const recordSearchQuery = useLiveQuery({
type: 'record.search',
searchQuery: query,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/records/values/record-collaborator-value.tsx b/packages/ui/src/components/records/values/record-collaborator-value.tsx
index 12f8a18e..2a969019 100644
--- a/packages/ui/src/components/records/values/record-collaborator-value.tsx
+++ b/packages/ui/src/components/records/values/record-collaborator-value.tsx
@@ -14,7 +14,7 @@ import { Separator } from '@colanode/ui/components/ui/separator';
import { UserSearch } from '@colanode/ui/components/users/user-search';
import { useRecord } from '@colanode/ui/contexts/record';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
interface RecordCollaboratorValueProps {
field: CollaboratorFieldAttributes;
@@ -45,7 +45,7 @@ export const RecordCollaboratorValue = ({
const [open, setOpen] = useState(false);
const collaboratorIds = record.getCollaboratorValue(field) ?? [];
- const results = useQueries(
+ const results = useLiveQueries(
collaboratorIds.map((id) => ({
type: 'user.get',
userId: id,
diff --git a/packages/ui/src/components/records/values/record-created-by-value.tsx b/packages/ui/src/components/records/values/record-created-by-value.tsx
index afd8f40a..4143a193 100644
--- a/packages/ui/src/components/records/values/record-created-by-value.tsx
+++ b/packages/ui/src/components/records/values/record-created-by-value.tsx
@@ -2,7 +2,7 @@ import { CreatedByFieldAttributes } from '@colanode/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useRecord } from '@colanode/ui/contexts/record';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface RecordCreatedByValueProps {
field: CreatedByFieldAttributes;
@@ -11,7 +11,7 @@ interface RecordCreatedByValueProps {
export const RecordCreatedByValue = ({ field }: RecordCreatedByValueProps) => {
const workspace = useWorkspace();
const record = useRecord();
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
accountId: workspace.accountId,
workspaceId: workspace.id,
diff --git a/packages/ui/src/components/records/values/record-relation-value.tsx b/packages/ui/src/components/records/values/record-relation-value.tsx
index 55fff35b..c6c525ee 100644
--- a/packages/ui/src/components/records/values/record-relation-value.tsx
+++ b/packages/ui/src/components/records/values/record-relation-value.tsx
@@ -13,7 +13,7 @@ import {
import { Separator } from '@colanode/ui/components/ui/separator';
import { useRecord } from '@colanode/ui/contexts/record';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
interface RecordRelationValueProps {
field: RelationFieldAttributes;
@@ -45,7 +45,7 @@ export const RecordRelationValue = ({
const [open, setOpen] = useState(false);
const relationIds = record.getRelationValue(field) ?? [];
- const results = useQueries(
+ const results = useLiveQueries(
relationIds.map((id) => ({
type: 'node.get',
nodeId: id,
diff --git a/packages/ui/src/components/records/values/record-updated-by-value.tsx b/packages/ui/src/components/records/values/record-updated-by-value.tsx
index fb3abc95..c09db8f9 100644
--- a/packages/ui/src/components/records/values/record-updated-by-value.tsx
+++ b/packages/ui/src/components/records/values/record-updated-by-value.tsx
@@ -4,7 +4,7 @@ import { UpdatedByFieldAttributes } from '@colanode/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useRecord } from '@colanode/ui/contexts/record';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface RecordUpdatedByValueProps {
field: UpdatedByFieldAttributes;
@@ -14,7 +14,7 @@ export const RecordUpdatedByValue = ({ field }: RecordUpdatedByValueProps) => {
const workspace = useWorkspace();
const record = useRecord();
- const { data } = useQuery(
+ const { data } = useLiveQuery(
{
type: 'user.get',
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/servers/server-provider.tsx b/packages/ui/src/components/servers/server-provider.tsx
index 87859f46..10e2dc9d 100644
--- a/packages/ui/src/components/servers/server-provider.tsx
+++ b/packages/ui/src/components/servers/server-provider.tsx
@@ -1,6 +1,6 @@
import { ServerNotFound } from '@colanode/ui/components/servers/server-not-found';
import { ServerContext } from '@colanode/ui/contexts/server';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { isFeatureSupported } from '@colanode/ui/lib/features';
interface ServerProviderProps {
@@ -9,7 +9,7 @@ interface ServerProviderProps {
}
export const ServerProvider = ({ domain, children }: ServerProviderProps) => {
- const serverListQuery = useQuery({
+ const serverListQuery = useLiveQuery({
type: 'server.list',
});
diff --git a/packages/ui/src/components/spaces/space-container-tab.tsx b/packages/ui/src/components/spaces/space-container-tab.tsx
index 171c2aa9..90e53a67 100644
--- a/packages/ui/src/components/spaces/space-container-tab.tsx
+++ b/packages/ui/src/components/spaces/space-container-tab.tsx
@@ -1,7 +1,7 @@
import { LocalSpaceNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface SpaceContainerTabProps {
spaceId: string;
@@ -10,7 +10,7 @@ interface SpaceContainerTabProps {
export const SpaceContainerTab = ({ spaceId }: SpaceContainerTabProps) => {
const workspace = useWorkspace();
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: spaceId,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/spaces/space-sidebar-item.tsx b/packages/ui/src/components/spaces/space-sidebar-item.tsx
index 8e48acb1..fb0db2fa 100644
--- a/packages/ui/src/components/spaces/space-sidebar-item.tsx
+++ b/packages/ui/src/components/spaces/space-sidebar-item.tsx
@@ -15,8 +15,8 @@ import {
} from '@colanode/ui/components/ui/collapsible';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
import { useMutation } from '@colanode/ui/hooks/use-mutation';
-import { useQuery } from '@colanode/ui/hooks/use-query';
import { sortSpaceChildren } from '@colanode/ui/lib/spaces';
import { cn } from '@colanode/ui/lib/utils';
@@ -32,7 +32,7 @@ export const SpaceSidebarItem = ({ space }: SpaceSidebarItemProps) => {
const role = extractNodeRole(space, workspace.userId);
const canEdit = role === 'admin';
- const nodeChildrenGetQuery = useQuery({
+ const nodeChildrenGetQuery = useLiveQuery({
type: 'node.children.get',
nodeId: space.id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/ui/table.tsx b/packages/ui/src/components/ui/table.tsx
new file mode 100644
index 00000000..bb4a410c
--- /dev/null
+++ b/packages/ui/src/components/ui/table.tsx
@@ -0,0 +1,114 @@
+import * as React from 'react';
+
+import { cn } from '@colanode/ui/lib/utils';
+
+function Table({ className, ...props }: React.ComponentProps<'table'>) {
+ return (
+ <div
+ data-slot="table-container"
+ className="relative w-full overflow-x-auto"
+ >
+ <table
+ data-slot="table"
+ className={cn('w-full caption-bottom text-sm', className)}
+ {...props}
+ />
+ </div>
+ );
+}
+
+function TableHeader({ className, ...props }: React.ComponentProps<'thead'>) {
+ return (
+ <thead
+ data-slot="table-header"
+ className={cn('[&_tr]:border-b', className)}
+ {...props}
+ />
+ );
+}
+
+function TableBody({ className, ...props }: React.ComponentProps<'tbody'>) {
+ return (
+ <tbody
+ data-slot="table-body"
+ className={cn('[&_tr:last-child]:border-0', className)}
+ {...props}
+ />
+ );
+}
+
+function TableFooter({ className, ...props }: React.ComponentProps<'tfoot'>) {
+ return (
+ <tfoot
+ data-slot="table-footer"
+ className={cn(
+ 'bg-muted/50 border-t font-medium [&>tr]:last:border-b-0',
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+function TableRow({ className, ...props }: React.ComponentProps<'tr'>) {
+ return (
+ <tr
+ data-slot="table-row"
+ className={cn(
+ 'hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors',
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+function TableHead({ className, ...props }: React.ComponentProps<'th'>) {
+ return (
+ <th
+ data-slot="table-head"
+ className={cn(
+ 'text-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]',
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+function TableCell({ className, ...props }: React.ComponentProps<'td'>) {
+ return (
+ <td
+ data-slot="table-cell"
+ className={cn(
+ 'p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]',
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+function TableCaption({
+ className,
+ ...props
+}: React.ComponentProps<'caption'>) {
+ return (
+ <caption
+ data-slot="table-caption"
+ className={cn('text-muted-foreground mt-4 text-sm', className)}
+ {...props}
+ />
+ );
+}
+
+export {
+ Table,
+ TableHeader,
+ TableBody,
+ TableFooter,
+ TableHead,
+ TableRow,
+ TableCell,
+ TableCaption,
+};
diff --git a/packages/ui/src/components/users/user-search.tsx b/packages/ui/src/components/users/user-search.tsx
index 9a20ac9b..cc71f943 100644
--- a/packages/ui/src/components/users/user-search.tsx
+++ b/packages/ui/src/components/users/user-search.tsx
@@ -11,7 +11,7 @@ import {
CommandList,
} from '@colanode/ui/components/ui/command';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface UserSearchProps {
exclude?: string[];
@@ -22,7 +22,7 @@ export const UserSearch = ({ exclude, onSelect }: UserSearchProps) => {
const workspace = useWorkspace();
const [query, setQuery] = useState('');
- const userSearchQuery = useQuery({
+ const userSearchQuery = useLiveQuery({
type: 'user.search',
searchQuery: query,
accountId: workspace.accountId,
diff --git a/packages/ui/src/components/workspaces/storage-stats.tsx b/packages/ui/src/components/workspaces/storage-stats.tsx
new file mode 100644
index 00000000..34aed185
--- /dev/null
+++ b/packages/ui/src/components/workspaces/storage-stats.tsx
@@ -0,0 +1,143 @@
+import { FileSubtype, formatBytes } from '@colanode/core';
+import { bigintToPercent } from '@colanode/ui/lib/utils';
+
+interface SubtypeMetadata {
+ subtype: FileSubtype;
+ color: string;
+ name: string;
+}
+
+const subtypeMetadata: SubtypeMetadata[] = [
+ {
+ subtype: 'image',
+ color: 'bg-blue-500',
+ name: 'Images',
+ },
+ {
+ subtype: 'video',
+ color: 'bg-green-500',
+ name: 'Videos',
+ },
+ {
+ subtype: 'audio',
+ color: 'bg-purple-500',
+ name: 'Audio',
+ },
+ {
+ subtype: 'pdf',
+ color: 'bg-red-500',
+ name: 'PDFs',
+ },
+ {
+ subtype: 'other',
+ color: 'bg-gray-500',
+ name: 'Other Files',
+ },
+];
+
+interface StorageSubtype {
+ subtype: string;
+ size: string;
+}
+
+interface StorageStatsProps {
+ usedBytes: bigint;
+ limitBytes: bigint | null;
+ subtypes: StorageSubtype[];
+}
+
+export const StorageStats = ({
+ usedBytes,
+ limitBytes,
+ subtypes,
+}: StorageStatsProps) => {
+ const usedPercentage = limitBytes
+ ? bigintToPercent(limitBytes, usedBytes)
+ : 0;
+
+ return (
+ <div className="space-y-2">
+ <div className="flex gap-2 items-baseline">
+ <span className="text-2xl font-medium">{formatBytes(usedBytes)}</span>
+ <span className="text-xl text-muted-foreground">
+ {' '}
+ of {limitBytes ? formatBytes(limitBytes) : 'Unlimited'}
+ </span>
+ <span className="text-sm text-muted-foreground">
+ ({usedPercentage}%) used
+ </span>
+ </div>
+ <div className="w-full h-3 bg-gray-200 rounded-full overflow-hidden flex">
+ {subtypes.map((subtype) => {
+ const size = BigInt(subtype.size);
+ if (size === BigInt(0)) {
+ return null;
+ }
+
+ const percentage = limitBytes ? bigintToPercent(limitBytes, size) : 0;
+ const metadata = subtypeMetadata.find(
+ (m) => m.subtype === subtype.subtype
+ );
+
+ if (!metadata) {
+ return null;
+ }
+
+ const name = metadata.name;
+ const color = metadata.color;
+ const title = `${name}: ${formatBytes(BigInt(subtype.size))}`;
+
+ return (
+ <div
+ key={subtype.subtype}
+ className={color}
+ style={{ width: `${percentage}%` }}
+ title={title}
+ />
+ );
+ })}
+ {usedPercentage < 100 && (
+ <div
+ className="bg-gray-200"
+ style={{ width: `${100 - usedPercentage}%` }}
+ />
+ )}
+ </div>
+
+ <div className="mb-6 space-y-2">
+ {subtypes.map((subtype) => {
+ const size = BigInt(subtype.size);
+ if (size === BigInt(0)) {
+ return null;
+ }
+
+ const metadata = subtypeMetadata.find(
+ (m) => m.subtype === subtype.subtype
+ );
+
+ if (!metadata) {
+ return null;
+ }
+
+ const name = metadata.name;
+ const color = metadata.color;
+
+ return (
+ <div
+ key={subtype.subtype}
+ className="flex items-center justify-between"
+ >
+ <div className="flex items-center gap-2">
+ <div className={`w-3 h-3 rounded-full ${color}`} />
+ <span className="text-sm">{name}</span>
+ </div>
+ <span className="text-sm text-muted-foreground">
+ {formatBytes(BigInt(subtype.size))}
+ </span>
+ </div>
+ );
+ })}
+ </div>
+ </div>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/user-storage-stats.tsx b/packages/ui/src/components/workspaces/user-storage-stats.tsx
new file mode 100644
index 00000000..97517b67
--- /dev/null
+++ b/packages/ui/src/components/workspaces/user-storage-stats.tsx
@@ -0,0 +1,42 @@
+import { Separator } from '@colanode/ui/components/ui/separator';
+import { StorageStats } from '@colanode/ui/components/workspaces/storage-stats';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+
+export const UserStorageStats = () => {
+ const workspace = useWorkspace();
+
+ const userStorageGetQuery = useLiveQuery({
+ type: 'user.storage.get',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const data = userStorageGetQuery.data ?? {
+ limit: '0',
+ used: '0',
+ subtypes: [],
+ };
+ const usedBytes = BigInt(data.used);
+ const limitBytes = BigInt(data.limit);
+
+ return (
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">My storage</h2>
+ <Separator className="mt-3" />
+ </div>
+ {userStorageGetQuery.isPending ? (
+ <div className="text-sm text-muted-foreground">
+ Loading storage data...
+ </div>
+ ) : (
+ <StorageStats
+ usedBytes={usedBytes}
+ limitBytes={limitBytes}
+ subtypes={data.subtypes}
+ />
+ )}
+ </div>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/workspace-settings-breadcrumb.tsx b/packages/ui/src/components/workspaces/workspace-settings-breadcrumb.tsx
deleted file mode 100644
index 3be84ba2..00000000
--- a/packages/ui/src/components/workspaces/workspace-settings-breadcrumb.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import {
- Breadcrumb,
- BreadcrumbItem,
- BreadcrumbList,
-} from '@colanode/ui/components/ui/breadcrumb';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
-
-export const WorkspaceSettingsBreadcrumb = () => {
- const workspace = useWorkspace();
-
- return (
- <Breadcrumb className="flex-grow">
- <BreadcrumbList>
- <BreadcrumbItem className="cursor-pointer hover:text-foreground">
- <div className="flex items-center space-x-2">
- <Avatar
- id={workspace.id}
- name={workspace.name}
- avatar={workspace.avatar}
- className="size-4"
- />
- <span>{workspace.name} Settings</span>
- </div>
- </BreadcrumbItem>
- </BreadcrumbList>
- </Breadcrumb>
- );
-};
diff --git a/packages/ui/src/components/workspaces/workspace-settings-tab.tsx b/packages/ui/src/components/workspaces/workspace-settings-tab.tsx
index 36503fbb..48d3858b 100644
--- a/packages/ui/src/components/workspaces/workspace-settings-tab.tsx
+++ b/packages/ui/src/components/workspaces/workspace-settings-tab.tsx
@@ -1,18 +1,10 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { Settings } from 'lucide-react';
export const WorkspaceSettingsTab = () => {
- const workspace = useWorkspace();
-
return (
<div className="flex items-center space-x-2">
- <Avatar
- id={workspace.id}
- name={workspace.name}
- avatar={workspace.avatar}
- size="small"
- />
- <span>{workspace.name} Settings</span>
+ <Settings className="size-4" />
+ <span>Workspace Settings</span>
</div>
);
};
diff --git a/packages/ui/src/components/workspaces/workspace-settings.tsx b/packages/ui/src/components/workspaces/workspace-settings.tsx
index f1a0d50f..15ac21bb 100644
--- a/packages/ui/src/components/workspaces/workspace-settings.tsx
+++ b/packages/ui/src/components/workspaces/workspace-settings.tsx
@@ -1,14 +1,9 @@
import { toast } from 'sonner';
-import {
- Container,
- ContainerBody,
- ContainerHeader,
-} from '@colanode/ui/components/ui/container';
+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';
import { Separator } from '@colanode/ui/components/ui/separator';
import { WorkspaceDelete } from '@colanode/ui/components/workspaces/workspace-delete';
import { WorkspaceForm } from '@colanode/ui/components/workspaces/workspace-form';
-import { WorkspaceSettingsBreadcrumb } from '@colanode/ui/components/workspaces/workspace-settings-breadcrumb';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
import { useMutation } from '@colanode/ui/hooks/use-mutation';
@@ -19,55 +14,50 @@ export const WorkspaceSettings = () => {
return (
<Container>
- <ContainerHeader>
- <WorkspaceSettingsBreadcrumb />
- </ContainerHeader>
- <ContainerBody className="max-w-4xl">
- <div className="space-y-8">
- <div className="space-y-6">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">General</h2>
- <Separator className="mt-3" />
- </div>
- <WorkspaceForm
- readOnly={!canEdit}
- values={{
- name: workspace.name,
- description: workspace.description ?? '',
- avatar: workspace.avatar ?? null,
- }}
- onSubmit={(values) => {
- mutate({
- input: {
- type: 'workspace.update',
- id: workspace.id,
- accountId: workspace.accountId,
- name: values.name,
- description: values.description,
- avatar: values.avatar ?? null,
- },
- onSuccess() {
- toast.success('Workspace updated');
- },
- onError(error) {
- toast.error(error.message);
- },
- });
- }}
- isSaving={isPending}
- saveText="Update"
- />
+ <ContainerBody className="max-w-4xl space-y-8">
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">General</h2>
+ <Separator className="mt-3" />
</div>
+ <WorkspaceForm
+ readOnly={!canEdit}
+ values={{
+ name: workspace.name,
+ description: workspace.description ?? '',
+ avatar: workspace.avatar ?? null,
+ }}
+ onSubmit={(values) => {
+ mutate({
+ input: {
+ type: 'workspace.update',
+ id: workspace.id,
+ accountId: workspace.accountId,
+ name: values.name,
+ description: values.description,
+ avatar: values.avatar ?? null,
+ },
+ onSuccess() {
+ toast.success('Workspace updated');
+ },
+ onError(error) {
+ toast.error(error.message);
+ },
+ });
+ }}
+ isSaving={isPending}
+ saveText="Update"
+ />
+ </div>
- <div className="space-y-6">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">
- Danger Zone
- </h2>
- <Separator className="mt-3" />
- </div>
- <WorkspaceDelete />
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">
+ Danger Zone
+ </h2>
+ <Separator className="mt-3" />
</div>
+ <WorkspaceDelete />
</div>
</ContainerBody>
</Container>
diff --git a/packages/ui/src/components/workspaces/workspace-storage-stats.tsx b/packages/ui/src/components/workspaces/workspace-storage-stats.tsx
new file mode 100644
index 00000000..8aa6bb66
--- /dev/null
+++ b/packages/ui/src/components/workspaces/workspace-storage-stats.tsx
@@ -0,0 +1,89 @@
+import { BadgeAlert, ServerCog } from 'lucide-react';
+import { match } from 'ts-pattern';
+
+import { Separator } from '@colanode/ui/components/ui/separator';
+import { Spinner } from '@colanode/ui/components/ui/spinner';
+import { StorageStats } from '@colanode/ui/components/workspaces/storage-stats';
+import { WorkspaceStorageUserTable } from '@colanode/ui/components/workspaces/workspace-storage-user-table';
+import { useServer } from '@colanode/ui/contexts/server';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useQuery } from '@colanode/ui/hooks/use-query';
+
+export const WorkspaceStorageStats = () => {
+ const workspace = useWorkspace();
+ const server = useServer();
+ const isFeatureSupported = server.supports('workspace.storage.management');
+
+ const workspaceStorageGetQuery = useQuery(
+ {
+ type: 'workspace.storage.get',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ },
+ {
+ enabled: isFeatureSupported,
+ }
+ );
+
+ const data = workspaceStorageGetQuery.data ?? {
+ limit: '0',
+ used: '0',
+ subtypes: [],
+ users: [],
+ };
+ const usedBytes = BigInt(data.used);
+ const limitBytes = data.limit ? BigInt(data.limit) : null;
+
+ return (
+ <div className="space-y-10">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">
+ Workspace storage
+ </h2>
+ <Separator className="mt-3" />
+ </div>
+ {!isFeatureSupported ? (
+ <div className="flex items-center gap-4 text-sm text-muted-foreground">
+ <ServerCog className="size-8 text-muted-foreground" />
+ <span>
+ Workspace storage management is not supported by this server
+ version. Please contact your administrator to upgrade the server.
+ </span>
+ </div>
+ ) : (
+ match(workspaceStorageGetQuery)
+ .with({ isPending: true }, () => (
+ <div className="flex items-center gap-4 text-sm text-muted-foreground">
+ <Spinner className="size-5" />
+ <span>Loading storage data from the server...</span>
+ </div>
+ ))
+ .with({ isPending: false, isError: false }, () => (
+ <>
+ <StorageStats
+ usedBytes={usedBytes}
+ limitBytes={limitBytes}
+ subtypes={data.subtypes}
+ />
+ <WorkspaceStorageUserTable
+ users={data.users}
+ onUpdate={() => {
+ workspaceStorageGetQuery.refetch();
+ }}
+ />
+ </>
+ ))
+ .otherwise(() => (
+ <div className="flex items-center gap-4 text-sm text-muted-foreground">
+ <BadgeAlert className="size-8 text-red-400" />
+ <span>
+ Couldn't load storage information from the server. Please make
+ sure that the server is accessible and you have permission to
+ access this workspace storage data.
+ </span>
+ </div>
+ ))
+ )}
+ </div>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/workspace-storage-tab.tsx b/packages/ui/src/components/workspaces/workspace-storage-tab.tsx
new file mode 100644
index 00000000..bc0daf80
--- /dev/null
+++ b/packages/ui/src/components/workspaces/workspace-storage-tab.tsx
@@ -0,0 +1,10 @@
+import { Cylinder } from 'lucide-react';
+
+export const WorkspaceStorageTab = () => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Cylinder className="size-4" />
+ <span>Workspace Storage</span>
+ </div>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/workspace-storage-user-table.tsx b/packages/ui/src/components/workspaces/workspace-storage-user-table.tsx
new file mode 100644
index 00000000..ca9ceedf
--- /dev/null
+++ b/packages/ui/src/components/workspaces/workspace-storage-user-table.tsx
@@ -0,0 +1,168 @@
+import { Settings } from 'lucide-react';
+import { useState } from 'react';
+
+import { formatBytes } from '@colanode/core';
+import { Avatar } from '@colanode/ui/components/avatars/avatar';
+import { Button } from '@colanode/ui/components/ui/button';
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from '@colanode/ui/components/ui/table';
+import { WorkspaceStorageUserUpdateDialog } from '@colanode/ui/components/workspaces/workspace-storage-user-update-dialog';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useQuery } from '@colanode/ui/hooks/use-query';
+import { bigintToPercent, cn } from '@colanode/ui/lib/utils';
+
+interface WorkspaceStorageUser {
+ id: string;
+ used: string;
+ limit: string;
+}
+
+interface UserStorageProgressBarProps {
+ used: bigint;
+ limit: bigint;
+}
+
+const UserStorageProgressBar = ({
+ used,
+ limit,
+}: UserStorageProgressBarProps) => {
+ const percentage = limit > 0n ? bigintToPercent(limit, used) : 0;
+
+ const getBarColor = () => {
+ if (percentage >= 90) return 'bg-red-500';
+ if (percentage >= 70) return 'bg-orange-500';
+ return 'bg-green-500';
+ };
+
+ return (
+ <div className="space-y-1">
+ <div className="flex items-center justify-between text-sm">
+ <span className="font-medium">{formatBytes(used)}</span>
+ <span className="text-muted-foreground">
+ ({percentage.toFixed(1)}%)
+ </span>
+ </div>
+ <div className="w-full h-2 bg-gray-200 rounded-full overflow-hidden">
+ <div
+ className={cn('h-full transition-all duration-300', getBarColor())}
+ style={{ width: `${Math.min(percentage, 100)}%` }}
+ />
+ </div>
+ </div>
+ );
+};
+
+interface WorkspaceStorageUserRowProps {
+ user: WorkspaceStorageUser;
+ onUpdate: () => void;
+}
+
+const WorkspaceStorageUserRow = ({
+ user,
+ onUpdate,
+}: WorkspaceStorageUserRowProps) => {
+ const workspace = useWorkspace();
+ const [openUpdateDialog, setOpenUpdateDialog] = useState(false);
+
+ const userQuery = useQuery({
+ type: 'user.get',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ userId: user.id,
+ });
+
+ const name = userQuery.data?.name ?? 'Unknown';
+ const email = userQuery.data?.email ?? '';
+ const avatar = userQuery.data?.avatar ?? null;
+
+ const usedBytes = BigInt(user.used);
+ const limitBytes = BigInt(user.limit);
+
+ return (
+ <>
+ <TableRow>
+ <TableCell>
+ <div className="flex items-center space-x-3">
+ <Avatar id={user.id} name={name} avatar={avatar} />
+ <div className="flex-grow min-w-0">
+ <p className="text-sm font-medium leading-none truncate">
+ {name}
+ </p>
+ <p className="text-sm text-muted-foreground truncate">{email}</p>
+ </div>
+ </div>
+ </TableCell>
+ <TableCell className="text-center">
+ <span className="text-sm font-medium">{formatBytes(limitBytes)}</span>
+ </TableCell>
+ <TableCell className="min-w-[200px] text-center">
+ <UserStorageProgressBar used={usedBytes} limit={limitBytes} />
+ </TableCell>
+ <TableCell className="w-10 text-right">
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-8 w-8"
+ onClick={() => setOpenUpdateDialog(true)}
+ >
+ <Settings className="h-4 w-4" />
+ </Button>
+ </TableCell>
+ </TableRow>
+ {openUpdateDialog && (
+ <WorkspaceStorageUserUpdateDialog
+ userId={user.id}
+ limit={user.limit}
+ open={openUpdateDialog}
+ onOpenChange={setOpenUpdateDialog}
+ onUpdate={() => {
+ onUpdate();
+ setOpenUpdateDialog(false);
+ }}
+ />
+ )}
+ </>
+ );
+};
+
+interface WorkspaceStorageUserTableProps {
+ users: WorkspaceStorageUser[];
+ onUpdate: () => void;
+}
+
+export const WorkspaceStorageUserTable = ({
+ users,
+ onUpdate,
+}: WorkspaceStorageUserTableProps) => {
+ if (users.length === 0) {
+ return <div className="text-sm text-muted-foreground">No users found.</div>;
+ }
+
+ return (
+ <Table>
+ <TableHeader>
+ <TableRow>
+ <TableHead>User</TableHead>
+ <TableHead className="text-center">Total Storage</TableHead>
+ <TableHead className="text-center">Used Storage</TableHead>
+ <TableHead className="w-10 text-right"></TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {users.map((user) => (
+ <WorkspaceStorageUserRow
+ key={user.id}
+ user={user}
+ onUpdate={onUpdate}
+ />
+ ))}
+ </TableBody>
+ </Table>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/workspace-storage-user-update-dialog.tsx b/packages/ui/src/components/workspaces/workspace-storage-user-update-dialog.tsx
new file mode 100644
index 00000000..bf4ef853
--- /dev/null
+++ b/packages/ui/src/components/workspaces/workspace-storage-user-update-dialog.tsx
@@ -0,0 +1,249 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Check, ChevronDown } from 'lucide-react';
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { toast } from 'sonner';
+import { z } from 'zod/v4';
+
+import { Avatar } from '@colanode/ui/components/avatars/avatar';
+import { Button } from '@colanode/ui/components/ui/button';
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@colanode/ui/components/ui/dialog';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@colanode/ui/components/ui/dropdown-menu';
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from '@colanode/ui/components/ui/form';
+import { Input } from '@colanode/ui/components/ui/input';
+import { Spinner } from '@colanode/ui/components/ui/spinner';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { useMutation } from '@colanode/ui/hooks/use-mutation';
+import { useQuery } from '@colanode/ui/hooks/use-query';
+
+const UNITS = [
+ { label: 'TB', value: 'TB', bytes: 1024 ** 4 },
+ { label: 'GB', value: 'GB', bytes: 1024 ** 3 },
+ { label: 'MB', value: 'MB', bytes: 1024 ** 2 },
+ { label: 'KB', value: 'KB', bytes: 1024 },
+ { label: 'Bytes', value: 'bytes', bytes: 1 },
+];
+
+const convertBytesToUnit = (bytes: string) => {
+ const bytesNum = parseInt(bytes);
+ if (isNaN(bytesNum) || bytesNum === 0) {
+ return { value: '0', unit: 'bytes' };
+ }
+
+ for (const unit of UNITS) {
+ if (bytesNum >= unit.bytes || unit.value === 'bytes') {
+ const value = bytesNum / unit.bytes;
+ return {
+ value: value % 1 === 0 ? value.toString() : value.toFixed(2),
+ unit: unit.value,
+ };
+ }
+ }
+ return { value: '0', unit: 'bytes' };
+};
+
+const convertUnitToBytes = (value: string, unit: string): string => {
+ const unitData = UNITS.find((u) => u.value === unit);
+ const selectedUnit = unitData || UNITS[UNITS.length - 1]!;
+ const numValue = parseFloat(value || '0');
+ return Math.round(numValue * selectedUnit.bytes).toString();
+};
+
+const formatBytes = (bytes: string): string => {
+ const num = parseInt(bytes);
+ if (isNaN(num)) return '0';
+ return new Intl.NumberFormat().format(num);
+};
+
+const formSchema = z.object({
+ limit: z.string().min(1, 'Storage limit is required'),
+});
+
+interface WorkspaceStorageUserUpdateDialogProps {
+ userId: string;
+ limit: string;
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+ onUpdate: () => void;
+}
+
+export const WorkspaceStorageUserUpdateDialog = ({
+ userId,
+ limit,
+ open,
+ onOpenChange,
+ onUpdate,
+}: WorkspaceStorageUserUpdateDialogProps) => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useMutation();
+
+ const initialLimit = convertBytesToUnit(limit);
+
+ const [limitUnit, setLimitUnit] = useState(initialLimit.unit);
+
+ const userQuery = useQuery({
+ type: 'user.get',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ userId,
+ });
+
+ const name = userQuery.data?.name ?? 'Unknown';
+ const email = userQuery.data?.email ?? '';
+ const avatar = userQuery.data?.avatar ?? null;
+
+ const form = useForm<z.infer<typeof formSchema>>({
+ resolver: zodResolver(formSchema),
+ defaultValues: {
+ limit: initialLimit.value,
+ },
+ });
+
+ const handleCancel = () => {
+ form.reset();
+ setLimitUnit(initialLimit.unit);
+ onOpenChange(false);
+ };
+
+ const handleSubmit = async (values: z.infer<typeof formSchema>) => {
+ if (isPending) {
+ return;
+ }
+
+ const apiValues = {
+ limit: convertUnitToBytes(values.limit, limitUnit),
+ };
+
+ mutate({
+ input: {
+ type: 'user.storage.update',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ userId,
+ limit: apiValues.limit,
+ },
+ onSuccess: () => {
+ toast.success('User storage settings updated');
+ form.reset();
+ onUpdate();
+ },
+ onError: (error) => {
+ toast.error(error.message);
+ },
+ });
+ };
+
+ const unit = UNITS.find((u) => u.value === limitUnit);
+ const unitLabel = unit?.label ?? 'bytes';
+
+ return (
+ <Dialog open={open} onOpenChange={onOpenChange}>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Update storage settings</DialogTitle>
+ <DialogDescription>
+ Update the storage limit for this user
+ </DialogDescription>
+ </DialogHeader>
+ <div className="flex items-center space-x-3 py-4 border-b">
+ <Avatar id={userId} name={name} avatar={avatar} />
+ <div className="flex-grow min-w-0">
+ <p className="text-sm font-medium leading-none truncate">{name}</p>
+ <p className="text-sm text-muted-foreground truncate">{email}</p>
+ </div>
+ </div>
+ <Form {...form}>
+ <form
+ className="flex flex-col"
+ onSubmit={form.handleSubmit(handleSubmit)}
+ >
+ <div className="flex-grow space-y-6 py-2 pb-4">
+ <FormField
+ control={form.control}
+ name="limit"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Storage Limit</FormLabel>
+ <FormControl>
+ <div className="flex space-x-2">
+ <Input
+ type="number"
+ placeholder="5"
+ {...field}
+ className="flex-1"
+ min="0"
+ step="0.01"
+ />
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="outline"
+ className="w-20 justify-between"
+ >
+ {unitLabel}
+ <ChevronDown className="h-4 w-4" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent>
+ {UNITS.map((unit) => (
+ <DropdownMenuItem
+ key={unit.value}
+ onClick={() => setLimitUnit(unit.value)}
+ className="flex items-center justify-between"
+ >
+ <span>{unit.label}</span>
+ {limitUnit === unit.value && (
+ <Check className="h-4 w-4" />
+ )}
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ </FormControl>
+ <div className="text-xs text-muted-foreground">
+ ={' '}
+ {formatBytes(
+ convertUnitToBytes(field.value || '0', limitUnit)
+ )}{' '}
+ bytes
+ </div>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </div>
+ <DialogFooter>
+ <Button type="button" variant="outline" onClick={handleCancel}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={isPending}>
+ {isPending && <Spinner className="mr-1" />}
+ Update
+ </Button>
+ </DialogFooter>
+ </form>
+ </Form>
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/workspace-storage.tsx b/packages/ui/src/components/workspaces/workspace-storage.tsx
new file mode 100644
index 00000000..efc8d93f
--- /dev/null
+++ b/packages/ui/src/components/workspaces/workspace-storage.tsx
@@ -0,0 +1,19 @@
+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';
+import { UserStorageStats } from '@colanode/ui/components/workspaces/user-storage-stats';
+import { WorkspaceStorageStats } from '@colanode/ui/components/workspaces/workspace-storage-stats';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+
+export const WorkspaceStorage = () => {
+ const workspace = useWorkspace();
+ const canManageStorage =
+ workspace.role === 'owner' || workspace.role === 'admin';
+
+ return (
+ <Container>
+ <ContainerBody className="max-w-4xl space-y-10">
+ <UserStorageStats />
+ {canManageStorage && <WorkspaceStorageStats />}
+ </ContainerBody>
+ </Container>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/workspace-users-breadcrumb.tsx b/packages/ui/src/components/workspaces/workspace-users-breadcrumb.tsx
deleted file mode 100644
index 1a232265..00000000
--- a/packages/ui/src/components/workspaces/workspace-users-breadcrumb.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import {
- Breadcrumb,
- BreadcrumbItem,
- BreadcrumbList,
-} from '@colanode/ui/components/ui/breadcrumb';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
-
-export const WorkspaceUsersBreadcrumb = () => {
- const workspace = useWorkspace();
-
- return (
- <Breadcrumb className="flex-grow">
- <BreadcrumbList>
- <BreadcrumbItem className="cursor-pointer hover:text-foreground">
- <div className="flex items-center space-x-2">
- <Avatar
- id={workspace.id}
- name={workspace.name}
- avatar={workspace.avatar}
- className="size-4"
- />
- <span>{workspace.name} Users</span>
- </div>
- </BreadcrumbItem>
- </BreadcrumbList>
- </Breadcrumb>
- );
-};
diff --git a/packages/ui/src/components/workspaces/workspace-users-tab.tsx b/packages/ui/src/components/workspaces/workspace-users-tab.tsx
index 5dd18cef..2ccc3ba9 100644
--- a/packages/ui/src/components/workspaces/workspace-users-tab.tsx
+++ b/packages/ui/src/components/workspaces/workspace-users-tab.tsx
@@ -1,18 +1,10 @@
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { Users } from 'lucide-react';
export const WorkspaceUsersTab = () => {
- const workspace = useWorkspace();
-
return (
<div className="flex items-center space-x-2">
- <Avatar
- id={workspace.id}
- name={workspace.name}
- avatar={workspace.avatar}
- size="small"
- />
- <span>{workspace.name} Users</span>
+ <Users className="size-4" />
+ <span>Workspace Users</span>
</div>
);
};
diff --git a/packages/ui/src/components/workspaces/workspace-users.tsx b/packages/ui/src/components/workspaces/workspace-users.tsx
index 949e3891..fa70851e 100644
--- a/packages/ui/src/components/workspaces/workspace-users.tsx
+++ b/packages/ui/src/components/workspaces/workspace-users.tsx
@@ -4,18 +4,13 @@ import { InView } from 'react-intersection-observer';
import { UserListQueryInput } from '@colanode/client/queries';
import { WorkspaceRole } from '@colanode/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import {
- Container,
- ContainerBody,
- ContainerHeader,
-} from '@colanode/ui/components/ui/container';
+import { Container, ContainerBody } from '@colanode/ui/components/ui/container';
import { Separator } from '@colanode/ui/components/ui/separator';
import { Spinner } from '@colanode/ui/components/ui/spinner';
import { WorkspaceUserInvite } from '@colanode/ui/components/workspaces/workspace-user-invite';
import { WorkspaceUserRoleDropdown } from '@colanode/ui/components/workspaces/workspace-user-role-dropdown';
-import { WorkspaceUsersBreadcrumb } from '@colanode/ui/components/workspaces/workspace-users-breadcrumb';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
const USERS_PER_PAGE = 50;
@@ -34,76 +29,69 @@ export const WorkspaceUsers = () => {
workspaceId: workspace.id,
}));
- const result = useQueries(inputs);
+ const result = useLiveQueries(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 (
<Container>
- <ContainerHeader>
- <WorkspaceUsersBreadcrumb />
- </ContainerHeader>
- <ContainerBody className="max-w-4xl">
- <div className="space-y-8">
- {canEditUsers && (
- <div className="space-y-6">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">
- Invite
- </h2>
- <Separator className="mt-3" />
- </div>
- <WorkspaceUserInvite workspace={workspace} />
- </div>
- )}
-
+ <ContainerBody className="max-w-4xl space-y-8">
+ {canEditUsers && (
<div className="space-y-6">
<div>
- <h2 className="text-2xl font-semibold tracking-tight">Users</h2>
- <p className="text-sm text-muted-foreground mt-1">
- The list of all users on the workspace
- </p>
+ <h2 className="text-2xl font-semibold tracking-tight">Invite</h2>
<Separator className="mt-3" />
</div>
- <div className="flex flex-col gap-3">
- {users.map((user) => {
- const name: string = user.name ?? 'Unknown';
- const email: string = user.email ?? ' ';
- const avatar: string | null | undefined = user.avatar;
- const role: WorkspaceRole = user.role;
+ <WorkspaceUserInvite workspace={workspace} />
+ </div>
+ )}
- if (!role) {
- return null;
- }
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">Users</h2>
+ <p className="text-sm text-muted-foreground mt-1">
+ The list of all users on the workspace
+ </p>
+ <Separator className="mt-3" />
+ </div>
+ <div className="flex flex-col gap-3">
+ {users.map((user) => {
+ const name: string = user.name ?? 'Unknown';
+ const email: string = user.email ?? ' ';
+ const avatar: string | null | undefined = user.avatar;
+ const role: WorkspaceRole = user.role;
+
+ if (!role) {
+ return null;
+ }
- return (
- <div key={user.id} className="flex items-center space-x-3">
- <Avatar id={user.id} name={name} avatar={avatar} />
- <div className="flex-grow">
- <p className="text-sm font-medium leading-none">{name}</p>
- <p className="text-sm text-muted-foreground">{email}</p>
- </div>
- <WorkspaceUserRoleDropdown
- userId={user.id}
- value={role}
- canEdit={canEditUsers}
- />
+ return (
+ <div key={user.id} className="flex items-center space-x-3">
+ <Avatar id={user.id} name={name} avatar={avatar} />
+ <div className="flex-grow">
+ <p className="text-sm font-medium leading-none">{name}</p>
+ <p className="text-sm text-muted-foreground">{email}</p>
</div>
- );
- })}
- <div className="flex items-center justify-center space-x-3">
- {isPending && <Spinner />}
- </div>
- <InView
- rootMargin="200px"
- onChange={(inView) => {
- if (inView && hasMore && !isPending) {
- setLastPage(lastPage + 1);
- }
- }}
- ></InView>
+ <WorkspaceUserRoleDropdown
+ userId={user.id}
+ value={role}
+ canEdit={canEditUsers}
+ />
+ </div>
+ );
+ })}
+ <div className="flex items-center justify-center space-x-3">
+ {isPending && <Spinner />}
</div>
+ <InView
+ rootMargin="200px"
+ onChange={(inView) => {
+ if (inView && hasMore && !isPending) {
+ setLastPage(lastPage + 1);
+ }
+ }}
+ />
</div>
</div>
</ContainerBody>
diff --git a/packages/ui/src/components/workspaces/workspace.tsx b/packages/ui/src/components/workspaces/workspace.tsx
index 7ba2fb3a..cd5a3be8 100644
--- a/packages/ui/src/components/workspaces/workspace.tsx
+++ b/packages/ui/src/components/workspaces/workspace.tsx
@@ -6,7 +6,7 @@ import {
import { Layout } from '@colanode/ui/components/layouts/layout';
import { useAccount } from '@colanode/ui/contexts/account';
import { WorkspaceContext } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface WorkspaceProps {
workspace: WorkspaceType;
@@ -15,7 +15,7 @@ interface WorkspaceProps {
export const Workspace = ({ workspace }: WorkspaceProps) => {
const account = useAccount();
- const workspaceMetadataListQuery = useQuery({
+ const workspaceMetadataListQuery = useLiveQuery({
type: 'workspace.metadata.list',
accountId: account.id,
workspaceId: workspace.id,
diff --git a/packages/ui/src/editor/renderers/mention.tsx b/packages/ui/src/editor/renderers/mention.tsx
index 2c8b71f3..e89f24f5 100644
--- a/packages/ui/src/editor/renderers/mention.tsx
+++ b/packages/ui/src/editor/renderers/mention.tsx
@@ -3,7 +3,7 @@ import { JSONContent } from '@tiptap/core';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
import { defaultClasses } from '@colanode/ui/editor/classes';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
interface MentionRendererProps {
node: JSONContent;
@@ -14,7 +14,7 @@ export const MentionRenderer = ({ node }: MentionRendererProps) => {
const workspace = useWorkspace();
const target = node.attrs?.target;
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
userId: target,
accountId: workspace.accountId,
diff --git a/packages/ui/src/editor/views/database.tsx b/packages/ui/src/editor/views/database.tsx
index db6b5f66..2acb9115 100644
--- a/packages/ui/src/editor/views/database.tsx
+++ b/packages/ui/src/editor/views/database.tsx
@@ -5,14 +5,14 @@ import { LocalDatabaseNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const DatabaseNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
const layout = useLayout();
const id = node.attrs.id;
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/editor/views/folder.tsx b/packages/ui/src/editor/views/folder.tsx
index 27d5ac2e..264c7236 100644
--- a/packages/ui/src/editor/views/folder.tsx
+++ b/packages/ui/src/editor/views/folder.tsx
@@ -5,14 +5,14 @@ import { LocalFolderNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const FolderNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
const layout = useLayout();
const id = node.attrs.id;
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/editor/views/mention.tsx b/packages/ui/src/editor/views/mention.tsx
index e776e1df..9b993225 100644
--- a/packages/ui/src/editor/views/mention.tsx
+++ b/packages/ui/src/editor/views/mention.tsx
@@ -4,13 +4,13 @@ import { NodeViewWrapper } from '@tiptap/react';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
import { defaultClasses } from '@colanode/ui/editor/classes';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const MentionNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
const target = node.attrs.target;
- const userGetQuery = useQuery({
+ const userGetQuery = useLiveQuery({
type: 'user.get',
userId: target,
accountId: workspace.accountId,
diff --git a/packages/ui/src/editor/views/page.tsx b/packages/ui/src/editor/views/page.tsx
index 15feff92..7084c60b 100644
--- a/packages/ui/src/editor/views/page.tsx
+++ b/packages/ui/src/editor/views/page.tsx
@@ -5,14 +5,14 @@ import { LocalPageNode } from '@colanode/client/types';
import { Avatar } from '@colanode/ui/components/avatars/avatar';
import { useLayout } from '@colanode/ui/contexts/layout';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
export const PageNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
const layout = useLayout();
const id = node.attrs.id;
- const nodeGetQuery = useQuery({
+ const nodeGetQuery = useLiveQuery({
type: 'node.get',
nodeId: id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/hooks/use-queries.tsx b/packages/ui/src/hooks/use-live-queries.tsx
similarity index 86%
rename from packages/ui/src/hooks/use-queries.tsx
rename to packages/ui/src/hooks/use-live-queries.tsx
index 2a19166b..c5c7c52c 100644
--- a/packages/ui/src/hooks/use-queries.tsx
+++ b/packages/ui/src/hooks/use-live-queries.tsx
@@ -3,7 +3,7 @@ import { sha256 } from 'js-sha256';
import { QueryInput } from '@colanode/client/queries';
-export const useQueries = <T extends QueryInput>(inputs: T[]) => {
+export const useLiveQueries = <T extends QueryInput>(inputs: T[]) => {
const result = useTanstackQueries({
queries: inputs.map((input) => {
const hash = sha256(JSON.stringify(input));
diff --git a/packages/ui/src/hooks/use-live-query.tsx b/packages/ui/src/hooks/use-live-query.tsx
new file mode 100644
index 00000000..803e713c
--- /dev/null
+++ b/packages/ui/src/hooks/use-live-query.tsx
@@ -0,0 +1,28 @@
+import {
+ useQuery as useTanstackQuery,
+ UseQueryOptions as TanstackUseQueryOptions,
+} from '@tanstack/react-query';
+import { sha256 } from 'js-sha256';
+
+import { QueryInput, QueryMap } from '@colanode/client/queries';
+
+type UseLiveQueryOptions<T extends QueryInput> = Omit<
+ TanstackUseQueryOptions<QueryMap[T['type']]['output']>,
+ 'queryFn' | 'queryKey'
+>;
+
+export const useLiveQuery = <T extends QueryInput>(
+ input: T,
+ options?: UseLiveQueryOptions<T>
+) => {
+ const inputJson = JSON.stringify(input);
+ const hash = sha256(inputJson);
+
+ const result = useTanstackQuery({
+ queryKey: [hash],
+ queryFn: () => window.colanode.executeQueryAndSubscribe(hash, input),
+ ...options,
+ });
+
+ return result;
+};
diff --git a/packages/ui/src/hooks/use-node-container.tsx b/packages/ui/src/hooks/use-node-container.tsx
index d4cbcdc9..9870ccdd 100644
--- a/packages/ui/src/hooks/use-node-container.tsx
+++ b/packages/ui/src/hooks/use-node-container.tsx
@@ -1,7 +1,7 @@
import { LocalNode } from '@colanode/client/types';
import { NodeRole, extractNodeRole } from '@colanode/core';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQuery } from '@colanode/ui/hooks/use-query';
+import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
type UseNodeContainerResult<T extends LocalNode> =
| {
@@ -25,7 +25,7 @@ export const useNodeContainer = <T extends LocalNode>(
): UseNodeContainerResult<T> => {
const workspace = useWorkspace();
- const nodeTreeGetQuery = useQuery({
+ const nodeTreeGetQuery = useLiveQuery({
type: 'node.tree.get',
nodeId: id,
accountId: workspace.accountId,
diff --git a/packages/ui/src/hooks/use-query.tsx b/packages/ui/src/hooks/use-query.tsx
index a3f62dcb..82b26bd5 100644
--- a/packages/ui/src/hooks/use-query.tsx
+++ b/packages/ui/src/hooks/use-query.tsx
@@ -20,7 +20,7 @@ export const useQuery = <T extends QueryInput>(
const result = useTanstackQuery({
queryKey: [hash],
- queryFn: () => window.colanode.executeQueryAndSubscribe(hash, input),
+ queryFn: () => window.colanode.executeQuery(input),
...options,
});
diff --git a/packages/ui/src/hooks/use-records-query.tsx b/packages/ui/src/hooks/use-records-query.tsx
index 79a7d078..a0582b16 100644
--- a/packages/ui/src/hooks/use-records-query.tsx
+++ b/packages/ui/src/hooks/use-records-query.tsx
@@ -7,7 +7,7 @@ import {
} from '@colanode/core';
import { useDatabase } from '@colanode/ui/contexts/database';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useQueries } from '@colanode/ui/hooks/use-queries';
+import { useLiveQueries } from '@colanode/ui/hooks/use-live-queries';
const RECORDS_PER_PAGE = 50;
@@ -35,7 +35,7 @@ export const useRecordsQuery = (
userId: workspace.userId,
}));
- const result = useQueries(inputs);
+ const result = useLiveQueries(inputs);
const records = result.flatMap((data) => data.data ?? []);
const isPending = result.some((data) => data.isPending);
const hasMore =
diff --git a/packages/ui/src/lib/features.ts b/packages/ui/src/lib/features.ts
index 4f33eac1..d934ba7e 100644
--- a/packages/ui/src/lib/features.ts
+++ b/packages/ui/src/lib/features.ts
@@ -1,6 +1,8 @@
import semver from 'semver';
-export const FeatureVersions = {} as const;
+export const FeatureVersions = {
+ 'workspace.storage.management': '0.2.9',
+} as const;
export type FeatureKey = keyof typeof FeatureVersions;
diff --git a/packages/ui/src/lib/utils.ts b/packages/ui/src/lib/utils.ts
index 8ba51b8b..b02c421d 100644
--- a/packages/ui/src/lib/utils.ts
+++ b/packages/ui/src/lib/utils.ts
@@ -55,3 +55,12 @@ export const percentToNumber = (total: number, percent: number) =>
export const numberToPercent = (total: number, number: number) =>
Math.round((number / total) * 100);
+
+export const bigintToPercent = (total: bigint, number: bigint) => {
+ if (total === 0n) {
+ return 0;
+ }
+
+ const result = (number * 100n) / total;
+ return Math.round(Number(result));
+};