Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

refactor(organization): split home and documents pages (#136)

Corentin Thomasset84d2af5df56e
diff --git a/apps/papra-client/src/locales/fr.yml b/apps/papra-client/src/locales/fr.yml
index 6acbf0df..45c3c4ac 100644
--- a/apps/papra-client/src/locales/fr.yml
+++ b/apps/papra-client/src/locales/fr.yml
@@ -26,7 +26,7 @@ layout:
tags: Tags
integrations: Intégrations
deleted-documents: Documents supprimés
- organization-settings: Paramètres de l'orga.
+ organization-settings: Paramètres de l'organisation
demo:
popup:
diff --git a/apps/papra-client/src/modules/documents/components/documents-list.component.tsx b/apps/papra-client/src/modules/documents/components/documents-list.component.tsx
index 27b5a479..249cf2da 100644
--- a/apps/papra-client/src/modules/documents/components/documents-list.component.tsx
+++ b/apps/papra-client/src/modules/documents/components/documents-list.component.tsx
@@ -59,9 +59,10 @@ export const tagsColumn: ColumnDef<Document> = {
export const DocumentsPaginatedList: Component<{
documents: Document[];
documentsCount: number;
- getPagination: Accessor<Pagination>;
- setPagination: Setter<Pagination>;
+ getPagination?: Accessor<Pagination>;
+ setPagination?: Setter<Pagination>;
extraColumns?: ColumnDef<Document>[];
+ showPagination?: boolean;
}> = (props) => {
const table = createSolidTable({
get data() {
@@ -69,7 +70,7 @@ export const DocumentsPaginatedList: Component<{
},
columns: [
{
- header: 'File',
+ header: 'File name',
cell: data => (
<div class="overflow-hidden flex gap-4 items-center">
<div class="bg-muted flex items-center justify-center p-2 rounded-lg">
@@ -81,7 +82,7 @@ export const DocumentsPaginatedList: Component<{
href={`/organizations/${data.row.original.organizationId}/documents/${data.row.original.id}`}
class="font-bold truncate block hover:underline"
>
- {data.row.original.name.split('.').shift()}
+ {data.row.original.name.split('.').slice(0, -1).join('.')}
</A>
<div class="text-xs text-muted-foreground lh-tight">
@@ -135,7 +136,7 @@ export const DocumentsPaginatedList: Component<{
onPaginationChange: props.setPagination,
state: {
get pagination() {
- return props.getPagination();
+ return props.getPagination?.();
},
},
manualPagination: true,
@@ -191,76 +192,78 @@ export const DocumentsPaginatedList: Component<{
</Table>
- <div class="flex flex-col-reverse items-center gap-4 sm:flex-row sm:justify-end mt-4">
- <div class="flex items-center space-x-2">
- <p class="whitespace-nowrap text-sm font-medium">Rows per page</p>
- <Select
- value={table.getState().pagination.pageSize}
- onChange={value => value && table.setPageSize(value)}
- options={[15, 50, 100]}
- itemComponent={props => (
- <SelectItem item={props.item}>{props.item.rawValue}</SelectItem>
- )}
- >
- <SelectTrigger class="h-8 w-[4.5rem]">
- <SelectValue<string>>
- {state => state.selectedOption()}
- </SelectValue>
- </SelectTrigger>
- <SelectContent />
- </Select>
- </div>
- <div class="flex items-center justify-center whitespace-nowrap text-sm font-medium">
- Page
- {' '}
- {table.getState().pagination.pageIndex + 1}
- {' '}
- of
- {' '}
- {table.getPageCount()}
- </div>
- <div class="flex items-center space-x-2">
- <Button
- aria-label="Go to first page"
- variant="outline"
- class="flex size-8 p-0"
- onClick={() => table.setPageIndex(0)}
- disabled={!table.getCanPreviousPage()}
- >
- <div class="size-4 i-tabler-chevrons-left" />
- </Button>
- <Button
- aria-label="Go to previous page"
- variant="outline"
- size="icon"
- class="size-8"
- onClick={() => table.previousPage()}
- disabled={!table.getCanPreviousPage()}
- >
- <div class="size-4 i-tabler-chevron-left" />
- </Button>
- <Button
- aria-label="Go to next page"
- variant="outline"
- size="icon"
- class="size-8"
- onClick={() => table.nextPage()}
- disabled={!table.getCanNextPage()}
- >
- <div class="size-4 i-tabler-chevron-right" />
- </Button>
- <Button
- aria-label="Go to last page"
- variant="outline"
- size="icon"
- class="flex size-8"
- onClick={() => table.setPageIndex(table.getPageCount() - 1)}
- disabled={!table.getCanNextPage()}
- >
- <div class="size-4 i-tabler-chevrons-right" />
- </Button>
+ <Show when={props.showPagination ?? true}>
+ <div class="flex flex-col-reverse items-center gap-4 sm:flex-row sm:justify-end mt-4">
+ <div class="flex items-center space-x-2">
+ <p class="whitespace-nowrap text-sm font-medium">Rows per page</p>
+ <Select
+ value={table.getState().pagination.pageSize}
+ onChange={value => value && table.setPageSize(value)}
+ options={[15, 50, 100]}
+ itemComponent={props => (
+ <SelectItem item={props.item}>{props.item.rawValue}</SelectItem>
+ )}
+ >
+ <SelectTrigger class="h-8 w-[4.5rem]">
+ <SelectValue<string>>
+ {state => state.selectedOption()}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent />
+ </Select>
+ </div>
+ <div class="flex items-center justify-center whitespace-nowrap text-sm font-medium">
+ Page
+ {' '}
+ {table.getState().pagination.pageIndex + 1}
+ {' '}
+ of
+ {' '}
+ {table.getPageCount()}
+ </div>
+ <div class="flex items-center space-x-2">
+ <Button
+ aria-label="Go to first page"
+ variant="outline"
+ class="flex size-8 p-0"
+ onClick={() => table.setPageIndex(0)}
+ disabled={!table.getCanPreviousPage()}
+ >
+ <div class="size-4 i-tabler-chevrons-left" />
+ </Button>
+ <Button
+ aria-label="Go to previous page"
+ variant="outline"
+ size="icon"
+ class="size-8"
+ onClick={() => table.previousPage()}
+ disabled={!table.getCanPreviousPage()}
+ >
+ <div class="size-4 i-tabler-chevron-left" />
+ </Button>
+ <Button
+ aria-label="Go to next page"
+ variant="outline"
+ size="icon"
+ class="size-8"
+ onClick={() => table.nextPage()}
+ disabled={!table.getCanNextPage()}
+ >
+ <div class="size-4 i-tabler-chevron-right" />
+ </Button>
+ <Button
+ aria-label="Go to last page"
+ variant="outline"
+ size="icon"
+ class="flex size-8"
+ onClick={() => table.setPageIndex(table.getPageCount() - 1)}
+ disabled={!table.getCanNextPage()}
+ >
+ <div class="size-4 i-tabler-chevrons-right" />
+ </Button>
+ </div>
</div>
- </div>
+ </Show>
</Match>
</Switch>
</div>
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 ae2aae6a..ddcab463 100644
--- a/apps/papra-client/src/modules/documents/pages/documents.page.tsx
+++ b/apps/papra-client/src/modules/documents/pages/documents.page.tsx
@@ -1,70 +1,11 @@
-import type { TooltipTriggerProps } from '@kobalte/core/tooltip';
-import type { Document } from '../documents.types';
import { fetchOrganization } from '@/modules/organizations/organizations.services';
-import { timeAgo } from '@/modules/shared/date/time-ago';
-import { cn } from '@/modules/shared/style/cn';
-import { Button } from '@/modules/ui/components/button';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/modules/ui/components/tooltip';
-import { formatBytes } from '@corentinth/chisels';
-import { A, useParams } from '@solidjs/router';
+import { useParams } from '@solidjs/router';
import { createQueries, keepPreviousData } from '@tanstack/solid-query';
-import { type Component, createSignal, For, Show, Suspense } from 'solid-js';
-import { DocumentManagementDropdown } from '../components/document-management-dropdown.component';
+import { type Component, createSignal, Suspense } from 'solid-js';
import { DocumentUploadArea } from '../components/document-upload-area.component';
import { createdAtColumn, DocumentsPaginatedList, standardActionsColumn, tagsColumn } from '../components/documents-list.component';
-import { getDocumentIcon } from '../document.models';
-import { useUploadDocuments } from '../documents.composables';
import { fetchOrganizationDocuments } from '../documents.services';
-const DocumentCard: Component<{ document: Document; organizationId?: string }> = (props) => {
- const params = useParams();
-
- const getOrganizationId = () => props.organizationId ?? params.organizationId;
-
- return (
- <div class="border rounded-lg overflow-hidden flex gap-4 p-3 pr-2 items-center">
- <div class="bg-muted flex items-center justify-center p-2 rounded-lg">
- <div class={cn(getDocumentIcon({ document: props.document }), 'size-6 text-primary')}></div>
- </div>
-
- <div class="flex-1 flex flex-col gap-1 truncate">
- <A
- href={`/organizations/${getOrganizationId()}/documents/${props.document.id}`}
- class="font-bold truncate block hover:underline"
- >
- {props.document.name.split('.').shift()}
- </A>
-
- <div class="text-xs text-muted-foreground lh-tight">
- {formatBytes({ bytes: props.document.originalSize, base: 1000 })}
- {' '}
- -
- {' '}
- {props.document.name.split('.').pop()?.toUpperCase()}
- {' '}
- -
- {' '}
- <Tooltip>
- <TooltipTrigger as={(tooltipProps: TooltipTriggerProps) => (
- <span {...tooltipProps}>
- {timeAgo({ date: props.document.createdAt })}
- </span>
- )}
- />
- <TooltipContent>
- {props.document.createdAt.toLocaleString()}
- </TooltipContent>
- </Tooltip>
- </div>
- </div>
-
- <div>
- <DocumentManagementDropdown document={props.document} />
- </div>
- </div>
- );
-};
-
export const DocumentsPage: Component = () => {
const params = useParams();
const [getPagination, setPagination] = createSignal({ pageIndex: 0, pageSize: 100 });
@@ -86,10 +27,8 @@ export const DocumentsPage: Component = () => {
],
}));
- const { promptImport } = useUploadDocuments({ organizationId: params.organizationId });
-
return (
- <div class="p-6 mt-4 pb-32 max-w-7xl mx-auto">
+ <div class="p-6 mt-4 pb-32 max-w-5xl mx-auto">
<Suspense>
{query[0].data?.documents?.length === 0
? (
@@ -108,56 +47,8 @@ export const DocumentsPage: Component = () => {
)
: (
<>
- <div class="grid grid-cols-1 lg:grid-cols-3 gap-4 mb-12">
-
- <Button onClick={promptImport} class="h-auto items-start flex-col gap-4 py-4 px-6">
- <div class="i-tabler-upload size-6"></div>
-
- Upload documents
- </Button>
-
- <Show when={query[1].data?.organization}>
- {organization => (
- <>
- <div class="border rounded-lg p-2 flex items-center gap-4 py-4 px-6">
- <div class="flex gap-2 items-baseline">
- <span class="font-light text-2xl">
- {organization().documentsCount}
- </span>
- <span class="text-muted-foreground">
- documents in total
- </span>
- </div>
- </div>
-
- <div class="border rounded-lg p-2 flex items-center gap-4 py-4 px-6">
- <div class="flex gap-2 items-baseline">
- <span class="font-light text-2xl">
- {formatBytes({ bytes: organization().documentsSize, base: 1000 })}
- </span>
- <span class="text-muted-foreground">
- total size
- </span>
- </div>
- </div>
- </>
- )}
- </Show>
- </div>
-
<h2 class="text-lg font-semibold mb-4">
- Latest imported documents
- </h2>
- <div class="grid gap-4 grid-cols-1 lg:grid-cols-2 xl:grid-cols-3">
- <For each={query[0].data?.documents.slice(0, 5)}>
- {document => (
- <DocumentCard document={document} />
- )}
- </For>
- </div>
-
- <h2 class="text-lg font-semibold mt-12 mb-2">
- All documents
+ Documents
</h2>
<DocumentsPaginatedList
diff --git a/apps/papra-client/src/modules/organizations/pages/organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/organization.page.tsx
new file mode 100644
index 00000000..acb5f40a
--- /dev/null
+++ b/apps/papra-client/src/modules/organizations/pages/organization.page.tsx
@@ -0,0 +1,112 @@
+import { DocumentUploadArea } from '@/modules/documents/components/document-upload-area.component';
+import { createdAtColumn, DocumentsPaginatedList, standardActionsColumn, tagsColumn } from '@/modules/documents/components/documents-list.component';
+import { useUploadDocuments } from '@/modules/documents/documents.composables';
+import { fetchOrganizationDocuments } from '@/modules/documents/documents.services';
+import { Button } from '@/modules/ui/components/button';
+import { formatBytes } from '@corentinth/chisels';
+import { useParams } from '@solidjs/router';
+import { createQueries, keepPreviousData } from '@tanstack/solid-query';
+import { type Component, createSignal, Show, Suspense } from 'solid-js';
+import { fetchOrganization } from '../organizations.services';
+
+export const OrganizationPage: Component = () => {
+ const params = useParams();
+ const [getPagination, setPagination] = createSignal({ pageIndex: 0, pageSize: 100 });
+
+ const query = createQueries(() => ({
+ queries: [
+ {
+ queryKey: ['organizations', params.organizationId, 'documents', getPagination()],
+ queryFn: () => fetchOrganizationDocuments({
+ organizationId: params.organizationId,
+ ...getPagination(),
+ }),
+ placeholderData: keepPreviousData,
+ },
+ {
+ queryKey: ['organizations', params.organizationId],
+ queryFn: () => fetchOrganization({ organizationId: params.organizationId }),
+ },
+ ],
+ }));
+
+ const { promptImport } = useUploadDocuments({ organizationId: params.organizationId });
+
+ return (
+ <div class="p-6 mt-4 pb-32 max-w-5xl mx-auto">
+ <Suspense>
+ {query[0].data?.documents?.length === 0
+ ? (
+ <>
+ <h2 class="text-xl font-bold ">
+ No documents
+ </h2>
+
+ <p class="text-muted-foreground mt-1 mb-6">
+ There are no documents in this organization yet. Start by uploading some documents.
+ </p>
+
+ <DocumentUploadArea />
+
+ </>
+ )
+ : (
+ <>
+ <div class="grid grid-cols-1 lg:grid-cols-3 gap-4 mb-12">
+
+ <Button onClick={promptImport} class="h-auto items-start flex-col gap-4 py-4 px-6">
+ <div class="i-tabler-upload size-6"></div>
+
+ Upload documents
+ </Button>
+
+ <Show when={query[1].data?.organization}>
+ {organization => (
+ <>
+ <div class="border rounded-lg p-2 flex items-center gap-4 py-4 px-6">
+ <div class="flex gap-2 items-baseline">
+ <span class="font-light text-2xl">
+ {organization().documentsCount}
+ </span>
+ <span class="text-muted-foreground">
+ documents in total
+ </span>
+ </div>
+ </div>
+
+ <div class="border rounded-lg p-2 flex items-center gap-4 py-4 px-6">
+ <div class="flex gap-2 items-baseline">
+ <span class="font-light text-2xl">
+ {formatBytes({ bytes: organization().documentsSize, base: 1000 })}
+ </span>
+ <span class="text-muted-foreground">
+ total size
+ </span>
+ </div>
+ </div>
+ </>
+ )}
+ </Show>
+ </div>
+
+ <h2 class="text-lg font-semibold mb-4">
+ Latest imported documents
+ </h2>
+
+ <DocumentsPaginatedList
+ documents={query[0].data?.documents ?? []}
+ documentsCount={query[0].data?.documentsCount ?? 0}
+ getPagination={getPagination}
+ setPagination={setPagination}
+ extraColumns={[
+ tagsColumn,
+ createdAtColumn,
+ standardActionsColumn,
+ ]}
+ />
+ </>
+ )}
+ </Suspense>
+ </div>
+ );
+};
diff --git a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
index b909b868..baf316cb 100644
--- a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
+++ b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
@@ -62,6 +62,8 @@ export const SideNav: Component<{
},
];
+ const version = `v${config.papraVersion}`;
+
return (
<div class="flex h-full">
<div class="w-65px border-r bg-card pt-4 pb-6 flex flex-col">
@@ -93,9 +95,9 @@ export const SideNav: Component<{
))}
</div>
- <div class="text-xs text-muted-foreground text-center mt-auto">
- {`v${config.papraVersion}`}
- </div>
+ <a class="text-xs text-muted-foreground text-center mt-auto transition-colors hover:(text-primary underline)" href={`https://github.com/papra-hq/papra/releases/tag/${version}`} target="_blank" rel="noopener noreferrer">
+ {version}
+ </a>
</div>
{(props.header || props.mainMenu || props.footerMenu || props.footer) && (
diff --git a/apps/papra-client/src/routes.tsx b/apps/papra-client/src/routes.tsx
index 32987b1f..bd0cc51c 100644
--- a/apps/papra-client/src/routes.tsx
+++ b/apps/papra-client/src/routes.tsx
@@ -14,6 +14,7 @@ import { IntakeEmailsPage } from './modules/intake-emails/pages/intake-emails.pa
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 { OrganizationPage } from './modules/organizations/pages/organization.page';
import { OrganizationsSettingsPage } from './modules/organizations/pages/organizations-settings.page';
import { OrganizationsPage } from './modules/organizations/pages/organizations.page';
import { ComingSoonPage } from './modules/shared/pages/coming-soon.page';
@@ -88,7 +89,7 @@ export const routes: RouteDefinition[] = [
children: [
{
path: '/',
- component: DocumentsPage,
+ component: OrganizationPage,
},
{
path: '/documents',