@nocobase/app-template-default 1.0.0-beta.74 → 1.0.0-beta.76

package/client/hooks/use-table-url-state.ts

@@ -0,0 +1,93 @@
+import { useEffect } from 'react';
+import { useSearchParams } from 'react-router';
+import type {
+  OnChangeFn,
+  PaginationState,
+  SortingState,
+} from '@tanstack/react-table';
+
+const sizes = [10, 20, 50, 100] as const;
+
+/** Keep list position shareable across overlays, refresh and browser history. */
+export function useTableUrlState({
+  defaultPageSize = 10,
+  pageSizeOptions = sizes,
+  sortColumns,
+  rowCount,
+}: {
+  defaultPageSize?: number;
+  pageSizeOptions?: readonly number[];
+  sortColumns: readonly string[];
+  rowCount?: number;
+}) {
+  const [params, setParams] = useSearchParams();
+  const requestedPage = Number(params.get('page'));
+  const pageIndex =
+    Number.isSafeInteger(requestedPage) && requestedPage > 0
+      ? requestedPage - 1
+      : 0;
+  const requestedSize = Number(params.get('pageSize'));
+  const pageSize = pageSizeOptions.includes(requestedSize)
+    ? requestedSize
+    : defaultPageSize;
+  const paginationState = { pageIndex, pageSize };
+  const sort = params.get('sort') ?? sortColumns[0];
+  const order = params.get('order');
+  const sortingState: SortingState =
+    sort && sortColumns.includes(sort) && (order === 'asc' || order === 'desc')
+      ? [{ id: sort, desc: order === 'desc' }]
+      : [];
+  const onPaginationChange: OnChangeFn<PaginationState> = (updater) => {
+    const next =
+      typeof updater === 'function' ? updater(paginationState) : updater;
+    setParams(
+      (old) => {
+        const result = new URLSearchParams(old);
+        result.set('page', String(next.pageIndex + 1));
+        result.set('pageSize', String(next.pageSize));
+        return result;
+      },
+      { replace: false },
+    );
+  };
+  const onSortingChange: OnChangeFn<SortingState> = (updater) => {
+    const next =
+      typeof updater === 'function' ? updater(sortingState) : updater;
+    setParams(
+      (old) => {
+        const result = new URLSearchParams(old);
+        result.delete('page');
+        if (next[0] && sortColumns.includes(next[0].id)) {
+          result.set('sort', next[0].id);
+          result.set('order', next[0].desc ? 'desc' : 'asc');
+        } else {
+          result.delete('sort');
+          result.delete('order');
+        }
+        return result;
+      },
+      { replace: true },
+    );
+  };
+  // Only pass a count for the current, successfully loaded query.
+  useEffect(() => {
+    if (rowCount === undefined) return;
+    const lastPage = Math.max(0, Math.ceil(rowCount / pageSize) - 1);
+    if (pageIndex <= lastPage) return;
+    setParams(
+      (old) => {
+        const result = new URLSearchParams(old);
+        result.set('page', String(lastPage + 1));
+        return result;
+      },
+      { replace: true },
+    );
+  }, [rowCount, pageSize, pageIndex, setParams]);
+  return {
+    paginationState,
+    onPaginationChange,
+    sortingState,
+    onSortingChange,
+    pageSizeOptions,
+  };
+}

package/client/lib/navigation-transform.ts

@@ -1,10 +1,11 @@
+import { groupFoundationNavigation } from '@nocobase/app-plugin-foundation/client';
 import type { RouteNavigationItem } from '../routing/route-navigation.js';
 
 /** Application-owned navigation customization, applied after permission filtering. */
 export function transformNavigation(
   items: RouteNavigationItem[],
 ): RouteNavigationItem[] {
-  return collapsePermissionNavigation(items);
+  return groupFoundationNavigation(collapsePermissionNavigation(items));
 }
 
 /** One sidebar entry opens the first readable tab; original routes and guards remain unchanged. */

package/client/lib/required-role-setup.ts

@@ -0,0 +1,98 @@
+import type { UsersClient } from '@nocobase/app-plugin-users/client/user-client';
+import {
+  setupInspectionFailure,
+  type SetupInspection,
+  type SetupInspections,
+} from '../components/setup-readiness-state.js';
+import { safeReturnTo } from './return-to.js';
+
+function isReadonlyArray<T>(
+  value: readonly T[] | undefined,
+): value is readonly T[] {
+  return Array.isArray(value);
+}
+
+export interface RequiredSetupRole {
+  readonly scope: string;
+  readonly role: string;
+  /** A localized business label; never render the role key as a title. */
+  readonly title: string;
+  readonly description: string;
+}
+export function requiredRoleSetupId(
+  role: Pick<RequiredSetupRole, 'scope' | 'role'>,
+): string {
+  return JSON.stringify([role.scope, role.role]);
+}
+export function requiredRoleSetupLink(
+  role: Pick<RequiredSetupRole, 'scope' | 'role'>,
+  returnTo: string,
+): string {
+  const query = new URLSearchParams({
+    roleScope: role.scope,
+    role: role.role,
+    status: 'enabled',
+  });
+  const source = safeReturnTo(returnTo);
+  if (source) query.set('returnTo', source);
+  return `/settings/users?${query}`;
+}
+
+/** One metadata read and one bounded read per distinct required role. No writes. */
+export async function inspectRequiredRoles(
+  client: Pick<UsersClient, 'options' | 'list'>,
+  requirements: readonly RequiredSetupRole[],
+): Promise<SetupInspections> {
+  const unique = [
+    ...new Map(
+      requirements.map((role) => [requiredRoleSetupId(role), role]),
+    ).values(),
+  ];
+  if (unique.length === 0) return {};
+  const options = await client.options();
+  const roleScopes = options?.roleScopes;
+  if (!isReadonlyArray(roleScopes))
+    return Object.fromEntries(
+      unique.map((role) => [
+        requiredRoleSetupId(role),
+        { status: 'unknown', reason: 'invalid' },
+      ]),
+    );
+  const entries = await Promise.all(
+    unique.map(
+      async (requirement): Promise<readonly [string, SetupInspection]> => {
+        const id = requiredRoleSetupId(requirement);
+        const scope = roleScopes.find(
+          (scope) => scope?.key === requirement.scope,
+        );
+        const role = isReadonlyArray(scope?.options)
+          ? scope.options.find((role) => role?.value === requirement.role)
+          : undefined;
+        // Metadata offers direct selectable roles; authenticated defaults apply separately.
+        if (!scope || !role)
+          return [id, { status: 'unknown', reason: 'invalid' }];
+        try {
+          const page = await client.list({
+            roleScope: requirement.scope,
+            role: requirement.role,
+            status: 'enabled',
+            page: 1,
+            pageSize: 1,
+          });
+          if (!Number.isSafeInteger(page?.total) || page.total < 0)
+            return [id, { status: 'unknown', reason: 'invalid' }];
+          return [
+            id,
+            {
+              status: page.total > 0 ? 'ready' : 'missing',
+              canConfigure: role.assignable !== false,
+            },
+          ];
+        } catch (error: unknown) {
+          return [id, setupInspectionFailure(error)];
+        }
+      },
+    ),
+  );
+  return Object.fromEntries(entries);
+}

package/client/lib/return-to.ts

@@ -0,0 +1,19 @@
+/** Accept only an application-relative destination, resolved by the app router's basename. */
+export function safeReturnTo(value: string | null): string | undefined {
+  if (
+    !value ||
+    !value.startsWith('/') ||
+    value.startsWith('//') ||
+    [...value].some(
+      (character) =>
+        character === '\\' ||
+        character.charCodeAt(0) <= 32 ||
+        character.charCodeAt(0) === 127,
+    )
+  )
+    return;
+  const base = 'https://app.invalid';
+  const url = new URL(value, base);
+  if (url.origin !== base || url.pathname.startsWith('//')) return;
+  return `${url.pathname}${url.search}${url.hash}`;
+}

package/client/locales/system/en-US.ts

@@ -9,6 +9,16 @@ import inboxEnUS from '#extensions/nocobase-inbox/locales/en-US';
  */
 const systemEnUS = {
   flowDiagram: {
+    controls: 'Diagram controls',
+    fitView: 'Fit to view',
+    fullscreen: 'Fullscreen',
+    exitFullscreen: 'Exit fullscreen',
+    escapeHint: 'Press Escape to exit',
+    leavesTo: 'Leaves to',
+    arrivesFrom: 'Arrives from',
+    otherRoutes: 'Other routes',
+    minimap: 'Diagram overview',
+
     configure: 'Configure',
     overview: 'Diagram overview',
     actualSize: 'Actual size',

package/client/locales/system/settings-en-US.ts

@@ -1,4 +1,25 @@
 const settings = {
+  setup: {
+    title: 'Feature prerequisites',
+    checking: 'Checking current configuration…',
+    checkAgain: 'Check again',
+    ready: 'The checked prerequisites are ready.',
+    missing: 'Review the configuration items below.',
+    manageMembers: 'Manage members',
+    manageMembersFor: 'Manage {{role}} members',
+    unavailable: 'Unable to check right now. Try again.',
+    signIn: 'Your session expired. Sign in again to check configuration.',
+    forbidden:
+      'You do not have access to check this configuration. Contact an administrator.',
+    invalid:
+      'This prerequisite could not be verified. Ask the application maintainer to check its configuration.',
+  },
+  roleFilterIncomplete:
+    'Choose both a role scope and a role, or clear the filters.',
+  backToSource: 'Return to previous page',
+  roleFilter: 'Filter by role',
+  allRoles: 'All roles',
+
   permissionManagement: 'Permission management',
   defaultAccess: {
     noResourcesShort: 'No configurable objects available',
@@ -83,6 +104,11 @@ const settings = {
 
   assignedRoles: 'Assigned roles',
   actionSaved: 'Updated access for "{{name}}"',
+  userActionSaved: {
+    disable: 'Disabled user "{{name}}"',
+    enable: 'Enabled user "{{name}}"',
+    revokeSessions: 'Revoked active sessions for "{{name}}"',
+  },
 
   identityConflict: 'This email or username is already in use.',
   signInAgain: 'Sign in again',
@@ -97,6 +123,7 @@ const settings = {
   userSearch: 'Search names, usernames or emails',
   roleSearch: 'Search role names',
   newUser: 'New user',
+  editUserFor: 'Edit {{name}}',
   editUser: 'Edit user',
   newRole: 'New role',
   editRole: 'Edit role',
@@ -104,6 +131,7 @@ const settings = {
   username: 'Username',
   email: 'Email',
   password: 'Initial password',
+  roleType: 'Role type',
   roleName: 'Role name',
   key: 'Key',
   status: 'Status',
@@ -116,9 +144,16 @@ const settings = {
   noResults: 'No matching results',
   clearHint: 'Try a different search or clear the filters.',
   noUsers: 'No users yet',
+  usersReadOnlyEmpty:
+    'Contact an administrator to add users or grant the permissions needed to create users and assign roles.',
+  rolesReadOnlyEmpty:
+    'Contact an administrator to create a role or grant you permission to create roles.',
   noRoles: 'No roles yet',
   create: 'Create',
   edit: 'Edit',
+  selectRoles: 'Select roles',
+  searchRoles: 'Search roles',
+  noRolesFound: 'No roles found.',
   save: 'Save',
   cancel: 'Cancel',
   saving: 'Saving…',
@@ -148,12 +183,14 @@ const settings = {
   discardTitle: 'Discard changes?',
   discardHint: 'Your unsaved changes will be lost.',
   failed: 'Unable to complete the request. Try again.',
+  invalidRequest:
+    'Some values are invalid. Check your input or filters and try again.',
   retry: 'Retry',
   loading: 'Loading',
   denied: 'You do not have access. Contact an administrator.',
   missing: 'This record does not exist or has been deleted.',
   conflict:
-    'This role has changed. Reload it and merge your changes before saving.',
+    'The request conflicts with current data. Review the latest record before trying again.',
   sessionEnded: 'Your session has ended. Sign in again.',
   previous: 'Previous',
   next: 'Next',

package/client/locales/system/settings-zh-CN.ts

@@ -1,4 +1,22 @@
 const settings = {
+  setup: {
+    title: '功能前置配置',
+    checking: '正在检查当前配置…',
+    checkAgain: '重新检查',
+    ready: '已检查的前置配置已就绪。',
+    missing: '请检查以下配置项。',
+    manageMembers: '管理成员',
+    manageMembersFor: '管理{{role}}成员',
+    unavailable: '暂时无法检查，请稍后重试。',
+    signIn: '登录已失效，请重新登录后检查配置。',
+    forbidden: '没有权限检查此配置，请联系管理员。',
+    invalid: '无法确认此前置配置，请应用维护者检查其配置声明。',
+  },
+  roleFilterIncomplete: '请同时指定角色范围与角色，或清除筛选条件。',
+  backToSource: '返回原页面',
+  roleFilter: '按角色筛选',
+  allRoles: '全部角色',
+
   permissionManagement: '权限管理',
   defaultAccess: {
     noResourcesShort: '暂无可配置的业务对象',
@@ -75,6 +93,11 @@ const settings = {
 
   assignedRoles: '已分配角色',
   actionSaved: '已更新“{{name}}”的访问状态',
+  userActionSaved: {
+    disable: '已禁用用户“{{name}}”',
+    enable: '已启用用户“{{name}}”',
+    revokeSessions: '已撤销“{{name}}”的登录会话',
+  },
 
   identityConflict: '此邮箱或用户名已被使用。',
   signInAgain: '重新登录',
@@ -89,6 +112,7 @@ const settings = {
   userSearch: '搜索姓名、用户名或邮箱',
   roleSearch: '搜索角色名称',
   newUser: '新建用户',
+  editUserFor: '编辑 {{name}}',
   editUser: '编辑用户',
   newRole: '新建角色',
   editRole: '编辑角色',
@@ -96,6 +120,7 @@ const settings = {
   username: '用户名',
   email: '邮箱',
   password: '初始密码',
+  roleType: '角色类型',
   roleName: '角色名称',
   key: '标识',
   status: '状态',
@@ -108,9 +133,15 @@ const settings = {
   noResults: '没有匹配的结果',
   clearHint: '请更换搜索条件或清除筛选。',
   noUsers: '暂无用户',
+  usersReadOnlyEmpty:
+    '请联系管理员添加用户，或授予创建用户和分配角色所需的权限。',
+  rolesReadOnlyEmpty: '请联系管理员创建角色，或授予你创建角色的权限。',
   noRoles: '暂无角色',
   create: '创建',
   edit: '编辑',
+  selectRoles: '选择角色',
+  searchRoles: '搜索角色',
+  noRolesFound: '没有匹配的角色。',
   save: '保存',
   cancel: '取消',
   saving: '正在保存…',
@@ -138,11 +169,12 @@ const settings = {
   discardTitle: '放弃未保存的更改？',
   discardHint: '未保存的更改将丢失。',
   failed: '请求失败，请重试。',
+  invalidRequest: '部分内容无效，请检查填写内容或筛选条件后重试。',
   retry: '重试',
   loading: '加载中',
-  denied: '无权查看，请联系管理员。',
+  denied: '没有执行此操作的权限，请联系管理员。',
   missing: '记录不存在或已被删除。',
-  conflict: '角色已被其他人修改，请重新加载后合并。',
+  conflict: '此操作与当前数据冲突，请查看最新记录后再试。',
   sessionEnded: '会话已结束，请重新登录。',
   previous: '上一页',
   next: '下一页',

package/client/locales/system/zh-CN.ts

@@ -6,6 +6,16 @@ import inboxZhCN from '#extensions/nocobase-inbox/locales/zh-CN';
 /** The Chinese copy of what the template ships; see `./en-US.ts`. */
 const systemZhCN: SystemResource = {
   flowDiagram: {
+    controls: '流程图控制',
+    fitView: '适应画布',
+    fullscreen: '全屏',
+    exitFullscreen: '退出全屏',
+    escapeHint: '按 Escape 退出',
+    leavesTo: '可转到',
+    arrivesFrom: '来自',
+    otherRoutes: '其他流转',
+    minimap: '流程缩略导航',
+
     configure: '配置',
     overview: '流程缩略导航',
     actualSize: '实际大小',

package/client/pages/settings/default-access-form.tsx

@@ -79,7 +79,10 @@ function DefaultAccessFormBody(): ReactElement {
     draft !== undefined && JSON.stringify(draft) !== JSON.stringify(initial);
   const leave = useSettingsLeave(dirty, busy);
   const close = () => {
-    void navigate({ pathname: '/default-access', search: location.search });
+    void navigate(
+      { pathname: '/default-access', search: location.search },
+      { replace: true },
+    );
   };
   const text = (value: LocalizedText): string =>
     typeof value === 'string'

package/client/pages/settings/default-access.tsx

@@ -1,3 +1,5 @@
+import { RecordLink } from '#components/record-link';
+import { useTableUrlState } from '#hooks/use-table-url-state';
 import { useApiClient, useToaster } from '@nocobase/app-client';
 import {
   useCan,
@@ -119,15 +121,14 @@ export default function DefaultAccessPage(): ReactElement {
         />
       ),
       cell: ({ row }) => (
-        <Link
-          className='text-foreground underline-offset-4 hover:underline'
+        <RecordLink
           to={{
             pathname: `${encodeURIComponent(row.original.key)}/edit`,
             search: location.search,
           }}
         >
           {name(row.original)}
-        </Link>
+        </RecordLink>
       ),
     },
     {
@@ -210,6 +211,29 @@ export default function DefaultAccessPage(): ReactElement {
         .includes(search.toLocaleLowerCase()),
     )
     .sort((a, b) => name(a).localeCompare(name(b), i18n.language));
+  const tableState = useTableUrlState({
+    defaultPageSize: 20,
+    sortColumns: ['resource'],
+    rowCount:
+      rules.data &&
+      !rules.loading &&
+      !rules.error &&
+      catalog.data &&
+      !catalog.loading &&
+      !catalog.error
+        ? rows.length
+        : undefined,
+  });
+  const clearSearch = () =>
+    setParams(
+      (old) => {
+        const next = new URLSearchParams(old);
+        next.delete('q');
+        next.delete('page');
+        return next;
+      },
+      { replace: true },
+    );
   const eligible = resources.some(
     (resource) =>
       !rules.data?.data.some(
@@ -295,13 +319,20 @@ export default function DefaultAccessPage(): ReactElement {
             placeholder={t('settings.defaultAccess.search')}
             aria-label={t('settings.defaultAccess.search')}
             onChange={(event) =>
-              setParams(event.target.value ? { q: event.target.value } : {}, {
-                replace: true,
-              })
+              setParams(
+                (old) => {
+                  const next = new URLSearchParams(old);
+                  next.delete('page');
+                  if (event.target.value) next.set('q', event.target.value);
+                  else next.delete('q');
+                  return next;
+                },
+                { replace: true },
+              )
             }
           />
           {search && (
-            <Button variant='ghost' onClick={() => setParams({})}>
+            <Button variant='ghost' onClick={clearSearch}>
               {t('settings.clear')}
             </Button>
           )}
@@ -329,6 +360,7 @@ export default function DefaultAccessPage(): ReactElement {
           !catalog.error &&
           (rows.length ? (
             <DataTable
+              {...tableState}
               columns={columns}
               data={rows}
               getRowId={(rule) => rule.key}
@@ -358,7 +390,7 @@ export default function DefaultAccessPage(): ReactElement {
               </EmptyDescription>
               <EmptyContent>
                 {search ? (
-                  <Button variant='outline' onClick={() => setParams({})}>
+                  <Button variant='outline' onClick={clearSearch}>
                     {t('settings.clear')}
                   </Button>
                 ) : (

package/client/pages/settings/role-form.tsx

@@ -230,7 +230,7 @@ function RoleEditor(): ReactElement {
       parent.reload();
       toaster.show({ type: 'success', title: t('settings.saved', { name }) });
       leave.allow();
-      void navigate(closeTo);
+      void navigate(closeTo, { replace: true });
     } catch (next) {
       if (
         creating &&

package/client/pages/settings/roles.tsx

@@ -10,6 +10,7 @@ import { ShieldCheckIcon, PlusIcon } from 'lucide-react';
 import { PermissionManagementPage } from './permission-management-page.js';
 import { Input } from '#components/ui/input';
 import { Button } from '#components/ui/button';
+import { useTableUrlState } from '#hooks/use-table-url-state';
 import { RoleList } from '#components/role-list';
 import {
   Empty,
@@ -48,6 +49,13 @@ export default function RolesPage(): ReactElement {
         i18n.language,
       ),
     );
+  const tableState = useTableUrlState({
+    sortColumns: ['title', 'key'],
+    rowCount:
+      request.data && !request.loading && !request.error
+        ? rows.length
+        : undefined,
+  });
   const create = canCreate ? (
     <Button
       nativeButton={false}
@@ -70,16 +78,31 @@ export default function RolesPage(): ReactElement {
             placeholder={t('settings.roleSearch')}
             aria-label={t('settings.roleSearch')}
             onChange={(event) => {
-              setParams(event.target.value ? { q: event.target.value } : {}, {
-                replace: true,
-              });
+              setParams(
+                (old) => {
+                  const next = new URLSearchParams(old);
+                  next.delete('page');
+                  if (event.target.value) next.set('q', event.target.value);
+                  else next.delete('q');
+                  return next;
+                },
+                { replace: true },
+              );
             }}
           />
           {search && (
             <Button
               variant='ghost'
               onClick={() => {
-                setParams({});
+                setParams(
+                  (old) => {
+                    const next = new URLSearchParams(old);
+                    next.delete('q');
+                    next.delete('page');
+                    return next;
+                  },
+                  { replace: true },
+                );
               }}
             >
               {t('settings.clear')}
@@ -93,6 +116,7 @@ export default function RolesPage(): ReactElement {
           !request.error &&
           (rows.length ? (
             <RoleList
+              tableState={tableState}
               ariaLabel={t('settings.roles')}
               roles={rows.map((role) => ({
                 key: role.key,
@@ -104,6 +128,9 @@ export default function RolesPage(): ReactElement {
                 protected: Boolean(role.protection),
               }))}
               labels={{
+                name: t('settings.roleName'),
+                key: t('settings.key'),
+                type: t('settings.roleType'),
                 protected: t('settings.protected'),
                 custom: t('settings.custom'),
               }}
@@ -117,14 +144,28 @@ export default function RolesPage(): ReactElement {
                 {t(search ? 'settings.noResults' : 'settings.noRoles')}
               </EmptyTitle>
               <EmptyDescription>
-                {t(search ? 'settings.clearHint' : 'settings.rolesDescription')}
+                {t(
+                  search
+                    ? 'settings.clearHint'
+                    : canCreate
+                      ? 'settings.rolesDescription'
+                      : 'settings.rolesReadOnlyEmpty',
+                )}
               </EmptyDescription>
               <EmptyContent>
                 {search ? (
                   <Button
                     variant='outline'
                     onClick={() => {
-                      setParams({});
+                      setParams(
+                        (old) => {
+                          const next = new URLSearchParams(old);
+                          next.delete('q');
+                          next.delete('page');
+                          return next;
+                        },
+                        { replace: true },
+                      );
                     }}
                   >
                     {t('settings.clear')}