Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

feat(organizations): added organization settings (#41)

Corentin THOMASSETf22efaeb6336
diff --git a/apps/papra-client/src/modules/documents/pages/documents.page.tsx b/apps/papra-client/src/modules/documents/pages/documents.page.tsx
index 43142551..4d8f9cc6 100644
--- a/apps/papra-client/src/modules/documents/pages/documents.page.tsx
+++ b/apps/papra-client/src/modules/documents/pages/documents.page.tsx
@@ -79,7 +79,7 @@ export const DocumentsPage: Component = () => {
}));
return (
- <div class="p-6 mt-4 pb-32">
+ <div class="p-6 mt-4 pb-32">
{query[0].data?.documents.length === 0
? (
diff --git a/apps/papra-client/src/modules/organizations/components/create-organization-form.component.tsx b/apps/papra-client/src/modules/organizations/components/create-organization-form.component.tsx
index b2d52967..c22ee845 100644
--- a/apps/papra-client/src/modules/organizations/components/create-organization-form.component.tsx
+++ b/apps/papra-client/src/modules/organizations/components/create-organization-form.component.tsx
@@ -3,6 +3,7 @@ import { createForm } from '@/modules/shared/form/form';
import { Button } from '@/modules/ui/components/button';
import { TextField, TextFieldLabel, TextFieldRoot } from '@/modules/ui/components/textfield';
import * as v from 'valibot';
+import { organizationNameSchema } from '../organizations.schemas';
export const CreateOrganizationForm: Component<{
onSubmit: (args: { organizationName: string }) => Promise<void>;
@@ -11,11 +12,7 @@ export const CreateOrganizationForm: Component<{
const { form, Form, Field } = createForm({
onSubmit: ({ organizationName }) => props.onSubmit({ organizationName }),
schema: v.object({
- organizationName: v.pipe(
- v.string('Organization name must be a string'),
- v.minLength(3, 'Organization name must be at least 3 characters'),
- v.maxLength(50, 'Organization name must be at most 50 characters'),
- ),
+ organizationName: organizationNameSchema,
}),
initialValues: {
organizationName: props.initialOrganizationName,
diff --git a/apps/papra-client/src/modules/organizations/composables/useCreateOrganization.tsx b/apps/papra-client/src/modules/organizations/composables/useCreateOrganization.tsx
deleted file mode 100644
index b17640ed..00000000
--- a/apps/papra-client/src/modules/organizations/composables/useCreateOrganization.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { queryClient } from '@/modules/shared/query/query-client';
-import { createToast } from '@/modules/ui/components/sonner';
-import { useNavigate } from '@solidjs/router';
-import { createOrganization } from '../organizations.services';
-
-export function useCreateOrganization() {
- const navigate = useNavigate();
-
- return {
- createOrganization: async ({ organizationName }: { organizationName: string }) => {
- const { organization } = await createOrganization({ name: organizationName });
-
- createToast({ type: 'success', message: 'Organization created' });
-
- await queryClient.invalidateQueries({
- queryKey: ['organizations'],
- });
-
- navigate(`/organizations/${organization.id}`);
- },
- };
-}
diff --git a/apps/papra-client/src/modules/organizations/organizations.composables.tsx b/apps/papra-client/src/modules/organizations/organizations.composables.tsx
new file mode 100644
index 00000000..f9934e9d
--- /dev/null
+++ b/apps/papra-client/src/modules/organizations/organizations.composables.tsx
@@ -0,0 +1,52 @@
+import { queryClient } from '@/modules/shared/query/query-client';
+import { createToast } from '@/modules/ui/components/sonner';
+import { useNavigate } from '@solidjs/router';
+import { createOrganization, deleteOrganization, updateOrganization } from './organizations.services';
+
+export function useCreateOrganization() {
+ const navigate = useNavigate();
+
+ return {
+ createOrganization: async ({ organizationName }: { organizationName: string }) => {
+ const { organization } = await createOrganization({ name: organizationName });
+
+ createToast({ type: 'success', message: 'Organization created' });
+
+ await queryClient.invalidateQueries({
+ queryKey: ['organizations'],
+ });
+
+ navigate(`/organizations/${organization.id}`);
+ },
+ };
+}
+
+export function useUpdateOrganization() {
+ return {
+ updateOrganization: async ({ organizationId, organizationName }: { organizationId: string; organizationName: string }) => {
+ await updateOrganization({ organizationId, name: organizationName });
+
+ await queryClient.invalidateQueries({
+ queryKey: ['organizations'],
+ refetchType: 'all',
+ });
+ },
+ };
+}
+
+export function useDeleteOrganization() {
+ const navigate = useNavigate();
+
+ return {
+ deleteOrganization: async ({ organizationId }: { organizationId: string }) => {
+ await deleteOrganization({ organizationId });
+
+ await queryClient.invalidateQueries({
+ queryKey: ['organizations'],
+ refetchType: 'all',
+ });
+
+ navigate('/organizations');
+ },
+ };
+}
diff --git a/apps/papra-client/src/modules/organizations/organizations.schemas.ts b/apps/papra-client/src/modules/organizations/organizations.schemas.ts
new file mode 100644
index 00000000..a03dadbd
--- /dev/null
+++ b/apps/papra-client/src/modules/organizations/organizations.schemas.ts
@@ -0,0 +1,8 @@
+import * as v from 'valibot';
+
+export const organizationNameSchema = v.pipe(
+ v.string('Organization name must be a string'),
+ v.trim(),
+ v.minLength(3, 'Organization name must be at least 3 characters'),
+ v.maxLength(50, 'Organization name must be at most 50 characters'),
+);
diff --git a/apps/papra-client/src/modules/organizations/organizations.services.ts b/apps/papra-client/src/modules/organizations/organizations.services.ts
index 2fe61f60..b3620098 100644
--- a/apps/papra-client/src/modules/organizations/organizations.services.ts
+++ b/apps/papra-client/src/modules/organizations/organizations.services.ts
@@ -31,3 +31,41 @@ export async function createOrganization({ name }: { name: string }) {
},
};
}
+
+export async function updateOrganization({ organizationId, name }: { organizationId: string; name: string }) {
+ const { organization } = await apiClient<{ organization: Organization }>({
+ path: `/api/organizations/${organizationId}`,
+ method: 'PUT',
+ body: { name },
+ });
+
+ return {
+ organization: {
+ ...organization,
+ createdAt: new Date(organization.createdAt),
+ updatedAt: organization.updatedAt ? new Date(organization.updatedAt) : undefined,
+ },
+ };
+}
+
+export async function fetchOrganization({ organizationId }: { organizationId: string }) {
+ const { organization } = await apiClient<{ organization: Organization }>({
+ path: `/api/organizations/${organizationId}`,
+ method: 'GET',
+ });
+
+ return {
+ organization: {
+ ...organization,
+ createdAt: new Date(organization.createdAt),
+ updatedAt: organization.updatedAt ? new Date(organization.updatedAt) : undefined,
+ },
+ };
+}
+
+export async function deleteOrganization({ organizationId }: { organizationId: string }) {
+ await apiClient({
+ path: `/api/organizations/${organizationId}`,
+ method: 'DELETE',
+ });
+}
diff --git a/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx
index ac40875c..20814dea 100644
--- a/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx
+++ b/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx
@@ -1,7 +1,7 @@
import type { Component } from 'solid-js';
import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';
import { CreateOrganizationForm } from '../components/create-organization-form.component';
-import { useCreateOrganization } from '../composables/useCreateOrganization';
+import { useCreateOrganization } from '../organizations.composables';
export const CreateFirstOrganizationPage: Component = () => {
const { createOrganization } = useCreateOrganization();
diff --git a/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx
index 9d2cceab..597850f6 100644
--- a/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx
+++ b/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx
@@ -2,7 +2,7 @@ import type { Component } from 'solid-js';
import { Button } from '@/modules/ui/components/button';
import { A } from '@solidjs/router';
import { CreateOrganizationForm } from '../components/create-organization-form.component';
-import { useCreateOrganization } from '../composables/useCreateOrganization';
+import { useCreateOrganization } from '../organizations.composables';
export const CreateOrganizationPage: Component = () => {
const { createOrganization } = useCreateOrganization();
diff --git a/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsx b/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsx
new file mode 100644
index 00000000..3cbf3b20
--- /dev/null
+++ b/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsx
@@ -0,0 +1,150 @@
+import type { Organization } from '../organizations.types';
+import { useConfirmModal } from '@/modules/shared/confirm';
+import { createForm } from '@/modules/shared/form/form';
+import { Button } from '@/modules/ui/components/button';
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/modules/ui/components/card';
+import { createToast } from '@/modules/ui/components/sonner';
+import { TextField, TextFieldLabel, TextFieldRoot } from '@/modules/ui/components/textfield';
+import { useParams } from '@solidjs/router';
+import { createQuery } from '@tanstack/solid-query';
+import { type Component, Show, Suspense } from 'solid-js';
+import * as v from 'valibot';
+import { useDeleteOrganization, useUpdateOrganization } from '../organizations.composables';
+import { organizationNameSchema } from '../organizations.schemas';
+import { fetchOrganization } from '../organizations.services';
+
+const DeleteOrganizationCard: Component<{ organization: Organization }> = (props) => {
+ const { deleteOrganization } = useDeleteOrganization();
+ const { confirm } = useConfirmModal();
+
+ const handleDelete = async () => {
+ const confirmed = await confirm({
+ title: 'Delete organization',
+ message: 'Are you sure you want to delete this organization? This action cannot be undone, and all data associated with this organization will be permanently removed.',
+ confirmButton: {
+ text: 'Delete organization',
+ variant: 'destructive',
+ },
+ cancelButton: {
+ text: 'Cancel',
+ },
+ });
+
+ if (confirmed) {
+ await deleteOrganization({ organizationId: props.organization.id });
+
+ createToast({ type: 'success', message: 'Organization deleted' });
+ }
+ };
+
+ return (
+ <div>
+ <Card class="border-destructive">
+ <CardHeader class="border-b">
+ <CardTitle>Delete organization</CardTitle>
+ <CardDescription>
+ Deleting this organization will permanently remove all data associated with it.
+ </CardDescription>
+ </CardHeader>
+
+ <CardFooter class="pt-6">
+ <Button onClick={handleDelete} variant="destructive">
+ Delete organization
+ </Button>
+ </CardFooter>
+ </Card>
+ </div>
+ );
+};
+
+const UpdateOrganizationNameCard: Component<{ organization: Organization }> = (props) => {
+ const { updateOrganization } = useUpdateOrganization();
+
+ const { form, Form, Field } = createForm({
+ schema: v.object({
+ organizationName: organizationNameSchema,
+ }),
+ initialValues: {
+ organizationName: props.organization.name,
+ },
+ onSubmit: async ({ organizationName }) => {
+ await updateOrganization({
+ organizationId: props.organization.id,
+ organizationName: organizationName.trim(),
+ });
+
+ createToast({ type: 'success', message: 'Organization name updated' });
+ },
+ });
+
+ return (
+ <div>
+ <Card>
+ <CardHeader class="border-b">
+ <CardTitle>Organization name</CardTitle>
+
+ </CardHeader>
+
+ <Form>
+ <CardContent class="pt-6 ">
+
+ <Field name="organizationName">
+ {(field, inputProps) => (
+ <TextFieldRoot class="flex flex-col gap-1">
+ <TextFieldLabel for="organizationName" class="sr-only">
+ Organization name
+ </TextFieldLabel>
+ <div class="flex gap-2 flex-col sm:flex-row">
+ <TextField type="text" id="organizationName" placeholder="Eg. Acme Inc." {...inputProps} autoFocus value={field.value} aria-invalid={Boolean(field.error)} />
+
+ <Button type="submit" isLoading={form.submitting} class="flex-shrink-0" disabled={field.value?.trim() === props.organization.name}>
+ Update name
+ </Button>
+ </div>
+ {field.error && <div class="text-red-500 text-sm">{field.error}</div>}
+ </TextFieldRoot>
+ )}
+ </Field>
+
+ <div class="text-red-500 text-sm">{form.response.message}</div>
+ </CardContent>
+
+ </Form>
+ </Card>
+ </div>
+ );
+};
+
+export const OrganizationsSettingsPage: Component = () => {
+ const params = useParams();
+
+ const query = createQuery(() => ({
+ queryKey: ['organizations', params.organizationId],
+ queryFn: () => fetchOrganization({ organizationId: params.organizationId }),
+ }));
+
+ return (
+ <div class="p-6 mt-4 pb-32 mx-auto max-w-xl">
+ <Suspense>
+ <Show when={query.data?.organization}>
+ { getOrganization => (
+ <>
+ <h1 class="text-xl font-semibold mb-2">
+ Organization settings
+ </h1>
+
+ <p class="text-muted-foreground">
+ Manage your organization settings here.
+ </p>
+
+ <div class="mt-6 flex flex-col gap-6">
+ <UpdateOrganizationNameCard organization={getOrganization()} />
+ <DeleteOrganizationCard organization={getOrganization()} />
+ </div>
+ </>
+ )}
+ </Show>
+ </Suspense>
+ </div>
+ );
+};
diff --git a/apps/papra-client/src/modules/organizations/pages/organizations.page.tsx b/apps/papra-client/src/modules/organizations/pages/organizations.page.tsx
index 7cfb51a4..cff06c32 100644
--- a/apps/papra-client/src/modules/organizations/pages/organizations.page.tsx
+++ b/apps/papra-client/src/modules/organizations/pages/organizations.page.tsx
@@ -1,40 +1,61 @@
-import type { Component } from 'solid-js';
-import { A } from '@solidjs/router';
+import { A, useNavigate } from '@solidjs/router';
import { createQuery } from '@tanstack/solid-query';
+import { type Component, createEffect, on } from 'solid-js';
import { fetchOrganizations } from '../organizations.services';
export const OrganizationsPage: Component = () => {
+ const navigate = useNavigate();
+
const queries = createQuery(() => ({
queryKey: ['organizations'],
queryFn: fetchOrganizations,
}));
+ createEffect(on(
+ () => queries.data?.organizations,
+ (orgs) => {
+ if (orgs && orgs.length === 0) {
+ navigate('/organizations/first');
+ }
+ },
+ ));
+
return (
- <div class="p-6 mt-4 pb-32">
- <h2 class="text-xl font-bold mb-6">
- Organizations
+ <div class="p-6 mt-4 pb-32 max-w-5xl mx-auto">
+ <h2 class="text-xl font-bold mb-2">
+ Your organizations
</h2>
+ <p class="text-muted-foreground mb-6">
+ Organizations are a way to group your documents and manage access to them. You can create multiple organizations and invite your team members to collaborate.
+ </p>
+
<div class="grid gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
{queries.data?.organizations.map(organization => (
- <div class="border rounded-lg overflow-hidden">
+ <A
+ href={`/organizations/${organization.id}`}
+ class="border rounded-lg overflow-hidden"
+ >
<div class="bg-card border-b flex items-center justify-center p-6">
<div class="size-16 text-muted-foreground"></div>
</div>
<div class="p-4">
- <div class="w-full text-left">
- <A
- href={`/organizations/${organization.id}`}
- class="text-xs font-bold truncate block"
- >
- {organization.name}
- </A>
+ <div class="w-full text-left font-bold truncate block">
+ {organization.name}
</div>
</div>
- </div>
+ </A>
))}
+
+ <A href="/organizations/create" class="border rounded-lg overflow-hidden border-dashed border-2px p-4 flex flex-col items-center justify-center text-center gap-2 group">
+ <div class="i-tabler-plus size-16 text-muted-foreground op-50 group-hover:(text-primary op-100) transition" />
+
+ <div class="font-bold block text-muted-foreground">
+ Create new organization
+ </div>
+ </A>
</div>
</div>
);
diff --git a/apps/papra-client/src/modules/shared/confirm.tsx b/apps/papra-client/src/modules/shared/confirm.tsx
index 26c33883..bdcb9e99 100644
--- a/apps/papra-client/src/modules/shared/confirm.tsx
+++ b/apps/papra-client/src/modules/shared/confirm.tsx
@@ -76,12 +76,15 @@ export const ConfirmModalProvider: ParentComponent = (props) => {
</DialogHeader>
<DialogFooter>
- <Button onClick={() => handleConfirm({ isConfirmed: false })} variant={getConfig()?.cancelButton?.variant ?? 'secondary'}>
- {getConfig()?.cancelButton?.text ?? 'Cancel'}
- </Button>
- <Button onClick={() => handleConfirm({ isConfirmed: true })} variant={getConfig()?.confirmButton?.variant ?? 'default'}>
- {getConfig()?.confirmButton?.text ?? 'Confirm'}
- </Button>
+ <div class="flex gap-2 justify-end flex-col-reverse sm:flex-row">
+
+ <Button onClick={() => handleConfirm({ isConfirmed: false })} variant={getConfig()?.cancelButton?.variant ?? 'secondary'}>
+ {getConfig()?.cancelButton?.text ?? 'Cancel'}
+ </Button>
+ <Button onClick={() => handleConfirm({ isConfirmed: true })} variant={getConfig()?.confirmButton?.variant ?? 'default'}>
+ {getConfig()?.confirmButton?.text ?? 'Confirm'}
+ </Button>
+ </div>
</DialogFooter>
</DialogContent>
</Dialog>
diff --git a/apps/papra-client/src/modules/shared/query/query-client.ts b/apps/papra-client/src/modules/shared/query/query-client.ts
index 4bac81b3..8b2b3d24 100644
--- a/apps/papra-client/src/modules/shared/query/query-client.ts
+++ b/apps/papra-client/src/modules/shared/query/query-client.ts
@@ -1,6 +1,21 @@
import { QueryClient } from '@tanstack/solid-query';
-export const queryClient = new QueryClient();
+export const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: {
+ // retry: (failureCount, error) => {
+ // const status = get(error, 'status');
+
+ // if (status && [401, 403, 404].includes(status)) {
+ // return false;
+ // }
+
+ // return failureCount < 3;
+ // },
+ retry: false,
+ },
+ },
+});
export function clearQueryCache() {
queryClient.clear();
diff --git a/apps/papra-client/src/modules/ui/components/dialog.tsx b/apps/papra-client/src/modules/ui/components/dialog.tsx
index 6bc8814e..e7ec0bd2 100644
--- a/apps/papra-client/src/modules/ui/components/dialog.tsx
+++ b/apps/papra-client/src/modules/ui/components/dialog.tsx
@@ -99,7 +99,7 @@ export function DialogHeader(props: ComponentProps<'div'>) {
return (
<div
class={cn(
- 'flex flex-col space-y-2 text-center sm:text-left',
+ 'flex flex-col space-y-2',
local.class,
)}
{...rest}
diff --git a/apps/papra-client/src/modules/ui/layouts/app.layout.tsx b/apps/papra-client/src/modules/ui/layouts/app.layout.tsx
deleted file mode 100644
index eb0e6def..00000000
--- a/apps/papra-client/src/modules/ui/layouts/app.layout.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import { authStore } from '@/modules/auth/auth.store';
-
-import { cn } from '@/modules/shared/style/cn';
-import { useThemeStore } from '@/modules/theme/theme.store';
-import { Button } from '@/modules/ui/components/button';
-import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';
-import { A, useNavigate } from '@solidjs/router';
-import { type Component, type ParentComponent, Show, Suspense } from 'solid-js';
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '../components/dropdown-menu';
-import { Sheet, SheetContent, SheetTrigger } from '../components/sheet';
-
-type MenuItem = {
- label: string;
- icon: string;
- href?: string;
- onClick?: () => void;
-};
-
-const MenuItemButton: Component<MenuItem> = (props) => {
- return (
- <>
- <Show when={props.onClick}>
- <Button class="block" onClick={props.onClick} variant="ghost">
- <div class="flex items-center gap-2">
- <div class={cn(props.icon, 'size-5 text-muted-foreground')}></div>
- <div>{props.label}</div>
- </div>
- </Button>
- </Show>
-
- <Show when={!props.onClick}>
- <Button class="block" as={A} href={props.href!} variant="ghost" activeClass="bg-accent/50! text-accent-foreground!">
- <div class="flex items-center gap-2">
- <div class={cn(props.icon, 'size-5 text-muted-foreground')}></div>
- <div>{props.label}</div>
- </div>
- </Button>
- </Show>
- </>
- );
-};
-
-const SideNav: Component = () => {
- const navigate = useNavigate();
-
- const getMainMenuItems = () => [
- {
- label: 'Renderings',
- icon: 'i-tabler-file-text',
- href: '/renderings',
- },
- {
- label: 'API Keys',
- icon: 'i-tabler-key',
- href: '/api-keys',
- },
- ];
-
- const getFooterMenuItems = () => [
- {
- label: 'Settings',
- icon: 'i-tabler-settings',
- href: '/settings',
- },
- {
- label: 'Logout',
- icon: 'i-tabler-logout',
- onClick: () => {
- authStore.logout();
- navigate('/login');
- },
- },
- ];
-
- return (
- <div class="h-full flex flex-col pb-6">
- <div class="h-60px flex items-center">
- <Button href="/" class="text-lg font-bold hover:no-underline" variant="link" as={A}>
- Papra
- </Button>
- </div>
-
- <nav class="flex flex-col gap-0.5 mt-4 text-muted-foreground">
- {getMainMenuItems().map(menuItem => <MenuItemButton {...menuItem} />)}
- </nav>
-
- <div class="flex-1"></div>
-
- <nav class="flex flex-col gap-0.5 text-muted-foreground">
- {getFooterMenuItems().map(menuItem => <MenuItemButton {...menuItem} />)}
- </nav>
- </div>
- );
-};
-
-const ThemeSwitcher: Component = () => {
- const themeStore = useThemeStore();
-
- return (
- <>
- <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'light' })} class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-sun text-lg"></div>
- Light Mode
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'dark' })} class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-moon text-lg"></div>
- Dark Mode
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'system' })} class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-device-laptop text-lg"></div>
- System Mode
- </DropdownMenuItem>
- </>
- );
-};
-
-export const AppLayout: ParentComponent = (props) => {
- const { user } = useCurrentUser();
- const themeStore = useThemeStore();
-
- return (
- <div class="flex flex-row h-screen min-h-0">
- <div class="w-64 border-r border-r-border px-2 flex-shrink-0 hidden md:block">
- <SideNav />
- </div>
- <div class="flex-1 min-h-0 flex flex-col">
- <div class="h-60px border-b flex items-center justify-between px-6">
- <div class="flex items-center gap-2">
- <Sheet>
- <SheetTrigger>
- <Button variant="ghost" size="icon" class="md:hidden">
- <div class="i-tabler-menu-2 size-6"></div>
- </Button>
- </SheetTrigger>
- <SheetContent side="left">
- <SideNav />
- </SheetContent>
- </Sheet>
- </div>
-
- <div class="flex items-center gap-2">
- <DropdownMenu>
- <DropdownMenuTrigger as={Button} class="text-base hidden sm:flex" variant="outline" aria-label="Theme switcher">
- <div classList={{ 'i-tabler-moon': themeStore.getColorMode() === 'dark', 'i-tabler-sun': themeStore.getColorMode() === 'light' }}></div>
- <div class="ml-2 i-tabler-chevron-down text-muted-foreground text-sm"></div>
- </DropdownMenuTrigger>
- <DropdownMenuContent class="w-42">
- <ThemeSwitcher />
- </DropdownMenuContent>
- </DropdownMenu>
-
- {user.roles.includes('admin') && (
- <Button as={A} href="/admin">
- <div class="i-tabler-settings size-4 mr-2"></div>
- Admin
- </Button>
- )}
-
- </div>
- </div>
- <div class="flex-1 overflow-auto max-w-screen">
- <Suspense>
- {props.children}
- </Suspense>
- </div>
- </div>
- </div>
- );
-};
diff --git a/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx b/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx
index 977ae0df..1b7e84e2 100644
--- a/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx
+++ b/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx
@@ -1,20 +1,12 @@
import type { Organization } from '@/modules/organizations/organizations.types';
import { authStore } from '@/modules/auth/auth.store';
-import { useCommandPalette } from '@/modules/command-palette/command-palette.provider';
-import { uploadDocument } from '@/modules/documents/documents.services';
-import { fetchOrganizations } from '@/modules/organizations/organizations.services';
-import { promptUploadFiles } from '@/modules/shared/files/upload';
-import { queryClient } from '@/modules/shared/query/query-client';
-import { cn } from '@/modules/shared/style/cn';
-import { useThemeStore } from '@/modules/theme/theme.store';
+import { fetchOrganization, fetchOrganizations } from '@/modules/organizations/organizations.services';
-import { Button } from '@/modules/ui/components/button';
-import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';
-import { A, useNavigate, useParams } from '@solidjs/router';
-import { createQuery } from '@tanstack/solid-query';
-import { type Component, type ParentComponent, Show, Suspense } from 'solid-js';
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '../components/dropdown-menu';
+import { useNavigate, useParams } from '@solidjs/router';
+import { createQueries, createQuery } from '@tanstack/solid-query';
+import { get } from 'lodash-es';
+import { type Component, createEffect, on, type ParentComponent } from 'solid-js';
import {
Select,
SelectContent,
@@ -22,40 +14,9 @@ import {
SelectTrigger,
SelectValue,
} from '../components/select';
-import { Sheet, SheetContent, SheetTrigger } from '../components/sheet';
+import { SideNav, SidenavLayout } from './sidenav.layout';
-type MenuItem = {
- label: string;
- icon: string;
- href?: string;
- onClick?: () => void;
-};
-
-const MenuItemButton: Component<MenuItem> = (props) => {
- return (
- <>
- <Show when={props.onClick}>
- <Button class="block" onClick={props.onClick} variant="ghost">
- <div class="flex items-center gap-2 dark:text-muted-foreground">
- <div class={cn(props.icon, 'size-5')}></div>
- <div>{props.label}</div>
- </div>
- </Button>
- </Show>
-
- <Show when={!props.onClick}>
- <Button class="block dark:text-muted-foreground" as={A} href={props.href!} variant="ghost" activeClass="bg-accent/50! text-accent-foreground!">
- <div class="flex items-center gap-2">
- <div class={cn(props.icon, 'size-5')}></div>
- <div>{props.label}</div>
- </div>
- </Button>
- </Show>
- </>
- );
-};
-
-const SideNav: Component = () => {
+const OrganizationLayoutSideNav: Component = () => {
const navigate = useNavigate();
const params = useParams();
@@ -71,7 +32,7 @@ const SideNav: Component = () => {
href: `/organizations/${params.organizationId}/deleted`,
},
{
- label: 'Settings',
+ label: 'Organization settings',
icon: 'i-tabler-settings',
href: `/organizations/${params.organizationId}/settings`,
},
@@ -79,11 +40,6 @@ const SideNav: Component = () => {
];
const getFooterMenuItems = () => [
- {
- label: 'Settings',
- icon: 'i-tabler-settings',
- href: '/settings',
- },
{
label: 'Logout',
icon: 'i-tabler-logout',
@@ -94,181 +50,111 @@ const SideNav: Component = () => {
},
];
- const query = createQuery(() => ({
- queryKey: ['organizations'],
- queryFn: fetchOrganizations,
+ const queries = createQueries(() => ({
+ queries: [
+ {
+ queryKey: ['organizations'],
+ queryFn: fetchOrganizations,
+ },
+ {
+ queryKey: ['organizations', params.organizationId],
+ queryFn: () => fetchOrganization({ organizationId: params.organizationId }),
+ },
+ ],
}));
- return (
- <div class="flex h-full">
- <div class="w-65px border-r bg-card pt-4">
- <Button variant="link" size="icon" as={A} href="/" class="text-lg font-bold hover:no-underline flex items-center text-primary mb-4 mx-auto">
- <div class="i-tabler-file-text size-10"></div>
- </Button>
-
- <Button variant="link" as={A} href="/organizations" class="text-lg font-bold hover:no-underline flex items-center text-foreground dark:text-muted-foreground">
- <div class="i-tabler-building-community size-5"></div>
- </Button>
-
- <Button variant="link" as={A} href="/docs" class="text-lg font-bold hover:no-underline flex items-center text-foreground dark:text-muted-foreground mt-1">
- <div class="i-tabler-book-2 size-5"></div>
- </Button>
-
- </div>
- <div class="h-full flex flex-col pb-6 flex-1">
-
- <div class="px-6 pt-4">
- <Select
- options={[...query.data?.organizations ?? [], { id: 'create' }]}
- optionValue="id"
- optionTextValue="name"
- value={query.data?.organizations.find(organization => organization.id === params.organizationId)}
- onChange={(value) => {
- if (!value || value.id === params.organizationId) {
- return;
- }
-
- return value && (
- value.id === 'create'
- ? navigate('/organizations/create')
- : navigate(`/organizations/${value.id}`));
- }}
-
- itemComponent={props => props.item.rawValue.id === 'create'
- ? (
- <SelectItem class="cursor-pointer" item={props.item}>
- <div class="flex items-center gap-2 text-muted-foreground">
- <div class="i-tabler-plus size-4"></div>
- <div>Create new organization</div>
- </div>
- </SelectItem>
- )
- : (
- <SelectItem class="cursor-pointer" item={props.item}>{props.item.rawValue.name}</SelectItem>
- )}
- >
- <SelectTrigger>
- <SelectValue<Organization>>
- {state => state.selectedOption().name}
- </SelectValue>
- </SelectTrigger>
- <SelectContent />
- </Select>
-
- </div>
-
- <nav class="flex flex-col gap-0.5 mt-4 px-4">
- {getMainMenuItems().map(menuItem => <MenuItemButton {...menuItem} />)}
- </nav>
-
- <div class="flex-1"></div>
+ createEffect(on(
+ () => queries[1].error,
+ (error) => {
+ if (error) {
+ const status = get(error, 'status');
+
+ if (status && [
+ 400, // when the id of the organization is not valid
+ 403, // when the user does not have access to the organization or the organization does not exist
+ ].includes(status)) {
+ navigate('/');
+ }
+ }
+ },
+ ));
- <nav class="flex flex-col gap-0.5 px-4">
- {getFooterMenuItems().map(menuItem => <MenuItemButton {...menuItem} />)}
- </nav>
- </div>
- </div>
- );
-};
+ return (
+ <SideNav
+ mainMenu={getMainMenuItems()}
+ footerMenu={getFooterMenuItems()}
+ header={() =>
+ (
+ <div class="px-6 pt-4 max-w-285px min-w-0">
+ <Select
+ options={[...queries[0].data?.organizations ?? [], { id: 'create' }]}
+ optionValue="id"
+ optionTextValue="name"
+ value={queries[0].data?.organizations.find(organization => organization.id === params.organizationId)}
+ onChange={(value) => {
+ if (!value || value.id === params.organizationId) {
+ return;
+ }
+
+ return value && (
+ value.id === 'create'
+ ? navigate('/organizations/create')
+ : navigate(`/organizations/${value.id}`));
+ }}
+ itemComponent={props => props.item.rawValue.id === 'create'
+ ? (
+ <SelectItem class="cursor-pointer" item={props.item}>
+ <div class="flex items-center gap-2 text-muted-foreground">
+ <div class="i-tabler-plus size-4"></div>
+ <div>Create new organization</div>
+ </div>
+ </SelectItem>
+ )
+ : (
+ <SelectItem class="cursor-pointer" item={props.item}>{props.item.rawValue.name}</SelectItem>
+ )}
+ >
+ <SelectTrigger>
+ <SelectValue<Organization> class="truncate">
+ {state => state.selectedOption().name}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent />
+ </Select>
-const ThemeSwitcher: Component = () => {
- const themeStore = useThemeStore();
+ </div>
+ )}
+ />
- return (
- <>
- <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'light' })} class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-sun text-lg"></div>
- Light Mode
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'dark' })} class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-moon text-lg"></div>
- Dark Mode
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'system' })} class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-device-laptop text-lg"></div>
- System Mode
- </DropdownMenuItem>
- </>
);
};
export const OrganizationLayout: ParentComponent = (props) => {
- const { user } = useCurrentUser();
- const themeStore = useThemeStore();
const params = useParams();
- const { openCommandPalette } = useCommandPalette();
-
- const promptImport = async () => {
- const { files } = await promptUploadFiles();
- for (const file of files) {
- await uploadDocument({ file, organizationId: params.organizationId });
- }
-
- queryClient.invalidateQueries({
- queryKey: ['organizations', params.organizationId, 'documents'],
- refetchType: 'all',
- });
- };
-
- return (
- <div class="flex flex-row h-screen min-h-0">
- <div class="w-320px border-r border-r-border flex-shrink-0 hidden md:block bg-card">
- <SideNav />
- </div>
- <div class="flex-1 min-h-0 flex flex-col">
- <div class="flex justify-between px-6 pt-4">
-
- <div class="flex items-center">
- <Sheet>
- <SheetTrigger>
- <Button variant="ghost" size="icon" class="md:hidden mr-2">
- <div class="i-tabler-menu-2 size-6"></div>
- </Button>
- </SheetTrigger>
- <SheetContent side="left" class="bg-card p-0!">
- <SideNav />
- </SheetContent>
- </Sheet>
-
- <Button variant="outline" class="lg:min-w-64 justify-start" onClick={openCommandPalette}>
- <div class="i-tabler-search size-4 mr-2"></div>
- Search...
- </Button>
- </div>
+ const navigate = useNavigate();
- <div class="flex items-center gap-2">
- <Button onClick={promptImport}>
- <div class="i-tabler-upload size-4"></div>
- <span class="hidden sm:inline ml-2">
- Import a document
- </span>
- </Button>
+ const query = createQuery(() => ({
+ queryKey: ['organizations', params.organizationId],
+ queryFn: () => fetchOrganization({ organizationId: params.organizationId }),
+ }));
- <DropdownMenu>
- <DropdownMenuTrigger as={Button} class="text-base hidden sm:flex" variant="outline" aria-label="Theme switcher">
- <div classList={{ 'i-tabler-moon': themeStore.getColorMode() === 'dark', 'i-tabler-sun': themeStore.getColorMode() === 'light' }}></div>
- <div class="ml-2 i-tabler-chevron-down text-muted-foreground text-sm"></div>
- </DropdownMenuTrigger>
- <DropdownMenuContent class="w-42">
- <ThemeSwitcher />
- </DropdownMenuContent>
- </DropdownMenu>
+ createEffect(on(
+ () => query.error,
+ (error) => {
+ if (error) {
+ const status = get(error, 'status');
- {user.roles.includes('admin') && (
- <Button as={A} href="/admin">
- <div class="i-tabler-settings size-4 mr-2"></div>
- Admin
- </Button>
- )}
+ if (status && [401, 403].includes(status)) {
+ navigate('/');
+ }
+ }
+ },
+ ));
- </div>
- </div>
- <div class="flex-1 overflow-auto max-w-screen">
- <Suspense>
- {props.children}
- </Suspense>
- </div>
- </div>
- </div>
+ return (
+ <SidenavLayout
+ children={props.children}
+ sideNav={OrganizationLayoutSideNav}
+ />
);
};
diff --git a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
new file mode 100644
index 00000000..4f86ce25
--- /dev/null
+++ b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
@@ -0,0 +1,200 @@
+import { useCommandPalette } from '@/modules/command-palette/command-palette.provider';
+import { uploadDocument } from '@/modules/documents/documents.services';
+import { promptUploadFiles } from '@/modules/shared/files/upload';
+import { queryClient } from '@/modules/shared/query/query-client';
+import { cn } from '@/modules/shared/style/cn';
+import { useThemeStore } from '@/modules/theme/theme.store';
+
+import { Button } from '@/modules/ui/components/button';
+import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';
+import { A, useParams } from '@solidjs/router';
+import { type Component, type ParentComponent, Show, Suspense } from 'solid-js';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '../components/dropdown-menu';
+
+import { Sheet, SheetContent, SheetTrigger } from '../components/sheet';
+
+type MenuItem = {
+ label: string;
+ icon: string;
+ href?: string;
+ onClick?: () => void;
+};
+
+const MenuItemButton: Component<MenuItem> = (props) => {
+ return (
+ <>
+ <Show when={props.onClick}>
+ <Button class="block" onClick={props.onClick} variant="ghost">
+ <div class="flex items-center gap-2 dark:text-muted-foreground truncate">
+ <div class={cn(props.icon, 'size-5')}></div>
+ <div>{props.label}</div>
+ </div>
+ </Button>
+ </Show>
+
+ <Show when={!props.onClick}>
+ <Button class="block dark:text-muted-foreground" as={A} href={props.href!} variant="ghost" activeClass="bg-accent/50! text-accent-foreground! truncate" end>
+ <div class="flex items-center gap-2">
+ <div class={cn(props.icon, 'size-5')}></div>
+ <div class="truncate">{props.label}</div>
+ </div>
+ </Button>
+ </Show>
+ </>
+ );
+};
+
+export const SideNav: Component<{
+ mainMenu?: MenuItem[];
+ footerMenu?: MenuItem[];
+ header?: Component;
+ footer?: Component;
+}> = (props) => {
+ return (
+ <div class="flex h-full">
+ <div class="w-65px border-r bg-card pt-4">
+ <Button variant="link" size="icon" as={A} href="/" class="text-lg font-bold hover:no-underline flex items-center text-primary mb-4 mx-auto">
+ <div class="i-tabler-file-text size-10"></div>
+ </Button>
+
+ <Button variant="link" as={A} href="/organizations" class="text-lg font-bold hover:no-underline flex items-center text-foreground dark:text-muted-foreground">
+ <div class="i-tabler-building-community size-5"></div>
+ </Button>
+
+ <Button variant="link" as={A} href="/docs" class="text-lg font-bold hover:no-underline flex items-center text-foreground dark:text-muted-foreground mt-1">
+ <div class="i-tabler-book-2 size-5"></div>
+ </Button>
+
+ </div>
+ {(props.header || props.mainMenu || props.footerMenu || props.footer) && (
+ <div class="h-full flex flex-col pb-6 flex-1">
+ {props.header && <props.header />}
+
+ {props.mainMenu && (
+ <nav class="flex flex-col gap-0.5 mt-4 px-4">
+ {props.mainMenu.map(menuItem => <MenuItemButton {...menuItem} />)}
+ </nav>
+ )}
+
+ <div class="flex-1"></div>
+
+ {props.footerMenu && (
+ <nav class="flex flex-col gap-0.5 px-4">
+ {props.footerMenu.map(menuItem => <MenuItemButton {...menuItem} />)}
+ </nav>
+ )}
+
+ {props.footer && <props.footer />}
+ </div>
+ )}
+ </div>
+ );
+};
+
+const ThemeSwitcher: Component = () => {
+ const themeStore = useThemeStore();
+
+ return (
+ <>
+ <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'light' })} class="flex items-center gap-2 cursor-pointer">
+ <div class="i-tabler-sun text-lg"></div>
+ Light Mode
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'dark' })} class="flex items-center gap-2 cursor-pointer">
+ <div class="i-tabler-moon text-lg"></div>
+ Dark Mode
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => themeStore.setColorMode({ mode: 'system' })} class="flex items-center gap-2 cursor-pointer">
+ <div class="i-tabler-device-laptop text-lg"></div>
+ System Mode
+ </DropdownMenuItem>
+ </>
+ );
+};
+
+export const SidenavLayout: ParentComponent<{
+ sideNav: Component;
+ showSearch?: boolean;
+}> = (props) => {
+ const { user } = useCurrentUser();
+ const themeStore = useThemeStore();
+ const params = useParams();
+ const { openCommandPalette } = useCommandPalette();
+
+ const promptImport = async () => {
+ const { files } = await promptUploadFiles();
+ for (const file of files) {
+ await uploadDocument({ file, organizationId: params.organizationId });
+ }
+
+ queryClient.invalidateQueries({
+ queryKey: ['organizations', params.organizationId, 'documents'],
+ refetchType: 'all',
+ });
+ };
+
+ return (
+ <div class="flex flex-row h-screen min-h-0">
+ <div class="w-350px border-r border-r-border flex-shrink-0 hidden md:block bg-card">
+ <props.sideNav />
+
+ </div>
+ <div class="flex-1 min-h-0 flex flex-col">
+ <div class="flex justify-between px-6 pt-4">
+
+ <div class="flex items-center">
+ <Sheet>
+ <SheetTrigger>
+ <Button variant="ghost" size="icon" class="md:hidden mr-2">
+ <div class="i-tabler-menu-2 size-6"></div>
+ </Button>
+ </SheetTrigger>
+ <SheetContent side="left" class="bg-card p-0!">
+ <props.sideNav />
+ </SheetContent>
+ </Sheet>
+
+ {(props.showSearch ?? true) && (
+ <Button variant="outline" class="lg:min-w-64 justify-start" onClick={openCommandPalette}>
+ <div class="i-tabler-search size-4 mr-2"></div>
+ Search...
+ </Button>
+ )}
+ </div>
+
+ <div class="flex items-center gap-2">
+ <Button onClick={promptImport}>
+ <div class="i-tabler-upload size-4"></div>
+ <span class="hidden sm:inline ml-2">
+ Import a document
+ </span>
+ </Button>
+
+ <DropdownMenu>
+ <DropdownMenuTrigger as={Button} class="text-base hidden sm:flex" variant="outline" aria-label="Theme switcher">
+ <div classList={{ 'i-tabler-moon': themeStore.getColorMode() === 'dark', 'i-tabler-sun': themeStore.getColorMode() === 'light' }}></div>
+ <div class="ml-2 i-tabler-chevron-down text-muted-foreground text-sm"></div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent class="w-42">
+ <ThemeSwitcher />
+ </DropdownMenuContent>
+ </DropdownMenu>
+
+ {user.roles.includes('admin') && (
+ <Button as={A} href="/admin">
+ <div class="i-tabler-settings size-4 mr-2"></div>
+ Admin
+ </Button>
+ )}
+
+ </div>
+ </div>
+ <div class="flex-1 overflow-auto max-w-screen">
+ <Suspense>
+ {props.children}
+ </Suspense>
+ </div>
+ </div>
+ </div>
+ );
+};
diff --git a/apps/papra-client/src/routes.tsx b/apps/papra-client/src/routes.tsx
index 7800350f..7b40c8c7 100644
--- a/apps/papra-client/src/routes.tsx
+++ b/apps/papra-client/src/routes.tsx
@@ -1,6 +1,6 @@
import { A, Navigate, type RouteDefinition, useParams } from '@solidjs/router';
import { createQuery } from '@tanstack/solid-query';
-import { Match, Suspense, Switch } from 'solid-js';
+import { Match, Show, Suspense, Switch } from 'solid-js';
import { createProtectedPage } from './modules/auth/middleware/protected-page.middleware';
import { ConfirmPage } from './modules/auth/pages/confirm.page';
import { GenericAuthPage } from './modules/auth/pages/generic-auth.page';
@@ -11,6 +11,7 @@ import { DocumentsPage } from './modules/documents/pages/documents.page';
import { fetchOrganizations } from './modules/organizations/organizations.services';
import { CreateFirstOrganizationPage } from './modules/organizations/pages/create-first-organization.page';
import { CreateOrganizationPage } from './modules/organizations/pages/create-organization.page';
+import { OrganizationsSettingsPage } from './modules/organizations/pages/organizations-settings.page';
import { OrganizationsPage } from './modules/organizations/pages/organizations.page';
import { Button } from './modules/ui/components/button';
import { OrganizationLayout } from './modules/ui/layouts/organization.layout';
@@ -34,19 +35,23 @@ export const routes: RouteDefinition[] = [
return (
<>
<Suspense>
- <Switch>
- <Match when={getLatestOrganizationId() && query.data && query.data.organizations.some(org => org.id === getLatestOrganizationId())}>
- <Navigate href={`/organizations/${getLatestOrganizationId()}`} />
- </Match>
+ <Show when={query.data?.organizations}>
+ {getOrgs => (
+ <Switch>
+ <Match when={getLatestOrganizationId() && getOrgs().some(org => org.id === getLatestOrganizationId())}>
+ <Navigate href={`/organizations/${getLatestOrganizationId()}`} />
+ </Match>
- <Match when={query.data && query.data.organizations.length > 0}>
- <Navigate href="/organizations" />
- </Match>
+ <Match when={query.data && query.data.organizations.length > 0}>
+ <Navigate href="/organizations" />
+ </Match>
- <Match when={query.data && query.data.organizations.length === 0}>
- <Navigate href="/organizations/first" />
- </Match>
- </Switch>
+ <Match when={query.data && query.data.organizations.length === 0}>
+ <Navigate href="/organizations/first" />
+ </Match>
+ </Switch>
+ )}
+ </Show>
</Suspense>
</>
@@ -78,11 +83,14 @@ export const routes: RouteDefinition[] = [
path: '/',
component: DocumentsPage,
},
-
{
path: '/documents/:documentId',
component: DocumentPage,
},
+ {
+ path: '/settings',
+ component: OrganizationsSettingsPage,
+ },
],
},
{
diff --git a/apps/papra-server/src/modules/organizations/organizations.errors.ts b/apps/papra-server/src/modules/organizations/organizations.errors.ts
index f94735f2..1367bba7 100644
--- a/apps/papra-server/src/modules/organizations/organizations.errors.ts
+++ b/apps/papra-server/src/modules/organizations/organizations.errors.ts
@@ -5,3 +5,9 @@ export const createUserNotInOrganizationError = createErrorFactory({
code: 'user.not_in_organization',
statusCode: 403,
});
+
+export const createOrganizationNotFoundError = createErrorFactory({
+ message: 'Organization not found.',
+ code: 'organization.not_found',
+ statusCode: 404,
+});
diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.ts b/apps/papra-server/src/modules/organizations/organizations.repository.ts
index 404f8995..cac12269 100644
--- a/apps/papra-server/src/modules/organizations/organizations.repository.ts
+++ b/apps/papra-server/src/modules/organizations/organizations.repository.ts
@@ -13,6 +13,9 @@ export function createOrganizationsRepository({ db }: { db: Database }) {
getUserOrganizations,
addUserToOrganization,
isUserInOrganization,
+ updateOrganization,
+ deleteOrganization,
+ getOrganizationById,
},
{ db },
);
@@ -55,3 +58,30 @@ async function isUserInOrganization({ userId, organizationId, db }: { userId: st
isInOrganization: organizationUser.length > 0,
};
}
+
+async function updateOrganization({ organizationId, organization: organizationToUpdate, db }: { organizationId: string; organization: { name: string }; db: Database }) {
+ const [organization] = await db
+ .update(organizationsTable)
+ .set({
+ name: organizationToUpdate.name,
+ })
+ .where(eq(organizationsTable.id, organizationId))
+ .returning();
+
+ return { organization };
+}
+
+async function deleteOrganization({ organizationId, db }: { organizationId: string; db: Database }) {
+ await db.delete(organizationsTable).where(eq(organizationsTable.id, organizationId));
+}
+
+async function getOrganizationById({ organizationId, db }: { organizationId: string; db: Database }) {
+ const [organization] = await db
+ .select()
+ .from(organizationsTable)
+ .where(eq(organizationsTable.id, organizationId));
+
+ return {
+ organization,
+ };
+}
diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.ts
index 86b00101..8d176c8f 100644
--- a/apps/papra-server/src/modules/organizations/organizations.routes.ts
+++ b/apps/papra-server/src/modules/organizations/organizations.routes.ts
@@ -2,13 +2,18 @@ import type { ServerInstance } from '../app/server.types';
import { z } from 'zod';
import { getAuthUserId } from '../app/auth/auth.models';
import { getDb } from '../app/database/database.models';
-import { validateJsonBody } from '../shared/validation/validation';
+import { validateJsonBody, validateParams } from '../shared/validation/validation';
+import { organizationIdRegex } from './organizations.constants';
+import { createOrganizationNotFoundError } from './organizations.errors';
import { createOrganizationsRepository } from './organizations.repository';
-import { createOrganization } from './organizations.usecases';
+import { createOrganization, ensureUserIsInOrganization } from './organizations.usecases';
export async function registerOrganizationsPrivateRoutes({ app }: { app: ServerInstance }) {
setupGetOrganizationsRoute({ app });
setupCreateOrganizationRoute({ app });
+ setupGetOrganizationRoute({ app });
+ setupUpdateOrganizationRoute({ app });
+ setupDeleteOrganizationRoute({ app });
}
function setupGetOrganizationsRoute({ app }: { app: ServerInstance }) {
@@ -47,3 +52,81 @@ function setupCreateOrganizationRoute({ app }: { app: ServerInstance }) {
},
);
}
+
+function setupGetOrganizationRoute({ app }: { app: ServerInstance }) {
+ app.get(
+ '/api/organizations/:organizationId',
+ validateParams(z.object({
+ organizationId: z.string().regex(organizationIdRegex),
+ })),
+ async (context) => {
+ const { userId } = getAuthUserId({ context });
+ const { db } = getDb({ context });
+ const { organizationId } = context.req.valid('param');
+
+ const organizationsRepository = createOrganizationsRepository({ db });
+
+ await ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });
+
+ const { organization } = await organizationsRepository.getOrganizationById({ organizationId });
+
+ if (!organization) {
+ throw createOrganizationNotFoundError();
+ }
+
+ return context.json({
+ organization,
+ });
+ },
+ );
+}
+
+function setupUpdateOrganizationRoute({ app }: { app: ServerInstance }) {
+ app.put(
+ '/api/organizations/:organizationId',
+ validateJsonBody(z.object({
+ name: z.string().min(3).max(50),
+ })),
+ validateParams(z.object({
+ organizationId: z.string().regex(organizationIdRegex),
+ })),
+ async (context) => {
+ const { userId } = getAuthUserId({ context });
+ const { db } = getDb({ context });
+ const { name } = context.req.valid('json');
+ const { organizationId } = context.req.valid('param');
+
+ const organizationsRepository = createOrganizationsRepository({ db });
+
+ await ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });
+
+ const { organization } = await organizationsRepository.updateOrganization({ organizationId, organization: { name } });
+
+ return context.json({
+ organization,
+ });
+ },
+ );
+}
+
+function setupDeleteOrganizationRoute({ app }: { app: ServerInstance }) {
+ app.delete(
+ '/api/organizations/:organizationId',
+ validateParams(z.object({
+ organizationId: z.string().regex(organizationIdRegex),
+ })),
+ async (context) => {
+ const { userId } = getAuthUserId({ context });
+ const { db } = getDb({ context });
+ const { organizationId } = context.req.valid('param');
+
+ const organizationsRepository = createOrganizationsRepository({ db });
+
+ await ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });
+
+ await organizationsRepository.deleteOrganization({ organizationId });
+
+ return context.body(null, 204);
+ },
+ );
+}
diff --git a/apps/papra-server/src/modules/users/users.routes.ts b/apps/papra-server/src/modules/users/users.routes.ts
index a3e8ba75..b48b6f95 100644
--- a/apps/papra-server/src/modules/users/users.routes.ts
+++ b/apps/papra-server/src/modules/users/users.routes.ts
@@ -33,6 +33,7 @@ function setupGetCurrentUserRoute({ app }: { app: ServerInstance }) {
[
'id',
'email',
+ 'fullName',
'createdAt',
'updatedAt',
'planId',