@nocobase/plugin-workflow-delay 0.19.0-alpha.2 → 0.19.0-alpha.4

package/dist/client/DelayInstruction.d.ts

@@ -34,5 +34,11 @@ export default class extends Instruction {
     components: {
         Duration: typeof Duration;
     };
+    isAvailable({ engine, workflow, upstream, branchIndex }: {
+        engine: any;
+        workflow: any;
+        upstream: any;
+        branchIndex: any;
+    }): boolean;
 }
 export {};

package/dist/client/index.js

@@ -1,4 +1,4 @@
-(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("antd"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","antd","@nocobase/plugin-workflow/client","react-i18next"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e["@nocobase/plugin-workflow-delay"]={},e["@nocobase/client"],e.jsxRuntime,e.antd,e["@nocobase/plugin-workflow"]))})(this,function(e,t,n,p,s){"use strict";var v=Object.defineProperty;var S=(e,t,n)=>t in e?v(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 w=(e,t,n)=>new Promise((p,s)=>{var a=o=>{try{d(n.next(o))}catch(c){s(c)}},f=o=>{try{d(n.throw(o))}catch(c){s(c)}},d=o=>o.done?p(o.value):Promise.resolve(o.value).then(a,f);d((n=n.apply(e,t)).next())});const a="workflow-delay",f=[{value:1e3,label:`{{t('Seconds', { ns: "workflow" })}}`},{value:6e4,label:`{{t('Minutes', { ns: "workflow" })}}`},{value:36e5,label:`{{t('Hours', { ns: "workflow" })}}`},{value:864e5,label:`{{t('Days', { ns: "workflow" })}}`},{value:6048e5,label:`{{t('Weeks', { ns: "workflow" })}}`}];function d(r){return f.slice().reverse().find(u=>!(r%u.value))}function o({value:r=6e4,onChange:u}){const x=t.useCompile(),m=d(r),b=Math.round(r/m.value);return n.jsxs("fieldset",{className:t.css`
+(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("antd"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","antd","@nocobase/plugin-workflow/client","react-i18next"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e["@nocobase/plugin-workflow-delay"]={},e["@nocobase/client"],e.jsxRuntime,e.antd,e["@nocobase/plugin-workflow"]))})(this,function(e,t,n,f,s){"use strict";var v=Object.defineProperty;var h=(e,t,n)=>t in e?v(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n;var r=(e,t,n)=>(h(e,typeof t!="symbol"?t+"":t,n),n);var m=(e,t,n)=>new Promise((f,s)=>{var a=o=>{try{c(n.next(o))}catch(d){s(d)}},w=o=>{try{c(n.throw(o))}catch(d){s(d)}},c=o=>o.done?f(o.value):Promise.resolve(o.value).then(a,w);c((n=n.apply(e,t)).next())});const a="workflow-delay",w=[{value:1e3,label:`{{t('Seconds', { ns: "workflow" })}}`},{value:6e4,label:`{{t('Minutes', { ns: "workflow" })}}`},{value:36e5,label:`{{t('Hours', { ns: "workflow" })}}`},{value:864e5,label:`{{t('Days', { ns: "workflow" })}}`},{value:6048e5,label:`{{t('Weeks', { ns: "workflow" })}}`}];function c(u){return w.slice().reverse().find(i=>!(u%i.value))}function o({value:u=6e4,onChange:i}){const b=t.useCompile(),p=c(u),y=Math.round(u/p.value);return n.jsxs("fieldset",{className:t.css`
         display: flex;
         gap: 0.5em;
-      `,children:[n.jsx(p.InputNumber,{min:1,value:b,onChange:i=>u(Math.round(i*m.value)),className:"auto-width"}),n.jsx(p.Select,{role:"button","data-testid":"select-time-unit",popupMatchSelectWidth:!1,value:m.value,onChange:i=>u(Math.round(b*i)),className:"auto-width",options:f.map(i=>({value:i.value,label:x(i.label)}))})]})}class c extends s.Instruction{constructor(){super(...arguments);l(this,"title",`{{t("Delay", { ns: "${a}" })}}`);l(this,"type","delay");l(this,"group","control");l(this,"description",`{{t("Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.", { ns: "${a}" })}}`);l(this,"fieldset",{duration:{type:"number",title:`{{t("Duration", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"Duration",default:6e4,required:!0},endStatus:{type:"number",title:`{{t("End Status", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"Radio.Group",enum:[{label:`{{t("Succeed and continue", { ns: "${a}" })}}`,value:s.JOB_STATUS.RESOLVED},{label:`{{t("Fail and exit", { ns: "${a}" })}}`,value:s.JOB_STATUS.FAILED}],required:!0,default:s.JOB_STATUS.RESOLVED}});l(this,"components",{Duration:o})}}class y extends t.Plugin{afterAdd(){return w(this,null,function*(){})}beforeLoad(){return w(this,null,function*(){})}load(){return w(this,null,function*(){this.app.pm.get("workflow").registerInstruction("delay",c)})}}e.default=y,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+      `,children:[n.jsx(f.InputNumber,{min:1,value:y,onChange:l=>i(Math.round(l*p.value)),className:"auto-width"}),n.jsx(f.Select,{role:"button","data-testid":"select-time-unit",popupMatchSelectWidth:!1,value:p.value,onChange:l=>i(Math.round(y*l)),className:"auto-width",options:w.map(l=>({value:l.value,label:b(l.label)}))})]})}class d extends s.Instruction{constructor(){super(...arguments);r(this,"title",`{{t("Delay", { ns: "${a}" })}}`);r(this,"type","delay");r(this,"group","control");r(this,"description",`{{t("Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.", { ns: "${a}" })}}`);r(this,"fieldset",{duration:{type:"number",title:`{{t("Duration", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"Duration",default:6e4,required:!0},endStatus:{type:"number",title:`{{t("End status", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"Radio.Group",enum:[{label:`{{t("Succeed and continue", { ns: "${a}" })}}`,value:s.JOB_STATUS.RESOLVED},{label:`{{t("Fail and exit", { ns: "${a}" })}}`,value:s.JOB_STATUS.FAILED}],required:!0,default:s.JOB_STATUS.RESOLVED}});r(this,"components",{Duration:o})}isAvailable({engine:b,workflow:p,upstream:y,branchIndex:l}){return!b.isWorkflowSync(p)}}class x extends t.Plugin{afterAdd(){return m(this,null,function*(){})}beforeLoad(){return m(this,null,function*(){})}load(){return m(this,null,function*(){this.app.pm.get("workflow").registerInstruction("delay",d)})}}e.default=x,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
   "react": "18.2.0",
   "antd": "5.12.8",
-  "@nocobase/client": "0.19.0-alpha.2",
-  "@nocobase/plugin-workflow": "0.19.0-alpha.2",
+  "@nocobase/client": "0.19.0-alpha.4",
+  "@nocobase/plugin-workflow": "0.19.0-alpha.4",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.19.0-alpha.2"
+  "@nocobase/server": "0.19.0-alpha.4"
 };

package/dist/locale/en-US.json

@@ -2,7 +2,7 @@
   "Delay": "Delay",
   "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.",
   "Duration": "Duration",
-  "End Status": "End Status",
+  "End status": "End status",
   "Select status": "Select status",
   "Succeed and continue": "Succeed and continue",
   "Fail and exit": "Fail and exit"

package/dist/locale/es-ES.json

@@ -1,7 +1,7 @@
 {
   "Delay": "Retraso",
   "Duration": "Duración",
-  "End Status": "Estado Final",
+  "End status": "Estado final",
   "Select status": "Seleccionar estado",
   "Succeed and continue": "Éxito y continuar",
   "Fail and exit": "Falla y sale"

package/dist/locale/fr-FR.json

@@ -1,7 +1,7 @@
 {
   "Delay": "Délai",
   "Duration": "Durée",
-  "End Status": "Statut de fin",
+  "End status": "Statut de fin",
   "Select status": "Sélectionner un statut",
   "Succeed and continue": "Réussir et continuer",
   "Fail and exit": "Échouer et quitter"

package/dist/locale/ko_KR.json

@@ -0,0 +1,10 @@
+{
+  "Delay": "지연",
+  "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.":
+    "일정 시간 동안 지연한 다음 프로세스를 계속하거나 종료합니다. 병렬 분기에서 대기 또는 타임아웃 시간을 설정하는 데 사용할 수 있습니다.",
+  "Duration": "기간",
+  "End Status": "종료 상태",
+  "Select status": "상태 선택",
+  "Succeed and continue": "성공하고 계속",
+  "Fail and exit": "실패하고 종료"  
+}

package/dist/locale/pt-BR.json

@@ -1,7 +1,7 @@
 {
   "Delay": "Atraso",
   "Duration": "Duração",
-  "End Status": "Status final",
+  "End status": "Status final",
   "Select status": "Selecionar status",
   "Succeed and continue": "Ter sucesso e continuar",
   "Fail and exit": "Falhar e sair"

package/dist/locale/zh-CN.json

@@ -2,7 +2,7 @@
   "Delay": "延时",
   "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "延时一段时间，然后继续或退出流程。可以用于并行分支中等待其他分支或设置超时时间。",
   "Duration": "时长",
-  "End Status": "到时状态",
+  "End status": "到时状态",
   "Select status": "选择状态",
   "Succeed and continue": "通过并继续",
   "Fail and exit": "失败并退出"

package/dist/server/DelayInstruction.js

@@ -91,6 +91,7 @@ class DelayInstruction_default extends import_plugin_workflow.Instruction {
       status: import_plugin_workflow.JOB_STATUS.PENDING,
       result: null,
       nodeId: node.id,
+      nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
     job.node = node;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "0.19.0-alpha.2",
+  "version": "0.19.0-alpha.4",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -19,5 +19,5 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "cff5b77ecf12ccdb450d50d505b3aa44a68478c8"
+  "gitHead": "9583023f7bea828da5192384a5c002782c341b65"
 }

package/src/client/DelayInstruction.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { InputNumber, Select } from 'antd';
-import { css, useCompile } from '@nocobase/client';
-import { Instruction, JOB_STATUS } from '@nocobase/plugin-workflow/client';
+import { css, useCompile, usePlugin } from '@nocobase/client';
+import WorkflowPlugin, { Instruction, JOB_STATUS } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../locale';
 
@@ -70,7 +70,7 @@ export default class extends Instruction {
     },
     endStatus: {
       type: 'number',
-      title: `{{t("End Status", { ns: "${NAMESPACE}" })}}`,
+      title: `{{t("End status", { ns: "${NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Radio.Group',
       enum: [
@@ -84,4 +84,7 @@ export default class extends Instruction {
   components = {
     Duration,
   };
+  isAvailable({ engine, workflow, upstream, branchIndex }) {
+    return !engine.isWorkflowSync(workflow);
+  }
 }

package/src/locale/en-US.json

@@ -2,7 +2,7 @@
   "Delay": "Delay",
   "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.",
   "Duration": "Duration",
-  "End Status": "End Status",
+  "End status": "End status",
   "Select status": "Select status",
   "Succeed and continue": "Succeed and continue",
   "Fail and exit": "Fail and exit"

package/src/locale/es-ES.json

@@ -1,7 +1,7 @@
 {
   "Delay": "Retraso",
   "Duration": "Duración",
-  "End Status": "Estado Final",
+  "End status": "Estado final",
   "Select status": "Seleccionar estado",
   "Succeed and continue": "Éxito y continuar",
   "Fail and exit": "Falla y sale"

package/src/locale/fr-FR.json

@@ -1,7 +1,7 @@
 {
   "Delay": "Délai",
   "Duration": "Durée",
-  "End Status": "Statut de fin",
+  "End status": "Statut de fin",
   "Select status": "Sélectionner un statut",
   "Succeed and continue": "Réussir et continuer",
   "Fail and exit": "Échouer et quitter"

package/src/locale/ko_KR.json

@@ -0,0 +1,10 @@
+{
+  "Delay": "지연",
+  "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.":
+    "일정 시간 동안 지연한 다음 프로세스를 계속하거나 종료합니다. 병렬 분기에서 대기 또는 타임아웃 시간을 설정하는 데 사용할 수 있습니다.",
+  "Duration": "기간",
+  "End Status": "종료 상태",
+  "Select status": "상태 선택",
+  "Succeed and continue": "성공하고 계속",
+  "Fail and exit": "실패하고 종료"  
+}

package/src/locale/pt-BR.json

@@ -1,7 +1,7 @@
 {
   "Delay": "Atraso",
   "Duration": "Duração",
-  "End Status": "Status final",
+  "End status": "Status final",
   "Select status": "Selecionar status",
   "Succeed and continue": "Ter sucesso e continuar",
   "Fail and exit": "Falhar e sair"

package/src/locale/zh-CN.json

@@ -2,7 +2,7 @@
   "Delay": "延时",
   "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "延时一段时间，然后继续或退出流程。可以用于并行分支中等待其他分支或设置超时时间。",
   "Duration": "时长",
-  "End Status": "到时状态",
+  "End status": "到时状态",
   "Select status": "选择状态",
   "Succeed and continue": "通过并继续",
   "Fail and exit": "失败并退出"

package/src/server/DelayInstruction.ts

@@ -91,6 +91,7 @@ export default class extends Instruction {
       status: JOB_STATUS.PENDING,
       result: null,
       nodeId: node.id,
+      nodeKey: node.key,
       upstreamId: prevJob?.id ?? null,
     });
     job.node = node;

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

@@ -86,7 +86,7 @@ describe('workflow > instructions > delay', () => {
       expect(j2.status).toBe(JOB_STATUS.FAILED);
     });
 
-    it('delay to resolve and rollback in downstream node', async () => {
+    it('delay to resolve and downstream node error', async () => {
       const n1 = await workflow.createNode({
         type: 'delay',
         config: {
@@ -97,11 +97,9 @@ describe('workflow > instructions > delay', () => {
       const n2 = await workflow.createNode({
         type: 'create',
         config: {
-          collection: 'comment',
+          collection: 'notExistsTable',
           params: {
-            values: {
-              status: 'should be number but use string to raise an error',
-            },
+            values: {},
           },
         },
         upstreamId: n1.id,