@nocobase/server 1.6.0-alpha.2 → 1.6.0-alpha.3

package/lib/middlewares/validate-filter-params.d.ts

@@ -6,4 +6,4 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export default function validateFilterParams(ctx: any, next: any): Promise<void>;
+export default function validateFilterParams(ctx: any, next: any): Promise<any>;

package/lib/middlewares/validate-filter-params.js

@@ -34,9 +34,35 @@ var import_utils = require("@nocobase/utils");
 async function validateFilterParams(ctx, next) {
   const { params } = ctx.action;
   const guardedActions = ["update", "destroy"];
+  const { actionName } = params;
+  if (skipValidate(params)) {
+    return await next();
+  }
+  if (emptyFilter(params) && emptyFilterByTk(params)) {
+    throw new Error(`to do ${actionName} action, filter or filterByTk is required`);
+  }
   if (params.filter && !(0, import_utils.isValidFilter)(params.filter) && guardedActions.includes(params.actionName)) {
     throw new Error(`Invalid filter: ${JSON.stringify(params.filter)}`);
   }
   await next();
 }
 __name(validateFilterParams, "validateFilterParams");
+function emptyFilter(params) {
+  return !(0, import_utils.isValidFilter)(params.filter);
+}
+__name(emptyFilter, "emptyFilter");
+function emptyFilterByTk(params) {
+  return !params.filterByTk;
+}
+__name(emptyFilterByTk, "emptyFilterByTk");
+function skipValidate(actionParams) {
+  const { actionName } = actionParams;
+  if (actionName === "update") {
+    return actionParams.forceUpdate;
+  }
+  if (actionName === "destroy") {
+    return actionParams.truncate;
+  }
+  return true;
+}
+__name(skipValidate, "skipValidate");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.6.0-alpha.2",
+    "version": "1.6.0-alpha.3",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.6.0-alpha.2",
-        "@nocobase/actions": "1.6.0-alpha.2",
-        "@nocobase/auth": "1.6.0-alpha.2",
-        "@nocobase/cache": "1.6.0-alpha.2",
-        "@nocobase/data-source-manager": "1.6.0-alpha.2",
-        "@nocobase/database": "1.6.0-alpha.2",
-        "@nocobase/evaluators": "1.6.0-alpha.2",
-        "@nocobase/lock-manager": "1.6.0-alpha.2",
-        "@nocobase/logger": "1.6.0-alpha.2",
-        "@nocobase/resourcer": "1.6.0-alpha.2",
-        "@nocobase/sdk": "1.6.0-alpha.2",
-        "@nocobase/telemetry": "1.6.0-alpha.2",
-        "@nocobase/utils": "1.6.0-alpha.2",
+        "@nocobase/acl": "1.6.0-alpha.3",
+        "@nocobase/actions": "1.6.0-alpha.3",
+        "@nocobase/auth": "1.6.0-alpha.3",
+        "@nocobase/cache": "1.6.0-alpha.3",
+        "@nocobase/data-source-manager": "1.6.0-alpha.3",
+        "@nocobase/database": "1.6.0-alpha.3",
+        "@nocobase/evaluators": "1.6.0-alpha.3",
+        "@nocobase/lock-manager": "1.6.0-alpha.3",
+        "@nocobase/logger": "1.6.0-alpha.3",
+        "@nocobase/resourcer": "1.6.0-alpha.3",
+        "@nocobase/sdk": "1.6.0-alpha.3",
+        "@nocobase/telemetry": "1.6.0-alpha.3",
+        "@nocobase/utils": "1.6.0-alpha.3",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -56,5 +56,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "08bbc34c21727fc0ad0880f397a42bf7741091ee"
+    "gitHead": "205b4aca5556d5af70679fa401394943a9e51670"
 }