Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

refactor(client): removed suspenses (#1356)

Corentin Thomasset1da48c346eae
diff --git a/apps/papra-client/src/index.tsx b/apps/papra-client/src/index.tsx
index 53ab4777..40a4b886 100644
--- a/apps/papra-client/src/index.tsx
+++ b/apps/papra-client/src/index.tsx
@@ -3,7 +3,7 @@
import { Router } from '@solidjs/router';
import { QueryClientProvider } from '@tanstack/solid-query';
-import { lazy, Suspense } from 'solid-js';
+import { lazy } from 'solid-js';
import { render } from 'solid-js/web';
import { CommandPaletteProvider } from './modules/command-palette/command-palette.provider';
import { isDemoMode } from './modules/config/config';
@@ -34,7 +34,7 @@ render(() => {
<Router
children={routes}
root={(props) => (
- <Suspense>
+ <>
<PageViewTracker />
<IdentifyUser />
<I18nProvider>
@@ -59,7 +59,7 @@ render(() => {
</ThemeProvider>
</ConfirmModalProvider>
</I18nProvider>
- </Suspense>
+ </>
)}
/>
</QueryClientProvider>
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 ee1d6aea..1dc634fc 100644
--- a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
+++ b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
@@ -1,5 +1,5 @@
import type { Component, ParentComponent } from 'solid-js';
-import { createEffect, createSignal, For, on, Show, Suspense } from 'solid-js';
+import { createEffect, createSignal, For, on, Show } from 'solid-js';
import { useI18n } from '@/modules/i18n/i18n.provider';
import { Button } from '@/modules/ui/components/button';
import { DropdownMenuRadioGroup, DropdownMenuRadioItem } from '../components/dropdown-menu';
@@ -70,9 +70,7 @@ export const SidenavLayout: ParentComponent<{
{props.header && <props.header />}
</div>
- <div class="flex-1 overflow-auto max-w-screen">
- <Suspense>{props.children}</Suspense>
- </div>
+ <div class="flex-1 overflow-auto max-w-screen">{props.children}</div>
</div>
</div>
);
diff --git a/apps/papra-client/src/routes.tsx b/apps/papra-client/src/routes.tsx
index 7d1a076d..d1f4b4a5 100644
--- a/apps/papra-client/src/routes.tsx
+++ b/apps/papra-client/src/routes.tsx
@@ -1,7 +1,7 @@
import type { RouteDefinition } from '@solidjs/router';
import { Navigate, useParams } from '@solidjs/router';
import { useQuery } from '@tanstack/solid-query';
-import { Match, Show, Suspense, Switch } from 'solid-js';
+import { Match, Show, Switch } from 'solid-js';
import { adminRoutes } from './modules/admin/admin.routes';
import { ApiKeysPage } from './modules/api-keys/pages/api-keys.page';
import { CreateApiKeyPage } from './modules/api-keys/pages/create-api-key.page';
@@ -71,36 +71,32 @@ export const routes: RouteDefinition[] = [
}));
return (
- <>
- <Suspense>
- <Show when={query.data?.organizations}>
- {(getOrgs) => (
- <Switch>
- <Match
- when={
- getLatestOrganizationId() &&
- getOrgs().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={getOrgs().length === 1}>
- <Navigate href={`/organizations/${getOrgs()[0]?.id ?? ''}`} />
- </Match>
+ <Match when={getOrgs().length === 1}>
+ <Navigate href={`/organizations/${getOrgs()[0]?.id ?? ''}`} />
+ </Match>
- <Match when={getOrgs().length > 0}>
- <Navigate href="/organizations" />
- </Match>
+ <Match when={getOrgs().length > 0}>
+ <Navigate href="/organizations" />
+ </Match>
- <Match when={getOrgs().length === 0}>
- <Navigate href="/organizations/first" />
- </Match>
- </Switch>
- )}
- </Show>
- </Suspense>
- </>
+ <Match when={getOrgs().length === 0}>
+ <Navigate href="/organizations/first" />
+ </Match>
+ </Switch>
+ )}
+ </Show>
);
},
},