@things-factory/dataset 5.0.0-alpha.26 → 5.0.0-alpha.29
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/pages/{data-entry-form.js → data-entry/data-entry-form.js} +1 -0
- package/client/pages/data-entry/data-entry-list-page.js +464 -0
- package/client/pages/{data-ooc.js → data-ooc/data-ooc-list-page.js} +3 -3
- package/client/pages/{data-ooc-view.js → data-ooc/data-ooc-view.js} +0 -0
- package/client/pages/{data-sample.js → data-sample/data-sample-list-page.js} +3 -3
- package/client/pages/{data-sample-view.js → data-sample/data-sample-view.js} +0 -0
- package/client/pages/{data-sensor.js → data-sensor/data-sensor-list-page.js} +3 -3
- package/client/pages/{data-item-list.js → data-set/data-item-list.js} +12 -0
- package/client/pages/{data-set-importer.js → data-set/data-set-importer.js} +0 -0
- package/client/pages/{data-set.js → data-set/data-set-list-page.js} +113 -32
- package/client/route.js +12 -8
- package/dist-server/controllers/create-data-sample.js +15 -10
- package/dist-server/controllers/create-data-sample.js.map +1 -1
- package/dist-server/service/data-item/data-item-type.js +4 -0
- package/dist-server/service/data-item/data-item-type.js.map +1 -1
- package/dist-server/service/data-item/data-item.js +7 -0
- package/dist-server/service/data-item/data-item.js.map +1 -1
- package/dist-server/service/data-set/data-set-query.js +98 -1
- package/dist-server/service/data-set/data-set-query.js.map +1 -1
- package/dist-server/service/data-set/data-set-type.js +32 -4
- package/dist-server/service/data-set/data-set-type.js.map +1 -1
- package/dist-server/service/data-set/data-set.js +39 -7
- package/dist-server/service/data-set/data-set.js.map +1 -1
- package/package.json +18 -16
- package/server/controllers/create-data-sample.ts +23 -14
- package/server/service/data-item/data-item-type.ts +3 -0
- package/server/service/data-item/data-item.ts +6 -0
- package/server/service/data-set/data-set-query.ts +79 -1
- package/server/service/data-set/data-set-type.ts +26 -4
- package/server/service/data-set/data-set.ts +36 -6
- package/things-factory.config.js +12 -8
- package/translations/en.json +9 -0
- package/translations/ko.json +8 -0
- package/translations/ms.json +8 -0
- package/translations/zh.json +8 -0
@@ -1,23 +1,59 @@
|
|
1
1
|
import '@operato/data-grist'
|
2
|
-
import './data-item-list'
|
3
|
-
import './data-set-importer'
|
4
|
-
import '
|
2
|
+
import './data-item-list.js'
|
3
|
+
import './data-set-importer.js'
|
4
|
+
import '../data-entry/data-entry-form.js'
|
5
5
|
|
6
|
-
import
|
7
|
-
import
|
6
|
+
import gql from 'graphql-tag'
|
7
|
+
import JSON5 from 'json5'
|
8
8
|
import { css, html } from 'lit'
|
9
|
-
import
|
10
|
-
import {
|
9
|
+
import moment from 'moment-timezone'
|
10
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
11
11
|
|
12
|
-
import
|
12
|
+
import { getEditor, getRenderer } from '@operato/data-grist'
|
13
13
|
import { OxDataUseCase } from '@operato/dataset'
|
14
14
|
import { client } from '@operato/graphql'
|
15
|
-
import {
|
16
|
-
import
|
15
|
+
import { i18next, localize } from '@operato/i18n'
|
16
|
+
import { notify, openPopup } from '@operato/layout'
|
17
|
+
import { PageView, store } from '@operato/shell'
|
18
|
+
import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
|
17
19
|
import { isMobileDevice } from '@operato/utils'
|
18
|
-
import moment from 'moment-timezone'
|
19
20
|
|
20
|
-
|
21
|
+
const DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone
|
22
|
+
const TIMEZONE_OPTIONS = ['', DEFAULT_TZ, ...moment.tz.names().filter(tz => tz !== DEFAULT_TZ)]
|
23
|
+
|
24
|
+
const VIEW_TYPES = [
|
25
|
+
{
|
26
|
+
display: '',
|
27
|
+
value: ''
|
28
|
+
},
|
29
|
+
{
|
30
|
+
display: 'Generated',
|
31
|
+
value: 'generated'
|
32
|
+
},
|
33
|
+
{
|
34
|
+
display: 'Board',
|
35
|
+
value: 'board'
|
36
|
+
},
|
37
|
+
{
|
38
|
+
display: 'Page',
|
39
|
+
value: 'page'
|
40
|
+
},
|
41
|
+
{
|
42
|
+
display: 'External URL',
|
43
|
+
value: 'external'
|
44
|
+
}
|
45
|
+
]
|
46
|
+
|
47
|
+
const USECASE_OPTIONS = () => {
|
48
|
+
return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
|
49
|
+
return {
|
50
|
+
display: name,
|
51
|
+
value: name
|
52
|
+
}
|
53
|
+
})
|
54
|
+
}
|
55
|
+
|
56
|
+
export class DataSetListPage extends connect(store)(localize(i18next)(PageView)) {
|
21
57
|
static get properties() {
|
22
58
|
return {
|
23
59
|
active: String,
|
@@ -48,7 +84,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
48
84
|
get context() {
|
49
85
|
return {
|
50
86
|
title: i18next.t('title.data-set list'),
|
51
|
-
help: '
|
87
|
+
help: 'dataset/data-set',
|
52
88
|
actions: [
|
53
89
|
{
|
54
90
|
title: i18next.t('button.copy'),
|
@@ -231,26 +267,12 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
231
267
|
header: i18next.t('field.use-case'),
|
232
268
|
record: {
|
233
269
|
editable: true,
|
234
|
-
options:
|
235
|
-
return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
|
236
|
-
return {
|
237
|
-
display: name,
|
238
|
-
value: name
|
239
|
-
}
|
240
|
-
})
|
241
|
-
}
|
270
|
+
options: USECASE_OPTIONS
|
242
271
|
},
|
243
272
|
sortable: true,
|
244
273
|
filter: {
|
245
274
|
operator: 'eq',
|
246
|
-
options:
|
247
|
-
return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
|
248
|
-
return {
|
249
|
-
display: name,
|
250
|
-
value: name
|
251
|
-
}
|
252
|
-
})
|
253
|
-
}
|
275
|
+
options: USECASE_OPTIONS /* in case select options type is a function, filter should have its own options */
|
254
276
|
},
|
255
277
|
width: 80
|
256
278
|
},
|
@@ -286,7 +308,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
286
308
|
header: i18next.t('field.timezone'),
|
287
309
|
record: {
|
288
310
|
editable: true,
|
289
|
-
options:
|
311
|
+
options: TIMEZONE_OPTIONS
|
290
312
|
},
|
291
313
|
width: 120
|
292
314
|
},
|
@@ -303,6 +325,62 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
303
325
|
sortable: true,
|
304
326
|
width: 120
|
305
327
|
},
|
328
|
+
{
|
329
|
+
type: 'select',
|
330
|
+
name: 'entryType',
|
331
|
+
label: true,
|
332
|
+
header: i18next.t('field.entry-type'),
|
333
|
+
record: {
|
334
|
+
editable: true,
|
335
|
+
options: VIEW_TYPES
|
336
|
+
},
|
337
|
+
width: 80
|
338
|
+
},
|
339
|
+
{
|
340
|
+
type: 'string',
|
341
|
+
name: 'entryView',
|
342
|
+
header: i18next.t('field.entry-view'),
|
343
|
+
record: {
|
344
|
+
editable: true,
|
345
|
+
editor: function (value, column, record, rowIndex, field) {
|
346
|
+
var type = record.entryType !== 'board' ? 'string' : 'board'
|
347
|
+
return getEditor(type)(value, column, record, rowIndex, field)
|
348
|
+
},
|
349
|
+
renderer: function (value, column, record, rowIndex, field) {
|
350
|
+
var type = record.entryType !== 'board' ? 'string' : 'board'
|
351
|
+
return getRenderer(type)(value, column, record, rowIndex, field)
|
352
|
+
}
|
353
|
+
},
|
354
|
+
width: 140
|
355
|
+
},
|
356
|
+
{
|
357
|
+
type: 'select',
|
358
|
+
name: 'monitorType',
|
359
|
+
label: true,
|
360
|
+
header: i18next.t('field.monitor-type'),
|
361
|
+
record: {
|
362
|
+
editable: true,
|
363
|
+
options: VIEW_TYPES
|
364
|
+
},
|
365
|
+
width: 80
|
366
|
+
},
|
367
|
+
{
|
368
|
+
type: 'string',
|
369
|
+
name: 'monitorView',
|
370
|
+
header: i18next.t('field.monitor-view'),
|
371
|
+
record: {
|
372
|
+
editable: true,
|
373
|
+
editor: function (value, column, record, rowIndex, field) {
|
374
|
+
var type = record.monitorType !== 'board' ? 'string' : 'board'
|
375
|
+
return getEditor(type)(value, column, record, rowIndex, field)
|
376
|
+
},
|
377
|
+
renderer: function (value, column, record, rowIndex, field) {
|
378
|
+
var type = record.monitorType !== 'board' ? 'string' : 'board'
|
379
|
+
return getRenderer(type)(value, column, record, rowIndex, field)
|
380
|
+
}
|
381
|
+
},
|
382
|
+
width: 140
|
383
|
+
},
|
306
384
|
{
|
307
385
|
type: 'resource-object',
|
308
386
|
name: 'updater',
|
@@ -379,7 +457,6 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
379
457
|
name
|
380
458
|
description
|
381
459
|
partitionKeys
|
382
|
-
slugger
|
383
460
|
active
|
384
461
|
type
|
385
462
|
useCase
|
@@ -389,6 +466,10 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
389
466
|
id
|
390
467
|
name
|
391
468
|
}
|
469
|
+
entryType
|
470
|
+
entryView
|
471
|
+
monitorType
|
472
|
+
monitorView
|
392
473
|
updater {
|
393
474
|
id
|
394
475
|
name
|
@@ -549,4 +630,4 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
|
|
549
630
|
}
|
550
631
|
}
|
551
632
|
|
552
|
-
window.customElements.define('data-set-page',
|
633
|
+
window.customElements.define('data-set-list-page', DataSetListPage)
|
package/client/route.js
CHANGED
@@ -1,19 +1,23 @@
|
|
1
1
|
export default function route(page) {
|
2
2
|
switch (page) {
|
3
|
-
case 'data-set':
|
4
|
-
import('./pages/data-set')
|
3
|
+
case 'data-set-list':
|
4
|
+
import('./pages/data-set/data-set-list-page.js')
|
5
5
|
return page
|
6
6
|
|
7
|
-
case 'data-sensor':
|
8
|
-
import('./pages/data-sensor')
|
7
|
+
case 'data-sensor-list':
|
8
|
+
import('./pages/data-sensor/data-sensor-list-page.js')
|
9
9
|
return page
|
10
10
|
|
11
|
-
case 'data-sample':
|
12
|
-
import('./pages/data-sample')
|
11
|
+
case 'data-sample-list':
|
12
|
+
import('./pages/data-sample/data-sample-list-page.js')
|
13
13
|
return page
|
14
14
|
|
15
|
-
case 'data-ooc':
|
16
|
-
import('./pages/data-ooc')
|
15
|
+
case 'data-ooc-list':
|
16
|
+
import('./pages/data-ooc/data-ooc-list-page.js')
|
17
|
+
return page
|
18
|
+
|
19
|
+
case 'data-entry-list':
|
20
|
+
import('./pages/data-entry/data-entry-list-page.js')
|
17
21
|
return page
|
18
22
|
}
|
19
23
|
}
|
@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.createDataSample = void 0;
|
7
|
-
const
|
7
|
+
const moment_timezone_1 = __importDefault(require("moment-timezone"));
|
8
8
|
const shell_1 = require("@things-factory/shell");
|
9
9
|
const data_item_1 = require("../service/data-item/data-item");
|
10
|
+
const data_ooc_1 = require("../service/data-ooc/data-ooc");
|
10
11
|
const data_sample_1 = require("../service/data-sample/data-sample");
|
11
12
|
const data_set_1 = require("../service/data-set/data-set");
|
12
13
|
const data_use_case_1 = require("./data-use-case");
|
13
14
|
const work_shift_1 = require("@things-factory/work-shift");
|
14
|
-
const moment_1 = __importDefault(require("moment"));
|
15
15
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample');
|
16
16
|
// parse variable javascript string pattern
|
17
17
|
const replaceVariables = (keys, dic) => {
|
@@ -51,23 +51,28 @@ async function createDataSample(dataSample, context) {
|
|
51
51
|
}
|
52
52
|
});
|
53
53
|
const spec = dataItems.reduce((spec, dataItem) => {
|
54
|
-
spec[dataItem.tag] = Object.assign(Object.assign({}, dataItem.spec), { name: dataItem.name
|
54
|
+
spec[dataItem.tag] = Object.assign(Object.assign({}, dataItem.spec), { name: dataItem.name, hidden: dataItem.hidden });
|
55
55
|
return spec;
|
56
56
|
}, {});
|
57
57
|
const collectedAt = dataSample.collectedAt || new Date();
|
58
|
-
|
58
|
+
// workDate ex) 2022-04-04
|
59
|
+
const { workDate, workShift } = await (0, work_shift_1.getWorkDateAndShift)(domain, collectedAt);
|
60
|
+
const dateFormat = 'YYYY-MM-DD';
|
61
|
+
// local time dataSet timezone or domain timezone or default 'UTC'
|
62
|
+
const timezone = dataSet['timezone'] || domain['timezone'] || 'UTC';
|
63
|
+
// const collectedAt = dataSample.collectedAt || new Date()
|
64
|
+
const localDateTz = (0, moment_timezone_1.default)(collectedAt).tz(timezone);
|
59
65
|
const defaultPartitionKeys = {
|
60
66
|
domain: domain.subdomain,
|
61
|
-
datasetid: dataSample.dataSet.id
|
62
|
-
|
63
|
-
|
64
|
-
|
67
|
+
datasetid: dataSample.dataSet.id,
|
68
|
+
date: localDateTz.format(dateFormat),
|
69
|
+
workdate: workDate,
|
70
|
+
workshift: workShift
|
65
71
|
};
|
66
72
|
var partitionKeys = Object.assign(Object.assign({}, defaultPartitionKeys), dataSet.partitionKeys);
|
67
|
-
partitionKeys = formatDate(partitionKeys,
|
73
|
+
partitionKeys = formatDate(partitionKeys, localDateTz);
|
68
74
|
partitionKeys = replaceVariables(partitionKeys, Object.assign({}, dataSample.data));
|
69
75
|
const { ooc, oos } = data_use_case_1.DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {};
|
70
|
-
const { workDate, workShift } = await (0, work_shift_1.getWorkDateAndShift)(domain, collectedAt);
|
71
76
|
const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase }, dataSample), { domain,
|
72
77
|
partitionKeys,
|
73
78
|
spec,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":";;;;;;AAAA,
|
1
|
+
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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"}
|
@@ -60,6 +60,10 @@ __decorate([
|
|
60
60
|
(0, type_graphql_1.Field)({ nullable: true }),
|
61
61
|
__metadata("design:type", Boolean)
|
62
62
|
], DataItemPatch.prototype, "active", void 0);
|
63
|
+
__decorate([
|
64
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
65
|
+
__metadata("design:type", Boolean)
|
66
|
+
], DataItemPatch.prototype, "hidden", void 0);
|
63
67
|
__decorate([
|
64
68
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
65
69
|
__metadata("design:type", typeof (_c = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _c : Object)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-item-type.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAAoE;AACpE,iDAA+D;AAG/D,IAAa,aAAa,GAA1B,MAAa,aAAa;
|
1
|
+
{"version":3,"file":"data-item-type.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAAoE;AACpE,iDAA+D;AAG/D,IAAa,aAAa,GAA1B,MAAa,aAAa;CA0CzB,CAAA;AAxCC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,iBAAS,oBAAT,iBAAS;8CAAA;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAGjB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGZ;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC7B;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACtC,oBAAY,oBAAZ,oBAAY;8CAAA;AAGtB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACzB;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACzC,oBAAY,oBAAZ,oBAAY;2CAAA;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACX;AAzCJ,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CA0CzB;AA1CY,sCAAa;AA6C1B,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY"}
|
@@ -84,6 +84,13 @@ __decorate([
|
|
84
84
|
(0, type_graphql_1.Field)({ nullable: true }),
|
85
85
|
__metadata("design:type", Boolean)
|
86
86
|
], DataItem.prototype, "active", void 0);
|
87
|
+
__decorate([
|
88
|
+
(0, typeorm_1.Column)({
|
89
|
+
nullable: true
|
90
|
+
}),
|
91
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
92
|
+
__metadata("design:type", Boolean)
|
93
|
+
], DataItem.prototype, "hidden", void 0);
|
87
94
|
__decorate([
|
88
95
|
(0, typeorm_1.Column)({
|
89
96
|
nullable: true
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-item.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAChB,iDAA4D;AAC5D,+CAA2E;AAE3E,mDAA8C;AAC9C,yDAAgD;AAEhD,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,6BAAa,CAAA;AACf,CAAC,EANW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAMvB;AAED,IAAA,+BAAgB,EAAC,YAAY,EAAE;IAC7B,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,kCAAkC;CAChD,CAAC,CAAA;AAKF,IAAa,QAAQ,GAArB,MAAa,QAAQ;
|
1
|
+
{"version":3,"file":"data-item.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item.ts"],"names":[],"mappings":"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"}
|
@@ -11,16 +11,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
13
13
|
};
|
14
|
-
var _a;
|
14
|
+
var _a, _b;
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
16
16
|
exports.DataSetQuery = void 0;
|
17
17
|
const type_graphql_1 = require("type-graphql");
|
18
18
|
const typeorm_1 = require("typeorm");
|
19
19
|
const auth_base_1 = require("@things-factory/auth-base");
|
20
|
+
const board_service_1 = require("@things-factory/board-service");
|
20
21
|
const shell_1 = require("@things-factory/shell");
|
21
22
|
const data_item_1 = require("../data-item/data-item");
|
23
|
+
const data_sample_1 = require("../data-sample/data-sample");
|
22
24
|
const data_set_1 = require("./data-set");
|
23
25
|
const data_set_type_1 = require("./data-set-type");
|
26
|
+
var parser = require('cron-parser');
|
24
27
|
let DataSetQuery = class DataSetQuery {
|
25
28
|
async dataSet(id, context) {
|
26
29
|
const { domain } = context.state;
|
@@ -34,6 +37,19 @@ let DataSetQuery = class DataSetQuery {
|
|
34
37
|
const [items, total] = await (0, typeorm_1.getRepository)(data_set_1.DataSet).findAndCount(convertedParams);
|
35
38
|
return { items, total };
|
36
39
|
}
|
40
|
+
async dataSetsForEntry(params, context) {
|
41
|
+
const { domain } = context.state;
|
42
|
+
/* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
|
43
|
+
const { where = {}, order, skip, take } = (0, shell_1.convertListParams)(params, domain.id);
|
44
|
+
where.active = (0, typeorm_1.Equal)(true);
|
45
|
+
const [items, total] = await (0, typeorm_1.getRepository)(data_set_1.DataSet).findAndCount({
|
46
|
+
where,
|
47
|
+
order,
|
48
|
+
skip,
|
49
|
+
take
|
50
|
+
});
|
51
|
+
return { items, total };
|
52
|
+
}
|
37
53
|
async dataItems(dataSet) {
|
38
54
|
return await (0, typeorm_1.getRepository)(data_item_1.DataItem).find({
|
39
55
|
dataSet
|
@@ -44,6 +60,16 @@ let DataSetQuery = class DataSetQuery {
|
|
44
60
|
id: dataSet.supervisoryRoleId
|
45
61
|
});
|
46
62
|
}
|
63
|
+
async entryBoard(dataSet) {
|
64
|
+
if (dataSet.entryType == 'board' && dataSet.entryView) {
|
65
|
+
return await (0, typeorm_1.getRepository)(board_service_1.Board).findOne({ id: dataSet.entryView });
|
66
|
+
}
|
67
|
+
}
|
68
|
+
async monitorBoard(dataSet) {
|
69
|
+
if (dataSet.monitorType == 'board' && dataSet.monitorView) {
|
70
|
+
return await (0, typeorm_1.getRepository)(board_service_1.Board).findOne({ id: dataSet.monitorView });
|
71
|
+
}
|
72
|
+
}
|
47
73
|
async domain(dataSet) {
|
48
74
|
return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(dataSet.domainId);
|
49
75
|
}
|
@@ -53,6 +79,34 @@ let DataSetQuery = class DataSetQuery {
|
|
53
79
|
async creator(dataSet) {
|
54
80
|
return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataSet.creatorId);
|
55
81
|
}
|
82
|
+
async latestCollectedAt(dataSet) {
|
83
|
+
const sample = await (0, typeorm_1.getRepository)(data_sample_1.DataSample).findOne({
|
84
|
+
select: ['collectedAt'],
|
85
|
+
where: { dataSet },
|
86
|
+
order: { collectedAt: 'DESC' }
|
87
|
+
});
|
88
|
+
return sample === null || sample === void 0 ? void 0 : sample.collectedAt;
|
89
|
+
}
|
90
|
+
async nextSchedule(dataSet) {
|
91
|
+
const { timezone, schedule } = dataSet;
|
92
|
+
if (!schedule) {
|
93
|
+
return;
|
94
|
+
}
|
95
|
+
var interval = parser.parseExpression(schedule, {
|
96
|
+
tz: timezone
|
97
|
+
});
|
98
|
+
return interval.next().toDate();
|
99
|
+
}
|
100
|
+
async prevSchedule(dataSet) {
|
101
|
+
const { timezone, schedule } = dataSet;
|
102
|
+
if (!schedule) {
|
103
|
+
return;
|
104
|
+
}
|
105
|
+
var interval = parser.parseExpression(schedule, {
|
106
|
+
tz: timezone
|
107
|
+
});
|
108
|
+
return interval.prev().toDate();
|
109
|
+
}
|
56
110
|
};
|
57
111
|
__decorate([
|
58
112
|
(0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)'),
|
@@ -72,6 +126,14 @@ __decorate([
|
|
72
126
|
__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
|
73
127
|
__metadata("design:returntype", Promise)
|
74
128
|
], DataSetQuery.prototype, "dataSets", null);
|
129
|
+
__decorate([
|
130
|
+
(0, type_graphql_1.Query)(returns => data_set_type_1.DataSetList, { description: 'To fetch multiple DataSets for data entry manually' }),
|
131
|
+
__param(0, (0, type_graphql_1.Args)()),
|
132
|
+
__param(1, (0, type_graphql_1.Ctx)()),
|
133
|
+
__metadata("design:type", Function),
|
134
|
+
__metadata("design:paramtypes", [typeof (_b = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _b : Object, Object]),
|
135
|
+
__metadata("design:returntype", Promise)
|
136
|
+
], DataSetQuery.prototype, "dataSetsForEntry", null);
|
75
137
|
__decorate([
|
76
138
|
(0, type_graphql_1.FieldResolver)(type => [data_item_1.DataItem]),
|
77
139
|
__param(0, (0, type_graphql_1.Root)()),
|
@@ -86,6 +148,20 @@ __decorate([
|
|
86
148
|
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
87
149
|
__metadata("design:returntype", Promise)
|
88
150
|
], DataSetQuery.prototype, "supervisoryRole", null);
|
151
|
+
__decorate([
|
152
|
+
(0, type_graphql_1.FieldResolver)(type => board_service_1.Board, { nullable: true }),
|
153
|
+
__param(0, (0, type_graphql_1.Root)()),
|
154
|
+
__metadata("design:type", Function),
|
155
|
+
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
156
|
+
__metadata("design:returntype", Promise)
|
157
|
+
], DataSetQuery.prototype, "entryBoard", null);
|
158
|
+
__decorate([
|
159
|
+
(0, type_graphql_1.FieldResolver)(type => board_service_1.Board, { nullable: true }),
|
160
|
+
__param(0, (0, type_graphql_1.Root)()),
|
161
|
+
__metadata("design:type", Function),
|
162
|
+
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
163
|
+
__metadata("design:returntype", Promise)
|
164
|
+
], DataSetQuery.prototype, "monitorBoard", null);
|
89
165
|
__decorate([
|
90
166
|
(0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
|
91
167
|
__param(0, (0, type_graphql_1.Root)()),
|
@@ -107,6 +183,27 @@ __decorate([
|
|
107
183
|
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
108
184
|
__metadata("design:returntype", Promise)
|
109
185
|
], DataSetQuery.prototype, "creator", null);
|
186
|
+
__decorate([
|
187
|
+
(0, type_graphql_1.FieldResolver)(type => Date, { nullable: true }),
|
188
|
+
__param(0, (0, type_graphql_1.Root)()),
|
189
|
+
__metadata("design:type", Function),
|
190
|
+
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
191
|
+
__metadata("design:returntype", Promise)
|
192
|
+
], DataSetQuery.prototype, "latestCollectedAt", null);
|
193
|
+
__decorate([
|
194
|
+
(0, type_graphql_1.FieldResolver)(type => Date, { nullable: true }),
|
195
|
+
__param(0, (0, type_graphql_1.Root)()),
|
196
|
+
__metadata("design:type", Function),
|
197
|
+
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
198
|
+
__metadata("design:returntype", Promise)
|
199
|
+
], DataSetQuery.prototype, "nextSchedule", null);
|
200
|
+
__decorate([
|
201
|
+
(0, type_graphql_1.FieldResolver)(type => Date, { nullable: true }),
|
202
|
+
__param(0, (0, type_graphql_1.Root)()),
|
203
|
+
__metadata("design:type", Function),
|
204
|
+
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
205
|
+
__metadata("design:returntype", Promise)
|
206
|
+
], DataSetQuery.prototype, "prevSchedule", null);
|
110
207
|
DataSetQuery = __decorate([
|
111
208
|
(0, type_graphql_1.Resolver)(data_set_1.DataSet)
|
112
209
|
], DataSetQuery);
|
@@ -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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"}
|
@@ -52,6 +52,22 @@ __decorate([
|
|
52
52
|
(0, type_graphql_1.Field)({ nullable: true }),
|
53
53
|
__metadata("design:type", String)
|
54
54
|
], NewDataSet.prototype, "timezone", void 0);
|
55
|
+
__decorate([
|
56
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
57
|
+
__metadata("design:type", String)
|
58
|
+
], NewDataSet.prototype, "entryType", void 0);
|
59
|
+
__decorate([
|
60
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
61
|
+
__metadata("design:type", String)
|
62
|
+
], NewDataSet.prototype, "entryView", void 0);
|
63
|
+
__decorate([
|
64
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
65
|
+
__metadata("design:type", String)
|
66
|
+
], NewDataSet.prototype, "monitorType", void 0);
|
67
|
+
__decorate([
|
68
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
69
|
+
__metadata("design:type", String)
|
70
|
+
], NewDataSet.prototype, "monitorView", void 0);
|
55
71
|
NewDataSet = __decorate([
|
56
72
|
(0, type_graphql_1.InputType)()
|
57
73
|
], NewDataSet);
|
@@ -78,10 +94,6 @@ __decorate([
|
|
78
94
|
(0, type_graphql_1.Field)({ nullable: true }),
|
79
95
|
__metadata("design:type", Boolean)
|
80
96
|
], DataSetPatch.prototype, "active", void 0);
|
81
|
-
__decorate([
|
82
|
-
(0, type_graphql_1.Field)({ nullable: true }),
|
83
|
-
__metadata("design:type", String)
|
84
|
-
], DataSetPatch.prototype, "type", void 0);
|
85
97
|
__decorate([
|
86
98
|
(0, type_graphql_1.Field)({ nullable: true }),
|
87
99
|
__metadata("design:type", String)
|
@@ -98,6 +110,22 @@ __decorate([
|
|
98
110
|
(0, type_graphql_1.Field)({ nullable: true }),
|
99
111
|
__metadata("design:type", String)
|
100
112
|
], DataSetPatch.prototype, "timezone", void 0);
|
113
|
+
__decorate([
|
114
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
115
|
+
__metadata("design:type", String)
|
116
|
+
], DataSetPatch.prototype, "entryType", void 0);
|
117
|
+
__decorate([
|
118
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
119
|
+
__metadata("design:type", String)
|
120
|
+
], DataSetPatch.prototype, "entryView", void 0);
|
121
|
+
__decorate([
|
122
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
123
|
+
__metadata("design:type", String)
|
124
|
+
], DataSetPatch.prototype, "monitorType", void 0);
|
125
|
+
__decorate([
|
126
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
127
|
+
__metadata("design:type", String)
|
128
|
+
], DataSetPatch.prototype, "monitorView", void 0);
|
101
129
|
__decorate([
|
102
130
|
(0, type_graphql_1.Field)(),
|
103
131
|
__metadata("design:type", String)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-set-type.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoE;
|
1
|
+
{"version":3,"file":"data-set-type.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-type.ts"],"names":[],"mappings":"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"}
|