@nocobase/actions 1.5.0-beta.1 → 1.6.0-alpha.2

package/lib/actions/index.d.ts

@@ -15,6 +15,5 @@ export * from './add';
 export * from './set';
 export * from './remove';
 export * from './toggle';
-export * from './move';
 export * from './first-or-create';
 export * from './update-or-create';

package/lib/actions/index.js

@@ -32,7 +32,6 @@ __reExport(actions_exports, require("./add"), module.exports);
 __reExport(actions_exports, require("./set"), module.exports);
 __reExport(actions_exports, require("./remove"), module.exports);
 __reExport(actions_exports, require("./toggle"), module.exports);
-__reExport(actions_exports, require("./move"), module.exports);
 __reExport(actions_exports, require("./first-or-create"), module.exports);
 __reExport(actions_exports, require("./update-or-create"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
@@ -46,7 +45,6 @@ __reExport(actions_exports, require("./update-or-create"), module.exports);
   ...require("./set"),
   ...require("./remove"),
   ...require("./toggle"),
-  ...require("./move"),
   ...require("./first-or-create"),
   ...require("./update-or-create")
 });

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@nocobase/actions",
-  "version": "1.5.0-beta.1",
+  "version": "1.6.0-alpha.2",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.5.0-beta.1",
-    "@nocobase/database": "1.5.0-beta.1",
-    "@nocobase/resourcer": "1.5.0-beta.1"
+    "@nocobase/cache": "1.6.0-alpha.2",
+    "@nocobase/database": "1.6.0-alpha.2",
+    "@nocobase/resourcer": "1.6.0-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/actions"
   },
-  "gitHead": "10c6f1f3d90e91f3aabfa80449c7ef062e90f6af"
+  "gitHead": "08bbc34c21727fc0ad0880f397a42bf7741091ee"
 }

package/lib/actions/move.d.ts

@@ -1,26 +0,0 @@
-/**
- * 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 { Model } from 'sequelize';
-import { Collection, SortField, TargetKey } from '@nocobase/database';
-import { Context } from '..';
-export declare function move(ctx: Context, next: any): Promise<void>;
-interface MoveOptions {
-    insertAfter?: boolean;
-}
-export declare class SortAbleCollection {
-    collection: Collection;
-    field: SortField;
-    scopeKey: string;
-    constructor(collection: Collection, fieldName?: string);
-    move(sourceInstanceId: TargetKey, targetInstanceId: TargetKey, options?: MoveOptions): Promise<void>;
-    changeScope(sourceInstanceId: TargetKey, targetScope: any, method?: string): Promise<void>;
-    sticky(sourceInstanceId: TargetKey): Promise<void>;
-    sameScopeMove(sourceInstance: Model, targetInstance: Model, options: MoveOptions): Promise<void>;
-}
-export {};

package/lib/actions/move.js

@@ -1,166 +0,0 @@
-/**
- * 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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-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 move_exports = {};
-__export(move_exports, {
-  SortAbleCollection: () => SortAbleCollection,
-  move: () => move
-});
-module.exports = __toCommonJS(move_exports);
-var import_sequelize = require("sequelize");
-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, 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 && !sortField) {
-    sortField = `${repository.association.foreignKey}Sort`;
-  }
-  const sortAbleCollection = new SortAbleCollection(repository.collection, sortField);
-  if (sourceId && targetId) {
-    await sortAbleCollection.move(sourceId, targetId, {
-      insertAfter: method === "insertAfter"
-    });
-  }
-  if (sourceId && targetScope) {
-    await sortAbleCollection.changeScope(sourceId, targetScope, method);
-  }
-  if (sourceId && sticky) {
-    await sortAbleCollection.sticky(sourceId);
-  }
-  ctx.body = "ok";
-  await next();
-}
-__name(move, "move");
-const _SortAbleCollection = class _SortAbleCollection {
-  collection;
-  field;
-  scopeKey;
-  constructor(collection, fieldName = "sort") {
-    this.collection = collection;
-    this.field = collection.getField(fieldName);
-    if (!(this.field instanceof import_database.SortField)) {
-      throw new Error(`${fieldName} is not a sort field`);
-    }
-    this.scopeKey = this.field.get("scopeKey");
-  }
-  // insert source position to target position
-  async move(sourceInstanceId, targetInstanceId, options = {}) {
-    const sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
-    const targetInstance = await this.collection.repository.findByTargetKey(targetInstanceId);
-    if (this.scopeKey && sourceInstance.get(this.scopeKey) !== targetInstance.get(this.scopeKey)) {
-      await sourceInstance.update({
-        [this.scopeKey]: targetInstance.get(this.scopeKey)
-      });
-    }
-    await this.sameScopeMove(sourceInstance, targetInstance, options);
-  }
-  async changeScope(sourceInstanceId, targetScope, method) {
-    const sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
-    const targetScopeValue = targetScope[this.scopeKey];
-    if (targetScopeValue && sourceInstance.get(this.scopeKey) !== targetScopeValue) {
-      await sourceInstance.update(
-        {
-          [this.scopeKey]: targetScopeValue
-        },
-        {
-          silent: false
-        }
-      );
-      if (method === "prepend") {
-        await this.sticky(sourceInstanceId);
-      }
-    }
-  }
-  async sticky(sourceInstanceId) {
-    const sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
-    await sourceInstance.update(
-      {
-        [this.field.get("name")]: 0
-      },
-      {
-        silent: true
-      }
-    );
-  }
-  async sameScopeMove(sourceInstance, targetInstance, options) {
-    const fieldName = this.field.get("name");
-    const sourceSort = sourceInstance.get(fieldName);
-    let targetSort = targetInstance.get(fieldName);
-    if (options.insertAfter) {
-      targetSort = targetSort + 1;
-    }
-    const scopeValue = this.scopeKey ? sourceInstance.get(this.scopeKey) : null;
-    let updateCondition;
-    let change;
-    if (targetSort > sourceSort) {
-      updateCondition = {
-        [import_sequelize.Op.gt]: sourceSort,
-        [import_sequelize.Op.lte]: targetSort
-      };
-      change = -1;
-    } else {
-      updateCondition = {
-        [import_sequelize.Op.lt]: sourceSort,
-        [import_sequelize.Op.gte]: targetSort
-      };
-      change = 1;
-    }
-    const where = {
-      [fieldName]: updateCondition
-    };
-    if (scopeValue) {
-      where[this.scopeKey] = {
-        [import_sequelize.Op.eq]: scopeValue
-      };
-    }
-    await this.collection.model.increment(fieldName, {
-      where,
-      by: change,
-      silent: true
-    });
-    await sourceInstance.update(
-      {
-        [fieldName]: targetSort
-      },
-      {
-        silent: true
-      }
-    );
-  }
-};
-__name(_SortAbleCollection, "SortAbleCollection");
-let SortAbleCollection = _SortAbleCollection;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SortAbleCollection,
-  move
-});