rimecms 0.31.4 → 0.31.5

package/dist/core/handlers/auth.server.js

@@ -1,16 +1,24 @@
+import { isPublicPanelAuthRoute } from '../constant.js';
 import { RimeError } from '../errors/index.js';
 import { error, redirect } from '@sveltejs/kit';
 import { BETTER_AUTH_ROLES } from '../collections/auth/constant.server.js';
 import { logger } from '../logger/index.server.js';
 const dev = process.env.NODE_ENV === 'development';
 /**
- * Analyzes the current route to determine authentication requirements
+ * Analyzes the current route to determine authentication requirements.
+ * isPanel/isPublicAuthRoute are derived from the matched route, not the
+ * pathname — event.params.panel only resolves when the request matched the
+ * [panel=panel] matcher, and event.route.id's literal folder names never
+ * carry the configured RIME_PANEL_ROUTE value — so neither check needs to
+ * know the actual (hideable) panel segment. sign-in/forgot-password/reset-password
+ * all live under [panel=panel] too but must stay reachable without a session,
+ * hence the isPublicAuthRoute carve-out.
  */
-function analyzeRoute(pathname) {
-    const isSignIn = pathname === '/panel/sign-in';
-    const isPanel = pathname.startsWith('/panel') && !isSignIn;
-    const isAPI = pathname.startsWith('/api');
-    return { isSignIn, isPanel, isAPI };
+function analyzeRoute(event) {
+    const isPublicAuthRoute = isPublicPanelAuthRoute(event.route.id);
+    const isPanel = event.params.panel !== undefined && !isPublicAuthRoute;
+    const isAPI = event.url.pathname.startsWith('/api');
+    return { isPublicAuthRoute, isPanel, isAPI };
 }
 /**
  * Ensures panel is properly set up before allowing access
@@ -31,7 +39,7 @@ async function authenticateRequest(headers, auth) {
  */
 function handleUnauthenticated(event, resolve, routeInfo) {
     if (routeInfo.isPanel) {
-        throw redirect(303, '/panel/sign-in');
+        throw redirect(303, `/${event.params.panel}/sign-in`);
     }
     event.locals.user = undefined;
     event.locals.session = undefined;
@@ -132,7 +140,7 @@ function cleanupUser(userData, routeInfo) {
  */
 export const handleAuth = async ({ event, resolve }) => {
     const rime = event.locals.rime;
-    const routeInfo = analyzeRoute(event.url.pathname);
+    const routeInfo = analyzeRoute(event);
     // Ensure auth is set up
     if (routeInfo.isPanel) {
         await ensureFirstAuthSetup(rime);

package/dist/core/handlers/routes.server.d.ts

@@ -31,7 +31,7 @@ export declare const routeHandlers: {
                 aria: import("../../types.js").Route[];
             }>;
             live: typeof liveLoad;
-            signIn: ({ locals }: ServerLoadEvent) => Promise<{
+            signIn: ({ locals, params }: ServerLoadEvent) => Promise<{
                 forgotPasswordEnabled: boolean;
                 image: string | null;
                 form: {};

package/dist/core/handlers/routes.server.js

@@ -1,3 +1,4 @@
+import { isPublicPanelAuthRoute } from '../constant.js';
 import { prototypeKebabToSlug } from '../naming.js';
 import buildNavigation from '../../panel/navigation.js';
 import { areaFormActions } from '../../panel/pages/area/actions.server.js';
@@ -56,9 +57,9 @@ export const routeHandlers = {
 };
 export const handleRoutes = async ({ event, resolve }) => {
     const { rime, user } = event.locals;
-    const IS_SIGN_IN_ROUTE = event.url.pathname === '/panel/sign-in';
+    const IS_PUBLIC_AUTH_ROUTE = isPublicPanelAuthRoute(event.route.id);
     const IS_API_ROUTE = event.url.pathname.startsWith('/api');
-    const IS_PANEL_ROUTE = event.url.pathname.startsWith('/panel') && !IS_SIGN_IN_ROUTE;
+    const IS_PANEL_ROUTE = event.params.panel !== undefined && !IS_PUBLIC_AUTH_ROUTE;
     // event.params.slug comes straight from the URL, always kebab-case (see
     // src/params/collection.ts, area.ts). Collection/area slugs themselves are
     // camelCase, so rewrite once here — every downstream handler (panel
@@ -72,7 +73,7 @@ export const handleRoutes = async ({ event, resolve }) => {
     }
     // build panel navigation
     if (IS_PANEL_ROUTE && event.request.method === 'GET') {
-        event.locals.navigation = buildNavigation(rime.config.raw, user);
+        event.locals.navigation = buildNavigation(rime.config.raw, user, event.params.panel);
     }
     event.locals.routes = routeHandlers;
     // Handle custom routes from config and plugins

package/dist/core/operations/hooks/before-read/populate-url.server.js

@@ -1,3 +1,4 @@
+import { env } from '$env/dynamic/private';
 import { PARAMS } from '../../../constant.js';
 import { logger } from '../../../logger/index.server.js';
 import { getValueAtPath } from '../../../../util/object.js';
@@ -98,7 +99,7 @@ export const populateURL = Hooks.beforeRead(async (args) => {
         }
         // Add the live url if needed
         if (config.live && event.locals.user && url) {
-            args.doc._live = `${process.env.PUBLIC_RIME_URL}/panel/live-edit?src=${url}&slug=${config.slug}&id=${args.doc.id}`;
+            args.doc._live = `${process.env.PUBLIC_RIME_URL}/${env.RIME_PANEL_ROUTE || 'panel'}/live-edit?src=${url}&slug=${config.slug}&id=${args.doc.id}`;
             args.doc._live += args.doc.versionId ? `&${PARAMS.VERSION_ID}=${args.doc.versionId}` : '';
             args.doc._live += locale ? `&${PARAMS.LOCALE}=${locale}` : '';
         }

package/dist/core/plugins/cache/handler.server.js

@@ -10,7 +10,7 @@ export const handler = async ({ event, resolve }) => {
         return await resolve(event);
     }
     // Do not cache panel routes
-    if (event.url.pathname.startsWith('/panel')) {
+    if (event.params.panel !== undefined) {
         return await resolve(event);
     }
     // Use configuration function

package/dist/panel/components/sections/collection/list/row/Row.svelte

@@ -3,6 +3,7 @@
   import type { GenericDoc } from '../../../../../../core/types/doc.js';
   import Checkbox from '../../../../ui/checkbox/checkbox.svelte';
   import { getLocaleContext } from '../../../../../context/locale.svelte';
+  import { panelUrl } from '../../../../../util/url.js';
   import { getValueAtPath } from '../../../../../../util/object';
   import StatusDot from '../../StatusDot.svelte';
   import UploadThumbCell from '../../upload-thumb-cell/UploadThumbCell.svelte';
@@ -59,7 +60,7 @@
       {/if}
       <label for="checkbox-{doc.id}" class="rz-list-row__title">{doc.title || '[untitled]'}</label>
     {:else}
-      <a class="rz-list-row__link" href="/panel/{config.kebab}/{doc.id}">
+      <a class="rz-list-row__link" href={panelUrl(config.kebab, doc.id)}>
         {#if doc._thumbnail}
           <UploadThumbCell url={doc._thumbnail} mimeType={doc.mimeType} />
         {:else}

package/dist/panel/components/sections/collection/tree/CollectionTreeNode.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { GenericDoc } from '../../../../../core/types/doc.js';
   import type { CollectionContext } from '../../../../context/collection.svelte.js';
+  import { panelUrl } from '../../../../util/url.js';
   import { GripVertical } from '@lucide/svelte';
   import StatusDot from '../StatusDot.svelte';
   import CollectionTreeNode from './CollectionTreeNode.svelte';
@@ -12,7 +13,7 @@
 
 {#key `${parentId}-${doc.id}-${doc._position}`}
   <div data-parent={parentId} data-id={doc.id} class="rz-collection-node">
-    <a href="/panel/{doc._type}/{doc.id}" class="rz-collection-node__row">
+    <a href={panelUrl(doc._type, doc.id)} class="rz-collection-node__row">
       <div class="rz-collection-node__grip"><GripVertical size="12" /></div>
       <div>
         {doc.title}

package/dist/panel/components/sections/document/AuthFooter.svelte

@@ -7,6 +7,7 @@
   import type { DocumentFormContext } from '../../../context/documentForm.svelte.js';
   import { getUserContext } from '../../../context/user.svelte.js';
   import { authClient } from '../../../util/auth';
+  import { panelUrl } from '../../../util/url.js';
   import validate from '../../../../util/validate';
   import { toast } from 'svelte-sonner';
   import Button from '../../ui/button/button.svelte';
@@ -27,7 +28,7 @@
   async function sendPasswordResetLink() {
     const { data, error } = await authClient.requestPasswordReset({
       email: form.values.email,
-      redirectTo: `/reset-password?slug=staff`
+      redirectTo: `${panelUrl('reset-password')}?slug=staff`
     });
     if (error && error.message) {
       toast.error(error.message);

package/dist/panel/components/sections/document/Versions.svelte

@@ -32,7 +32,7 @@
     if (doc._prototype === 'collection') {
       return `${panelUrl(kebabSlug, doc.id)}?versionId=${doc.versionId}`;
     } else {
-      return `${panelUrl(kebabSlug)}/panel/${toKebabCase(doc._type)}?versionId=${doc.versionId}`;
+      return `${panelUrl(kebabSlug)}?versionId=${doc.versionId}`;
     }
   });
 </script>

package/dist/panel/components/ui/card-resource/card-resource.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import { mimeTypeToIcon } from '../../../util/upload.js';
+  import { panelUrl } from '../../../util/url.js';
   import { Edit, FileIcon, X } from '@lucide/svelte';
 
   type Resource = {
@@ -40,7 +41,7 @@
 
   <div class="rz-card-resource__info">
     <p class="rz-card-resource__title">
-      {resource.title} <a href="/panel/{resource._type}/{resource.id}"><Edit size="12" /></a>
+      {resource.title} <a href={panelUrl(resource._type, resource.id)}><Edit size="12" /></a>
     </p>
     {#if isUpload}
       <p class="rz-card-resource__info-text">{resource.filesize}</p>

package/dist/panel/components/ui/nav/Nav.svelte

@@ -37,7 +37,7 @@
 <div class:rz-nav--collapsed={isCollapsed} class="rz-nav">
   <div class="rz-nav__content">
     <div class="rz-nav__header" class:rz-nav__header--collapsed={isCollapsed}>
-      <NavItem href="/panel" {isCollapsed} route={dashBoardRoute} />
+      <NavItem href={panelUrl()} {isCollapsed} route={dashBoardRoute} />
     </div>
 
     <div class="rz-nav__body">

package/dist/panel/components/ui/nav/NavItem.svelte

@@ -23,8 +23,9 @@
 
   let active = $derived.by(() => {
     const routePathname = new URL(route.url).pathname;
-    if (routePathname === '/panel') {
-      return pathname === '/panel';
+    const panelRoot = `/${page.params.panel}`;
+    if (routePathname === panelRoot) {
+      return pathname === panelRoot;
     }
     const reg = new RegExp(`^${routePathname}(/.*)?$`);
     return reg.test(pathname);

package/dist/panel/components/ui/nav/UserButton.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { env } from '$env/dynamic/public';
   import * as Tooltip from '../tooltip';
   import { getUserContext } from '../../../context/user.svelte.js';
   import { authClient } from '../../../util/auth.js';
+  import { panelUrl } from '../../../util/url.js';
   import { LogOut } from '@lucide/svelte';
   import { toast } from 'svelte-sonner';
   import Button from '../button/button.svelte';
@@ -15,7 +15,7 @@
   async function signout() {
     const result = await authClient.signOut();
     if (result.data?.success) {
-      window.location.href = `${env.PUBLIC_RIME_URL}/panel/sign-in`;
+      window.location.href = panelUrl('sign-in');
     } else {
       toast.error(`Can't sign-out, please try again`);
     }
@@ -26,7 +26,7 @@
   {#if !navCollapsed}
     <div class="rz-user-button">
       <div class="rz-user-button__left">
-        <a href="/panel/staff/{user.attributes.id}">
+        <a href={panelUrl('staff', user.attributes.id)}>
           {user.attributes.name?.charAt(0) || ''}
         </a>
         <div class="rz-user-button__name">{user.attributes.name}</div>

package/dist/panel/context/documentForm.svelte.js

@@ -4,6 +4,7 @@ import { PARAMS, VERSIONS_STATUS } from '../../core/constant.js';
 import { getFieldAtPath } from '../../core/fields/util.js';
 import { buildConfigMap } from '../../core/operations/configMap/index.js';
 import { isJSONContent, richTextJSONToText } from '../../fields/rich-text/index.js';
+import { panelUrl } from '../util/url.js';
 import { normalizeFieldPath } from '../../util/doc.js';
 import { apiUrl, random } from '../../util/index.js';
 import { isObjectLiteral, omit } from '../../util/object.js';
@@ -590,12 +591,10 @@ function createDocumentFormState({ initial, config, readOnly, key, onNestedDocum
      * This function constructs the appropriate URL to which the form data will be submitted.
      */
     const buildPanelActionUrl = () => {
-        // Start with the base URI for the panel
-        let panelUri = `/panel/${config.kebab}`;
-        // Add the item ID to the URI if we're updating a collection doc
-        if (operation === 'update' && initial._prototype === 'collection' && initial.id) {
-            panelUri += `/${initial.id}`;
-        }
+        // Start with the base URI for the panel, adding the item ID if we're updating a collection doc
+        const panelUri = operation === 'update' && initial._prototype === 'collection' && initial.id
+            ? panelUrl(config.kebab, initial.id)
+            : panelUrl(config.kebab);
         // Determine the appropriate action based on whether we're creating or updating
         const actionSuffix = operation === 'create' ? '/create?/create' : '?/update';
         // Add a redirect parameter if we're in a nested form ex: relation creation

package/dist/panel/navigation.d.ts

@@ -3,11 +3,16 @@ import type { BuildConfig } from '../core/config/server/index.server.js';
 import type { Config } from '../types.js';
 import type { Dic } from '../util/types.js';
 /**
- * Builds navigation structure based on config and user permissions
+ * Builds navigation structure based on config and user permissions. Called
+ * directly from the routes handle hook, before resolve() — page.params isn't
+ * populated yet at that point, so the panel segment is passed in explicitly
+ * (from the same event.params.panel the caller already has) rather than
+ * relying on panelUrl()'s page-based default.
  * @param config - Compiled configuration object
  * @param user - Current user object (optional)
+ * @param panelSegment - The resolved [panel=panel] segment for this request
  * @returns Dictionary of navigation groups
  */
-declare const buildNavigation: <C extends Config>(config: BuildConfig<C>, user: User | undefined) => Dic;
+declare const buildNavigation: <C extends Config>(config: BuildConfig<C>, user: User | undefined, panelSegment: string | undefined) => Dic;
 export default buildNavigation;
 export type Navigation = ReturnType<typeof buildNavigation>;

package/dist/panel/navigation.js

@@ -1,11 +1,16 @@
-import { panelUrl } from './util/url.js';
+import { panelUrlFor } from './util/url.js';
 /**
- * Builds navigation structure based on config and user permissions
+ * Builds navigation structure based on config and user permissions. Called
+ * directly from the routes handle hook, before resolve() — page.params isn't
+ * populated yet at that point, so the panel segment is passed in explicitly
+ * (from the same event.params.panel the caller already has) rather than
+ * relying on panelUrl()'s page-based default.
  * @param config - Compiled configuration object
  * @param user - Current user object (optional)
+ * @param panelSegment - The resolved [panel=panel] segment for this request
  * @returns Dictionary of navigation groups
  */
-const buildNavigation = (config, user) => {
+const buildNavigation = (config, user, panelSegment) => {
     const groups = {};
     /**
      * Adds a route to the appropriate navigation group
@@ -29,7 +34,7 @@ const buildNavigation = (config, user) => {
             const route = {
                 title: collection.label.plural,
                 icon: collection.slug,
-                url: panelUrl(collection.kebab)
+                url: panelUrlFor(panelSegment, collection.kebab)
             };
             addRouteToGroup(route, (collection.panel && collection.panel?.group) || 'collections');
         }
@@ -40,7 +45,7 @@ const buildNavigation = (config, user) => {
             const route = {
                 title: area.label,
                 icon: area.slug,
-                url: panelUrl(area.kebab)
+                url: panelUrlFor(panelSegment, area.kebab)
             };
             addRouteToGroup(route, (area.panel && area.panel?.group) || 'areas');
         }
@@ -50,7 +55,7 @@ const buildNavigation = (config, user) => {
         const route = {
             title: routeConfig.label,
             icon: `custom-${routePath}`,
-            url: panelUrl(routePath)
+            url: panelUrlFor(panelSegment, routePath)
         };
         addRouteToGroup(route, routeConfig.group);
     });

package/dist/panel/pages/area/actions.server.js

@@ -1,7 +1,7 @@
 import { PARAMS } from '../../../core/constant.js';
 import { ERROR_CONTEXT, handleError } from '../../../core/errors/handler.server.js';
 import { extractData } from '../../../core/operations/extract-data.server.js';
-import { panelUrl } from '../../util/url.js';
+import { panelUrlFor } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
 import { toKebabCase } from '../../../util/string.js';
 import { redirect } from '@sveltejs/kit';
@@ -10,6 +10,7 @@ export const areaFormActions = {
     update: async (event) => {
         const { rime, locale } = event.locals;
         const slug = (event.params.slug || '');
+        const panelSegment = event.params.panel;
         const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
         const draft = event.url.searchParams.get(PARAMS.DRAFT) === 'true';
         const [extractError, data] = await trycatch(() => extractData(event.request));
@@ -28,10 +29,10 @@ export const areaFormActions = {
         if (draft && 'versionId' in document) {
             const referer = event.request.headers.get('referer');
             if (referer && referer.includes('/versions')) {
-                return redirect(303, `${panelUrl(toKebabCase(slug))}/versions?versionId=${document.versionId}`);
+                return redirect(303, `${panelUrlFor(panelSegment, toKebabCase(slug))}/versions?versionId=${document.versionId}`);
             }
             else {
-                return redirect(303, `${panelUrl(toKebabCase(slug))}?versionId=${document.versionId}`);
+                return redirect(303, `${panelUrlFor(panelSegment, toKebabCase(slug))}?versionId=${document.versionId}`);
             }
         }
         return { document, message: t__('common.doc_updated') };

package/dist/panel/pages/area/load.server.js

@@ -2,7 +2,7 @@ import { PARAMS } from '../../../core/constant.js';
 import { ERROR_CONTEXT, handleError } from '../../../core/errors/handler.server.js';
 import { RimeError } from '../../../core/errors/index.js';
 import { withVersionsSuffix } from '../../../core/naming.js';
-import { panelUrl } from '../../util/url.js';
+import { panelUrlFor } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
 import { apiUrl } from '../../../util/index.js';
 import { toKebabCase } from '../../../util/string.js';
@@ -11,6 +11,7 @@ export async function areaLoad(event, withVersions) {
     const { locals, url, fetch } = event;
     const { rime, locale } = locals;
     const slug = (event.params.slug || '');
+    const panelSegment = event.params.panel;
     const area = rime.area(slug);
     const authorizedRead = area.config.access.read(locals.user, {});
     const authorizedUpdate = area.config.access.update(locals.user, {});
@@ -18,7 +19,7 @@ export async function areaLoad(event, withVersions) {
         throw handleError(new RimeError(RimeError.UNAUTHORIZED), { context: ERROR_CONTEXT.LOAD });
     }
     const aria = [
-        { title: 'Dashboard', icon: 'dashboard', url: panelUrl() },
+        { title: 'Dashboard', icon: 'dashboard', url: panelUrlFor(panelSegment) },
         { title: area.config.label }
     ];
     const versionId = url.searchParams.get(PARAMS.VERSION_ID) || undefined;

package/dist/panel/pages/auth/forgot-password/ForgotPassword.svelte

@@ -6,6 +6,7 @@
   import { setFormContext } from '../../../context/form.svelte';
   import { emailField } from '../fields.js';
   import { authClient } from '../../../util/auth';
+  import { panelUrl } from '../../../util/url.js';
   import { toast } from 'svelte-sonner';
 
   type Props = {
@@ -29,7 +30,7 @@
   async function sendResetPasswordMail() {
     const { data, error } = await authClient.requestPasswordReset({
       email: context.values.email,
-      redirectTo: `/reset-password`
+      redirectTo: panelUrl('reset-password')
     });
     if (error && error.message) {
       toast.error(error.message);

package/dist/panel/pages/auth/reset-password/ResetPassword.svelte

@@ -6,6 +6,7 @@
   import { setFormContext } from '../../../context/form.svelte';
   import { confirmPasswordField, passwordField } from '../fields.js';
   import { authClient } from '../../../util/auth';
+  import { panelUrl } from '../../../util/url.js';
   import { toast } from 'svelte-sonner';
 
   let success = $state(false);
@@ -42,7 +43,7 @@
 <AuthForm image={data.image} title={t__('common.resetPassword')}>
   {#if success}
     <p>{t__('common.reset_password_success')}</p>
-    <Button size="xl" href="/panel/sign-in">{t__('common.signin')}</Button>
+    <Button size="xl" href={panelUrl('sign-in')}>{t__('common.signin')}</Button>
   {:else}
     <Text type="password" config={passwordConfig} {form} />
     <Text type="password" config={confirmPasswordConfig} {form} />

package/dist/panel/pages/auth/sign-in/SignIn.svelte

@@ -8,6 +8,7 @@
   import SpinLoader from '../../../components/ui/spin-loader/SpinLoader.svelte';
   import { setFormContext } from '../../../context/form.svelte';
   import { emailField, passwordField } from '../fields.js';
+  import { panelPath, panelUrl } from '../../../util/url.js';
   import type { FormErrors } from '../../../../types.js';
   import { KeyRound } from '@lucide/svelte';
   import { toast } from 'svelte-sonner';
@@ -34,7 +35,7 @@
 
 <AuthForm image={data.image} title={t__('common.signin')}>
   {#if context.status !== 429}
-    <form method="POST" action="/panel/sign-in" use:enhance={context.enhance}>
+    <form method="POST" action={panelPath('sign-in')} use:enhance={context.enhance}>
       <Email config={emailField} form={context} />
       <Text
         type="password"
@@ -50,7 +51,7 @@
       </Button>
 
       {#if data.forgotPasswordEnabled}
-        <Button variant="link" href="/forgot-password">
+        <Button variant="link" href={panelUrl('forgot-password')}>
           {t__('common.forgotPassword')}
         </Button>
       {/if}

package/dist/panel/pages/auth/sign-in/actions.server.js

@@ -3,7 +3,7 @@ import { handleError } from '../../../../core/errors/handler.server.js';
 import { RimeFormError } from '../../../../core/errors/index.js';
 import { redirect } from '@sveltejs/kit';
 export const signInActions = {
-    default: async ({ cookies, request, locals }) => {
+    default: async ({ cookies, request, locals, params }) => {
         const { rime } = locals;
         const data = await request.formData();
         const email = data.get('email')?.toString() || '';
@@ -36,6 +36,6 @@ export const signInActions = {
                 secure: !dev
             });
         }
-        throw redirect(302, '/panel');
+        throw redirect(302, `/${params.panel}`);
     }
 };

package/dist/panel/pages/auth/sign-in/load.server.d.ts

@@ -1,5 +1,5 @@
 import { type ServerLoadEvent } from '@sveltejs/kit';
-export declare const signInLoad: ({ locals }: ServerLoadEvent) => Promise<{
+export declare const signInLoad: ({ locals, params }: ServerLoadEvent) => Promise<{
     forgotPasswordEnabled: boolean;
     image: string | null;
     form: {};

package/dist/panel/pages/auth/sign-in/load.server.js

@@ -1,11 +1,11 @@
 import { redirect } from '@sveltejs/kit';
 import { existsSync } from 'node:fs';
 import path from 'node:path';
-export const signInLoad = async ({ locals }) => {
+export const signInLoad = async ({ locals, params }) => {
     const { session, rime } = locals;
     const imageExist = existsSync(path.join(process.cwd(), 'static', 'panel', 'panel.jpg'));
     if (session) {
-        throw redirect(302, '/panel');
+        throw redirect(302, `/${params.panel}`);
     }
     else {
         return {

package/dist/panel/pages/collection/load.server.js

@@ -4,7 +4,7 @@ import { handleError } from '../../../core/errors/handler.server.js';
 import { RimeError } from '../../../core/errors/index.js';
 import { logger } from '../../../core/logger/index.server.js';
 import { withDirectoriesSuffix } from '../../../core/naming.js';
-import { panelUrl } from '../../util/url.js';
+import { panelUrlFor } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
 import { redirect } from '@sveltejs/kit';
 /**
@@ -13,6 +13,7 @@ import { redirect } from '@sveltejs/kit';
 export async function collectionLoad(event) {
     //
     const { rime, locale, user } = event.locals;
+    const panelSegment = event.params.panel;
     const slug = event.params.slug || '';
     if (!rime.config.isCollection(slug)) {
         throw handleError(new RimeError(RimeError.NOT_FOUND), { context: 'load' });
@@ -24,7 +25,7 @@ export async function collectionLoad(event) {
         draft: true
     });
     let aria = [
-        { title: 'Dashboard', url: panelUrl() },
+        { title: 'Dashboard', url: panelUrlFor(panelSegment) },
         { title: collection.config.label.plural }
     ];
     let data = {
@@ -68,10 +69,14 @@ export async function collectionLoad(event) {
             parentDirectory = result;
             const collectionAria = {
                 title: collection.config.label.plural,
-                url: panelUrl(collection.config.kebab)
+                url: panelUrlFor(panelSegment, collection.config.kebab)
             };
             aria = [...aria].slice(0, -1);
-            aria = [...aria, collectionAria, ...buildUploadAria({ path: currentDirectoryPath, slug })];
+            aria = [
+                ...aria,
+                collectionAria,
+                ...buildUploadAria({ path: currentDirectoryPath, slug, panelSegment })
+            ];
             data.aria = removePathFromLastAria(aria);
         }
         data = {

package/dist/panel/pages/collection-document/actions.server.js

@@ -2,7 +2,7 @@ import { PARAMS, UPLOAD_PATH } from '../../../core/constant.js';
 import { ERROR_CONTEXT, handleError } from '../../../core/errors/handler.server.js';
 import { RimeError } from '../../../core/errors/index.js';
 import { extractData } from '../../../core/operations/extract-data.server.js';
-import { panelUrl } from '../../util/url.js';
+import { panelUrlFor } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
 import { toKebabCase } from '../../../util/string.js';
 import {} from '@sveltejs/kit';
@@ -15,6 +15,7 @@ export const collectionFormActions = {
      */
     create: async (event) => {
         const { rime, locale } = event.locals;
+        const panelSegment = event.params.panel;
         const slug = event.params.slug;
         if (!rime.config.isCollection(slug)) {
             throw handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.ACTION });
@@ -44,7 +45,7 @@ export const collectionFormActions = {
         const params = collection.config.upload
             ? `?${PARAMS.UPLOAD_PATH}=${data._path || UPLOAD_PATH.ROOT_NAME}`
             : '';
-        const redirectUrl = `${panelUrl(toKebabCase(slug), document.id)}${params}`;
+        const redirectUrl = `${panelUrlFor(panelSegment, toKebabCase(slug), document.id)}${params}`;
         return {
             redirectUrl,
             document,
@@ -58,6 +59,7 @@ export const collectionFormActions = {
      */
     update: async (event) => {
         const { rime, locale } = event.locals;
+        const panelSegment = event.params.panel;
         const slug = event.params.slug || '';
         const id = event.params.id || '';
         const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
@@ -83,7 +85,7 @@ export const collectionFormActions = {
             return {
                 document,
                 message: t__('common.version_created'),
-                redirectUrl: `${panelUrl(toKebabCase(slug), document.id)}/versions?versionId=${document.versionId}`
+                redirectUrl: `${panelUrlFor(panelSegment, toKebabCase(slug), document.id)}/versions?versionId=${document.versionId}`
             };
         }
         return {

package/dist/panel/pages/collection-document/load.server.js

@@ -3,7 +3,7 @@ import { PARAMS, UPLOAD_PATH } from '../../../core/constant.js';
 import { ERROR_CONTEXT, handleError } from '../../../core/errors/handler.server.js';
 import { RimeError } from '../../../core/errors/index.js';
 import { withVersionsSuffix } from '../../../core/naming.js';
-import { panelUrl } from '../../util/url.js';
+import { panelUrlFor } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
 import { apiUrl } from '../../../util/index.js';
 import { toKebabCase } from '../../../util/string.js';
@@ -16,6 +16,7 @@ export async function documentLoad(event, withVersion) {
     const { locale, user, rime } = event.locals;
     const { id } = event.params;
     const slug = event.params.slug || '';
+    const panelSegment = event.params.panel;
     if (!id)
         throw error(404, 'Not found');
     let doc;
@@ -55,22 +56,25 @@ export async function documentLoad(event, withVersion) {
     let aria;
     const collectionAria = {
         title: collection.config.label.plural,
-        url: panelUrl(collection.config.kebab)
+        url: panelUrlFor(panelSegment, collection.config.kebab)
     };
     if (collection.config.upload) {
         const paramUploadPath = event.url.searchParams.get('uploadPath');
         const currentDirectoryPath = paramUploadPath || UPLOAD_PATH.ROOT_NAME;
         aria = [
-            { title: 'Dashboard', icon: 'dashboard', url: panelUrl() },
+            { title: 'Dashboard', icon: 'dashboard', url: panelUrlFor(panelSegment) },
             collectionAria,
-            ...buildUploadAria({ path: currentDirectoryPath, slug }),
+            ...buildUploadAria({ path: currentDirectoryPath, slug, panelSegment }),
             { title: undefined } // Will be populated by title context
         ];
     }
     else {
         aria = [
-            { title: 'Dashboard', icon: 'dashboard', url: panelUrl() },
-            { title: collection.config.label.plural, url: panelUrl(collection.config.kebab) },
+            { title: 'Dashboard', icon: 'dashboard', url: panelUrlFor(panelSegment) },
+            {
+                title: collection.config.label.plural,
+                url: panelUrlFor(panelSegment, collection.config.kebab)
+            },
             { title: undefined } // Will be populated by title context
         ];
     }