Skip to content

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

Improve storage tracking and UI (#259)

Hakan Shehu18cc7b44be9d
diff --git a/apps/server/src/api/client/routes/workspaces/files/file-upload-tus.ts b/apps/server/src/api/client/routes/workspaces/files/file-upload-tus.ts
index ed261b6c..3cb8538e 100644
--- a/apps/server/src/api/client/routes/workspaces/files/file-upload-tus.ts
+++ b/apps/server/src/api/client/routes/workspaces/files/file-upload-tus.ts
@@ -132,7 +132,7 @@ export const fileUploadTusRoute: FastifyPluginCallbackZod = (
const userStorageUsed = await fetchCounter(
database,
- `${user.id}.storage.used`
+ `${user.id}.uploads.size`
);
if (userStorageUsed >= BigInt(user.storage_limit)) {
@@ -149,7 +149,7 @@ export const fileUploadTusRoute: FastifyPluginCallbackZod = (
if (workspace.storage_limit) {
const workspaceStorageUsed = await fetchCounter(
database,
- `${workspaceId}.storage.used`
+ `${workspaceId}.uploads.size`
);
if (workspaceStorageUsed >= BigInt(workspace.storage_limit)) {
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
deleted file mode 100644
index ab881e05..00000000
--- a/apps/server/src/api/client/routes/workspaces/files/file-upload.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-import { FastifyPluginCallbackZod } from 'fastify-type-provider-zod';
-import { z } from 'zod/v4';
-
-import {
- ApiErrorCode,
- FileStatus,
- apiErrorOutputSchema,
- generateId,
- IdType,
-} from '@colanode/core';
-import { database } from '@colanode/server/data/database';
-import { fetchCounter } from '@colanode/server/lib/counters';
-import { buildFilePath } from '@colanode/server/lib/files';
-import { mapNode, updateNode } from '@colanode/server/lib/nodes';
-import { storage } from '@colanode/server/lib/storage';
-
-export const fileUploadRoute: FastifyPluginCallbackZod = (
- instance,
- _,
- done
-) => {
- instance.removeAllContentTypeParsers();
-
- instance.addContentTypeParser('*', (_request, _payload, done) => {
- done(null);
- });
-
- instance.route({
- method: 'PUT',
- url: '/:fileId',
- schema: {
- params: z.object({
- workspaceId: z.string(),
- fileId: z.string(),
- }),
- response: {
- 200: z.object({
- uploadId: z.string(),
- }),
- 400: apiErrorOutputSchema,
- 403: apiErrorOutputSchema,
- 404: apiErrorOutputSchema,
- 500: apiErrorOutputSchema,
- },
- },
- bodyLimit: 1024 * 1024 * 100, // 100MB
- handler: async (request, reply) => {
- 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()
- .where('id', '=', fileId)
- .executeTakeFirst();
-
- if (!node) {
- return reply.code(404).send({
- code: ApiErrorCode.FileNotFound,
- message: 'File not found.',
- });
- }
-
- if (node.created_by !== user.id) {
- return reply.code(403).send({
- code: ApiErrorCode.FileOwnerMismatch,
- message: 'You do not have permission to upload to this file.',
- });
- }
-
- const file = mapNode(node);
- if (file.type !== 'file') {
- return reply.code(400).send({
- code: ApiErrorCode.FileNotFound,
- message: 'This node is not a file.',
- });
- }
-
- const upload = await database
- .selectFrom('uploads')
- .selectAll()
- .where('file_id', '=', fileId)
- .executeTakeFirst();
-
- if (upload && upload.uploaded_at) {
- return reply.code(400).send({
- code: ApiErrorCode.FileAlreadyUploaded,
- message: 'This file is already uploaded.',
- });
- }
-
- 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 (userStorageUsed >= BigInt(user.storage_limit)) {
- return reply.code(400).send({
- 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;
- try {
- await storage.upload(
- path,
- stream,
- file.attributes.mimeType,
- BigInt(file.attributes.size)
- );
- } catch (error) {
- console.error(error);
- return reply.code(500).send({
- code: ApiErrorCode.FileUploadInitFailed,
- message: 'Failed to upload file to storage.',
- });
- }
-
- const result = await updateNode({
- nodeId: fileId,
- userId: request.user.id,
- workspaceId: workspaceId,
- updater(attributes) {
- if (attributes.type !== 'file') {
- throw new Error('Node is not a file');
- }
- attributes.status = FileStatus.Ready;
- return attributes;
- },
- });
-
- if (result === null) {
- return reply.code(500).send({
- code: ApiErrorCode.FileUploadCompleteFailed,
- message: 'Failed to complete file upload.',
- });
- }
-
- const upsertedUpload = await database
- .insertInto('uploads')
- .returningAll()
- .values({
- file_id: fileId,
- upload_id: generateId(IdType.Upload),
- workspace_id: workspaceId,
- root_id: node.root_id,
- mime_type: file.attributes.mimeType,
- size: file.attributes.size,
- path: path,
- version_id: file.attributes.version,
- created_at: new Date(),
- created_by: request.user.id,
- uploaded_at: new Date(),
- })
- .onConflict((b) =>
- b.columns(['file_id']).doUpdateSet({
- uploaded_at: new Date(),
- })
- )
- .executeTakeFirst();
-
- if (!upsertedUpload) {
- return reply.code(500).send({
- code: ApiErrorCode.FileUploadCompleteFailed,
- message: 'Failed to record file upload.',
- });
- }
-
- return {
- uploadId: upsertedUpload.upload_id,
- };
- },
- });
-
- done();
-};
diff --git a/apps/server/src/api/client/routes/workspaces/files/index.ts b/apps/server/src/api/client/routes/workspaces/files/index.ts
index d49d9b12..b9cef6c9 100644
--- a/apps/server/src/api/client/routes/workspaces/files/index.ts
+++ b/apps/server/src/api/client/routes/workspaces/files/index.ts
@@ -1,11 +1,9 @@
import { FastifyPluginCallback } from 'fastify';
import { fileDownloadRoute } from './file-download';
-import { fileUploadRoute } from './file-upload';
import { fileUploadTusRoute } from './file-upload-tus';
export const fileRoutes: FastifyPluginCallback = (instance, _, done) => {
- instance.register(fileUploadRoute);
instance.register(fileUploadTusRoute);
instance.register(fileDownloadRoute);
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
index b1a427d0..fc4e5556 100644
--- 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
@@ -1,28 +1,54 @@
import { FastifyPluginCallbackZod } from 'fastify-type-provider-zod';
-import { sql } from 'kysely';
import { z } from 'zod/v4';
import {
ApiErrorCode,
apiErrorOutputSchema,
- compareString,
- extractFileSubtype,
- FileSubtype,
+ WorkspaceStorageGetOutput,
workspaceStorageGetOutputSchema,
} from '@colanode/core';
import { database } from '@colanode/server/data/database';
-interface WorkspaceStorageAggregateRow {
- mime_type: string;
- total_size: string;
-}
+const buildCounterKeys = (id: string) => [
+ `${id}.uploads.size`,
+ `${id}.uploads.count`,
+ `${id}.nodes.size`,
+ `${id}.nodes.count`,
+ `${id}.documents.size`,
+ `${id}.documents.count`,
+];
-interface UserStorageRow {
- id: string;
- storage_limit: string;
- max_file_size: string;
- storage_used: string | null;
-}
+const buildUsage = (id: string, counters: Record<string, string>) => ({
+ uploads: {
+ size: counters[`${id}.uploads.size`] ?? '0',
+ count: counters[`${id}.uploads.count`] ?? '0',
+ },
+ nodes: {
+ size: counters[`${id}.nodes.size`] ?? '0',
+ count: counters[`${id}.nodes.count`] ?? '0',
+ },
+ documents: {
+ size: counters[`${id}.documents.size`] ?? '0',
+ count: counters[`${id}.documents.count`] ?? '0',
+ },
+});
+
+const fetchCounterMap = async (keys: string[]) => {
+ if (keys.length === 0) {
+ return {};
+ }
+
+ const counters = await database
+ .selectFrom('counters')
+ .select(['key', 'value'])
+ .where('key', 'in', keys)
+ .execute();
+
+ return counters.reduce<Record<string, string>>((acc, counter) => {
+ acc[counter.key] = counter.value ?? '0';
+ return acc;
+ }, {});
+};
export const workspaceStorageGetRoute: FastifyPluginCallbackZod = (
instance,
@@ -46,17 +72,11 @@ export const workspaceStorageGetRoute: FastifyPluginCallbackZod = (
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 isWorkspaceAdmin = user.role === 'owner' || user.role === 'admin';
const workspace = await database
.selectFrom('workspaces')
- .selectAll()
+ .select(['id', 'storage_limit', 'max_file_size'])
.where('id', '=', workspaceId)
.executeTakeFirstOrThrow();
@@ -67,71 +87,32 @@ export const workspaceStorageGetRoute: FastifyPluginCallbackZod = (
});
}
- 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,
- u.max_file_size,
- 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 userCounterKeys = buildCounterKeys(user.id);
+ const [userCounterMap, workspaceCounterMap] = await Promise.all([
+ fetchCounterMap(userCounterKeys),
+ isWorkspaceAdmin
+ ? fetchCounterMap(buildCounterKeys(workspaceId))
+ : Promise.resolve<Record<string, string>>({}),
]);
- 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,
- storageUsed: 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) => ({
+ const output: WorkspaceStorageGetOutput = {
+ user: {
id: user.id,
- storageUsed: user.storage_used ?? '0',
storageLimit: user.storage_limit,
maxFileSize: user.max_file_size,
- }));
-
- return {
- storageLimit: workspace.storage_limit,
- storageUsed: totalUsed.toString(),
- subtypes: subtypes,
- users: users,
+ usage: buildUsage(user.id, userCounterMap),
+ },
};
+
+ if (isWorkspaceAdmin) {
+ output.workspace = {
+ storageLimit: workspace.storage_limit,
+ maxFileSize: workspace.max_file_size,
+ usage: buildUsage(workspaceId, workspaceCounterMap),
+ };
+ }
+
+ return output;
},
});
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 48932244..482d666b 100644
--- a/apps/server/src/api/client/routes/workspaces/users/index.ts
+++ b/apps/server/src/api/client/routes/workspaces/users/index.ts
@@ -3,11 +3,13 @@ import { FastifyPluginCallback } from 'fastify';
import { userRoleUpdateRoute } from './user-role-update';
import { userStorageUpdateRoute } from './user-storage-update';
import { usersCreateRoute } from './users-create';
+import { usersStorageGetRoute } from './users-storage-get';
export const userRoutes: FastifyPluginCallback = (instance, _, done) => {
instance.register(usersCreateRoute);
instance.register(userRoleUpdateRoute);
instance.register(userStorageUpdateRoute);
+ instance.register(usersStorageGetRoute);
done();
};
diff --git a/apps/server/src/api/client/routes/workspaces/users/users-storage-get.ts b/apps/server/src/api/client/routes/workspaces/users/users-storage-get.ts
new file mode 100644
index 00000000..c5e6ea5a
--- /dev/null
+++ b/apps/server/src/api/client/routes/workspaces/users/users-storage-get.ts
@@ -0,0 +1,112 @@
+import { FastifyPluginCallbackZod } from 'fastify-type-provider-zod';
+import { z } from 'zod/v4';
+
+import {
+ ApiErrorCode,
+ apiErrorOutputSchema,
+ workspaceStorageUsersGetOutputSchema,
+} from '@colanode/core';
+import { database } from '@colanode/server/data/database';
+
+const querySchema = z.object({
+ limit: z.coerce.number().int().min(1).max(100).default(50),
+ after: z.string().optional(),
+});
+
+export const usersStorageGetRoute: FastifyPluginCallbackZod = (
+ instance,
+ _,
+ done
+) => {
+ instance.route({
+ method: 'GET',
+ url: '/storage',
+ schema: {
+ params: z.object({
+ workspaceId: z.string(),
+ }),
+ querystring: querySchema,
+ response: {
+ 200: workspaceStorageUsersGetOutputSchema,
+ 400: apiErrorOutputSchema,
+ 403: apiErrorOutputSchema,
+ },
+ },
+ handler: async (request, reply) => {
+ const workspaceId = request.params.workspaceId;
+ const { limit, after } = request.query;
+ 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 user storage.',
+ });
+ }
+
+ let usersQuery = database
+ .selectFrom('users')
+ .select(['id', 'storage_limit', 'max_file_size'])
+ .where('workspace_id', '=', workspaceId);
+
+ if (after) {
+ usersQuery = usersQuery.where('id', '>', after);
+ }
+
+ const userRows = await usersQuery.orderBy('id').limit(limit).execute();
+
+ const userIds = userRows.map((row) => row.id);
+
+ let counterMap: Record<string, string> = {};
+ if (userIds.length > 0) {
+ const counterKeys = userIds.flatMap((id) => [
+ `${id}.uploads.size`,
+ `${id}.uploads.count`,
+ `${id}.nodes.size`,
+ `${id}.nodes.count`,
+ `${id}.documents.size`,
+ `${id}.documents.count`,
+ ]);
+
+ const counters = await database
+ .selectFrom('counters')
+ .select(['key', 'value'])
+ .where('key', 'in', counterKeys)
+ .execute();
+
+ counterMap = counters.reduce<Record<string, string>>((acc, counter) => {
+ acc[counter.key] = counter.value ?? '0';
+ return acc;
+ }, {});
+ }
+
+ const getCounterValue = (key: string) => counterMap[key] ?? '0';
+
+ const users = userRows.map((row) => ({
+ id: row.id,
+ storageLimit: row.storage_limit,
+ maxFileSize: row.max_file_size,
+ usage: {
+ uploads: {
+ size: getCounterValue(`${row.id}.uploads.size`),
+ count: getCounterValue(`${row.id}.uploads.count`),
+ },
+ nodes: {
+ size: getCounterValue(`${row.id}.nodes.size`),
+ count: getCounterValue(`${row.id}.nodes.count`),
+ },
+ documents: {
+ size: getCounterValue(`${row.id}.documents.size`),
+ count: getCounterValue(`${row.id}.documents.count`),
+ },
+ },
+ }));
+
+ return {
+ users,
+ };
+ },
+ });
+
+ done();
+};
diff --git a/apps/server/src/data/migrations/00032-create-upload-usage-counter-triggers.ts b/apps/server/src/data/migrations/00032-create-upload-usage-counter-triggers.ts
new file mode 100644
index 00000000..28b9362d
--- /dev/null
+++ b/apps/server/src/data/migrations/00032-create-upload-usage-counter-triggers.ts
@@ -0,0 +1,243 @@
+import { Migration, sql } from 'kysely';
+
+export const createUploadUsageCounterTriggers: Migration = {
+ up: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_increment_workspace_storage_counter ON uploads;
+ DROP TRIGGER IF EXISTS trg_decrement_workspace_storage_counter ON uploads;
+ DROP TRIGGER IF EXISTS trg_update_workspace_storage_counter ON uploads;
+ DROP FUNCTION IF EXISTS fn_increment_workspace_storage_counter();
+ DROP FUNCTION IF EXISTS fn_decrement_workspace_storage_counter();
+ DROP FUNCTION IF EXISTS fn_update_workspace_storage_counter();
+ DROP TRIGGER IF EXISTS trg_increment_user_storage_counter ON uploads;
+ DROP TRIGGER IF EXISTS trg_decrement_user_storage_counter ON uploads;
+ DROP TRIGGER IF EXISTS trg_update_user_storage_counter ON uploads;
+ DROP FUNCTION IF EXISTS fn_increment_user_storage_counter();
+ DROP FUNCTION IF EXISTS fn_decrement_user_storage_counter();
+ DROP FUNCTION IF EXISTS fn_update_user_storage_counter();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.storage.used')
+ .execute();
+
+ const now = new Date();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('uploads')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('workspace_id'),
+ eb.cast(eb.val('.uploads.size'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.sum('size').as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('workspace_id')
+ )
+ .execute();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('uploads')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('workspace_id'),
+ eb.cast(eb.val('.uploads.count'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.countAll().as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('workspace_id')
+ )
+ .execute();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('uploads')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('created_by'),
+ eb.cast(eb.val('.uploads.size'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.sum('size').as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('created_by')
+ )
+ .execute();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('uploads')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('created_by'),
+ eb.cast(eb.val('.uploads.count'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.countAll().as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('created_by')
+ )
+ .execute();
+
+ await sql`
+ CREATE OR REPLACE FUNCTION fn_update_upload_usage_counters() RETURNS TRIGGER AS $$
+ DECLARE
+ workspace_size_key text;
+ workspace_count_key text;
+ user_size_key text;
+ user_count_key text;
+ old_workspace_size_key text;
+ old_workspace_count_key text;
+ old_user_size_key text;
+ old_user_count_key text;
+ size_difference bigint;
+ BEGIN
+ IF TG_OP = 'INSERT' THEN
+ workspace_size_key := CONCAT(NEW.workspace_id, '.uploads.size');
+ workspace_count_key := CONCAT(NEW.workspace_id, '.uploads.count');
+ user_size_key := CONCAT(NEW.created_by, '.uploads.size');
+ user_count_key := CONCAT(NEW.created_by, '.uploads.count');
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (workspace_size_key, NEW.size, NOW(), NOW()),
+ (workspace_count_key, 1, NOW(), NOW()),
+ (user_size_key, NEW.size, NOW(), NOW()),
+ (user_count_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+
+ RETURN NEW;
+ ELSIF TG_OP = 'DELETE' THEN
+ workspace_size_key := CONCAT(OLD.workspace_id, '.uploads.size');
+ workspace_count_key := CONCAT(OLD.workspace_id, '.uploads.count');
+ user_size_key := CONCAT(OLD.created_by, '.uploads.size');
+ user_count_key := CONCAT(OLD.created_by, '.uploads.count');
+
+ UPDATE counters
+ SET value = GREATEST(0, value - CASE
+ WHEN key = workspace_size_key THEN OLD.size
+ WHEN key = workspace_count_key THEN 1
+ WHEN key = user_size_key THEN OLD.size
+ WHEN key = user_count_key THEN 1
+ END),
+ updated_at = NOW()
+ WHERE key IN (workspace_size_key, workspace_count_key, user_size_key, user_count_key);
+
+ RETURN OLD;
+ ELSE
+ workspace_size_key := CONCAT(NEW.workspace_id, '.uploads.size');
+ workspace_count_key := CONCAT(NEW.workspace_id, '.uploads.count');
+ user_size_key := CONCAT(NEW.created_by, '.uploads.size');
+ user_count_key := CONCAT(NEW.created_by, '.uploads.count');
+
+ old_workspace_size_key := CONCAT(OLD.workspace_id, '.uploads.size');
+ old_workspace_count_key := CONCAT(OLD.workspace_id, '.uploads.count');
+ old_user_size_key := CONCAT(OLD.created_by, '.uploads.size');
+ old_user_count_key := CONCAT(OLD.created_by, '.uploads.count');
+
+ IF OLD.workspace_id IS DISTINCT FROM NEW.workspace_id THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - CASE
+ WHEN key = old_workspace_size_key THEN OLD.size
+ WHEN key = old_workspace_count_key THEN 1
+ END),
+ updated_at = NOW()
+ WHERE key IN (old_workspace_size_key, old_workspace_count_key);
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (workspace_size_key, NEW.size, NOW(), NOW()),
+ (workspace_count_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+ ELSE
+ size_difference := NEW.size - OLD.size;
+ IF size_difference <> 0 THEN
+ UPDATE counters
+ SET value = GREATEST(0, value + size_difference),
+ updated_at = NOW()
+ WHERE key = workspace_size_key;
+ END IF;
+ END IF;
+
+ IF OLD.created_by IS DISTINCT FROM NEW.created_by THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - CASE
+ WHEN key = old_user_size_key THEN OLD.size
+ WHEN key = old_user_count_key THEN 1
+ END),
+ updated_at = NOW()
+ WHERE key IN (old_user_size_key, old_user_count_key);
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (user_size_key, NEW.size, NOW(), NOW()),
+ (user_count_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+ ELSE
+ size_difference := NEW.size - OLD.size;
+ IF size_difference <> 0 THEN
+ UPDATE counters
+ SET value = GREATEST(0, value + size_difference),
+ updated_at = NOW()
+ WHERE key = user_size_key;
+ END IF;
+ END IF;
+
+ RETURN NEW;
+ END IF;
+ END;
+ $$ LANGUAGE plpgsql;
+
+ DROP TRIGGER IF EXISTS trg_upload_usage_counters ON uploads;
+
+ CREATE TRIGGER trg_upload_usage_counters
+ AFTER INSERT OR UPDATE OR DELETE ON uploads
+ FOR EACH ROW
+ EXECUTE FUNCTION fn_update_upload_usage_counters();
+ `.execute(db);
+ },
+ down: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_upload_usage_counters ON uploads;
+ DROP FUNCTION IF EXISTS fn_update_upload_usage_counters();
+ `.execute(db);
+ },
+};
diff --git a/apps/server/src/data/migrations/00033-create-node-counter-triggers.ts b/apps/server/src/data/migrations/00033-create-node-counter-triggers.ts
new file mode 100644
index 00000000..24595872
--- /dev/null
+++ b/apps/server/src/data/migrations/00033-create-node-counter-triggers.ts
@@ -0,0 +1,152 @@
+import { Migration, sql } from 'kysely';
+
+export const createNodeCounterTriggers: Migration = {
+ up: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_increment_workspace_node_counter ON nodes;
+ DROP TRIGGER IF EXISTS trg_decrement_workspace_node_counter ON nodes;
+ DROP FUNCTION IF EXISTS fn_increment_workspace_node_counter();
+ DROP FUNCTION IF EXISTS fn_decrement_workspace_node_counter();
+ DROP TRIGGER IF EXISTS trg_increment_user_node_counter ON nodes;
+ DROP TRIGGER IF EXISTS trg_decrement_user_node_counter ON nodes;
+ DROP FUNCTION IF EXISTS fn_increment_user_node_counter();
+ DROP FUNCTION IF EXISTS fn_decrement_user_node_counter();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.nodes.count')
+ .execute();
+
+ const now = new Date();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('nodes')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('workspace_id'),
+ eb.cast(eb.val('.nodes.count'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.count('id').as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('workspace_id')
+ )
+ .execute();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('nodes')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('created_by'),
+ eb.cast(eb.val('.nodes.count'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.count('id').as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('created_by')
+ )
+ .execute();
+
+ await sql`
+ CREATE OR REPLACE FUNCTION fn_update_node_counters() RETURNS TRIGGER AS $$
+ DECLARE
+ workspace_key text;
+ user_key text;
+ old_workspace_key text;
+ old_user_key text;
+ BEGIN
+ IF TG_OP = 'INSERT' THEN
+ workspace_key := CONCAT(NEW.workspace_id, '.nodes.count');
+ user_key := CONCAT(NEW.created_by, '.nodes.count');
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (workspace_key, 1, NOW(), NOW()),
+ (user_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + 1,
+ updated_at = NOW();
+
+ RETURN NEW;
+ ELSIF TG_OP = 'DELETE' THEN
+ workspace_key := CONCAT(OLD.workspace_id, '.nodes.count');
+ user_key := CONCAT(OLD.created_by, '.nodes.count');
+
+ UPDATE counters
+ SET value = GREATEST(0, value - 1), updated_at = NOW()
+ WHERE key IN (workspace_key, user_key);
+
+ RETURN OLD;
+ ELSE
+ workspace_key := CONCAT(NEW.workspace_id, '.nodes.count');
+ user_key := CONCAT(NEW.created_by, '.nodes.count');
+ old_workspace_key := CONCAT(OLD.workspace_id, '.nodes.count');
+ old_user_key := CONCAT(OLD.created_by, '.nodes.count');
+
+ IF OLD.workspace_id IS DISTINCT FROM NEW.workspace_id THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - 1), updated_at = NOW()
+ WHERE key = old_workspace_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (workspace_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + 1,
+ updated_at = NOW();
+ END IF;
+
+ IF OLD.created_by IS DISTINCT FROM NEW.created_by THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - 1), updated_at = NOW()
+ WHERE key = old_user_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (user_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + 1,
+ updated_at = NOW();
+ END IF;
+
+ RETURN NEW;
+ END IF;
+ END;
+ $$ LANGUAGE plpgsql;
+
+ DROP TRIGGER IF EXISTS trg_node_counters ON nodes;
+
+ CREATE TRIGGER trg_node_counters
+ AFTER INSERT OR UPDATE OR DELETE ON nodes
+ FOR EACH ROW
+ EXECUTE FUNCTION fn_update_node_counters();
+ `.execute(db);
+ },
+ down: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_node_counters ON nodes;
+ DROP FUNCTION IF EXISTS fn_update_node_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.nodes.count')
+ .execute();
+ },
+};
diff --git a/apps/server/src/data/migrations/00034-create-document-counter-triggers.ts b/apps/server/src/data/migrations/00034-create-document-counter-triggers.ts
new file mode 100644
index 00000000..d848ced3
--- /dev/null
+++ b/apps/server/src/data/migrations/00034-create-document-counter-triggers.ts
@@ -0,0 +1,146 @@
+import { Migration, sql } from 'kysely';
+
+export const createDocumentCounterTriggers: Migration = {
+ up: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_document_counters ON documents;
+ DROP FUNCTION IF EXISTS fn_update_document_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.documents.count')
+ .execute();
+
+ const now = new Date();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('documents')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('workspace_id'),
+ eb.cast(eb.val('.documents.count'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.count('id').as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('workspace_id')
+ )
+ .execute();
+
+ await db
+ .insertInto('counters')
+ .columns(['key', 'value', 'created_at', 'updated_at'])
+ .expression((eb) =>
+ eb
+ .selectFrom('documents')
+ .select([
+ eb
+ .fn('concat', [
+ eb.ref('created_by'),
+ eb.cast(eb.val('.documents.count'), 'varchar'),
+ ])
+ .as('key'),
+ eb.fn.count('id').as('value'),
+ eb.val(now).as('created_at'),
+ eb.val(now).as('updated_at'),
+ ])
+ .groupBy('created_by')
+ )
+ .execute();
+
+ await sql`
+ CREATE OR REPLACE FUNCTION fn_update_document_counters() RETURNS TRIGGER AS $$
+ DECLARE
+ workspace_key text;
+ user_key text;
+ old_workspace_key text;
+ old_user_key text;
+ BEGIN
+ IF TG_OP = 'INSERT' THEN
+ workspace_key := CONCAT(NEW.workspace_id, '.documents.count');
+ user_key := CONCAT(NEW.created_by, '.documents.count');
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (workspace_key, 1, NOW(), NOW()),
+ (user_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + 1,
+ updated_at = NOW();
+
+ RETURN NEW;
+ ELSIF TG_OP = 'DELETE' THEN
+ workspace_key := CONCAT(OLD.workspace_id, '.documents.count');
+ user_key := CONCAT(OLD.created_by, '.documents.count');
+
+ UPDATE counters
+ SET value = GREATEST(0, value - 1), updated_at = NOW()
+ WHERE key IN (workspace_key, user_key);
+
+ RETURN OLD;
+ ELSE
+ workspace_key := CONCAT(NEW.workspace_id, '.documents.count');
+ user_key := CONCAT(NEW.created_by, '.documents.count');
+ old_workspace_key := CONCAT(OLD.workspace_id, '.documents.count');
+ old_user_key := CONCAT(OLD.created_by, '.documents.count');
+
+ IF OLD.workspace_id IS DISTINCT FROM NEW.workspace_id THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - 1), updated_at = NOW()
+ WHERE key = old_workspace_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (workspace_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + 1,
+ updated_at = NOW();
+ END IF;
+
+ IF OLD.created_by IS DISTINCT FROM NEW.created_by THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - 1), updated_at = NOW()
+ WHERE key = old_user_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (user_key, 1, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + 1,
+ updated_at = NOW();
+ END IF;
+
+ RETURN NEW;
+ END IF;
+ END;
+ $$ LANGUAGE plpgsql;
+
+ DROP TRIGGER IF EXISTS trg_document_counters ON documents;
+
+ CREATE TRIGGER trg_document_counters
+ AFTER INSERT OR UPDATE OR DELETE ON documents
+ FOR EACH ROW
+ EXECUTE FUNCTION fn_update_document_counters();
+ `.execute(db);
+ },
+ down: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_document_counters ON documents;
+ DROP FUNCTION IF EXISTS fn_update_document_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.documents.count')
+ .execute();
+ },
+};
diff --git a/apps/server/src/data/migrations/00035-create-node-update-size-counter-triggers.ts b/apps/server/src/data/migrations/00035-create-node-update-size-counter-triggers.ts
new file mode 100644
index 00000000..0ff4bbbc
--- /dev/null
+++ b/apps/server/src/data/migrations/00035-create-node-update-size-counter-triggers.ts
@@ -0,0 +1,144 @@
+import { Migration, sql } from 'kysely';
+
+export const createNodeUpdateSizeCounterTriggers: Migration = {
+ up: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_node_update_size_counters ON node_updates;
+ DROP FUNCTION IF EXISTS fn_update_node_update_size_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.nodes.size')
+ .execute();
+
+ await sql`
+ INSERT INTO counters (key, value, created_at, updated_at)
+ SELECT
+ CONCAT(workspace_id, '.nodes.size') AS key,
+ COALESCE(SUM(octet_length(data)), 0) AS value,
+ NOW(),
+ NOW()
+ FROM node_updates
+ GROUP BY workspace_id;
+ `.execute(db);
+
+ await sql`
+ INSERT INTO counters (key, value, created_at, updated_at)
+ SELECT
+ CONCAT(created_by, '.nodes.size') AS key,
+ COALESCE(SUM(octet_length(data)), 0) AS value,
+ NOW(),
+ NOW()
+ FROM node_updates
+ GROUP BY created_by;
+ `.execute(db);
+
+ await sql`
+ CREATE OR REPLACE FUNCTION fn_update_node_update_size_counters() RETURNS TRIGGER AS $$
+ DECLARE
+ workspace_key text;
+ user_key text;
+ old_workspace_key text;
+ old_user_key text;
+ new_size bigint := 0;
+ old_size bigint := 0;
+ size_difference bigint := 0;
+ BEGIN
+ IF TG_OP = 'INSERT' THEN
+ workspace_key := CONCAT(NEW.workspace_id, '.nodes.size');
+ user_key := CONCAT(NEW.created_by, '.nodes.size');
+ new_size := COALESCE(octet_length(NEW.data), 0);
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (workspace_key, new_size, NOW(), NOW()),
+ (user_key, new_size, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+
+ RETURN NEW;
+ ELSIF TG_OP = 'DELETE' THEN
+ workspace_key := CONCAT(OLD.workspace_id, '.nodes.size');
+ user_key := CONCAT(OLD.created_by, '.nodes.size');
+ old_size := COALESCE(octet_length(OLD.data), 0);
+
+ UPDATE counters
+ SET value = GREATEST(0, value - CASE
+ WHEN key = workspace_key THEN old_size
+ WHEN key = user_key THEN old_size
+ END),
+ updated_at = NOW()
+ WHERE key IN (workspace_key, user_key);
+
+ RETURN OLD;
+ ELSE
+ workspace_key := CONCAT(NEW.workspace_id, '.nodes.size');
+ user_key := CONCAT(NEW.created_by, '.nodes.size');
+ old_workspace_key := CONCAT(OLD.workspace_id, '.nodes.size');
+ old_user_key := CONCAT(OLD.created_by, '.nodes.size');
+ new_size := COALESCE(octet_length(NEW.data), 0);
+ old_size := COALESCE(octet_length(OLD.data), 0);
+ size_difference := new_size - old_size;
+
+ IF OLD.workspace_id IS DISTINCT FROM NEW.workspace_id THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - old_size), updated_at = NOW()
+ WHERE key = old_workspace_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (workspace_key, new_size, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+ ELSIF size_difference <> 0 THEN
+ UPDATE counters
+ SET value = GREATEST(0, value + size_difference), updated_at = NOW()
+ WHERE key = workspace_key;
+ END IF;
+
+ IF OLD.created_by IS DISTINCT FROM NEW.created_by THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - old_size), updated_at = NOW()
+ WHERE key = old_user_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (user_key, new_size, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+ ELSIF size_difference <> 0 THEN
+ UPDATE counters
+ SET value = GREATEST(0, value + size_difference), updated_at = NOW()
+ WHERE key = user_key;
+ END IF;
+
+ RETURN NEW;
+ END IF;
+ END;
+ $$ LANGUAGE plpgsql;
+
+ DROP TRIGGER IF EXISTS trg_node_update_size_counters ON node_updates;
+
+ CREATE TRIGGER trg_node_update_size_counters
+ AFTER INSERT OR UPDATE OR DELETE ON node_updates
+ FOR EACH ROW
+ EXECUTE FUNCTION fn_update_node_update_size_counters();
+ `.execute(db);
+ },
+ down: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_node_update_size_counters ON node_updates;
+ DROP FUNCTION IF EXISTS fn_update_node_update_size_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.nodes.size')
+ .execute();
+ },
+};
diff --git a/apps/server/src/data/migrations/00036-create-document-update-size-counter-triggers.ts b/apps/server/src/data/migrations/00036-create-document-update-size-counter-triggers.ts
new file mode 100644
index 00000000..a8a0fec6
--- /dev/null
+++ b/apps/server/src/data/migrations/00036-create-document-update-size-counter-triggers.ts
@@ -0,0 +1,144 @@
+import { Migration, sql } from 'kysely';
+
+export const createDocumentUpdateSizeCounterTriggers: Migration = {
+ up: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_document_update_size_counters ON document_updates;
+ DROP FUNCTION IF EXISTS fn_update_document_update_size_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.documents.size')
+ .execute();
+
+ await sql`
+ INSERT INTO counters (key, value, created_at, updated_at)
+ SELECT
+ CONCAT(workspace_id, '.documents.size') AS key,
+ COALESCE(SUM(octet_length(data)), 0) AS value,
+ NOW(),
+ NOW()
+ FROM document_updates
+ GROUP BY workspace_id;
+ `.execute(db);
+
+ await sql`
+ INSERT INTO counters (key, value, created_at, updated_at)
+ SELECT
+ CONCAT(created_by, '.documents.size') AS key,
+ COALESCE(SUM(octet_length(data)), 0) AS value,
+ NOW(),
+ NOW()
+ FROM document_updates
+ GROUP BY created_by;
+ `.execute(db);
+
+ await sql`
+ CREATE OR REPLACE FUNCTION fn_update_document_update_size_counters() RETURNS TRIGGER AS $$
+ DECLARE
+ workspace_key text;
+ user_key text;
+ old_workspace_key text;
+ old_user_key text;
+ new_size bigint := 0;
+ old_size bigint := 0;
+ size_difference bigint := 0;
+ BEGIN
+ IF TG_OP = 'INSERT' THEN
+ workspace_key := CONCAT(NEW.workspace_id, '.documents.size');
+ user_key := CONCAT(NEW.created_by, '.documents.size');
+ new_size := COALESCE(octet_length(NEW.data), 0);
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES
+ (workspace_key, new_size, NOW(), NOW()),
+ (user_key, new_size, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+
+ RETURN NEW;
+ ELSIF TG_OP = 'DELETE' THEN
+ workspace_key := CONCAT(OLD.workspace_id, '.documents.size');
+ user_key := CONCAT(OLD.created_by, '.documents.size');
+ old_size := COALESCE(octet_length(OLD.data), 0);
+
+ UPDATE counters
+ SET value = GREATEST(0, value - CASE
+ WHEN key = workspace_key THEN old_size
+ WHEN key = user_key THEN old_size
+ END),
+ updated_at = NOW()
+ WHERE key IN (workspace_key, user_key);
+
+ RETURN OLD;
+ ELSE
+ workspace_key := CONCAT(NEW.workspace_id, '.documents.size');
+ user_key := CONCAT(NEW.created_by, '.documents.size');
+ old_workspace_key := CONCAT(OLD.workspace_id, '.documents.size');
+ old_user_key := CONCAT(OLD.created_by, '.documents.size');
+ new_size := COALESCE(octet_length(NEW.data), 0);
+ old_size := COALESCE(octet_length(OLD.data), 0);
+ size_difference := new_size - old_size;
+
+ IF OLD.workspace_id IS DISTINCT FROM NEW.workspace_id THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - old_size), updated_at = NOW()
+ WHERE key = old_workspace_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (workspace_key, new_size, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+ ELSIF size_difference <> 0 THEN
+ UPDATE counters
+ SET value = GREATEST(0, value + size_difference), updated_at = NOW()
+ WHERE key = workspace_key;
+ END IF;
+
+ IF OLD.created_by IS DISTINCT FROM NEW.created_by THEN
+ UPDATE counters
+ SET value = GREATEST(0, value - old_size), updated_at = NOW()
+ WHERE key = old_user_key;
+
+ INSERT INTO counters (key, value, created_at, updated_at)
+ VALUES (user_key, new_size, NOW(), NOW())
+ ON CONFLICT (key)
+ DO UPDATE SET
+ value = counters.value + EXCLUDED.value,
+ updated_at = NOW();
+ ELSIF size_difference <> 0 THEN
+ UPDATE counters
+ SET value = GREATEST(0, value + size_difference), updated_at = NOW()
+ WHERE key = user_key;
+ END IF;
+
+ RETURN NEW;
+ END IF;
+ END;
+ $$ LANGUAGE plpgsql;
+
+ DROP TRIGGER IF EXISTS trg_document_update_size_counters ON document_updates;
+
+ CREATE TRIGGER trg_document_update_size_counters
+ AFTER INSERT OR UPDATE OR DELETE ON document_updates
+ FOR EACH ROW
+ EXECUTE FUNCTION fn_update_document_update_size_counters();
+ `.execute(db);
+ },
+ down: async (db) => {
+ await sql`
+ DROP TRIGGER IF EXISTS trg_document_update_size_counters ON document_updates;
+ DROP FUNCTION IF EXISTS fn_update_document_update_size_counters();
+ `.execute(db);
+
+ await db
+ .deleteFrom('counters')
+ .where('key', 'like', '%.documents.size')
+ .execute();
+ },
+};
diff --git a/apps/server/src/data/migrations/index.ts b/apps/server/src/data/migrations/index.ts
index c4733a00..05651f26 100644
--- a/apps/server/src/data/migrations/index.ts
+++ b/apps/server/src/data/migrations/index.ts
@@ -31,6 +31,11 @@ import { removeDocumentUpdateRevisionTrigger } from './00028-remove-document-upd
import { addWorkspaceStorageLimitColumns } from './00029-add-workspace-storage-limit-columns';
import { addWorkspaceIndexToUploads } from './00030-add-workspace-index-to-uploads';
import { addCreatedAtIndexToUploads } from './00031-add-created-at-index-to-uploads';
+import { createUploadUsageCounterTriggers } from './00032-create-upload-usage-counter-triggers';
+import { createNodeCounterTriggers } from './00033-create-node-counter-triggers';
+import { createDocumentCounterTriggers } from './00034-create-document-counter-triggers';
+import { createNodeUpdateSizeCounterTriggers } from './00035-create-node-update-size-counter-triggers';
+import { createDocumentUpdateSizeCounterTriggers } from './00036-create-document-update-size-counter-triggers';
export const databaseMigrations: Record<string, Migration> = {
'00001_create_accounts_table': createAccountsTable,
@@ -68,4 +73,11 @@ export const databaseMigrations: Record<string, Migration> = {
'00029_add_workspace_storage_limit_columns': addWorkspaceStorageLimitColumns,
'00030_add_workspace_index_to_uploads': addWorkspaceIndexToUploads,
'00031_add_created_at_index_to_uploads': addCreatedAtIndexToUploads,
+ '00032_create_upload_usage_counter_triggers': createUploadUsageCounterTriggers,
+ '00033_create_node_counter_triggers': createNodeCounterTriggers,
+ '00034_create_document_counter_triggers': createDocumentCounterTriggers,
+ '00035_create_node_update_size_counter_triggers':
+ createNodeUpdateSizeCounterTriggers,
+ '00036_create_document_update_size_counter_triggers':
+ createDocumentUpdateSizeCounterTriggers,
};
diff --git a/apps/server/src/lib/counters.ts b/apps/server/src/lib/counters.ts
index a5feabfe..cb1992ce 100644
--- a/apps/server/src/lib/counters.ts
+++ b/apps/server/src/lib/counters.ts
@@ -3,8 +3,12 @@ import { Kysely, Transaction } from 'kysely';
import { DatabaseSchema } from '@colanode/server/data/schema';
export type CounterKey =
- | `${string}.storage.used`
+ | `${string}.uploads.size`
+ | `${string}.uploads.count`
| `${string}.nodes.count`
+ | `${string}.nodes.size`
+ | `${string}.documents.count`
+ | `${string}.documents.size`
| `node.updates.merge.cursor`
| `document.updates.merge.cursor`;
diff --git a/packages/client/src/handlers/queries/index.ts b/packages/client/src/handlers/queries/index.ts
index 4932a59d..4b4e871e 100644
--- a/packages/client/src/handlers/queries/index.ts
+++ b/packages/client/src/handlers/queries/index.ts
@@ -45,6 +45,7 @@ import { UserSearchQueryHandler } from './users/user-search';
import { UserStorageGetQueryHandler } from './users/user-storage-get';
import { WorkspaceListQueryHandler } from './workspaces/workspace-list';
import { WorkspaceStorageGetQueryHandler } from './workspaces/workspace-storage-get';
+import { WorkspaceStorageUsersGetQueryHandler } from './workspaces/workspace-storage-users-get';
export type QueryHandlerMap = {
[K in keyof QueryMap]: QueryHandler<QueryMap[K]['input']>;
@@ -64,6 +65,8 @@ export const buildQueryHandlerMap = (app: AppService): QueryHandlerMap => {
'record.field.value.count': new RecordFieldValueCountQueryHandler(app),
'user.search': new UserSearchQueryHandler(app),
'workspace.list': new WorkspaceListQueryHandler(app),
+ 'workspace.storage.get': new WorkspaceStorageGetQueryHandler(app),
+ 'workspace.storage.users.get': new WorkspaceStorageUsersGetQueryHandler(app),
'user.list': new UserListQueryHandler(app),
'file.list': new FileListQueryHandler(app),
'emoji.list': new EmojiListQueryHandler(app),
@@ -87,7 +90,6 @@ export const buildQueryHandlerMap = (app: AppService): QueryHandlerMap => {
'document.get': new DocumentGetQueryHandler(app),
'document.state.get': new DocumentStateGetQueryHandler(app),
'document.updates.list': new DocumentUpdatesListQueryHandler(app),
- 'workspace.storage.get': new WorkspaceStorageGetQueryHandler(app),
'upload.list': new UploadListQueryHandler(app),
'download.list': new DownloadListQueryHandler(app),
'temp.file.list': new TempFileListQueryHandler(app),
diff --git a/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts b/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts
index 2336b75e..747e2689 100644
--- a/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts
+++ b/packages/client/src/handlers/queries/workspaces/workspace-storage-get.ts
@@ -1,81 +1,41 @@
import { WorkspaceQueryHandlerBase } from '@colanode/client/handlers/queries/workspace-query-handler-base';
-import {
- ChangeCheckResult,
- parseApiError,
- QueryHandler,
-} from '@colanode/client/lib';
+import { parseApiError } from '@colanode/client/lib/ky';
+import { ChangeCheckResult, QueryHandler } from '@colanode/client/lib/types';
import { QueryError, QueryErrorCode } from '@colanode/client/queries';
-import { WorkspaceStorageGetQueryInput } from '@colanode/client/queries/workspaces/workspace-storage-get';
+import {
+ WorkspaceStorageGetQueryInput,
+ WorkspaceStorageGetQueryOutput,
+} 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 = {
- storageLimit: '0',
- storageUsed: '0',
- subtypes: [],
- users: [],
-};
export class WorkspaceStorageGetQueryHandler
extends WorkspaceQueryHandlerBase
implements QueryHandler<WorkspaceStorageGetQueryInput>
{
- public async handleQuery(
+ async handleQuery(
input: WorkspaceStorageGetQueryInput
- ): Promise<WorkspaceStorageGetOutput> {
- return this.fetchWorkspaceStorage(input.userId);
- }
-
- public async checkForChanges(
- event: Event,
- input: WorkspaceStorageGetQueryInput,
- _: WorkspaceStorageGetOutput
- ): Promise<ChangeCheckResult<WorkspaceStorageGetQueryInput>> {
- if (
- event.type === 'workspace.created' &&
- event.workspace.userId === input.userId
- ) {
- const result = await this.fetchWorkspaceStorage(input.userId);
-
- return {
- hasChanges: true,
- result,
- };
- }
-
- if (
- event.type === 'workspace.deleted' &&
- event.workspace.userId === input.userId
- ) {
- return {
- hasChanges: true,
- result: EMPTY_STORAGE_OUTPUT,
- };
- }
-
- return {
- hasChanges: false,
- };
- }
-
- private async fetchWorkspaceStorage(
- userId: string
- ): Promise<WorkspaceStorageGetOutput> {
- const workspace = this.getWorkspace(userId);
- if (!workspace) {
- return EMPTY_STORAGE_OUTPUT;
- }
+ ): Promise<WorkspaceStorageGetQueryOutput> {
+ const workspace = this.getWorkspace(input.userId);
try {
- const response = await workspace.account.client
+ const output = await workspace.account.client
.get(`v1/workspaces/${workspace.workspaceId}/storage`)
- .json<WorkspaceStorageGetOutput>();
+ .json<WorkspaceStorageGetQueryOutput>();
- return response;
+ return output;
} catch (error) {
- console.error(error);
const apiError = await parseApiError(error);
throw new QueryError(QueryErrorCode.ApiError, apiError.message);
}
}
+
+ async checkForChanges(
+ _event: Event,
+ _input: WorkspaceStorageGetQueryInput,
+ _output: WorkspaceStorageGetQueryOutput
+ ): Promise<ChangeCheckResult<WorkspaceStorageGetQueryInput>> {
+ return {
+ hasChanges: false,
+ };
+ }
}
diff --git a/packages/client/src/handlers/queries/workspaces/workspace-storage-users-get.ts b/packages/client/src/handlers/queries/workspaces/workspace-storage-users-get.ts
new file mode 100644
index 00000000..e5111a9e
--- /dev/null
+++ b/packages/client/src/handlers/queries/workspaces/workspace-storage-users-get.ts
@@ -0,0 +1,55 @@
+import { WorkspaceQueryHandlerBase } from '@colanode/client/handlers/queries/workspace-query-handler-base';
+import { parseApiError } from '@colanode/client/lib/ky';
+import { ChangeCheckResult, QueryHandler } from '@colanode/client/lib/types';
+import { QueryError, QueryErrorCode } from '@colanode/client/queries';
+import {
+ WorkspaceStorageUsersGetQueryInput,
+ WorkspaceStorageUsersGetQueryOutput,
+} from '@colanode/client/queries/workspaces/workspace-storage-users-get';
+import { Event } from '@colanode/client/types/events';
+import { WorkspaceStorageUsersGetOutput } from '@colanode/core';
+
+const DEFAULT_LIMIT = 100;
+
+export class WorkspaceStorageUsersGetQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<WorkspaceStorageUsersGetQueryInput>
+{
+ async handleQuery(
+ input: WorkspaceStorageUsersGetQueryInput
+ ): Promise<WorkspaceStorageUsersGetQueryOutput> {
+ const workspace = this.getWorkspace(input.userId);
+ const limit = input.limit ?? DEFAULT_LIMIT;
+
+ try {
+ const searchParams = new URLSearchParams({
+ limit: Math.max(1, Math.min(100, limit)).toString(),
+ });
+
+ if (input.cursor) {
+ searchParams.set('after', input.cursor);
+ }
+
+ const response = await workspace.account.client
+ .get(`v1/workspaces/${workspace.workspaceId}/users/storage`, {
+ searchParams,
+ })
+ .json<WorkspaceStorageUsersGetOutput>();
+
+ return response;
+ } catch (error) {
+ const apiError = await parseApiError(error);
+ throw new QueryError(QueryErrorCode.ApiError, apiError.message);
+ }
+ }
+
+ async checkForChanges(
+ _event: Event,
+ _input: WorkspaceStorageUsersGetQueryInput,
+ _output: WorkspaceStorageUsersGetQueryOutput
+ ): Promise<ChangeCheckResult<WorkspaceStorageUsersGetQueryInput>> {
+ return {
+ hasChanges: false,
+ };
+ }
+}
diff --git a/packages/client/src/queries/index.ts b/packages/client/src/queries/index.ts
index 51e8cd74..1dfa62c6 100644
--- a/packages/client/src/queries/index.ts
+++ b/packages/client/src/queries/index.ts
@@ -33,9 +33,10 @@ export * from './users/user-list';
export * from './users/user-search';
export * from './users/user-storage-get';
export * from './workspaces/workspace-list';
+export * from './workspaces/workspace-storage-get';
+export * from './workspaces/workspace-storage-users-get';
export * from './avatars/avatar-get';
export * from './records/record-field-value-count';
-export * from './workspaces/workspace-storage-get';
export * from './files/upload-list';
export * from './files/download-list';
export * from './files/temp-file-list';
diff --git a/packages/client/src/queries/workspaces/workspace-storage-users-get.ts b/packages/client/src/queries/workspaces/workspace-storage-users-get.ts
new file mode 100644
index 00000000..a99db5aa
--- /dev/null
+++ b/packages/client/src/queries/workspaces/workspace-storage-users-get.ts
@@ -0,0 +1,21 @@
+import { WorkspaceStorageUser } from '@colanode/core';
+
+export type WorkspaceStorageUsersGetQueryInput = {
+ type: 'workspace.storage.users.get';
+ userId: string;
+ limit: number;
+ cursor?: string;
+};
+
+export type WorkspaceStorageUsersGetQueryOutput = {
+ users: WorkspaceStorageUser[];
+};
+
+declare module '@colanode/client/queries' {
+ interface QueryMap {
+ 'workspace.storage.users.get': {
+ input: WorkspaceStorageUsersGetQueryInput;
+ output: WorkspaceStorageUsersGetQueryOutput;
+ };
+ }
+}
diff --git a/packages/core/src/types/storage.ts b/packages/core/src/types/storage.ts
index bf45d96f..a07c0c7e 100644
--- a/packages/core/src/types/storage.ts
+++ b/packages/core/src/types/storage.ts
@@ -1,32 +1,50 @@
import { z } from 'zod/v4';
-import { fileSubtypeSchema } from '@colanode/core/types/files';
-
-export const workspaceStorageFileSubtypeSchema = z.object({
- subtype: fileSubtypeSchema,
- storageUsed: z.string(),
+export const workspaceStorageCounterSchema = z.object({
+ count: z.string(),
+ size: z.string(),
});
-export type WorkspaceStorageFileSubtype = z.infer<
- typeof workspaceStorageFileSubtypeSchema
+export type WorkspaceStorageCounter = z.infer<
+ typeof workspaceStorageCounterSchema
>;
+export const workspaceStorageUsageSchema = z.object({
+ uploads: workspaceStorageCounterSchema,
+ nodes: workspaceStorageCounterSchema,
+ documents: workspaceStorageCounterSchema,
+});
+
+export type WorkspaceStorageUsage = z.infer<typeof workspaceStorageUsageSchema>;
+
export const workspaceStorageUserSchema = z.object({
id: z.string(),
- storageUsed: z.string(),
storageLimit: z.string(),
maxFileSize: z.string(),
+ usage: workspaceStorageUsageSchema,
});
export type WorkspaceStorageUser = z.infer<typeof workspaceStorageUserSchema>;
-export const workspaceStorageGetOutputSchema = z.object({
- storageLimit: z.string().nullable().optional(),
- storageUsed: z.string(),
- subtypes: z.array(workspaceStorageFileSubtypeSchema),
+export const workspaceStorageUsersGetOutputSchema = z.object({
users: z.array(workspaceStorageUserSchema),
});
+export type WorkspaceStorageUsersGetOutput = z.infer<
+ typeof workspaceStorageUsersGetOutputSchema
+>;
+
+const workspaceUsageSchema = z.object({
+ storageLimit: z.string().nullable().optional(),
+ maxFileSize: z.string().nullable().optional(),
+ usage: workspaceStorageUsageSchema,
+});
+
+export const workspaceStorageGetOutputSchema = z.object({
+ user: workspaceStorageUserSchema,
+ workspace: workspaceUsageSchema.optional(),
+});
+
export type WorkspaceStorageGetOutput = z.infer<
typeof workspaceStorageGetOutputSchema
>;
diff --git a/packages/ui/src/components/workspaces/storage/storage-stats.tsx b/packages/ui/src/components/workspaces/storage/storage-stats.tsx
index 16f3bd6a..bdb28193 100644
--- a/packages/ui/src/components/workspaces/storage/storage-stats.tsx
+++ b/packages/ui/src/components/workspaces/storage/storage-stats.tsx
@@ -1,146 +1,128 @@
-import { FileSubtype, formatBytes } from '@colanode/core';
-import { bigintToPercent } from '@colanode/ui/lib/utils';
-
-interface SubtypeMetadata {
- subtype: FileSubtype;
- color: string;
- name: string;
-}
+import { Info } from 'lucide-react';
-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;
- storageUsed: string;
-}
+import { formatBytes, WorkspaceStorageUsage } from '@colanode/core';
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from '@colanode/ui/components/ui/tooltip';
+import { bigintToPercent } from '@colanode/ui/lib/utils';
interface StorageStatsProps {
- storageUsed: string;
- storageLimit: string | null;
- subtypes: StorageSubtype[];
+ storageLimit: string | null | undefined;
+ usage: WorkspaceStorageUsage;
}
-export const StorageStats = ({
- storageUsed,
- storageLimit,
- subtypes,
-}: StorageStatsProps) => {
- const usedPercentage = storageLimit
- ? bigintToPercent(BigInt(storageLimit), BigInt(storageUsed))
- : 0;
+const numberFormatter = new Intl.NumberFormat();
- return (
- <div className="space-y-2">
- <div className="flex gap-2 items-baseline">
- <span className="text-2xl font-medium">
- {formatBytes(BigInt(storageUsed))}
- </span>
- <span className="text-xl text-muted-foreground">
- {' '}
- of {storageLimit ? formatBytes(BigInt(storageLimit)) : 'Unlimited'}
- </span>
- <span className="text-sm text-muted-foreground">
- ({usedPercentage}%) used
- </span>
- </div>
- <div className="w-full h-3 bg-secondary rounded-full overflow-hidden flex">
- {subtypes.map((subtype) => {
- const storageUsed = BigInt(subtype.storageUsed);
- if (storageUsed === BigInt(0)) {
- return null;
- }
+const formatCount = (value: bigint) => {
+ const asNumber = Number(value);
+ if (Number.isSafeInteger(asNumber)) {
+ return numberFormatter.format(asNumber);
+ }
- const percentage = storageLimit
- ? bigintToPercent(BigInt(storageLimit), storageUsed)
- : 0;
- const metadata = subtypeMetadata.find(
- (m) => m.subtype === subtype.subtype
- );
+ return value.toString();
+};
- if (!metadata) {
- return null;
- }
+export const StorageStats = ({ storageLimit, usage }: StorageStatsProps) => {
+ const uploadsUsed = BigInt(usage.uploads.size ?? '0');
+ const limit = storageLimit ? BigInt(storageLimit) : null;
+ const usedPercentage = limit ? bigintToPercent(limit, uploadsUsed) : 0;
+ const clampedUsedPercentage = Math.min(usedPercentage, 100);
+ const remaining = limit
+ ? limit > uploadsUsed
+ ? limit - uploadsUsed
+ : BigInt(0)
+ : null;
- const name = metadata.name;
- const color = metadata.color;
- const title = `${name}: ${formatBytes(BigInt(subtype.storageUsed))}`;
+ const filesSize = BigInt(usage.uploads.size ?? '0');
+ const filesCount = BigInt(usage.uploads.count ?? '0');
- return (
- <div
- key={subtype.subtype}
- className={color}
- style={{ width: `${percentage}%` }}
- title={title}
- />
- );
- })}
- {usedPercentage < 100 && (
+ const nodesSize = BigInt(usage.nodes.size ?? '0');
+ const nodesCount = BigInt(usage.nodes.count ?? '0');
+ const documentsSize = BigInt(usage.documents.size ?? '0');
+ const contentSize = nodesSize + documentsSize;
+ const contentCount = nodesCount;
+
+ return (
+ <div className="grid gap-4 md:grid-cols-2 md:items-stretch">
+ <div className="rounded-xl border p-6 shadow-sm">
+ <p className="text-sm font-medium text-muted-foreground">
+ Total storage
+ </p>
+ <div className="mt-4 flex flex-col gap-1">
+ <span className="text-3xl font-semibold tracking-tight">
+ {formatBytes(uploadsUsed)}
+ </span>
+ <span className="text-sm text-muted-foreground">
+ of {limit ? formatBytes(limit) : 'Unlimited'}
+ </span>
+ </div>
+ <div className="mt-6 h-3 w-full overflow-hidden rounded-full bg-secondary">
<div
- className="bg-secondary"
- style={{ width: `${100 - usedPercentage}%` }}
+ className="h-full rounded-full bg-primary transition-all"
+ style={{ width: `${clampedUsedPercentage}%` }}
/>
- )}
+ </div>
+ <div className="mt-3 flex items-center justify-between text-xs text-muted-foreground">
+ <span>
+ {clampedUsedPercentage.toFixed(1)}%{' '}
+ {limit ? 'of your limit' : 'used'}
+ </span>
+ {remaining !== null ? (
+ <span>{formatBytes(remaining)} remaining</span>
+ ) : (
+ <span>No limit set</span>
+ )}
+ </div>
</div>
- <div className="mb-6 space-y-2">
- {subtypes.map((subtype) => {
- const storageUsed = BigInt(subtype.storageUsed);
- if (storageUsed === 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.storageUsed))}
+ <div className="flex flex-col gap-4">
+ {[
+ {
+ label: 'Content',
+ size: formatBytes(contentSize),
+ count: formatCount(contentCount),
+ info: 'Messages, documents, databases and other items created directly in Colanode.',
+ },
+ {
+ label: 'Files',
+ size: formatBytes(filesSize),
+ count: formatCount(filesCount),
+ info: 'Includes every file uploaded to your workspace.',
+ },
+ ].map((card) => (
+ <div
+ key={card.label}
+ className="flex flex-1 flex-col justify-center rounded-xl border p-4 shadow-sm"
+ >
+ <div className="flex items-center gap-2">
+ <p className="text-xs text-muted-foreground">{card.label}</p>
+ {card.info ? (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <button
+ type="button"
+ aria-label={`More info about ${card.label}`}
+ className="text-muted-foreground transition hover:text-foreground"
+ >
+ <Info className="h-3.5 w-3.5" />
+ </button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{card.info}</p>
+ </TooltipContent>
+ </Tooltip>
+ ) : null}
+ </div>
+ <div className="mt-2 flex items-end justify-between">
+ <span className="text-2xl font-semibold">{card.size}</span>
+ <span className="text-xs text-muted-foreground">
+ {card.count} items
</span>
</div>
- );
- })}
+ </div>
+ ))}
</div>
</div>
);
diff --git a/packages/ui/src/components/workspaces/storage/user-storage-stats.tsx b/packages/ui/src/components/workspaces/storage/user-storage-stats.tsx
deleted file mode 100644
index d712f470..00000000
--- a/packages/ui/src/components/workspaces/storage/user-storage-stats.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Separator } from '@colanode/ui/components/ui/separator';
-import { StorageStats } from '@colanode/ui/components/workspaces/storage/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',
- userId: workspace.userId,
- });
-
- const data = userStorageGetQuery.data ?? {
- storageLimit: '0',
- storageUsed: '0',
- subtypes: [],
- };
-
- 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
- storageUsed={data.storageUsed}
- storageLimit={data.storageLimit}
- subtypes={data.subtypes}
- />
- )}
- </div>
- );
-};
diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-cloud.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-cloud.tsx
index 0cf80922..aa5ed8d1 100644
--- a/packages/ui/src/components/workspaces/storage/workspace-storage-cloud.tsx
+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-cloud.tsx
@@ -13,7 +13,7 @@ export const WorkspaceStorageCloud = () => {
}
return (
- <div className="w-full flex flex-row items-center border border-muted rounded-lg p-4 gap-4">
+ <div className="w-full flex flex-row items-center rounded-xl border p-6 shadow-sm gap-4">
<Cloud className="size-6" />
<div className="flex-1">
<h3 className="text-lg font-semibold tracking-tight">
diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-container.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-container.tsx
index 1741c832..52dc3a24 100644
--- a/packages/ui/src/components/workspaces/storage/workspace-storage-container.tsx
+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-container.tsx
@@ -1,16 +1,11 @@
-import { UserStorageStats } from '@colanode/ui/components/workspaces/storage/user-storage-stats';
import { WorkspaceStorageStats } from '@colanode/ui/components/workspaces/storage/workspace-storage-stats';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { WorkspaceStorageUsers } from '@colanode/ui/components/workspaces/storage/workspace-storage-users';
export const WorkspaceStorageContainer = () => {
- const workspace = useWorkspace();
- const canManageStorage =
- workspace.role === 'owner' || workspace.role === 'admin';
-
return (
<div className="max-w-4xl space-y-10">
- <UserStorageStats />
- {canManageStorage && <WorkspaceStorageStats />}
+ <WorkspaceStorageStats />
+ <WorkspaceStorageUsers />
</div>
);
};
diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-stats.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-stats.tsx
index 028303a5..37e23b69 100644
--- a/packages/ui/src/components/workspaces/storage/workspace-storage-stats.tsx
+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-stats.tsx
@@ -1,71 +1,100 @@
import { BadgeAlert } from 'lucide-react';
-import { match } from 'ts-pattern';
-import { Separator } from '@colanode/ui/components/ui/separator';
+import { Button } from '@colanode/ui/components/ui/button';
import { Spinner } from '@colanode/ui/components/ui/spinner';
import { StorageStats } from '@colanode/ui/components/workspaces/storage/storage-stats';
import { WorkspaceStorageCloud } from '@colanode/ui/components/workspaces/storage/workspace-storage-cloud';
-import { WorkspaceStorageUserTable } from '@colanode/ui/components/workspaces/storage/workspace-storage-user-table';
import { useWorkspace } from '@colanode/ui/contexts/workspace';
import { useQuery } from '@colanode/ui/hooks/use-query';
export const WorkspaceStorageStats = () => {
const workspace = useWorkspace();
+ const canManageStorage =
+ workspace.role === 'owner' || workspace.role === 'admin';
- const workspaceStorageGetQuery = useQuery({
+ const storageQuery = useQuery({
type: 'workspace.storage.get',
userId: workspace.userId,
});
- const data = workspaceStorageGetQuery.data ?? {
- storageLimit: '0',
- storageUsed: '0',
- subtypes: [],
- users: [],
- };
+ const showUserError = storageQuery.isError || !storageQuery.data?.user;
+ const showWorkspaceError =
+ storageQuery.isError || !storageQuery.data?.workspace;
return (
- <div className="space-y-10">
- <div>
- <h2 className="text-2xl font-semibold tracking-tight">
- Workspace storage
- </h2>
- <Separator className="mt-3" />
- </div>
- {match(workspaceStorageGetQuery)
- .with({ isPending: true }, () => (
+ <div className="max-w-4xl space-y-10">
+ <div className="space-y-4">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">My storage</h2>
+ <p className="mt-2 text-sm text-muted-foreground">
+ Your personal storage usage.
+ </p>
+ </div>
+ {storageQuery.isPending ? (
<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
- storageUsed={data.storageUsed}
- storageLimit={data.storageLimit ?? null}
- subtypes={data.subtypes}
- />
- <WorkspaceStorageCloud />
- <Separator className="my-4" />
- <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>
+ ) : showUserError ? (
+ <div className="space-y-2 text-sm text-muted-foreground">
+ <p>Couldn't load your storage information. Please try again.</p>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => storageQuery.refetch()}
+ >
+ Try again
+ </Button>
+ </div>
+ ) : storageQuery.data?.user?.usage ? (
+ <StorageStats
+ storageLimit={storageQuery.data.user.storageLimit}
+ usage={storageQuery.data.user.usage}
+ />
+ ) : null}
+ </div>
+ {canManageStorage && (
+ <div className="space-y-4">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">
+ Workspace storage
+ </h2>
+ <p className="mt-2 text-sm text-muted-foreground">
+ Total storage usage for the workspace.
+ </p>
</div>
- ))}
+ {storageQuery.isPending ? (
+ <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>
+ ) : showWorkspaceError ? (
+ <div className="flex flex-col gap-4 text-sm text-muted-foreground">
+ <div className="flex items-center gap-4">
+ <BadgeAlert className="size-8 text-red-400" />
+ <span>
+ Couldn't load workspace storage information. Please try again.
+ </span>
+ </div>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => storageQuery.refetch()}
+ >
+ Retry
+ </Button>
+ </div>
+ ) : storageQuery.data?.workspace?.usage ? (
+ <>
+ <StorageStats
+ storageLimit={storageQuery.data.workspace.storageLimit ?? null}
+ usage={storageQuery.data.workspace.usage}
+ />
+ <WorkspaceStorageCloud />
+ </>
+ ) : null}
+ </div>
+ )}
</div>
);
};
diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-user-row.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-user-row.tsx
new file mode 100644
index 00000000..0bdd1a12
--- /dev/null
+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-user-row.tsx
@@ -0,0 +1,136 @@
+import { eq, useLiveQuery } from '@tanstack/react-db';
+import { Settings } from 'lucide-react';
+import { useState } from 'react';
+
+import { formatBytes, WorkspaceStorageUser } from '@colanode/core';
+import { collections } from '@colanode/ui/collections';
+import { Avatar } from '@colanode/ui/components/avatars/avatar';
+import { Button } from '@colanode/ui/components/ui/button';
+import { TableCell, TableRow } from '@colanode/ui/components/ui/table';
+import { WorkspaceStorageUserUpdateDialog } from '@colanode/ui/components/workspaces/storage/workspace-storage-user-update-dialog';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+import { bigintToPercent, cn } from '@colanode/ui/lib/utils';
+
+interface UserStorageProgressBarProps {
+ storageUsed: string;
+ storageLimit: string;
+}
+
+const UserStorageProgressBar = ({
+ storageUsed,
+ storageLimit,
+}: UserStorageProgressBarProps) => {
+ const percentage = bigintToPercent(BigInt(storageLimit), BigInt(storageUsed));
+
+ 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(BigInt(storageUsed))}</span>
+ <span className="text-muted-foreground">
+ ({percentage.toFixed(1)}%)
+ </span>
+ </div>
+ <div className="w-full h-2 bg-secondary 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;
+}
+
+export const WorkspaceStorageUserRow = ({
+ user,
+ onUpdate,
+}: WorkspaceStorageUserRowProps) => {
+ const workspace = useWorkspace();
+ const [openUpdateDialog, setOpenUpdateDialog] = useState(false);
+
+ const userQuery = useLiveQuery((q) =>
+ q
+ .from({ users: collections.workspace(workspace.userId).users })
+ .where(({ users }) => eq(users.id, user.id))
+ .select(({ users }) => ({
+ id: users.id,
+ name: users.name,
+ avatar: users.avatar,
+ email: users.email,
+ }))
+ .findOne()
+ );
+
+ const name = userQuery.data?.name ?? 'Unknown';
+ const email = userQuery.data?.email ?? '';
+ const avatar = userQuery.data?.avatar ?? null;
+
+ const storageLimitBytes = BigInt(user.storageLimit);
+ const maxFileSizeBytes = user.maxFileSize ? BigInt(user.maxFileSize) : null;
+ const storageUsed = user.usage.uploads.size ?? '0';
+
+ return (
+ <>
+ <TableRow>
+ <TableCell>
+ <div className="flex items-center space-x-3">
+ <Avatar id={user.id} name={name} avatar={avatar} />
+ <div className="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">
+ {maxFileSizeBytes ? formatBytes(maxFileSizeBytes) : '#'}
+ </span>
+ </TableCell>
+ <TableCell className="text-center">
+ <span className="text-sm font-medium">
+ {formatBytes(storageLimitBytes)}
+ </span>
+ </TableCell>
+ <TableCell className="min-w-[200px] text-center">
+ <UserStorageProgressBar
+ storageLimit={user.storageLimit}
+ storageUsed={storageUsed}
+ />
+ </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
+ user={user}
+ open={openUpdateDialog}
+ onOpenChange={setOpenUpdateDialog}
+ onUpdate={() => {
+ onUpdate();
+ setOpenUpdateDialog(false);
+ }}
+ />
+ )}
+ </>
+ );
+};
diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx
index ef853ebc..53389614 100644
--- a/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx
+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-user-table.tsx
@@ -1,151 +1,22 @@
-import { eq, useLiveQuery } from '@tanstack/react-db';
-import { Settings } from 'lucide-react';
-import { useState } from 'react';
-
-import { formatBytes, WorkspaceStorageUser } from '@colanode/core';
-import { collections } from '@colanode/ui/collections';
-import { Avatar } from '@colanode/ui/components/avatars/avatar';
-import { Button } from '@colanode/ui/components/ui/button';
+import { WorkspaceStorageUser } from '@colanode/core';
import {
Table,
TableBody,
- TableCell,
TableHead,
TableHeader,
TableRow,
} from '@colanode/ui/components/ui/table';
-import { WorkspaceStorageUserUpdateDialog } from '@colanode/ui/components/workspaces/storage/workspace-storage-user-update-dialog';
-import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { bigintToPercent, cn } from '@colanode/ui/lib/utils';
-
-const UserStorageProgressBar = ({
- storageUsed,
- storageLimit,
-}: WorkspaceStorageUser) => {
- const percentage = bigintToPercent(BigInt(storageLimit), BigInt(storageUsed));
-
- 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(BigInt(storageUsed))}</span>
- <span className="text-muted-foreground">
- ({percentage.toFixed(1)}%)
- </span>
- </div>
- <div className="w-full h-2 bg-secondary 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 = useLiveQuery((q) =>
- q
- .from({ users: collections.workspace(workspace.userId).users })
- .where(({ users }) => eq(users.id, user.id))
- .select(({ users }) => ({
- id: users.id,
- name: users.name,
- avatar: users.avatar,
- email: users.email,
- }))
- .findOne()
- );
-
- const name = userQuery.data?.name ?? 'Unknown';
- const email = userQuery.data?.email ?? '';
- const avatar = userQuery.data?.avatar ?? null;
-
- const storageLimitBytes = BigInt(user.storageLimit);
- const maxFileSizeBytes = user.maxFileSize ? BigInt(user.maxFileSize) : null;
-
- return (
- <>
- <TableRow>
- <TableCell>
- <div className="flex items-center space-x-3">
- <Avatar id={user.id} name={name} avatar={avatar} />
- <div className="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">
- {maxFileSizeBytes ? formatBytes(maxFileSizeBytes) : '#'}
- </span>
- </TableCell>
- <TableCell className="text-center">
- <span className="text-sm font-medium">
- {formatBytes(storageLimitBytes)}
- </span>
- </TableCell>
- <TableCell className="min-w-[200px] text-center">
- <UserStorageProgressBar {...user} />
- </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
- user={user}
- open={openUpdateDialog}
- onOpenChange={setOpenUpdateDialog}
- onUpdate={() => {
- onUpdate();
- setOpenUpdateDialog(false);
- }}
- />
- )}
- </>
- );
-};
+import { WorkspaceStorageUserRow } from '@colanode/ui/components/workspaces/storage/workspace-storage-user-row';
interface WorkspaceStorageUserTableProps {
users: WorkspaceStorageUser[];
- onUpdate: () => void;
+ onUsersUpdated: () => void;
}
export const WorkspaceStorageUserTable = ({
users,
- onUpdate,
+ onUsersUpdated,
}: WorkspaceStorageUserTableProps) => {
- if (users.length === 0) {
- return <div className="text-sm text-muted-foreground">No users found.</div>;
- }
-
return (
<Table>
<TableHeader>
@@ -162,7 +33,7 @@ export const WorkspaceStorageUserTable = ({
<WorkspaceStorageUserRow
key={user.id}
user={user}
- onUpdate={onUpdate}
+ onUpdate={onUsersUpdated}
/>
))}
</TableBody>
diff --git a/packages/ui/src/components/workspaces/storage/workspace-storage-users.tsx b/packages/ui/src/components/workspaces/storage/workspace-storage-users.tsx
new file mode 100644
index 00000000..5c19463f
--- /dev/null
+++ b/packages/ui/src/components/workspaces/storage/workspace-storage-users.tsx
@@ -0,0 +1,107 @@
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { BadgeAlert } from 'lucide-react';
+import { InView } from 'react-intersection-observer';
+
+import { Button } from '@colanode/ui/components/ui/button';
+import { Separator } from '@colanode/ui/components/ui/separator';
+import { Spinner } from '@colanode/ui/components/ui/spinner';
+import { WorkspaceStorageUserTable } from '@colanode/ui/components/workspaces/storage/workspace-storage-user-table';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
+
+const USERS_PER_PAGE = 100;
+
+export const WorkspaceStorageUsers = () => {
+ const workspace = useWorkspace();
+ const canManageStorage =
+ workspace.role === 'owner' || workspace.role === 'admin';
+
+ const usersQuery = useInfiniteQuery({
+ queryKey: ['workspace-storage-users', workspace.userId],
+ initialPageParam: undefined as string | undefined,
+ queryFn: ({ pageParam }) =>
+ window.colanode.executeQuery({
+ type: 'workspace.storage.users.get',
+ userId: workspace.userId,
+ limit: USERS_PER_PAGE,
+ cursor: pageParam,
+ }),
+ getNextPageParam: (lastPage) => {
+ if (lastPage.users.length < USERS_PER_PAGE) {
+ return undefined;
+ }
+
+ const lastUser = lastPage.users[lastPage.users.length - 1];
+ return lastUser?.id;
+ },
+ });
+
+ const users = usersQuery.data?.pages.flatMap((page) => page.users) ?? [];
+
+ if (!canManageStorage) {
+ return null;
+ }
+
+ const handleUsersUpdated = () => {
+ usersQuery.refetch();
+ };
+
+ return (
+ <div className="space-y-6">
+ <div>
+ <h2 className="text-2xl font-semibold tracking-tight">Users</h2>
+ <p className="mt-2 text-sm text-muted-foreground">
+ View and manage storage usage for each workspace user.
+ </p>
+ <Separator className="mt-3" />
+ </div>
+ {usersQuery.isPending && users.length === 0 ? (
+ <div className="flex items-center gap-4 text-sm text-muted-foreground">
+ <Spinner className="size-5" />
+ <span>Loading user storage information...</span>
+ </div>
+ ) : usersQuery.isError && users.length === 0 ? (
+ <div className="flex flex-col gap-4 text-sm text-muted-foreground">
+ <div className="flex items-center gap-4">
+ <BadgeAlert className="size-8 text-red-400" />
+ <span>
+ Couldn't load workspace user storage details. Please try again.
+ </span>
+ </div>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => usersQuery.refetch()}
+ >
+ Retry
+ </Button>
+ </div>
+ ) : users.length === 0 ? (
+ <div className="text-sm text-muted-foreground">No users found.</div>
+ ) : (
+ <>
+ <WorkspaceStorageUserTable
+ users={users}
+ onUsersUpdated={handleUsersUpdated}
+ />
+ <div className="flex items-center justify-center py-4">
+ {usersQuery.isFetchingNextPage && <Spinner className="size-4" />}
+ </div>
+ {usersQuery.hasNextPage && (
+ <InView
+ rootMargin="200px"
+ onChange={(inView) => {
+ if (
+ inView &&
+ usersQuery.hasNextPage &&
+ !usersQuery.isFetchingNextPage
+ ) {
+ usersQuery.fetchNextPage();
+ }
+ }}
+ />
+ )}
+ </>
+ )}
+ </div>
+ );
+};