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
Implement account update form
Hakan Shehu3f32e64a7786
diff --git a/desktop/src/main/handlers/mutations/account-update.ts b/desktop/src/main/handlers/mutations/account-update.tsnew file mode 100644index 00000000..b10362a4--- /dev/null+++ b/desktop/src/main/handlers/mutations/account-update.ts@@ -0,0 +1,67 @@+import { databaseManager } from '@/main/data/database-manager';+import { httpClient } from '@/lib/http-client';+import { MutationHandler, MutationResult } from '@/operations/mutations';+import { AccountUpdateOutput } from '@/types/accounts';+import { AccountUpdateMutationInput } from '@/operations/mutations/account-update';++export class AccountUpdateMutationHandler+ implements MutationHandler<AccountUpdateMutationInput>+{+ async handleMutation(+ input: AccountUpdateMutationInput,+ ): Promise<MutationResult<AccountUpdateMutationInput>> {+ const account = await databaseManager.appDatabase+ .selectFrom('accounts')+ .selectAll()+ .where('id', '=', input.id)+ .executeTakeFirst();++ if (!account) {+ throw new Error('Account not found!');+ }++ const server = await databaseManager.appDatabase+ .selectFrom('servers')+ .selectAll()+ .where('domain', '=', account.server)+ .executeTakeFirst();++ if (!server) {+ throw new Error('Account not found');+ }++ const { data } = await httpClient.put<AccountUpdateOutput>(+ `/v1/accounts/${input.id}`,+ {+ name: input.name,+ avatar: input.avatar,+ },+ {+ serverDomain: server.domain,+ serverAttributes: server.attributes,+ token: account.token,+ },+ );++ await databaseManager.appDatabase+ .updateTable('accounts')+ .set({+ name: data.name,+ avatar: data.avatar,+ })+ .where('id', '=', input.id)+ .execute();++ return {+ output: {+ success: true,+ },+ changes: [+ {+ type: 'app',+ table: 'accounts',+ },+ ],+ };+ }+}diff --git a/desktop/src/main/handlers/mutations/index.ts b/desktop/src/main/handlers/mutations/index.tsindex 8395d54e..237bc99a 100644--- a/desktop/src/main/handlers/mutations/index.ts+++ b/desktop/src/main/handlers/mutations/index.ts@@ -35,6 +35,7 @@ import { FolderCreateMutationHandler } from '@/main/handlers/mutations/folder-crimport { FileCreateMutationHandler } from '@/main/handlers/mutations/file-create';import { FileDownloadMutationHandler } from '@/main/handlers/mutations/file-download';import { SpaceUpdateMutationHandler } from '@/main/handlers/mutations/space-update';+import { AccountUpdateMutationHandler } from '@/main/handlers/mutations/account-update';type MutationHandlerMap = {[K in keyof MutationMap]: MutationHandler<MutationMap[K]['input']>;@@ -77,4 +78,5 @@ export const mutationHandlerMap: MutationHandlerMap = {file_create: new FileCreateMutationHandler(),file_download: new FileDownloadMutationHandler(),space_update: new SpaceUpdateMutationHandler(),+ account_update: new AccountUpdateMutationHandler(),};diff --git a/desktop/src/main/handlers/mutations/workspace-create.ts b/desktop/src/main/handlers/mutations/workspace-create.tsindex 93f7d4ed..abc38d01 100644--- a/desktop/src/main/handlers/mutations/workspace-create.ts+++ b/desktop/src/main/handlers/mutations/workspace-create.ts@@ -1,11 +1,7 @@import { databaseManager } from '@/main/data/database-manager';import { httpClient } from '@/lib/http-client';import { WorkspaceCreateMutationInput } from '@/operations/mutations/workspace-create';-import {- MutationChange,- MutationHandler,- MutationResult,-} from '@/operations/mutations';+import { MutationHandler, MutationResult } from '@/operations/mutations';import { WorkspaceOutput } from '@/types/workspaces';export class WorkspaceCreateMutationHandler@@ -86,23 +82,21 @@ export class WorkspaceCreateMutationHandler.onConflict((cb) => cb.doNothing()).execute();- const changedTables: MutationChange[] = [- {- type: 'app',- table: 'workspaces',- },- {- type: 'workspace',- table: 'nodes',- userId: user.id,- },- ];-return {output: {id: data.id,},- changes: changedTables,+ changes: [+ {+ type: 'app',+ table: 'workspaces',+ },+ {+ type: 'workspace',+ table: 'nodes',+ userId: user.id,+ },+ ],};}}diff --git a/desktop/src/main/handlers/mutations/workspace-update.ts b/desktop/src/main/handlers/mutations/workspace-update.tsindex dbe59d32..192f388f 100644--- a/desktop/src/main/handlers/mutations/workspace-update.ts+++ b/desktop/src/main/handlers/mutations/workspace-update.ts@@ -65,18 +65,16 @@ export class WorkspaceUpdateMutationHandler).execute();- const changedTables: MutationChange[] = [- {- type: 'app',- table: 'workspaces',- },- ];-return {output: {success: true,},- changes: changedTables,+ changes: [+ {+ type: 'app',+ table: 'workspaces',+ },+ ],};}}diff --git a/desktop/src/operations/mutations/account-update.ts b/desktop/src/operations/mutations/account-update.tsnew file mode 100644index 00000000..36fe606c--- /dev/null+++ b/desktop/src/operations/mutations/account-update.ts@@ -0,0 +1,19 @@+export type AccountUpdateMutationInput = {+ type: 'account_update';+ id: string;+ name: string;+ avatar: string | null;+};++export type AccountUpdateMutationOutput = {+ success: boolean;+};++declare module '@/operations/mutations' {+ interface MutationMap {+ account_update: {+ input: AccountUpdateMutationInput;+ output: AccountUpdateMutationOutput;+ };+ }+}diff --git a/desktop/src/renderer/components/accounts/account-settings-dialog.tsx b/desktop/src/renderer/components/accounts/account-settings-dialog.tsxnew file mode 100644index 00000000..c3eccb87--- /dev/null+++ b/desktop/src/renderer/components/accounts/account-settings-dialog.tsx@@ -0,0 +1,94 @@+import React from 'react';+import {+ Dialog,+ DialogContent,+ DialogTitle,+} from '@/renderer/components/ui/dialog';+import {+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+} from '@/renderer/components/ui/tabs';+import { VisuallyHidden } from '@radix-ui/react-visually-hidden';+import { Avatar } from '../avatars/avatar';+import { useAccount } from '@/renderer/contexts/account';+import { Info, Trash2 } from 'lucide-react';+import { AccountUpdate } from '@/renderer/components/accounts/account-update';++interface AccountSettingsDialogProps {+ id: string;+ open: boolean;+ onOpenChange: (open: boolean) => void;+}++export const AccountSettingsDialog = ({+ id,+ open,+ onOpenChange,+}: AccountSettingsDialogProps) => {+ const account = useAccount();++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent+ className="md:min-h-3/4 md:max-h-3/4 p-3 md:h-3/4 md:w-3/4 md:max-w-full"+ aria-describedby={undefined}+ >+ <VisuallyHidden>+ <DialogTitle>Workspace Settings</DialogTitle>+ </VisuallyHidden>+ <Tabs+ defaultValue="info"+ className="grid h-full max-h-full grid-cols-[240px_minmax(0,1fr)] overflow-hidden"+ >+ <TabsList className="flex h-full max-h-full flex-col items-start justify-start gap-1 rounded-none border-r border-r-gray-100 bg-white pr-3">+ <div className="mb-1 flex h-10 w-full items-center justify-between bg-gray-50 p-1 text-foreground/80">+ <div className="flex items-center gap-2">+ <Avatar+ id={account.id}+ name={account.name}+ avatar={account.avatar}+ size="small"+ />+ <span>{account.name}</span>+ </div>+ </div>+ <TabsTrigger+ key={`tab-trigger-info`}+ className="w-full justify-start p-2 hover:bg-gray-50"+ value="info"+ >+ <Info className="mr-2 size-4" />+ Info+ </TabsTrigger>+ <TabsTrigger+ key={`tab-trigger-delete`}+ className="w-full justify-start p-2 hover:bg-gray-50"+ value="delete"+ >+ <Trash2 className="mr-2 size-4" />+ Delete+ </TabsTrigger>+ </TabsList>+ <div className="overflow-auto p-4">+ <TabsContent+ key="tab-content-info"+ className="focus-visible:ring-0 focus-visible:ring-offset-0"+ value="info"+ >+ <AccountUpdate />+ </TabsContent>+ <TabsContent+ key="tab-content-delete"+ className="focus-visible:ring-0 focus-visible:ring-offset-0"+ value="delete"+ >+ <p>Coming soon.</p>+ </TabsContent>+ </div>+ </Tabs>+ </DialogContent>+ </Dialog>+ );+};diff --git a/desktop/src/renderer/components/accounts/account-update.tsx b/desktop/src/renderer/components/accounts/account-update.tsxnew file mode 100644index 00000000..51a6df5e--- /dev/null+++ b/desktop/src/renderer/components/accounts/account-update.tsx@@ -0,0 +1,196 @@+import React from 'react';+import {+ Form,+ FormField,+ FormItem,+ FormLabel,+ FormControl,+ FormMessage,+} from '@/renderer/components/ui/form';+import { useForm } from 'react-hook-form';+import { zodResolver } from '@hookform/resolvers/zod';+import { z } from 'zod';+import { useAccount } from '@/renderer/contexts/account';+import { useMutation } from '@/renderer/hooks/use-mutation';+import { toast } from '@/renderer/hooks/use-toast';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { cn } from '@/lib/utils';+import { Spinner } from '@/renderer/components/ui/spinner';+import { Upload } from 'lucide-react';+import { Input } from '@/renderer/components/ui/input';+import { Button } from '@/renderer/components/ui/button';++const formSchema = z.object({+ name: z.string().min(3, 'Name must be at least 3 characters long.'),+ avatar: z.string().optional().nullable(),+ email: z.string().email('Invalid email address'),+});++type formSchemaType = z.infer<typeof formSchema>;++export const AccountUpdate = () => {+ const account = useAccount();+ const { mutate: uploadAvatar, isPending: isUploadingAvatar } = useMutation();+ const { mutate: updateAccount, isPending: isUpdatingAccount } = useMutation();++ const [isFileDialogOpen, setIsFileDialogOpen] = React.useState(false);++ const form = useForm<formSchemaType>({+ resolver: zodResolver(formSchema),+ defaultValues: {+ name: account.name,+ avatar: account.avatar,+ email: account.email,+ },+ });++ const name = form.watch('name');+ const avatar = form.watch('avatar');++ const onSubmit = (values: formSchemaType) => {+ if (isUpdatingAccount) {+ return;+ }++ updateAccount({+ input: {+ type: 'account_update',+ id: account.id,+ name: values.name,+ avatar: values.avatar,+ },+ onSuccess() {+ toast({+ title: 'Account updated',+ description: 'Account was updated successfully',+ variant: 'default',+ });+ },+ onError() {+ toast({+ title: 'Failed to update account',+ description:+ 'Something went wrong updating account. Please try again!',+ variant: 'destructive',+ });+ },+ });+ };++ return (+ <Form {...form}>+ <form className="flex flex-col" onSubmit={form.handleSubmit(onSubmit)}>+ <div className="flex flex-row gap-1">+ <div className="h-40 w-40 pt-3">+ <div+ className="group relative cursor-pointer"+ onClick={async () => {+ if (+ isUpdatingAccount ||+ isUploadingAvatar ||+ isFileDialogOpen+ ) {+ return;+ }++ setIsFileDialogOpen(true);+ const result = await window.neuron.openFileDialog({+ properties: ['openFile'],+ filters: [+ { name: 'Images', extensions: ['jpg', 'png', 'jpeg'] },+ ],+ });++ if (result.canceled || !result.filePaths.length) {+ setIsFileDialogOpen(false);+ return;+ }++ const filePath = result.filePaths[0];+ uploadAvatar({+ input: {+ type: 'avatar_upload',+ accountId: account.id,+ filePath: filePath,+ },+ onSuccess(output) {+ if (output.status === 'success' && output.id) {+ form.setValue('avatar', output.id);+ }+ setIsFileDialogOpen(false);+ },+ onError() {+ toast({+ title: 'Failed to upload avatar',+ description:+ 'Something went wrong trying to upload avatar. Please try again.',+ variant: 'destructive',+ });+ setIsFileDialogOpen(false);+ },+ });+ }}+ >+ <Avatar+ id={account.id}+ name={name}+ avatar={avatar}+ className="h-32 w-32"+ />+ <div+ className={cn(+ `absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-gray-50 group-hover:inline-flex`,+ isUploadingAvatar ? 'inline-flex' : 'hidden',+ )}+ >+ {isUploadingAvatar ? (+ <Spinner className="size-5" />+ ) : (+ <Upload className="size-5 text-foreground" />+ )}+ </div>+ </div>+ </div>+ <div className="flex-grow space-y-4 py-2 pb-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem className="flex-1">+ <FormLabel>Name *</FormLabel>+ <FormControl>+ <Input placeholder="Name" {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <FormField+ control={form.control}+ name="email"+ render={({ field }) => (+ <FormItem className="flex-1">+ <FormLabel>Email</FormLabel>+ <FormControl>+ <Input readOnly placeholder="Email" {...field} disabled />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ </div>++ <div className="flex flex-row justify-end gap-2">+ <Button+ type="submit"+ disabled={isUpdatingAccount || isUploadingAvatar}+ >+ {isUpdatingAccount && <Spinner className="mr-1" />}+ Save+ </Button>+ </div>+ </form>+ </Form>+ );+};diff --git a/desktop/src/renderer/components/app.tsx b/desktop/src/renderer/components/app.tsxindex b063a837..b5df56cb 100644--- a/desktop/src/renderer/components/app.tsx+++ b/desktop/src/renderer/components/app.tsx@@ -6,9 +6,11 @@ import { Outlet } from 'react-router-dom';import { AccountLogout } from '@/renderer/components/accounts/account-logout';import { DelayedComponent } from '@/renderer/components/ui/delayed-component';import { useQuery } from '@/renderer/hooks/use-query';+import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';export const App = () => {const [showLogout, setShowLogout] = React.useState(false);+ const [showAccountSettings, setShowAccountSettings] = React.useState(false);const { data: servers, isPending: isPendingServers } = useQuery({type: 'server_list',@@ -54,6 +56,9 @@ export const App = () => {logout: () => {setShowLogout(true);},+ openSettings: () => {+ setShowAccountSettings(true);+ },}}><Outlet />@@ -68,6 +73,13 @@ export const App = () => {}}/>)}+ {showAccountSettings && (+ <AccountSettingsDialog+ id={account.id}+ open={showAccountSettings}+ onOpenChange={setShowAccountSettings}+ />+ )}</AccountContext.Provider>);};diff --git a/desktop/src/renderer/components/messages/message.tsx b/desktop/src/renderer/components/messages/message.tsxindex 90b17fba..ead41ae4 100644--- a/desktop/src/renderer/components/messages/message.tsx+++ b/desktop/src/renderer/components/messages/message.tsx@@ -70,6 +70,7 @@ export const Message = ({<Avatarid={message.author.id}name={message.author.name}+ avatar={message.author.avatar}size="medium"/>)}diff --git a/desktop/src/renderer/components/workspaces/sidebars/sidebar-footer.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-footer.tsxindex f733aee5..e2c2bf28 100644--- a/desktop/src/renderer/components/workspaces/sidebars/sidebar-footer.tsx+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-footer.tsx@@ -15,7 +15,7 @@ import {} from '@/renderer/components/ui/sidebar';import { Avatar } from '@/renderer/components/avatars/avatar';import { useAccount } from '@/renderer/contexts/account';-import { ChevronsDownUp, ChevronsUpDown, LogOut } from 'lucide-react';+import { ChevronsUpDown, LogOut, Settings } from 'lucide-react';export function SidebarFooter() {const account = useAccount();@@ -64,6 +64,15 @@ export function SidebarFooter() {</div></DropdownMenuLabel><DropdownMenuSeparator />+ <DropdownMenuItem+ className="flex items-center gap-2"+ onClick={() => {+ account.openSettings();+ }}+ >+ <Settings className="size-4" />+ Settings+ </DropdownMenuItem><DropdownMenuItemclassName="flex items-center gap-2"onClick={() => {diff --git a/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx b/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsxindex 0819d2d4..4d0a5a94 100644--- a/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx+++ b/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx@@ -1,5 +1,9 @@import React from 'react';-import { Dialog, DialogContent } from '@/renderer/components/ui/dialog';+import {+ Dialog,+ DialogContent,+ DialogTitle,+} from '@/renderer/components/ui/dialog';import {Tabs,TabsContent,@@ -11,7 +15,6 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { WorkspaceUpdate } from '@/renderer/components/workspaces/workspace-update';import { WorkspaceUsers } from '@/renderer/components/workspaces/workspace-users';import { VisuallyHidden } from '@radix-ui/react-visually-hidden';-import { DialogTitle } from '@radix-ui/react-dialog';import { Info, Trash2, Users } from 'lucide-react';interface WorkspaceSettingsDialogProps {diff --git a/desktop/src/renderer/contexts/account.ts b/desktop/src/renderer/contexts/account.tsindex 7e046874..8972bdcb 100644--- a/desktop/src/renderer/contexts/account.ts+++ b/desktop/src/renderer/contexts/account.ts@@ -5,6 +5,7 @@ import { Workspace } from '@/types/workspaces';interface AccountContext extends Account {workspaces: Workspace[];logout: () => void;+ openSettings: () => void;}export const AccountContext = createContext<AccountContext>(diff --git a/desktop/src/types/accounts.ts b/desktop/src/types/accounts.tsindex 4802265d..f72a62f6 100644--- a/desktop/src/types/accounts.ts+++ b/desktop/src/types/accounts.ts@@ -15,3 +15,9 @@ export type Account = {status: string;server: string;};++export type AccountUpdateOutput = {+ id: string;+ name: string;+ avatar?: string | null;+};diff --git a/server/src/routes/accounts.ts b/server/src/routes/accounts.tsindex 4a10d303..429d7bfe 100644--- a/server/src/routes/accounts.ts+++ b/server/src/routes/accounts.ts@@ -1,6 +1,8 @@import { Request, Response, Router } from 'express';import {AccountStatus,+ AccountUpdateInput,+ AccountUpdateOutput,EmailLoginInput,EmailRegisterInput,GoogleLoginInput,@@ -17,6 +19,12 @@ import { authMiddleware } from '@/middlewares/auth';import { generateToken } from '@/lib/tokens';import { mapNode } from '@/lib/nodes';import { enqueueTask } from '@/queues/tasks';+import * as Y from 'yjs';+import { fromUint8Array, toUint8Array } from 'js-base64';+import { CompiledQuery } from 'kysely';+import { ServerNodeAttributes } from '@/types/nodes';+import { NodeUpdatedEvent } from '@/types/events';+import { enqueueEvent } from '@/queues/events';const GoogleUserInfoUrl = 'https://www.googleapis.com/oauth2/v1/userinfo';const SaltRounds = 10;@@ -228,6 +236,157 @@ accountsRouter.delete(},);+accountsRouter.put(+ '/:id',+ authMiddleware,+ async (req: NeuronRequest, res: NeuronResponse) => {+ const id = req.params.id;+ const input: AccountUpdateInput = req.body;++ if (!req.account) {+ return res.status(401).json({+ code: ApiError.Unauthorized,+ message: 'Unauthorized.',+ });+ }++ if (id !== req.account.id) {+ return res.status(400).json({+ code: ApiError.BadRequest,+ message: 'Invalid account id.',+ });+ }++ const account = await database+ .selectFrom('accounts')+ .where('id', '=', req.account.id)+ .selectAll()+ .executeTakeFirst();++ if (!account) {+ return res.status(404).json({+ code: ApiError.ResourceNotFound,+ message: 'Account not found.',+ });+ }++ const nameChanged = account.name !== input.name;+ const avatarChanged = account.avatar !== input.avatar;++ if (!nameChanged && !avatarChanged) {+ return res.status(400).json({+ code: ApiError.BadRequest,+ message: 'Nothing to update.',+ });+ }++ const users = await database+ .selectFrom('nodes')+ .selectAll()+ .where(+ 'id',+ 'in',+ database+ .selectFrom('workspace_users')+ .select('id')+ .where('account_id', '=', req.account.id),+ )+ .execute();++ const updates: CompiledQuery[] = [];+ const events: NodeUpdatedEvent[] = [];++ updates.push(+ database+ .updateTable('accounts')+ .set({+ name: input.name,+ avatar: input.avatar,+ updated_at: new Date(),+ })+ .where('id', '=', req.account.id)+ .compile(),+ );++ for (const user of users) {+ const name = user.attributes.name;+ const avatar = user.attributes.avatar;++ if (account.name !== name || account.avatar !== avatar) {+ continue;+ }++ const doc = new Y.Doc({+ guid: user.id,+ });+ Y.applyUpdate(doc, toUint8Array(user.state));++ const attributesMap = doc.getMap('attributes');+ if (name != input.name) {+ attributesMap.set('name', input.name);+ }++ if (avatar != input.avatar) {+ attributesMap.set('avatar', input.avatar);+ }++ const attributes = attributesMap.toJSON() as ServerNodeAttributes;+ const attributesJson = JSON.stringify(attributes);+ const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));++ const updatedAt = new Date();+ const versionId = generateId(IdType.Version);++ updates.push(+ database+ .updateTable('nodes')+ .set({+ attributes: attributesJson,+ state: encodedState,+ updated_at: updatedAt,+ updated_by: user.id,+ version_id: versionId,+ server_updated_at: updatedAt,+ })+ .where('id', '=', user.id)+ .compile(),+ );++ const event: NodeUpdatedEvent = {+ type: 'node_updated',+ id: user.id,+ workspaceId: user.workspace_id,+ beforeAttributes: user.attributes,+ afterAttributes: attributes,+ updatedBy: user.id,+ updatedAt: updatedAt.toISOString(),+ serverUpdatedAt: updatedAt.toISOString(),+ versionId,+ };++ events.push(event);+ }++ await database.transaction().execute(async (trx) => {+ for (const update of updates) {+ await trx.executeQuery(update);+ }+ });++ for (const event of events) {+ await enqueueEvent(event);+ }++ const output: AccountUpdateOutput = {+ id: account.id,+ name: input.name,+ avatar: input.avatar,+ };++ return res.status(200).json(output);+ },+);+const buildLoginOutput = async (id: string,name: string,diff --git a/server/src/types/accounts.ts b/server/src/types/accounts.tsindex d569ada6..3351126e 100644--- a/server/src/types/accounts.ts+++ b/server/src/types/accounts.ts@@ -43,14 +43,13 @@ export enum AccountStatus {Active = 2,}-export type Account = {+export type AccountUpdateInput = {+ name: string;+ avatar?: string | null;+};++export type AccountUpdateOutput = {id: string;name: string;- email: string;avatar?: string | null;- password?: string | null;- attrs?: Record<string, any>;- createdAt: Date;- updatedAt?: Date | null;- status: AccountStatus;};