@nocobase/plugin-workflow-sql 0.19.0-alpha.4 → 0.19.0-alpha.5

package/dist/client/SQLInstruction.d.ts

@@ -1,4 +1,5 @@
 import { Instruction, WorkflowVariableRawTextArea } from '@nocobase/plugin-workflow/client';
+import React from 'react';
 export default class extends Instruction {
     title: string;
     type: string;
@@ -18,6 +19,9 @@ export default class extends Instruction {
             };
         };
     };
+    scope: {
+        sqlDescription(): React.JSX.Element;
+    };
     components: {
         WorkflowVariableRawTextArea: typeof WorkflowVariableRawTextArea;
     };

package/dist/client/index.js

@@ -1,4 +1,4 @@
-(function(e,o){typeof exports=="object"&&typeof module!="undefined"?o(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","react-i18next"],o):(e=typeof globalThis!="undefined"?globalThis:e||self,o(e["@nocobase/plugin-workflow-sql"]={},e["@nocobase/client"],e["@nocobase/plugin-workflow"]))})(this,function(e,o,t){"use strict";var p=Object.defineProperty;var w=(e,o,t)=>o in e?p(e,o,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[o]=t;var s=(e,o,t)=>(w(e,typeof o!="symbol"?o+"":o,t),t);var c=(e,o,t)=>new Promise((r,l)=>{var u=n=>{try{i(t.next(n))}catch(a){l(a)}},f=n=>{try{i(t.throw(n))}catch(a){l(a)}},i=n=>n.done?r(n.value):Promise.resolve(n.value).then(u,f);i((t=t.apply(e,o)).next())});const r="workflow-sql";class l extends t.Instruction{constructor(){super(...arguments);s(this,"title",`{{t("SQL action", { ns: "${r}" })}}`);s(this,"type","sql");s(this,"group","collection");s(this,"description",`{{t("Execute a SQL statement in database.", { ns: "${r}" })}}`);s(this,"fieldset",{sql:{type:"string",required:!0,title:"SQL",description:`{{t("Usage of SQL query result is not supported yet.", { ns: "${r}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableRawTextArea","x-component-props":{rows:20,className:o.css`
+(function(e,o){typeof exports=="object"&&typeof module!="undefined"?o(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","@nocobase/plugin-workflow/client","react-i18next"],o):(e=typeof globalThis!="undefined"?globalThis:e||self,o(e["@nocobase/plugin-workflow-sql"]={},e["@nocobase/client"],e.jsxRuntime,e["@nocobase/plugin-workflow"],e["react-i18next"]))})(this,function(e,o,n,s,c){"use strict";var x=Object.defineProperty;var b=(e,o,n)=>o in e?x(e,o,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[o]=n;var r=(e,o,n)=>(b(e,typeof o!="symbol"?o+"":o,n),n);var u=(e,o,n)=>new Promise((s,c)=>{var i=t=>{try{a(n.next(t))}catch(l){c(l)}},d=t=>{try{a(n.throw(t))}catch(l){c(l)}},a=t=>t.done?s(t.value):Promise.resolve(t.value).then(i,d);a((n=n.apply(e,o)).next())});const i="@nocobase/plugin-workflow-sql";class d extends s.Instruction{constructor(){super(...arguments);r(this,"title",`{{t("SQL action", { ns: "${i}" })}}`);r(this,"type","sql");r(this,"group","collection");r(this,"description",`{{t("Execute a SQL statement in database.", { ns: "${i}" })}}`);r(this,"fieldset",{sql:{type:"string",required:!0,title:"SQL",description:"{{sqlDescription()}}","x-decorator":"FormItem","x-component":"WorkflowVariableRawTextArea","x-component-props":{rows:20,className:o.css`
           font-size: 80%;
           font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-        `}}});s(this,"components",{WorkflowVariableRawTextArea:t.WorkflowVariableRawTextArea})}useVariables({key:n,title:a},{types:b,fieldNames:d=t.defaultFieldNames}){return{[d.value]:n,[d.label]:a}}}class u extends o.Plugin{afterAdd(){return c(this,null,function*(){})}beforeLoad(){return c(this,null,function*(){})}load(){return c(this,null,function*(){this.app.pm.get("workflow").registerInstruction("sql",l)})}}e.default=u,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+        `}}});r(this,"scope",{sqlDescription(){return n.jsxs(c.Trans,{ns:i,children:["SQL query result could be used through ",n.jsx("a",{href:"https://docs-cn.nocobase.com/plugins/workflow-json-query",target:"_blank",rel:"noreferrer",children:"JSON query node"})," (Commercial plugin)."]})}});r(this,"components",{WorkflowVariableRawTextArea:s.WorkflowVariableRawTextArea})}useVariables({key:p,title:w},{types:m,fieldNames:f=s.defaultFieldNames}){return{[f.value]:p,[f.label]:w}}}class a extends o.Plugin{afterAdd(){return u(this,null,function*(){})}beforeLoad(){return u(this,null,function*(){})}load(){return u(this,null,function*(){this.app.pm.get("workflow").registerInstruction("sql",d)})}}e.default=a,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,9 +1,10 @@
 module.exports = {
-  "@nocobase/client": "0.19.0-alpha.4",
-  "@nocobase/plugin-workflow": "0.19.0-alpha.4",
+  "@nocobase/client": "0.19.0-alpha.5",
+  "@nocobase/plugin-workflow": "0.19.0-alpha.5",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.19.0-alpha.4",
-  "@nocobase/plugin-workflow-test": "0.19.0-alpha.4",
-  "@nocobase/test": "0.19.0-alpha.4",
-  "@nocobase/utils": "0.19.0-alpha.4"
+  "react": "18.2.0",
+  "@nocobase/server": "0.19.0-alpha.5",
+  "@nocobase/plugin-workflow-test": "0.19.0-alpha.5",
+  "@nocobase/test": "0.19.0-alpha.5",
+  "@nocobase/utils": "0.19.0-alpha.5"
 };

package/dist/locale/index.d.ts

@@ -1,3 +1,3 @@
-export declare const NAMESPACE = "workflow-sql";
+export declare const NAMESPACE = "@nocobase/plugin-workflow-sql";
 export declare function useLang(key: string, options?: {}): string;
-export declare function usePluginTranslation(options: any): import("react-i18next").UseTranslationResponse<"workflow-sql", undefined>;
+export declare function usePluginTranslation(options: any): import("react-i18next").UseTranslationResponse<"@nocobase/plugin-workflow-sql", undefined>;

package/dist/locale/index.js

@@ -23,7 +23,7 @@ __export(locale_exports, {
 });
 module.exports = __toCommonJS(locale_exports);
 var import_react_i18next = require("react-i18next");
-const NAMESPACE = "workflow-sql";
+const NAMESPACE = "@nocobase/plugin-workflow-sql";
 function useLang(key, options = {}) {
   const { t } = usePluginTranslation(options);
   return t(key);

package/dist/locale/zh-CN.json

@@ -1,5 +1,5 @@
 {
   "SQL action": "SQL 操作",
-  "Execute a SQL statement in database": "在数据库中执行一个 SQL 语句",
-  "Usage of SQL query result is not supported yet.": "SQL 执行的结果暂不支持使用。"
+  "Execute a SQL statement in database.": "在数据库中执行一个 SQL 语句",
+  "SQL query result could be used through <1>JSON query node</1> (Commercial plugin).": "SQL 执行的结果可在 <1>JSON 解析节点</1> 中使用（商业插件）。"
 }

package/dist/server/SQLInstruction.js

@@ -31,7 +31,7 @@ class SQLInstruction_default extends import_plugin_workflow.Instruction {
       };
     }
     const result = await sequelize.query(sql, {
-      // transaction: processor.transaction,
+      transaction: processor.transaction
       // plain: true,
       // model: db.getCollection(node.config.collection).model
     });

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "0.19.0-alpha.4",
+  "version": "0.19.0-alpha.5",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -19,5 +19,5 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "9583023f7bea828da5192384a5c002782c341b65"
+  "gitHead": "580eca25451ec731d17ddef285d0b8c52c48d501"
 }

package/src/client/SQLInstruction.tsx

@@ -3,6 +3,8 @@ import { css } from '@nocobase/client';
 import { Instruction, WorkflowVariableRawTextArea, defaultFieldNames } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../locale';
+import { Trans } from 'react-i18next';
+import React from 'react';
 
 export default class extends Instruction {
   title = `{{t("SQL action", { ns: "${NAMESPACE}" })}}`;
@@ -14,7 +16,7 @@ export default class extends Instruction {
       type: 'string',
       required: true,
       title: 'SQL',
-      description: `{{t("Usage of SQL query result is not supported yet.", { ns: "${NAMESPACE}" })}}`,
+      description: '{{sqlDescription()}}',
       'x-decorator': 'FormItem',
       'x-component': 'WorkflowVariableRawTextArea',
       'x-component-props': {
@@ -26,6 +28,19 @@ export default class extends Instruction {
       },
     },
   };
+  scope = {
+    sqlDescription() {
+      return (
+        <Trans ns={NAMESPACE}>
+          {'SQL query result could be used through '}
+          <a href="https://docs-cn.nocobase.com/plugins/workflow-json-query" target="_blank" rel="noreferrer">
+            {'JSON query node'}
+          </a>
+          {' (Commercial plugin).'}
+        </Trans>
+      );
+    },
+  };
   components = {
     WorkflowVariableRawTextArea,
   };

package/src/locale/index.ts

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 
-export const NAMESPACE = 'workflow-sql';
+export const NAMESPACE = '@nocobase/plugin-workflow-sql';
 
 export function useLang(key: string, options = {}) {
   const { t } = usePluginTranslation(options);

package/src/locale/zh-CN.json

@@ -1,5 +1,5 @@
 {
   "SQL action": "SQL 操作",
-  "Execute a SQL statement in database": "在数据库中执行一个 SQL 语句",
-  "Usage of SQL query result is not supported yet.": "SQL 执行的结果暂不支持使用。"
+  "Execute a SQL statement in database.": "在数据库中执行一个 SQL 语句",
+  "SQL query result could be used through <1>JSON query node</1> (Commercial plugin).": "SQL 执行的结果可在 <1>JSON 解析节点</1> 中使用（商业插件）。"
 }

package/src/server/SQLInstruction.ts

@@ -11,7 +11,7 @@ export default class extends Instruction {
     }
 
     const result = await sequelize.query(sql, {
-      // transaction: processor.transaction,
+      transaction: processor.transaction,
       // plain: true,
       // model: db.getCollection(node.config.collection).model
     });

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

@@ -1,4 +1,4 @@
-import Database from '@nocobase/database';
+import Database, { fn } from '@nocobase/database';
 import { Application } from '@nocobase/server';
 import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
@@ -166,4 +166,33 @@ describe('workflow > instructions > sql', () => {
       expect(queryJob.result).toBeNull();
     });
   });
+
+  describe('run in sync mode', () => {
+    it('sync workflow', async () => {
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        sync: true,
+        type: 'collection',
+        config: {
+          mode: 1,
+          collection: 'categories',
+        },
+      });
+
+      const n1 = await w2.createNode({
+        type: 'sql',
+        config: {
+          sql: `select count(id) from ${PostCollection.quotedTableName()}`,
+        },
+      });
+
+      const CategoryRepo = db.getCollection('categories').repository;
+      const category = await CategoryRepo.create({ values: { title: 't1' } });
+
+      const [execution] = await w2.getExecutions();
+      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const [job] = await execution.getJobs();
+      expect(job.status).toBe(JOB_STATUS.RESOLVED);
+    });
+  });
 });