@nocobase/test 1.6.0-alpha.2 → 1.6.0-alpha.20

package/es/e2e/e2eUtils.d.ts

@@ -117,7 +117,7 @@ interface AclRoleSetting {
      */
     default?: boolean;
     key?: string;
-    menuUiSchemas?: string[];
+    desktopRoutes?: number[];
     dataSourceKey?: string;
 }
 interface DatabaseSetting {
@@ -289,6 +289,7 @@ export declare class NocoPage {
     protected page?: Page;
     protected url: string;
     protected uid: string | undefined;
+    protected desktopRouteId: number | undefined;
     protected collectionsName: string[] | undefined;
     protected _waitForInit: Promise<void>;
     constructor(options?: PageConfig, page?: Page);
@@ -296,6 +297,7 @@ export declare class NocoPage {
     goto(): Promise<void>;
     getUrl(): Promise<string>;
     getUid(): Promise<string>;
+    getDesktopRouteId(): Promise<number>;
     /**
      * If you are using mockRecords, then you need to use this method.
      * Wait until the mockRecords create the records successfully before navigating to the page.
@@ -308,7 +310,7 @@ export declare class NocoPage {
 export declare class NocoMobilePage extends NocoPage {
     protected options?: MobilePageConfig;
     protected page?: Page;
-    protected routeId: number;
+    protected mobileRouteId: number;
     protected title: string;
     constructor(options?: MobilePageConfig, page?: Page);
     getTitle(): string;

package/es/server/index.d.ts

@@ -14,6 +14,7 @@ export * from './mock-isolated-cluster';
 export * from './mock-server';
 export declare const pgOnly: () => any;
 export declare const isPg: () => boolean;
+export declare const isMysql: () => boolean;
 export declare function randomStr(): string;
 export declare function sleep(ms?: number): Promise<unknown>;
 export declare const waitSecond: typeof sleep;

package/es/server/mock-server.d.ts

@@ -57,8 +57,9 @@ interface Resource {
     [name: string]: (params?: ActionParams) => Promise<supertest.Response>;
 }
 interface ExtendedAgent extends SuperAgentTest {
-    login: (user: any) => ExtendedAgent;
-    loginUsingId: (userId: number) => ExtendedAgent;
+    login: (user: any, roleName?: string) => ExtendedAgent;
+    loginUsingId: (userId: number, roleName?: string) => ExtendedAgent;
+    loginWithJti: (user: any, roleName?: string) => Promise<ExtendedAgent>;
     resource: (name: string, resourceOf?: any) => Resource;
 }
 export declare class MockServer extends Application {
@@ -69,7 +70,7 @@ export declare class MockServer extends Application {
         clean?: boolean;
     }): Promise<void>;
     destroy(options?: any): Promise<void>;
-    agent(): ExtendedAgent;
+    agent(callback?: any): ExtendedAgent;
     protected createDatabase(options: ApplicationOptions): import("@nocobase/database").MockDatabase;
 }
 export declare function mockServer(options?: ApplicationOptions): MockServer;

package/lib/client/formItemChecker/icon.js

@@ -53,7 +53,6 @@ async function iconChecker(options) {
     await import_user_event.default.click(formItem.querySelector("span[role=img]") || formItem.querySelector("button"));
     await (0, import_react.waitFor)(() => {
       (0, import_utils.expectNoTsError)(import_react.screen.queryByRole("tooltip")).toBeInTheDocument();
-      (0, import_utils.expectNoTsError)(import_react.screen.getByRole("tooltip").querySelector(".ant-popover-title")).toHaveTextContent("Icon");
     });
     await import_user_event.default.click(import_react.screen.getByRole("tooltip").querySelector(`span[aria-label="${options.newValue}"]`));
     await (0, import_react.waitFor)(() => {

package/lib/e2e/e2eUtils.d.ts

@@ -117,7 +117,7 @@ interface AclRoleSetting {
      */
     default?: boolean;
     key?: string;
-    menuUiSchemas?: string[];
+    desktopRoutes?: number[];
     dataSourceKey?: string;
 }
 interface DatabaseSetting {
@@ -289,6 +289,7 @@ export declare class NocoPage {
     protected page?: Page;
     protected url: string;
     protected uid: string | undefined;
+    protected desktopRouteId: number | undefined;
     protected collectionsName: string[] | undefined;
     protected _waitForInit: Promise<void>;
     constructor(options?: PageConfig, page?: Page);
@@ -296,6 +297,7 @@ export declare class NocoPage {
     goto(): Promise<void>;
     getUrl(): Promise<string>;
     getUid(): Promise<string>;
+    getDesktopRouteId(): Promise<number>;
     /**
      * If you are using mockRecords, then you need to use this method.
      * Wait until the mockRecords create the records successfully before navigating to the page.
@@ -308,7 +310,7 @@ export declare class NocoPage {
 export declare class NocoMobilePage extends NocoPage {
     protected options?: MobilePageConfig;
     protected page?: Page;
-    protected routeId: number;
+    protected mobileRouteId: number;
     protected title: string;
     constructor(options?: MobilePageConfig, page?: Page);
     getTitle(): string;

package/lib/e2e/e2eUtils.js

@@ -68,6 +68,7 @@ const _NocoPage = class _NocoPage {
   }
   url;
   uid;
+  desktopRouteId;
   collectionsName;
   _waitForInit;
   async init() {
@@ -89,7 +90,9 @@ const _NocoPage = class _NocoPage {
       })
     );
     const result = await Promise.all(waitList);
-    this.uid = result[result.length - 1];
+    const { schemaUid, routeId } = result[result.length - 1] || {};
+    this.uid = schemaUid;
+    this.desktopRouteId = routeId;
     this.url = `${((_i = this.options) == null ? void 0 : _i.basePath) || "/admin/"}${this.uid}`;
   }
   async goto() {
@@ -105,6 +108,10 @@ const _NocoPage = class _NocoPage {
     await this._waitForInit;
     return this.uid;
   }
+  async getDesktopRouteId() {
+    await this._waitForInit;
+    return this.desktopRouteId;
+  }
   /**
    * If you are using mockRecords, then you need to use this method.
    * Wait until the mockRecords create the records successfully before navigating to the page.
@@ -119,8 +126,9 @@ const _NocoPage = class _NocoPage {
     var _a;
     const waitList = [];
     if (this.uid) {
-      waitList.push(deletePage(this.uid));
+      waitList.push(deletePage(this.uid, this.desktopRouteId));
       this.uid = void 0;
+      this.desktopRouteId = void 0;
     }
     if ((_a = this.collectionsName) == null ? void 0 : _a.length) {
       waitList.push(deleteCollections(this.collectionsName));
@@ -137,7 +145,7 @@ const _NocoMobilePage = class _NocoMobilePage extends NocoPage {
     this.options = options;
     this.page = page;
   }
-  routeId;
+  mobileRouteId;
   title;
   getTitle() {
     return this.title;
@@ -154,7 +162,7 @@ const _NocoMobilePage = class _NocoMobilePage extends NocoPage {
     const result = await Promise.all(waitList);
     const { url, pageSchemaUid, routeId, title } = result[result.length - 1];
     this.title = title;
-    this.routeId = routeId;
+    this.mobileRouteId = routeId;
     this.uid = pageSchemaUid;
     if (((_c = this.options) == null ? void 0 : _c.type) == "link") {
       if (url == null ? void 0 : url.startsWith("/")) {
@@ -167,7 +175,7 @@ const _NocoMobilePage = class _NocoMobilePage extends NocoPage {
     }
   }
   async mobileDestroy() {
-    await deleteMobileRoutes(this.routeId);
+    await deleteMobileRoutes(this.mobileRouteId);
     await this.destroy();
   }
 };
@@ -379,6 +387,7 @@ const updateUidOfPageSchema = /* @__PURE__ */ __name((uiSchema) => {
   return uiSchema;
 }, "updateUidOfPageSchema");
 const createPage = /* @__PURE__ */ __name(async (options) => {
+  var _a, _b, _c, _d;
   const { type = "page", url, name, pageSchema, keepUid, pageUid: pageUidFromOptions } = options || {};
   const api = await import_test.request.newContext({
     storageState: process.env.PLAYWRIGHT_AUTH_FILE
@@ -401,8 +410,79 @@ const createPage = /* @__PURE__ */ __name(async (options) => {
   };
   const state = await api.storageState();
   const headers = getHeaders(state);
-  const pageUid = pageUidFromOptions || (0, import_shared.uid)();
-  const gridName = (0, import_shared.uid)();
+  const menuSchemaUid = pageUidFromOptions || (0, import_shared.uid)();
+  const pageSchemaUid = (0, import_shared.uid)();
+  const tabSchemaUid = (0, import_shared.uid)();
+  const tabSchemaName = (0, import_shared.uid)();
+  const title = name || menuSchemaUid;
+  const newPageSchema = keepUid ? pageSchema : updateUidOfPageSchema(pageSchema);
+  let routeId;
+  let schemaUid;
+  if (type === "group") {
+    const result2 = await api.post("/api/desktopRoutes:create", {
+      headers,
+      data: {
+        type: "group",
+        title,
+        schemaUid: menuSchemaUid,
+        hideInMenu: false
+      }
+    });
+    if (!result2.ok()) {
+      throw new Error(await result2.text());
+    }
+    const data = await result2.json();
+    routeId = (_a = data.data) == null ? void 0 : _a.id;
+    schemaUid = menuSchemaUid;
+  }
+  if (type === "page") {
+    const result2 = await api.post("/api/desktopRoutes:create", {
+      headers,
+      data: {
+        type: "page",
+        title,
+        schemaUid: (newPageSchema == null ? void 0 : newPageSchema["x-uid"]) || pageSchemaUid,
+        menuSchemaUid,
+        hideInMenu: false,
+        enableTabs: !!((_b = newPageSchema == null ? void 0 : newPageSchema["x-component-props"]) == null ? void 0 : _b.enablePageTabs),
+        children: newPageSchema ? schemaToRoutes(newPageSchema) : [
+          {
+            type: "tabs",
+            title: '{{t("Unnamed")}}',
+            schemaUid: tabSchemaUid,
+            tabSchemaName,
+            hideInMenu: false
+          }
+        ]
+      }
+    });
+    if (!result2.ok()) {
+      throw new Error(await result2.text());
+    }
+    const data = await result2.json();
+    routeId = (_c = data.data) == null ? void 0 : _c.id;
+    schemaUid = menuSchemaUid;
+  }
+  if (type === "link") {
+    const result2 = await api.post("/api/desktopRoutes:create", {
+      headers,
+      data: {
+        type: "link",
+        title,
+        schemaUid: menuSchemaUid,
+        hideInMenu: false,
+        options: {
+          href: url
+        }
+      }
+    });
+    if (!result2.ok()) {
+      throw new Error(await result2.text());
+    }
+    const data = await result2.json();
+    routeId = (_d = data.data) == null ? void 0 : _d.id;
+    schemaUid = menuSchemaUid;
+  }
   const result = await api.post(`/api/uiSchemas:insertAdjacent/nocobase-admin-menu?position=beforeEnd`, {
     headers,
     data: {
@@ -410,37 +490,33 @@ const createPage = /* @__PURE__ */ __name(async (options) => {
         _isJSONSchemaObject: true,
         version: "2.0",
         type: "void",
-        title: name || pageUid,
+        title,
         ...typeToSchema[type],
         "x-decorator": "ACLMenuItemProvider",
-        "x-server-hooks": [
-          { type: "onSelfCreate", method: "bindMenuToRole" },
-          { type: "onSelfSave", method: "extractTextToLocale" }
-        ],
         properties: {
-          page: (keepUid ? pageSchema : updateUidOfPageSchema(pageSchema)) || {
+          page: newPageSchema || {
             _isJSONSchemaObject: true,
             version: "2.0",
             type: "void",
             "x-component": "Page",
             "x-async": true,
             properties: {
-              [gridName]: {
+              [tabSchemaName]: {
                 _isJSONSchemaObject: true,
                 version: "2.0",
                 type: "void",
                 "x-component": "Grid",
                 "x-initializer": "page:addBlock",
-                "x-uid": (0, import_shared.uid)(),
-                name: gridName
+                "x-uid": tabSchemaUid,
+                name: tabSchemaName
               }
             },
-            "x-uid": (0, import_shared.uid)(),
+            "x-uid": pageSchemaUid,
             name: "page"
           }
         },
         name: (0, import_shared.uid)(),
-        "x-uid": pageUid
+        "x-uid": menuSchemaUid
       },
       wrap: null
     }
@@ -448,7 +524,7 @@ const createPage = /* @__PURE__ */ __name(async (options) => {
   if (!result.ok()) {
     throw new Error(await result.text());
   }
-  return pageUid;
+  return { schemaUid, routeId };
 }, "createPage");
 const createMobilePage = /* @__PURE__ */ __name(async (options) => {
   const { type = "page", url, name, pageSchema, keepUid } = options || {};
@@ -614,12 +690,20 @@ const deleteMobileRoutes = /* @__PURE__ */ __name(async (mobileRouteId) => {
     throw new Error(await result2.text());
   }
 }, "deleteMobileRoutes");
-const deletePage = /* @__PURE__ */ __name(async (pageUid) => {
+const deletePage = /* @__PURE__ */ __name(async (pageUid, routeId) => {
   const api = await import_test.request.newContext({
     storageState: process.env.PLAYWRIGHT_AUTH_FILE
   });
   const state = await api.storageState();
   const headers = getHeaders(state);
+  if (routeId !== void 0) {
+    const routeResult = await api.post(`/api/desktopRoutes:destroy?filterByTk=${routeId}`, {
+      headers
+    });
+    if (!routeResult.ok()) {
+      throw new Error(await routeResult.text());
+    }
+  }
   const result = await api.post(`/api/uiSchemas:remove/${pageUid}`, {
     headers
   });
@@ -921,6 +1005,26 @@ async function expectSupportedVariables(page, variables) {
   }
 }
 __name(expectSupportedVariables, "expectSupportedVariables");
+function schemaToRoutes(schema) {
+  const schemaKeys = Object.keys(schema.properties || {});
+  if (schemaKeys.length === 0) {
+    return [];
+  }
+  const result = schemaKeys.map((key) => {
+    var _a;
+    const item = schema.properties[key];
+    return {
+      type: "tabs",
+      title: item.title || '{{t("Unnamed")}}',
+      icon: (_a = item["x-component-props"]) == null ? void 0 : _a.icon,
+      schemaUid: item["x-uid"],
+      tabSchemaName: key,
+      hideInMenu: false
+    };
+  });
+  return result;
+}
+__name(schemaToRoutes, "schemaToRoutes");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   NocoMobilePage,

package/lib/e2e/templatesOfPage.js

@@ -12313,7 +12313,7 @@ const oneFilterFormBlockWithAllAssociationFieldsV1333Beta = {
                                         "x-use-decorator-props": "useFormItemProps",
                                         "x-collection-field": "general.oneToOneBelongsTo",
                                         "x-component-props": {
-                                          multiple: false,
+                                          multiple: true,
                                           fieldNames: {
                                             label: "id",
                                             value: "id"
@@ -12360,7 +12360,7 @@ const oneFilterFormBlockWithAllAssociationFieldsV1333Beta = {
                                         "x-use-decorator-props": "useFormItemProps",
                                         "x-collection-field": "general.oneToOneHasOne",
                                         "x-component-props": {
-                                          multiple: false,
+                                          multiple: true,
                                           fieldNames: {
                                             label: "id",
                                             value: "id"
@@ -12454,7 +12454,7 @@ const oneFilterFormBlockWithAllAssociationFieldsV1333Beta = {
                                         "x-use-decorator-props": "useFormItemProps",
                                         "x-collection-field": "general.manyToOne",
                                         "x-component-props": {
-                                          multiple: false,
+                                          multiple: true,
                                           fieldNames: {
                                             label: "id",
                                             value: "id"

package/lib/server/index.d.ts

@@ -14,6 +14,7 @@ export * from './mock-isolated-cluster';
 export * from './mock-server';
 export declare const pgOnly: () => any;
 export declare const isPg: () => boolean;
+export declare const isMysql: () => boolean;
 export declare function randomStr(): string;
 export declare function sleep(ms?: number): Promise<unknown>;
 export declare const waitSecond: typeof sleep;

package/lib/server/index.js

@@ -40,6 +40,7 @@ var server_exports = {};
 __export(server_exports, {
   MockDatabase: () => import_database.MockDatabase,
   createWsClient: () => createWsClient,
+  isMysql: () => isMysql,
   isPg: () => isPg,
   mockDatabase: () => import_database.mockDatabase,
   pgOnly: () => pgOnly,
@@ -59,6 +60,7 @@ __reExport(server_exports, require("./mock-isolated-cluster"), module.exports);
 __reExport(server_exports, require("./mock-server"), module.exports);
 const pgOnly = /* @__PURE__ */ __name(() => process.env.DB_DIALECT == "postgres" ? import_vitest.describe : import_vitest.describe.skip, "pgOnly");
 const isPg = /* @__PURE__ */ __name(() => process.env.DB_DIALECT == "postgres", "isPg");
+const isMysql = /* @__PURE__ */ __name(() => process.env.DB_DIALECT == "mysql", "isMysql");
 function randomStr() {
   return Math.random().toString(36).substring(2);
 }
@@ -112,6 +114,7 @@ const createWsClient = /* @__PURE__ */ __name(async ({ serverPort, options = {}
 0 && (module.exports = {
   MockDatabase,
   createWsClient,
+  isMysql,
   isPg,
   mockDatabase,
   pgOnly,

package/lib/server/mock-server.d.ts

@@ -57,8 +57,9 @@ interface Resource {
     [name: string]: (params?: ActionParams) => Promise<supertest.Response>;
 }
 interface ExtendedAgent extends SuperAgentTest {
-    login: (user: any) => ExtendedAgent;
-    loginUsingId: (userId: number) => ExtendedAgent;
+    login: (user: any, roleName?: string) => ExtendedAgent;
+    loginUsingId: (userId: number, roleName?: string) => ExtendedAgent;
+    loginWithJti: (user: any, roleName?: string) => Promise<ExtendedAgent>;
     resource: (name: string, resourceOf?: any) => Resource;
 }
 export declare class MockServer extends Application {
@@ -69,7 +70,7 @@ export declare class MockServer extends Application {
         clean?: boolean;
     }): Promise<void>;
     destroy(options?: any): Promise<void>;
-    agent(): ExtendedAgent;
+    agent(callback?: any): ExtendedAgent;
     protected createDatabase(options: ApplicationOptions): import("@nocobase/database").MockDatabase;
 }
 export declare function mockServer(options?: ApplicationOptions): MockServer;

package/lib/server/mock-server.js

@@ -53,6 +53,9 @@ var import_qs = __toESM(require("qs"));
 var import_supertest = __toESM(require("supertest"));
 var import_memory_pub_sub_adapter = require("./memory-pub-sub-adapter");
 var import_mock_data_source = require("./mock-data-source");
+var import_path = __toESM(require("path"));
+var import_node_process = __toESM(require("node:process"));
+var import_fs = require("fs");
 const _MockServer = class _MockServer extends import_server.Application {
   registerMockDataSource() {
     this.dataSourceManager.factory.register("mock", import_mock_data_source.MockDataSource);
@@ -87,20 +90,22 @@ const _MockServer = class _MockServer extends import_server.Application {
     import_server.Gateway.getInstance().destroy();
     await import_server.AppSupervisor.getInstance().destroy();
   }
-  agent() {
-    const agent = import_supertest.default.agent(this.callback());
+  agent(callback) {
+    const agent = import_supertest.default.agent(callback || this.callback());
     const prefix = this.resourcer.options.prefix;
+    const authManager = this.authManager;
     const proxy = new Proxy(agent, {
       get(target, method, receiver) {
         if (["login", "loginUsingId"].includes(method)) {
-          return (userOrId) => {
+          return (userOrId, roleName) => {
             return proxy.auth(
               import_jsonwebtoken.default.sign(
                 {
                   userId: typeof userOrId === "number" ? userOrId : userOrId == null ? void 0 : userOrId.id,
-                  temp: true
+                  temp: true,
+                  roleName
                 },
-                process.env.APP_KEY,
+                import_node_process.default.env.APP_KEY,
                 {
                   expiresIn: "1d"
                 }
@@ -109,6 +114,29 @@ const _MockServer = class _MockServer extends import_server.Application {
             ).set("X-Authenticator", "basic");
           };
         }
+        if (method === "loginWithJti") {
+          return async (userOrId, roleName) => {
+            const userId = typeof userOrId === "number" ? userOrId : userOrId == null ? void 0 : userOrId.id;
+            const tokenInfo = await authManager.tokenController.add({ userId });
+            const expiresIn = (await authManager.tokenController.getConfig()).tokenExpirationTime;
+            return proxy.auth(
+              import_jsonwebtoken.default.sign(
+                {
+                  userId,
+                  temp: true,
+                  roleName,
+                  signInTime: Date.now()
+                },
+                import_node_process.default.env.APP_KEY,
+                {
+                  jwtid: tokenInfo.jti,
+                  expiresIn
+                }
+              ),
+              { type: "bearer" }
+            ).set("X-Authenticator", "basic");
+          };
+        }
         if (method === "resource") {
           return (name, resourceOf) => {
             const keys = name.split(".");
@@ -252,6 +280,12 @@ async function createMockCluster({
 }
 __name(createMockCluster, "createMockCluster");
 async function createMockServer(options = {}) {
+  const cachePath = import_path.default.join(import_node_process.default.cwd(), "storage", "cache");
+  try {
+    await import_fs.promises.rm(cachePath, { recursive: true, force: true });
+    await import_fs.promises.mkdir(cachePath, { recursive: true });
+  } catch (e) {
+  }
   const { version, beforeInstall, skipInstall, skipStart, ...others } = options;
   const app = mockServer(others);
   if (!skipInstall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.20",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.6.0-alpha.2",
+    "@nocobase/server": "1.6.0-alpha.20",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -76,5 +76,5 @@
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "08bbc34c21727fc0ad0880f397a42bf7741091ee"
+  "gitHead": "c127664eb2b900edd5c18c9344046cd663a06c3b"
 }