diff --git a/packages/plugins/@nocobase/plugin-field-sort/src/server/action.ts b/packages/plugins/@nocobase/plugin-field-sort/src/server/action.ts index 3ceef484c4..f01435bc1d 100644 --- a/packages/plugins/@nocobase/plugin-field-sort/src/server/action.ts +++ b/packages/plugins/@nocobase/plugin-field-sort/src/server/action.ts @@ -7,9 +7,9 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ +import { pick } from 'lodash'; import { BelongsToManyRepository, Collection, HasManyRepository, TargetKey, Model, Op } from '@nocobase/database'; import { Context } from '@nocobase/actions'; -import { pick } from 'lodash'; import { SortField } from './sort-field'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts index 7775f3c122..8a5b3aae62 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts @@ -164,6 +164,36 @@ describe('workflow > triggers > collection', () => { }); describe('config.mode', () => { + it('update by move action', async () => { + db.getCollection('posts').addField('sort', { + type: 'sort', + name: 'sort', + }); + await db.sync(); + const p1 = await PostRepo.create({ values: { title: 't1' } }); + const p2 = await PostRepo.create({ values: { title: 't2' } }); + + const workflow = await WorkflowModel.create({ + enabled: true, + type: 'collection', + config: { + mode: 2, + collection: 'posts', + }, + }); + + const response = await agent.resource('posts').move({ + sourceId: p1.id, + targetId: p2.id, + }); + + await sleep(500); + + const e1s = await workflow.getExecutions(); + expect(e1s.length).toBe(1); + expect(e1s[0].status).toBe(EXECUTION_STATUS.RESOLVED); + }); + it('mode in "update or create" could trigger on each', async () => { const workflow = await WorkflowModel.create({ enabled: true,