@things-factory/dataset 5.0.0-y.0 → 5.0.0-zeta.2
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/data-entry-list-page.js +1 -34
- package/client/pages/data-ooc/data-ooc-list-page.js +0 -67
- package/client/pages/data-report/data-report-list-page.js +1 -34
- package/client/pages/data-sample/data-sample-list-page.js +0 -14
- package/client/pages/data-sensor/data-sensor-list-page.js +0 -4
- package/client/pages/data-set/data-item-list.js +1 -1
- package/client/pages/data-set/data-set-list-page.js +0 -4
- package/dist-server/service/data-set/data-set-query.js +11 -10
- package/dist-server/service/data-set/data-set-query.js.map +1 -1
- package/package.json +17 -17
- package/server/service/data-set/data-set-query.ts +9 -12
|
@@ -3,7 +3,6 @@ import './data-entry-form'
|
|
|
3
3
|
import '@operato/board/ox-board-viewer.js'
|
|
4
4
|
|
|
5
5
|
import gql from 'graphql-tag'
|
|
6
|
-
import JSON5 from 'json5'
|
|
7
6
|
import { css, html } from 'lit'
|
|
8
7
|
import { connect } from 'pwa-helpers/connect-mixin'
|
|
9
8
|
|
|
@@ -120,7 +119,7 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
|
|
|
120
119
|
.orders=${this.orders}
|
|
121
120
|
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
122
121
|
>
|
|
123
|
-
<div slot="headroom"
|
|
122
|
+
<div slot="headroom">
|
|
124
123
|
<div id="filters">
|
|
125
124
|
<ox-filters-form></ox-filters-form>
|
|
126
125
|
</div>
|
|
@@ -315,38 +314,6 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
|
|
|
315
314
|
}
|
|
316
315
|
]
|
|
317
316
|
}
|
|
318
|
-
|
|
319
|
-
await this.updateComplete
|
|
320
|
-
|
|
321
|
-
this.grist.fetch()
|
|
322
|
-
}
|
|
323
|
-
|
|
324
|
-
async pageUpdated(changes, lifecycle) {
|
|
325
|
-
if (this.active) {
|
|
326
|
-
await this.updateComplete
|
|
327
|
-
|
|
328
|
-
var filters = lifecycle.params?.['filters']
|
|
329
|
-
if (filters) {
|
|
330
|
-
try {
|
|
331
|
-
filters = JSON5.parse(filters)
|
|
332
|
-
this.filters = filters
|
|
333
|
-
} catch (e) {
|
|
334
|
-
console.error(`filters parameter parsing error: ${e}`)
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
|
-
|
|
338
|
-
var sorters = lifecycle.params?.['sorters']
|
|
339
|
-
if (sorters) {
|
|
340
|
-
try {
|
|
341
|
-
sorters = JSON5.parse(sorters)
|
|
342
|
-
this.sorters = sorters
|
|
343
|
-
} catch (e) {
|
|
344
|
-
console.error(`sorters parameter parsing error: ${e}`)
|
|
345
|
-
}
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
this.grist.fetch()
|
|
349
|
-
}
|
|
350
317
|
}
|
|
351
318
|
|
|
352
319
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
|
@@ -316,16 +316,6 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
316
316
|
this.grist.fetch()
|
|
317
317
|
}
|
|
318
318
|
|
|
319
|
-
// async pageUpdated(changes, lifecycle) {
|
|
320
|
-
// if (this.active) {
|
|
321
|
-
// // update with url params value
|
|
322
|
-
// this._updateSearchConfig(lifecycle)
|
|
323
|
-
// await this.updateComplete
|
|
324
|
-
|
|
325
|
-
// this.grist.fetch()
|
|
326
|
-
// }
|
|
327
|
-
// }
|
|
328
|
-
|
|
329
319
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
|
330
320
|
const response = await client.query({
|
|
331
321
|
query: gql`
|
|
@@ -383,63 +373,6 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
383
373
|
}
|
|
384
374
|
}
|
|
385
375
|
|
|
386
|
-
// async _updateDataOoc() {
|
|
387
|
-
// let patches = this.grist.dirtyRecords
|
|
388
|
-
// if (patches && patches.length) {
|
|
389
|
-
// patches = patches.map(patch => {
|
|
390
|
-
// let patchField = patch.id ? { id: patch.id } : {}
|
|
391
|
-
// const dirtyFields = patch.__dirtyfields__
|
|
392
|
-
// for (let key in dirtyFields) {
|
|
393
|
-
// patchField[key] = dirtyFields[key].after
|
|
394
|
-
// }
|
|
395
|
-
// this._setDefaultFieldsValue(patchField)
|
|
396
|
-
// patchField.cuFlag = patch.__dirty__
|
|
397
|
-
|
|
398
|
-
// return patchField
|
|
399
|
-
// })
|
|
400
|
-
|
|
401
|
-
// const response = await client.mutate({
|
|
402
|
-
// mutation: gql`
|
|
403
|
-
// mutation ($patches: [DataOocPatch!]!) {
|
|
404
|
-
// updateMultipleDataOoc(patches: $patches) {
|
|
405
|
-
// name
|
|
406
|
-
// }
|
|
407
|
-
// }
|
|
408
|
-
// `,
|
|
409
|
-
// variables: {
|
|
410
|
-
// patches
|
|
411
|
-
// }
|
|
412
|
-
// })
|
|
413
|
-
|
|
414
|
-
// if (!response.errors) this.grist.fetch()
|
|
415
|
-
// }
|
|
416
|
-
// }
|
|
417
|
-
|
|
418
|
-
// async _deleteDataOoc() {
|
|
419
|
-
// if (confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) {
|
|
420
|
-
// const ids = this.grist.selected.map(record => record.id)
|
|
421
|
-
// if (ids && ids.length > 0) {
|
|
422
|
-
// const response = await client.mutate({
|
|
423
|
-
// mutation: gql`
|
|
424
|
-
// mutation ($ids: [String!]!) {
|
|
425
|
-
// deleteDataOocs(ids: $ids)
|
|
426
|
-
// }
|
|
427
|
-
// `,
|
|
428
|
-
// variables: {
|
|
429
|
-
// ids
|
|
430
|
-
// }
|
|
431
|
-
// })
|
|
432
|
-
|
|
433
|
-
// if (!response.errors) {
|
|
434
|
-
// this.grist.fetch()
|
|
435
|
-
// notify({
|
|
436
|
-
// message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
|
|
437
|
-
// })
|
|
438
|
-
// }
|
|
439
|
-
// }
|
|
440
|
-
// }
|
|
441
|
-
// }
|
|
442
|
-
|
|
443
376
|
_exportableData() {
|
|
444
377
|
let records = []
|
|
445
378
|
if (this.grist.selected && this.grist.selected.length > 0) {
|
|
@@ -2,7 +2,6 @@ import '@operato/data-grist'
|
|
|
2
2
|
import '@operato/board/ox-board-viewer.js'
|
|
3
3
|
|
|
4
4
|
import gql from 'graphql-tag'
|
|
5
|
-
import JSON5 from 'json5'
|
|
6
5
|
import { css, html } from 'lit'
|
|
7
6
|
import { connect } from 'pwa-helpers/connect-mixin'
|
|
8
7
|
|
|
@@ -155,7 +154,7 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
155
154
|
.orders=${this.orders}
|
|
156
155
|
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
157
156
|
>
|
|
158
|
-
<div slot="headroom"
|
|
157
|
+
<div slot="headroom">
|
|
159
158
|
<div id="filters">
|
|
160
159
|
<ox-filters-form></ox-filters-form>
|
|
161
160
|
</div>
|
|
@@ -358,38 +357,6 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
358
357
|
}
|
|
359
358
|
]
|
|
360
359
|
}
|
|
361
|
-
|
|
362
|
-
await this.updateComplete
|
|
363
|
-
|
|
364
|
-
this.grist.fetch()
|
|
365
|
-
}
|
|
366
|
-
|
|
367
|
-
async pageUpdated(changes, lifecycle) {
|
|
368
|
-
if (this.active) {
|
|
369
|
-
await this.updateComplete
|
|
370
|
-
|
|
371
|
-
var filters = lifecycle.params?.['filters']
|
|
372
|
-
if (filters) {
|
|
373
|
-
try {
|
|
374
|
-
filters = JSON5.parse(filters)
|
|
375
|
-
this.filters = filters
|
|
376
|
-
} catch (e) {
|
|
377
|
-
console.error(`filters parameter parsing error: ${e}`)
|
|
378
|
-
}
|
|
379
|
-
}
|
|
380
|
-
|
|
381
|
-
var sorters = lifecycle.params?.['sorters']
|
|
382
|
-
if (sorters) {
|
|
383
|
-
try {
|
|
384
|
-
sorters = JSON5.parse(sorters)
|
|
385
|
-
this.sorters = sorters
|
|
386
|
-
} catch (e) {
|
|
387
|
-
console.error(`sorters parameter parsing error: ${e}`)
|
|
388
|
-
}
|
|
389
|
-
}
|
|
390
|
-
|
|
391
|
-
this.grist.fetch()
|
|
392
|
-
}
|
|
393
360
|
}
|
|
394
361
|
|
|
395
362
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
|
@@ -281,22 +281,8 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
281
281
|
}
|
|
282
282
|
]
|
|
283
283
|
}
|
|
284
|
-
|
|
285
|
-
await this.updateComplete
|
|
286
|
-
|
|
287
|
-
this.grist.fetch()
|
|
288
284
|
}
|
|
289
285
|
|
|
290
|
-
// async pageUpdated(changes, lifecycle) {
|
|
291
|
-
// if (this.active) {
|
|
292
|
-
// // update with url params value
|
|
293
|
-
// this._updateSearchConfig(lifecycle)
|
|
294
|
-
// await this.updateComplete
|
|
295
|
-
|
|
296
|
-
// this.grist.fetch()
|
|
297
|
-
// }
|
|
298
|
-
// }
|
|
299
|
-
|
|
300
286
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
|
301
287
|
const response = await client.query({
|
|
302
288
|
query: gql`
|
|
@@ -38,6 +38,7 @@ let DataSetQuery = class DataSetQuery {
|
|
|
38
38
|
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
|
39
39
|
params,
|
|
40
40
|
domain,
|
|
41
|
+
alias: 'dataset',
|
|
41
42
|
searchables: ['name', 'description', 'supervisoryRole']
|
|
42
43
|
});
|
|
43
44
|
const [items, total] = await queryBuilder.getManyAndCount();
|
|
@@ -54,16 +55,16 @@ let DataSetQuery = class DataSetQuery {
|
|
|
54
55
|
if (!roles.length) {
|
|
55
56
|
return { items: [], total: 0 };
|
|
56
57
|
}
|
|
57
|
-
const
|
|
58
|
+
const [items, total] = await (0, shell_1.getQueryBuilderFromListParams)({
|
|
58
59
|
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
|
59
60
|
params,
|
|
60
61
|
domain,
|
|
61
62
|
alias: 'dataset',
|
|
62
63
|
searchables: ['name', 'description']
|
|
63
|
-
})
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
})
|
|
65
|
+
.andWhere(`dataset.active = :active`, { active: true })
|
|
66
|
+
.andWhere('dataset.entryRole IN (:...roles)', { roles })
|
|
67
|
+
.getManyAndCount();
|
|
67
68
|
return { items, total };
|
|
68
69
|
}
|
|
69
70
|
async dataSetsForReport(params, context) {
|
|
@@ -77,16 +78,16 @@ let DataSetQuery = class DataSetQuery {
|
|
|
77
78
|
if (!roles.length) {
|
|
78
79
|
return { items: [], total: 0 };
|
|
79
80
|
}
|
|
80
|
-
const
|
|
81
|
+
const [items, total] = await (0, shell_1.getQueryBuilderFromListParams)({
|
|
81
82
|
repository: (0, typeorm_1.getRepository)(data_set_1.DataSet),
|
|
82
83
|
params,
|
|
83
84
|
domain,
|
|
84
85
|
alias: 'dataset',
|
|
85
86
|
searchables: ['name', 'description']
|
|
86
|
-
})
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
87
|
+
})
|
|
88
|
+
.andWhere(`dataset.active = :active`, { active: true })
|
|
89
|
+
.andWhere('dataset.supervisoryRole IN (:...roles)', { roles })
|
|
90
|
+
.getManyAndCount();
|
|
90
91
|
return { items, total };
|
|
91
92
|
}
|
|
92
93
|
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,qCAAuC;AAEvC,qEAA4D;AAC5D,yDAAsD;AACtD,iEAAqD;AACrD,iDAAwF;AAExF,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,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,iBAAiB,CAAC;SACxD,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,
|
|
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-
|
|
3
|
+
"version": "5.0.0-zeta.2",
|
|
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-
|
|
37
|
-
"@things-factory/aws-base": "^5.0.0-
|
|
38
|
-
"@things-factory/board-service": "^5.0.0-
|
|
39
|
-
"@things-factory/env": "^5.0.0-
|
|
40
|
-
"@things-factory/shell": "^5.0.0-
|
|
41
|
-
"@things-factory/work-shift": "^5.0.0-
|
|
27
|
+
"@operato/app": "1.0.0-beta.30",
|
|
28
|
+
"@operato/data-grist": "1.0.0-beta.30",
|
|
29
|
+
"@operato/dataset": "1.0.0-beta.30",
|
|
30
|
+
"@operato/graphql": "1.0.0-beta.30",
|
|
31
|
+
"@operato/i18n": "1.0.0-beta.30",
|
|
32
|
+
"@operato/layout": "1.0.0-beta.30",
|
|
33
|
+
"@operato/shell": "1.0.0-beta.30",
|
|
34
|
+
"@operato/styles": "1.0.0-beta.30",
|
|
35
|
+
"@operato/utils": "1.0.0-beta.30",
|
|
36
|
+
"@things-factory/auth-base": "^5.0.0-zeta.2",
|
|
37
|
+
"@things-factory/aws-base": "^5.0.0-zeta.2",
|
|
38
|
+
"@things-factory/board-service": "^5.0.0-zeta.2",
|
|
39
|
+
"@things-factory/env": "^5.0.0-zeta.2",
|
|
40
|
+
"@things-factory/shell": "^5.0.0-zeta.2",
|
|
41
|
+
"@things-factory/work-shift": "^5.0.0-zeta.2",
|
|
42
42
|
"cron-parser": "^4.3.0",
|
|
43
43
|
"moment-timezone": "^0.5.34"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "fe921b76f32ac48ceddf3c290110509bdb5750d6"
|
|
46
46
|
}
|
|
@@ -34,6 +34,7 @@ export class DataSetQuery {
|
|
|
34
34
|
repository: getRepository(DataSet),
|
|
35
35
|
params,
|
|
36
36
|
domain,
|
|
37
|
+
alias: 'dataset',
|
|
37
38
|
searchables: ['name', 'description', 'supervisoryRole']
|
|
38
39
|
})
|
|
39
40
|
|
|
@@ -57,18 +58,16 @@ export class DataSetQuery {
|
|
|
57
58
|
return { items: [], total: 0 }
|
|
58
59
|
}
|
|
59
60
|
|
|
60
|
-
const
|
|
61
|
+
const [items, total] = await getQueryBuilderFromListParams({
|
|
61
62
|
repository: getRepository(DataSet),
|
|
62
63
|
params,
|
|
63
64
|
domain,
|
|
64
65
|
alias: 'dataset',
|
|
65
66
|
searchables: ['name', 'description']
|
|
66
67
|
})
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const [items, total] = await queryBuilder.getManyAndCount()
|
|
68
|
+
.andWhere(`dataset.active = :active`, { active: true })
|
|
69
|
+
.andWhere('dataset.entryRole IN (:...roles)', { roles })
|
|
70
|
+
.getManyAndCount()
|
|
72
71
|
|
|
73
72
|
return { items, total }
|
|
74
73
|
}
|
|
@@ -88,18 +87,16 @@ export class DataSetQuery {
|
|
|
88
87
|
return { items: [], total: 0 }
|
|
89
88
|
}
|
|
90
89
|
|
|
91
|
-
const
|
|
90
|
+
const [items, total] = await getQueryBuilderFromListParams({
|
|
92
91
|
repository: getRepository(DataSet),
|
|
93
92
|
params,
|
|
94
93
|
domain,
|
|
95
94
|
alias: 'dataset',
|
|
96
95
|
searchables: ['name', 'description']
|
|
97
96
|
})
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const [items, total] = await queryBuilder.getManyAndCount()
|
|
97
|
+
.andWhere(`dataset.active = :active`, { active: true })
|
|
98
|
+
.andWhere('dataset.supervisoryRole IN (:...roles)', { roles })
|
|
99
|
+
.getManyAndCount()
|
|
103
100
|
|
|
104
101
|
return { items, total }
|
|
105
102
|
}
|