@nocobase/plugin-workflow-manual 1.9.0-beta.17 → 1.9.0-beta.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -47,12 +47,10 @@ var import_constants = require("../common/constants");
47
47
  class Plugin_default extends import_server.Plugin {
48
48
  onTaskSave = async (task, { transaction }) => {
49
49
  const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
50
- const workflowId = Array.from(workflowPlugin.enabledCache.keys());
51
50
  const ModelClass = task.constructor;
52
51
  const pending = await ModelClass.count({
53
52
  where: {
54
53
  userId: task.userId,
55
- workflowId,
56
54
  status: import_constants.TASK_STATUS.PENDING
57
55
  },
58
56
  include: [
@@ -71,8 +69,7 @@ class Plugin_default extends import_server.Plugin {
71
69
  });
72
70
  const all = await ModelClass.count({
73
71
  where: {
74
- userId: task.userId,
75
- workflowId
72
+ userId: task.userId
76
73
  },
77
74
  col: "id",
78
75
  transaction
@@ -113,8 +110,7 @@ class Plugin_default extends import_server.Plugin {
113
110
  const pendingCounts = await WorkflowManualTaskModel.count({
114
111
  where: {
115
112
  status: import_constants.TASK_STATUS.PENDING,
116
- userId,
117
- workflowId: execution.workflowId
113
+ userId
118
114
  },
119
115
  include: [
120
116
  {
@@ -132,8 +128,7 @@ class Plugin_default extends import_server.Plugin {
132
128
  });
133
129
  const allCounts = await WorkflowManualTaskModel.count({
134
130
  where: {
135
- userId,
136
- workflowId: execution.workflowId
131
+ userId
137
132
  },
138
133
  col: "id",
139
134
  group: ["userId"],
@@ -261,7 +256,7 @@ class Plugin_default extends import_server.Plugin {
261
256
  name: "workflowManualTasks",
262
257
  actions: jobActions
263
258
  });
264
- this.app.acl.allow("workflowManualTasks", ["list", "listMine", "get", "submit"], "loggedIn");
259
+ this.app.acl.allow("workflowManualTasks", ["listMine", "get", "submit"], "loggedIn");
265
260
  const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
266
261
  workflowPlugin.registerInstruction("manual", import_ManualInstruction.default);
267
262
  this.db.on("workflowManualTasks.afterSave", this.onTaskSave);
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  "description": "Could be used for workflows which some of decisions are made by users.",
7
7
  "description.ru-RU": "Может использоваться в рабочих процессах, где какие-то решения принимаются пользователями.",
8
8
  "description.zh-CN": "用于人工控制部分决策的流程。",
9
- "version": "1.9.0-beta.17",
9
+ "version": "1.9.0-beta.18",
10
10
  "license": "AGPL-3.0",
11
11
  "main": "./dist/server/index.js",
12
12
  "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -33,7 +33,7 @@
33
33
  "@nocobase/test": "1.x",
34
34
  "@nocobase/utils": "1.x"
35
35
  },
36
- "gitHead": "4f95b676235fa3f7583493412279d8132a20c4d0",
36
+ "gitHead": "1c211ab8c30d9442c38d07e2ebef2c2935e0fbac",
37
37
  "keywords": [
38
38
  "Workflow"
39
39
  ]