@nocobase/plugin-client 1.6.0-alpha.21 → 1.6.0-alpha.23

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.21",
+  "@nocobase/client": "1.6.0-alpha.23",
   "antd": "5.12.8",
   "react": "18.2.0",
   "@ant-design/icons": "5.2.6",
   "@formily/react": "2.3.0",
-  "@nocobase/utils": "1.6.0-alpha.21",
+  "@nocobase/utils": "1.6.0-alpha.23",
   "lodash": "4.17.21",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "1.6.0-alpha.21",
-  "@nocobase/server": "1.6.0-alpha.21"
+  "@nocobase/database": "1.6.0-alpha.23",
+  "@nocobase/server": "1.6.0-alpha.23"
 };

package/dist/node_modules/cronstrue/package.json

@@ -1 +1 @@
-{"name":"cronstrue","title":"cRonstrue","version":"2.47.0","description":"Convert cron expressions into human readable descriptions","author":"Brady Holt","license":"MIT","bugs":{"url":"https://github.com/bradymholt/cronstrue/issues"},"homepage":"https://github.com/bradymholt/cronstrue","keywords":["cron","cronjob","crontab","schedule","parser","cron expression","cron description","pretty cron","cron for humans","cron translated","cron english","cron schedule","cron english","cron schedule"],"main":"dist/cronstrue.js","bin":{"cronstrue":"bin/cli.js"},"typings":"dist/cronstrue.d.ts","files":["dist/","locales/","i18n.js","i18n.d.ts"],"repository":{"type":"git","url":"git+https://github.com/bradymholt/cronstrue.git"},"publishConfig":{"access":"public"},"prettier":{"printWidth":120},"devDependencies":{"@types/chai":"^4.2.11","@types/mocha":"^8.0.0","chai":"^4.2.0","handlebars":"^4.7.6","marked":"^4.0.10","mocha":"^10.1.0","pixl-xml":"^1.0.13","prettier":"^2.1.1","terser-webpack-plugin":"^5.3.1","ts-loader":"^9.2.6","ts-node":"^10.5.0","typescript":"^4.6.2","webpack":"^5.69.1","webpack-cli":"^4.9.2","xml2js":"^0.5.0"},"scripts":{"start":"npm run build","build":"npx tsc -p ./src --emitDeclarationOnly","test":"npx mocha --reporter spec --require ts-node/register \"./test/**/*.ts\"","prepublishOnly":"rm -rf ./dist && ./node_modules/webpack-cli/bin/cli.js && git add -A"},"dependencies":{},"_lastModified":"2025-02-07T02:40:14.575Z"}
+{"name":"cronstrue","title":"cRonstrue","version":"2.47.0","description":"Convert cron expressions into human readable descriptions","author":"Brady Holt","license":"MIT","bugs":{"url":"https://github.com/bradymholt/cronstrue/issues"},"homepage":"https://github.com/bradymholt/cronstrue","keywords":["cron","cronjob","crontab","schedule","parser","cron expression","cron description","pretty cron","cron for humans","cron translated","cron english","cron schedule","cron english","cron schedule"],"main":"dist/cronstrue.js","bin":{"cronstrue":"bin/cli.js"},"typings":"dist/cronstrue.d.ts","files":["dist/","locales/","i18n.js","i18n.d.ts"],"repository":{"type":"git","url":"git+https://github.com/bradymholt/cronstrue.git"},"publishConfig":{"access":"public"},"prettier":{"printWidth":120},"devDependencies":{"@types/chai":"^4.2.11","@types/mocha":"^8.0.0","chai":"^4.2.0","handlebars":"^4.7.6","marked":"^4.0.10","mocha":"^10.1.0","pixl-xml":"^1.0.13","prettier":"^2.1.1","terser-webpack-plugin":"^5.3.1","ts-loader":"^9.2.6","ts-node":"^10.5.0","typescript":"^4.6.2","webpack":"^5.69.1","webpack-cli":"^4.9.2","xml2js":"^0.5.0"},"scripts":{"start":"npm run build","build":"npx tsc -p ./src --emitDeclarationOnly","test":"npx mocha --reporter spec --require ts-node/register \"./test/**/*.ts\"","prepublishOnly":"rm -rf ./dist && ./node_modules/webpack-cli/bin/cli.js && git add -A"},"dependencies":{},"_lastModified":"2025-02-07T12:03:15.126Z"}

package/dist/server/migrations/2024122912211-transform-menu-schema-to-routes.d.ts

@@ -12,3 +12,7 @@ export default class extends Migration {
     up(): Promise<void>;
 }
 export declare function schemaToRoutes(schema: any, uiSchemas: any): any;
+export declare function getIds(desktopRoutes: any[], menuUiSchemas: any[]): {
+    needRemoveIds: any[];
+    needAddIds: any[];
+};

package/dist/server/migrations/2024122912211-transform-menu-schema-to-routes.js

@@ -27,6 +27,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var transform_menu_schema_to_routes_exports = {};
 __export(transform_menu_schema_to_routes_exports, {
   default: () => transform_menu_schema_to_routes_default,
+  getIds: () => getIds,
   schemaToRoutes: () => schemaToRoutes
 });
 module.exports = __toCommonJS(transform_menu_schema_to_routes_exports);
@@ -53,20 +54,25 @@ class transform_menu_schema_to_routes_default extends import_server.Migration {
             transaction
           });
           const roles = await rolesRepository.find({
-            appends: ["desktopRoutes", "menuUiSchemas"],
+            appends: ["menuUiSchemas"],
             transaction
           });
+          const allDesktopRoutes = await desktopRoutes.find({ transaction });
           for (const role of roles) {
             const menuUiSchemas = role.menuUiSchemas || [];
-            const desktopRoutes2 = role.desktopRoutes || [];
-            const needRemoveIds = getNeedRemoveIds(desktopRoutes2, menuUiSchemas);
-            if (needRemoveIds.length === 0) {
-              continue;
+            const { needRemoveIds, needAddIds } = getIds(allDesktopRoutes, menuUiSchemas);
+            if (needRemoveIds.length > 0) {
+              await this.db.getRepository("roles.desktopRoutes", role.name).remove({
+                tk: needRemoveIds,
+                transaction
+              });
+            }
+            if (needAddIds.length > 0) {
+              await this.db.getRepository("roles.desktopRoutes", role.name).add({
+                tk: needAddIds,
+                transaction
+              });
             }
-            await this.db.getRepository("roles.desktopRoutes", role.name).remove({
-              tk: needRemoveIds,
-              transaction
-            });
           }
         }
         if (mobileRoutes) {
@@ -165,9 +171,9 @@ async function schemaToRoutes(schema, uiSchemas) {
   });
   return Promise.all(result);
 }
-function getNeedRemoveIds(desktopRoutes, menuUiSchemas) {
+function getIds(desktopRoutes, menuUiSchemas) {
   const uidList = menuUiSchemas.map((item) => item["x-uid"]);
-  return desktopRoutes.filter((item) => {
+  const needRemoveIds = desktopRoutes.filter((item) => {
     if (item.type === "tabs") {
       const page = desktopRoutes.find((route) => (route == null ? void 0 : route.id) === (item == null ? void 0 : item.parentId));
       return !uidList.includes(page == null ? void 0 : page.menuSchemaUid);
@@ -177,8 +183,11 @@ function getNeedRemoveIds(desktopRoutes, menuUiSchemas) {
     }
     return !uidList.includes(item == null ? void 0 : item.schemaUid);
   }).map((item) => item == null ? void 0 : item.id);
+  const needAddIds = desktopRoutes.map((item) => item == null ? void 0 : item.id).filter((id) => !needRemoveIds.includes(id));
+  return { needRemoveIds, needAddIds };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getIds,
   schemaToRoutes
 });

package/dist/server/migrations/202502071837-fix-permissions.d.ts

@@ -0,0 +1,17 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    appVersion: string;
+    up(): Promise<void>;
+}
+export declare function getIds(desktopRoutes: any[], menuUiSchemas: any[]): {
+    needRemoveIds: any[];
+    needAddIds: any[];
+};

package/dist/server/migrations/202502071837-fix-permissions.js

@@ -0,0 +1,85 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var fix_permissions_exports = {};
+__export(fix_permissions_exports, {
+  default: () => fix_permissions_default,
+  getIds: () => getIds
+});
+module.exports = __toCommonJS(fix_permissions_exports);
+var import_server = require("@nocobase/server");
+class fix_permissions_default extends import_server.Migration {
+  appVersion = "<1.6.0";
+  async up() {
+    const desktopRoutes = this.db.getRepository("desktopRoutes");
+    const count = await desktopRoutes.count();
+    if (!count) {
+      return;
+    }
+    const rolesRepository = this.db.getRepository("roles");
+    try {
+      await this.db.sequelize.transaction(async (transaction) => {
+        const roles = await rolesRepository.find({
+          appends: ["menuUiSchemas"],
+          transaction
+        });
+        const allDesktopRoutes = await desktopRoutes.find({ transaction });
+        for (const role of roles) {
+          const menuUiSchemas = role.menuUiSchemas || [];
+          const { needAddIds } = getIds(allDesktopRoutes, menuUiSchemas);
+          if (needAddIds.length > 0) {
+            await this.db.getRepository("roles.desktopRoutes", role.name).add({
+              tk: needAddIds,
+              transaction
+            });
+          }
+        }
+      });
+    } catch (error) {
+      console.error("Migration failed:", error);
+      throw error;
+    }
+  }
+}
+function getIds(desktopRoutes, menuUiSchemas) {
+  const uidList = menuUiSchemas.map((item) => item["x-uid"]);
+  const needRemoveIds = desktopRoutes.filter((item) => {
+    if (item.type === "tabs") {
+      const page = desktopRoutes.find((route) => (route == null ? void 0 : route.id) === (item == null ? void 0 : item.parentId));
+      return !uidList.includes(page == null ? void 0 : page.menuSchemaUid);
+    }
+    if (item.type === "page") {
+      return !uidList.includes(item == null ? void 0 : item.menuSchemaUid);
+    }
+    return !uidList.includes(item == null ? void 0 : item.schemaUid);
+  }).map((item) => item == null ? void 0 : item.id);
+  const needAddIds = desktopRoutes.map((item) => item == null ? void 0 : item.id).filter((id) => !needRemoveIds.includes(id));
+  return { needRemoveIds, needAddIds };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getIds
+});

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "1.6.0-alpha.21",
+  "version": "1.6.0-alpha.23",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -20,5 +20,5 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "873cbaec9554e684781b8dc6cfd4386bb5cfa5b0"
+  "gitHead": "34e9bab601ea8364f10730f6da9f132e906b1908"
 }