@nocobase/actions 0.20.0-alpha.9 → 0.21.0-alpha.10

package/lib/actions/move.d.ts

@@ -1,6 +1,6 @@
 import { Model } from 'sequelize';
-import { Context } from '..';
 import { Collection, SortField, TargetKey } from '@nocobase/database';
+import { Context } from '..';
 export declare function move(ctx: Context, next: any): Promise<void>;
 interface MoveOptions {
     insertAfter?: boolean;

package/lib/actions/move.js

@@ -27,22 +27,15 @@ var import_database = require("@nocobase/database");
 var import_utils = require("../utils");
 async function move(ctx, next) {
   const repository = ctx.databaseRepository || (0, import_utils.getRepositoryFromParams)(ctx);
-  const { sourceId, targetId, sortField, targetScope, sticky, method } = ctx.action.params;
+  const { sourceId, targetId, targetScope, sticky, method } = ctx.action.params;
+  let sortField = ctx.action.params.sortField;
   if (repository instanceof import_database.BelongsToManyRepository) {
     throw new Error("Sorting association as 'belongs-to-many' type is not supported.");
   }
-  if (repository instanceof import_database.HasManyRepository) {
-    const hasManyField = repository.sourceCollection.getField(repository.associationName);
-    if (!hasManyField.options.sortable) {
-      throw new Error(
-        `association ${hasManyField.options.name} in ${repository.sourceCollection.name} is not sortable`
-      );
-    }
+  if (repository instanceof import_database.HasManyRepository && !sortField) {
+    sortField = `${repository.association.foreignKey}Sort`;
   }
-  const sortAbleCollection = new SortAbleCollection(
-    repository instanceof import_database.Repository ? repository.collection : repository.targetCollection,
-    repository instanceof import_database.Repository ? sortField : `${repository.association.foreignKey}Sort`
-  );
+  const sortAbleCollection = new SortAbleCollection(repository.collection, sortField);
   if (sourceId && targetId) {
     await sortAbleCollection.move(sourceId, targetId, {
       insertAfter: method === "insertAfter"

package/lib/index.d.ts

@@ -14,5 +14,8 @@ export interface Context extends Koa.Context {
     app: any;
     [key: string]: any;
 }
+/**
+ * @internal
+ */
 export declare function registerActions(api: any): void;
 export default actions;

package/lib/utils.d.ts

@@ -4,5 +4,5 @@ export declare function pageArgsToLimitArgs(page: number, pageSize: number): {
     offset: number;
     limit: number;
 };
-export declare function getRepositoryFromParams(ctx: Context): MultipleRelationRepository | Repository<any, any>;
+export declare function getRepositoryFromParams(ctx: Context): Repository<any, any> | MultipleRelationRepository;
 export declare function RelationRepositoryActionBuilder(method: 'remove' | 'set'): (ctx: Context, next: any) => Promise<void>;

package/lib/utils.js

@@ -31,9 +31,13 @@ function pageArgsToLimitArgs(page, pageSize) {
 }
 __name(pageArgsToLimitArgs, "pageArgsToLimitArgs");
 function getRepositoryFromParams(ctx) {
-  const { resourceName, resourceOf } = ctx.action;
-  if (resourceOf) {
-    return ctx.db.getRepository(resourceName, resourceOf);
+  const { resourceName, sourceId, actionName } = ctx.action;
+  if (sourceId === "_" && ["get", "list"].includes(actionName)) {
+    const collection = ctx.db.getCollection(resourceName);
+    return ctx.db.getRepository(collection.name);
+  }
+  if (sourceId) {
+    return ctx.db.getRepository(resourceName, sourceId);
   }
   return ctx.db.getRepository(resourceName);
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@nocobase/actions",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "0.20.0-alpha.9",
-    "@nocobase/database": "0.20.0-alpha.9",
-    "@nocobase/resourcer": "0.20.0-alpha.9"
+    "@nocobase/cache": "0.21.0-alpha.10",
+    "@nocobase/database": "0.21.0-alpha.10",
+    "@nocobase/resourcer": "0.21.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/actions"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5"
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268"
 }