@things-factory/integration-base 6.2.35 → 6.2.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.2.35",
+  "version": "6.2.38",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,11 +26,11 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.2.34",
-    "@things-factory/auth-base": "^6.2.34",
+    "@things-factory/api": "^6.2.38",
+    "@things-factory/auth-base": "^6.2.38",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/oauth2-client": "^6.2.34",
-    "@things-factory/scheduler-client": "^6.2.34",
+    "@things-factory/oauth2-client": "^6.2.38",
+    "@things-factory/scheduler-client": "^6.2.38",
     "@things-factory/shell": "^6.2.34",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "7f44fa314cdfcb84faf99e3db9d188efb53c2423"
+  "gitHead": "df14ab133528fadeb146f3dc2652f499df30a918"
 }

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

@@ -56,7 +56,7 @@ export class ScenarioInstanceMutation {
     @Arg('variables', type => ScalarObject, { nullable: true }) variables: any,
     @Ctx() context: ResolverContext
   ): Promise<ScenarioInstance> {
-    const { domain, user } = context.state
+    const { domain, user, lng } = context.state
 
     debug('runScenario', scenarioName, instanceName, variables)
 
@@ -78,6 +78,8 @@ export class ScenarioInstanceMutation {
     instanceName = instanceName || scenarioName + '-' + String(Date.now())
     var instance = new ScenarioInstance(instanceName, scenario, {
       domain,
+      user,
+      lng,
       variables,
       client: GraphqlLocalClient.client
     })

package/server/service/scenario-instance/scenario-instance-type.ts

@@ -153,7 +153,8 @@ export class ScenarioInstance {
   }
 
   constructor(instanceName, { name: scenarioName, steps, domain: scenarioDomain }, context?) {
-    const { domain = scenarioDomain, user, lng } = context || {}
+    var { domain, user, lng } = context || {}
+    domain ||= scenarioDomain
 
     this.instanceName = instanceName
     this.scenarioName = scenarioName

package/server/service/state-register/state-register-mutation.ts

@@ -101,11 +101,11 @@ export class StateRegisterMutation {
     @Arg('state', type => ScalarObject) state: any,
     @Ctx() context: ResolverContext
   ): Promise<StateRegister> {
-    const { domain, user, tx } = context.state
+    const { domain, user = null, tx } = context.state
 
     const repository = tx.getRepository(StateRegister)
     const stateRegister = await repository.findOne({
-      where: { domain: { id: domain.id }, name }
+      where: { domain: { id: domain?.id }, name }
     })
 
     return await repository.save({

package/server/service/state-register/state-register-query.ts

@@ -60,6 +60,11 @@ export class StateRegisterQuery {
     return stateRegister.domainId && (await getRepository(Domain).findOneBy({ id: stateRegister.domainId }))
   }
 
+  @FieldResolver(type => User)
+  async writer(@Root() stateRegister: StateRegister): Promise<User> {
+    return stateRegister.writerId && (await getRepository(User).findOneBy({ id: stateRegister.writerId }))
+  }
+
   @FieldResolver(type => User)
   async updater(@Root() stateRegister: StateRegister): Promise<User> {
     return stateRegister.updaterId && (await getRepository(User).findOneBy({ id: stateRegister.updaterId }))

package/dist-server/engine/task/read-state.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
-const task_registry_1 = require("../task-registry");
-async function ReadState(step, { logger, publish, data, domain, user, client }) {
-    var { params: { name } } = step;
-    if (!name) {
-        throw Error(`name should be defined: name - '${name}'`);
-    }
-    var { data: queryResult, errors } = await client.query({
-        query: (0, graphql_tag_1.default) `
-      query ($name: String!) {
-        stateRegisterByName(state: $state, name: $name) {
-          state
-        }
-      }
-    `,
-        variables: {
-            name
-        },
-        context: {
-            state: {
-                domain,
-                user
-            }
-        }
-    });
-    if (errors) {
-        errors.forEach(error => {
-            logger.error('GraphQL Error: %s', error);
-        });
-    }
-    return {
-        data: queryResult === null || queryResult === void 0 ? void 0 : queryResult.stateRegisterByName.state
-    };
-}
-ReadState.parameterSpec = [
-    {
-        type: 'string',
-        name: 'name',
-        label: 'name'
-    }
-];
-ReadState.connectorFree = true;
-ReadState.help = 'integration/task/read-state';
-task_registry_1.TaskRegistry.registerTaskHandler('read-state', ReadState);
-//# sourceMappingURL=read-state.js.map

package/dist-server/engine/task/read-state.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"read-state.js","sourceRoot":"","sources":["../../../server/engine/task/read-state.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAC7B,oDAA+C;AAE/C,KAAK,UAAU,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;IAC5E,IAAI,EACF,MAAM,EAAE,EAAE,IAAI,EAAE,EACjB,GAAG,IAAI,CAAA;IAER,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,KAAK,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAA;KACxD;IAED,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;QACrD,KAAK,EAAE,IAAA,qBAAG,EAAA;;;;;;KAMT;QACD,SAAS,EAAE;YACT,IAAI;SACL;QACD,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI;aACL;SACF;KACF,CAAC,CAAA;IAEF,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;KACH;IAED,OAAO;QACL,IAAI,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,mBAAmB,CAAC,KAAK;KAC7C,CAAA;AACH,CAAC;AAED,SAAS,CAAC,aAAa,GAAG;IACxB;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;CACF,CAAA;AAED,SAAS,CAAC,aAAa,GAAG,IAAI,CAAA;AAC9B,SAAS,CAAC,IAAI,GAAG,6BAA6B,CAAA;AAE9C,4BAAY,CAAC,mBAAmB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { TaskRegistry } from '../task-registry'\n\nasync function ReadState(step, { logger, publish, data, domain, user, client }) {\n  var {\n    params: { name }\n  } = step\n\n  if (!name) {\n    throw Error(`name should be defined: name - '${name}'`)\n  }\n\n  var { data: queryResult, errors } = await client.query({\n    query: gql`\n      query ($name: String!) {\n        stateRegisterByName(state: $state, name: $name) {\n          state\n        }\n      }\n    `,\n    variables: {\n      name\n    },\n    context: {\n      state: {\n        domain,\n        user\n      }\n    }\n  })\n\n  if (errors) {\n    errors.forEach(error => {\n      logger.error('GraphQL Error: %s', error)\n    })\n  }\n\n  return {\n    data: queryResult?.stateRegisterByName.state\n  }\n}\n\nReadState.parameterSpec = [\n  {\n    type: 'string',\n    name: 'name',\n    label: 'name'\n  }\n]\n\nReadState.connectorFree = true\nReadState.help = 'integration/task/read-state'\n\nTaskRegistry.registerTaskHandler('read-state', ReadState)\n"]}

package/dist-server/engine/task/write-state.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
-const utils_1 = require("@things-factory/utils");
-const task_registry_1 = require("../task-registry");
-async function WriteState(step, { logger, publish, data, domain, user, client }) {
-    var { params: { name, accessor } } = step;
-    if (!name || !accessor) {
-        throw Error(`name and accessor should be defined: name - '${name}', accessor - '${accessor}'`);
-    }
-    var state = (0, utils_1.access)(accessor, data);
-    var { data: mutateResult, errors } = await client.mutate({
-        mutation: (0, graphql_tag_1.default) `
-      mutation ($state: Object!, $name: String!) {
-        updateStateRegisterByName(state: $state, name: $name) {
-          state
-        }
-      }
-    `,
-        variables: {
-            name,
-            state
-        },
-        context: {
-            state: {
-                domain,
-                user
-            }
-        }
-    });
-    if (errors) {
-        errors.forEach(error => {
-            logger.error('GraphQL Error: %s', error);
-        });
-    }
-    return {
-        data: mutateResult === null || mutateResult === void 0 ? void 0 : mutateResult.updateStateRegisterByName.state
-    };
-}
-WriteState.parameterSpec = [
-    {
-        type: 'string',
-        name: 'name',
-        label: 'name'
-    },
-    {
-        type: 'scenario-step-input',
-        name: 'accessor',
-        label: 'accessor'
-    }
-];
-WriteState.connectorFree = true;
-WriteState.help = 'integration/task/write-state';
-task_registry_1.TaskRegistry.registerTaskHandler('write-state', WriteState);
-//# sourceMappingURL=write-state.js.map

package/dist-server/engine/task/write-state.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"write-state.js","sourceRoot":"","sources":["../../../server/engine/task/write-state.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAC7B,iDAA8C;AAC9C,oDAA+C;AAE/C,KAAK,UAAU,UAAU,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;IAC7E,IAAI,EACF,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAC3B,GAAG,IAAI,CAAA;IAER,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACtB,MAAM,KAAK,CAAC,gDAAgD,IAAI,kBAAkB,QAAQ,GAAG,CAAC,CAAA;KAC/F;IAED,IAAI,KAAK,GAAG,IAAA,cAAM,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAElC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACvD,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;KAMZ;QACD,SAAS,EAAE;YACT,IAAI;YACJ,KAAK;SACN;QACD,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI;aACL;SACF;KACF,CAAC,CAAA;IAEF,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;KACH;IAED,OAAO;QACL,IAAI,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,yBAAyB,CAAC,KAAK;KACpD,CAAA;AACH,CAAC;AAED,UAAU,CAAC,aAAa,GAAG;IACzB;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;IACD;QACE,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,UAAU;KAClB;CACF,CAAA;AAED,UAAU,CAAC,aAAa,GAAG,IAAI,CAAA;AAC/B,UAAU,CAAC,IAAI,GAAG,8BAA8B,CAAA;AAEhD,4BAAY,CAAC,mBAAmB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { access } from '@things-factory/utils'\nimport { TaskRegistry } from '../task-registry'\n\nasync function WriteState(step, { logger, publish, data, domain, user, client }) {\n  var {\n    params: { name, accessor }\n  } = step\n\n  if (!name || !accessor) {\n    throw Error(`name and accessor should be defined: name - '${name}', accessor - '${accessor}'`)\n  }\n\n  var state = access(accessor, data)\n\n  var { data: mutateResult, errors } = await client.mutate({\n    mutation: gql`\n      mutation ($state: Object!, $name: String!) {\n        updateStateRegisterByName(state: $state, name: $name) {\n          state\n        }\n      }\n    `,\n    variables: {\n      name,\n      state\n    },\n    context: {\n      state: {\n        domain,\n        user\n      }\n    }\n  })\n\n  if (errors) {\n    errors.forEach(error => {\n      logger.error('GraphQL Error: %s', error)\n    })\n  }\n\n  return {\n    data: mutateResult?.updateStateRegisterByName.state\n  }\n}\n\nWriteState.parameterSpec = [\n  {\n    type: 'string',\n    name: 'name',\n    label: 'name'\n  },\n  {\n    type: 'scenario-step-input',\n    name: 'accessor',\n    label: 'accessor'\n  }\n]\n\nWriteState.connectorFree = true\nWriteState.help = 'integration/task/write-state'\n\nTaskRegistry.registerTaskHandler('write-state', WriteState)\n"]}