@nocobase/test 1.6.0-beta.8 → 1.6.0

package/lib/e2e/e2eUtils.js

@@ -58,6 +58,24 @@ var import_test = require("@playwright/test");
 var import_lodash = __toESM(require("lodash"));
 var import_defineConfig = require("./defineConfig");
 __reExport(e2eUtils_exports, require("@playwright/test"), module.exports);
+function getPageMenuSchema({ pageSchemaUid, tabSchemaUid, tabSchemaName }) {
+  return {
+    type: "void",
+    "x-component": "Page",
+    properties: {
+      [tabSchemaName]: {
+        type: "void",
+        "x-component": "Grid",
+        "x-initializer": "page:addBlock",
+        properties: {},
+        "x-uid": tabSchemaUid,
+        "x-async": true
+      }
+    },
+    "x-uid": pageSchemaUid
+  };
+}
+__name(getPageMenuSchema, "getPageMenuSchema");
 const PORT = process.env.APP_PORT || 2e4;
 const APP_BASE_URL = process.env.APP_BASE_URL || `http://localhost:${PORT}`;
 const _NocoPage = class _NocoPage {
@@ -93,7 +111,7 @@ const _NocoPage = class _NocoPage {
     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}`;
+    this.url = `${((_i = this.options) == null ? void 0 : _i.basePath) || "/admin/"}${this.uid || this.desktopRouteId}`;
   }
   async goto() {
     var _a;
@@ -125,7 +143,7 @@ const _NocoPage = class _NocoPage {
   async destroy() {
     var _a;
     const waitList = [];
-    if (this.uid) {
+    if (this.uid || this.desktopRouteId !== void 0) {
       waitList.push(deletePage(this.uid, this.desktopRouteId));
       this.uid = void 0;
       this.desktopRouteId = void 0;
@@ -392,137 +410,85 @@ const createPage = /* @__PURE__ */ __name(async (options) => {
   const api = await import_test.request.newContext({
     storageState: process.env.PLAYWRIGHT_AUTH_FILE
   });
-  const typeToSchema = {
-    group: {
-      "x-component": "Menu.SubMenu",
-      "x-component-props": {}
-    },
-    page: {
-      "x-component": "Menu.Item",
-      "x-component-props": {}
-    },
-    link: {
-      "x-component": "Menu.URL",
-      "x-component-props": {
-        href: url
-      }
-    }
-  };
   const state = await api.storageState();
   const headers = getHeaders(state);
-  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);
+  const pageSchemaUid = (newPageSchema == null ? void 0 : newPageSchema["x-uid"]) || (0, import_shared.uid)();
+  const newTabSchemaUid = (0, import_shared.uid)();
+  const newTabSchemaName = (0, import_shared.uid)();
+  const title = name || pageSchemaUid;
   let routeId;
   let schemaUid;
   if (type === "group") {
-    const result2 = await api.post("/api/desktopRoutes:create", {
+    const result = await api.post("/api/desktopRoutes:create", {
       headers,
       data: {
         type: "group",
         title,
-        schemaUid: menuSchemaUid,
         hideInMenu: false
       }
     });
-    if (!result2.ok()) {
-      throw new Error(await result2.text());
+    if (!result.ok()) {
+      throw new Error(await result.text());
     }
-    const data = await result2.json();
+    const data = await result.json();
     routeId = (_a = data.data) == null ? void 0 : _a.id;
-    schemaUid = menuSchemaUid;
   }
   if (type === "page") {
-    const result2 = await api.post("/api/desktopRoutes:create", {
+    const routeResult = await api.post("/api/desktopRoutes:create", {
       headers,
       data: {
         type: "page",
         title,
-        schemaUid: (newPageSchema == null ? void 0 : newPageSchema["x-uid"]) || pageSchemaUid,
-        menuSchemaUid,
+        schemaUid: pageSchemaUid,
         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,
+            schemaUid: newTabSchemaUid,
+            tabSchemaName: newTabSchemaName,
             hideInMenu: false
           }
         ]
       }
     });
-    if (!result2.ok()) {
-      throw new Error(await result2.text());
+    if (!routeResult.ok()) {
+      throw new Error(await routeResult.text());
+    }
+    const schemaResult = await api.post(`/api/uiSchemas:insert`, {
+      headers,
+      data: newPageSchema || getPageMenuSchema({
+        pageSchemaUid,
+        tabSchemaUid: newTabSchemaUid,
+        tabSchemaName: newTabSchemaName
+      })
+    });
+    if (!schemaResult.ok()) {
+      throw new Error(await routeResult.text());
     }
-    const data = await result2.json();
+    const data = await routeResult.json();
     routeId = (_c = data.data) == null ? void 0 : _c.id;
-    schemaUid = menuSchemaUid;
+    schemaUid = pageSchemaUid;
   }
   if (type === "link") {
-    const result2 = await api.post("/api/desktopRoutes:create", {
+    const result = 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());
+    if (!result.ok()) {
+      throw new Error(await result.text());
     }
-    const data = await result2.json();
+    const data = await result.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: {
-      schema: {
-        _isJSONSchemaObject: true,
-        version: "2.0",
-        type: "void",
-        title,
-        ...typeToSchema[type],
-        "x-decorator": "ACLMenuItemProvider",
-        properties: {
-          page: newPageSchema || {
-            _isJSONSchemaObject: true,
-            version: "2.0",
-            type: "void",
-            "x-component": "Page",
-            "x-async": true,
-            properties: {
-              [tabSchemaName]: {
-                _isJSONSchemaObject: true,
-                version: "2.0",
-                type: "void",
-                "x-component": "Grid",
-                "x-initializer": "page:addBlock",
-                "x-uid": tabSchemaUid,
-                name: tabSchemaName
-              }
-            },
-            "x-uid": pageSchemaUid,
-            name: "page"
-          }
-        },
-        name: (0, import_shared.uid)(),
-        "x-uid": menuSchemaUid
-      },
-      wrap: null
-    }
-  });
-  if (!result.ok()) {
-    throw new Error(await result.text());
   }
   return { schemaUid, routeId };
 }, "createPage");
@@ -704,11 +670,13 @@ const deletePage = /* @__PURE__ */ __name(async (pageUid, routeId) => {
       throw new Error(await routeResult.text());
     }
   }
-  const result = await api.post(`/api/uiSchemas:remove/${pageUid}`, {
-    headers
-  });
-  if (!result.ok()) {
-    throw new Error(await result.text());
+  if (pageUid) {
+    const result = await api.post(`/api/uiSchemas:remove/${pageUid}`, {
+      headers
+    });
+    if (!result.ok()) {
+      throw new Error(await result.text());
+    }
   }
 }, "deletePage");
 const deleteCollections = /* @__PURE__ */ __name(async (collectionNames) => {
@@ -949,11 +917,11 @@ async function expectSettingsMenu({
   await page.waitForTimeout(100);
   await showMenu();
   for (const option of supportedOptions) {
-    await (0, import_test.expect)(page.getByRole("menuitem", { name: option })).toBeVisible();
+    await (0, import_test.expect)(page.getByRole("menuitem", { name: option, exact: option === "Edit" })).toBeVisible();
   }
   if (unsupportedOptions) {
     for (const option of unsupportedOptions) {
-      await (0, import_test.expect)(page.getByRole("menuitem", { name: option })).not.toBeVisible();
+      await (0, import_test.expect)(page.getByRole("menuitem", { name: option, exact: option === "Edit" })).not.toBeVisible();
     }
   }
 }

package/lib/web/dataSourceMainCollections.json

@@ -241,36 +241,6 @@
           }
         }
       },
-      {
-        "key": "qe7b1rsct5h",
-        "name": "jobs",
-        "type": "belongsToMany",
-        "interface": null,
-        "description": null,
-        "collectionName": "users",
-        "parentKey": null,
-        "reverseKey": null,
-        "through": "users_jobs",
-        "foreignKey": "userId",
-        "sourceKey": "id",
-        "otherKey": "jobId",
-        "targetKey": "id",
-        "target": "jobs"
-      },
-      {
-        "key": "vt0n1l1ruyz",
-        "name": "usersJobs",
-        "type": "hasMany",
-        "interface": null,
-        "description": null,
-        "collectionName": "users",
-        "parentKey": null,
-        "reverseKey": null,
-        "target": "users_jobs",
-        "foreignKey": "userId",
-        "sourceKey": "id",
-        "targetKey": "id"
-      },
       {
         "key": "ekol7p60nry",
         "name": "sortName",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.6.0-beta.8",
+  "version": "1.6.0",
   "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-beta.8",
+    "@nocobase/server": "1.6.0",
     "@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": "2257b50e1cf0b2a2873673a630e5ecc80ec2e01a"
+  "gitHead": "7422d72a4e515a11300860028a26030ed5732135"
 }