@things-factory/dataset 5.0.0-alpha.35 → 5.0.0-alpha.36
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/client/bootstrap.js +5 -2
- package/client/pages/data-report/data-report-list-page.js +7 -7
- package/client/pages/data-set/data-set-list-page.js +10 -9
- package/dist-server/service/data-item/data-item-query.js +7 -2
- package/dist-server/service/data-item/data-item-query.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc-query.js +7 -2
- package/dist-server/service/data-ooc/data-ooc-query.js.map +1 -1
- package/dist-server/service/data-sample/data-sample-query.js +7 -2
- package/dist-server/service/data-sample/data-sample-query.js.map +1 -1
- package/dist-server/service/data-sensor/data-sensor-query.js +7 -2
- package/dist-server/service/data-sensor/data-sensor-query.js.map +1 -1
- package/dist-server/service/data-set/data-set-query.js +37 -20
- package/dist-server/service/data-set/data-set-query.js.map +1 -1
- package/package.json +16 -16
- package/server/service/data-item/data-item-query.ts +9 -3
- package/server/service/data-ooc/data-ooc-query.ts +9 -3
- package/server/service/data-sample/data-sample-query.ts +9 -3
- package/server/service/data-sensor/data-sensor-query.ts +9 -3
- package/server/service/data-set/data-set-query.ts +44 -24
- package/yarn-error.log +4 -4
package/client/bootstrap.js
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
1
|
+
import '@operato/app/filter-renderer.js' /* register resource-object filter renderer */
|
|
2
|
+
|
|
3
3
|
import {
|
|
4
4
|
OxGristRendererJson5,
|
|
5
5
|
registerEditor as registerGristEditor,
|
|
6
6
|
registerRenderer as registerGristRenderer
|
|
7
7
|
} from '@operato/data-grist'
|
|
8
|
+
|
|
9
|
+
import { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js'
|
|
8
10
|
import { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor'
|
|
11
|
+
import { OxGristEditorPartitionKeys } from '@operato/app/grist-editor/ox-grist-editor-partition-keys.js'
|
|
9
12
|
|
|
10
13
|
export default function bootstrap() {
|
|
11
14
|
registerGristEditor('data-item-spec', OxGristEditorDataItemSpec)
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import '@operato/data-grist'
|
|
2
2
|
import '@operato/board/ox-board-viewer.js'
|
|
3
3
|
|
|
4
|
-
import
|
|
5
|
-
import
|
|
4
|
+
import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
|
|
5
|
+
import { PageView, navigate, store } from '@operato/shell'
|
|
6
6
|
import { css, html } from 'lit'
|
|
7
|
-
import {
|
|
7
|
+
import { i18next, localize } from '@operato/i18n'
|
|
8
8
|
|
|
9
|
+
import JSON5 from 'json5'
|
|
9
10
|
import { OxDataUseCase } from '@operato/dataset'
|
|
10
11
|
import { client } from '@operato/graphql'
|
|
11
|
-
import {
|
|
12
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
|
13
|
+
import gql from 'graphql-tag'
|
|
12
14
|
import { openPopup } from '@operato/layout'
|
|
13
|
-
import { navigate, PageView, store } from '@operato/shell'
|
|
14
|
-
import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
|
|
15
15
|
import { provider } from '@things-factory/board-ui'
|
|
16
16
|
|
|
17
17
|
const USECASE_OPTIONS = () => {
|
|
@@ -394,7 +394,7 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
394
394
|
const response = await client.query({
|
|
395
395
|
query: gql`
|
|
396
396
|
query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
|
|
397
|
-
responses:
|
|
397
|
+
responses: dataSetsForReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
398
398
|
items {
|
|
399
399
|
id
|
|
400
400
|
name
|
|
@@ -3,20 +3,20 @@ import './data-item-list.js'
|
|
|
3
3
|
import './data-set-importer.js'
|
|
4
4
|
import '../data-entry/data-entry-form.js'
|
|
5
5
|
|
|
6
|
-
import
|
|
7
|
-
import
|
|
6
|
+
import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
|
|
7
|
+
import { PageView, store } from '@operato/shell'
|
|
8
8
|
import { css, html } from 'lit'
|
|
9
|
-
import moment from 'moment-timezone'
|
|
10
|
-
import { connect } from 'pwa-helpers/connect-mixin'
|
|
11
|
-
|
|
12
9
|
import { getEditor, getRenderer } from '@operato/data-grist'
|
|
13
|
-
import { OxDataUseCase } from '@operato/dataset'
|
|
14
|
-
import { client } from '@operato/graphql'
|
|
15
10
|
import { i18next, localize } from '@operato/i18n'
|
|
16
11
|
import { notify, openPopup } from '@operato/layout'
|
|
17
|
-
|
|
18
|
-
import
|
|
12
|
+
|
|
13
|
+
import JSON5 from 'json5'
|
|
14
|
+
import { OxDataUseCase } from '@operato/dataset'
|
|
15
|
+
import { client } from '@operato/graphql'
|
|
16
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
|
17
|
+
import gql from 'graphql-tag'
|
|
19
18
|
import { isMobileDevice } from '@operato/utils'
|
|
19
|
+
import moment from 'moment-timezone'
|
|
20
20
|
|
|
21
21
|
const DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone
|
|
22
22
|
const TIMEZONE_OPTIONS = ['', DEFAULT_TZ, ...moment.tz.names().filter(tz => tz !== DEFAULT_TZ)]
|
|
@@ -369,6 +369,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
369
369
|
}
|
|
370
370
|
},
|
|
371
371
|
sortable: true,
|
|
372
|
+
filter: 'like',
|
|
372
373
|
width: 120
|
|
373
374
|
},
|
|
374
375
|
{
|
|
@@ -30,8 +30,13 @@ let DataItemQuery = class DataItemQuery {
|
|
|
30
30
|
}
|
|
31
31
|
async dataItems(params, context) {
|
|
32
32
|
const { domain } = context.state;
|
|
33
|
-
const
|
|
34
|
-
|
|
33
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
34
|
+
repository: (0, typeorm_1.getRepository)(data_item_1.DataItem),
|
|
35
|
+
params,
|
|
36
|
+
domain,
|
|
37
|
+
alias: 'dataitem'
|
|
38
|
+
});
|
|
39
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
35
40
|
return { items, total };
|
|
36
41
|
}
|
|
37
42
|
async dataSet(dataItem) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-item-query.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"data-item-query.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,8 +31,13 @@ let DataOocQuery = class DataOocQuery {
|
|
|
31
31
|
}
|
|
32
32
|
async dataOocs(params, context) {
|
|
33
33
|
const { domain } = context.state;
|
|
34
|
-
const
|
|
35
|
-
|
|
34
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
35
|
+
repository: (0, typeorm_1.getRepository)(data_ooc_1.DataOoc),
|
|
36
|
+
params,
|
|
37
|
+
domain,
|
|
38
|
+
alias: 'dataooc'
|
|
39
|
+
});
|
|
40
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
36
41
|
return { items, total };
|
|
37
42
|
}
|
|
38
43
|
async dataSet(dataOoc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-ooc-query.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"data-ooc-query.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,13 @@ let DataSampleQuery = class DataSampleQuery {
|
|
|
30
30
|
}
|
|
31
31
|
async dataSamples(params, context) {
|
|
32
32
|
const { domain } = context.state;
|
|
33
|
-
const
|
|
34
|
-
|
|
33
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
34
|
+
repository: (0, typeorm_1.getRepository)(data_sample_1.DataSample),
|
|
35
|
+
params,
|
|
36
|
+
domain,
|
|
37
|
+
alias: 'datasample'
|
|
38
|
+
});
|
|
39
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
35
40
|
return { items, total };
|
|
36
41
|
}
|
|
37
42
|
async dataSet(dataSample) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sample-query.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"data-sample-query.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,13 @@ let DataSensorQuery = class DataSensorQuery {
|
|
|
30
30
|
}
|
|
31
31
|
async dataSensors(params, context) {
|
|
32
32
|
const { domain } = context.state;
|
|
33
|
-
const
|
|
34
|
-
|
|
33
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
34
|
+
repository: (0, typeorm_1.getRepository)(data_sensor_1.DataSensor),
|
|
35
|
+
params,
|
|
36
|
+
domain,
|
|
37
|
+
alias: 'datasensor'
|
|
38
|
+
});
|
|
39
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
35
40
|
return { items, total };
|
|
36
41
|
}
|
|
37
42
|
async appliance(dataSensor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sensor-query.js","sourceRoot":"","sources":["../../../server/service/data-sensor/data-sensor-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,qCAAuC;AAEvC,yDAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"data-sensor-query.js","sourceRoot":"","sources":["../../../server/service/data-sensor/data-sensor-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,34 +33,51 @@ let DataSetQuery = class DataSetQuery {
|
|
|
33
33
|
}
|
|
34
34
|
async dataSets(params, context) {
|
|
35
35
|
const { domain } = context.state;
|
|
36
|
-
const
|
|
37
|
-
|
|
36
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
37
|
+
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
|
38
|
+
params,
|
|
39
|
+
domain,
|
|
40
|
+
alias: 'dataset'
|
|
41
|
+
});
|
|
42
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
38
43
|
return { items, total };
|
|
39
44
|
}
|
|
40
45
|
async dataSetsForEntry(params, context) {
|
|
41
|
-
|
|
42
|
-
/*
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
46
|
+
var { domain, user } = context.state;
|
|
47
|
+
/* 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
|
|
48
|
+
user = await (0, typeorm_1.getRepository)(auth_base_1.User).findOne({
|
|
49
|
+
where: { id: user.id },
|
|
50
|
+
relations: ['roles']
|
|
51
|
+
});
|
|
52
|
+
const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id);
|
|
53
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
54
|
+
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
|
55
|
+
params,
|
|
56
|
+
domain,
|
|
57
|
+
alias: 'dataset'
|
|
50
58
|
});
|
|
59
|
+
queryBuilder.andWhere(`dataset.active = :active`, { active: true });
|
|
60
|
+
queryBuilder.andWhere(`dataset.entry_role_id IN (:...roles)`, { roles });
|
|
61
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
51
62
|
return { items, total };
|
|
52
63
|
}
|
|
53
64
|
async dataSetsForReport(params, context) {
|
|
54
|
-
|
|
55
|
-
/*
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
65
|
+
var { domain, user } = context.state;
|
|
66
|
+
/* 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
|
|
67
|
+
user = await (0, typeorm_1.getRepository)(auth_base_1.User).findOne({
|
|
68
|
+
where: { id: user.id },
|
|
69
|
+
relations: ['roles']
|
|
70
|
+
});
|
|
71
|
+
const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id);
|
|
72
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
73
|
+
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
|
74
|
+
params,
|
|
75
|
+
domain,
|
|
76
|
+
alias: 'dataset'
|
|
63
77
|
});
|
|
78
|
+
queryBuilder.andWhere(`dataset.active = :active`, { active: true });
|
|
79
|
+
queryBuilder.andWhere(`dataset.supervisory_role_id IN (:...roles)`, { roles });
|
|
80
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
64
81
|
return { items, total };
|
|
65
82
|
}
|
|
66
83
|
async dataItems(dataSet) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-query.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"data-set-query.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/dataset",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.36",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,22 +24,22 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@operato/app": "1.0.0-beta.
|
|
28
|
-
"@operato/data-grist": "1.0.0-beta.
|
|
29
|
-
"@operato/dataset": "1.0.0-beta.
|
|
30
|
-
"@operato/graphql": "1.0.0-beta.
|
|
31
|
-
"@operato/i18n": "1.0.0-beta.
|
|
32
|
-
"@operato/layout": "1.0.0-beta.
|
|
33
|
-
"@operato/shell": "1.0.0-beta.
|
|
34
|
-
"@operato/styles": "1.0.0-beta.
|
|
35
|
-
"@operato/utils": "1.0.0-beta.
|
|
36
|
-
"@things-factory/auth-base": "^5.0.0-alpha.
|
|
37
|
-
"@things-factory/board-service": "^5.0.0-alpha.
|
|
38
|
-
"@things-factory/env": "^5.0.0-alpha.
|
|
39
|
-
"@things-factory/shell": "^5.0.0-alpha.
|
|
40
|
-
"@things-factory/work-shift": "^5.0.0-alpha.
|
|
27
|
+
"@operato/app": "1.0.0-beta.4",
|
|
28
|
+
"@operato/data-grist": "1.0.0-beta.4",
|
|
29
|
+
"@operato/dataset": "1.0.0-beta.4",
|
|
30
|
+
"@operato/graphql": "1.0.0-beta.4",
|
|
31
|
+
"@operato/i18n": "1.0.0-beta.4",
|
|
32
|
+
"@operato/layout": "1.0.0-beta.4",
|
|
33
|
+
"@operato/shell": "1.0.0-beta.4",
|
|
34
|
+
"@operato/styles": "1.0.0-beta.4",
|
|
35
|
+
"@operato/utils": "1.0.0-beta.4",
|
|
36
|
+
"@things-factory/auth-base": "^5.0.0-alpha.36",
|
|
37
|
+
"@things-factory/board-service": "^5.0.0-alpha.36",
|
|
38
|
+
"@things-factory/env": "^5.0.0-alpha.36",
|
|
39
|
+
"@things-factory/shell": "^5.0.0-alpha.36",
|
|
40
|
+
"@things-factory/work-shift": "^5.0.0-alpha.36",
|
|
41
41
|
"cron-parser": "^4.3.0",
|
|
42
42
|
"moment-timezone": "^0.5.34"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "e9b944908264f902a4edb2c0bc92c4ea0607bb10"
|
|
45
45
|
}
|
|
@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
5
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
6
6
|
|
|
7
7
|
import { DataSet } from '../data-set/data-set'
|
|
8
8
|
import { DataItem } from './data-item'
|
|
@@ -25,8 +25,14 @@ export class DataItemQuery {
|
|
|
25
25
|
async dataItems(@Args() params: ListParam, @Ctx() context: any): Promise<DataItemList> {
|
|
26
26
|
const { domain } = context.state
|
|
27
27
|
|
|
28
|
-
const
|
|
29
|
-
|
|
28
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
29
|
+
repository: getRepository(DataItem),
|
|
30
|
+
params,
|
|
31
|
+
domain,
|
|
32
|
+
alias: 'dataitem'
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
30
36
|
|
|
31
37
|
return { items, total }
|
|
32
38
|
}
|
|
@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
5
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
6
6
|
|
|
7
7
|
import { DataSample } from '../data-sample/data-sample'
|
|
8
8
|
import { DataSet } from '../data-set/data-set'
|
|
@@ -26,8 +26,14 @@ export class DataOocQuery {
|
|
|
26
26
|
async dataOocs(@Args() params: ListParam, @Ctx() context: any): Promise<DataOocList> {
|
|
27
27
|
const { domain } = context.state
|
|
28
28
|
|
|
29
|
-
const
|
|
30
|
-
|
|
29
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
30
|
+
repository: getRepository(DataOoc),
|
|
31
|
+
params,
|
|
32
|
+
domain,
|
|
33
|
+
alias: 'dataooc'
|
|
34
|
+
})
|
|
35
|
+
|
|
36
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
31
37
|
|
|
32
38
|
return { items, total }
|
|
33
39
|
}
|
|
@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
5
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
6
6
|
|
|
7
7
|
import { DataSet } from '../data-set/data-set'
|
|
8
8
|
import { DataSample } from './data-sample'
|
|
@@ -25,8 +25,14 @@ export class DataSampleQuery {
|
|
|
25
25
|
async dataSamples(@Args() params: ListParam, @Ctx() context: any): Promise<DataSampleList> {
|
|
26
26
|
const { domain } = context.state
|
|
27
27
|
|
|
28
|
-
const
|
|
29
|
-
|
|
28
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
29
|
+
repository: getRepository(DataSample),
|
|
30
|
+
params,
|
|
31
|
+
domain,
|
|
32
|
+
alias: 'datasample'
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
30
36
|
|
|
31
37
|
return { items, total }
|
|
32
38
|
}
|
|
@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graph
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { Appliance, User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
5
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
6
6
|
|
|
7
7
|
import { DataSet } from '../data-set/data-set'
|
|
8
8
|
import { DataSensor } from './data-sensor'
|
|
@@ -23,8 +23,14 @@ export class DataSensorQuery {
|
|
|
23
23
|
async dataSensors(@Args() params: ListParam, @Ctx() context: any): Promise<DataSensorList> {
|
|
24
24
|
const { domain } = context.state
|
|
25
25
|
|
|
26
|
-
const
|
|
27
|
-
|
|
26
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
27
|
+
repository: getRepository(DataSensor),
|
|
28
|
+
params,
|
|
29
|
+
domain,
|
|
30
|
+
alias: 'datasensor'
|
|
31
|
+
})
|
|
32
|
+
|
|
33
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
28
34
|
|
|
29
35
|
return { items, total }
|
|
30
36
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
2
|
-
import {
|
|
2
|
+
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { Role, User } from '@things-factory/auth-base'
|
|
5
5
|
import { Board } from '@things-factory/board-service'
|
|
6
|
-
import {
|
|
6
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
7
7
|
|
|
8
8
|
import { DataItem } from '../data-item/data-item'
|
|
9
9
|
import { DataSample } from '../data-sample/data-sample'
|
|
@@ -29,47 +29,67 @@ export class DataSetQuery {
|
|
|
29
29
|
async dataSets(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
|
|
30
30
|
const { domain } = context.state
|
|
31
31
|
|
|
32
|
-
const
|
|
33
|
-
|
|
32
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
33
|
+
repository: getRepository(DataSet),
|
|
34
|
+
params,
|
|
35
|
+
domain,
|
|
36
|
+
alias: 'dataset'
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
34
40
|
|
|
35
41
|
return { items, total }
|
|
36
42
|
}
|
|
37
43
|
|
|
38
44
|
@Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
|
|
39
45
|
async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
|
|
40
|
-
|
|
46
|
+
var { domain, user } = context.state
|
|
41
47
|
|
|
42
|
-
/*
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
/* 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
|
|
49
|
+
user = await getRepository(User).findOne({
|
|
50
|
+
where: { id: user.id },
|
|
51
|
+
relations: ['roles']
|
|
52
|
+
})
|
|
53
|
+
const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
|
|
46
54
|
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
55
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
56
|
+
repository: getRepository(DataSet),
|
|
57
|
+
params,
|
|
58
|
+
domain,
|
|
59
|
+
alias: 'dataset'
|
|
52
60
|
})
|
|
53
61
|
|
|
62
|
+
queryBuilder.andWhere(`dataset.active = :active`, { active: true })
|
|
63
|
+
queryBuilder.andWhere(`dataset.entry_role_id IN (:...roles)`, { roles })
|
|
64
|
+
|
|
65
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
66
|
+
|
|
54
67
|
return { items, total }
|
|
55
68
|
}
|
|
56
69
|
|
|
57
70
|
@Query(returns => DataSetList, { description: 'To fetch multiple DataSets to see data report' })
|
|
58
71
|
async dataSetsForReport(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
/* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
|
|
72
|
+
var { domain, user } = context.state
|
|
62
73
|
|
|
63
|
-
|
|
64
|
-
|
|
74
|
+
/* 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
|
|
75
|
+
user = await getRepository(User).findOne({
|
|
76
|
+
where: { id: user.id },
|
|
77
|
+
relations: ['roles']
|
|
78
|
+
})
|
|
79
|
+
const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
|
|
65
80
|
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
81
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
82
|
+
repository: getRepository(DataSet),
|
|
83
|
+
params,
|
|
84
|
+
domain,
|
|
85
|
+
alias: 'dataset'
|
|
71
86
|
})
|
|
72
87
|
|
|
88
|
+
queryBuilder.andWhere(`dataset.active = :active`, { active: true })
|
|
89
|
+
queryBuilder.andWhere(`dataset.supervisory_role_id IN (:...roles)`, { roles })
|
|
90
|
+
|
|
91
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
92
|
+
|
|
73
93
|
return { items, total }
|
|
74
94
|
}
|
|
75
95
|
|
package/yarn-error.log
CHANGED
|
@@ -1176,7 +1176,7 @@ Lockfile:
|
|
|
1176
1176
|
"@babel/types" "^7.17.0"
|
|
1177
1177
|
convert-source-map "^1.7.0"
|
|
1178
1178
|
debug "^4.1.0"
|
|
1179
|
-
gensync "^1.0.0-beta.
|
|
1179
|
+
gensync "^1.0.0-beta.4"
|
|
1180
1180
|
json5 "^2.1.2"
|
|
1181
1181
|
semver "^6.3.0"
|
|
1182
1182
|
|
|
@@ -11884,9 +11884,9 @@ Lockfile:
|
|
|
11884
11884
|
resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
|
|
11885
11885
|
integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
|
|
11886
11886
|
|
|
11887
|
-
gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.
|
|
11888
|
-
version "1.0.0-beta.
|
|
11889
|
-
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.
|
|
11887
|
+
gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.4:
|
|
11888
|
+
version "1.0.0-beta.4"
|
|
11889
|
+
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.4.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
|
|
11890
11890
|
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
|
|
11891
11891
|
|
|
11892
11892
|
get-caller-file@^1.0.1:
|