@things-factory/dataset 5.0.3 → 5.0.6
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 -48
- package/client/pages/data-sample/data-sample-view.js +48 -33
- package/dist-server/service/data-sample/data-sample-query.js +3 -1
- package/dist-server/service/data-sample/data-sample-query.js.map +1 -1
- package/dist-server/service/data-sample/data-sample.js +4 -7
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/package.json +2 -2
- package/server/service/data-sample/data-sample-query.ts +3 -1
- package/server/service/data-sample/data-sample.ts +3 -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',
|
|
@@ -203,28 +209,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
203
209
|
width: 150,
|
|
204
210
|
imex: true
|
|
205
211
|
},
|
|
206
|
-
{
|
|
207
|
-
type: 'resource-object',
|
|
208
|
-
name: 'dataSet',
|
|
209
|
-
header: i18next.t('field.data-set'),
|
|
210
|
-
record: {
|
|
211
|
-
editable: false
|
|
212
|
-
},
|
|
213
|
-
sortable: true,
|
|
214
|
-
width: 120,
|
|
215
|
-
imex: true
|
|
216
|
-
},
|
|
217
212
|
...this.getDataKeyColumns(),
|
|
218
|
-
{
|
|
219
|
-
type: 'json5',
|
|
220
|
-
name: 'partitionKeys',
|
|
221
|
-
header: i18next.t('field.partition-keys'),
|
|
222
|
-
record: {
|
|
223
|
-
editable: false
|
|
224
|
-
},
|
|
225
|
-
width: 200,
|
|
226
|
-
imex: true
|
|
227
|
-
},
|
|
228
213
|
{
|
|
229
214
|
type: 'checkbox',
|
|
230
215
|
name: 'ooc',
|
|
@@ -250,17 +235,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
250
235
|
record: {
|
|
251
236
|
editable: false
|
|
252
237
|
},
|
|
253
|
-
|
|
254
|
-
imex: true
|
|
255
|
-
},
|
|
256
|
-
{
|
|
257
|
-
type: 'text',
|
|
258
|
-
name: 'rawData',
|
|
259
|
-
header: i18next.t('field.raw-data'),
|
|
260
|
-
record: {
|
|
261
|
-
editable: false
|
|
262
|
-
},
|
|
263
|
-
width: 200,
|
|
238
|
+
hidden: true,
|
|
264
239
|
imex: true
|
|
265
240
|
},
|
|
266
241
|
{
|
|
@@ -268,6 +243,11 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
268
243
|
name: 'workDate',
|
|
269
244
|
header: i18next.t('field.work-date'),
|
|
270
245
|
sortable: true,
|
|
246
|
+
filter: {
|
|
247
|
+
type: 'date',
|
|
248
|
+
operator: 'between',
|
|
249
|
+
value: [today, today]
|
|
250
|
+
},
|
|
271
251
|
width: 80,
|
|
272
252
|
imex: true
|
|
273
253
|
},
|
|
@@ -332,6 +312,10 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
332
312
|
}
|
|
333
313
|
|
|
334
314
|
async fetchHandler({ page, limit, sortings = [], filters = [] }) {
|
|
315
|
+
if (!this.dataKeySetId) {
|
|
316
|
+
return { records: [], total: 0 }
|
|
317
|
+
}
|
|
318
|
+
|
|
335
319
|
const response = await client.query({
|
|
336
320
|
query: gql`
|
|
337
321
|
query ($dataKeySetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
|
|
@@ -351,21 +335,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
|
|
|
351
335
|
key03
|
|
352
336
|
key04
|
|
353
337
|
key05
|
|
354
|
-
dataSet {
|
|
355
|
-
id
|
|
356
|
-
name
|
|
357
|
-
description
|
|
358
|
-
}
|
|
359
|
-
partitionKeys
|
|
360
|
-
dataItems {
|
|
361
|
-
name
|
|
362
|
-
description
|
|
363
|
-
tag
|
|
364
|
-
unit
|
|
365
|
-
spec
|
|
366
|
-
}
|
|
367
338
|
data
|
|
368
|
-
rawData
|
|
369
339
|
ooc
|
|
370
340
|
oos
|
|
371
341
|
judgment
|
|
@@ -10,7 +10,10 @@ import { ScrollbarStyles } from '@operato/styles'
|
|
|
10
10
|
class DataSampleView extends localize(i18next)(LitElement) {
|
|
11
11
|
static get properties() {
|
|
12
12
|
return {
|
|
13
|
-
|
|
13
|
+
dataSampleId: {
|
|
14
|
+
type: String,
|
|
15
|
+
attribute: 'data-sample-id'
|
|
16
|
+
},
|
|
14
17
|
dataSample: Object
|
|
15
18
|
}
|
|
16
19
|
}
|
|
@@ -42,57 +45,69 @@ class DataSampleView extends localize(i18next)(LitElement) {
|
|
|
42
45
|
]
|
|
43
46
|
}
|
|
44
47
|
|
|
45
|
-
get sampleView() {
|
|
46
|
-
return this.renderRoot.querySelector('ox-data-sample-view')
|
|
47
|
-
}
|
|
48
|
-
|
|
49
48
|
render() {
|
|
50
49
|
return html`
|
|
51
50
|
<div content>
|
|
52
|
-
|
|
51
|
+
${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : html``}
|
|
53
52
|
</div>
|
|
54
53
|
`
|
|
55
54
|
}
|
|
56
55
|
|
|
57
56
|
updated(changes) {
|
|
58
|
-
if (changes.has('
|
|
59
|
-
this.
|
|
57
|
+
if (changes.has('dataSampleId')) {
|
|
58
|
+
this.fetchDataSample()
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
61
|
|
|
63
|
-
async
|
|
64
|
-
const id = this.
|
|
62
|
+
async fetchDataSample() {
|
|
63
|
+
const id = this.dataSampleId
|
|
65
64
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
query:
|
|
69
|
-
|
|
70
|
-
|
|
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 {
|
|
71
82
|
id
|
|
72
83
|
name
|
|
73
84
|
description
|
|
74
|
-
useCase
|
|
75
|
-
dataItems {
|
|
76
|
-
name
|
|
77
|
-
description
|
|
78
|
-
active
|
|
79
|
-
tag
|
|
80
|
-
type
|
|
81
|
-
unit
|
|
82
|
-
options
|
|
83
|
-
quota
|
|
84
|
-
spec
|
|
85
|
-
}
|
|
86
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
|
|
87
102
|
}
|
|
88
|
-
`,
|
|
89
|
-
variables: {
|
|
90
|
-
id: this.dataSample.dataSet.id
|
|
91
103
|
}
|
|
92
|
-
|
|
104
|
+
`,
|
|
105
|
+
variables: {
|
|
106
|
+
id
|
|
107
|
+
}
|
|
108
|
+
})
|
|
93
109
|
|
|
94
|
-
|
|
95
|
-
}
|
|
110
|
+
this.dataSample = response.data.dataSample
|
|
96
111
|
}
|
|
97
112
|
}
|
|
98
113
|
|
|
@@ -47,12 +47,14 @@ let DataSampleQuery = class DataSampleQuery {
|
|
|
47
47
|
const dataKeySet = await (0, typeorm_1.getRepository)(data_key_set_1.DataKeySet).findOne(dataKeySetId);
|
|
48
48
|
const dataKeyItems = (dataKeySet === null || dataKeySet === void 0 ? void 0 : dataKeySet.dataKeyItems) || [];
|
|
49
49
|
const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`);
|
|
50
|
-
/* TODO DataKeySet 과 관련된 DataSample만 조회되도록 할 것. */
|
|
51
50
|
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
52
51
|
repository: (0, typeorm_1.getRepository)(data_sample_1.DataSample),
|
|
53
52
|
params,
|
|
54
53
|
domain,
|
|
54
|
+
alias: 'dks',
|
|
55
55
|
searchables: ['name', 'description'].concat(searchables)
|
|
56
|
+
}).innerJoin('dks.dataSet', 'ds', 'ds.dataKeySet = :dataKeySetId', {
|
|
57
|
+
dataKeySetId
|
|
56
58
|
});
|
|
57
59
|
const [items, total] = await queryBuilder.getManyAndCount();
|
|
58
60
|
return { items, total };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sample-query.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAgD;AAChD,iDAAwF;AAExF,+DAAyD;AACzD,2EAAqE;AACrE,+DAAqD;AACrD,mDAA8C;AAC9C,+CAA0C;AAC1C,yDAAmD;AAGnD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAG1B,KAAK,CAAC,UAAU,CAAY,EAAU,EAAS,OAAY;QACzD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,OAAO,MAAM,IAAA,uBAAa,EAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,WAAW,CAAS,MAAiB,EAAS,OAAY;QAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,UAAU,EAAE,IAAA,uBAAa,EAAC,wBAAU,CAAC;YACrC,MAAM;YACN,MAAM;YACN,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;SACrC,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;IAID,KAAK,CAAC,uBAAuB,CACN,YAAoB,EACjC,MAAiB,EAClB,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAa,EAAC,yBAAU,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACxE,MAAM,YAAY,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,KAAI,EAAE,CAAA;QACnD,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;QAEzE,
|
|
1
|
+
{"version":3,"file":"data-sample-query.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAgD;AAChD,iDAAwF;AAExF,+DAAyD;AACzD,2EAAqE;AACrE,+DAAqD;AACrD,mDAA8C;AAC9C,+CAA0C;AAC1C,yDAAmD;AAGnD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAG1B,KAAK,CAAC,UAAU,CAAY,EAAU,EAAS,OAAY;QACzD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,OAAO,MAAM,IAAA,uBAAa,EAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,WAAW,CAAS,MAAiB,EAAS,OAAY;QAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,UAAU,EAAE,IAAA,uBAAa,EAAC,wBAAU,CAAC;YACrC,MAAM;YACN,MAAM;YACN,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;SACrC,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;IAID,KAAK,CAAC,uBAAuB,CACN,YAAoB,EACjC,MAAiB,EAClB,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAa,EAAC,yBAAU,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACxE,MAAM,YAAY,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,KAAI,EAAE,CAAA;QACnD,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;QAEzE,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,UAAU,EAAE,IAAA,uBAAa,EAAC,wBAAU,CAAC;YACrC,MAAM;YACN,MAAM;YACN,KAAK,EAAE,KAAK;YACZ,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;SACzD,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,+BAA+B,EAAE;YACjE,YAAY;SACb,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,SAAS,CAAS,UAAsB;QAC5C,MAAM,cAAc,GAAmB,MAAM,IAAA,uBAAa,EAAC,iCAAc,CAAC,CAAC,OAAO,CAAC;YACjF,KAAK,EAAE;gBACL,UAAU,EAAE,UAAU,CAAC,SAAS;gBAChC,OAAO,EAAE,UAAU,CAAC,cAAc;aACnC;SACF,CAAC,CAAA;QACF,OAAO,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,KAAI,EAAE,CAAA;IACxC,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,UAAsB;QAC1C,OAAO,MAAM,IAAA,uBAAa,EAAC,kBAAO,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACnE,CAAC;IAGD,KAAK,CAAC,MAAM,CAAS,UAAsB;QACzC,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IACjE,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,UAAsB;QAC1C,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IAChE,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,UAAsB;QAC1C,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IAChE,CAAC;CACF,CAAA;AAnFC;IAFC,IAAA,wBAAS,EAAC,mFAAmF,CAAC;IAC9F,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,wBAAU,EAAE,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;IACtD,WAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;iDAM7C;AAID;IAFC,IAAA,wBAAS,EAAC,mFAAmF,CAAC;IAC9F,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,iCAAc,EAAE,EAAE,WAAW,EAAE,gCAAgC,EAAE,CAAC;IACjE,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,kBAAG,GAAE,CAAA;;yDAAjB,iBAAS,oBAAT,iBAAS;;kDAa1C;AAID;IAFC,IAAA,wBAAS,EAAC,mFAAmF,CAAC;IAC9F,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,iCAAc,EAAE,EAAE,WAAW,EAAE,gDAAgD,EAAE,CAAC;IAEjG,WAAA,IAAA,kBAAG,EAAC,cAAc,CAAC,CAAA;IACnB,WAAA,IAAA,mBAAI,GAAE,CAAA;IACN,WAAA,IAAA,kBAAG,GAAE,CAAA;;iEADU,iBAAS,oBAAT,iBAAS;;8DAsB1B;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,yBAAQ,CAAC,CAAC;IACjB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAa,wBAAU;;gDAQ7C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAO,CAAC;IAChB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAa,wBAAU;;8CAE3C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IAChB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAa,wBAAU;;6CAE1C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACb,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAa,wBAAU;;8CAE3C;AAGD;IADC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACb,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAa,wBAAU;;8CAE3C;AArFU,eAAe;IAD3B,IAAA,uBAAQ,EAAC,wBAAU,CAAC;GACR,eAAe,CAsF3B;AAtFY,0CAAe"}
|
|
@@ -209,14 +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
|
-
dataSample.
|
|
216
|
-
dataSample.
|
|
217
|
-
dataSample.
|
|
218
|
-
dataSample.key04,
|
|
219
|
-
dataSample.key05,
|
|
214
|
+
dataSample.dataSet,
|
|
215
|
+
dataSample.workDate,
|
|
216
|
+
dataSample.workShift,
|
|
220
217
|
dataSample.collectedAt
|
|
221
218
|
], { unique: false }),
|
|
222
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.6",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"cron-parser": "^4.3.0",
|
|
44
44
|
"moment-timezone": "^0.5.34"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "dfaf95e5b0daa68180a91e426628d272dc802eef"
|
|
47
47
|
}
|
|
@@ -53,12 +53,14 @@ export class DataSampleQuery {
|
|
|
53
53
|
const dataKeyItems = dataKeySet?.dataKeyItems || []
|
|
54
54
|
const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`)
|
|
55
55
|
|
|
56
|
-
/* TODO DataKeySet 과 관련된 DataSample만 조회되도록 할 것. */
|
|
57
56
|
const queryBuilder = getQueryBuilderFromListParams({
|
|
58
57
|
repository: getRepository(DataSample),
|
|
59
58
|
params,
|
|
60
59
|
domain,
|
|
60
|
+
alias: 'dks',
|
|
61
61
|
searchables: ['name', 'description'].concat(searchables)
|
|
62
|
+
}).innerJoin('dks.dataSet', 'ds', 'ds.dataKeySet = :dataKeySetId', {
|
|
63
|
+
dataKeySetId
|
|
62
64
|
})
|
|
63
65
|
|
|
64
66
|
const [items, total] = await queryBuilder.getManyAndCount()
|
|
@@ -22,18 +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
|
-
dataSample.
|
|
33
|
-
dataSample.
|
|
34
|
-
dataSample.
|
|
35
|
-
dataSample.key04,
|
|
36
|
-
dataSample.key05,
|
|
27
|
+
dataSample.dataSet,
|
|
28
|
+
dataSample.workDate,
|
|
29
|
+
dataSample.workShift,
|
|
37
30
|
dataSample.collectedAt
|
|
38
31
|
],
|
|
39
32
|
{ unique: false }
|