@things-factory/dataset 5.0.0-alpha.39 → 5.0.0-alpha.41
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-ooc/data-ooc-list-page.js +43 -48
- package/client/pages/data-report/data-report-list-page.js +3 -3
- package/client/pages/data-report/jasper-report-oocs-page.js +115 -0
- package/client/pages/data-report/jasper-report-samples-page.js +115 -0
- package/client/pages/data-sample/data-sample-list-page.js +43 -48
- package/client/pages/data-sensor/data-sensor-list-page.js +37 -53
- package/client/pages/data-set/data-set-list-page.js +28 -43
- package/client/route.js +8 -0
- package/config/config.development.js +13 -0
- package/config/config.production.js +1 -0
- package/dist-server/controllers/jasper-report.js +129 -0
- package/dist-server/controllers/jasper-report.js.map +1 -0
- package/dist-server/routes.js +4 -0
- package/dist-server/routes.js.map +1 -1
- package/dist-server/service/data-set/data-set-mutation.js +27 -4
- package/dist-server/service/data-set/data-set-mutation.js.map +1 -1
- package/dist-server/service/data-set/data-set-query.js +23 -0
- package/dist-server/service/data-set/data-set-query.js.map +1 -1
- package/dist-server/service/data-set/data-set-type.js +13 -4
- package/dist-server/service/data-set/data-set-type.js.map +1 -1
- package/dist-server/service/data-set/data-set.js +4 -0
- package/dist-server/service/data-set/data-set.js.map +1 -1
- package/package.json +17 -16
- package/server/controllers/jasper-report.ts +130 -0
- package/server/routes.ts +4 -0
- package/server/service/data-set/data-set-mutation.ts +41 -4
- package/server/service/data-set/data-set-query.ts +21 -0
- package/server/service/data-set/data-set-type.ts +7 -0
- package/server/service/data-set/data-set.ts +3 -0
- package/things-factory.config.js +8 -0
- package/translations/en.json +1 -0
- package/translations/ko.json +1 -0
@@ -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 { PageView, store } from '@operato/shell'
|
6
|
+
import gql from 'graphql-tag'
|
8
7
|
import { css, html } from 'lit'
|
9
|
-
import
|
10
|
-
import {
|
11
|
-
import { notify, openPopup } from '@operato/layout'
|
8
|
+
import moment from 'moment-timezone'
|
9
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
12
10
|
|
13
|
-
import
|
11
|
+
import { getEditor, getRenderer } from '@operato/data-grist'
|
14
12
|
import { OxDataUseCase } from '@operato/dataset'
|
15
13
|
import { client } from '@operato/graphql'
|
16
|
-
import {
|
17
|
-
import
|
14
|
+
import { i18next, localize } from '@operato/i18n'
|
15
|
+
import { notify, openPopup } from '@operato/layout'
|
16
|
+
import { PageView, store } from '@operato/shell'
|
17
|
+
import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
|
18
18
|
import { isMobileDevice } from '@operato/utils'
|
19
|
-
import
|
19
|
+
import { FileSelector } from '@things-factory/attachment-ui'
|
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)]
|
@@ -98,14 +98,11 @@ const USECASE_OPTIONS = () => {
|
|
98
98
|
}
|
99
99
|
})
|
100
100
|
}
|
101
|
-
|
102
101
|
export class DataSetListPage extends connect(store)(localize(i18next)(PageView)) {
|
103
102
|
static get properties() {
|
104
103
|
return {
|
105
104
|
active: String,
|
106
105
|
gristConfig: Object,
|
107
|
-
filters: Object,
|
108
|
-
sorters: Object,
|
109
106
|
mode: String
|
110
107
|
}
|
111
108
|
}
|
@@ -165,11 +162,10 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
165
162
|
<ox-grist
|
166
163
|
.mode=${mode}
|
167
164
|
.config=${this.gristConfig}
|
168
|
-
.filters=${this.filters}
|
169
|
-
.orders=${this.orders}
|
170
165
|
.fetchHandler=${this.fetchHandler.bind(this)}
|
166
|
+
url-params-sensitive
|
171
167
|
>
|
172
|
-
<div slot="headroom"
|
168
|
+
<div slot="headroom">
|
173
169
|
<div id="filters">
|
174
170
|
<ox-filters-form></ox-filters-form>
|
175
171
|
</div>
|
@@ -206,6 +202,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
206
202
|
}
|
207
203
|
|
208
204
|
async pageInitialized(lifecycle) {
|
205
|
+
const fileSelector = new FileSelector()
|
209
206
|
this.gristConfig = {
|
210
207
|
list: {
|
211
208
|
fields: ['name', 'description'],
|
@@ -469,6 +466,15 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
469
466
|
},
|
470
467
|
width: 140
|
471
468
|
},
|
469
|
+
{
|
470
|
+
type: 'file',
|
471
|
+
name: 'reportTemplate',
|
472
|
+
header: i18next.t('field.report-template'),
|
473
|
+
record: {
|
474
|
+
editable: true
|
475
|
+
},
|
476
|
+
width: 80
|
477
|
+
},
|
472
478
|
{
|
473
479
|
type: 'resource-object',
|
474
480
|
name: 'updater',
|
@@ -507,34 +513,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
507
513
|
this.grist.fetch()
|
508
514
|
}
|
509
515
|
|
510
|
-
async pageUpdated(changes, lifecycle) {
|
511
|
-
if (this.active) {
|
512
|
-
await this.updateComplete
|
513
|
-
|
514
|
-
var filters = lifecycle.params?.['filters']
|
515
|
-
if (filters) {
|
516
|
-
try {
|
517
|
-
filters = JSON5.parse(filters)
|
518
|
-
this.filters = filters
|
519
|
-
} catch (e) {
|
520
|
-
console.error(`filters parameter parsing error: ${e}`)
|
521
|
-
}
|
522
|
-
}
|
523
|
-
|
524
|
-
var sorters = lifecycle.params?.['sorters']
|
525
|
-
if (sorters) {
|
526
|
-
try {
|
527
|
-
sorters = JSON5.parse(sorters)
|
528
|
-
this.sorters = sorters
|
529
|
-
} catch (e) {
|
530
|
-
console.error(`sorters parameter parsing error: ${e}`)
|
531
|
-
}
|
532
|
-
}
|
533
|
-
|
534
|
-
this.grist.fetch()
|
535
|
-
}
|
536
|
-
}
|
537
|
-
|
538
516
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
539
517
|
const response = await client.query({
|
540
518
|
query: gql`
|
@@ -564,6 +542,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
564
542
|
monitorView
|
565
543
|
reportType
|
566
544
|
reportView
|
545
|
+
reportTemplate
|
567
546
|
updater {
|
568
547
|
id
|
569
548
|
name
|
@@ -656,6 +635,9 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
656
635
|
for (let key in dirtyFields) {
|
657
636
|
patchField[key] = dirtyFields[key].after
|
658
637
|
}
|
638
|
+
if (patchField['reportTemplate'] instanceof FileList) {
|
639
|
+
patchField['reportTemplate'] = patchField['reportTemplate'][0]
|
640
|
+
}
|
659
641
|
patchField.cuFlag = patch.__dirty__
|
660
642
|
|
661
643
|
return patchField
|
@@ -671,6 +653,9 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
671
653
|
`,
|
672
654
|
variables: {
|
673
655
|
patches
|
656
|
+
},
|
657
|
+
context: {
|
658
|
+
hasUpload: true
|
674
659
|
}
|
675
660
|
})
|
676
661
|
|
package/client/route.js
CHANGED
@@ -23,5 +23,13 @@ export default function route(page) {
|
|
23
23
|
case 'data-report-list':
|
24
24
|
import('./pages/data-report/data-report-list-page.js')
|
25
25
|
return page
|
26
|
+
|
27
|
+
case 'jasper-report-samples':
|
28
|
+
import('./pages/data-report/jasper-report-samples-page.js')
|
29
|
+
return page
|
30
|
+
|
31
|
+
case 'jasper-report-oocs':
|
32
|
+
import('./pages/data-report/jasper-report-oocs-page.js')
|
33
|
+
return page
|
26
34
|
}
|
27
35
|
}
|
@@ -0,0 +1 @@
|
|
1
|
+
module.exports = {}
|
@@ -0,0 +1,129 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
exports.renderJasperReport = void 0;
|
7
|
+
const form_data_1 = __importDefault(require("form-data"));
|
8
|
+
const node_fetch_1 = __importDefault(require("node-fetch"));
|
9
|
+
const attachment_base_1 = require("@things-factory/attachment-base");
|
10
|
+
const aws_base_1 = require("@things-factory/aws-base");
|
11
|
+
const env_1 = require("@things-factory/env");
|
12
|
+
const dataReportConfig = env_1.config.get('dataReport');
|
13
|
+
const { jasper: { endpoint: { protocol, host, port }, datasource: { database } } } = dataReportConfig;
|
14
|
+
/** author: ywnam123 */
|
15
|
+
function transformValuesToRows(queryResult) {
|
16
|
+
var parseData = [];
|
17
|
+
let index = 1;
|
18
|
+
for (let i = 0; i < queryResult.Items.length; i++) {
|
19
|
+
var j = 0;
|
20
|
+
const data = JSON.parse(queryResult.Items[i].data);
|
21
|
+
const spec = JSON.parse(queryResult.Items[i].spec);
|
22
|
+
for (let key in data) {
|
23
|
+
if (Array.isArray(data[key])) {
|
24
|
+
for (j = 0; j < data[key].length; j++) {
|
25
|
+
for (let specKey in spec) {
|
26
|
+
if (key === specKey) {
|
27
|
+
parseData.push({
|
28
|
+
item: spec[specKey].name,
|
29
|
+
index: index + j,
|
30
|
+
value: String(data[key][j])
|
31
|
+
});
|
32
|
+
}
|
33
|
+
}
|
34
|
+
}
|
35
|
+
}
|
36
|
+
else {
|
37
|
+
parseData.push({
|
38
|
+
item: key,
|
39
|
+
index,
|
40
|
+
value: String(data[key])
|
41
|
+
});
|
42
|
+
}
|
43
|
+
}
|
44
|
+
if (j !== 0) {
|
45
|
+
index = index + j;
|
46
|
+
}
|
47
|
+
else {
|
48
|
+
index = index + 1;
|
49
|
+
}
|
50
|
+
}
|
51
|
+
}
|
52
|
+
/** @todo considering trasformation in lambda, as massive dataset */
|
53
|
+
function pivotData(rows) {
|
54
|
+
var _a, _b;
|
55
|
+
var parseData = [];
|
56
|
+
let index = 1;
|
57
|
+
for (let i = 0; i < rows.length; i++) {
|
58
|
+
var j = 0;
|
59
|
+
const data = JSON.parse(rows[i].data);
|
60
|
+
const spec = JSON.parse(rows[i].spec);
|
61
|
+
for (let key in data) {
|
62
|
+
/** @todo rule to display or not, about unspecified spec */
|
63
|
+
const value = data[key];
|
64
|
+
!((_a = spec[key]) === null || _a === void 0 ? void 0 : _a.hidden) && parseData.push({
|
65
|
+
item: ((_b = spec[key]) === null || _b === void 0 ? void 0 : _b.name) || key,
|
66
|
+
index,
|
67
|
+
value: Array.isArray(value) ? value.join(', ') : value
|
68
|
+
});
|
69
|
+
}
|
70
|
+
if (j !== 0) {
|
71
|
+
index = index + j;
|
72
|
+
}
|
73
|
+
else {
|
74
|
+
index = index + 1;
|
75
|
+
}
|
76
|
+
}
|
77
|
+
return parseData;
|
78
|
+
}
|
79
|
+
const athenaClient = new aws_base_1.AthenaController();
|
80
|
+
async function queryAthena(params) {
|
81
|
+
const queryData = {
|
82
|
+
sql: `select data, spec, from_unixtime(collected_at/1000/1000) collected_at
|
83
|
+
from ${params['table']}
|
84
|
+
where domain='${params['domain']}'
|
85
|
+
and datasetid = '${params['dataSetId']}'
|
86
|
+
and workdate >= '${params['fromWorkDate']}'
|
87
|
+
and workdate <= '${params['toWorkDate']}'
|
88
|
+
and workshift = '${params['workShift'] || 'NA'}'
|
89
|
+
order by collected_at`,
|
90
|
+
db: database
|
91
|
+
};
|
92
|
+
// and json_extract_scalar(data, '$.dauid') = 'A8032AD81730'
|
93
|
+
return await athenaClient.query(queryData);
|
94
|
+
}
|
95
|
+
async function renderJasperReport(context) {
|
96
|
+
const { state: { domain }, query } = context;
|
97
|
+
const template = await attachment_base_1.STORAGE.readFile(query['template'] || 'dynamic_header_sample.jrxml', 'utf-8');
|
98
|
+
let templateType = 'crosstab';
|
99
|
+
let parsedData = [];
|
100
|
+
query['domain'] = domain === null || domain === void 0 ? void 0 : domain.subdomain;
|
101
|
+
const queryResult = await queryAthena(query);
|
102
|
+
const rows = queryResult.Items;
|
103
|
+
if (templateType === 'crosstab') {
|
104
|
+
parsedData = pivotData(rows);
|
105
|
+
}
|
106
|
+
else {
|
107
|
+
/** unused */
|
108
|
+
for (let i = 0; i < rows.length; i++) {
|
109
|
+
const data = JSON.parse(rows[i].data);
|
110
|
+
for (let key in data) {
|
111
|
+
if (Array.isArray(data[key])) {
|
112
|
+
data[key] = data[key].toString();
|
113
|
+
}
|
114
|
+
}
|
115
|
+
parsedData.push(data);
|
116
|
+
}
|
117
|
+
}
|
118
|
+
const formData = new form_data_1.default();
|
119
|
+
formData.append('template', template);
|
120
|
+
formData.append('jsonString', JSON.stringify(parsedData));
|
121
|
+
const reportUrl = `${protocol || 'http'}://${host}:${port}/rest/report/show_html`;
|
122
|
+
const response = await (0, node_fetch_1.default)(reportUrl, {
|
123
|
+
method: 'POST',
|
124
|
+
body: formData
|
125
|
+
});
|
126
|
+
return await response.text();
|
127
|
+
}
|
128
|
+
exports.renderJasperReport = renderJasperReport;
|
129
|
+
//# sourceMappingURL=jasper-report.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"jasper-report.js","sourceRoot":"","sources":["../../server/controllers/jasper-report.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAE9B,qEAAyD;AACzD,uDAA2D;AAC3D,6CAA4C;AAE5C,MAAM,gBAAgB,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AACjD,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,gBAAgB,CAAA;AAErG,uBAAuB;AACvB,SAAS,qBAAqB,CAAC,WAAW;IACxC,IAAI,SAAS,GAAG,EAAE,CAAA;IAChB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjD,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAElD,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC5B,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACrC,KAAK,IAAI,OAAO,IAAI,IAAI,EAAE;wBACxB,IAAI,GAAG,KAAK,OAAO,EAAE;4BACnB,SAAS,CAAC,IAAI,CAAC;gCACb,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI;gCACxB,KAAK,EAAE,KAAK,GAAG,CAAC;gCAChB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;6BAC5B,CAAC,CAAA;yBACH;qBACF;iBACF;aACF;iBAAM;gBACL,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,GAAG;oBACT,KAAK;oBACL,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACzB,CAAC,CAAA;aACH;SACF;QACD,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,KAAK,GAAG,KAAK,GAAG,CAAC,CAAA;SAClB;aAAM;YACL,KAAK,GAAG,KAAK,GAAG,CAAC,CAAA;SAClB;KACF;AACL,CAAC;AAED,oEAAoE;AACpE,SAAS,SAAS,CAAC,IAAI;;IACrB,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAErC,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YACpB,2DAA2D;YAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACvB,CAAC,CAAC,MAAA,IAAI,CAAC,GAAG,CAAC,0CAAE,MAAM,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC;gBACrC,IAAI,EAAE,CAAA,MAAA,IAAI,CAAC,GAAG,CAAC,0CAAE,IAAI,KAAI,GAAG;gBAC5B,KAAK;gBACL,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK;aACvD,CAAC,CAAA;SACH;QACD,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,KAAK,GAAG,KAAK,GAAG,CAAC,CAAA;SAClB;aAAM;YACL,KAAK,GAAG,KAAK,GAAG,CAAC,CAAA;SAClB;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,YAAY,GAAG,IAAI,2BAAgB,EAAE,CAAA;AAC3C,KAAK,UAAU,WAAW,CAAC,MAAM;IAC/B,MAAM,SAAS,GAAG;QAChB,GAAG,EAAE;WACE,MAAM,CAAC,OAAO,CAAC;oBACN,MAAM,CAAC,QAAQ,CAAC;uBACb,MAAM,CAAC,WAAW,CAAC;uBACnB,MAAM,CAAC,cAAc,CAAC;uBACtB,MAAM,CAAC,YAAY,CAAC;uBACpB,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI;0BACxB;QACtB,EAAE,EAAE,QAAQ;KACb,CAAA;IACD,4DAA4D;IAE5D,OAAO,MAAM,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;AAC5C,CAAC;AACM,KAAK,UAAU,kBAAkB,CAAC,OAAY;IACnD,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC5C,MAAM,QAAQ,GAAG,MAAM,yBAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,6BAA6B,EAAE,OAAO,CAAC,CAAA;IACpG,IAAI,YAAY,GAAG,UAAU,CAAA;IAC7B,IAAI,UAAU,GAAG,EAAE,CAAA;IAEnB,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAA;IACnC,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;IAC5C,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAA;IAE9B,IAAI,YAAY,KAAK,UAAU,EAAE;QAC/B,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;KAC7B;SAAM;QACL,aAAa;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;YACrC,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;gBACpB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;iBACjC;aACF;YACD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACtB;KACF;IAED,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC/B,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACrC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;IAEzD,MAAM,SAAS,GAAG,GAAG,QAAQ,IAAI,MAAM,MAAM,IAAI,IAAI,IAAI,wBAAwB,CAAA;IACjF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,SAAS,EAAE;QACtC,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,QAAQ;KACf,CAAC,CAAA;IAEF,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;AAC9B,CAAC;AApCD,gDAoCC"}
|
package/dist-server/routes.js
CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const typeorm_1 = require("typeorm");
|
4
4
|
const auth_base_1 = require("@things-factory/auth-base");
|
5
5
|
const create_data_sample_1 = require("./controllers/create-data-sample");
|
6
|
+
const jasper_report_1 = require("./controllers/jasper-report");
|
6
7
|
const data_sensor_1 = require("./service/data-sensor/data-sensor");
|
7
8
|
const debug = require('debug')('things-factory:dataset:routes');
|
8
9
|
process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
|
@@ -70,5 +71,8 @@ process.on('bootstrap-module-domain-private-route', (app, domainPrivateRouter) =
|
|
70
71
|
/*
|
71
72
|
* can add domain private routes to application (auth required, tenancy required)
|
72
73
|
*/
|
74
|
+
domainPrivateRouter.get('/data-report/jasper', async (context, next) => {
|
75
|
+
context.body = await (0, jasper_report_1.renderJasperReport)(context);
|
76
|
+
});
|
73
77
|
});
|
74
78
|
//# sourceMappingURL=routes.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}
|
@@ -19,13 +19,16 @@ exports.DataSetMutation = void 0;
|
|
19
19
|
const type_graphql_1 = require("type-graphql");
|
20
20
|
const typeorm_1 = require("typeorm");
|
21
21
|
const v4_1 = __importDefault(require("uuid/v4"));
|
22
|
+
const attachment_base_1 = require("@things-factory/attachment-base");
|
22
23
|
const data_item_1 = require("../data-item/data-item");
|
23
24
|
const data_set_1 = require("./data-set");
|
24
25
|
const data_set_type_1 = require("./data-set-type");
|
25
26
|
let DataSetMutation = class DataSetMutation {
|
26
27
|
async createDataSet(dataSet, context) {
|
27
28
|
const { domain, user, tx } = context.state;
|
28
|
-
|
29
|
+
const result = await tx.getRepository(data_set_1.DataSet).save(Object.assign(Object.assign({}, dataSet), { domain, creator: user, updater: user }));
|
30
|
+
await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: '+' });
|
31
|
+
return result;
|
29
32
|
}
|
30
33
|
async updateDataSet(id, patch, context) {
|
31
34
|
const { domain, user, tx } = context.state;
|
@@ -33,7 +36,9 @@ let DataSetMutation = class DataSetMutation {
|
|
33
36
|
const dataSet = await repository.findOne({
|
34
37
|
where: { domain, id }
|
35
38
|
});
|
36
|
-
|
39
|
+
const result = await repository.save(Object.assign(Object.assign(Object.assign({}, dataSet), patch), { updater: user }));
|
40
|
+
await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: 'M' });
|
41
|
+
return result;
|
37
42
|
}
|
38
43
|
async updateMultipleDataSet(patches, context) {
|
39
44
|
const { domain, user, tx } = context.state;
|
@@ -42,18 +47,22 @@ let DataSetMutation = class DataSetMutation {
|
|
42
47
|
const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
|
43
48
|
const dataSetRepo = tx.getRepository(data_set_1.DataSet);
|
44
49
|
if (_createRecords.length > 0) {
|
50
|
+
const cuFlag = '+';
|
45
51
|
for (let i = 0; i < _createRecords.length; i++) {
|
46
52
|
const newRecord = _createRecords[i];
|
47
53
|
const result = await dataSetRepo.save(Object.assign(Object.assign({}, newRecord), { domain, creator: user, updater: user }));
|
48
|
-
|
54
|
+
await this._createAttachment(context, newRecord.reportTemplate, { refId: result.id, cuFlag });
|
55
|
+
results.push(Object.assign(Object.assign({}, result), { cuFlag }));
|
49
56
|
}
|
50
57
|
}
|
51
58
|
if (_updateRecords.length > 0) {
|
59
|
+
const cuFlag = 'M';
|
52
60
|
for (let i = 0; i < _updateRecords.length; i++) {
|
53
61
|
const newRecord = _updateRecords[i];
|
54
62
|
const dataSet = await dataSetRepo.findOne(newRecord.id);
|
55
63
|
const result = await dataSetRepo.save(Object.assign(Object.assign(Object.assign({}, dataSet), newRecord), { updater: user }));
|
56
|
-
|
64
|
+
await this._createAttachment(context, newRecord.reportTemplate, { refId: result.id, cuFlag });
|
65
|
+
results.push(Object.assign(Object.assign({}, result), { cuFlag }));
|
57
66
|
}
|
58
67
|
}
|
59
68
|
return results;
|
@@ -61,6 +70,7 @@ let DataSetMutation = class DataSetMutation {
|
|
61
70
|
async deleteDataSet(id, context) {
|
62
71
|
const { domain, tx } = context.state;
|
63
72
|
await tx.getRepository(data_set_1.DataSet).delete({ domain, id });
|
73
|
+
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [`report-${id}`] }, context);
|
64
74
|
return true;
|
65
75
|
}
|
66
76
|
async deleteDataSets(ids, context) {
|
@@ -69,6 +79,7 @@ let DataSetMutation = class DataSetMutation {
|
|
69
79
|
domain,
|
70
80
|
id: (0, typeorm_1.In)(ids)
|
71
81
|
});
|
82
|
+
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: ids.map(id => `report-${id}`) }, context);
|
72
83
|
return true;
|
73
84
|
}
|
74
85
|
async importDataSets(dataSets, context) {
|
@@ -136,6 +147,18 @@ let DataSetMutation = class DataSetMutation {
|
|
136
147
|
return dataSet;
|
137
148
|
});
|
138
149
|
}
|
150
|
+
async _createAttachment(context, attachment, { refId, cuFlag }) {
|
151
|
+
if (attachment) {
|
152
|
+
const attachmentRef = 'report-' + refId;
|
153
|
+
cuFlag == 'M' && await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [attachmentRef] }, context);
|
154
|
+
await (0, attachment_base_1.createAttachment)(null, {
|
155
|
+
attachment: {
|
156
|
+
file: attachment,
|
157
|
+
refBy: attachmentRef
|
158
|
+
}
|
159
|
+
}, context);
|
160
|
+
}
|
161
|
+
}
|
139
162
|
};
|
140
163
|
__decorate([
|
141
164
|
(0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)'),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAA2C;AAC3C,iDAA0B;
|
1
|
+
{"version":3,"file":"data-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-mutation.ts"],"names":[],"mappings":"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"}
|
@@ -19,6 +19,7 @@ const typeorm_1 = require("typeorm");
|
|
19
19
|
const auth_base_1 = require("@things-factory/auth-base");
|
20
20
|
const board_service_1 = require("@things-factory/board-service");
|
21
21
|
const shell_1 = require("@things-factory/shell");
|
22
|
+
const attachment_base_1 = require("@things-factory/attachment-base");
|
22
23
|
const data_item_1 = require("../data-item/data-item");
|
23
24
|
const data_sample_1 = require("../data-sample/data-sample");
|
24
25
|
const data_set_1 = require("./data-set");
|
@@ -50,6 +51,9 @@ let DataSetQuery = class DataSetQuery {
|
|
50
51
|
relations: ['roles']
|
51
52
|
});
|
52
53
|
const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id);
|
54
|
+
if (!roles.length) {
|
55
|
+
return { items: [], total: 0 };
|
56
|
+
}
|
53
57
|
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
54
58
|
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
55
59
|
params,
|
@@ -69,6 +73,9 @@ let DataSetQuery = class DataSetQuery {
|
|
69
73
|
relations: ['roles']
|
70
74
|
});
|
71
75
|
const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id);
|
76
|
+
if (!roles.length) {
|
77
|
+
return { items: [], total: 0 };
|
78
|
+
}
|
72
79
|
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
73
80
|
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
74
81
|
params,
|
@@ -142,6 +149,15 @@ let DataSetQuery = class DataSetQuery {
|
|
142
149
|
});
|
143
150
|
return interval.prev().toDate();
|
144
151
|
}
|
152
|
+
async reportTemplate(dataset) {
|
153
|
+
const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
154
|
+
where: {
|
155
|
+
domain: dataset.domainId,
|
156
|
+
refBy: `report-${dataset.id}`
|
157
|
+
}
|
158
|
+
});
|
159
|
+
return attachment === null || attachment === void 0 ? void 0 : attachment.fullpath;
|
160
|
+
}
|
145
161
|
};
|
146
162
|
__decorate([
|
147
163
|
(0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)'),
|
@@ -254,6 +270,13 @@ __decorate([
|
|
254
270
|
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
255
271
|
__metadata("design:returntype", Promise)
|
256
272
|
], DataSetQuery.prototype, "prevSchedule", null);
|
273
|
+
__decorate([
|
274
|
+
(0, type_graphql_1.FieldResolver)(type => String),
|
275
|
+
__param(0, (0, type_graphql_1.Root)()),
|
276
|
+
__metadata("design:type", Function),
|
277
|
+
__metadata("design:paramtypes", [data_set_1.DataSet]),
|
278
|
+
__metadata("design:returntype", Promise)
|
279
|
+
], DataSetQuery.prototype, "reportTemplate", null);
|
257
280
|
DataSetQuery = __decorate([
|
258
281
|
(0, type_graphql_1.Resolver)(data_set_1.DataSet)
|
259
282
|
], 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,qCAAuC;AAEvC,yDAAsD;AACtD,iEAAqD;AACrD,iDAAwF;
|
1
|
+
{"version":3,"file":"data-set-query.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAsD;AACtD,iEAAqD;AACrD,iDAAwF;AACxF,qEAA4D;AAE5D,sDAAiD;AACjD,4DAAuD;AACvD,yCAAoC;AACpC,mDAA6C;AAE7C,IAAI,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAGnC,IAAa,YAAY,GAAzB,MAAa,YAAY;IAGvB,KAAK,CAAC,OAAO,CAAY,EAAU,EAAS,OAAY;QACtD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,OAAO,MAAM,IAAA,uBAAa,EAAC,kBAAO,CAAC,CAAC,OAAO,CAAC;YAC1C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,QAAQ,CAAS,MAAiB,EAAS,OAAY;QAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,UAAU,EAAE,IAAA,uBAAa,EAAC,kBAAO,CAAC;YAClC,MAAM;YACN,MAAM;YACN,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGD,KAAK,CAAC,gBAAgB,CAAS,MAAiB,EAAS,OAAY;QACnE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,8CAA8C;QAC9C,IAAI,GAAG,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;YACtB,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEzF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;SAC/B;QAED,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,UAAU,EAAE,IAAA,uBAAa,EAAC,kBAAO,CAAC;YAClC,MAAM;YACN,MAAM;YACN,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QAEF,YAAY,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACnE,YAAY,CAAC,QAAQ,CAAC,sCAAsC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAExE,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGD,KAAK,CAAC,iBAAiB,CAAS,MAAiB,EAAS,OAAY;QACpE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,kDAAkD;QAClD,IAAI,GAAG,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;YACtB,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEzF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;SAC/B;QAED,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,UAAU,EAAE,IAAA,uBAAa,EAAC,kBAAO,CAAC;YAClC,MAAM;YACN,MAAM;YACN,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QAEF,YAAY,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACnE,YAAY,CAAC,QAAQ,CAAC,4CAA4C,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAE9E,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGD,KAAK,CAAC,SAAS,CAAS,OAAgB;QACtC,OAAO,MAAM,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAC,IAAI,CAAC;YACxC,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,SAAS,CAAS,OAAgB;QACtC,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;YACvC,EAAE,EAAE,OAAO,CAAC,WAAW;SACxB,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,eAAe,CAAS,OAAgB;QAC5C,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;YACvC,EAAE,EAAE,OAAO,CAAC,iBAAiB;SAC9B,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,UAAU,CAAS,OAAgB;QACvC,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE;YACrD,OAAO,MAAM,IAAA,uBAAa,EAAC,qBAAK,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;SACrE;IACH,CAAC;IAGD,KAAK,CAAC,YAAY,CAAS,OAAgB;QACzC,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE;YACzD,OAAO,MAAM,IAAA,uBAAa,EAAC,qBAAK,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;SACvE;IACH,CAAC;IAGD,KAAK,CAAC,MAAM,CAAS,OAAgB;QACnC,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9D,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,OAAgB;QACpC,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC7D,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,OAAgB;QACpC,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC7D,CAAC;IAGD,KAAK,CAAC,iBAAiB,CAAS,OAAgB;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;YACrD,MAAM,EAAE,CAAC,aAAa,CAAC;YACvB,KAAK,EAAE,EAAE,OAAO,EAAE;YAClB,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;SAC/B,CAAC,CAAA;QAEF,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAA;IAC5B,CAAC;IAGD,KAAK,CAAC,YAAY,CAAS,OAAgB;QACzC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAEhD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAM;SACP;QAED,IAAI,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC9C,EAAE,EAAE,QAAQ,IAAK,CAAC,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAY,CAAC,QAAQ,IAAI,KAAK;SAC9F,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAA;IACjC,CAAC;IAGD,KAAK,CAAC,YAAY,CAAS,OAAgB;QACzC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAEhD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAM;SACP;QAED,IAAI,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC9C,EAAE,EAAE,QAAQ,IAAK,CAAC,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAY,CAAC,QAAQ,IAAI,KAAK;SAC9F,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAA;IACjC,CAAC;IAGD,KAAK,CAAC,cAAc,CAAS,OAAgB;QAC3C,MAAM,UAAU,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE;gBACL,MAAM,EAAE,OAAO,CAAC,QAAQ;gBACxB,KAAK,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE;aAC9B;SACF,CAAC,CAAA;QAEF,OAAO,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA;IAC7B,CAAC;CACF,CAAA;AA3LC;IAFC,IAAA,wBAAS,EAAC,gFAAgF,CAAC;IAC3F,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,kBAAO,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAClD,WAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;2CAM1C;AAID;IAFC,IAAA,wBAAS,EAAC,gFAAgF,CAAC;IAC3F,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,2BAAW,EAAE,EAAE,WAAW,EAAE,4BAA4B,EAAE,CAAC;IAC7D,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,kBAAG,GAAE,CAAA;;yDAAjB,iBAAS,oBAAT,iBAAS;;4CAavC;AAGD;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,2BAAW,EAAE,EAAE,WAAW,EAAE,oDAAoD,EAAE,CAAC;IAC7E,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,kBAAG,GAAE,CAAA;;yDAAjB,iBAAS,oBAAT,iBAAS;;oDA2B/C;AAGD;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,2BAAW,EAAE,EAAE,WAAW,EAAE,+CAA+C,EAAE,CAAC;IACvE,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,kBAAG,GAAE,CAAA;;yDAAjB,iBAAS,oBAAT,iBAAS;;qDA2BhD;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,CAAC;IACjB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;6CAIvC;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACX,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;6CAIvC;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACL,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;mDAI7C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,qBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/B,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;8CAIxC;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,qBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7B,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;gDAI1C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IAChB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;0CAEpC;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACb,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;2CAErC;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACb,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;2CAErC;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;qDAQ/C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;gDAY1C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;gDAY1C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IACR,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAU,kBAAO;;kDAS5C;AA7LU,YAAY;IADxB,IAAA,uBAAQ,EAAC,kBAAO,CAAC;GACL,YAAY,CA8LxB;AA9LY,oCAAY"}
|
@@ -8,10 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var _a, _b, _c, _d, _e, _f;
|
11
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
13
13
|
exports.DataSetList = exports.DataSetPatch = exports.NewDataSet = void 0;
|
14
14
|
const type_graphql_1 = require("type-graphql");
|
15
|
+
const graphql_upload_1 = require("graphql-upload");
|
15
16
|
const shell_1 = require("@things-factory/shell");
|
16
17
|
const data_set_1 = require("./data-set");
|
17
18
|
let NewDataSet = class NewDataSet {
|
@@ -80,6 +81,10 @@ __decorate([
|
|
80
81
|
(0, type_graphql_1.Field)({ nullable: true }),
|
81
82
|
__metadata("design:type", String)
|
82
83
|
], NewDataSet.prototype, "reportView", void 0);
|
84
|
+
__decorate([
|
85
|
+
(0, type_graphql_1.Field)(type => graphql_upload_1.GraphQLUpload, { nullable: true }),
|
86
|
+
__metadata("design:type", typeof (_d = typeof graphql_upload_1.FileUpload !== "undefined" && graphql_upload_1.FileUpload) === "function" ? _d : Object)
|
87
|
+
], NewDataSet.prototype, "reportTemplate", void 0);
|
83
88
|
NewDataSet = __decorate([
|
84
89
|
(0, type_graphql_1.InputType)()
|
85
90
|
], NewDataSet);
|
@@ -100,11 +105,11 @@ __decorate([
|
|
100
105
|
], DataSetPatch.prototype, "description", void 0);
|
101
106
|
__decorate([
|
102
107
|
(0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
|
103
|
-
__metadata("design:type", typeof (
|
108
|
+
__metadata("design:type", typeof (_e = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _e : Object)
|
104
109
|
], DataSetPatch.prototype, "supervisoryRole", void 0);
|
105
110
|
__decorate([
|
106
111
|
(0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
|
107
|
-
__metadata("design:type", typeof (
|
112
|
+
__metadata("design:type", typeof (_f = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _f : Object)
|
108
113
|
], DataSetPatch.prototype, "entryRole", void 0);
|
109
114
|
__decorate([
|
110
115
|
(0, type_graphql_1.Field)({ nullable: true }),
|
@@ -120,7 +125,7 @@ __decorate([
|
|
120
125
|
], DataSetPatch.prototype, "useCase", void 0);
|
121
126
|
__decorate([
|
122
127
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
123
|
-
__metadata("design:type", typeof (
|
128
|
+
__metadata("design:type", typeof (_g = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _g : Object)
|
124
129
|
], DataSetPatch.prototype, "partitionKeys", void 0);
|
125
130
|
__decorate([
|
126
131
|
(0, type_graphql_1.Field)({ nullable: true }),
|
@@ -154,6 +159,10 @@ __decorate([
|
|
154
159
|
(0, type_graphql_1.Field)({ nullable: true }),
|
155
160
|
__metadata("design:type", String)
|
156
161
|
], DataSetPatch.prototype, "reportView", void 0);
|
162
|
+
__decorate([
|
163
|
+
(0, type_graphql_1.Field)(type => graphql_upload_1.GraphQLUpload, { nullable: true }),
|
164
|
+
__metadata("design:type", typeof (_h = typeof graphql_upload_1.FileUpload !== "undefined" && graphql_upload_1.FileUpload) === "function" ? _h : Object)
|
165
|
+
], DataSetPatch.prototype, "reportTemplate", void 0);
|
157
166
|
__decorate([
|
158
167
|
(0, type_graphql_1.Field)(),
|
159
168
|
__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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"}
|