@things-factory/dataset 5.0.0-alpha.18 → 5.0.0-alpha.19
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-view.js +134 -0
- package/client/pages/data-ooc.js +19 -1
- package/client/pages/data-sample-view.js +96 -0
- package/client/pages/data-sample.js +19 -1
- package/dist-server/controllers/create-data-sample.js +4 -3
- package/dist-server/controllers/create-data-sample.js.map +1 -1
- package/dist-server/routes.js +1 -1
- package/dist-server/routes.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc.js +7 -0
- package/dist-server/service/data-ooc/data-ooc.js.map +1 -1
- package/dist-server/service/data-sample/data-sample.js +10 -3
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/package.json +14 -14
- package/server/controllers/create-data-sample.ts +7 -6
- package/server/routes.ts +1 -1
- package/server/service/data-ooc/data-ooc.ts +6 -0
- package/server/service/data-sample/data-sample.ts +9 -4
- package/translations/en.json +3 -1
- package/translations/ko.json +3 -1
- package/translations/ms.json +2 -0
- package/translations/zh.json +2 -0
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
import '@operato/dataset/ox-data-sample-view.js'
|
|
2
|
+
|
|
3
|
+
import { LitElement, css, html } from 'lit'
|
|
4
|
+
import { i18next, localize } from '@operato/i18n'
|
|
5
|
+
|
|
6
|
+
import { ScrollbarStyles } from '@operato/styles'
|
|
7
|
+
import { client } from '@operato/graphql'
|
|
8
|
+
import gql from 'graphql-tag'
|
|
9
|
+
|
|
10
|
+
class DataOocView extends localize(i18next)(LitElement) {
|
|
11
|
+
static get properties() {
|
|
12
|
+
return {
|
|
13
|
+
dataSet: Object,
|
|
14
|
+
dataSample: Object
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
static get styles() {
|
|
19
|
+
return [
|
|
20
|
+
ScrollbarStyles,
|
|
21
|
+
css`
|
|
22
|
+
:host {
|
|
23
|
+
display: flex;
|
|
24
|
+
flex-direction: column;
|
|
25
|
+
|
|
26
|
+
background-color: #fff;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
div[content] {
|
|
30
|
+
flex: 1;
|
|
31
|
+
|
|
32
|
+
display: flex;
|
|
33
|
+
overflow: scroll;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
ox-data-sample-view {
|
|
37
|
+
flex: 1;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
.button-container {
|
|
41
|
+
display: flex;
|
|
42
|
+
margin-left: auto;
|
|
43
|
+
padding: var(--padding-default);
|
|
44
|
+
}
|
|
45
|
+
`
|
|
46
|
+
]
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
get sampleView() {
|
|
50
|
+
return this.renderRoot.querySelector('ox-data-sample-view')
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
render() {
|
|
54
|
+
return html`
|
|
55
|
+
<div content>
|
|
56
|
+
<ox-data-sample-view .dataSet=${this.dataSet} .dataSample=${this.dataSample}></ox-data-sample-view>
|
|
57
|
+
</div>
|
|
58
|
+
|
|
59
|
+
<div class="button-container">
|
|
60
|
+
<mwc-button raised @click=${this._updateDataSample.bind(this)}>${i18next.t('button.save')}</mwc-button>
|
|
61
|
+
</div>
|
|
62
|
+
`
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
updated(changes) {
|
|
66
|
+
if (changes.has('dataSample')) {
|
|
67
|
+
this.fetchDataSet()
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
async fetchDataSet() {
|
|
72
|
+
const id = this.dataSample?.dataSet?.id
|
|
73
|
+
|
|
74
|
+
if (id) {
|
|
75
|
+
const response = await client.query({
|
|
76
|
+
query: gql`
|
|
77
|
+
query ($id: String!) {
|
|
78
|
+
dataSet(id: $id) {
|
|
79
|
+
id
|
|
80
|
+
name
|
|
81
|
+
description
|
|
82
|
+
useCase
|
|
83
|
+
dataItems {
|
|
84
|
+
id
|
|
85
|
+
name
|
|
86
|
+
description
|
|
87
|
+
active
|
|
88
|
+
unit
|
|
89
|
+
tag
|
|
90
|
+
type
|
|
91
|
+
spec
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
`,
|
|
96
|
+
variables: {
|
|
97
|
+
id: this.dataSample.dataSet.id
|
|
98
|
+
}
|
|
99
|
+
})
|
|
100
|
+
|
|
101
|
+
this.dataSet = response.data.dataSet
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
async _updateDataSample() {
|
|
106
|
+
// const data = this.sampleView.buildValue()
|
|
107
|
+
// const dataSample = {
|
|
108
|
+
// dataSet: {
|
|
109
|
+
// id: this.dataSet.id
|
|
110
|
+
// },
|
|
111
|
+
// data
|
|
112
|
+
// }
|
|
113
|
+
// const response = await client.mutate({
|
|
114
|
+
// mutation: gql`
|
|
115
|
+
// mutation ($dataSample: NewDataSample!) {
|
|
116
|
+
// createDataSample(dataSample: $dataSample) {
|
|
117
|
+
// id
|
|
118
|
+
// collectedAt
|
|
119
|
+
// }
|
|
120
|
+
// }
|
|
121
|
+
// `,
|
|
122
|
+
// variables: {
|
|
123
|
+
// dataSample
|
|
124
|
+
// }
|
|
125
|
+
// })
|
|
126
|
+
// if (!response.errors) {
|
|
127
|
+
// document.dispatchEvent(
|
|
128
|
+
// new CustomEvent('notify', { detail: { message: i18next.t('text.data sample created successfully') } })
|
|
129
|
+
// )
|
|
130
|
+
// }
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
window.customElements.define('data-ooc-view', DataOocView)
|
package/client/pages/data-ooc.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import '@operato/data-grist'
|
|
2
|
+
import './data-ooc-view.js'
|
|
2
3
|
|
|
3
4
|
import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
|
|
4
5
|
import { PageView, store } from '@operato/shell'
|
|
5
6
|
import { css, html } from 'lit'
|
|
6
7
|
import { i18next, localize } from '@operato/i18n'
|
|
8
|
+
import { notify, openPopup } from '@operato/layout'
|
|
7
9
|
|
|
8
10
|
import { client } from '@operato/graphql'
|
|
9
11
|
import { connect } from 'pwa-helpers/connect-mixin'
|
|
10
12
|
import gql from 'graphql-tag'
|
|
11
13
|
import { isMobileDevice } from '@operato/utils'
|
|
12
|
-
import { notify } from '@operato/layout'
|
|
13
14
|
|
|
14
15
|
export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
|
|
15
16
|
static get properties() {
|
|
@@ -117,6 +118,23 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
|
|
|
117
118
|
columns: [
|
|
118
119
|
{ type: 'gutter', gutterName: 'sequence' },
|
|
119
120
|
{ type: 'gutter', gutterName: 'row-selector', multiple: true },
|
|
121
|
+
{
|
|
122
|
+
type: 'gutter',
|
|
123
|
+
gutterName: 'button',
|
|
124
|
+
icon: 'assignment_turned_in',
|
|
125
|
+
handlers: {
|
|
126
|
+
click: (columns, data, column, record, rowIndex) => {
|
|
127
|
+
openPopup(
|
|
128
|
+
html` <data-ooc-view .dataSample=${record} style="background-color: white;"></data-ooc-view> `,
|
|
129
|
+
{
|
|
130
|
+
backdrop: true,
|
|
131
|
+
size: 'large',
|
|
132
|
+
title: i18next.t('title.data-ooc view')
|
|
133
|
+
}
|
|
134
|
+
)
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
},
|
|
120
138
|
{
|
|
121
139
|
type: 'string',
|
|
122
140
|
name: 'name',
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import '@operato/dataset/ox-data-sample-view.js'
|
|
2
|
+
|
|
3
|
+
import { LitElement, css, html } from 'lit'
|
|
4
|
+
import { i18next, localize } from '@operato/i18n'
|
|
5
|
+
|
|
6
|
+
import { ScrollbarStyles } from '@operato/styles'
|
|
7
|
+
import { client } from '@operato/graphql'
|
|
8
|
+
import gql from 'graphql-tag'
|
|
9
|
+
|
|
10
|
+
class DataSampleView extends localize(i18next)(LitElement) {
|
|
11
|
+
static get properties() {
|
|
12
|
+
return {
|
|
13
|
+
dataSet: Object,
|
|
14
|
+
dataSample: Object
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
static get styles() {
|
|
19
|
+
return [
|
|
20
|
+
ScrollbarStyles,
|
|
21
|
+
css`
|
|
22
|
+
:host {
|
|
23
|
+
display: flex;
|
|
24
|
+
flex-direction: column;
|
|
25
|
+
|
|
26
|
+
background-color: #fff;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
div[content] {
|
|
30
|
+
flex: 1;
|
|
31
|
+
|
|
32
|
+
display: flex;
|
|
33
|
+
overflow: scroll;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
ox-data-sample-view {
|
|
37
|
+
flex: 1;
|
|
38
|
+
}
|
|
39
|
+
`
|
|
40
|
+
]
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
get sampleView() {
|
|
44
|
+
return this.renderRoot.querySelector('ox-data-sample-view')
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
render() {
|
|
48
|
+
return html`
|
|
49
|
+
<div content>
|
|
50
|
+
<ox-data-sample-view .dataSet=${this.dataSet} .dataSample=${this.dataSample}></ox-data-sample-view>
|
|
51
|
+
</div>
|
|
52
|
+
`
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
updated(changes) {
|
|
56
|
+
if (changes.has('dataSample')) {
|
|
57
|
+
this.fetchDataSet()
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
async fetchDataSet() {
|
|
62
|
+
const id = this.dataSample?.dataSet?.id
|
|
63
|
+
|
|
64
|
+
if (id) {
|
|
65
|
+
const response = await client.query({
|
|
66
|
+
query: gql`
|
|
67
|
+
query ($id: String!) {
|
|
68
|
+
dataSet(id: $id) {
|
|
69
|
+
id
|
|
70
|
+
name
|
|
71
|
+
description
|
|
72
|
+
useCase
|
|
73
|
+
dataItems {
|
|
74
|
+
id
|
|
75
|
+
name
|
|
76
|
+
description
|
|
77
|
+
active
|
|
78
|
+
unit
|
|
79
|
+
tag
|
|
80
|
+
type
|
|
81
|
+
spec
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
`,
|
|
86
|
+
variables: {
|
|
87
|
+
id: this.dataSample.dataSet.id
|
|
88
|
+
}
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
this.dataSet = response.data.dataSet
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
window.customElements.define('data-sample-view', DataSampleView)
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import '@operato/data-grist'
|
|
2
|
+
import './data-sample-view.js'
|
|
2
3
|
|
|
3
4
|
import { PageView, store } from '@operato/shell'
|
|
4
5
|
import { css, html } from 'lit'
|
|
5
6
|
import { i18next, localize } from '@operato/i18n'
|
|
7
|
+
import { notify, openPopup } from '@operato/layout'
|
|
6
8
|
|
|
7
9
|
import { ScrollbarStyles } from '@operato/styles'
|
|
8
10
|
import { client } from '@operato/graphql'
|
|
9
11
|
import { connect } from 'pwa-helpers/connect-mixin'
|
|
10
12
|
import gql from 'graphql-tag'
|
|
11
13
|
import { isMobileDevice } from '@operato/utils'
|
|
12
|
-
import { notify } from '@operato/layout'
|
|
13
14
|
|
|
14
15
|
export class DataSample extends connect(store)(localize(i18next)(PageView)) {
|
|
15
16
|
static get properties() {
|
|
@@ -109,6 +110,23 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
|
|
|
109
110
|
columns: [
|
|
110
111
|
{ type: 'gutter', gutterName: 'sequence' },
|
|
111
112
|
{ type: 'gutter', gutterName: 'row-selector', multiple: true },
|
|
113
|
+
{
|
|
114
|
+
type: 'gutter',
|
|
115
|
+
gutterName: 'button',
|
|
116
|
+
icon: 'assignment',
|
|
117
|
+
handlers: {
|
|
118
|
+
click: (columns, data, column, record, rowIndex) => {
|
|
119
|
+
openPopup(
|
|
120
|
+
html` <data-sample-view .dataSample=${record} style="background-color: white;"></data-sample-view> `,
|
|
121
|
+
{
|
|
122
|
+
backdrop: true,
|
|
123
|
+
size: 'large',
|
|
124
|
+
title: i18next.t('title.data-sample view')
|
|
125
|
+
}
|
|
126
|
+
)
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
},
|
|
112
130
|
{
|
|
113
131
|
type: 'string',
|
|
114
132
|
name: 'name',
|
|
@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createDataSample = void 0;
|
|
7
|
-
const
|
|
7
|
+
const data_ooc_1 = require("../service/data-ooc/data-ooc");
|
|
8
8
|
const shell_1 = require("@things-factory/shell");
|
|
9
9
|
const data_item_1 = require("../service/data-item/data-item");
|
|
10
|
-
const data_ooc_1 = require("../service/data-ooc/data-ooc");
|
|
11
10
|
const data_sample_1 = require("../service/data-sample/data-sample");
|
|
12
11
|
const data_set_1 = require("../service/data-set/data-set");
|
|
13
12
|
const data_use_case_1 = require("./data-use-case");
|
|
13
|
+
const moment_1 = __importDefault(require("moment"));
|
|
14
14
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample');
|
|
15
15
|
// parse variable javascript string pattern
|
|
16
16
|
const replaceVariables = (keys, dic) => {
|
|
@@ -58,7 +58,7 @@ async function createDataSample(dataSample, context) {
|
|
|
58
58
|
partitionKeys = formatDate(partitionKeys, (0, moment_1.default)(collectedAt).utc());
|
|
59
59
|
partitionKeys = replaceVariables(partitionKeys, Object.assign({ domain: domain.subdomain, dataSetId: dataSample.dataSet.id }, dataSample.data));
|
|
60
60
|
const { ooc, oos } = data_use_case_1.DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {};
|
|
61
|
-
const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description }, dataSample), { domain,
|
|
61
|
+
const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase }, dataSample), { domain,
|
|
62
62
|
partitionKeys,
|
|
63
63
|
spec,
|
|
64
64
|
ooc,
|
|
@@ -68,6 +68,7 @@ async function createDataSample(dataSample, context) {
|
|
|
68
68
|
const dataOoc = await tx.getRepository(data_ooc_1.DataOoc).save({
|
|
69
69
|
name: dataSet.name,
|
|
70
70
|
description: dataSet.description,
|
|
71
|
+
useCase: dataSet.useCase,
|
|
71
72
|
dataSet,
|
|
72
73
|
dataSample: result,
|
|
73
74
|
data: dataSample.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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"}
|
package/dist-server/routes.js
CHANGED
|
@@ -39,7 +39,7 @@ process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) =>
|
|
|
39
39
|
}
|
|
40
40
|
const domain = sensor.domain;
|
|
41
41
|
const dataSet = sensor.dataSet;
|
|
42
|
-
const user = await
|
|
42
|
+
const user = await tx.getRepository(auth_base_1.User).findOne({
|
|
43
43
|
where: {
|
|
44
44
|
reference: sensor.appliance.id,
|
|
45
45
|
userType: 'appliance'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AAEtD,yDAAgD;AAEhD,yEAAmE;AACnE,mEAA8D;AAE9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+BAA+B,CAAC,CAAA;AAE/D,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;;;;OAKG;IAEH,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC9D,SAAS;QACT,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;QAChF,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,cAAc,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;SACpG;QAED,uBAAuB;QACvB,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,+BAA+B;YAC/B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,QAAQ,EAAE;gBACnB,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC;aAC9C,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,aAAa,CAAC,CAAA;aACvE;YAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,iBAAiB,CAAC,CAAA;aACjF;YAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,iBAAiB,CAAC,CAAA;aACrF;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,iBAAiB,CAAC,CAAA;aACnF;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAC9B,MAAM,IAAI,GAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,6 +120,13 @@ __decorate([
|
|
|
120
120
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
121
121
|
__metadata("design:type", String)
|
|
122
122
|
], DataOoc.prototype, "type", void 0);
|
|
123
|
+
__decorate([
|
|
124
|
+
(0, typeorm_1.Column)({
|
|
125
|
+
nullable: true
|
|
126
|
+
}),
|
|
127
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
128
|
+
__metadata("design:type", String)
|
|
129
|
+
], DataOoc.prototype, "useCase", void 0);
|
|
123
130
|
__decorate([
|
|
124
131
|
(0, typeorm_1.Column)('simple-json', { nullable: true }),
|
|
125
132
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-ooc.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAWgB;AAChB,iDAA4D;AAC5D,+CAA2E;AAE3E,4DAAuD;AACvD,mDAA8C;AAC9C,yDAAgD;AAChD,6CAA4C;AAE5C,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAC7C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAA;AAEpC,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,wCAAuB,CAAA;IACvB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACvB,CAAC,EAPW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAOxB;AAED,IAAA,+BAAgB,EAAC,aAAa,EAAE;IAC9B,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,+DAA+D;CAC7E,CAAC,CAAA;AAOF,IAAa,OAAO,GAApB,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"data-ooc.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var _a, _b, _c, _d, _e, _f;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.DataSample = void 0;
|
|
14
|
-
const type_graphql_1 = require("type-graphql");
|
|
15
14
|
const typeorm_1 = require("typeorm");
|
|
16
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
17
|
-
const env_1 = require("@things-factory/env");
|
|
18
15
|
const shell_1 = require("@things-factory/shell");
|
|
16
|
+
const type_graphql_1 = require("type-graphql");
|
|
19
17
|
const data_set_1 = require("../data-set/data-set");
|
|
18
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
19
|
+
const env_1 = require("@things-factory/env");
|
|
20
20
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
21
21
|
const DATABASE_TYPE = ORMCONFIG.type;
|
|
22
22
|
let DataSample = class DataSample {
|
|
@@ -54,6 +54,13 @@ __decorate([
|
|
|
54
54
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
55
55
|
__metadata("design:type", String)
|
|
56
56
|
], DataSample.prototype, "type", void 0);
|
|
57
|
+
__decorate([
|
|
58
|
+
(0, typeorm_1.Column)({
|
|
59
|
+
nullable: true
|
|
60
|
+
}),
|
|
61
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
62
|
+
__metadata("design:type", String)
|
|
63
|
+
], DataSample.prototype, "useCase", void 0);
|
|
57
64
|
__decorate([
|
|
58
65
|
(0, typeorm_1.Column)('simple-json', { nullable: true }),
|
|
59
66
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sample.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;
|
|
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.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.19",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,19 +24,19 @@
|
|
|
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-alpha.
|
|
28
|
-
"@operato/data-grist": "1.0.0-alpha.
|
|
29
|
-
"@operato/dataset": "1.0.0-alpha.
|
|
30
|
-
"@operato/graphql": "1.0.0-alpha.
|
|
31
|
-
"@operato/i18n": "1.0.0-alpha.
|
|
32
|
-
"@operato/layout": "1.0.0-alpha.
|
|
33
|
-
"@operato/shell": "1.0.0-alpha.
|
|
34
|
-
"@operato/styles": "1.0.0-alpha.
|
|
35
|
-
"@operato/utils": "1.0.0-alpha.
|
|
36
|
-
"@things-factory/auth-base": "^5.0.0-alpha.
|
|
37
|
-
"@things-factory/env": "^5.0.0-alpha.
|
|
38
|
-
"@things-factory/shell": "^5.0.0-alpha.
|
|
27
|
+
"@operato/app": "1.0.0-alpha.38",
|
|
28
|
+
"@operato/data-grist": "1.0.0-alpha.38",
|
|
29
|
+
"@operato/dataset": "1.0.0-alpha.38",
|
|
30
|
+
"@operato/graphql": "1.0.0-alpha.38",
|
|
31
|
+
"@operato/i18n": "1.0.0-alpha.38",
|
|
32
|
+
"@operato/layout": "1.0.0-alpha.38",
|
|
33
|
+
"@operato/shell": "1.0.0-alpha.38",
|
|
34
|
+
"@operato/styles": "1.0.0-alpha.38",
|
|
35
|
+
"@operato/utils": "1.0.0-alpha.38",
|
|
36
|
+
"@things-factory/auth-base": "^5.0.0-alpha.19",
|
|
37
|
+
"@things-factory/env": "^5.0.0-alpha.19",
|
|
38
|
+
"@things-factory/shell": "^5.0.0-alpha.19",
|
|
39
39
|
"moment": "^2.29.1"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "2e89b095f6c976bde6f7ecd777dec0f5b900fea3"
|
|
42
42
|
}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { EntityManager } from 'typeorm'
|
|
3
|
-
|
|
4
|
-
import { User } from '@things-factory/auth-base'
|
|
1
|
+
import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
|
|
5
2
|
import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
|
|
6
3
|
|
|
7
4
|
import { DataItem } from '../service/data-item/data-item'
|
|
8
|
-
import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
|
|
9
5
|
import { DataSample } from '../service/data-sample/data-sample'
|
|
10
|
-
import { NewDataSample } from '../service/data-sample/data-sample-type'
|
|
11
6
|
import { DataSet } from '../service/data-set/data-set'
|
|
12
7
|
import { DataUseCase } from './data-use-case'
|
|
8
|
+
import { EntityManager } from 'typeorm'
|
|
9
|
+
import { NewDataSample } from '../service/data-sample/data-sample-type'
|
|
10
|
+
import { User } from '@things-factory/auth-base'
|
|
11
|
+
import moment from 'moment'
|
|
13
12
|
|
|
14
13
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
|
|
15
14
|
|
|
@@ -90,6 +89,7 @@ export async function createDataSample(
|
|
|
90
89
|
const result = await tx.getRepository(DataSample).save({
|
|
91
90
|
name: dataSet.name,
|
|
92
91
|
description: dataSet.description,
|
|
92
|
+
useCase: dataSet.useCase,
|
|
93
93
|
...dataSample,
|
|
94
94
|
domain,
|
|
95
95
|
partitionKeys,
|
|
@@ -105,6 +105,7 @@ export async function createDataSample(
|
|
|
105
105
|
const dataOoc = await tx.getRepository(DataOoc).save({
|
|
106
106
|
name: dataSet.name,
|
|
107
107
|
description: dataSet.description,
|
|
108
|
+
useCase: dataSet.useCase,
|
|
108
109
|
dataSet,
|
|
109
110
|
dataSample: result,
|
|
110
111
|
data: dataSample.data,
|
package/server/routes.ts
CHANGED
|
@@ -48,7 +48,7 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
|
|
|
48
48
|
|
|
49
49
|
const domain = sensor.domain
|
|
50
50
|
const dataSet = sensor.dataSet
|
|
51
|
-
const user: User = await getRepository(User).findOne({
|
|
51
|
+
const user: User = await tx.getRepository(User).findOne({
|
|
52
52
|
where: {
|
|
53
53
|
reference: sensor.appliance.id,
|
|
54
54
|
userType: 'appliance'
|
|
@@ -113,6 +113,12 @@ export class DataOoc {
|
|
|
113
113
|
@Field({ nullable: true })
|
|
114
114
|
type?: string
|
|
115
115
|
|
|
116
|
+
@Column({
|
|
117
|
+
nullable: true
|
|
118
|
+
})
|
|
119
|
+
@Field({ nullable: true })
|
|
120
|
+
useCase?: string
|
|
121
|
+
|
|
116
122
|
@Column('simple-json', { nullable: true })
|
|
117
123
|
@Field(type => ScalarObject, { nullable: true })
|
|
118
124
|
partitionKeys?: ScalarObject
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
1
|
import {
|
|
3
2
|
Column,
|
|
4
3
|
CreateDateColumn,
|
|
@@ -9,12 +8,12 @@ import {
|
|
|
9
8
|
RelationId,
|
|
10
9
|
UpdateDateColumn
|
|
11
10
|
} from 'typeorm'
|
|
12
|
-
|
|
13
|
-
import { User } from '@things-factory/auth-base'
|
|
14
|
-
import { config } from '@things-factory/env'
|
|
15
11
|
import { Domain, ScalarObject } from '@things-factory/shell'
|
|
12
|
+
import { Field, ID, ObjectType } from 'type-graphql'
|
|
16
13
|
|
|
17
14
|
import { DataSet } from '../data-set/data-set'
|
|
15
|
+
import { User } from '@things-factory/auth-base'
|
|
16
|
+
import { config } from '@things-factory/env'
|
|
18
17
|
|
|
19
18
|
const ORMCONFIG = config.get('ormconfig', {})
|
|
20
19
|
const DATABASE_TYPE = ORMCONFIG.type
|
|
@@ -54,6 +53,12 @@ export class DataSample {
|
|
|
54
53
|
@Field({ nullable: true })
|
|
55
54
|
type?: string
|
|
56
55
|
|
|
56
|
+
@Column({
|
|
57
|
+
nullable: true
|
|
58
|
+
})
|
|
59
|
+
@Field({ nullable: true })
|
|
60
|
+
useCase?: string
|
|
61
|
+
|
|
57
62
|
@Column('simple-json', { nullable: true })
|
|
58
63
|
@Field(type => ScalarObject, { nullable: true })
|
|
59
64
|
partitionKeys?: ScalarObject
|
package/translations/en.json
CHANGED
|
@@ -27,7 +27,9 @@
|
|
|
27
27
|
"title.data-entry-form": "data entry form",
|
|
28
28
|
"title.data-item list": "data item list",
|
|
29
29
|
"title.data-ooc list": "data OOC list",
|
|
30
|
+
"title.data-ooc view": "data OOC view",
|
|
30
31
|
"title.data-sample list": "data sample list",
|
|
32
|
+
"title.data-sample view": "data sample view",
|
|
31
33
|
"title.data-sensor list": "data sensor list",
|
|
32
34
|
"title.data-set list": "data set list"
|
|
33
|
-
}
|
|
35
|
+
}
|
package/translations/ko.json
CHANGED
|
@@ -27,7 +27,9 @@
|
|
|
27
27
|
"title.data-entry-form": "데이타 입력",
|
|
28
28
|
"title.data-item list": "데이타 아이템 조회",
|
|
29
29
|
"title.data-ooc list": "데이타 이탈점 조회",
|
|
30
|
+
"title.data-ooc view": "데이타 이탈점 상세",
|
|
30
31
|
"title.data-sample list": "데이타 샘플 조회",
|
|
32
|
+
"title.data-sample view": "데이타 샘플 상세",
|
|
31
33
|
"title.data-sensor list": "데이타 센서 조회",
|
|
32
34
|
"title.data-set list": "데이타 셋 조회"
|
|
33
|
-
}
|
|
35
|
+
}
|
package/translations/ms.json
CHANGED
|
@@ -27,7 +27,9 @@
|
|
|
27
27
|
"title.data-entry-form": "data entry form",
|
|
28
28
|
"title.data-item list": "data item list",
|
|
29
29
|
"title.data-ooc list": "data OOC list",
|
|
30
|
+
"title.data-ooc view": "data OOC view",
|
|
30
31
|
"title.data-sample list": "data sample list",
|
|
32
|
+
"title.data-sample view": "data sample view",
|
|
31
33
|
"title.data-sensor list": "data sensor list",
|
|
32
34
|
"title.data-set list": "data set list"
|
|
33
35
|
}
|
package/translations/zh.json
CHANGED
|
@@ -27,7 +27,9 @@
|
|
|
27
27
|
"title.data-entry-form": "data entry form",
|
|
28
28
|
"title.data-item list": "data item list",
|
|
29
29
|
"title.data-ooc list": "data OOC list",
|
|
30
|
+
"title.data-ooc view": "data OOC view",
|
|
30
31
|
"title.data-sample list": "data sample list",
|
|
32
|
+
"title.data-sample view": "data sample view",
|
|
31
33
|
"title.data-sensor list": "data sensor list",
|
|
32
34
|
"title.data-set list": "data set list"
|
|
33
35
|
}
|