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

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.70",
   "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.70"
   },
   "devDependencies": {
     "@ai-sdk/react": "2.0.0",
@@ -75,15 +75,17 @@
     "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.38",
     "@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/logging": "^0.1.0-beta.7",
-    "@nocobase/session": "^0.1.0-beta.3"
+    "@nocobase/drive": "^0.1.0-beta.6",
+    "@nocobase/session": "^0.1.0-beta.3",
+    "@nocobase/logging": "^0.1.0-beta.7"
   },
   "files": [
     ".prettierignore",
@@ -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/config": "^0.1.0-beta.3",
     "@nocobase/app-server": "^2.0.0-beta.8",
+    "@nocobase/config": "^0.1.0-beta.3",
     "@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/logic/page-permission-titles.test.ts

@@ -0,0 +1,223 @@
+import { describe, expect, it } from 'vitest';
+import {
+  resolveAppClientContributions,
+  type AppClientRegisteredRoute,
+} from '@nocobase/app-client/plugins';
+import applicationRoutes from '../../client/routes.js';
+import enUS from '../../client/locales/en-US.js';
+import zhCN from '../../client/locales/zh-CN.js';
+import {
+  pagePermissionResources,
+  pagePermissionTitle,
+} from '../../client/pages/settings/page-permissions.js';
+import { pagePermissionTitles } from '../../client/pages/settings/page-permission-titles.js';
+
+const flatten = (
+  routes: readonly AppClientRegisteredRoute[],
+): AppClientRegisteredRoute[] =>
+  routes.flatMap((route) => [route, ...flatten(route.children ?? [])]);
+const localized = (resource: unknown, key: string): unknown =>
+  key
+    .split('.')
+    .reduce<unknown>(
+      (value, part) =>
+        value && typeof value === 'object'
+          ? Reflect.get(value, part)
+          : undefined,
+      resource,
+    );
+const application = resolveAppClientContributions([
+  {
+    packageName: 'title-check-app',
+    source: 'application',
+    routes: applicationRoutes,
+  },
+]);
+const pages = flatten(application.routes).filter(
+  (route) =>
+    route.source === 'application' &&
+    route.componentLoader &&
+    typeof route.authz === 'object' &&
+    route.authz.resource.type === 'page',
+);
+
+describe('page permission labels', () => {
+  it('names every application page permission and translates it in both languages', () => {
+    const missing = pages
+      .filter((route) => !pagePermissionTitle(route, pagePermissionTitles))
+      .map((route) => route.name);
+    expect(
+      missing,
+      'Add a navigation/breadcrumb title or a page-permission-titles entry; never rename authorization ids to fix labels.',
+    ).toEqual([]);
+    for (const route of pages) {
+      const title = pagePermissionTitle(route, pagePermissionTitles);
+      if (!title || typeof title === 'string')
+        throw new Error(`Missing permission title: ${route.name}`);
+      for (const locale of [enUS, zhCN]) {
+        const value = localized(locale, title.key);
+        expect(value, `${route.name}: ${title.key}`).toBeTypeOf('string');
+        expect(String(value).trim()).not.toBe('');
+        expect(value).not.toBe(title.key);
+        expect(value).not.toBe(route.id);
+        expect(String(value)).not.toContain('{{');
+      }
+    }
+    const names = new Set(
+      flatten(application.routes).map((route) => route.name),
+    );
+    for (const name of Object.keys(pagePermissionTitles))
+      expect(names.has(name), `Stale permission title: ${name}`).toBe(true);
+  });
+
+  it('preserves the complete application page-resource identity list', () => {
+    const expected = pages.map((route) => {
+      if (typeof route.authz !== 'object')
+        throw new Error('Expected page authorization');
+      return { type: 'page', id: route.authz.resource.id, actions: ['access'] };
+    });
+    expect(
+      pagePermissionResources(
+        application.routes,
+        pagePermissionTitles,
+        (path) => `Unnamed (${path})`,
+      ).map(({ type, id, actions }) => ({
+        type,
+        id,
+        actions: actions.map((action) => action.name),
+      })),
+    ).toEqual(expected);
+  });
+
+  const fixture = () =>
+    resolveAppClientContributions([
+      {
+        packageName: 'private-app',
+        source: 'application',
+        routes: [
+          {
+            parent: 'app',
+            routes: [
+              {
+                name: 'expenses',
+                path: '/expenses',
+                auth: 'required',
+                authz: {
+                  resource: { type: 'page', id: 'legacy-expenses' },
+                  action: 'access',
+                },
+                navigation: { title: 'expenses.title' },
+                componentLoader: async () => ({ default: () => null }),
+                children: [
+                  {
+                    name: 'expenseEdit',
+                    path: ':id/edit',
+                    authz: {
+                      resource: { type: 'page', id: 'legacy-edit' },
+                      action: 'access',
+                    },
+                    componentLoader: async () => ({ default: () => null }),
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ]);
+
+  it('names an overlay without adding navigation/breadcrumbs or changing resources', () => {
+    const input = fixture();
+    const route = input.routes[0]!.children![0]!;
+    const identities = flatten(input.routes).map(
+      ({ id, name, path, authz }) => ({ id, name, path, authz }),
+    );
+    const result = pagePermissionResources(
+      input.routes,
+      { expenseEdit: 'expenses.editTitle' },
+      (path) => `Unnamed (${path})`,
+    );
+    expect(result.map(({ id, actions }) => ({ id, actions }))).toEqual([
+      {
+        id: 'legacy-expenses',
+        actions: [{ name: 'access', title: { key: 'settings.access' } }],
+      },
+      {
+        id: 'legacy-edit',
+        actions: [{ name: 'access', title: { key: 'settings.access' } }],
+      },
+    ]);
+    expect(result[1]!.title).toEqual({
+      key: 'expenses.editTitle',
+      ns: 'private-app',
+    });
+    expect(route.navigation).toBeUndefined();
+    expect(route.breadcrumb).toBeUndefined();
+    expect(
+      flatten(input.routes).map(({ id, name, path, authz }) => ({
+        id,
+        name,
+        path,
+        authz,
+      })),
+    ).toEqual(identities);
+    expect(
+      pagePermissionResources(
+        input.routes,
+        { expenseEdit: 'expenses.editTitle' },
+        (path) => `Unnamed (${path})`,
+      ),
+    ).toEqual(result);
+  });
+
+  it('reports missing metadata and renders a localized fallback without dropping the permission', () => {
+    const input = fixture();
+    const overlay = input.routes[0]!.children![0]!;
+    expect(pagePermissionTitle(overlay, {})).toBeUndefined();
+    const resources = pagePermissionResources(
+      input.routes,
+      {},
+      (path) => `未命名页面（${path}）`,
+    );
+    expect(resources[1]!.id).toBe('legacy-edit');
+    expect(resources[1]!.title).toBe('未命名页面（/expenses/:id/edit）');
+    expect(resources[1]!.title).not.toContain('private-app:');
+  });
+
+  it('does not treat object prototype properties as configured labels', () => {
+    const route = fixture().routes[0]!.children![0]!;
+    expect(
+      pagePermissionTitle({ ...route, name: 'constructor' }, {}),
+    ).toBeUndefined();
+    expect(
+      pagePermissionTitle({ ...route, name: 'toString' }, {}),
+    ).toBeUndefined();
+  });
+
+  it('does not apply application-name overrides to plugin routes or expose non-page resources', () => {
+    const input = fixture();
+    const overlay = input.routes[0]!.children![0]!;
+    expect(
+      pagePermissionTitle(
+        { ...overlay, source: 'plugin', packageName: 'plugin' },
+        { expenseEdit: 'expenses.editTitle' },
+      ),
+    ).toBeUndefined();
+    expect(
+      pagePermissionResources(
+        [
+          { ...overlay, authz: 'skip' },
+          {
+            ...overlay,
+            authz: {
+              resource: { type: 'settings', id: 'members' },
+              action: 'read',
+            },
+          },
+        ],
+        {},
+        () => 'Unnamed',
+      ),
+    ).toEqual([]);
+  });
+});