@things-factory/integration-base 7.0.1-beta.13 → 7.0.1-beta.18
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.
- package/dist-server/service/connection/connection-query.js +8 -4
- package/dist-server/service/connection/connection-query.js.map +1 -1
- package/dist-server/service/payload-log/payload-log-query.js +1 -1
- package/dist-server/service/payload-log/payload-log-query.js.map +1 -1
- package/dist-server/service/payload-log/payload-log.js +2 -2
- package/dist-server/service/payload-log/payload-log.js.map +1 -1
- package/dist-server/service/scenario/scenario-query.js +1 -1
- package/dist-server/service/scenario/scenario-query.js.map +1 -1
- package/dist-server/service/scenario/scenario.js +2 -2
- package/dist-server/service/scenario/scenario.js.map +1 -1
- package/dist-server/service/scenario-instance/scenario-instance-query.js +1 -1
- package/dist-server/service/scenario-instance/scenario-instance-query.js.map +1 -1
- package/dist-server/service/state-register/state-register-query.js +1 -1
- package/dist-server/service/state-register/state-register-query.js.map +1 -1
- package/dist-server/service/step/step-query.js +1 -1
- package/dist-server/service/step/step-query.js.map +1 -1
- package/dist-server/service/step/step-type.js +2 -2
- package/dist-server/service/step/step-type.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +8 -8
- package/server/service/connection/connection-query.ts +13 -4
- package/server/service/payload-log/payload-log-query.ts +4 -1
- package/server/service/payload-log/payload-log.ts +2 -2
- package/server/service/scenario/scenario-query.ts +1 -1
- package/server/service/scenario/scenario.ts +2 -2
- package/server/service/scenario-instance/scenario-instance-query.ts +4 -1
- package/server/service/state-register/state-register-query.ts +4 -1
- package/server/service/step/step-query.ts +1 -1
- package/server/service/step/step-type.ts +2 -2
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@things-factory/integration-base",
|
3
|
-
"version": "7.0.1-beta.
|
3
|
+
"version": "7.0.1-beta.18",
|
4
4
|
"main": "dist-server/index.js",
|
5
5
|
"browser": "client/index.js",
|
6
6
|
"things-factory": true,
|
@@ -27,12 +27,12 @@
|
|
27
27
|
"dependencies": {
|
28
28
|
"@apollo/client": "^3.6.9",
|
29
29
|
"@operato/moment-timezone-es": "^2.0.0-beta.0",
|
30
|
-
"@things-factory/api": "^7.0.1-beta.
|
31
|
-
"@things-factory/auth-base": "^7.0.1-beta.
|
32
|
-
"@things-factory/env": "^7.0.1-beta.
|
33
|
-
"@things-factory/oauth2-client": "^7.0.1-beta.
|
34
|
-
"@things-factory/scheduler-client": "^7.0.1-beta.
|
35
|
-
"@things-factory/shell": "^7.0.1-beta.
|
30
|
+
"@things-factory/api": "^7.0.1-beta.18",
|
31
|
+
"@things-factory/auth-base": "^7.0.1-beta.18",
|
32
|
+
"@things-factory/env": "^7.0.1-beta.18",
|
33
|
+
"@things-factory/oauth2-client": "^7.0.1-beta.18",
|
34
|
+
"@things-factory/scheduler-client": "^7.0.1-beta.18",
|
35
|
+
"@things-factory/shell": "^7.0.1-beta.18",
|
36
36
|
"@things-factory/utils": "^7.0.1-beta.10",
|
37
37
|
"async-mqtt": "^2.5.0",
|
38
38
|
"chance": "^1.1.11",
|
@@ -43,5 +43,5 @@
|
|
43
43
|
"readline": "^1.3.0",
|
44
44
|
"vm2": "^3.9.11"
|
45
45
|
},
|
46
|
-
"gitHead": "
|
46
|
+
"gitHead": "44f0df6a133577bad8d184a529796c69249a8296"
|
47
47
|
}
|
@@ -19,12 +19,17 @@ export class ConnectionQuery {
|
|
19
19
|
|
20
20
|
return {
|
21
21
|
...connection,
|
22
|
-
state: ConnectionManager.getConnectionInstance(connection)
|
22
|
+
state: ConnectionManager.getConnectionInstance(connection)
|
23
|
+
? ConnectionStatus.CONNECTED
|
24
|
+
: ConnectionStatus.DISCONNECTED
|
23
25
|
} as Connection
|
24
26
|
}
|
25
27
|
|
26
28
|
@Query(returns => ConnectionList, { description: 'To fetch multiple connections' })
|
27
|
-
async connections(
|
29
|
+
async connections(
|
30
|
+
@Args(type => ListParam) params: ListParam,
|
31
|
+
@Ctx() context: ResolverContext
|
32
|
+
): Promise<ConnectionList> {
|
28
33
|
const { domain } = context.state
|
29
34
|
|
30
35
|
const queryBuilder = getQueryBuilderFromListParams({
|
@@ -38,7 +43,9 @@ export class ConnectionQuery {
|
|
38
43
|
const [items, total] = await queryBuilder.leftJoinAndSelect('connection.domain', 'domain').getManyAndCount()
|
39
44
|
|
40
45
|
items.forEach(connection => {
|
41
|
-
connection['state'] = ConnectionManager.getConnectionInstance(connection)
|
46
|
+
connection['state'] = ConnectionManager.getConnectionInstance(connection)
|
47
|
+
? ConnectionStatus.CONNECTED
|
48
|
+
: ConnectionStatus.DISCONNECTED
|
42
49
|
})
|
43
50
|
|
44
51
|
return { items, total }
|
@@ -63,7 +70,9 @@ export class ConnectionQuery {
|
|
63
70
|
|
64
71
|
@FieldResolver(type => Domain)
|
65
72
|
async domain(@Root() connection: Connection) {
|
66
|
-
return
|
73
|
+
return (
|
74
|
+
connection.domain || (connection.domainId && (await getRepository(Domain).findOneBy({ id: connection.domainId })))
|
75
|
+
)
|
67
76
|
}
|
68
77
|
|
69
78
|
@FieldResolver(type => User)
|
@@ -18,7 +18,10 @@ export class PayloadLogQuery {
|
|
18
18
|
}
|
19
19
|
|
20
20
|
@Query(returns => PayloadLogList, { description: 'To fetch multiple PayloadLogs' })
|
21
|
-
async payloadLogs(
|
21
|
+
async payloadLogs(
|
22
|
+
@Args(type => ListParam) params: ListParam,
|
23
|
+
@Ctx() context: ResolverContext
|
24
|
+
): Promise<PayloadLogList> {
|
22
25
|
const { domain } = context.state
|
23
26
|
|
24
27
|
const convertedParams = convertListParams(params, {
|
@@ -81,14 +81,14 @@ export class PayloadLog {
|
|
81
81
|
updatedAt?: Date
|
82
82
|
|
83
83
|
@ManyToOne(type => User, { nullable: true })
|
84
|
-
@Field({ nullable: true })
|
84
|
+
@Field(type => User, { nullable: true })
|
85
85
|
creator?: User
|
86
86
|
|
87
87
|
@RelationId((payloadLog: PayloadLog) => payloadLog.creator)
|
88
88
|
creatorId?: string
|
89
89
|
|
90
90
|
@ManyToOne(type => User, { nullable: true })
|
91
|
-
@Field({ nullable: true })
|
91
|
+
@Field(type => User, { nullable: true })
|
92
92
|
updater?: User
|
93
93
|
|
94
94
|
@RelationId((payloadLog: PayloadLog) => payloadLog.updater)
|
@@ -26,7 +26,7 @@ export class ScenarioQuery {
|
|
26
26
|
|
27
27
|
@Directive('@privilege(category: "scenario", privilege: "query", domainOwnerGranted: true)')
|
28
28
|
@Query(returns => ScenarioList, { description: 'To fetch multiple scenarios' })
|
29
|
-
async scenarios(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ScenarioList> {
|
29
|
+
async scenarios(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<ScenarioList> {
|
30
30
|
const { domain } = context.state
|
31
31
|
|
32
32
|
const queryBuilder = getQueryBuilderFromListParams({
|
@@ -81,14 +81,14 @@ export class Scenario {
|
|
81
81
|
updatedAt?: Date
|
82
82
|
|
83
83
|
@ManyToOne(type => User, { nullable: true })
|
84
|
-
@Field({ nullable: true })
|
84
|
+
@Field(type => User, { nullable: true })
|
85
85
|
creator?: User
|
86
86
|
|
87
87
|
@RelationId((scenario: Scenario) => scenario.creator)
|
88
88
|
creatorId?: string
|
89
89
|
|
90
90
|
@ManyToOne(type => User, { nullable: true })
|
91
|
-
@Field({ nullable: true })
|
91
|
+
@Field(type => User, { nullable: true })
|
92
92
|
updater?: User
|
93
93
|
|
94
94
|
@RelationId((scenario: Scenario) => scenario.updater)
|
@@ -23,7 +23,10 @@ export class ScenarioInstanceQuery {
|
|
23
23
|
}
|
24
24
|
|
25
25
|
@Query(returns => ScenarioInstanceList, { description: 'To fetch multiple scenario instances' })
|
26
|
-
async scenarioInstances(
|
26
|
+
async scenarioInstances(
|
27
|
+
@Args(type => ListParam) params: ListParam,
|
28
|
+
@Ctx() context: ResolverContext
|
29
|
+
): Promise<ScenarioInstanceList> {
|
27
30
|
const { domain } = context.state
|
28
31
|
|
29
32
|
var scenarioInstances = ScenarioEngine.getScenarioInstances(domain)
|
@@ -28,7 +28,10 @@ export class StateRegisterQuery {
|
|
28
28
|
|
29
29
|
@Directive('@privilege(category: "state-register", privilege: "query", domainOwnerGranted: true)')
|
30
30
|
@Query(returns => StateRegisterList, { description: 'To fetch multiple StateRegisters' })
|
31
|
-
async stateRegisters(
|
31
|
+
async stateRegisters(
|
32
|
+
@Args(type => ListParam) params: ListParam,
|
33
|
+
@Ctx() context: ResolverContext
|
34
|
+
): Promise<StateRegisterList> {
|
32
35
|
const { domain } = context.state
|
33
36
|
|
34
37
|
const queryBuilder = getQueryBuilderFromListParams({
|
@@ -18,7 +18,7 @@ export class StepQuery {
|
|
18
18
|
}
|
19
19
|
|
20
20
|
@Query(returns => StepList, { description: 'To fetch multiple steps' })
|
21
|
-
async steps(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<StepList> {
|
21
|
+
async steps(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<StepList> {
|
22
22
|
const { domain } = context.state
|
23
23
|
|
24
24
|
const queryBuilder = getQueryBuilderFromListParams({
|
@@ -137,7 +137,7 @@ export class Step {
|
|
137
137
|
* The user who created this step.
|
138
138
|
*/
|
139
139
|
@ManyToOne(type => User, { nullable: true })
|
140
|
-
@Field({ nullable: true })
|
140
|
+
@Field(type => User, { nullable: true })
|
141
141
|
creator?: User
|
142
142
|
|
143
143
|
/**
|
@@ -150,7 +150,7 @@ export class Step {
|
|
150
150
|
* The user who last updated this step.
|
151
151
|
*/
|
152
152
|
@ManyToOne(type => User, { nullable: true })
|
153
|
-
@Field({ nullable: true })
|
153
|
+
@Field(type => User, { nullable: true })
|
154
154
|
updater?: User
|
155
155
|
|
156
156
|
/**
|