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

package/dist/client/RequestInstruction.d.ts

@@ -173,8 +173,13 @@ export default class extends Instruction {
         title: any;
     }, { types, fieldNames }: {
         types: any;
-        fieldNames?: import("@nocobase/client").FieldNames;
+        fieldNames?: {
+            readonly label: "label";
+            readonly value: "value";
+            readonly children: "children";
+        };
     }): {
-        [x: string]: any;
+        value: any;
+        label: any;
     };
 }

package/dist/client/index.js

@@ -1 +1 @@
-(function(t,o){typeof exports=="object"&&typeof module!="undefined"?o(exports,require("@nocobase/client"),require("@formily/antd-v5"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@formily/antd-v5","@nocobase/plugin-workflow/client","react-i18next"],o):(t=typeof globalThis!="undefined"?globalThis:t||self,o(t["@nocobase/plugin-workflow-request"]={},t["@nocobase/client"],t["@formily/antd-v5"],t["@nocobase/plugin-workflow"]))})(this,function(t,o,r,p){"use strict";var x=Object.defineProperty;var y=(t,o,r)=>o in t?x(t,o,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[o]=r;var s=(t,o,r)=>(y(t,typeof o!="symbol"?o+"":o,r),r);var d=(t,o,r)=>new Promise((p,e)=>{var l=n=>{try{i(r.next(n))}catch(a){e(a)}},c=n=>{try{i(r.throw(n))}catch(a){e(a)}},i=n=>n.done?p(n.value):Promise.resolve(n.value).then(l,c);i((r=r.apply(t,o)).next())});const e="workflow-request";class l extends p.Instruction{constructor(){super(...arguments);s(this,"title",`{{t("HTTP request", { ns: "${e}" })}}`);s(this,"type","request");s(this,"group","extended");s(this,"description",`{{t("Send HTTP request to a URL. You can use the variables in the upstream nodes as request headers, parameters and request body.", { ns: "${e}" })}}`);s(this,"fieldset",{method:{type:"string",required:!0,title:`{{t("HTTP method", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-component":"Select","x-component-props":{showSearch:!1,allowClear:!1,className:"auto-width"},enum:[{label:"GET",value:"GET"},{label:"POST",value:"POST"},{label:"PUT",value:"PUT"},{label:"PATCH",value:"PATCH"},{label:"DELETE",value:"DELETE"}],default:"POST"},url:{type:"string",required:!0,title:`{{t("URL", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-decorator-props":{},"x-component":"Input","x-component-props":{placeholder:"https://www.nocobase.com"}},headers:{type:"array","x-component":"ArrayItems","x-decorator":"FormItem",title:`{{t("Headers", { ns: "${e}" })}}`,description:`{{t('"Content-Type" only support "application/json", and no need to specify', { ns: "${e}" })}}`,items:{type:"object",properties:{space:{type:"void","x-component":"Space",properties:{name:{type:"string","x-decorator":"FormItem","x-component":"Input","x-component-props":{placeholder:'{{t("Name")}}'}},value:{type:"string","x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{useTypedConstant:!0}},remove:{type:"void","x-decorator":"FormItem","x-component":"ArrayItems.Remove"}}}}},properties:{add:{type:"void",title:`{{t("Add request header", { ns: "${e}" })}}`,"x-component":"ArrayItems.Addition"}}},params:{type:"array","x-component":"ArrayItems","x-decorator":"FormItem",title:`{{t("Parameters", { ns: "${e}" })}}`,items:{type:"object",properties:{space:{type:"void","x-component":"Space",properties:{name:{type:"string","x-decorator":"FormItem","x-component":"Input","x-component-props":{placeholder:'{{t("Name")}}'}},value:{type:"string","x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{useTypedConstant:!0}},remove:{type:"void","x-decorator":"FormItem","x-component":"ArrayItems.Remove"}}}}},properties:{add:{type:"void",title:`{{t("Add parameter", { ns: "${e}" })}}`,"x-component":"ArrayItems.Addition"}}},data:{type:"string",title:`{{t("Body", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-decorator-props":{},"x-component":"WorkflowVariableJSON","x-component-props":{changeOnSelect:!0,autoSize:{minRows:10},placeholder:`{{t("Input request data", { ns: "${e}" })}}`},description:`{{t("Only support standard JSON data", { ns: "${e}" })}}`},timeout:{type:"number",title:`{{t("Timeout config", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-decorator-props":{},"x-component":"InputNumber","x-component-props":{addonAfter:`{{t("ms", { ns: "${e}" })}}`,min:1,step:1e3,defaultValue:5e3}},ignoreFail:{type:"boolean",title:`{{t("Ignore failed request and continue workflow", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-component":"Checkbox"}});s(this,"components",{ArrayItems:r.ArrayItems,WorkflowVariableInput:p.WorkflowVariableInput,WorkflowVariableJSON:p.WorkflowVariableJSON})}useVariables({key:a,title:u},{types:f,fieldNames:m=o.defaultFieldNames}){return{[m.value]:a,[m.label]:u}}}class c extends o.Plugin{afterAdd(){return d(this,null,function*(){})}beforeLoad(){return d(this,null,function*(){})}load(){return d(this,null,function*(){const n=this.app.pm.get("workflow"),a=new l;n.instructions.register(a.type,a)})}}t.default=c,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(t,o){typeof exports=="object"&&typeof module!="undefined"?o(exports,require("@nocobase/client"),require("@formily/antd-v5"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@formily/antd-v5","@nocobase/plugin-workflow/client","react-i18next"],o):(t=typeof globalThis!="undefined"?globalThis:t||self,o(t["@nocobase/plugin-workflow-request"]={},t["@nocobase/client"],t["@formily/antd-v5"],t["@nocobase/plugin-workflow"]))})(this,function(t,o,r,s){"use strict";var x=Object.defineProperty;var y=(t,o,r)=>o in t?x(t,o,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[o]=r;var a=(t,o,r)=>(y(t,typeof o!="symbol"?o+"":o,r),r);var l=(t,o,r)=>new Promise((s,e)=>{var d=n=>{try{p(r.next(n))}catch(i){e(i)}},m=n=>{try{p(r.throw(n))}catch(i){e(i)}},p=n=>n.done?s(n.value):Promise.resolve(n.value).then(d,m);p((r=r.apply(t,o)).next())});const e="workflow-request";class d extends s.Instruction{constructor(){super(...arguments);a(this,"title",`{{t("HTTP request", { ns: "${e}" })}}`);a(this,"type","request");a(this,"group","extended");a(this,"description",`{{t("Send HTTP request to a URL. You can use the variables in the upstream nodes as request headers, parameters and request body.", { ns: "${e}" })}}`);a(this,"fieldset",{method:{type:"string",required:!0,title:`{{t("HTTP method", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-component":"Select","x-component-props":{showSearch:!1,allowClear:!1,className:"auto-width"},enum:[{label:"GET",value:"GET"},{label:"POST",value:"POST"},{label:"PUT",value:"PUT"},{label:"PATCH",value:"PATCH"},{label:"DELETE",value:"DELETE"}],default:"POST"},url:{type:"string",required:!0,title:`{{t("URL", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-decorator-props":{},"x-component":"Input","x-component-props":{placeholder:"https://www.nocobase.com"}},headers:{type:"array","x-component":"ArrayItems","x-decorator":"FormItem",title:`{{t("Headers", { ns: "${e}" })}}`,description:`{{t('"Content-Type" only support "application/json", and no need to specify', { ns: "${e}" })}}`,items:{type:"object",properties:{space:{type:"void","x-component":"Space",properties:{name:{type:"string","x-decorator":"FormItem","x-component":"Input","x-component-props":{placeholder:'{{t("Name")}}'}},value:{type:"string","x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{useTypedConstant:!0}},remove:{type:"void","x-decorator":"FormItem","x-component":"ArrayItems.Remove"}}}}},properties:{add:{type:"void",title:`{{t("Add request header", { ns: "${e}" })}}`,"x-component":"ArrayItems.Addition"}}},params:{type:"array","x-component":"ArrayItems","x-decorator":"FormItem",title:`{{t("Parameters", { ns: "${e}" })}}`,items:{type:"object",properties:{space:{type:"void","x-component":"Space",properties:{name:{type:"string","x-decorator":"FormItem","x-component":"Input","x-component-props":{placeholder:'{{t("Name")}}'}},value:{type:"string","x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{useTypedConstant:!0}},remove:{type:"void","x-decorator":"FormItem","x-component":"ArrayItems.Remove"}}}}},properties:{add:{type:"void",title:`{{t("Add parameter", { ns: "${e}" })}}`,"x-component":"ArrayItems.Addition"}}},data:{type:"string",title:`{{t("Body", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-decorator-props":{},"x-component":"WorkflowVariableJSON","x-component-props":{changeOnSelect:!0,autoSize:{minRows:10},placeholder:`{{t("Input request data", { ns: "${e}" })}}`},description:`{{t("Only support standard JSON data", { ns: "${e}" })}}`},timeout:{type:"number",title:`{{t("Timeout config", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-decorator-props":{},"x-component":"InputNumber","x-component-props":{addonAfter:`{{t("ms", { ns: "${e}" })}}`,min:1,step:1e3,defaultValue:5e3}},ignoreFail:{type:"boolean",title:`{{t("Ignore failed request and continue workflow", { ns: "${e}" })}}`,"x-decorator":"FormItem","x-component":"Checkbox"}});a(this,"components",{ArrayItems:r.ArrayItems,WorkflowVariableInput:s.WorkflowVariableInput,WorkflowVariableJSON:s.WorkflowVariableJSON})}useVariables({key:i,title:u},{types:f,fieldNames:c=s.defaultFieldNames}){return{[c.value]:i,[c.label]:u}}}class m extends o.Plugin{afterAdd(){return l(this,null,function*(){})}beforeLoad(){return l(this,null,function*(){})}load(){return l(this,null,function*(){this.app.pm.get("workflow").registerInstruction("request",d)})}}t.default=m,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
-  "@formily/antd-v5": "1.1.7",
-  "@nocobase/client": "0.17.0-alpha.7",
-  "@nocobase/plugin-workflow": "0.17.0-alpha.7",
+  "@formily/antd-v5": "1.1.9",
+  "@nocobase/plugin-workflow": "0.18.0-alpha.8",
+  "@nocobase/client": "0.18.0-alpha.8",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.17.0-alpha.7",
+  "@nocobase/server": "0.18.0-alpha.8",
   "axios": "0.26.1"
 };

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

package/dist/server/RequestInstruction.js

@@ -74,7 +74,7 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
       });
     }).finally(() => {
       processor.logger.info(`request (#${node.id}) response received, status: ${job.get("status")}`);
-      this.plugin.resume(job);
+      this.workflow.resume(job);
     });
     processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
     return processor.exit();

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "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/RequestInstruction.tsx

@@ -1,8 +1,11 @@
 import { ArrayItems } from '@formily/antd-v5';
 
-import { defaultFieldNames } from '@nocobase/client';
-
-import { Instruction, WorkflowVariableInput, WorkflowVariableJSON } from '@nocobase/plugin-workflow/client';
+import {
+  Instruction,
+  WorkflowVariableInput,
+  WorkflowVariableJSON,
+  defaultFieldNames,
+} from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../locale';
 

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 requestInstruction = new RequestInstruction();
-    workflow.instructions.register(requestInstruction.type, requestInstruction);
+    workflow.registerInstruction('request', RequestInstruction);
   }
 }

package/src/server/Plugin.ts

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

package/src/server/RequestInstruction.ts

@@ -65,7 +65,7 @@ export default class extends Instruction {
       })
       .finally(() => {
         processor.logger.info(`request (#${node.id}) response received, status: ${job.get('status')}`);
-        this.plugin.resume(job);
+        this.workflow.resume(job);
       });
 
     processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);