@things-factory/integration-base 4.3.234 → 4.3.238

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,10 +14,15 @@ exports.Integration = exports.Platform = void 0;
14
14
  const type_graphql_1 = require("type-graphql");
15
15
  const typeorm_1 = require("typeorm");
16
16
  const auth_base_1 = require("@things-factory/auth-base");
17
+ const env_1 = require("@things-factory/env");
17
18
  const shell_1 = require("@things-factory/shell");
19
+ const ORMCONFIG = env_1.config.get('ormconfig', {});
20
+ const DATABASE_TYPE = ORMCONFIG.type;
18
21
  var Platform;
19
22
  (function (Platform) {
20
23
  Platform["POWRUP"] = "POWRUP";
24
+ Platform["POWRUP_INTERNAL"] = "POWRUP_INTERNAL";
25
+ Platform["OTHERS"] = "OTHERS";
21
26
  })(Platform = exports.Platform || (exports.Platform = {}));
22
27
  (0, type_graphql_1.registerEnumType)(Platform, {
23
28
  name: 'Platform',
@@ -44,6 +49,13 @@ __decorate([
44
49
  (0, type_graphql_1.Field)(),
45
50
  __metadata("design:type", String)
46
51
  ], Integration.prototype, "name", void 0);
52
+ __decorate([
53
+ (0, typeorm_1.Column)({
54
+ nullable: true
55
+ }),
56
+ (0, type_graphql_1.Field)({ nullable: true }),
57
+ __metadata("design:type", String)
58
+ ], Integration.prototype, "accountId", void 0);
47
59
  __decorate([
48
60
  (0, typeorm_1.Column)({
49
61
  nullable: true
@@ -52,7 +64,15 @@ __decorate([
52
64
  __metadata("design:type", String)
53
65
  ], Integration.prototype, "description", void 0);
54
66
  __decorate([
55
- (0, typeorm_1.Column)(),
67
+ (0, typeorm_1.Column)({
68
+ type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
69
+ ? 'enum'
70
+ : DATABASE_TYPE == 'oracle'
71
+ ? 'varchar2'
72
+ : 'smallint',
73
+ enum: Platform,
74
+ default: Platform.OTHERS
75
+ }),
56
76
  (0, type_graphql_1.Field)(),
57
77
  __metadata("design:type", String)
58
78
  ], Integration.prototype, "platform", void 0);
@@ -63,6 +83,14 @@ __decorate([
63
83
  (0, type_graphql_1.Field)({ nullable: true }),
64
84
  __metadata("design:type", Boolean)
65
85
  ], Integration.prototype, "active", void 0);
86
+ __decorate([
87
+ (0, typeorm_1.Column)({
88
+ nullable: true,
89
+ default: false
90
+ }),
91
+ (0, type_graphql_1.Field)({ nullable: true }),
92
+ __metadata("design:type", Boolean)
93
+ ], Integration.prototype, "staging", void 0);
66
94
  __decorate([
67
95
  (0, typeorm_1.CreateDateColumn)(),
68
96
  (0, type_graphql_1.Field)({ nullable: true }),
@@ -1 +1 @@
1
- {"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../server/service/integration/integration.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,IAAY,QAEX;AAFD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;AACnB,CAAC,EAFW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAEnB;AAED,IAAA,+BAAgB,EAAC,QAAQ,EAAE;IACzB,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,uCAAuC;CACrD,CAAC,CAAA;AAKK,IAAM,WAAW,GAAjB,MAAM,WAAW;CAyDvB,CAAA;AAxDC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;uCACC;AAEnB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACjB,cAAM,oBAAN,cAAM;2CAAA;AAEf;IAAC,IAAA,oBAAU,EAAC,CAAC,WAAwB,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC;;6CAC5C;AAEjB;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACI;AAEZ;IAAC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAEpB;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;6CACU;AAElB;IAAC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACV;AAEhB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACd,IAAI;8CAAA;AAEhB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACd,IAAI;8CAAA;AAEhB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAChB,gBAAI,oBAAJ,gBAAI;4CAAA;AAEd;IAAC,IAAA,oBAAU,EAAC,CAAC,WAAwB,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC;;8CAC5C;AAElB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAChB,gBAAI,oBAAJ,gBAAI;4CAAA;AAEd;IAAC,IAAA,oBAAU,EAAC,CAAC,WAAwB,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC;;8CAC5C;AAxDP,WAAW;IAHvB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,kBAAkB,EAAE,CAAC,WAAwB,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjH,IAAA,yBAAU,EAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;GACzC,WAAW,CAyDvB;AAzDY,kCAAW"}
1
+ {"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../server/service/integration/integration.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-base",
3
- "version": "4.3.234",
3
+ "version": "4.3.238",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -26,10 +26,10 @@
26
26
  "dependencies": {
27
27
  "@apollo/client": "^3.5.6",
28
28
  "@aws-sdk/client-sqs": "^3.46.0",
29
- "@things-factory/api": "^4.3.234",
30
- "@things-factory/auth-base": "^4.3.234",
31
- "@things-factory/oauth2-client": "^4.3.234",
32
- "@things-factory/shell": "^4.3.227",
29
+ "@things-factory/api": "^4.3.237",
30
+ "@things-factory/auth-base": "^4.3.237",
31
+ "@things-factory/oauth2-client": "^4.3.237",
32
+ "@things-factory/shell": "^4.3.237",
33
33
  "async-mqtt": "^2.5.0",
34
34
  "cron": "^1.7.2",
35
35
  "cross-fetch": "^3.0.4",
@@ -40,5 +40,5 @@
40
40
  "promise-socket": "^7.0.0",
41
41
  "vm2": "^3.9.2"
42
42
  },
43
- "gitHead": "f09a8d10fcf4cffc06abb9777ca60ee82b00ce33"
43
+ "gitHead": "926d659dd0e4d6c24c33ed7cf558779a51f5cba7"
44
44
  }
@@ -11,10 +11,16 @@ import {
11
11
  } from 'typeorm'
12
12
 
13
13
  import { User } from '@things-factory/auth-base'
14
+ import { config } from '@things-factory/env'
14
15
  import { Domain } from '@things-factory/shell'
15
16
 
17
+ const ORMCONFIG = config.get('ormconfig', {})
18
+ const DATABASE_TYPE = ORMCONFIG.type
19
+
16
20
  export enum Platform {
17
- POWRUP = 'POWRUP'
21
+ POWRUP = 'POWRUP',
22
+ POWRUP_INTERNAL = 'POWRUP_INTERNAL',
23
+ OTHERS = 'OTHERS'
18
24
  }
19
25
 
20
26
  registerEnumType(Platform, {
@@ -41,13 +47,28 @@ export class Integration {
41
47
  @Field()
42
48
  name: string
43
49
 
50
+ @Column({
51
+ nullable: true
52
+ })
53
+ @Field({ nullable: true })
54
+ accountId?: string
55
+
44
56
  @Column({
45
57
  nullable: true
46
58
  })
47
59
  @Field({ nullable: true })
48
60
  description?: string
49
61
 
50
- @Column()
62
+ @Column({
63
+ type:
64
+ DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
65
+ ? 'enum'
66
+ : DATABASE_TYPE == 'oracle'
67
+ ? 'varchar2'
68
+ : 'smallint',
69
+ enum: Platform,
70
+ default: Platform.OTHERS
71
+ })
51
72
  @Field()
52
73
  platform: Platform
53
74
 
@@ -57,6 +78,13 @@ export class Integration {
57
78
  @Field({ nullable: true })
58
79
  active?: boolean
59
80
 
81
+ @Column({
82
+ nullable: true,
83
+ default: false
84
+ })
85
+ @Field({ nullable: true })
86
+ staging?: boolean
87
+
60
88
  @CreateDateColumn()
61
89
  @Field({ nullable: true })
62
90
  createdAt?: Date
@@ -0,0 +1,3 @@
1
+ {
2
+ "error.scenario not found": "シナリオ'{scenario}'が見つかりません."
3
+ }