Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Refactor layout components and queries
Hakan Shehu541712bb20cb
diff --git a/apps/desktop/src/main/queries/account-get.ts b/apps/desktop/src/main/queries/account-get.tsnew file mode 100644index 00000000..09d0111a--- /dev/null+++ b/apps/desktop/src/main/queries/account-get.ts@@ -0,0 +1,70 @@+import { databaseService } from '@/main/data/database-service';+import { Account } from '@/shared/types/accounts';+import { SelectAccount } from '@/main/data/app/schema';+import { ChangeCheckResult, QueryHandler } from '@/main/types';+import { Event } from '@/shared/types/events';+import { mapAccount } from '@/main/utils';+import { AccountGetQueryInput } from '@/shared/queries/account-get';++export class AccountGetQueryHandler+ implements QueryHandler<AccountGetQueryInput>+{+ public async handleQuery(+ input: AccountGetQueryInput+ ): Promise<Account | null> {+ const row = await this.fetchAccount(input.accountId);+ if (!row) {+ return null;+ }++ return mapAccount(row);+ }++ public async checkForChanges(+ event: Event,+ input: AccountGetQueryInput,+ output: Account | null+ ): Promise<ChangeCheckResult<AccountGetQueryInput>> {+ if (+ event.type === 'account_created' &&+ event.account.id === input.accountId+ ) {+ return {+ hasChanges: true,+ result: event.account,+ };+ }++ if (+ event.type === 'account_updated' &&+ event.account.id === input.accountId+ ) {+ return {+ hasChanges: true,+ result: event.account,+ };+ }++ if (+ event.type === 'account_deleted' &&+ event.account.id === input.accountId+ ) {+ return {+ hasChanges: true,+ result: null,+ };+ }++ return {+ hasChanges: false,+ };+ }++ private fetchAccount(accountId: string): Promise<SelectAccount | null> {+ return databaseService.appDatabase+ .selectFrom('accounts')+ .selectAll()+ .where('id', '=', accountId)+ .executeTakeFirst();+ }+}diff --git a/apps/desktop/src/main/queries/accounts-list.ts b/apps/desktop/src/main/queries/accounts-list.tsindex 0fd6ca00..4e85e782 100644--- a/apps/desktop/src/main/queries/accounts-list.ts+++ b/apps/desktop/src/main/queries/accounts-list.ts@@ -4,13 +4,14 @@ import { Account } from '@/shared/types/accounts';import { SelectAccount } from '@/main/data/app/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';import { Event } from '@/shared/types/events';+import { mapAccount } from '@/main/utils';export class AccountListQueryHandlerimplements QueryHandler<AccountListQueryInput>{public async handleQuery(_: AccountListQueryInput): Promise<Account[]> {const rows = await this.fetchAccounts();- return this.buildAccounts(rows);+ return rows.map(mapAccount);}public async checkForChanges(@@ -63,19 +64,4 @@ export class AccountListQueryHandler.where('status', '=', 'active').execute();}-- private buildAccounts(rows: SelectAccount[]): Account[] {- return rows.map((row) => {- return {- id: row.id,- name: row.name,- avatar: row.avatar,- token: row.token,- email: row.email,- deviceId: row.device_id,- status: row.status,- server: row.server,- };- });- }}diff --git a/apps/desktop/src/main/queries/index.ts b/apps/desktop/src/main/queries/index.tsindex 09030908..c1c47364 100644--- a/apps/desktop/src/main/queries/index.ts+++ b/apps/desktop/src/main/queries/index.ts@@ -13,8 +13,10 @@ import { EmojisGetQueryHandler } from '@/main/queries/emojis-get';import { IconsGetQueryHandler } from '@/main/queries/icons-get';import { NodeTreeGetQueryHandler } from '@/main/queries/node-tree-get';import { NodeChildrenGetQueryHandler } from '@/main/queries/node-children-get';-import { ReadStatesGetQueryHandler } from '@/main/queries/read-states-get';+import { RadarDataGetQueryHandler } from '@/main/queries/radar-data-get';import { FileMetadataGetQueryHandler } from '@/main/queries/file-metadata-get';+import { AccountGetQueryHandler } from '@/main/queries/account-get';+import { WorkspaceGetQueryHandler } from '@/main/queries/workspace-get';type QueryHandlerMap = {[K in keyof QueryMap]: QueryHandler<QueryMap[K]['input']>;@@ -34,6 +36,8 @@ export const queryHandlerMap: QueryHandlerMap = {icons_get: new IconsGetQueryHandler(),node_tree_get: new NodeTreeGetQueryHandler(),node_children_get: new NodeChildrenGetQueryHandler(),- read_states_get: new ReadStatesGetQueryHandler(),+ radar_data_get: new RadarDataGetQueryHandler(),file_metadata_get: new FileMetadataGetQueryHandler(),+ account_get: new AccountGetQueryHandler(),+ workspace_get: new WorkspaceGetQueryHandler(),};diff --git a/apps/desktop/src/main/queries/read-states-get.ts b/apps/desktop/src/main/queries/radar-data-get.tssimilarity index 55%rename from apps/desktop/src/main/queries/read-states-get.tsrename to apps/desktop/src/main/queries/radar-data-get.tsindex e919f09f..af7c9cc7 100644--- a/apps/desktop/src/main/queries/read-states-get.ts+++ b/apps/desktop/src/main/queries/radar-data-get.ts@@ -1,24 +1,24 @@import { radarService } from '@/main/services/radar-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { ReadStatesGetQueryInput } from '@/shared/queries/read-states-get';-import { WorkspaceReadState } from '@/shared/types/radars';+import { RadarDataGetQueryInput } from '@/shared/queries/radar-data-get';+import { WorkspaceRadarData } from '@/shared/types/radars';import { Event } from '@/shared/types/events';-export class ReadStatesGetQueryHandler- implements QueryHandler<ReadStatesGetQueryInput>+export class RadarDataGetQueryHandler+ implements QueryHandler<RadarDataGetQueryInput>{public async handleQuery(- _: ReadStatesGetQueryInput- ): Promise<Record<string, WorkspaceReadState>> {+ _: RadarDataGetQueryInput+ ): Promise<Record<string, WorkspaceRadarData>> {const data = radarService.getWorkspaceStates();return data;}public async checkForChanges(event: Event,- _: ReadStatesGetQueryInput,- ___: Record<string, WorkspaceReadState>- ): Promise<ChangeCheckResult<ReadStatesGetQueryInput>> {+ _: RadarDataGetQueryInput,+ ___: Record<string, WorkspaceRadarData>+ ): Promise<ChangeCheckResult<RadarDataGetQueryInput>> {if (event.type === 'radar_data_updated') {const data = radarService.getWorkspaceStates();return {diff --git a/apps/desktop/src/main/queries/workspace-get.ts b/apps/desktop/src/main/queries/workspace-get.tsnew file mode 100644index 00000000..c5faa0f9--- /dev/null+++ b/apps/desktop/src/main/queries/workspace-get.ts@@ -0,0 +1,77 @@+import { databaseService } from '@/main/data/database-service';+import { SelectWorkspace } from '@/main/data/app/schema';+import { ChangeCheckResult, QueryHandler } from '@/main/types';+import { Event } from '@/shared/types/events';+import { mapWorkspace } from '@/main/utils';+import { WorkspaceGetQueryInput } from '@/shared/queries/workspace-get';+import { Workspace } from '@/shared/types/workspaces';++export class WorkspaceGetQueryHandler+ implements QueryHandler<WorkspaceGetQueryInput>+{+ public async handleQuery(+ input: WorkspaceGetQueryInput+ ): Promise<Workspace | null> {+ const row = await this.fetchWorkspace(input.accountId, input.workspaceId);+ if (!row) {+ return null;+ }++ return mapWorkspace(row);+ }++ public async checkForChanges(+ event: Event,+ input: WorkspaceGetQueryInput,+ output: Workspace | null+ ): Promise<ChangeCheckResult<WorkspaceGetQueryInput>> {+ if (+ event.type === 'workspace_created' &&+ event.workspace.accountId === input.accountId &&+ event.workspace.id === input.workspaceId+ ) {+ return {+ hasChanges: true,+ result: event.workspace,+ };+ }++ if (+ event.type === 'workspace_updated' &&+ event.workspace.accountId === input.accountId &&+ event.workspace.id === input.workspaceId+ ) {+ return {+ hasChanges: true,+ result: event.workspace,+ };+ }++ if (+ event.type === 'workspace_deleted' &&+ event.workspace.accountId === input.accountId &&+ event.workspace.id === input.workspaceId+ ) {+ return {+ hasChanges: true,+ result: null,+ };+ }++ return {+ hasChanges: false,+ };+ }++ private fetchWorkspace(+ accountId: string,+ workspaceId: string+ ): Promise<SelectWorkspace | null> {+ return databaseService.appDatabase+ .selectFrom('workspaces')+ .selectAll()+ .where('account_id', '=', accountId)+ .where('workspace_id', '=', workspaceId)+ .executeTakeFirst();+ }+}diff --git a/apps/desktop/src/main/queries/workspace-list.ts b/apps/desktop/src/main/queries/workspace-list.tsindex dabeaf97..03373a7e 100644--- a/apps/desktop/src/main/queries/workspace-list.ts+++ b/apps/desktop/src/main/queries/workspace-list.ts@@ -1,25 +1,30 @@import { WorkspaceListQueryInput } from '@/shared/queries/workspace-list';import { databaseService } from '@/main/data/database-service';import { Workspace } from '@/shared/types/workspaces';-import { WorkspaceRole } from '@colanode/core';import { SelectWorkspace } from '@/main/data/app/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';import { Event } from '@/shared/types/events';+import { mapWorkspace } from '@/main/utils';export class WorkspaceListQueryHandlerimplements QueryHandler<WorkspaceListQueryInput>{- public async handleQuery(_: WorkspaceListQueryInput): Promise<Workspace[]> {- const rows = await this.fetchWorkspaces();- return this.buildWorkspaces(rows);+ public async handleQuery(+ input: WorkspaceListQueryInput+ ): Promise<Workspace[]> {+ const rows = await this.fetchWorkspaces(input.accountId);+ return rows.map(mapWorkspace);}public async checkForChanges(event: Event,- _: WorkspaceListQueryInput,+ input: WorkspaceListQueryInput,output: Workspace[]): Promise<ChangeCheckResult<WorkspaceListQueryInput>> {- if (event.type === 'workspace_created') {+ if (+ event.type === 'workspace_created' &&+ event.workspace.accountId === input.accountId+ ) {const newWorkspaces = [...output, event.workspace];return {hasChanges: true,@@ -27,7 +32,10 @@ export class WorkspaceListQueryHandler};}- if (event.type === 'workspace_updated') {+ if (+ event.type === 'workspace_updated' &&+ event.workspace.accountId === input.accountId+ ) {const updatedWorkspaces = output.map((workspace) => {if (workspace.id === event.workspace.id) {return event.workspace;@@ -41,7 +49,10 @@ export class WorkspaceListQueryHandler};}- if (event.type === 'workspace_deleted') {+ if (+ event.type === 'workspace_deleted' &&+ event.workspace.accountId === input.accountId+ ) {const activeWorkspaces = output.filter((workspace) => workspace.id !== event.workspace.id);@@ -57,33 +68,11 @@ export class WorkspaceListQueryHandler};}- private fetchWorkspaces(): Promise<SelectWorkspace[]> {+ private fetchWorkspaces(accountId: string): Promise<SelectWorkspace[]> {return databaseService.appDatabase.selectFrom('workspaces').selectAll()- .where(- 'account_id',- 'in',- databaseService.appDatabase- .selectFrom('accounts')- .where('status', '=', 'active')- .select('id')- )+ .where('account_id', '=', accountId).execute();}-- private buildWorkspaces(rows: SelectWorkspace[]): Workspace[] {- return rows.map((row) => {- return {- id: row.workspace_id,- name: row.name,- description: row.description,- avatar: row.avatar,- versionId: row.version_id,- accountId: row.account_id,- role: row.role as WorkspaceRole,- userId: row.user_id,- };- });- }}diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.tsindex e25ca056..e0af1970 100644--- a/apps/desktop/src/main/services/radar-service.ts+++ b/apps/desktop/src/main/services/radar-service.ts@@ -1,36 +1,72 @@import { databaseService } from '@/main/data/database-service';-import { Kysely } from 'kysely';-import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';import { getIdType, IdType, NodeTypes } from '@colanode/core';-import { WorkspaceReadState } from '@/shared/types/radars';+import { WorkspaceRadarData } from '@/shared/types/radars';import { eventBus } from '@/shared/lib/event-bus';import { Event } from '@/shared/types/events';class RadarService {- private readonly workspaceStates: Record<string, WorkspaceReadState> = {};+ private readonly workspaceStates: Record<string, WorkspaceRadarData> = {};constructor() {eventBus.subscribe(this.handleEvent.bind(this));}public async init(): Promise<void> {- const workspaceDatabases = await databaseService.getWorkspaceDatabases();- for (const [userId, workspaceDatabase] of workspaceDatabases.entries()) {- await this.initWorkspace(userId, workspaceDatabase);+ const workspaces = await databaseService.appDatabase+ .selectFrom('workspaces')+ .select(['user_id', 'workspace_id', 'account_id'])+ .execute();++ for (const workspace of workspaces) {+ this.workspaceStates[workspace.user_id] = {+ userId: workspace.user_id,+ workspaceId: workspace.workspace_id,+ accountId: workspace.account_id,+ nodeStates: {},+ importantCount: 0,+ hasUnseenChanges: false,+ };++ await this.initWorkspace(workspace.user_id);}}- public getWorkspaceStates(): Record<string, WorkspaceReadState> {+ public getWorkspaceStates(): Record<string, WorkspaceRadarData> {return this.workspaceStates;}- private async initWorkspace(- userId: string,- workspaceDatabase: Kysely<WorkspaceDatabaseSchema>- ): Promise<void> {- const workspaceState: WorkspaceReadState = {- importantCount: 0,+ private async initWorkspace(userId: string): Promise<void> {+ let existingData = this.workspaceStates[userId];+ if (!existingData) {+ const workspace = await databaseService.appDatabase+ .selectFrom('workspaces')+ .select(['user_id', 'workspace_id', 'account_id'])+ .where('user_id', '=', userId)+ .executeTakeFirst();++ if (!workspace) {+ return;+ }++ existingData = {+ userId,+ workspaceId: workspace.workspace_id,+ accountId: workspace.account_id,+ nodeStates: {},+ importantCount: 0,+ hasUnseenChanges: false,+ };+ }++ const workspaceDatabase =+ await databaseService.getWorkspaceDatabase(userId);++ const data: WorkspaceRadarData = {+ accountId: existingData.accountId,+ workspaceId: existingData.workspaceId,+ userId: existingData.userId,hasUnseenChanges: false,+ importantCount: 0,nodeStates: {},};@@ -55,7 +91,7 @@ class RadarService {const mentionsCount = nodeUnreadMessageCount.mentions_count;if (idType === IdType.Chat) {- workspaceState.nodeStates[nodeId] = {+ data.nodeStates[nodeId] = {type: 'chat',nodeId,unseenMessagesCount: messagesCount,@@ -63,14 +99,14 @@ class RadarService {};if (mentionsCount > 0) {- workspaceState.importantCount += mentionsCount;+ data.importantCount += mentionsCount;}if (messagesCount > 0) {- workspaceState.importantCount += messagesCount;+ data.importantCount += messagesCount;}} else if (idType === IdType.Channel) {- workspaceState.nodeStates[nodeId] = {+ data.nodeStates[nodeId] = {type: 'channel',nodeId,unseenMessagesCount: messagesCount,@@ -78,14 +114,14 @@ class RadarService {};if (messagesCount > 0) {- workspaceState.hasUnseenChanges = true;+ data.hasUnseenChanges = true;} else if (mentionsCount > 0) {- workspaceState.importantCount += messagesCount;+ data.importantCount += messagesCount;}}}- this.workspaceStates[userId] = workspaceState;+ this.workspaceStates[userId] = data;}private async handleEvent(event: Event) {@@ -99,10 +135,7 @@ class RadarService {event.type === 'user_node_updated') {// to be optimized- const workspaceDatabase = await databaseService.getWorkspaceDatabase(- event.userId- );- await this.initWorkspace(event.userId, workspaceDatabase);+ await this.initWorkspace(event.userId);eventBus.publish({type: 'radar_data_updated',});diff --git a/apps/desktop/src/renderer/app.tsx b/apps/desktop/src/renderer/app.tsxindex ca04d1ca..0e28d7db 100644--- a/apps/desktop/src/renderer/app.tsx+++ b/apps/desktop/src/renderer/app.tsx@@ -1,42 +1,10 @@-import { AppLoading } from '@/renderer/app-loading';import { Outlet } from 'react-router-dom';-import { DelayedComponent } from '@/renderer/components/ui/delayed-component';-import { useQuery } from '@/renderer/hooks/use-query';import { AppContext } from '@/renderer/contexts/app';import { RadarProvider } from '@/renderer/radar-provider';export const App = () => {- const { data: servers, isPending: isPendingServers } = useQuery({- type: 'server_list',- });-- const { data: accounts, isPending: isPendingAccounts } = useQuery({- type: 'account_list',- });-- const { data: workspaces, isPending: isPendingWorkspaces } = useQuery({- type: 'workspace_list',- });-- const isPending =- isPendingServers || isPendingAccounts || isPendingWorkspaces;-- if (isPending) {- return (- <DelayedComponent>- <AppLoading />- </DelayedComponent>- );- }-return (- <AppContext.Provider- value={{- accounts: accounts ?? [],- workspaces: workspaces ?? [],- servers: servers ?? [],- }}- >+ <AppContext.Provider value={{}}><RadarProvider><Outlet /></RadarProvider>diff --git a/apps/desktop/src/renderer/components/accounts/account-redirect.tsx b/apps/desktop/src/renderer/components/accounts/account-redirect.tsxindex fe464a4c..476735ec 100644--- a/apps/desktop/src/renderer/components/accounts/account-redirect.tsx+++ b/apps/desktop/src/renderer/components/accounts/account-redirect.tsx@@ -1,19 +1,25 @@import React from 'react';+import { useQuery } from '@/renderer/hooks/use-query';import { useNavigate } from 'react-router-dom';-import { useApp } from '@/renderer/contexts/app';export const AccountRedirect = (): React.ReactNode => {- const app = useApp();const navigate = useNavigate();+ const { data, isPending } = useQuery({+ type: 'account_list',+ });React.useEffect(() => {- if (app.accounts.length == 0) {+ if (isPending) {+ return;+ }++ if (data.length == 0) {navigate('/login');return;}- navigate(`/${app.accounts[0].id}`);- }, [app.accounts, navigate]);+ navigate(`/${data[0].id}`);+ }, [data, isPending, navigate]);return null;};diff --git a/apps/desktop/src/renderer/components/accounts/account.tsx b/apps/desktop/src/renderer/components/accounts/account.tsxindex 063adc95..3920395e 100644--- a/apps/desktop/src/renderer/components/accounts/account.tsx+++ b/apps/desktop/src/renderer/components/accounts/account.tsx@@ -2,8 +2,9 @@ import React from 'react';import { AccountContext } from '@/renderer/contexts/account';import { useApp } from '@/renderer/contexts/app';import { Outlet, useNavigate, useParams } from 'react-router-dom';-import { AccountLogout } from './account-logout';-import { AccountSettingsDialog } from './account-settings-dialog';+import { AccountLogout } from '@/renderer/components/accounts/account-logout';+import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';+import { useQuery } from '@/renderer/hooks/use-query';export const Account = () => {const { accountId } = useParams<{ accountId: string }>();@@ -13,19 +14,20 @@ export const Account = () => {const [openSettings, setOpenSettings] = React.useState(false);const [openLogout, setOpenLogout] = React.useState(false);- const account = app.accounts.find((a) => a.id === accountId);+ const { data } = useQuery({+ type: 'account_get',+ accountId,+ });- if (!account) {+ if (!data) {return <p>Account not found</p>;}- const workspaces = app.workspaces.filter((w) => w.accountId === account.id);-+ const account = data;return (<AccountContext.Providervalue={{...account,- workspaces,openSettings: () => setOpenSettings(true),openLogout: () => setOpenLogout(true),}}@@ -42,14 +44,7 @@ export const Account = () => {onCancel={() => setOpenLogout(false)}onLogout={() => {setOpenLogout(false);- const activeAccounts =- app.accounts?.filter((a) => a.id !== account.id) ?? [];- if (activeAccounts.length > 0) {- navigate(`/${activeAccounts[0].id}`);- return;- }-- navigate('/login');+ navigate('/');}}/>)}diff --git a/apps/desktop/src/renderer/components/accounts/login-form.tsx b/apps/desktop/src/renderer/components/accounts/login-form.tsxindex 58397acc..91fae18a 100644--- a/apps/desktop/src/renderer/components/accounts/login-form.tsx+++ b/apps/desktop/src/renderer/components/accounts/login-form.tsx@@ -2,20 +2,25 @@ import React from 'react';import { EmailRegister } from '@/renderer/components/accounts/email-register';import { EmailLogin } from '@/renderer/components/accounts/email-login';import { ServerDropdown } from '@/renderer/components/servers/server-dropdown';-import { useApp } from '@/renderer/contexts/app';import { useNavigate } from 'react-router-dom';import { Separator } from '@/renderer/components/ui/separator';+import { Account } from '@/shared/types/accounts';+import { Server } from '@/shared/types/servers';-export const LoginForm = () => {- const app = useApp();+interface LoginFormProps {+ accounts: Account[];+ servers: Server[];+}++export const LoginForm = ({ accounts, servers }: LoginFormProps) => {const navigate = useNavigate();const [showRegister, setShowRegister] = React.useState(false);- const [server, setServer] = React.useState(app.servers[0]);+ const [server, setServer] = React.useState(servers[0]);return (<div className="flex flex-col gap-4">- <ServerDropdown value={server} onChange={setServer} />+ <ServerDropdown value={server} onChange={setServer} servers={servers} />{showRegister ? (<EmailRegister server={server} />) : (@@ -31,7 +36,7 @@ export const LoginForm = () => {? 'Already have an account? Login': 'No account yet? Register'}</p>- {app.accounts.length > 0 && (+ {accounts.length > 0 && (<React.Fragment><Separator className="w-full" /><pdiff --git a/apps/desktop/src/renderer/components/accounts/login.tsx b/apps/desktop/src/renderer/components/accounts/login.tsxindex 2f245803..50a8eeda 100644--- a/apps/desktop/src/renderer/components/accounts/login.tsx+++ b/apps/desktop/src/renderer/components/accounts/login.tsx@@ -1,6 +1,19 @@import { LoginForm } from '@/renderer/components/accounts/login-form';+import { useQuery } from '@/renderer/hooks/use-query';export const Login = () => {+ const { data: accounts, isPending: isPendingAccounts } = useQuery({+ type: 'account_list',+ });++ const { data: servers, isPending: isPendingServers } = useQuery({+ type: 'server_list',+ });++ if (isPendingAccounts || isPendingServers) {+ return null;+ }+return (<div className="grid h-screen min-h-screen w-full grid-cols-5"><div className="col-span-2 flex items-center justify-center bg-zinc-950">@@ -16,7 +29,7 @@ export const Login = () => {Use one of the following methods to login</p></div>- <LoginForm />+ <LoginForm accounts={accounts} servers={servers} /></div></div></div>diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsxindex 316ec6d3..a7f8e950 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx@@ -16,49 +16,28 @@ import {import { Avatar } from '@/renderer/components/avatars/avatar';import { useAccount } from '@/renderer/contexts/account';import { Check, ChevronsUpDown, LogOut, Plus, Settings } from 'lucide-react';-import { useApp } from '@/renderer/contexts/app';import { useNavigate } from 'react-router-dom';import { useRadar } from '@/renderer/contexts/radar';import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';--interface AccountReadState {- importantCount: number;- hasUnseenChanges: boolean;-}+import { useQuery } from '@/renderer/hooks/use-query';+import { AccountReadState } from '@/shared/types/radars';export function LayoutSidebarFooter() {- const app = useApp();const account = useAccount();const sidebar = useSidebar();const navigate = useNavigate();const radar = useRadar();const [open, setOpen] = React.useState(false);- const otherAccounts = app.accounts.filter((a) => a.id !== account.id);+ const { data } = useQuery({+ type: 'account_list',+ });+ const accounts = data ?? [];+ const otherAccounts = accounts.filter((a) => a.id !== account.id);const accountStates: Record<string, AccountReadState> = {};- for (const accountItem of app.accounts) {- const accountWorkspaces = app.workspaces.filter(- (w) => w.accountId === accountItem.id- );-- const state: AccountReadState = {- importantCount: 0,- hasUnseenChanges: false,- };-- for (const accountWorkspace of accountWorkspaces) {- const workspaceState = radar.getWorkspaceState(accountWorkspace.userId);- if (!workspaceState) {- continue;- }-- state.importantCount += workspaceState.importantCount;- state.hasUnseenChanges =- state.hasUnseenChanges || workspaceState.hasUnseenChanges;- }-- accountStates[accountItem.id] = state;+ for (const accountItem of otherAccounts) {+ accountStates[accountItem.id] = radar.getAccountState(accountItem.id);}const importantCount = Object.values(accountStates).reduce(@@ -138,7 +117,7 @@ export function LayoutSidebarFooter() {<React.Fragment><DropdownMenuSeparator /><DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>- {app.accounts.map((accountItem) => {+ {accounts.map((accountItem) => {const state = accountStates[accountItem.id];return (<DropdownMenuItemdiff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsxindex b706c1d0..c56ff59a 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx@@ -20,6 +20,7 @@ import {import { ChevronsUpDown, Settings, Plus, Bell, Check } from 'lucide-react';import { useRadar } from '@/renderer/contexts/radar';import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { useQuery } from '@/renderer/hooks/use-query';export const LayoutSidebarHeader = () => {const workspace = useWorkspace();@@ -29,9 +30,13 @@ export const LayoutSidebarHeader = () => {const radar = useRadar();const [open, setOpen] = React.useState(false);- const otherWorkspaces = account.workspaces.filter(- (w) => w.id !== workspace.id- );+ const { data } = useQuery({+ type: 'workspace_list',+ accountId: account.id,+ });++ const workspaces = data ?? [];+ const otherWorkspaces = workspaces.filter((w) => w.id !== workspace.id);const otherWorkspaceStates = otherWorkspaces.map((w) =>radar.getWorkspaceState(w.userId));@@ -108,7 +113,7 @@ export const LayoutSidebarHeader = () => {<DropdownMenuLabel className="mb-1">Workspaces</DropdownMenuLabel>- {account.workspaces.map((workspaceItem) => {+ {workspaces.map((workspaceItem) => {const workspaceState = radar.getWorkspaceState(workspaceItem.userId);diff --git a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx b/apps/desktop/src/renderer/components/servers/server-dropdown.tsxindex c6a757a9..6e1e6bef 100644--- a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx+++ b/apps/desktop/src/renderer/components/servers/server-dropdown.tsx@@ -10,15 +10,18 @@ import { Server } from '@/shared/types/servers';import { ServerCreateDialog } from '@/renderer/components/servers/server-create-dialog';import { DropdownMenuSeparator } from '@radix-ui/react-dropdown-menu';import { ChevronDown } from 'lucide-react';-import { useApp } from '@/renderer/contexts/app';interface ServerDropdownProps {value: Server;onChange: (server: Server) => void;+ servers: Server[];}-export const ServerDropdown = ({ value, onChange }: ServerDropdownProps) => {- const app = useApp();+export const ServerDropdown = ({+ value,+ onChange,+ servers,+}: ServerDropdownProps) => {const [openCreate, setOpenCreate] = React.useState(false);return (@@ -35,7 +38,7 @@ export const ServerDropdown = ({ value, onChange }: ServerDropdownProps) => {</div></DropdownMenuTrigger><DropdownMenuContent className="w-96">- {app.servers.map((server) => (+ {servers.map((server) => (<DropdownMenuItemkey={server.domain}onSelect={() => {diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsxindex b37ddf24..cacbc691 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx@@ -3,6 +3,7 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { useAccount } from '@/renderer/contexts/account';import { useNavigate } from 'react-router-dom';import { WorkspaceForm } from '@/renderer/components/workspaces/workspace-form';+import { useQuery } from '@/renderer/hooks/use-query';export const WorkspaceCreate = () => {const account = useAccount();@@ -10,8 +11,13 @@ export const WorkspaceCreate = () => {const { mutate, isPending } = useMutation();- const handleCancel =- account.workspaces.length > 0 ? () => navigate('/') : undefined;+ const { data } = useQuery({+ type: 'workspace_list',+ accountId: account.id,+ });++ const workspaces = data ?? [];+ const handleCancel = workspaces.length > 0 ? () => navigate('/') : undefined;return (<div className="container flex flex-row justify-center">diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsxindex 28688e03..f69a8ba3 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx@@ -1,19 +1,30 @@import React from 'react';import { useNavigate } from 'react-router-dom';import { useAccount } from '@/renderer/contexts/account';+import { useQuery } from '@/renderer/hooks/use-query';export const WorkspaceRedirect = (): React.ReactNode => {const account = useAccount();const navigate = useNavigate();+ const { data, isPending } = useQuery({+ type: 'workspace_list',+ accountId: account.id,+ });++ const workspaces = data ?? [];React.useEffect(() => {- if (account.workspaces.length == 0) {+ if (isPending) {+ return;+ }++ if (workspaces.length == 0) {navigate(`/${account.id}/create`);return;}- navigate(`/${account.id}/${account.workspaces[0].id}`);- }, [account.workspaces, navigate]);+ navigate(`/${account.id}/${workspaces[0].id}`);+ }, [workspaces, navigate, isPending]);return null;};diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsxindex 42693b72..b3c96bc3 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx@@ -4,15 +4,23 @@ import { useParams, useSearchParams } from 'react-router-dom';import { useAccount } from '@/renderer/contexts/account';import { Layout } from '@/renderer/components/layouts/layout';import { WorkspaceSettingsDialog } from '@/renderer/components/workspaces/workspace-settings-dialog';+import { useQuery } from '@/renderer/hooks/use-query';export const Workspace = () => {const { workspaceId } = useParams<{ workspaceId: string }>();- const [searchParams, setSearchParams] = useSearchParams();const account = useAccount();+ const [searchParams, setSearchParams] = useSearchParams();+const [openSettings, setOpenSettings] = React.useState(false);- const workspace = account.workspaces.find((w) => w.id === workspaceId);+ const { data, isPending } = useQuery({+ type: 'workspace_get',+ accountId: account.id,+ workspaceId,+ });++ const workspace = data ?? null;if (!workspace) {return <p>Workspace not found</p>;diff --git a/apps/desktop/src/renderer/contexts/account.ts b/apps/desktop/src/renderer/contexts/account.tsindex 8787065f..fe225302 100644--- a/apps/desktop/src/renderer/contexts/account.ts+++ b/apps/desktop/src/renderer/contexts/account.ts@@ -1,9 +1,7 @@import { createContext, useContext } from 'react';import { Account } from '@/shared/types/accounts';-import { Workspace } from '@/shared/types/workspaces';interface AccountContext extends Account {- workspaces: Workspace[];openSettings: () => void;openLogout: () => void;}diff --git a/apps/desktop/src/renderer/contexts/app.ts b/apps/desktop/src/renderer/contexts/app.tsindex a44c3d6c..a4778d14 100644--- a/apps/desktop/src/renderer/contexts/app.ts+++ b/apps/desktop/src/renderer/contexts/app.ts@@ -1,13 +1,6 @@import { createContext, useContext } from 'react';-import { Account } from '@/shared/types/accounts';-import { Workspace } from '@/shared/types/workspaces';-import { Server } from '@/shared/types/servers';-interface AppContext {- accounts: Account[];- workspaces: Workspace[];- servers: Server[];-}+interface AppContext {}export const AppContext = createContext<AppContext>({} as AppContext);diff --git a/apps/desktop/src/renderer/contexts/radar.ts b/apps/desktop/src/renderer/contexts/radar.tsindex 2a6f7754..947118e7 100644--- a/apps/desktop/src/renderer/contexts/radar.ts+++ b/apps/desktop/src/renderer/contexts/radar.ts@@ -1,4 +1,5 @@import {+ AccountReadState,ChannelReadState,ChatReadState,WorkspaceReadState,@@ -6,6 +7,7 @@ import {import { createContext, useContext } from 'react';interface RadarContext {+ getAccountState: (accountId: string) => AccountReadState;getWorkspaceState: (userId: string) => WorkspaceReadState;getChatState: (userId: string, nodeId: string) => ChatReadState;getChannelState: (userId: string, nodeId: string) => ChannelReadState;diff --git a/apps/desktop/src/renderer/radar-provider.tsx b/apps/desktop/src/renderer/radar-provider.tsxindex 6a0b2db7..9b691903 100644--- a/apps/desktop/src/renderer/radar-provider.tsx+++ b/apps/desktop/src/renderer/radar-provider.tsx@@ -7,23 +7,49 @@ interface RadarProviderProps {export const RadarProvider = ({ children }: RadarProviderProps) => {const { data } = useQuery({- type: 'read_states_get',+ type: 'radar_data_get',});+ const radarData = data ?? {};return (<RadarContext.Providervalue={{- getWorkspaceState: (userId) => {- return (- data?.[userId] ?? {- nodeStates: {},- importantCount: 0,- hasUnseenChanges: false,- }+ getAccountState: (accountId) => {+ const workspaceStates = Object.values(radarData).filter(+ (state) => state.accountId === accountId+ );++ const importantCount = workspaceStates.reduce(+ (acc, state) => acc + state.importantCount,+ 0);++ const hasUnseenChanges = workspaceStates.some(+ (state) => state.hasUnseenChanges+ );++ return {+ importantCount,+ hasUnseenChanges,+ };+ },+ getWorkspaceState: (userId) => {+ const workspaceState = radarData[userId];+ if (workspaceState) {+ return {+ hasUnseenChanges: workspaceState.hasUnseenChanges,+ importantCount: workspaceState.importantCount,+ };+ }++ return {+ nodeStates: {},+ importantCount: 0,+ hasUnseenChanges: false,+ };},getChatState: (userId, nodeId) => {- const workspaceState = data?.[userId];+ const workspaceState = radarData[userId];if (workspaceState) {const chatState = workspaceState.nodeStates[nodeId];if (chatState && chatState.type === 'chat') {@@ -39,7 +65,7 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {};},getChannelState: (userId, nodeId) => {- const workspaceState = data?.[userId];+ const workspaceState = radarData[userId];if (workspaceState) {const channelState = workspaceState.nodeStates[nodeId];if (channelState && channelState.type === 'channel') {diff --git a/apps/desktop/src/renderer/app-loading.tsx b/apps/desktop/src/renderer/root-loader.tsxsimilarity index 92%rename from apps/desktop/src/renderer/app-loading.tsxrename to apps/desktop/src/renderer/root-loader.tsxindex c3293c12..eba1a2a9 100644--- a/apps/desktop/src/renderer/app-loading.tsx+++ b/apps/desktop/src/renderer/root-loader.tsx@@ -1,6 +1,6 @@import { Spinner } from '@/renderer/components/ui/spinner';-export const AppLoading = () => {+export const RootLoader = () => {return (<div className="min-w-screen flex h-full min-h-screen w-full items-center justify-center"><div className="flex flex-col items-center gap-8 text-center">diff --git a/apps/desktop/src/renderer/root.tsx b/apps/desktop/src/renderer/root.tsxindex 60b95d38..02a6fa74 100644--- a/apps/desktop/src/renderer/root.tsx+++ b/apps/desktop/src/renderer/root.tsx@@ -17,7 +17,7 @@ import { Event } from '@/shared/types/events';import { AccountRedirect } from '@/renderer/components/accounts/account-redirect';import { Account } from '@/renderer/components/accounts/account';import { DelayedComponent } from '@/renderer/components/ui/delayed-component';-import { AppLoading } from '@/renderer/app-loading';+import { RootLoader } from '@/renderer/root-loader';const router = createHashRouter([{@@ -108,7 +108,7 @@ const Root = () => {if (!initialized) {return (<DelayedComponent>- <AppLoading />+ <RootLoader /></DelayedComponent>);}diff --git a/apps/desktop/src/shared/queries/account-get.ts b/apps/desktop/src/shared/queries/account-get.tsnew file mode 100644index 00000000..8c9d8bd8--- /dev/null+++ b/apps/desktop/src/shared/queries/account-get.ts@@ -0,0 +1,15 @@+import { Account } from '@/shared/types/accounts';++export type AccountGetQueryInput = {+ type: 'account_get';+ accountId: string;+};++declare module '@/shared/queries' {+ interface QueryMap {+ account_get: {+ input: AccountGetQueryInput;+ output: Account | null;+ };+ }+}diff --git a/apps/desktop/src/shared/queries/radar-data-get.ts b/apps/desktop/src/shared/queries/radar-data-get.tsnew file mode 100644index 00000000..25ccf6ee--- /dev/null+++ b/apps/desktop/src/shared/queries/radar-data-get.ts@@ -0,0 +1,14 @@+import { WorkspaceRadarData } from '@/shared/types/radars';++export type RadarDataGetQueryInput = {+ type: 'radar_data_get';+};++declare module '@/shared/queries' {+ interface QueryMap {+ radar_data_get: {+ input: RadarDataGetQueryInput;+ output: Record<string, WorkspaceRadarData>;+ };+ }+}diff --git a/apps/desktop/src/shared/queries/read-states-get.ts b/apps/desktop/src/shared/queries/read-states-get.tsdeleted file mode 100644index de44b6da..00000000--- a/apps/desktop/src/shared/queries/read-states-get.ts+++ /dev/null@@ -1,14 +0,0 @@-import { WorkspaceReadState } from '@/shared/types/radars';--export type ReadStatesGetQueryInput = {- type: 'read_states_get';-};--declare module '@/shared/queries' {- interface QueryMap {- read_states_get: {- input: ReadStatesGetQueryInput;- output: Record<string, WorkspaceReadState>;- };- }-}diff --git a/apps/desktop/src/shared/queries/workspace-get.ts b/apps/desktop/src/shared/queries/workspace-get.tsnew file mode 100644index 00000000..9c1a1f6a--- /dev/null+++ b/apps/desktop/src/shared/queries/workspace-get.ts@@ -0,0 +1,16 @@+import { Workspace } from '@/shared/types/workspaces';++export type WorkspaceGetQueryInput = {+ type: 'workspace_get';+ accountId: string;+ workspaceId: string;+};++declare module '@/shared/queries' {+ interface QueryMap {+ workspace_get: {+ input: WorkspaceGetQueryInput;+ output: Workspace | null;+ };+ }+}diff --git a/apps/desktop/src/shared/queries/workspace-list.ts b/apps/desktop/src/shared/queries/workspace-list.tsindex aaa93301..51c2e250 100644--- a/apps/desktop/src/shared/queries/workspace-list.ts+++ b/apps/desktop/src/shared/queries/workspace-list.ts@@ -2,6 +2,7 @@ import { Workspace } from '@/shared/types/workspaces';export type WorkspaceListQueryInput = {type: 'workspace_list';+ accountId: string;};declare module '@/shared/queries' {diff --git a/apps/desktop/src/shared/types/radars.ts b/apps/desktop/src/shared/types/radars.tsindex 0cdd2b32..93ff7a9d 100644--- a/apps/desktop/src/shared/types/radars.ts+++ b/apps/desktop/src/shared/types/radars.ts@@ -41,10 +41,21 @@ export type FolderState = {export type WorkspaceReadState = {importantCount: number;hasUnseenChanges: boolean;- nodeStates: Record<string, ReadState>;};-export type ReadState =+export type AccountReadState = {+ importantCount: number;+ hasUnseenChanges: boolean;+};++export type WorkspaceRadarData = WorkspaceReadState & {+ userId: string;+ workspaceId: string;+ accountId: string;+ nodeStates: Record<string, NodeReadState>;+};++export type NodeReadState =| ChannelReadState| ChatReadState| DatabaseReadState