@things-factory/integration-base 6.1.154 → 6.1.156

package/helps/integration/task/jsonata.ja.md

@@ -0,0 +1,24 @@
+# JSonata
+
+このタスクは JSonata 式を実行し、その結果を返します。
+
+[JSonata](https://jsonata.org/)は JSON データを対象とする軽量なクエリおよび変換言語です。
+
+[JSonata テスト](https://try.jsonata.org/)で式をテストできます。
+
+## パラメータ
+
+### JSonata 式(expression)
+
+JSonata のベース(base)は次の 5 つの組み込み変数(data、variables、domain、user、lng)で構成されています。
+
+```
+# JSonataベース(base)のJSON表現
+{
+  data,
+  variables,
+  domain,
+  user,
+  lng
+}
+```

package/helps/integration/task/jsonata.ko.md

@@ -0,0 +1,25 @@
+# JSonata
+
+JSonata 표현식을 실행하여 그 결과를 리턴하는 태스크이다.
+
+[JSonata](https://jsonata.org/) 는 JSON 데이터를 대상으로하는 간편한 쿼리 및 변환 언어이다.
+
+[JSonata 테스트](https://try.jsonata.org/)에서 표현식을 테스트 해볼 수 있다.
+
+## parameters
+
+### JSonata 표현식(expression)
+
+JSonata의 베이스는 일반 [스크립트 내장변수](../concept/script-internal-variables.md)인 data, variables, domain, user, lng 다섯가지이다.
+
+```
+# JSonata base의 json 표현
+{
+  data,
+  variables,
+  domain,
+  user,
+  lng
+}
+
+```

package/helps/integration/task/jsonata.md

@@ -0,0 +1,24 @@
+# JSonata
+
+This task executes JSonata expressions and returns the results.
+
+[JSonata](https://jsonata.org/) is a lightweight query and transformation language for JSON data.
+
+You can test expressions on [JSonata Test](https://try.jsonata.org/).
+
+## Parameters
+
+### JSonata Expression (expression)
+
+The JSonata base consists of five built-in variables (data, variables, domain, user, lng) as follows:
+
+```
+# JSON representation of the JSonata base
+{
+  data,
+  variables,
+  domain,
+  user,
+  lng
+}
+```

package/helps/integration/task/jsonata.ms.md

@@ -0,0 +1,24 @@
+# JSonata
+
+Tugas ini menjalankan ekspresi JSonata dan mengembalikan hasilnya.
+
+[JSonata](https://jsonata.org/) adalah bahasa kueri dan transformasi yang ringan untuk data JSON.
+
+Anda dapat menguji ekspresi di [JSonata Test](https://try.jsonata.org/).
+
+## Parameter
+
+### Ekspresi JSonata (expression)
+
+Basis JSonata terdiri dari lima variabel bawaan(data, variables, domain, user, lng) seperti berikut.
+
+```
+# Representasi JSON basis(base) JSonata
+{
+  data,
+  variables,
+  domain,
+  user,
+  lng
+}
+```

package/helps/integration/task/jsonata.zh.md

@@ -0,0 +1,24 @@
+# JSonata
+
+这个任务执行 JSonata 表达式并返回结果。
+
+[JSonata](https://jsonata.org/) 是一种用于 JSON 数据的轻量级查询和转换语言。
+
+您可以在[JSonata 测试](https://try.jsonata.org/)中测试表达式。
+
+## 参数
+
+### JSonata 表达式(expression)
+
+JSonata 的基本(base)由以下五个内置变量(data, variables, domain, user, lng)组成。
+
+```
+# JSonata基本(base)的JSON表示
+{
+  data,
+  variables,
+  domain,
+  user,
+  lng
+}
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.154",
+  "version": "6.1.156",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.1.154",
-    "@things-factory/auth-base": "^6.1.154",
+    "@things-factory/api": "^6.1.156",
+    "@things-factory/auth-base": "^6.1.156",
     "@things-factory/env": "^6.1.154",
-    "@things-factory/oauth2-client": "^6.1.154",
-    "@things-factory/scheduler-client": "^6.1.154",
-    "@things-factory/shell": "^6.1.154",
+    "@things-factory/oauth2-client": "^6.1.156",
+    "@things-factory/scheduler-client": "^6.1.156",
+    "@things-factory/shell": "^6.1.156",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "f724eab413cae097192afa2865d27664bc5b4a6f"
+  "gitHead": "5a0f1cd16edee089468c231b3bb97bd0c03c8727"
 }

package/server/engine/task/index.ts

@@ -38,3 +38,4 @@ import './headless-post'
 import './headless-scrap'
 import './set-domain'
 import './oracle-procedure'
+import './jsonata'

package/server/engine/task/jsonata.ts

@@ -0,0 +1,35 @@
+import { TaskRegistry } from '../task-registry'
+import jsonata from 'jsonata'
+
+async function JSonata(step, context) {
+  var {
+    params: { expression }
+  } = step
+
+  const { domain, user, data, variables, lng, logger } = context
+
+  var result = jsonata(expression).evaluate({
+    domain,
+    user,
+    lng,
+    data,
+    variables
+  })
+
+  return {
+    data: result
+  }
+}
+
+JSonata.parameterSpec = [
+  {
+    type: 'textarea',
+    name: 'expression',
+    label: 'jsonata-expression'
+  }
+]
+
+JSonata.connectorFree = true
+JSonata.help = 'integration/task/jsonata'
+
+TaskRegistry.registerTaskHandler('jsonata', JSonata)

package/server/service/connection/connection-mutation.ts

@@ -166,12 +166,41 @@ export class ConnectionMutation {
   ): Promise<boolean> {
     const { tx, domain, user } = context.state
 
+    const repository = tx.getRepository(Connection)
+
     await Promise.all(
       connections.map(async (connection: Connection) => {
-        await tx.getRepository(Connection).save({
+        const { id, name } = connection
+
+        if (id) {
+          const sameId = await repository.findOneBy({ id })
+
+          if (sameId) {
+            if (sameId.domainId != domain.id) {
+              throw `Connection with id '${id}:${name}' is already taken by another domain`
+            }
+
+            const sameName = await repository.findOneBy({ domain: { id: domain.id }, name })
+            if (sameName && sameName.id != id) {
+              throw `Connection with name '${name}' is already taken by another connection`
+            }
+
+            await repository.save({
+              ...sameId,
+              ...connection,
+              domain,
+              updater: user
+            })
+
+            return
+          }
+        }
+
+        await repository.save({
           ...connection,
           domain,
-          updater: user
+          updater: user,
+          creator: user
         })
       })
     )

package/server/service/scenario/scenario-mutation.ts

@@ -147,27 +147,62 @@ export class ScenarioMutation {
     @Arg('scenarios', type => [ScenarioPatch]) scenarios: Scenario[],
     @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { domain, user, tx } = context.state
+    const { tx, domain, user } = context.state
+
+    const repository = tx.getRepository(Scenario)
 
     await Promise.all(
       scenarios.map(async (scenario: Scenario) => {
-        const savedScenario: Scenario = await tx.getRepository(Scenario).save({
-          domain,
-          ...scenario,
-          updater: user
-        })
-        if (scenario.steps?.length) {
-          await tx.getRepository(Step).save(
-            scenario.steps.map((step: Step) => {
-              return {
-                ...step,
-                domain,
-                scenario: savedScenario,
-                updater: user
-              }
+        const { id, name } = scenario
+        var savedScenario
+
+        if (id) {
+          const sameId = await repository.findOneBy({ id })
+
+          if (sameId) {
+            if (sameId.domainId != domain.id) {
+              throw `Scenario with id '${id}:${name}' is already taken by another domain`
+            }
+
+            const sameName = await repository.findOneBy({ domain: { id: domain.id }, name })
+            if (sameName && sameName.id != id) {
+              throw `Scenario Name '${name}' is already taken by another scenario`
+            }
+
+            savedScenario = await repository.save({
+              ...sameId,
+              ...scenario,
+              domain,
+              updater: user
+            })
+          } else {
+            savedScenario = await repository.save({
+              ...scenario,
+              domain,
+              updater: user,
+              creator: user
             })
-          )
+          }
+        } else {
+          savedScenario = await repository.save({
+            ...scenario,
+            domain,
+            updater: user,
+            creator: user
+          })
         }
+
+        await tx.getRepository(Step).delete({ domain: { id: domain.id }, scenario: { id: savedScenario.id } })
+        await tx.getRepository(Step).save(
+          scenario.steps.map((step: Step) => {
+            return {
+              ...step,
+              domain,
+              scenario: savedScenario,
+              updater: user
+            }
+          })
+        )
       })
     )