@things-factory/dataset 5.0.0-zeta.18 → 5.0.0-zeta.20
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 -1
- package/client/pages/data-ooc/data-ooc-list-page.js +2 -2
- package/client/pages/data-report/data-report-list-page.js +1 -1
- package/client/pages/data-sample/data-sample-list-page.js +1 -1
- package/client/pages/data-sensor/data-sensor-list-page.js +1 -1
- package/client/pages/data-set/data-set-list-page.js +1 -1
- package/dist-server/service/data-ooc/data-ooc-query.js +1 -1
- package/dist-server/service/data-ooc/data-ooc-query.js.map +1 -1
- package/dist-server/service/data-sample/data-sample-query.js +1 -1
- package/dist-server/service/data-sample/data-sample-query.js.map +1 -1
- package/dist-server/service/data-set/data-set-mutation.js +0 -17
- package/dist-server/service/data-set/data-set-mutation.js.map +1 -1
- package/dist-server/service/data-set-history/data-set-history-query.js +2 -2
- package/dist-server/service/data-set-history/data-set-history-query.js.map +1 -1
- package/dist-server/service/data-set-history/data-set-history.js +43 -55
- package/dist-server/service/data-set-history/data-set-history.js.map +1 -1
- package/dist-server/service/data-set-history/event-subscriber.js +26 -0
- package/dist-server/service/data-set-history/event-subscriber.js.map +1 -0
- package/dist-server/service/data-set-history/index.js +3 -1
- package/dist-server/service/data-set-history/index.js.map +1 -1
- package/dist-server/service/index.js +5 -1
- package/dist-server/service/index.js.map +1 -1
- package/package.json +18 -18
- package/server/service/data-ooc/data-ooc-query.ts +1 -1
- package/server/service/data-sample/data-sample-query.ts +1 -1
- package/server/service/data-set/data-set-mutation.ts +0 -26
- package/server/service/data-set-history/data-set-history-query.ts +2 -2
- package/server/service/data-set-history/data-set-history.ts +60 -59
- package/server/service/data-set-history/event-subscriber.ts +17 -0
- package/server/service/data-set-history/index.ts +2 -0
- package/server/service/index.ts +10 -1
- package/translations/en.json +2 -2
- package/translations/ko.json +2 -2
- package/translations/ms.json +1 -1
- package/translations/zh.json +1 -1
|
@@ -121,7 +121,7 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
|
|
|
121
121
|
>
|
|
122
122
|
<div slot="headroom">
|
|
123
123
|
<div id="filters">
|
|
124
|
-
<ox-filters-form></ox-filters-form>
|
|
124
|
+
<ox-filters-form autofocus></ox-filters-form>
|
|
125
125
|
</div>
|
|
126
126
|
|
|
127
127
|
<div id="sorters">
|
|
@@ -71,7 +71,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
71
71
|
>
|
|
72
72
|
<div slot="headroom">
|
|
73
73
|
<div id="filters">
|
|
74
|
-
<ox-filters-form></ox-filters-form>
|
|
74
|
+
<ox-filters-form autofocus></ox-filters-form>
|
|
75
75
|
</div>
|
|
76
76
|
|
|
77
77
|
<div id="sorters">
|
|
@@ -186,7 +186,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
186
186
|
type: 'select',
|
|
187
187
|
name: 'state',
|
|
188
188
|
label: true,
|
|
189
|
-
header: i18next.t('field.
|
|
189
|
+
header: i18next.t('field.status'),
|
|
190
190
|
record: {
|
|
191
191
|
editable: false,
|
|
192
192
|
options: ['', 'CREATED', 'REVIEWED', 'CORRECTED']
|
|
@@ -156,7 +156,7 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
|
|
|
156
156
|
>
|
|
157
157
|
<div slot="headroom">
|
|
158
158
|
<div id="filters">
|
|
159
|
-
<ox-filters-form></ox-filters-form>
|
|
159
|
+
<ox-filters-form autofocus></ox-filters-form>
|
|
160
160
|
</div>
|
|
161
161
|
|
|
162
162
|
<div id="sorters">
|
|
@@ -165,7 +165,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
|
|
|
165
165
|
>
|
|
166
166
|
<div slot="headroom">
|
|
167
167
|
<div id="filters">
|
|
168
|
-
<ox-filters-form></ox-filters-form>
|
|
168
|
+
<ox-filters-form autofocus></ox-filters-form>
|
|
169
169
|
</div>
|
|
170
170
|
|
|
171
171
|
<div id="sorters">
|
|
@@ -44,7 +44,7 @@ let DataOocQuery = class DataOocQuery {
|
|
|
44
44
|
async dataItems(dataOoc) {
|
|
45
45
|
const dataSetHistory = await (0, typeorm_1.getRepository)(data_set_history_1.DataSetHistory).findOne({
|
|
46
46
|
where: {
|
|
47
|
-
|
|
47
|
+
originalId: dataOoc.dataSetId,
|
|
48
48
|
version: dataOoc.dataSetVersion
|
|
49
49
|
}
|
|
50
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-ooc-query.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,yDAAgD;AAChD,iDAAwF;AAExF,2EAAqE;AACrE,+DAAqD;AACrD,mDAA8C;AAC9C,yCAAoC;AACpC,mDAA6C;AAG7C,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,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;IAGD,KAAK,CAAC,SAAS,CAAS,OAAgB;QACtC,MAAM,cAAc,GAAmB,MAAM,IAAA,uBAAa,EAAC,iCAAc,CAAC,CAAC,OAAO,CAAC;YACjF,KAAK,EAAE;gBACL,
|
|
1
|
+
{"version":3,"file":"data-ooc-query.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ let DataSampleQuery = class DataSampleQuery {
|
|
|
44
44
|
async dataItems(dataSample) {
|
|
45
45
|
const dataSetHistory = await (0, typeorm_1.getRepository)(data_set_history_1.DataSetHistory).findOne({
|
|
46
46
|
where: {
|
|
47
|
-
|
|
47
|
+
originalId: dataSample.dataSetId,
|
|
48
48
|
version: dataSample.dataSetVersion
|
|
49
49
|
}
|
|
50
50
|
});
|
|
@@ -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,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;IAGD,KAAK,CAAC,SAAS,CAAS,UAAsB;QAC5C,MAAM,cAAc,GAAmB,MAAM,IAAA,uBAAa,EAAC,iCAAc,CAAC,CAAC,OAAO,CAAC;YACjF,KAAK,EAAE;gBACL,
|
|
1
|
+
{"version":3,"file":"data-sample-query.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ exports.DataSetMutation = void 0;
|
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
17
|
const typeorm_1 = require("typeorm");
|
|
18
18
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
19
|
-
const data_set_history_1 = require("../data-set-history/data-set-history");
|
|
20
19
|
const data_set_1 = require("./data-set");
|
|
21
20
|
const data_set_type_1 = require("./data-set-type");
|
|
22
21
|
const crypto = require('crypto');
|
|
@@ -24,32 +23,23 @@ let DataSetMutation = class DataSetMutation {
|
|
|
24
23
|
async createDataSet(dataSet, context) {
|
|
25
24
|
const { domain, user, tx } = context.state;
|
|
26
25
|
const dataSetRepo = tx.getRepository(data_set_1.DataSet);
|
|
27
|
-
const dataSetHistoryRepo = tx.getRepository(data_set_history_1.DataSetHistory);
|
|
28
26
|
const result = await dataSetRepo.save(Object.assign(Object.assign({}, dataSet), { version: 1, domain, creator: user, updater: user }));
|
|
29
27
|
await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: '+' });
|
|
30
|
-
await dataSetHistoryRepo.save(await dataSetRepo.findOne(result.id, {
|
|
31
|
-
relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
|
|
32
|
-
}));
|
|
33
28
|
return result;
|
|
34
29
|
}
|
|
35
30
|
async updateDataSet(id, patch, context) {
|
|
36
31
|
const { domain, user, tx } = context.state;
|
|
37
32
|
const dataSetRepo = tx.getRepository(data_set_1.DataSet);
|
|
38
|
-
const dataSetHistoryRepo = tx.getRepository(data_set_history_1.DataSetHistory);
|
|
39
33
|
const dataSet = await dataSetRepo.findOne({
|
|
40
34
|
where: { domain, id }
|
|
41
35
|
});
|
|
42
36
|
const result = await dataSetRepo.save(Object.assign(Object.assign(Object.assign({}, dataSet), patch), { updater: user }));
|
|
43
37
|
await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: 'M' });
|
|
44
|
-
await dataSetHistoryRepo.save(await dataSetRepo.findOne(id, {
|
|
45
|
-
relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
|
|
46
|
-
}));
|
|
47
38
|
return result;
|
|
48
39
|
}
|
|
49
40
|
async updateMultipleDataSet(patches, context) {
|
|
50
41
|
const { domain, user, tx } = context.state;
|
|
51
42
|
const dataSetRepo = tx.getRepository(data_set_1.DataSet);
|
|
52
|
-
const dataSetHistoryRepo = tx.getRepository(data_set_history_1.DataSetHistory);
|
|
53
43
|
let results = [];
|
|
54
44
|
const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
|
|
55
45
|
const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
|
|
@@ -76,7 +66,6 @@ let DataSetMutation = class DataSetMutation {
|
|
|
76
66
|
}))), { cuFlag }));
|
|
77
67
|
}
|
|
78
68
|
}
|
|
79
|
-
results.forEach(result => dataSetHistoryRepo.save(Object.assign({}, result)));
|
|
80
69
|
return results;
|
|
81
70
|
}
|
|
82
71
|
async deleteDataSet(id, context) {
|
|
@@ -97,19 +86,14 @@ let DataSetMutation = class DataSetMutation {
|
|
|
97
86
|
async importDataSets(dataSets, context) {
|
|
98
87
|
const { domain, tx } = context.state;
|
|
99
88
|
const dataSetRepo = tx.getRepository(data_set_1.DataSet);
|
|
100
|
-
const dataSetHistoryRepo = tx.getRepository(data_set_history_1.DataSetHistory);
|
|
101
89
|
await Promise.all(dataSets.map(async (dataSet) => {
|
|
102
90
|
const createdDataSet = await dataSetRepo.save(Object.assign({ domain }, dataSet));
|
|
103
|
-
await dataSetHistoryRepo.save(...(await dataSetRepo.findOne(createdDataSet.id, {
|
|
104
|
-
relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
|
|
105
|
-
})));
|
|
106
91
|
}));
|
|
107
92
|
return true;
|
|
108
93
|
}
|
|
109
94
|
async copyDataSets(ids, context) {
|
|
110
95
|
const { domain, user, tx } = context.state;
|
|
111
96
|
const dataSetRepo = tx.getRepository(data_set_1.DataSet);
|
|
112
|
-
const dataSetHistoryRepo = tx.getRepository(data_set_history_1.DataSetHistory);
|
|
113
97
|
const originals = await dataSetRepo.find({
|
|
114
98
|
where: {
|
|
115
99
|
id: (0, typeorm_1.In)(ids),
|
|
@@ -125,7 +109,6 @@ let DataSetMutation = class DataSetMutation {
|
|
|
125
109
|
return Object.assign(Object.assign({}, dataSet), { id: dataSetId, name: dataSet.name + ' (' + dataSetId + ')', active: false, domain, creator: user, updater: user });
|
|
126
110
|
});
|
|
127
111
|
var copiedDataSets = await dataSetRepo.save(newCopys);
|
|
128
|
-
await dataSetHistoryRepo.save(copiedDataSets);
|
|
129
112
|
return copiedDataSets;
|
|
130
113
|
}
|
|
131
114
|
async _createAttachment(context, attachment, { refId, cuFlag }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAA4B;AAE5B,qEAA0F;AAE1F,
|
|
1
|
+
{"version":3,"file":"data-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ let DataSetHistoryQuery = class DataSetHistoryQuery {
|
|
|
26
26
|
async dataSetHistory(id, timestamp, context) {
|
|
27
27
|
const { domain } = context.state;
|
|
28
28
|
return await (0, typeorm_1.getRepository)(data_set_history_1.DataSetHistory).findOne({
|
|
29
|
-
where: { domain, id, updatedAt: timestamp }
|
|
29
|
+
where: { domain, originalId: id, updatedAt: timestamp }
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
32
|
async dataSetHistories(params, context) {
|
|
@@ -78,7 +78,7 @@ let DataSetHistoryQuery = class DataSetHistoryQuery {
|
|
|
78
78
|
const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
79
79
|
where: {
|
|
80
80
|
domain: dataSetHistory.domainId,
|
|
81
|
-
refBy: `report-${dataSetHistory.
|
|
81
|
+
refBy: `report-${dataSetHistory.originalId}`
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
return attachment === null || attachment === void 0 ? void 0 : attachment.path;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-history-query.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AAEvC,qEAA4D;AAC5D,yDAAsD;AACtD,iEAAqD;AACrD,iDAAoG;AAEpG,yDAAmD;AACnD,mEAA4D;AAG5D,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAG9B,KAAK,CAAC,cAAc,CACP,EAAU,EACiB,SAAqB,EACpD,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,OAAO,MAAM,IAAA,uBAAa,EAAC,iCAAc,CAAC,CAAC,OAAO,CAAC;YACjD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"data-set-history-query.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,23 +13,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.DataSetHistory = void 0;
|
|
14
14
|
const type_graphql_1 = require("type-graphql");
|
|
15
15
|
const typeorm_1 = require("typeorm");
|
|
16
|
+
const typeorm_history_1 = require("@anchan828/typeorm-history");
|
|
16
17
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
18
|
+
const env_1 = require("@things-factory/env");
|
|
17
19
|
const shell_1 = require("@things-factory/shell");
|
|
18
20
|
const data_item_type_1 = require("../data-set/data-item-type");
|
|
19
21
|
const data_set_1 = require("../data-set/data-set");
|
|
22
|
+
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
23
|
+
const DATABASE_TYPE = ORMCONFIG.type;
|
|
20
24
|
let DataSetHistory = class DataSetHistory {
|
|
21
25
|
constructor() {
|
|
22
26
|
this.version = 1;
|
|
23
27
|
}
|
|
24
28
|
};
|
|
25
29
|
__decorate([
|
|
26
|
-
(0, typeorm_1.
|
|
30
|
+
(0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
|
|
27
31
|
(0, type_graphql_1.Field)(type => type_graphql_1.ID),
|
|
28
32
|
__metadata("design:type", String)
|
|
29
33
|
], DataSetHistory.prototype, "id", void 0);
|
|
30
34
|
__decorate([
|
|
31
|
-
(0, typeorm_1.
|
|
32
|
-
(0, type_graphql_1.Field)(),
|
|
35
|
+
(0, typeorm_1.Column)({ default: 1 }),
|
|
36
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
33
37
|
__metadata("design:type", Number)
|
|
34
38
|
], DataSetHistory.prototype, "version", void 0);
|
|
35
39
|
__decorate([
|
|
@@ -47,23 +51,17 @@ __decorate([
|
|
|
47
51
|
__metadata("design:type", String)
|
|
48
52
|
], DataSetHistory.prototype, "name", void 0);
|
|
49
53
|
__decorate([
|
|
50
|
-
(0, typeorm_1.Column)({
|
|
51
|
-
nullable: true
|
|
52
|
-
}),
|
|
54
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
53
55
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
54
56
|
__metadata("design:type", String)
|
|
55
57
|
], DataSetHistory.prototype, "description", void 0);
|
|
56
58
|
__decorate([
|
|
57
|
-
(0, typeorm_1.Column)({
|
|
58
|
-
nullable: true
|
|
59
|
-
}),
|
|
59
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
60
60
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
61
61
|
__metadata("design:type", Boolean)
|
|
62
62
|
], DataSetHistory.prototype, "active", void 0);
|
|
63
63
|
__decorate([
|
|
64
|
-
(0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
|
|
65
|
-
nullable: true
|
|
66
|
-
}),
|
|
64
|
+
(0, typeorm_1.ManyToOne)(type => auth_base_1.Role, { nullable: true }),
|
|
67
65
|
(0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
|
|
68
66
|
__metadata("design:type", typeof (_b = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _b : Object)
|
|
69
67
|
], DataSetHistory.prototype, "entryRole", void 0);
|
|
@@ -72,9 +70,7 @@ __decorate([
|
|
|
72
70
|
__metadata("design:type", String)
|
|
73
71
|
], DataSetHistory.prototype, "entryRoleId", void 0);
|
|
74
72
|
__decorate([
|
|
75
|
-
(0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
|
|
76
|
-
nullable: true
|
|
77
|
-
}),
|
|
73
|
+
(0, typeorm_1.ManyToOne)(type => auth_base_1.Role, { nullable: true }),
|
|
78
74
|
(0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
|
|
79
75
|
__metadata("design:type", typeof (_c = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _c : Object)
|
|
80
76
|
], DataSetHistory.prototype, "supervisoryRole", void 0);
|
|
@@ -83,51 +79,37 @@ __decorate([
|
|
|
83
79
|
__metadata("design:type", String)
|
|
84
80
|
], DataSetHistory.prototype, "supervisoryRoleId", void 0);
|
|
85
81
|
__decorate([
|
|
86
|
-
(0, typeorm_1.Column)({
|
|
87
|
-
nullable: true
|
|
88
|
-
}),
|
|
82
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
89
83
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
90
84
|
__metadata("design:type", String)
|
|
91
85
|
], DataSetHistory.prototype, "type", void 0);
|
|
92
86
|
__decorate([
|
|
93
|
-
(0, typeorm_1.Column)({
|
|
94
|
-
nullable: true
|
|
95
|
-
}),
|
|
87
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
96
88
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
97
89
|
__metadata("design:type", String)
|
|
98
90
|
], DataSetHistory.prototype, "entryType", void 0);
|
|
99
91
|
__decorate([
|
|
100
|
-
(0, typeorm_1.Column)({
|
|
101
|
-
nullable: true
|
|
102
|
-
}),
|
|
92
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
103
93
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
104
94
|
__metadata("design:type", String)
|
|
105
95
|
], DataSetHistory.prototype, "entryView", void 0);
|
|
106
96
|
__decorate([
|
|
107
|
-
(0, typeorm_1.Column)({
|
|
108
|
-
nullable: true
|
|
109
|
-
}),
|
|
97
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
110
98
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
111
99
|
__metadata("design:type", String)
|
|
112
100
|
], DataSetHistory.prototype, "monitorType", void 0);
|
|
113
101
|
__decorate([
|
|
114
|
-
(0, typeorm_1.Column)({
|
|
115
|
-
nullable: true
|
|
116
|
-
}),
|
|
102
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
117
103
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
118
104
|
__metadata("design:type", String)
|
|
119
105
|
], DataSetHistory.prototype, "monitorView", void 0);
|
|
120
106
|
__decorate([
|
|
121
|
-
(0, typeorm_1.Column)({
|
|
122
|
-
nullable: true
|
|
123
|
-
}),
|
|
107
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
124
108
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
125
109
|
__metadata("design:type", String)
|
|
126
110
|
], DataSetHistory.prototype, "reportType", void 0);
|
|
127
111
|
__decorate([
|
|
128
|
-
(0, typeorm_1.Column)({
|
|
129
|
-
nullable: true
|
|
130
|
-
}),
|
|
112
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
131
113
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
132
114
|
__metadata("design:type", String)
|
|
133
115
|
], DataSetHistory.prototype, "reportView", void 0);
|
|
@@ -136,9 +118,7 @@ __decorate([
|
|
|
136
118
|
__metadata("design:type", String)
|
|
137
119
|
], DataSetHistory.prototype, "reportTemplate", void 0);
|
|
138
120
|
__decorate([
|
|
139
|
-
(0, typeorm_1.Column)({
|
|
140
|
-
nullable: true
|
|
141
|
-
}),
|
|
121
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
142
122
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
143
123
|
__metadata("design:type", String)
|
|
144
124
|
], DataSetHistory.prototype, "useCase", void 0);
|
|
@@ -153,35 +133,27 @@ __decorate([
|
|
|
153
133
|
__metadata("design:type", Array)
|
|
154
134
|
], DataSetHistory.prototype, "dataItems", void 0);
|
|
155
135
|
__decorate([
|
|
156
|
-
(0, typeorm_1.Column)({
|
|
157
|
-
nullable: true
|
|
158
|
-
}),
|
|
136
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
159
137
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
160
138
|
__metadata("design:type", String)
|
|
161
139
|
], DataSetHistory.prototype, "schedule", void 0);
|
|
162
140
|
__decorate([
|
|
163
|
-
(0, typeorm_1.Column)({
|
|
164
|
-
nullable: true
|
|
165
|
-
}),
|
|
141
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
166
142
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
167
143
|
__metadata("design:type", String)
|
|
168
144
|
], DataSetHistory.prototype, "timezone", void 0);
|
|
169
145
|
__decorate([
|
|
170
|
-
(0, typeorm_1.Column)({
|
|
171
|
-
nullable: true
|
|
172
|
-
}),
|
|
146
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
173
147
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
174
148
|
__metadata("design:type", Date)
|
|
175
149
|
], DataSetHistory.prototype, "createdAt", void 0);
|
|
176
150
|
__decorate([
|
|
177
|
-
(0, typeorm_1.
|
|
151
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
178
152
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
179
153
|
__metadata("design:type", Date)
|
|
180
154
|
], DataSetHistory.prototype, "updatedAt", void 0);
|
|
181
155
|
__decorate([
|
|
182
|
-
(0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
|
|
183
|
-
nullable: true
|
|
184
|
-
}),
|
|
156
|
+
(0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
|
|
185
157
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
186
158
|
__metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
|
|
187
159
|
], DataSetHistory.prototype, "creator", void 0);
|
|
@@ -190,9 +162,7 @@ __decorate([
|
|
|
190
162
|
__metadata("design:type", String)
|
|
191
163
|
], DataSetHistory.prototype, "creatorId", void 0);
|
|
192
164
|
__decorate([
|
|
193
|
-
(0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
|
|
194
|
-
nullable: true
|
|
195
|
-
}),
|
|
165
|
+
(0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
|
|
196
166
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
197
167
|
__metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
|
|
198
168
|
], DataSetHistory.prototype, "updater", void 0);
|
|
@@ -200,8 +170,26 @@ __decorate([
|
|
|
200
170
|
(0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.creator),
|
|
201
171
|
__metadata("design:type", String)
|
|
202
172
|
], DataSetHistory.prototype, "updaterId", void 0);
|
|
173
|
+
__decorate([
|
|
174
|
+
(0, typeorm_history_1.HistoryOriginalIdColumn)({ nullable: true }),
|
|
175
|
+
__metadata("design:type", String)
|
|
176
|
+
], DataSetHistory.prototype, "originalId", void 0);
|
|
177
|
+
__decorate([
|
|
178
|
+
(0, typeorm_history_1.HistoryActionColumn)({
|
|
179
|
+
nullable: false,
|
|
180
|
+
type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
181
|
+
? 'enum'
|
|
182
|
+
: DATABASE_TYPE == 'oracle'
|
|
183
|
+
? 'varchar2'
|
|
184
|
+
: 'smallint',
|
|
185
|
+
enum: typeorm_history_1.HistoryActionType
|
|
186
|
+
}),
|
|
187
|
+
__metadata("design:type", String)
|
|
188
|
+
], DataSetHistory.prototype, "action", void 0);
|
|
203
189
|
DataSetHistory = __decorate([
|
|
204
190
|
(0, typeorm_1.Entity)(),
|
|
191
|
+
(0, typeorm_1.Index)('ix_data_set_history_0', (dataSetHistory) => [dataSetHistory.originalId, dataSetHistory.version], { unique: true }),
|
|
192
|
+
(0, typeorm_1.Index)('ix_data_set_history_1', (dataSetHistory) => [dataSetHistory.domain, dataSetHistory.originalId, dataSetHistory.version], { unique: true }),
|
|
205
193
|
(0, type_graphql_1.ObjectType)({ description: 'Entity for DataSetHistory' })
|
|
206
194
|
], DataSetHistory);
|
|
207
195
|
exports.DataSetHistory = DataSetHistory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-history.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"data-set-history.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.DataSetHistoryEntitySubscriber = void 0;
|
|
10
|
+
const typeorm_1 = require("typeorm");
|
|
11
|
+
const typeorm_history_1 = require("@anchan828/typeorm-history");
|
|
12
|
+
const data_set_1 = require("../data-set/data-set");
|
|
13
|
+
const data_set_history_1 = require("./data-set-history");
|
|
14
|
+
let DataSetHistoryEntitySubscriber = class DataSetHistoryEntitySubscriber extends typeorm_history_1.HistoryEntitySubscriber {
|
|
15
|
+
get entity() {
|
|
16
|
+
return data_set_1.DataSet;
|
|
17
|
+
}
|
|
18
|
+
get historyEntity() {
|
|
19
|
+
return data_set_history_1.DataSetHistory;
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
DataSetHistoryEntitySubscriber = __decorate([
|
|
23
|
+
(0, typeorm_1.EventSubscriber)()
|
|
24
|
+
], DataSetHistoryEntitySubscriber);
|
|
25
|
+
exports.DataSetHistoryEntitySubscriber = DataSetHistoryEntitySubscriber;
|
|
26
|
+
//# sourceMappingURL=event-subscriber.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-subscriber.js","sourceRoot":"","sources":["../../../server/service/data-set-history/event-subscriber.ts"],"names":[],"mappings":";;;;;;;;;AAAA,qCAAyC;AAEzC,gEAAoE;AAEpE,mDAA8C;AAC9C,yDAAmD;AAGnD,IAAa,8BAA8B,GAA3C,MAAa,8BAA+B,SAAQ,yCAAgD;IAClG,IAAW,MAAM;QACf,OAAO,kBAAO,CAAA;IAChB,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,iCAAc,CAAA;IACvB,CAAC;CACF,CAAA;AARY,8BAA8B;IAD1C,IAAA,yBAAe,GAAE;GACL,8BAA8B,CAQ1C;AARY,wEAA8B"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolvers = exports.entities = void 0;
|
|
3
|
+
exports.subscribers = exports.resolvers = exports.entities = void 0;
|
|
4
4
|
const data_set_history_1 = require("./data-set-history");
|
|
5
5
|
const data_set_history_query_1 = require("./data-set-history-query");
|
|
6
|
+
const event_subscriber_1 = require("./event-subscriber");
|
|
6
7
|
exports.entities = [data_set_history_1.DataSetHistory];
|
|
7
8
|
exports.resolvers = [data_set_history_query_1.DataSetHistoryQuery];
|
|
9
|
+
exports.subscribers = [event_subscriber_1.DataSetHistoryEntitySubscriber];
|
|
8
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/data-set-history/index.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AACnD,qEAA8D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/data-set-history/index.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AACnD,qEAA8D;AAC9D,yDAAmE;AAEtD,QAAA,QAAQ,GAAG,CAAC,iCAAc,CAAC,CAAA;AAC3B,QAAA,SAAS,GAAG,CAAC,4CAAmB,CAAC,CAAA;AACjC,QAAA,WAAW,GAAG,CAAC,iDAA8B,CAAC,CAAA"}
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.schema = exports.entities = void 0;
|
|
17
|
+
exports.schema = exports.subscribers = exports.entities = void 0;
|
|
18
18
|
const data_item_1 = require("./data-item");
|
|
19
19
|
/* IMPORT ENTITIES AND RESOLVERS */
|
|
20
20
|
const data_ooc_1 = require("./data-ooc");
|
|
@@ -41,6 +41,10 @@ exports.entities = [
|
|
|
41
41
|
...data_set_history_1.entities,
|
|
42
42
|
...data_spec_1.entities
|
|
43
43
|
];
|
|
44
|
+
exports.subscribers = [
|
|
45
|
+
/* SUBSCRIBERS */
|
|
46
|
+
...data_set_history_1.subscribers
|
|
47
|
+
];
|
|
44
48
|
exports.schema = {
|
|
45
49
|
resolverClasses: [
|
|
46
50
|
/* RESOLVER CLASSES */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,mCAAmC;AACnC,yCAAuF;AACvF,+CAAgG;AAChG,+CAAgG;AAChG,yCAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,mCAAmC;AACnC,yCAAuF;AACvF,+CAAgG;AAChG,+CAAgG;AAChG,yCAAuF;AACvF,yDAI2B;AAC3B,2CAA0F;AAE1F,yBAAyB;AACzB,sDAAmC;AACnC,4DAAyC;AACzC,4DAAyC;AACzC,sDAAmC;AACnC,sEAAmD;AACnD,4DAAyC;AACzC,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,GAAG,oBAAgB;IACnB,GAAG,mBAAe;IAClB,GAAG,sBAAkB;IACrB,GAAG,sBAAkB;IACrB,GAAG,mBAAe;IAClB,GAAG,2BAAsB;IACzB,GAAG,oBAAgB;CACpB,CAAA;AAEY,QAAA,WAAW,GAAG;IACzB,iBAAiB;IACjB,GAAG,8BAAyB;CAC7B,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACtB,GAAG,oBAAgB;QACnB,GAAG,uBAAmB;QACtB,GAAG,uBAAmB;QACtB,GAAG,oBAAgB;QACnB,GAAG,4BAAuB;QAC1B,GAAG,qBAAiB;KACrB;CACF,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/dataset",
|
|
3
|
-
"version": "5.0.0-zeta.
|
|
3
|
+
"version": "5.0.0-zeta.20",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,24 +24,24 @@
|
|
|
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/grist-editor": "^1.0.0-beta.
|
|
32
|
-
"@operato/i18n": "^1.0.0-beta.
|
|
33
|
-
"@operato/layout": "^1.0.0-beta.
|
|
34
|
-
"@operato/shell": "^1.0.0-beta.
|
|
35
|
-
"@operato/styles": "^1.0.0-beta.
|
|
36
|
-
"@operato/utils": "^1.0.0-beta.
|
|
37
|
-
"@things-factory/auth-base": "^5.0.0-zeta.
|
|
38
|
-
"@things-factory/aws-base": "^5.0.0-zeta.
|
|
39
|
-
"@things-factory/board-service": "^5.0.0-zeta.
|
|
40
|
-
"@things-factory/env": "^5.0.0-zeta.
|
|
41
|
-
"@things-factory/shell": "^5.0.0-zeta.
|
|
42
|
-
"@things-factory/work-shift": "^5.0.0-zeta.
|
|
27
|
+
"@operato/app": "^1.0.0-beta.47",
|
|
28
|
+
"@operato/data-grist": "^1.0.0-beta.47",
|
|
29
|
+
"@operato/dataset": "^1.0.0-beta.47",
|
|
30
|
+
"@operato/graphql": "^1.0.0-beta.47",
|
|
31
|
+
"@operato/grist-editor": "^1.0.0-beta.47",
|
|
32
|
+
"@operato/i18n": "^1.0.0-beta.47",
|
|
33
|
+
"@operato/layout": "^1.0.0-beta.47",
|
|
34
|
+
"@operato/shell": "^1.0.0-beta.47",
|
|
35
|
+
"@operato/styles": "^1.0.0-beta.47",
|
|
36
|
+
"@operato/utils": "^1.0.0-beta.47",
|
|
37
|
+
"@things-factory/auth-base": "^5.0.0-zeta.20",
|
|
38
|
+
"@things-factory/aws-base": "^5.0.0-zeta.20",
|
|
39
|
+
"@things-factory/board-service": "^5.0.0-zeta.20",
|
|
40
|
+
"@things-factory/env": "^5.0.0-zeta.20",
|
|
41
|
+
"@things-factory/shell": "^5.0.0-zeta.20",
|
|
42
|
+
"@things-factory/work-shift": "^5.0.0-zeta.20",
|
|
43
43
|
"cron-parser": "^4.3.0",
|
|
44
44
|
"moment-timezone": "^0.5.34"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "34981af408c52ca2472fdbd70ea3b5fbe0ab4073"
|
|
47
47
|
}
|
|
@@ -43,7 +43,7 @@ export class DataOocQuery {
|
|
|
43
43
|
async dataItems(@Root() dataOoc: DataOoc): Promise<DataItem[]> {
|
|
44
44
|
const dataSetHistory: DataSetHistory = await getRepository(DataSetHistory).findOne({
|
|
45
45
|
where: {
|
|
46
|
-
|
|
46
|
+
originalId: dataOoc.dataSetId,
|
|
47
47
|
version: dataOoc.dataSetVersion
|
|
48
48
|
}
|
|
49
49
|
})
|
|
@@ -43,7 +43,7 @@ export class DataSampleQuery {
|
|
|
43
43
|
async dataItems(@Root() dataSample: DataSample): Promise<DataItem[]> {
|
|
44
44
|
const dataSetHistory: DataSetHistory = await getRepository(DataSetHistory).findOne({
|
|
45
45
|
where: {
|
|
46
|
-
|
|
46
|
+
originalId: dataSample.dataSetId,
|
|
47
47
|
version: dataSample.dataSetVersion
|
|
48
48
|
}
|
|
49
49
|
})
|
|
@@ -3,7 +3,6 @@ import { In } from 'typeorm'
|
|
|
3
3
|
|
|
4
4
|
import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
|
|
5
5
|
|
|
6
|
-
import { DataSetHistory } from '../data-set-history/data-set-history'
|
|
7
6
|
import { DataSet } from './data-set'
|
|
8
7
|
import { DataSetPatch, NewDataSet } from './data-set-type'
|
|
9
8
|
|
|
@@ -17,7 +16,6 @@ export class DataSetMutation {
|
|
|
17
16
|
async createDataSet(@Arg('dataSet') dataSet: NewDataSet, @Ctx() context: any): Promise<DataSet> {
|
|
18
17
|
const { domain, user, tx } = context.state
|
|
19
18
|
const dataSetRepo = tx.getRepository(DataSet)
|
|
20
|
-
const dataSetHistoryRepo = tx.getRepository(DataSetHistory)
|
|
21
19
|
|
|
22
20
|
const result = await dataSetRepo.save({
|
|
23
21
|
...dataSet,
|
|
@@ -29,12 +27,6 @@ export class DataSetMutation {
|
|
|
29
27
|
|
|
30
28
|
await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: '+' })
|
|
31
29
|
|
|
32
|
-
await dataSetHistoryRepo.save(
|
|
33
|
-
await dataSetRepo.findOne(result.id, {
|
|
34
|
-
relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
|
|
35
|
-
})
|
|
36
|
-
)
|
|
37
|
-
|
|
38
30
|
return result
|
|
39
31
|
}
|
|
40
32
|
|
|
@@ -44,7 +36,6 @@ export class DataSetMutation {
|
|
|
44
36
|
async updateDataSet(@Arg('id') id: string, @Arg('patch') patch: DataSetPatch, @Ctx() context: any): Promise<DataSet> {
|
|
45
37
|
const { domain, user, tx } = context.state
|
|
46
38
|
const dataSetRepo = tx.getRepository(DataSet)
|
|
47
|
-
const dataSetHistoryRepo = tx.getRepository(DataSetHistory)
|
|
48
39
|
|
|
49
40
|
const dataSet = await dataSetRepo.findOne({
|
|
50
41
|
where: { domain, id }
|
|
@@ -58,12 +49,6 @@ export class DataSetMutation {
|
|
|
58
49
|
|
|
59
50
|
await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: 'M' })
|
|
60
51
|
|
|
61
|
-
await dataSetHistoryRepo.save(
|
|
62
|
-
await dataSetRepo.findOne(id, {
|
|
63
|
-
relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
|
|
64
|
-
})
|
|
65
|
-
)
|
|
66
|
-
|
|
67
52
|
return result
|
|
68
53
|
}
|
|
69
54
|
|
|
@@ -76,7 +61,6 @@ export class DataSetMutation {
|
|
|
76
61
|
): Promise<DataSet[]> {
|
|
77
62
|
const { domain, user, tx } = context.state
|
|
78
63
|
const dataSetRepo = tx.getRepository(DataSet)
|
|
79
|
-
const dataSetHistoryRepo = tx.getRepository(DataSetHistory)
|
|
80
64
|
|
|
81
65
|
let results = []
|
|
82
66
|
const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
|
|
@@ -128,8 +112,6 @@ export class DataSetMutation {
|
|
|
128
112
|
}
|
|
129
113
|
}
|
|
130
114
|
|
|
131
|
-
results.forEach(result => dataSetHistoryRepo.save({ ...result }))
|
|
132
|
-
|
|
133
115
|
return results
|
|
134
116
|
}
|
|
135
117
|
|
|
@@ -169,7 +151,6 @@ export class DataSetMutation {
|
|
|
169
151
|
): Promise<boolean> {
|
|
170
152
|
const { domain, tx } = context.state
|
|
171
153
|
const dataSetRepo = tx.getRepository(DataSet)
|
|
172
|
-
const dataSetHistoryRepo = tx.getRepository(DataSetHistory)
|
|
173
154
|
|
|
174
155
|
await Promise.all(
|
|
175
156
|
dataSets.map(async (dataSet: DataSet) => {
|
|
@@ -177,11 +158,6 @@ export class DataSetMutation {
|
|
|
177
158
|
domain,
|
|
178
159
|
...dataSet
|
|
179
160
|
})
|
|
180
|
-
await dataSetHistoryRepo.save(
|
|
181
|
-
...(await dataSetRepo.findOne(createdDataSet.id, {
|
|
182
|
-
relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
|
|
183
|
-
}))
|
|
184
|
-
)
|
|
185
161
|
})
|
|
186
162
|
)
|
|
187
163
|
|
|
@@ -194,7 +170,6 @@ export class DataSetMutation {
|
|
|
194
170
|
async copyDataSets(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<DataSet[]> {
|
|
195
171
|
const { domain, user, tx } = context.state
|
|
196
172
|
const dataSetRepo = tx.getRepository(DataSet)
|
|
197
|
-
const dataSetHistoryRepo = tx.getRepository(DataSetHistory)
|
|
198
173
|
|
|
199
174
|
const originals = await dataSetRepo.find({
|
|
200
175
|
where: {
|
|
@@ -223,7 +198,6 @@ export class DataSetMutation {
|
|
|
223
198
|
})
|
|
224
199
|
|
|
225
200
|
var copiedDataSets = await dataSetRepo.save(newCopys)
|
|
226
|
-
await dataSetHistoryRepo.save(copiedDataSets)
|
|
227
201
|
|
|
228
202
|
return copiedDataSets
|
|
229
203
|
}
|
|
@@ -21,7 +21,7 @@ export class DataSetHistoryQuery {
|
|
|
21
21
|
const { domain } = context.state
|
|
22
22
|
|
|
23
23
|
return await getRepository(DataSetHistory).findOne({
|
|
24
|
-
where: { domain, id, updatedAt: timestamp }
|
|
24
|
+
where: { domain, originalId: id, updatedAt: timestamp }
|
|
25
25
|
})
|
|
26
26
|
}
|
|
27
27
|
|
|
@@ -101,7 +101,7 @@ export class DataSetHistoryQuery {
|
|
|
101
101
|
const attachment: Attachment = await getRepository(Attachment).findOne({
|
|
102
102
|
where: {
|
|
103
103
|
domain: dataSetHistory.domainId,
|
|
104
|
-
refBy: `report-${dataSetHistory.
|
|
104
|
+
refBy: `report-${dataSetHistory.originalId}`
|
|
105
105
|
}
|
|
106
106
|
})
|
|
107
107
|
|
|
@@ -1,21 +1,41 @@
|
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
|
-
import { Column, Entity, ManyToOne,
|
|
3
|
-
|
|
2
|
+
import { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
HistoryActionColumn,
|
|
6
|
+
HistoryActionType,
|
|
7
|
+
HistoryEntityInterface,
|
|
8
|
+
HistoryOriginalIdColumn
|
|
9
|
+
} from '@anchan828/typeorm-history'
|
|
4
10
|
import { Role, User } from '@things-factory/auth-base'
|
|
11
|
+
import { config } from '@things-factory/env'
|
|
5
12
|
import { Domain, ScalarObject } from '@things-factory/shell'
|
|
6
13
|
|
|
7
14
|
import { DataItem } from '../data-set/data-item-type'
|
|
8
|
-
import { DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
|
|
15
|
+
import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
|
|
16
|
+
|
|
17
|
+
const ORMCONFIG = config.get('ormconfig', {})
|
|
18
|
+
const DATABASE_TYPE = ORMCONFIG.type
|
|
9
19
|
|
|
10
20
|
@Entity()
|
|
21
|
+
@Index(
|
|
22
|
+
'ix_data_set_history_0',
|
|
23
|
+
(dataSetHistory: DataSetHistory) => [dataSetHistory.originalId, dataSetHistory.version],
|
|
24
|
+
{ unique: true }
|
|
25
|
+
)
|
|
26
|
+
@Index(
|
|
27
|
+
'ix_data_set_history_1',
|
|
28
|
+
(dataSetHistory: DataSetHistory) => [dataSetHistory.domain, dataSetHistory.originalId, dataSetHistory.version],
|
|
29
|
+
{ unique: true }
|
|
30
|
+
)
|
|
11
31
|
@ObjectType({ description: 'Entity for DataSetHistory' })
|
|
12
|
-
export class DataSetHistory {
|
|
13
|
-
@
|
|
32
|
+
export class DataSetHistory implements HistoryEntityInterface<DataSet> {
|
|
33
|
+
@PrimaryGeneratedColumn('uuid')
|
|
14
34
|
@Field(type => ID)
|
|
15
35
|
readonly id: string
|
|
16
36
|
|
|
17
|
-
@
|
|
18
|
-
@Field()
|
|
37
|
+
@Column({ default: 1 })
|
|
38
|
+
@Field({ nullable: true })
|
|
19
39
|
readonly version: number = 1
|
|
20
40
|
|
|
21
41
|
@ManyToOne(type => Domain)
|
|
@@ -29,84 +49,60 @@ export class DataSetHistory {
|
|
|
29
49
|
@Field()
|
|
30
50
|
name: string
|
|
31
51
|
|
|
32
|
-
@Column({
|
|
33
|
-
nullable: true
|
|
34
|
-
})
|
|
52
|
+
@Column({ nullable: true })
|
|
35
53
|
@Field({ nullable: true })
|
|
36
54
|
description?: string
|
|
37
55
|
|
|
38
|
-
@Column({
|
|
39
|
-
nullable: true
|
|
40
|
-
})
|
|
56
|
+
@Column({ nullable: true })
|
|
41
57
|
@Field({ nullable: true })
|
|
42
58
|
active?: boolean
|
|
43
59
|
|
|
44
|
-
@ManyToOne(type => Role, {
|
|
45
|
-
nullable: true
|
|
46
|
-
})
|
|
60
|
+
@ManyToOne(type => Role, { nullable: true })
|
|
47
61
|
@Field(type => Role, { nullable: true })
|
|
48
62
|
entryRole?: Role
|
|
49
63
|
|
|
50
64
|
@RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.entryRole)
|
|
51
65
|
entryRoleId?: string
|
|
52
66
|
|
|
53
|
-
@ManyToOne(type => Role, {
|
|
54
|
-
nullable: true
|
|
55
|
-
})
|
|
67
|
+
@ManyToOne(type => Role, { nullable: true })
|
|
56
68
|
@Field(type => Role, { nullable: true })
|
|
57
69
|
supervisoryRole?: Role
|
|
58
70
|
|
|
59
71
|
@RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.supervisoryRole)
|
|
60
72
|
supervisoryRoleId?: string
|
|
61
73
|
|
|
62
|
-
@Column({
|
|
63
|
-
nullable: true
|
|
64
|
-
})
|
|
74
|
+
@Column({ nullable: true })
|
|
65
75
|
@Field({ nullable: true })
|
|
66
76
|
type?: 'manual' | 'automatic' | string
|
|
67
77
|
|
|
68
|
-
@Column({
|
|
69
|
-
nullable: true
|
|
70
|
-
})
|
|
78
|
+
@Column({ nullable: true })
|
|
71
79
|
@Field({ nullable: true })
|
|
72
80
|
entryType?: DataSetEntryType
|
|
73
81
|
|
|
74
|
-
@Column({
|
|
75
|
-
nullable: true
|
|
76
|
-
})
|
|
82
|
+
@Column({ nullable: true })
|
|
77
83
|
@Field({ nullable: true })
|
|
78
84
|
entryView?: string
|
|
79
85
|
|
|
80
|
-
@Column({
|
|
81
|
-
nullable: true
|
|
82
|
-
})
|
|
86
|
+
@Column({ nullable: true })
|
|
83
87
|
@Field({ nullable: true })
|
|
84
88
|
monitorType?: DataSetMonitorType
|
|
85
89
|
|
|
86
|
-
@Column({
|
|
87
|
-
nullable: true
|
|
88
|
-
})
|
|
90
|
+
@Column({ nullable: true })
|
|
89
91
|
@Field({ nullable: true })
|
|
90
92
|
monitorView?: string
|
|
91
93
|
|
|
92
|
-
@Column({
|
|
93
|
-
nullable: true
|
|
94
|
-
})
|
|
94
|
+
@Column({ nullable: true })
|
|
95
95
|
@Field({ nullable: true })
|
|
96
96
|
reportType?: DataSetReportType
|
|
97
97
|
|
|
98
|
-
@Column({
|
|
99
|
-
nullable: true
|
|
100
|
-
})
|
|
98
|
+
@Column({ nullable: true })
|
|
101
99
|
@Field({ nullable: true })
|
|
102
100
|
reportView?: string
|
|
103
101
|
|
|
104
102
|
@Field({ nullable: true })
|
|
105
103
|
reportTemplate?: string
|
|
106
104
|
|
|
107
|
-
@Column({
|
|
108
|
-
nullable: true
|
|
109
|
-
})
|
|
105
|
+
@Column({ nullable: true })
|
|
110
106
|
@Field({ nullable: true })
|
|
111
107
|
useCase?: string
|
|
112
108
|
|
|
@@ -118,43 +114,48 @@ export class DataSetHistory {
|
|
|
118
114
|
@Field(type => [DataItem], { nullable: true })
|
|
119
115
|
dataItems: DataItem[]
|
|
120
116
|
|
|
121
|
-
@Column({
|
|
122
|
-
nullable: true
|
|
123
|
-
})
|
|
117
|
+
@Column({ nullable: true })
|
|
124
118
|
@Field({ nullable: true })
|
|
125
119
|
schedule?: string
|
|
126
120
|
|
|
127
|
-
@Column({
|
|
128
|
-
nullable: true
|
|
129
|
-
})
|
|
121
|
+
@Column({ nullable: true })
|
|
130
122
|
@Field({ nullable: true })
|
|
131
123
|
timezone?: string
|
|
132
124
|
|
|
133
|
-
@Column({
|
|
134
|
-
nullable: true
|
|
135
|
-
})
|
|
125
|
+
@Column({ nullable: true })
|
|
136
126
|
@Field({ nullable: true })
|
|
137
127
|
createdAt?: Date
|
|
138
128
|
|
|
139
|
-
@
|
|
129
|
+
@Column({ nullable: true })
|
|
140
130
|
@Field({ nullable: true })
|
|
141
131
|
updatedAt?: Date
|
|
142
132
|
|
|
143
|
-
@ManyToOne(type => User, {
|
|
144
|
-
nullable: true
|
|
145
|
-
})
|
|
133
|
+
@ManyToOne(type => User, { nullable: true })
|
|
146
134
|
@Field({ nullable: true })
|
|
147
135
|
creator?: User
|
|
148
136
|
|
|
149
137
|
@RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.creator)
|
|
150
138
|
creatorId?: string
|
|
151
139
|
|
|
152
|
-
@ManyToOne(type => User, {
|
|
153
|
-
nullable: true
|
|
154
|
-
})
|
|
140
|
+
@ManyToOne(type => User, { nullable: true })
|
|
155
141
|
@Field({ nullable: true })
|
|
156
142
|
updater?: User
|
|
157
143
|
|
|
158
144
|
@RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.creator)
|
|
159
145
|
updaterId?: string
|
|
146
|
+
|
|
147
|
+
@HistoryOriginalIdColumn({ nullable: true })
|
|
148
|
+
public originalId!: string
|
|
149
|
+
|
|
150
|
+
@HistoryActionColumn({
|
|
151
|
+
nullable: false,
|
|
152
|
+
type:
|
|
153
|
+
DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
154
|
+
? 'enum'
|
|
155
|
+
: DATABASE_TYPE == 'oracle'
|
|
156
|
+
? 'varchar2'
|
|
157
|
+
: 'smallint',
|
|
158
|
+
enum: HistoryActionType
|
|
159
|
+
})
|
|
160
|
+
public action!: HistoryActionType
|
|
160
161
|
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { EventSubscriber } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { HistoryEntitySubscriber } from '@anchan828/typeorm-history'
|
|
4
|
+
|
|
5
|
+
import { DataSet } from '../data-set/data-set'
|
|
6
|
+
import { DataSetHistory } from './data-set-history'
|
|
7
|
+
|
|
8
|
+
@EventSubscriber()
|
|
9
|
+
export class DataSetHistoryEntitySubscriber extends HistoryEntitySubscriber<DataSet, DataSetHistory> {
|
|
10
|
+
public get entity() {
|
|
11
|
+
return DataSet
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
public get historyEntity() {
|
|
15
|
+
return DataSetHistory
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { DataSetHistory } from './data-set-history'
|
|
2
2
|
import { DataSetHistoryQuery } from './data-set-history-query'
|
|
3
|
+
import { DataSetHistoryEntitySubscriber } from './event-subscriber'
|
|
3
4
|
|
|
4
5
|
export const entities = [DataSetHistory]
|
|
5
6
|
export const resolvers = [DataSetHistoryQuery]
|
|
7
|
+
export const subscribers = [DataSetHistoryEntitySubscriber]
|
package/server/service/index.ts
CHANGED
|
@@ -4,7 +4,11 @@ import { entities as DataOocEntities, resolvers as DataOocResolvers } from './da
|
|
|
4
4
|
import { entities as DataSampleEntities, resolvers as DataSampleResolvers } from './data-sample'
|
|
5
5
|
import { entities as DataSensorEntities, resolvers as DataSensorResolvers } from './data-sensor'
|
|
6
6
|
import { entities as DataSetEntities, resolvers as DataSetResolvers } from './data-set'
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
entities as DataSetHistoryEntities,
|
|
9
|
+
resolvers as DataSetHistoryResolvers,
|
|
10
|
+
subscribers as DataSetHistorySubscribers
|
|
11
|
+
} from './data-set-history'
|
|
8
12
|
import { entities as DataSpecEntities, resolvers as DataSpecResolvers } from './data-spec'
|
|
9
13
|
|
|
10
14
|
/* EXPORT ENTITY TYPES */
|
|
@@ -27,6 +31,11 @@ export const entities = [
|
|
|
27
31
|
...DataSpecEntities
|
|
28
32
|
]
|
|
29
33
|
|
|
34
|
+
export const subscribers = [
|
|
35
|
+
/* SUBSCRIBERS */
|
|
36
|
+
...DataSetHistorySubscribers
|
|
37
|
+
]
|
|
38
|
+
|
|
30
39
|
export const schema = {
|
|
31
40
|
resolverClasses: [
|
|
32
41
|
/* RESOLVER CLASSES */
|
package/translations/en.json
CHANGED
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"field.report-view": "report view",
|
|
33
33
|
"field.serial-no": "serial #",
|
|
34
34
|
"field.spec": "spec",
|
|
35
|
-
"field.
|
|
35
|
+
"field.status": "status",
|
|
36
36
|
"field.supervisory-role": "supervisory role",
|
|
37
37
|
"field.tag": "tag name",
|
|
38
38
|
"field.unit": "unit",
|
|
@@ -61,4 +61,4 @@
|
|
|
61
61
|
"title.data-sensor list": "data sensor list",
|
|
62
62
|
"title.data-set list": "data set list",
|
|
63
63
|
"title.edit code": "edit code"
|
|
64
|
-
}
|
|
64
|
+
}
|
package/translations/ko.json
CHANGED
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"field.report-view": "리포트용 화면",
|
|
33
33
|
"field.serial-no": "시리얼번호",
|
|
34
34
|
"field.spec": "명세",
|
|
35
|
-
"field.
|
|
35
|
+
"field.status": "상태",
|
|
36
36
|
"field.supervisory-role": "관리자 역할",
|
|
37
37
|
"field.tag": "태그이름",
|
|
38
38
|
"field.unit": "단위",
|
|
@@ -60,4 +60,4 @@
|
|
|
60
60
|
"title.data-sensor list": "데이타 센서 조회",
|
|
61
61
|
"title.data-set list": "데이타 셋 조회",
|
|
62
62
|
"title.edit code": "코드 편집"
|
|
63
|
-
}
|
|
63
|
+
}
|
package/translations/ms.json
CHANGED
package/translations/zh.json
CHANGED