@nocobase/plugin-workflow-parallel 0.17.0-alpha.7 → 0.18.0-alpha.8

package/dist/client/index.js

@@ -1,4 +1,4 @@
-(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react/jsx-runtime"),require("react"),require("antd"),require("@ant-design/icons"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","react/jsx-runtime","react","antd","@ant-design/icons","react-i18next"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e["@nocobase/plugin-workflow-parallel"]={},e["@nocobase/client"],e["@nocobase/plugin-workflow"],e.jsxRuntime,e.react,e.antd,e["@ant-design/icons"],e["react-i18next"]))})(this,function(e,t,n,a,f,d,b,u){"use strict";var M=Object.defineProperty;var S=(e,t,n)=>t in e?M(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n;var l=(e,t,n)=>(S(e,typeof t!="symbol"?t+"":t,n),n);var m=(e,t,n)=>new Promise((a,f)=>{var d=s=>{try{u(n.next(s))}catch(p){f(p)}},b=s=>{try{u(n.throw(s))}catch(p){f(p)}},u=s=>s.done?a(s.value):Promise.resolve(s.value).then(d,b);u((n=n.apply(e,t)).next())});const s="workflow-parallel";function p(h,x={}){const{t:r}=v(x);return r(h)}function v(h){return u.useTranslation(s,h)}class $ extends n.Instruction{constructor(){super(...arguments);l(this,"title",`{{t("Parallel branch", { ns: "${s}" })}}`);l(this,"type","parallel");l(this,"group","control");l(this,"description",`{{t("Run multiple branch processes in parallel.", { ns: "${s}" })}}`);l(this,"fieldset",{mode:{type:"string",title:`{{t("Mode", { ns: "${s}" })}}`,"x-decorator":"FormItem","x-component":"RadioWithTooltip","x-component-props":{options:[{value:"all",label:`{{t('All succeeded', { ns: "${s}" })}}`,tooltip:`{{t('Continue after all branches succeeded', { ns: "${s}" })}}`},{value:"any",label:`{{t('Any succeeded', { ns: "${s}" })}}`,tooltip:`{{t('Continue after any branch succeeded', { ns: "${s}" })}}`},{value:"race",label:`{{t('Any succeeded or failed', { ns: "${s}" })}}`,tooltip:`{{t('Continue after any branch succeeded, or exit after any branch failed.', { ns: "${s}" })}}`}]},default:"all"}});l(this,"components",{RadioWithTooltip:n.RadioWithTooltip})}Component({data:r}){const{styles:A}=n.useStyles(),{id:w,config:{mode:L}}=r,{workflow:y,nodes:T}=n.useFlowContext(),i=T.reduce((o,c)=>c.upstreamId===w&&c.branchIndex!=null?o.concat(c):o,[]).sort((o,c)=>o.branchIndex-c.branchIndex),[g,C]=f.useState(Math.max(2,i.length)),{getAriaLabel:q}=n.useGetAriaLabelOfAddButton(r),N=p("Add branch"),j=Array(Math.max(0,g-i.length)).fill(null),I=i[i.length-1];return a.jsx(n.NodeDefaultView,{data:r,children:a.jsxs("div",{className:A.nodeSubtreeClass,children:[a.jsxs("div",{className:A.branchBlockClass,children:[i.map(o=>a.jsx(n.Branch,{from:r,entry:o,branchIndex:o.branchIndex},o.id)),j.map((o,c)=>a.jsx(n.Branch,{from:r,branchIndex:(I?I.branchIndex:0)+c+1,controller:i.length+c>1?a.jsx("div",{className:t.css`
+(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react/jsx-runtime"),require("react"),require("antd"),require("@ant-design/icons"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","react/jsx-runtime","react","antd","@ant-design/icons","react-i18next"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e["@nocobase/plugin-workflow-parallel"]={},e["@nocobase/client"],e["@nocobase/plugin-workflow"],e.jsxRuntime,e.react,e.antd,e["@ant-design/icons"],e["react-i18next"]))})(this,function(e,t,n,r,f,d,b,u){"use strict";var M=Object.defineProperty;var S=(e,t,n)=>t in e?M(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n;var l=(e,t,n)=>(S(e,typeof t!="symbol"?t+"":t,n),n);var x=(e,t,n)=>new Promise((r,f)=>{var d=a=>{try{u(n.next(a))}catch(p){f(p)}},b=a=>{try{u(n.throw(a))}catch(p){f(p)}},u=a=>a.done?r(a.value):Promise.resolve(a.value).then(d,b);u((n=n.apply(e,t)).next())});const a="workflow-parallel";function p(h,m={}){const{t:c}=v(m);return c(h)}function v(h){return u.useTranslation(a,h)}class $ extends n.Instruction{constructor(){super(...arguments);l(this,"title",`{{t("Parallel branch", { ns: "${a}" })}}`);l(this,"type","parallel");l(this,"group","control");l(this,"description",`{{t("Run multiple branch processes in parallel.", { ns: "${a}" })}}`);l(this,"fieldset",{mode:{type:"string",title:`{{t("Mode", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"RadioWithTooltip","x-component-props":{options:[{value:"all",label:`{{t('All succeeded', { ns: "${a}" })}}`,tooltip:`{{t('Continue after all branches succeeded', { ns: "${a}" })}}`},{value:"any",label:`{{t('Any succeeded', { ns: "${a}" })}}`,tooltip:`{{t('Continue after any branch succeeded', { ns: "${a}" })}}`},{value:"race",label:`{{t('Any succeeded or failed', { ns: "${a}" })}}`,tooltip:`{{t('Continue after any branch succeeded, or exit after any branch failed.', { ns: "${a}" })}}`}]},default:"all"}});l(this,"components",{RadioWithTooltip:n.RadioWithTooltip})}Component({data:c}){const{styles:A}=n.useStyles(),{id:B,config:{mode:L}}=c,{workflow:y,nodes:T}=n.useFlowContext(),i=T.reduce((s,o)=>o.upstreamId===B&&o.branchIndex!=null?s.concat(o):s,[]).sort((s,o)=>s.branchIndex-o.branchIndex),[g,C]=f.useState(Math.max(2,i.length)),{getAriaLabel:q}=n.useGetAriaLabelOfAddButton(c),N=p("Add branch"),j=Array(Math.max(0,g-i.length)).fill(null),I=i[i.length-1];return r.jsx(n.NodeDefaultView,{data:c,children:r.jsxs("div",{className:A.nodeSubtreeClass,children:[r.jsxs("div",{className:A.branchBlockClass,children:[i.map(s=>r.jsx(n.Branch,{from:c,entry:s,branchIndex:s.branchIndex},s.id)),j.map((s,o)=>r.jsx(n.Branch,{from:c,branchIndex:(I?I.branchIndex:0)+o+1,controller:i.length+o>1?r.jsx("div",{className:t.css`
                         padding-top: 2em;
 
                         > button {
@@ -6,9 +6,9 @@
                             transform: rotate(45deg);
                           }
                         }
-                      `,children:a.jsx(d.Button,{shape:"circle",icon:a.jsx(b.PlusOutlined,{}),onClick:()=>C(g-1),disabled:y.executed})}):null},`temp_${i.length+c}`))]}),a.jsx(d.Tooltip,{title:N,className:t.css`
+                      `,children:r.jsx(d.Button,{shape:"circle",icon:r.jsx(b.PlusOutlined,{}),onClick:()=>C(g-1),disabled:y.executed})}):null},`temp_${i.length+o}`))]}),r.jsx(d.Tooltip,{title:N,className:t.css`
               visibility: ${y.executed?"hidden":"visible"};
-            `,children:a.jsx(d.Button,{"aria-label":q("add-branch"),icon:a.jsx(b.PlusOutlined,{}),className:t.css`
+            `,children:r.jsx(d.Button,{"aria-label":q("add-branch"),icon:r.jsx(b.PlusOutlined,{}),className:t.css`
                 position: relative;
                 top: 1em;
                 transform-origin: center;
@@ -18,4 +18,4 @@
                   transform-origin: center;
                   transform: rotate(-45deg);
                 }
-              `,onClick:()=>C(g+1),disabled:y.executed})})]})})}}class B extends t.Plugin{afterAdd(){return m(this,null,function*(){})}beforeLoad(){return m(this,null,function*(){})}load(){return m(this,null,function*(){const x=this.app.pm.get(n),r=new $;x.instructions.register(r.type,r)})}}e.default=B,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+              `,onClick:()=>C(g+1),disabled:y.executed})})]})})}}class w extends t.Plugin{afterAdd(){return x(this,null,function*(){})}beforeLoad(){return x(this,null,function*(){})}load(){return x(this,null,function*(){this.app.pm.get(n).registerInstruction("parallel",$)})}}e.default=w,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,9 +1,9 @@
 module.exports = {
   "react": "18.2.0",
-  "antd": "5.8.6",
-  "@ant-design/icons": "5.1.4",
-  "@nocobase/client": "0.17.0-alpha.7",
-  "@nocobase/plugin-workflow": "0.17.0-alpha.7",
+  "antd": "5.12.2",
+  "@ant-design/icons": "5.2.6",
+  "@nocobase/client": "0.18.0-alpha.8",
+  "@nocobase/plugin-workflow": "0.18.0-alpha.8",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.17.0-alpha.7"
+  "@nocobase/server": "0.18.0-alpha.8"
 };

package/dist/server/ParallelInstruction.js

@@ -112,7 +112,7 @@ class ParallelInstruction_default extends import_plugin_workflow.Instruction {
       status: Modes[mode].getStatus(newResult)
     });
     if (job.status === import_plugin_workflow.JOB_STATUS.PENDING) {
-      await job.save({ transaction: processor.transaction });
+      await job.save();
       return processor.exit();
     }
     return job;

package/dist/server/Plugin.d.ts

@@ -1,6 +1,4 @@
 import { Plugin } from '@nocobase/server';
-import WorkflowPlugin from '@nocobase/plugin-workflow';
 export default class extends Plugin {
-    workflow: WorkflowPlugin;
     load(): Promise<void>;
 }

package/dist/server/Plugin.js

@@ -31,12 +31,11 @@ __export(Plugin_exports, {
 });
 module.exports = __toCommonJS(Plugin_exports);
 var import_server = require("@nocobase/server");
+var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
 var import_ParallelInstruction = __toESM(require("./ParallelInstruction"));
 class Plugin_default extends import_server.Plugin {
-  workflow;
   async load() {
-    const workflowPlugin = this.app.getPlugin("workflow");
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register("parallel", new import_ParallelInstruction.default(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin(import_plugin_workflow.default);
+    workflowPlugin.registerInstruction("parallel", import_ParallelInstruction.default);
   }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "0.17.0-alpha.7",
+  "version": "0.18.0-alpha.8",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -17,9 +17,8 @@
     "@nocobase/client": "0.x",
     "@nocobase/database": "0.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
-    "@nocobase/plugin-workflow-test": ">=0.17.0-alpha.3",
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "91377a3abd1124f79fb3819f2d0e80905e091a32"
+  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
 }

package/src/client/index.ts

@@ -13,7 +13,6 @@ export default class extends Plugin {
   // You can get and modify the app instance here
   async load() {
     const workflow = this.app.pm.get(WorkflowPlugin);
-    const parallelInstruction = new ParallelInstruction();
-    workflow.instructions.register(parallelInstruction.type, parallelInstruction);
+    workflow.registerInstruction('parallel', ParallelInstruction);
   }
 }

package/src/server/ParallelInstruction.ts

@@ -110,7 +110,7 @@ export default class extends Instruction {
     });
 
     if (job.status === JOB_STATUS.PENDING) {
-      await job.save({ transaction: processor.transaction });
+      await job.save();
       return processor.exit();
     }
 

package/src/server/Plugin.ts

@@ -4,11 +4,8 @@ import WorkflowPlugin from '@nocobase/plugin-workflow';
 import ParallelInstruction from './ParallelInstruction';
 
 export default class extends Plugin {
-  workflow: WorkflowPlugin;
-
   async load() {
-    const workflowPlugin = this.app.getPlugin('workflow') as WorkflowPlugin;
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register('parallel', new ParallelInstruction(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin<WorkflowPlugin>(WorkflowPlugin);
+    workflowPlugin.registerInstruction('parallel', ParallelInstruction);
   }
 }

package/src/server/__tests__/instruction.test.ts

@@ -1,6 +1,6 @@
 import Database from '@nocobase/database';
 import { Application } from '@nocobase/server';
-import { BRANCH_INDEX, EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
 
 import Plugin from '..';
@@ -453,7 +453,7 @@ describe('workflow > instructions > parallel', () => {
 
       const n2 = await workflow.createNode({
         type: 'parallel',
-        branchIndex: BRANCH_INDEX.ON_TRUE,
+        branchIndex: 1,
         upstreamId: n1.id,
       });
 
@@ -521,7 +521,7 @@ describe('workflow > instructions > parallel', () => {
       const n4 = await workflow.createNode({
         type: 'echo',
         upstreamId: n3.id,
-        branchIndex: BRANCH_INDEX.ON_TRUE,
+        branchIndex: 1,
       });
 
       const n5 = await workflow.createNode({