@things-factory/dataset 6.0.0-zeta.12 → 6.0.0-zeta.20
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/data-set/data-set-query.js +8 -6
- package/dist-server/service/data-set/data-set-query.js.map +1 -1
- package/dist-server/service/data-set-history/data-set-history-query.js +8 -6
- package/dist-server/service/data-set-history/data-set-history-query.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
- package/server/service/data-set/data-set-query.ts +8 -6
- package/server/service/data-set-history/data-set-history-query.ts +8 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/dataset",
|
|
3
|
-
"version": "6.0.0-zeta.
|
|
3
|
+
"version": "6.0.0-zeta.20",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -33,14 +33,14 @@
|
|
|
33
33
|
"@operato/shell": "^1.0.1",
|
|
34
34
|
"@operato/styles": "^1.0.0",
|
|
35
35
|
"@operato/utils": "^1.0.1",
|
|
36
|
-
"@things-factory/auth-base": "^6.0.0-zeta.
|
|
37
|
-
"@things-factory/aws-base": "^6.0.0-zeta.
|
|
38
|
-
"@things-factory/board-service": "^6.0.0-zeta.
|
|
36
|
+
"@things-factory/auth-base": "^6.0.0-zeta.20",
|
|
37
|
+
"@things-factory/aws-base": "^6.0.0-zeta.20",
|
|
38
|
+
"@things-factory/board-service": "^6.0.0-zeta.20",
|
|
39
39
|
"@things-factory/env": "^6.0.0-zeta.1",
|
|
40
|
-
"@things-factory/shell": "^6.0.0-zeta.
|
|
41
|
-
"@things-factory/work-shift": "^6.0.0-zeta.
|
|
40
|
+
"@things-factory/shell": "^6.0.0-zeta.20",
|
|
41
|
+
"@things-factory/work-shift": "^6.0.0-zeta.20",
|
|
42
42
|
"cron-parser": "^4.3.0",
|
|
43
43
|
"moment-timezone": "^0.5.34"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "a9ce22fe4130d97245e7377b460d0d76a03de263"
|
|
46
46
|
}
|
|
@@ -114,9 +114,10 @@ export class DataSetQuery {
|
|
|
114
114
|
async entryRole(@Root() dataSet: DataSet): Promise<Role> {
|
|
115
115
|
return (
|
|
116
116
|
dataSet.entryRole ||
|
|
117
|
-
(
|
|
118
|
-
|
|
119
|
-
|
|
117
|
+
(dataSet.entryRoleId &&
|
|
118
|
+
(await getRepository(Role).findOneBy({
|
|
119
|
+
id: dataSet.entryRoleId
|
|
120
|
+
})))
|
|
120
121
|
)
|
|
121
122
|
}
|
|
122
123
|
|
|
@@ -124,9 +125,10 @@ export class DataSetQuery {
|
|
|
124
125
|
async supervisoryRole(@Root() dataSet: DataSet): Promise<Role> {
|
|
125
126
|
return (
|
|
126
127
|
dataSet.supervisoryRole ||
|
|
127
|
-
(
|
|
128
|
-
|
|
129
|
-
|
|
128
|
+
(dataSet.supervisoryRoleId &&
|
|
129
|
+
(await getRepository(Role).findOneBy({
|
|
130
|
+
id: dataSet.supervisoryRoleId
|
|
131
|
+
})))
|
|
130
132
|
)
|
|
131
133
|
}
|
|
132
134
|
|
|
@@ -47,9 +47,10 @@ export class DataSetHistoryQuery {
|
|
|
47
47
|
async entryRole(@Root() dataSetHistory: DataSetHistory): Promise<Role> {
|
|
48
48
|
return (
|
|
49
49
|
dataSetHistory.entryRole ||
|
|
50
|
-
(
|
|
51
|
-
|
|
52
|
-
|
|
50
|
+
(dataSetHistory.entryRoleId &&
|
|
51
|
+
(await getRepository(Role).findOneBy({
|
|
52
|
+
id: dataSetHistory.entryRoleId
|
|
53
|
+
})))
|
|
53
54
|
)
|
|
54
55
|
}
|
|
55
56
|
|
|
@@ -57,9 +58,10 @@ export class DataSetHistoryQuery {
|
|
|
57
58
|
async supervisoryRole(@Root() dataSetHistory: DataSetHistory): Promise<Role> {
|
|
58
59
|
return (
|
|
59
60
|
dataSetHistory.supervisoryRole ||
|
|
60
|
-
(
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
(dataSetHistory.supervisoryRoleId &&
|
|
62
|
+
(await getRepository(Role).findOneBy({
|
|
63
|
+
id: dataSetHistory.supervisoryRoleId
|
|
64
|
+
})))
|
|
63
65
|
)
|
|
64
66
|
}
|
|
65
67
|
|