@things-factory/dataset 5.0.0-alpha.44 → 5.0.0-alpha.47
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-view.js +5 -4
- package/client/pages/data-sample/data-sample-view.js +5 -4
- package/client/pages/data-set/data-set-list-page.js +62 -25
- package/dist-server/service/data-set/data-set-mutation.js +3 -6
- package/dist-server/service/data-set/data-set-mutation.js.map +1 -1
- package/package.json +17 -17
- package/server/service/data-set/data-set-mutation.ts +6 -7
- package/yarn-error.log +23244 -0
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import '@operato/dataset/ox-data-ooc-view.js'
|
|
2
2
|
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
3
|
+
import gql from 'graphql-tag'
|
|
4
|
+
import { css, html, LitElement } from 'lit'
|
|
5
5
|
|
|
6
|
-
import { ScrollbarStyles } from '@operato/styles'
|
|
7
6
|
import { client } from '@operato/graphql'
|
|
8
|
-
import
|
|
7
|
+
import { i18next, localize } from '@operato/i18n'
|
|
8
|
+
import { ScrollbarStyles } from '@operato/styles'
|
|
9
9
|
|
|
10
10
|
class DataOocView extends localize(i18next)(LitElement) {
|
|
11
11
|
static get styles() {
|
|
@@ -29,6 +29,7 @@ class DataOocView extends localize(i18next)(LitElement) {
|
|
|
29
29
|
ox-data-ooc-view {
|
|
30
30
|
flex: 1;
|
|
31
31
|
padding: var(--padding-wide);
|
|
32
|
+
overflow: auto;
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
label[comment] {
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import '@operato/dataset/ox-data-sample-view.js'
|
|
2
2
|
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
3
|
+
import gql from 'graphql-tag'
|
|
4
|
+
import { css, html, LitElement } from 'lit'
|
|
5
5
|
|
|
6
|
-
import { ScrollbarStyles } from '@operato/styles'
|
|
7
6
|
import { client } from '@operato/graphql'
|
|
8
|
-
import
|
|
7
|
+
import { i18next, localize } from '@operato/i18n'
|
|
8
|
+
import { ScrollbarStyles } from '@operato/styles'
|
|
9
9
|
|
|
10
10
|
class DataSampleView extends localize(i18next)(LitElement) {
|
|
11
11
|
static get properties() {
|
|
@@ -36,6 +36,7 @@ class DataSampleView extends localize(i18next)(LitElement) {
|
|
|
36
36
|
ox-data-sample-view {
|
|
37
37
|
flex: 1;
|
|
38
38
|
padding: var(--padding-wide);
|
|
39
|
+
overflow: auto;
|
|
39
40
|
}
|
|
40
41
|
`
|
|
41
42
|
]
|
|
@@ -256,7 +256,13 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
256
256
|
},
|
|
257
257
|
filter: 'search',
|
|
258
258
|
sortable: true,
|
|
259
|
-
width: 150
|
|
259
|
+
width: 150,
|
|
260
|
+
imex: {
|
|
261
|
+
width: 25,
|
|
262
|
+
header: i18next.t('field.name'),
|
|
263
|
+
type: 'string',
|
|
264
|
+
key: 'name'
|
|
265
|
+
}
|
|
260
266
|
},
|
|
261
267
|
{
|
|
262
268
|
type: 'string',
|
|
@@ -266,7 +272,13 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
266
272
|
editable: true
|
|
267
273
|
},
|
|
268
274
|
filter: 'search',
|
|
269
|
-
width: 200
|
|
275
|
+
width: 200,
|
|
276
|
+
imex: {
|
|
277
|
+
width: 33,
|
|
278
|
+
header: i18next.t('field.description'),
|
|
279
|
+
type: 'string',
|
|
280
|
+
key: 'description'
|
|
281
|
+
}
|
|
270
282
|
},
|
|
271
283
|
{
|
|
272
284
|
type: 'checkbox',
|
|
@@ -278,7 +290,13 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
278
290
|
},
|
|
279
291
|
filter: true,
|
|
280
292
|
sortable: true,
|
|
281
|
-
width: 60
|
|
293
|
+
width: 60,
|
|
294
|
+
imex: {
|
|
295
|
+
width: 10,
|
|
296
|
+
header: i18next.t('field.active'),
|
|
297
|
+
type: 'checkbox',
|
|
298
|
+
key: 'active'
|
|
299
|
+
}
|
|
282
300
|
},
|
|
283
301
|
{
|
|
284
302
|
type: 'select',
|
|
@@ -301,7 +319,13 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
301
319
|
},
|
|
302
320
|
sortable: true,
|
|
303
321
|
filter: true,
|
|
304
|
-
width: 60
|
|
322
|
+
width: 60,
|
|
323
|
+
imex: {
|
|
324
|
+
width: 10,
|
|
325
|
+
header: i18next.t('field.type'),
|
|
326
|
+
type: 'select',
|
|
327
|
+
key: 'type'
|
|
328
|
+
}
|
|
305
329
|
},
|
|
306
330
|
{
|
|
307
331
|
type: 'select',
|
|
@@ -343,7 +367,13 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
343
367
|
}
|
|
344
368
|
},
|
|
345
369
|
width: 80,
|
|
346
|
-
label: true
|
|
370
|
+
label: true,
|
|
371
|
+
imex: {
|
|
372
|
+
width: 13,
|
|
373
|
+
header: i18next.t('field.schedule'),
|
|
374
|
+
type: 'string',
|
|
375
|
+
key: 'schedule'
|
|
376
|
+
}
|
|
347
377
|
},
|
|
348
378
|
{
|
|
349
379
|
type: 'select',
|
|
@@ -353,7 +383,13 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
353
383
|
editable: true,
|
|
354
384
|
options: TIMEZONE_OPTIONS
|
|
355
385
|
},
|
|
356
|
-
width: 120
|
|
386
|
+
width: 120,
|
|
387
|
+
imex: {
|
|
388
|
+
width: 13,
|
|
389
|
+
header: i18next.t('field.timezone'),
|
|
390
|
+
type: 'select',
|
|
391
|
+
key: 'timezone'
|
|
392
|
+
}
|
|
357
393
|
},
|
|
358
394
|
{
|
|
359
395
|
type: 'resource-object',
|
|
@@ -666,27 +702,28 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
666
702
|
}
|
|
667
703
|
|
|
668
704
|
async exportHandler() {
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
'description',
|
|
675
|
-
'tag',
|
|
676
|
-
'schedule',
|
|
677
|
-
'timezone',
|
|
678
|
-
'active',
|
|
679
|
-
'dataItems'
|
|
680
|
-
])
|
|
681
|
-
|
|
682
|
-
return exportTargets.map(dataSet => {
|
|
683
|
-
let tempObj = {}
|
|
684
|
-
for (const field of targetFieldSet) {
|
|
685
|
-
tempObj[field] = dataSet[field]
|
|
686
|
-
}
|
|
705
|
+
var headerSetting = this.grist._config.columns
|
|
706
|
+
.filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
|
|
707
|
+
.map(column => {
|
|
708
|
+
return column.imex
|
|
709
|
+
})
|
|
687
710
|
|
|
688
|
-
|
|
711
|
+
let records = this.grist.data.records;
|
|
712
|
+
|
|
713
|
+
var data = records.map(item => {
|
|
714
|
+
return {
|
|
715
|
+
id: item.id,
|
|
716
|
+
...this.grist._config.columns
|
|
717
|
+
.filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
|
|
718
|
+
.reduce((record, column) => {
|
|
719
|
+
record[column.imex.key] = column.imex.key
|
|
720
|
+
.split('.')
|
|
721
|
+
.reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
|
|
722
|
+
return record
|
|
723
|
+
}, {})
|
|
724
|
+
}
|
|
689
725
|
})
|
|
726
|
+
return { header: headerSetting, data: data }
|
|
690
727
|
}
|
|
691
728
|
|
|
692
729
|
async importHandler(records) {
|
|
@@ -11,18 +11,15 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
-
};
|
|
17
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
15
|
exports.DataSetMutation = void 0;
|
|
19
16
|
const type_graphql_1 = require("type-graphql");
|
|
20
17
|
const typeorm_1 = require("typeorm");
|
|
21
|
-
const v4_1 = __importDefault(require("uuid/v4"));
|
|
22
18
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
23
19
|
const data_item_1 = require("../data-item/data-item");
|
|
24
20
|
const data_set_1 = require("./data-set");
|
|
25
21
|
const data_set_type_1 = require("./data-set-type");
|
|
22
|
+
const crypto = require('crypto');
|
|
26
23
|
let DataSetMutation = class DataSetMutation {
|
|
27
24
|
async createDataSet(dataSet, context) {
|
|
28
25
|
const { domain, user, tx } = context.state;
|
|
@@ -112,7 +109,7 @@ let DataSetMutation = class DataSetMutation {
|
|
|
112
109
|
}
|
|
113
110
|
var newDataItems = [];
|
|
114
111
|
var newCopys = originals.map(dataSet => {
|
|
115
|
-
let dataSetId =
|
|
112
|
+
let dataSetId = crypto.randomUUID();
|
|
116
113
|
newDataItems.push(...dataSet.dataItems.map(dataItem => {
|
|
117
114
|
return {
|
|
118
115
|
dataSet: dataSetId,
|
|
@@ -157,7 +154,7 @@ let DataSetMutation = class DataSetMutation {
|
|
|
157
154
|
async _createAttachment(context, attachment, { refId, cuFlag }) {
|
|
158
155
|
if (attachment) {
|
|
159
156
|
const attachmentRef = 'report-' + refId;
|
|
160
|
-
cuFlag == 'M' && await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [attachmentRef] }, context);
|
|
157
|
+
cuFlag == 'M' && (await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [attachmentRef] }, context));
|
|
161
158
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
162
159
|
attachment: {
|
|
163
160
|
file: attachment,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-mutation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"data-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-mutation.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.47",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,23 +24,23 @@
|
|
|
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/aws-base": "^5.0.0-alpha.
|
|
38
|
-
"@things-factory/board-service": "^5.0.0-alpha.
|
|
39
|
-
"@things-factory/env": "^5.0.0-alpha.
|
|
40
|
-
"@things-factory/shell": "^5.0.0-alpha.
|
|
41
|
-
"@things-factory/work-shift": "^5.0.0-alpha.
|
|
27
|
+
"@operato/app": "1.0.0-beta.17",
|
|
28
|
+
"@operato/data-grist": "1.0.0-beta.17",
|
|
29
|
+
"@operato/dataset": "1.0.0-beta.17",
|
|
30
|
+
"@operato/graphql": "1.0.0-beta.17",
|
|
31
|
+
"@operato/i18n": "1.0.0-beta.17",
|
|
32
|
+
"@operato/layout": "1.0.0-beta.17",
|
|
33
|
+
"@operato/shell": "1.0.0-beta.17",
|
|
34
|
+
"@operato/styles": "1.0.0-beta.17",
|
|
35
|
+
"@operato/utils": "1.0.0-beta.17",
|
|
36
|
+
"@things-factory/auth-base": "^5.0.0-alpha.47",
|
|
37
|
+
"@things-factory/aws-base": "^5.0.0-alpha.47",
|
|
38
|
+
"@things-factory/board-service": "^5.0.0-alpha.47",
|
|
39
|
+
"@things-factory/env": "^5.0.0-alpha.47",
|
|
40
|
+
"@things-factory/shell": "^5.0.0-alpha.47",
|
|
41
|
+
"@things-factory/work-shift": "^5.0.0-alpha.47",
|
|
42
42
|
"cron-parser": "^4.3.0",
|
|
43
43
|
"moment-timezone": "^0.5.34"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "e7d4df52d5c5dc2577673757f2c4caade6b63b05"
|
|
46
46
|
}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
|
|
2
2
|
import { EntityManager, In } from 'typeorm'
|
|
3
|
-
import uuid from 'uuid/v4'
|
|
4
3
|
|
|
5
|
-
import { Domain } from '@things-factory/shell'
|
|
6
4
|
import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
|
|
5
|
+
import { Domain } from '@things-factory/shell'
|
|
7
6
|
|
|
8
7
|
import { DataItem } from '../data-item/data-item'
|
|
9
8
|
import { DataSet } from './data-set'
|
|
10
9
|
import { DataSetPatch, NewDataSet } from './data-set-type'
|
|
11
10
|
|
|
11
|
+
const crypto = require('crypto')
|
|
12
|
+
|
|
12
13
|
@Resolver(DataSet)
|
|
13
14
|
export class DataSetMutation {
|
|
14
15
|
@Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
|
|
@@ -126,7 +127,7 @@ export class DataSetMutation {
|
|
|
126
127
|
id: In(ids)
|
|
127
128
|
})
|
|
128
129
|
|
|
129
|
-
await deleteAttachmentsByRef(null, { refBys: ids.map(id => `report-${id}`) }
|
|
130
|
+
await deleteAttachmentsByRef(null, { refBys: ids.map(id => `report-${id}`) }, context)
|
|
130
131
|
|
|
131
132
|
return true
|
|
132
133
|
}
|
|
@@ -179,7 +180,7 @@ export class DataSetMutation {
|
|
|
179
180
|
var newDataItems = []
|
|
180
181
|
|
|
181
182
|
var newCopys = originals.map(dataSet => {
|
|
182
|
-
let dataSetId =
|
|
183
|
+
let dataSetId = crypto.randomUUID()
|
|
183
184
|
newDataItems.push(
|
|
184
185
|
...dataSet.dataItems.map(dataItem => {
|
|
185
186
|
return {
|
|
@@ -228,11 +229,10 @@ export class DataSetMutation {
|
|
|
228
229
|
})
|
|
229
230
|
}
|
|
230
231
|
|
|
231
|
-
|
|
232
232
|
async _createAttachment(context, attachment, { refId, cuFlag }) {
|
|
233
233
|
if (attachment) {
|
|
234
234
|
const attachmentRef = 'report-' + refId
|
|
235
|
-
cuFlag == 'M' && await deleteAttachmentsByRef(null, { refBys: [attachmentRef] }, context)
|
|
235
|
+
cuFlag == 'M' && (await deleteAttachmentsByRef(null, { refBys: [attachmentRef] }, context))
|
|
236
236
|
await createAttachment(
|
|
237
237
|
null,
|
|
238
238
|
{
|
|
@@ -246,4 +246,3 @@ export class DataSetMutation {
|
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
|
-
|