@things-factory/dataset 5.0.4 → 5.0.7
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-sample/data-sample-list-page.js +11 -36
- package/client/pages/data-sample/data-sample-search-page.js +18 -15
- package/client/pages/data-sample/data-sample-view.js +64 -1
- package/dist-server/service/data-sample/data-sample.js +3 -7
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/package.json +7 -7
- package/server/service/data-sample/data-sample.ts +2 -10
|
@@ -61,7 +61,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
61
61
|
.mode=${mode}
|
|
62
62
|
.config=${this.gristConfig}
|
|
63
63
|
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
64
|
-
?url-params-sensitive=${this.active}
|
|
64
|
+
?url-params-sensitive=${false /* this.active */}
|
|
65
65
|
>
|
|
66
66
|
<div slot="headroom">
|
|
67
67
|
<div id="filters">
|
|
@@ -100,6 +100,8 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
async pageInitialized(lifecycle) {
|
|
103
|
+
const today = new Date().toISOString().split('T')[0]
|
|
104
|
+
|
|
103
105
|
this.gristConfig = {
|
|
104
106
|
list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
|
|
105
107
|
columns: [
|
|
@@ -112,7 +114,9 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
112
114
|
handlers: {
|
|
113
115
|
click: (columns, data, column, record, rowIndex) => {
|
|
114
116
|
openPopup(
|
|
115
|
-
html`
|
|
117
|
+
html`
|
|
118
|
+
<data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
|
|
119
|
+
`,
|
|
116
120
|
{
|
|
117
121
|
backdrop: true,
|
|
118
122
|
size: 'large',
|
|
@@ -147,17 +151,6 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
147
151
|
width: 150,
|
|
148
152
|
imex: true
|
|
149
153
|
},
|
|
150
|
-
{
|
|
151
|
-
type: 'resource-object',
|
|
152
|
-
name: 'dataSet',
|
|
153
|
-
header: i18next.t('field.data-set'),
|
|
154
|
-
record: {
|
|
155
|
-
editable: false
|
|
156
|
-
},
|
|
157
|
-
sortable: true,
|
|
158
|
-
width: 120,
|
|
159
|
-
imex: true
|
|
160
|
-
},
|
|
161
154
|
{
|
|
162
155
|
type: 'string',
|
|
163
156
|
name: 'key01',
|
|
@@ -213,16 +206,6 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
213
206
|
width: 120,
|
|
214
207
|
imex: true
|
|
215
208
|
},
|
|
216
|
-
{
|
|
217
|
-
type: 'json5',
|
|
218
|
-
name: 'partitionKeys',
|
|
219
|
-
header: i18next.t('field.partition-keys'),
|
|
220
|
-
record: {
|
|
221
|
-
editable: false
|
|
222
|
-
},
|
|
223
|
-
width: 200,
|
|
224
|
-
imex: true
|
|
225
|
-
},
|
|
226
209
|
{
|
|
227
210
|
type: 'checkbox',
|
|
228
211
|
name: 'ooc',
|
|
@@ -266,6 +249,11 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
266
249
|
name: 'workDate',
|
|
267
250
|
header: i18next.t('field.work-date'),
|
|
268
251
|
sortable: true,
|
|
252
|
+
filter: {
|
|
253
|
+
type: 'date',
|
|
254
|
+
operator: 'between',
|
|
255
|
+
value: [today, today]
|
|
256
|
+
},
|
|
269
257
|
width: 80,
|
|
270
258
|
imex: true
|
|
271
259
|
},
|
|
@@ -344,19 +332,6 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
344
332
|
key03
|
|
345
333
|
key04
|
|
346
334
|
key05
|
|
347
|
-
dataSet {
|
|
348
|
-
id
|
|
349
|
-
name
|
|
350
|
-
description
|
|
351
|
-
}
|
|
352
|
-
partitionKeys
|
|
353
|
-
dataItems {
|
|
354
|
-
name
|
|
355
|
-
description
|
|
356
|
-
tag
|
|
357
|
-
unit
|
|
358
|
-
spec
|
|
359
|
-
}
|
|
360
335
|
data
|
|
361
336
|
rawData
|
|
362
337
|
ooc
|
|
@@ -63,7 +63,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
63
63
|
.mode=${mode}
|
|
64
64
|
.config=${this.gristConfig}
|
|
65
65
|
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
66
|
-
?url-params-sensitive=${this.active}
|
|
66
|
+
?url-params-sensitive=${false /* this.active */}
|
|
67
67
|
>
|
|
68
68
|
<div slot="headroom">
|
|
69
69
|
<div id="filters">
|
|
@@ -133,6 +133,8 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
133
133
|
|
|
134
134
|
this.dataKeySet = response.data.dataKeySet
|
|
135
135
|
this.refreshGristConfig()
|
|
136
|
+
|
|
137
|
+
this.grist.fetch()
|
|
136
138
|
}
|
|
137
139
|
}
|
|
138
140
|
|
|
@@ -156,6 +158,8 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
156
158
|
}
|
|
157
159
|
|
|
158
160
|
refreshGristConfig() {
|
|
161
|
+
const today = new Date().toISOString().split('T')[0]
|
|
162
|
+
|
|
159
163
|
this.gristConfig = {
|
|
160
164
|
list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
|
|
161
165
|
columns: [
|
|
@@ -168,7 +172,9 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
168
172
|
handlers: {
|
|
169
173
|
click: (columns, data, column, record, rowIndex) => {
|
|
170
174
|
openPopup(
|
|
171
|
-
html`
|
|
175
|
+
html`
|
|
176
|
+
<data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
|
|
177
|
+
`,
|
|
172
178
|
{
|
|
173
179
|
backdrop: true,
|
|
174
180
|
size: 'large',
|
|
@@ -229,7 +235,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
229
235
|
record: {
|
|
230
236
|
editable: false
|
|
231
237
|
},
|
|
232
|
-
|
|
238
|
+
hidden: true,
|
|
233
239
|
imex: true
|
|
234
240
|
},
|
|
235
241
|
{
|
|
@@ -237,6 +243,11 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
237
243
|
name: 'workDate',
|
|
238
244
|
header: i18next.t('field.work-date'),
|
|
239
245
|
sortable: true,
|
|
246
|
+
filter: {
|
|
247
|
+
type: 'date',
|
|
248
|
+
operator: 'between',
|
|
249
|
+
value: [today, today]
|
|
250
|
+
},
|
|
240
251
|
width: 80,
|
|
241
252
|
imex: true
|
|
242
253
|
},
|
|
@@ -301,6 +312,10 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
301
312
|
}
|
|
302
313
|
|
|
303
314
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
|
315
|
+
if (!this.dataKeySetId) {
|
|
316
|
+
return { records: [], total: 0 }
|
|
317
|
+
}
|
|
318
|
+
|
|
304
319
|
const response = await client.query({
|
|
305
320
|
query: gql`
|
|
306
321
|
query ($dataKeySetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
|
|
@@ -323,18 +338,6 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
323
338
|
data
|
|
324
339
|
ooc
|
|
325
340
|
oos
|
|
326
|
-
dataSet {
|
|
327
|
-
id
|
|
328
|
-
name
|
|
329
|
-
description
|
|
330
|
-
}
|
|
331
|
-
dataItems {
|
|
332
|
-
name
|
|
333
|
-
description
|
|
334
|
-
tag
|
|
335
|
-
unit
|
|
336
|
-
spec
|
|
337
|
-
}
|
|
338
341
|
judgment
|
|
339
342
|
workDate
|
|
340
343
|
workShift
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import '@operato/dataset/ox-data-sample-view.js'
|
|
2
2
|
|
|
3
|
+
import gql from 'graphql-tag'
|
|
3
4
|
import { css, html, LitElement } from 'lit'
|
|
4
5
|
|
|
6
|
+
import { client } from '@operato/graphql'
|
|
5
7
|
import { i18next, localize } from '@operato/i18n'
|
|
6
8
|
import { ScrollbarStyles } from '@operato/styles'
|
|
7
9
|
|
|
8
10
|
class DataSampleView extends localize(i18next)(LitElement) {
|
|
9
11
|
static get properties() {
|
|
10
12
|
return {
|
|
13
|
+
dataSampleId: {
|
|
14
|
+
type: String,
|
|
15
|
+
attribute: 'data-sample-id'
|
|
16
|
+
},
|
|
11
17
|
dataSample: Object
|
|
12
18
|
}
|
|
13
19
|
}
|
|
@@ -42,10 +48,67 @@ class DataSampleView extends localize(i18next)(LitElement) {
|
|
|
42
48
|
render() {
|
|
43
49
|
return html`
|
|
44
50
|
<div content>
|
|
45
|
-
|
|
51
|
+
${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : html``}
|
|
46
52
|
</div>
|
|
47
53
|
`
|
|
48
54
|
}
|
|
55
|
+
|
|
56
|
+
updated(changes) {
|
|
57
|
+
if (changes.has('dataSampleId')) {
|
|
58
|
+
this.fetchDataSample()
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
async fetchDataSample() {
|
|
63
|
+
const id = this.dataSampleId
|
|
64
|
+
|
|
65
|
+
const response = await client.query({
|
|
66
|
+
query: gql`
|
|
67
|
+
query ($id: String!) {
|
|
68
|
+
dataSample(id: $id) {
|
|
69
|
+
id
|
|
70
|
+
name
|
|
71
|
+
description
|
|
72
|
+
useCase
|
|
73
|
+
key01
|
|
74
|
+
key02
|
|
75
|
+
key03
|
|
76
|
+
key04
|
|
77
|
+
key05
|
|
78
|
+
data
|
|
79
|
+
ooc
|
|
80
|
+
oos
|
|
81
|
+
dataSet {
|
|
82
|
+
id
|
|
83
|
+
name
|
|
84
|
+
description
|
|
85
|
+
}
|
|
86
|
+
dataItems {
|
|
87
|
+
name
|
|
88
|
+
description
|
|
89
|
+
tag
|
|
90
|
+
unit
|
|
91
|
+
spec
|
|
92
|
+
}
|
|
93
|
+
judgment
|
|
94
|
+
workDate
|
|
95
|
+
workShift
|
|
96
|
+
updater {
|
|
97
|
+
id
|
|
98
|
+
name
|
|
99
|
+
}
|
|
100
|
+
updatedAt
|
|
101
|
+
collectedAt
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
`,
|
|
105
|
+
variables: {
|
|
106
|
+
id
|
|
107
|
+
}
|
|
108
|
+
})
|
|
109
|
+
|
|
110
|
+
this.dataSample = response.data.dataSample
|
|
111
|
+
}
|
|
49
112
|
}
|
|
50
113
|
|
|
51
114
|
window.customElements.define('data-sample-view', DataSampleView)
|
|
@@ -209,15 +209,11 @@ __decorate([
|
|
|
209
209
|
], DataSample.prototype, "updaterId", void 0);
|
|
210
210
|
DataSample = __decorate([
|
|
211
211
|
(0, typeorm_1.Entity)(),
|
|
212
|
-
(0, typeorm_1.Index)('ix_data_sample_0', (dataSample) => [
|
|
213
|
-
(0, typeorm_1.Index)('ix_data_sample_1', (dataSample) => [
|
|
212
|
+
(0, typeorm_1.Index)('ix_data_sample_0', (dataSample) => [
|
|
214
213
|
dataSample.domain,
|
|
215
214
|
dataSample.dataSet,
|
|
216
|
-
dataSample.
|
|
217
|
-
dataSample.
|
|
218
|
-
dataSample.key03,
|
|
219
|
-
dataSample.key04,
|
|
220
|
-
dataSample.key05,
|
|
215
|
+
dataSample.workDate,
|
|
216
|
+
dataSample.workShift,
|
|
221
217
|
dataSample.collectedAt
|
|
222
218
|
], { unique: false }),
|
|
223
219
|
(0, type_graphql_1.ObjectType)({ description: 'Entity for DataSample' })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sample.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,qCASgB;AAEhB,yDAAgD;AAChD,6CAA4C;AAC5C,iDAA4D;AAE5D,+DAAqD;AACrD,mDAA8C;AAE9C,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAC7C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"data-sample.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample.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.
|
|
3
|
+
"version": "5.0.7",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -34,14 +34,14 @@
|
|
|
34
34
|
"@operato/shell": "^1.0.1",
|
|
35
35
|
"@operato/styles": "^1.0.0",
|
|
36
36
|
"@operato/utils": "^1.0.1",
|
|
37
|
-
"@things-factory/auth-base": "^5.0.
|
|
38
|
-
"@things-factory/aws-base": "^5.0.
|
|
39
|
-
"@things-factory/board-service": "^5.0.
|
|
37
|
+
"@things-factory/auth-base": "^5.0.7",
|
|
38
|
+
"@things-factory/aws-base": "^5.0.7",
|
|
39
|
+
"@things-factory/board-service": "^5.0.7",
|
|
40
40
|
"@things-factory/env": "^5.0.0",
|
|
41
|
-
"@things-factory/shell": "^5.0.
|
|
42
|
-
"@things-factory/work-shift": "^5.0.
|
|
41
|
+
"@things-factory/shell": "^5.0.7",
|
|
42
|
+
"@things-factory/work-shift": "^5.0.7",
|
|
43
43
|
"cron-parser": "^4.3.0",
|
|
44
44
|
"moment-timezone": "^0.5.34"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "1c7c7618e2e3c9ef8b07d730c3df84c8bc01b35f"
|
|
47
47
|
}
|
|
@@ -22,19 +22,11 @@ const DATABASE_TYPE = ORMCONFIG.type
|
|
|
22
22
|
@Entity()
|
|
23
23
|
@Index(
|
|
24
24
|
'ix_data_sample_0',
|
|
25
|
-
(dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
|
|
26
|
-
{ unique: false }
|
|
27
|
-
)
|
|
28
|
-
@Index(
|
|
29
|
-
'ix_data_sample_1',
|
|
30
25
|
(dataSample: DataSample) => [
|
|
31
26
|
dataSample.domain,
|
|
32
27
|
dataSample.dataSet,
|
|
33
|
-
dataSample.
|
|
34
|
-
dataSample.
|
|
35
|
-
dataSample.key03,
|
|
36
|
-
dataSample.key04,
|
|
37
|
-
dataSample.key05,
|
|
28
|
+
dataSample.workDate,
|
|
29
|
+
dataSample.workShift,
|
|
38
30
|
dataSample.collectedAt
|
|
39
31
|
],
|
|
40
32
|
{ unique: false }
|