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
Select server on create and some UI improvements
Hakan Shehu2c55eb9fb6e6
diff --git a/apps/desktop/index.html b/apps/desktop/index.htmlindex 00f19c7e..db4902d6 100644--- a/apps/desktop/index.html+++ b/apps/desktop/index.html@@ -6,7 +6,7 @@<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP --><metahttp-equiv="Content-Security-Policy"- content="default-src 'self' 'unsafe-inline' data: avatar: local-file: local-file-preview: asset:; img-src 'self' https:;"+ content="default-src 'self' 'unsafe-inline' data:; img-src 'self' https: avatar: local-file: local-file-preview: asset:;"/></head>diff --git a/apps/desktop/src/main/mutations/servers/server-create.ts b/apps/desktop/src/main/mutations/servers/server-create.tsindex b4c37470..350a31e7 100644--- a/apps/desktop/src/main/mutations/servers/server-create.ts+++ b/apps/desktop/src/main/mutations/servers/server-create.ts@@ -35,7 +35,7 @@ export class ServerCreateMutationHandler}return {- success: true,+ server,};}}diff --git a/apps/desktop/src/renderer/components/avatars/avatar-popover.tsx b/apps/desktop/src/renderer/components/avatars/avatar-popover.tsxindex f71b7e3a..f2b6ee7e 100644--- a/apps/desktop/src/renderer/components/avatars/avatar-popover.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar-popover.tsx@@ -16,7 +16,10 @@ export const AvatarPopover = ({ onPick, children }: AvatarPopoverProps) => {return (<Popover><PopoverTrigger asChild>{children}</PopoverTrigger>- <PopoverContent className="w-max p-0">+ <PopoverContent+ className="w-max p-0"+ onWheel={(e) => e.stopPropagation()}+ ><AvatarPicker onPick={onPick} /></PopoverContent></Popover>diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker.tsxindex 061303ab..3564deb2 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx@@ -31,7 +31,7 @@ export const EmojiPicker = ({ onPick }: EmojiPickerProps) => {onSkinToneChange={setSkinTone}/></div>- <div className="h-[280px] min-h-[280px] overflow-auto w-[350px] min-w-[350px]">+ <div className="h-[280px] min-h-[280px] overflow-auto w-[330px] min-w-[330px]">{!isPending && data && (<EmojiPickerContext.Providervalue={{diff --git a/apps/desktop/src/renderer/components/icons/icon-picker.tsx b/apps/desktop/src/renderer/components/icons/icon-picker.tsxindex 24883cc7..2361ddf6 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker.tsx@@ -28,7 +28,7 @@ export const IconPicker = ({ onPick }: IconPickerProps) => {onChange={(e) => setQuery(e.target.value)}className="w-full rounded-md bg-gray-100 p-2 text-xs focus:outline-none"/>- <div className="h-[280px] min-h-[280px] overflow-auto w-[350px] min-w-[350px]">+ <div className="h-[280px] min-h-[280px] overflow-auto w-[330px] min-w-[330px]">{!isPending && data && (<IconPickerContext.Provider value={{ data, onPick }}>{query.length > 2 ? (diff --git a/apps/desktop/src/renderer/components/servers/server-create-dialog.tsx b/apps/desktop/src/renderer/components/servers/server-create-dialog.tsxindex 22e996b5..bfa18cc3 100644--- a/apps/desktop/src/renderer/components/servers/server-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/servers/server-create-dialog.tsx@@ -14,21 +14,29 @@ import { Label } from '@/renderer/components/ui/label';import { Spinner } from '@/renderer/components/ui/spinner';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';+import { Server } from '@/shared/types/servers';interface ServerCreateDialogProps {- open: boolean;- onOpenChange: (open: boolean) => void;+ onCancel: () => void;+ onCreate: (server: Server) => void;}export const ServerCreateDialog = ({- open,- onOpenChange,+ onCancel,+ onCreate,}: ServerCreateDialogProps) => {+ const [open, setOpen] = React.useState(true);const { mutate, isPending } = useMutation();const [domain, setDomain] = React.useState('');return (- <Dialog open={open} onOpenChange={onOpenChange}>+ <Dialog+ open={open}+ onOpenChange={() => {+ onCancel();+ setOpen(false);+ }}+ ><DialogContent><DialogHeader><DialogTitle>Add a server</DialogTitle>@@ -43,11 +51,7 @@ export const ServerCreateDialog = ({/></div><DialogFooter>- <Button- type="button"- variant="outline"- onClick={() => onOpenChange(false)}- >+ <Button type="button" variant="outline" onClick={() => onCancel()}>Cancel</Button><Button@@ -59,8 +63,8 @@ export const ServerCreateDialog = ({type: 'server_create',domain,},- onSuccess() {- onOpenChange(false);+ onSuccess(output) {+ onCreate(output.server);},onError(error) {toast({diff --git a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx b/apps/desktop/src/renderer/components/servers/server-dropdown.tsxindex 6a4a9142..cf90fdde 100644--- a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx+++ b/apps/desktop/src/renderer/components/servers/server-dropdown.tsx@@ -76,7 +76,13 @@ export const ServerDropdown = ({</DropdownMenuContent></DropdownMenu>{openCreate && (- <ServerCreateDialog open={openCreate} onOpenChange={setOpenCreate} />+ <ServerCreateDialog+ onCancel={() => setOpenCreate(false)}+ onCreate={(server) => {+ setOpenCreate(false);+ onChange(server);+ }}+ />)}</React.Fragment>);diff --git a/apps/desktop/src/shared/mutations/servers/server-create.ts b/apps/desktop/src/shared/mutations/servers/server-create.tsindex de0ab1fb..1fdf758d 100644--- a/apps/desktop/src/shared/mutations/servers/server-create.ts+++ b/apps/desktop/src/shared/mutations/servers/server-create.ts@@ -1,10 +1,12 @@+import { Server } from '@/shared/types/servers';+export type ServerCreateMutationInput = {type: 'server_create';domain: string;};export type ServerCreateMutationOutput = {- success: boolean;+ server: Server;};declare module '@/shared/mutations' {