@nocobase/plugin-workflow-delay 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("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 r=(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{c(n.next(o))}catch(d){s(d)}},f=o=>{try{c(n.throw(o))}catch(d){s(d)}},c=o=>o.done?p(o.value):Promise.resolve(o.value).then(a,f);c((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 c(u){return f.slice().reverse().find(l=>!(u%l.value))}function o({value:u=6e4,onChange:l}){const m=t.useCompile(),b=c(u),y=Math.round(u/b.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,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`
         display: flex;
         gap: 0.5em;
-      `,children:[n.jsx(p.InputNumber,{min:1,value:y,onChange:i=>l(Math.round(i*b.value)),className:"auto-width"}),n.jsx(p.Select,{role:"button","data-testid":"select-time-unit",popupMatchSelectWidth:!1,value:b.value,onChange:i=>l(Math.round(y*i)),className:"auto-width",options:f.map(i=>({value:i.value,label:m(i.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})}}class x extends t.Plugin{afterAdd(){return w(this,null,function*(){})}beforeLoad(){return w(this,null,function*(){})}load(){return w(this,null,function*(){const l=this.app.pm.get("workflow"),m=new d;l.instructions.register(m.type,m)})}}e.default=x,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+      `,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"}})});

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
   "react": "18.2.0",
-  "antd": "5.8.6",
-  "@nocobase/client": "0.17.0-alpha.7",
-  "@nocobase/plugin-workflow": "0.17.0-alpha.7",
+  "antd": "5.12.2",
+  "@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/DelayInstruction.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import WorkflowPlugin, { Processor, Instruction } from '@nocobase/plugin-workflow';
 export default class extends Instruction {
-    plugin: WorkflowPlugin;
+    workflow: WorkflowPlugin;
     timers: Map<number, NodeJS.Timeout>;
-    constructor(plugin: WorkflowPlugin);
+    constructor(workflow: WorkflowPlugin);
     load: () => Promise<void>;
     unload: () => void;
     schedule(job: any): void;

package/dist/server/DelayInstruction.js

@@ -22,15 +22,15 @@ __export(DelayInstruction_exports, {
 module.exports = __toCommonJS(DelayInstruction_exports);
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 class DelayInstruction_default extends import_plugin_workflow.Instruction {
-  constructor(plugin) {
-    super(plugin);
-    this.plugin = plugin;
-    plugin.app.on("afterStart", this.load);
-    plugin.app.on("beforeStop", this.unload);
+  constructor(workflow) {
+    super(workflow);
+    this.workflow = workflow;
+    workflow.app.on("afterStart", this.load);
+    workflow.app.on("beforeStop", this.unload);
   }
   timers = /* @__PURE__ */ new Map();
   load = async () => {
-    const { model } = this.plugin.db.getCollection("jobs");
+    const { model } = this.workflow.app.db.getCollection("jobs");
     const jobs = await model.findAll({
       where: {
         status: import_plugin_workflow.JOB_STATUS.PENDING
@@ -80,7 +80,7 @@ class DelayInstruction_default extends import_plugin_workflow.Instruction {
       job.execution = await job.getExecution();
     }
     if (job.execution.status === import_plugin_workflow.EXECUTION_STATUS.STARTED) {
-      this.plugin.resume(job);
+      this.workflow.resume(job);
     }
     if (this.timers.get(job.id)) {
       this.timers.delete(job.id);

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_DelayInstruction = __toESM(require("./DelayInstruction"));
 class Plugin_default extends import_server.Plugin {
-  workflow;
   async load() {
-    const workflowPlugin = this.app.getPlugin("workflow");
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register("delay", new import_DelayInstruction.default(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin(import_plugin_workflow.default);
+    workflowPlugin.registerInstruction("delay", import_DelayInstruction.default);
   }
 }

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.17.0-alpha.7",
+  "version": "0.18.0-alpha.8",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -16,9 +16,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('workflow') as WorkflowPlugin;
-    const delayInstruction = new DelayInstruction();
-    workflow.instructions.register(delayInstruction.type, delayInstruction);
+    workflow.registerInstruction('delay', DelayInstruction);
   }
 }

package/src/server/DelayInstruction.ts

@@ -16,15 +16,15 @@ interface DelayConfig {
 export default class extends Instruction {
   timers: Map<number, NodeJS.Timeout> = new Map();
 
-  constructor(public plugin: WorkflowPlugin) {
-    super(plugin);
+  constructor(public workflow: WorkflowPlugin) {
+    super(workflow);
 
-    plugin.app.on('afterStart', this.load);
-    plugin.app.on('beforeStop', this.unload);
+    workflow.app.on('afterStart', this.load);
+    workflow.app.on('beforeStop', this.unload);
   }
 
   load = async () => {
-    const { model } = this.plugin.db.getCollection('jobs');
+    const { model } = this.workflow.app.db.getCollection('jobs');
     const jobs = (await model.findAll({
       where: {
         status: JOB_STATUS.PENDING,
@@ -79,7 +79,7 @@ export default class extends Instruction {
       job.execution = await job.getExecution();
     }
     if (job.execution.status === EXECUTION_STATUS.STARTED) {
-      this.plugin.resume(job);
+      this.workflow.resume(job);
     }
     if (this.timers.get(job.id)) {
       this.timers.delete(job.id);

package/src/server/Plugin.ts

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