@nocobase/app-template-default 1.0.0-beta.69 → 1.0.0-beta.71

package/client/extensions/nocobase-workflow-management/layout.tsx

@@ -0,0 +1,95 @@
+import type { ReactElement, ReactNode } from 'react';
+import { PageContainer } from '#components/page-container';
+import { PageHeader } from '#components/page-header';
+import { Tabs, TabsList, TabsTrigger } from '#components/ui/tabs';
+import { Card, CardContent, CardHeader, CardTitle } from '#components/ui/card';
+
+export type WorkflowTab = 'definitions' | 'executions';
+
+/** The caller owns routes, tab URLs and permissions; details replace the list chrome. */
+export interface WorkflowManagementLayoutProps {
+  title: string;
+  description?: ReactNode;
+  labels: Record<WorkflowTab, string>;
+  tab: WorkflowTab;
+  onTabChange: (tab: WorkflowTab) => void;
+  detail?: boolean;
+  children: ReactNode;
+}
+
+export function WorkflowManagementLayout({
+  title,
+  description,
+  labels,
+  tab,
+  onTabChange,
+  detail = false,
+  children,
+}: WorkflowManagementLayoutProps): ReactElement {
+  return (
+    <PageContainer>
+      {!detail && (
+        <>
+          <PageHeader title={title} description={description} />
+          <Tabs
+            value={tab}
+            onValueChange={(value) => onTabChange(value as WorkflowTab)}
+          >
+            <TabsList variant='line'>
+              <TabsTrigger value='definitions'>
+                {labels.definitions}
+              </TabsTrigger>
+              <TabsTrigger value='executions'>{labels.executions}</TabsTrigger>
+            </TabsList>
+          </Tabs>
+        </>
+      )}
+      {children}
+    </PageContainer>
+  );
+}
+
+export interface WorkflowDefinitionDetailProps {
+  diagram: ReactNode;
+  parameters?: ReactNode;
+  diagramTitle: string;
+  parametersTitle: string;
+}
+
+export function WorkflowDefinitionDetail({
+  diagram,
+  parameters,
+  diagramTitle,
+  parametersTitle,
+}: WorkflowDefinitionDetailProps): ReactElement {
+  return (
+    <div className='flex flex-col gap-4'>
+      <div
+        className={
+          parameters == null
+            ? 'min-w-0'
+            : 'grid min-w-0 grid-cols-1 items-start gap-6 lg:grid-cols-2'
+        }
+      >
+        <Card className='min-w-0' role='region' aria-label={diagramTitle}>
+          <CardHeader>
+            <CardTitle>
+              <h2>{diagramTitle}</h2>
+            </CardTitle>
+          </CardHeader>
+          <CardContent className='flex flex-1 flex-col'>{diagram}</CardContent>
+        </Card>
+        {parameters != null && (
+          <Card className='min-w-0' role='region' aria-label={parametersTitle}>
+            <CardHeader>
+              <CardTitle>
+                <h2>{parametersTitle}</h2>
+              </CardTitle>
+            </CardHeader>
+            <CardContent>{parameters}</CardContent>
+          </Card>
+        )}
+      </div>
+    </div>
+  );
+}

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

@@ -8,6 +8,28 @@ import inboxEnUS from '#extensions/nocobase-inbox/locales/en-US';
  * upgrade replaces this file, so put the application's own copy in `../en-US.ts` rather than here.
  */
 const systemEnUS = {
+  flowDiagram: {
+    configure: 'Configure',
+    overview: 'Diagram overview',
+    actualSize: 'Actual size',
+    states: 'States',
+    transitions: 'Transitions',
+    configurable: 'Parameters',
+    current: 'Current',
+    visited: 'Visited',
+    initial: 'Initial',
+    final: 'Final',
+    state: 'State',
+    zoomOut: 'Zoom out',
+    zoomIn: 'Zoom in',
+    fit: 'Fit to view',
+
+    empty: 'No states to display.',
+    loading: 'Laying out diagram…',
+    failed: 'Unable to lay out this diagram.',
+    nodeHelp: 'Press Enter or Space to select a state.',
+    edgeHelp: 'Press Enter or Space to select a transition.',
+  },
   settings,
   'auth.preparingSession': 'Preparing your session…',
   'auth.connectionFailed': 'Unable to connect',

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

@@ -1,4 +1,5 @@
 const settings = {
+  unnamedPage: 'Unnamed page ({{path}})',
   revokeRoles: 'Revoke roles',
   keyConflict: 'This role key is already in use.',
   userPermissions: 'User management',
@@ -96,6 +97,7 @@ const settings = {
   selectAllPermissions: 'All',
   selectVisiblePermissions: 'Select visible permissions in {{name}}',
   permissionSummary: '{{enabled}} of {{total}} enabled',
+  preservedRecordScope: 'Keep existing configuration',
   noRecordScope: 'No records (not authorized)',
   permissionFilter: {
     limit: 'Up to 20 conditions',

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

@@ -1,4 +1,5 @@
 const settings = {
+  unnamedPage: '未命名页面（{{path}}）',
   revokeRoles: '撤销角色',
   keyConflict: '此角色标识已被使用。',
   userPermissions: '用户管理',
@@ -87,18 +88,19 @@ const settings = {
   total_other: '共 {{count}} 位用户',
   access: '访问',
   permissionSearch: '搜索分类、分组或权限',
-  enabledOnly: '仅看已开启',
+  enabledOnly: '仅显示已授权',
   noPermissions: '暂无可配置权限',
   permissionCategories: '权限分类',
   selectAllPermissions: '全选',
   selectVisiblePermissions: '选择“{{name}}”中显示的权限',
-  permissionSummary: '已开启 {{enabled}} / {{total}}',
-  noRecordScope: '无记录（未授权）',
+  permissionSummary: '已授权 {{enabled}} / {{total}}',
+  noRecordScope: '不允许访问数据',
+  preservedRecordScope: '保留现有配置',
   permissionFilter: {
     limit: '最多支持 20 个条件',
-    configure: '筛选条件',
-    title: '配置记录筛选',
-    description: '应用条件后还需保存角色，权限才会生效。',
+    configure: '设置条件',
+    title: '设置数据范围',
+    description: '仅允许访问符合以下条件的数据，保存角色后生效。',
     all: '满足全部条件',
     any: '满足任一条件',
     field: '字段',

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

@@ -5,6 +5,28 @@ 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: {
+    configure: '配置',
+    overview: '流程缩略导航',
+    actualSize: '实际大小',
+    states: '状态',
+    transitions: '转移',
+    configurable: '可配置参数',
+    current: '当前',
+    visited: '已经过',
+    initial: '初始状态',
+    final: '终止状态',
+    state: '状态',
+    zoomOut: '缩小',
+    zoomIn: '放大',
+    fit: '适应画布',
+
+    empty: '暂无可展示的状态。',
+    loading: '正在布局流程图…',
+    failed: '无法布局此流程图。',
+    nodeHelp: '按 Enter 或空格键选择状态。',
+    edgeHelp: '按 Enter 或空格键选择转移。',
+  },
   settings,
   'auth.preparingSession': '正在准备登录会话…',
   'auth.connectionFailed': '连接失败',

package/client/pages/settings/page-permission-titles.ts

@@ -0,0 +1,7 @@
+import type { PagePermissionTitles } from './page-permissions.js';
+
+/** Permission labels for application pages without navigation/breadcrumb titles (including overlays).
+ * Keys are existing route names; values are application translation keys.
+ * Do not add navigation/breadcrumbs or change authorization ids just to name a permission.
+ */
+export const pagePermissionTitles: PagePermissionTitles = {};

package/client/pages/settings/page-permissions.ts

@@ -0,0 +1,51 @@
+import type { AppClientRegisteredRoute } from '@nocobase/app-client/plugins';
+import type { LocalizedText } from '@nocobase/app-plugin-authorization/client';
+import type { CatalogResource } from './permissions-model.js';
+
+/** Application route names are stable within their owner; labels never change stored grants. */
+export type PagePermissionTitles = Readonly<Record<string, string>>;
+
+export function pagePermissionTitle(
+  route: AppClientRegisteredRoute,
+  titles: PagePermissionTitles,
+): LocalizedText | undefined {
+  const key =
+    (route.source === 'application' && Object.hasOwn(titles, route.name)
+      ? titles[route.name]
+      : undefined) ??
+    route.navigation?.title ??
+    route.breadcrumb?.title;
+  return key?.trim() ? { key, ns: route.packageName } : undefined;
+}
+
+/** Preserve every existing resource id/action; never use a technical route id as its label. */
+export function pagePermissionResources(
+  routes: readonly AppClientRegisteredRoute[],
+  titles: PagePermissionTitles,
+  unnamed: (path: string) => string,
+): CatalogResource[] {
+  const resources = new Map<string, CatalogResource>();
+  const visit = (items: readonly AppClientRegisteredRoute[]): void => {
+    for (const route of items) {
+      if (
+        route.componentLoader &&
+        typeof route.authz === 'object' &&
+        route.authz.resource.type === 'page'
+      ) {
+        const id = route.authz.resource.id;
+        // Resolved child routes may inherit the parent's authorization resource.
+        // They share one grant, so showing independent checkboxes is misleading.
+        if (!resources.has(id))
+          resources.set(id, {
+            type: 'page',
+            id,
+            title: pagePermissionTitle(route, titles) ?? unnamed(route.path),
+            actions: [{ name: 'access', title: { key: 'settings.access' } }],
+          });
+      }
+      visit(route.children ?? []);
+    }
+  };
+  visit(routes);
+  return [...resources.values()];
+}

package/client/pages/settings/permissions-model.ts

@@ -17,6 +17,15 @@ export function setPermission(
   action: string,
   enabled: boolean,
 ): readonly PermissionGrant[] {
+  const existing =
+    grants
+      .find(
+        (grant) =>
+          grant.resource.type === resource.type &&
+          grant.resource.id === resource.id,
+      )
+      ?.actions.some((entry) => entry.action === action) ?? false;
+  if (existing === enabled) return grants;
   const next = grants.map((grant) => ({
     ...grant,
     actions: [...grant.actions],
@@ -87,40 +96,55 @@ export function permissionSections(
             return {
               ...row,
               scopes: granted
-                ? (resource.dataScopes?.[action.name] ?? []).map((scope) => ({
-                    id: JSON.stringify([
-                      resource.type,
-                      resource.id,
-                      action.name,
-                      scope.key,
-                    ]),
-                    label: text(
-                      typeof scope.title === 'string' &&
-                        scope.title === scope.collection
-                        ? { key: 'settings.recordScope' }
-                        : scope.title,
-                    ),
-                    levels: [
-                      {
-                        value: '',
-                        label: text({ key: 'settings.noRecordScope' }),
-                      },
-                      ...scope.recordAccess.map((key) => ({
-                        value: key,
-                        label: text(
-                          catalog.recordAccess.find(
-                            (entry) => entry.key === key,
-                          )?.title ?? key,
-                        ),
-                      })),
-                    ],
-                    level: scopeSelectionKey(
+                ? (resource.dataScopes?.[action.name] ?? []).map((scope) => {
+                    const value = scopeSelectionKey(
                       granted.policy?.scopes &&
                         typeof granted.policy.scopes === 'object'
                         ? Reflect.get(granted.policy.scopes, scope.key)
                         : undefined,
-                    ),
-                  }))
+                    );
+                    const preserved =
+                      value !== '' && !scope.recordAccess.includes(value);
+                    return {
+                      id: JSON.stringify([
+                        resource.type,
+                        resource.id,
+                        action.name,
+                        scope.key,
+                      ]),
+                      label: text(
+                        typeof scope.title === 'string' &&
+                          scope.title === scope.collection
+                          ? { key: 'settings.recordScope' }
+                          : scope.title,
+                      ),
+                      levels: [
+                        ...(preserved
+                          ? [
+                              {
+                                value,
+                                label: text({
+                                  key: 'settings.preservedRecordScope',
+                                }),
+                              },
+                            ]
+                          : []),
+                        {
+                          value: '',
+                          label: text({ key: 'settings.noRecordScope' }),
+                        },
+                        ...scope.recordAccess.map((key) => ({
+                          value: key,
+                          label: text(
+                            catalog.recordAccess.find(
+                              (entry) => entry.key === key,
+                            )?.title ?? key,
+                          ),
+                        })),
+                      ],
+                      level: value,
+                    };
+                  })
                 : [],
             };
           }),
@@ -136,6 +160,11 @@ export function setScope(
   value: unknown,
 ): readonly PermissionGrant[] {
   const [type, id, action, scope] = JSON.parse(rowId) as string[];
+  if (
+    typeof value === 'string' &&
+    scopeSelectionKey(getScopeSelection(grants, rowId)) === value
+  )
+    return grants;
   return grants.map((grant) =>
     grant.resource.type !== type || grant.resource.id !== id
       ? grant
@@ -216,7 +245,7 @@ function scopeSelectionKey(value: unknown): string {
     typeof Reflect.get(value, 'key') === 'string'
   )
     return String(Reflect.get(value, 'key'));
-  return '';
+  return value == null || value === '' ? '' : '__preserved_scope__';
 }
 
 /** Legacy bare custom-filter keys require configuration before saving. */

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

@@ -16,7 +16,8 @@ import {
   type PermissionGrant,
   type PermissionSet,
 } from '@nocobase/app-plugin-authorization/client';
-import type { AppClientRegisteredRoute } from '@nocobase/app-client/plugins';
+import { pagePermissionResources } from './page-permissions.js';
+import { pagePermissionTitles } from './page-permission-titles.js';
 import { useEffect, useMemo, useRef, useState, type ReactElement } from 'react';
 import {
   useLocation,
@@ -40,7 +41,6 @@ import {
   unconfiguredFilter,
   setPermissions,
   setScope,
-  type CatalogResource,
 } from './permissions-model.js';
 
 function RoleEditor(): ReactElement {
@@ -100,32 +100,11 @@ function RoleEditor(): ReactElement {
   const catalog = useMemo(() => {
     if (!options.data) return undefined;
     const source = options.data.data;
-    const pages: CatalogResource[] = [];
-    const collect = (routes: readonly AppClientRegisteredRoute[]) => {
-      for (const route of routes) {
-        const pageTitle = route.navigation?.title ?? route.breadcrumb?.title;
-        if (
-          route.componentLoader &&
-          typeof route.authz === 'object' &&
-          route.authz.resource.type === 'page'
-        )
-          pages.push({
-            type: 'page',
-            id: route.authz.resource.id,
-            title: pageTitle
-              ? { key: pageTitle, ns: route.packageName }
-              : route.id,
-            actions: [
-              {
-                name: 'access',
-                title: { key: 'settings.access' },
-              },
-            ],
-          });
-        collect(route.children ?? []);
-      }
-    };
-    collect(app.runtime.routes);
+    const pages = pagePermissionResources(
+      app.runtime.routes,
+      pagePermissionTitles,
+      (path) => t('settings.unnamedPage', { path }),
+    );
     return {
       ...source,
       sections: [
@@ -180,7 +159,7 @@ function RoleEditor(): ReactElement {
         })),
       ],
     };
-  }, [options.data, app]);
+  }, [options.data, app, t]);
   const allowed = creating
     ? canCreate
     : canUpdate &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nocobase/app-template-default",
   "displayName": "Default Template",
-  "version": "1.0.0-beta.69",
+  "version": "1.0.0-beta.71",
   "type": "module",
   "prettier": "@nocobase/dev-config/prettier",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "nocobase": {
     "templateKind": "app",
-    "defaultTemplateVersion": "1.0.0-beta.69"
+    "defaultTemplateVersion": "1.0.0-beta.71"
   },
   "devDependencies": {
     "@ai-sdk/react": "2.0.0",
@@ -75,13 +75,15 @@
     "vite": "^6.3.5",
     "vitest": "^4.1.10",
     "tar": "^7.5.22",
+    "@xyflow/react": "^12.11.5",
+    "elkjs": "^0.10.2",
     "@nocobase/app-client": "^3.0.0-beta.2",
     "@nocobase/app-plugin-template-print": "0.0.2-beta.2",
-    "@nocobase/app-skills": "0.1.0-beta.37",
+    "@nocobase/app-skills": "0.1.0-beta.39",
     "@nocobase/app-testing": "0.1.0-beta.4",
     "@nocobase/app-websocket": "^0.0.2-beta.0",
-    "@nocobase/drive": "^0.1.0-beta.6",
     "@nocobase/dev-config": "0.1.0-beta.23",
+    "@nocobase/drive": "^0.1.0-beta.7",
     "@nocobase/logging": "^0.1.0-beta.7",
     "@nocobase/session": "^0.1.0-beta.3"
   },
@@ -146,19 +148,19 @@
     "@nocobase/app-plugin-authentication": "^2.0.0-beta.10",
     "@nocobase/app-plugin-authorization": "^1.0.0-beta.28",
     "@nocobase/app-plugin-database-explorer": "^1.0.0-beta.15",
+    "@nocobase/app-plugin-file": "^1.0.0-beta.24",
     "@nocobase/app-plugin-i18n": "^1.0.0-beta.16",
     "@nocobase/app-plugin-mail": "^1.0.0-beta.14",
-    "@nocobase/app-plugin-file": "^1.0.0-beta.24",
     "@nocobase/app-plugin-notification": "^1.0.0-beta.27",
     "@nocobase/app-plugin-notification-in-app": "^1.0.0-beta.25",
     "@nocobase/app-plugin-notification-providers": "^0.2.0-beta.12",
     "@nocobase/app-plugin-scheduler": "^1.0.0-beta.17",
     "@nocobase/app-plugin-users": "^2.0.0-beta.5",
+    "@nocobase/app-server": "^2.0.0-beta.9",
     "@nocobase/config": "^0.1.0-beta.3",
-    "@nocobase/app-server": "^2.0.0-beta.8",
     "@nocobase/db": "^1.0.0-beta.21",
-    "@nocobase/service-provider": "^0.0.2-beta.2",
     "@nocobase/db-sqlite": "^0.1.0-beta.6",
+    "@nocobase/service-provider": "^0.0.2-beta.2",
     "@nocobase/snowflake": "^1.0.0-beta.4",
     "@nocobase/app-plugin-authz-default-access": "^1.0.0-beta.13",
     "@nocobase/app-plugin-authz-sharing-rules": "^1.0.0-beta.13",
@@ -168,9 +170,9 @@
     "@nocobase/jobs": "^0.1.0-beta.3",
     "@nocobase/lifecycle": "^0.1.0-beta.2",
     "@nocobase/i18n": "^1.0.0-beta.7",
-    "@nocobase/repository-input": "^0.1.0-beta.3",
     "@nocobase/caching": "^0.1.0-beta.3",
-    "@nocobase/app-cli": "^1.0.0-beta.23"
+    "@nocobase/repository-input": "^0.1.0-beta.3",
+    "@nocobase/app-cli": "^1.0.0-beta.24"
   },
   "description": "NocoBase 3 application template with the standard product capabilities.",
   "imports": {

package/tests/components/permission-editor.test.tsx

@@ -475,3 +475,65 @@ it('aligns semantic actions across resources without dropping special or filtere
     view.container.querySelectorAll('[data-slot=permission-row]'),
   ).toHaveLength(1);
 });
+
+it('keeps scope captions consistent in a category with multiple data ranges, including when filtered', async () => {
+  const level = [{ value: 'all', label: 'All records' }];
+  render(
+    <PermissionEditor
+      sections={[
+        {
+          id: 'business',
+          title: 'Business',
+          groups: [
+            {
+              id: 'quotes',
+              title: 'Quotes',
+              rows: [
+                {
+                  id: 'view',
+                  label: 'View quotes',
+                  enabled: true,
+                  scopes: [
+                    {
+                      id: 'view-records',
+                      label: 'Visible quotes',
+                      level: 'all',
+                      levels: level,
+                    },
+                  ],
+                },
+                {
+                  id: 'submit',
+                  label: 'Submit quote',
+                  enabled: true,
+                  scopes: [
+                    {
+                      id: 'submit-projects',
+                      label: 'Linked projects',
+                      level: 'all',
+                      levels: level,
+                    },
+                    {
+                      id: 'submit-quotes',
+                      label: 'Allowed quotes',
+                      level: 'all',
+                      levels: level,
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ]}
+      onEnabledChange={vi.fn()}
+      onLevelChange={vi.fn()}
+    />,
+  );
+  expect(screen.getByText('Visible quotes')).toBeVisible();
+  expect(screen.getByText('Linked projects')).toBeVisible();
+  expect(screen.getByText('Allowed quotes')).toBeVisible();
+  await userEvent.type(screen.getByRole('textbox'), 'View quotes');
+  expect(screen.queryByText('Linked projects')).not.toBeInTheDocument();
+  expect(screen.getByText('Visible quotes')).toBeVisible();
+});