@steedos/service-metadata-objects 2.2.40 → 2.2.43
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/lib/actionsHandler.js +44 -17
- package/lib/actionsHandler.js.map +1 -1
- package/lib/formula/formulaActionHandler.d.ts +1 -1
- package/lib/formula/formulaActionHandler.js +18 -9
- package/lib/formula/formulaActionHandler.js.map +1 -1
- package/lib/lookup/LookupActionHandler.js +10 -5
- package/lib/lookup/LookupActionHandler.js.map +1 -1
- package/lib/master-detail/masterDetailActionHandler.js +21 -11
- package/lib/master-detail/masterDetailActionHandler.js.map +1 -1
- package/lib/objects.service.js +20 -1
- package/lib/objects.service.js.map +1 -1
- package/lib/summary/summaryActionHandler.js +9 -4
- package/lib/summary/summaryActionHandler.js.map +1 -1
- package/package.json +4 -3
- package/src/actionsHandler.ts +53 -17
- package/src/formula/formulaActionHandler.ts +19 -10
- package/src/lookup/LookupActionHandler.ts +11 -5
- package/src/master-detail/masterDetailActionHandler.ts +21 -11
- package/src/objects.service.ts +21 -1
- package/src/summary/summaryActionHandler.ts +9 -4
package/lib/objects.service.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
+
const metadata_registrar_1 = require("@steedos/metadata-registrar");
|
|
4
5
|
const actionsHandler_1 = require("./actionsHandler");
|
|
5
6
|
const masterDetailActionHandler_1 = require("./master-detail/masterDetailActionHandler");
|
|
6
7
|
const formulaActionHandler_1 = require("./formula/formulaActionHandler");
|
|
@@ -228,7 +229,25 @@ module.exports = {
|
|
|
228
229
|
const detailsInfoKey = this.masterDetailActionHandler.getDetailsInfoKey(objectApiName);
|
|
229
230
|
const mastersInfo = this.masterDetailActionHandler.getMastersInfoKey(objectApiName);
|
|
230
231
|
const lookupDetailsInfo = this.lookupActionHandler.getDetailsInfoKey(objectApiName);
|
|
231
|
-
const results =
|
|
232
|
+
// const results = await ctx.broker.call('metadata.mfilter', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
|
|
233
|
+
const results = yield metadata_registrar_1.Register.mfilter(ctx.broker, [detailsInfoKey, mastersInfo, lookupDetailsInfo]);
|
|
234
|
+
return {
|
|
235
|
+
details: _.compact(_.map(results[0], 'metadata.key')),
|
|
236
|
+
masters: _.compact(_.map(results[1], 'metadata.key')),
|
|
237
|
+
lookup_details: _.compact(_.map(results[2], 'metadata.key')),
|
|
238
|
+
};
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
},
|
|
242
|
+
getAllRelationsInfo: {
|
|
243
|
+
handler(ctx) {
|
|
244
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
245
|
+
const objectApiName = "*";
|
|
246
|
+
const detailsInfoKey = this.masterDetailActionHandler.getDetailsInfoKey(objectApiName);
|
|
247
|
+
const mastersInfo = this.masterDetailActionHandler.getMastersInfoKey(objectApiName);
|
|
248
|
+
const lookupDetailsInfo = this.lookupActionHandler.getDetailsInfoKey(objectApiName);
|
|
249
|
+
// const results = await ctx.broker.call('metadata.mfilter', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
|
|
250
|
+
const results = yield metadata_registrar_1.Register.mfilter(ctx.broker, [detailsInfoKey, mastersInfo, lookupDetailsInfo]);
|
|
232
251
|
return {
|
|
233
252
|
details: _.compact(_.map(results[0], 'metadata')),
|
|
234
253
|
masters: _.compact(_.map(results[1], 'metadata')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objects.service.js","sourceRoot":"","sources":["../src/objects.service.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;
|
|
1
|
+
{"version":3,"file":"objects.service.js","sourceRoot":"","sources":["../src/objects.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SummaryActionHandler = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const metadata_registrar_1 = require("@steedos/metadata-registrar");
|
|
5
6
|
const type_1 = require("./type");
|
|
6
7
|
const core_1 = require("../formula/core");
|
|
7
8
|
const _ = require("lodash");
|
|
@@ -23,7 +24,8 @@ class SummaryActionHandler {
|
|
|
23
24
|
return;
|
|
24
25
|
}
|
|
25
26
|
// console.log(`deleteAll summary`, this.cacherKey(objectConfig.name, '*'))
|
|
26
|
-
|
|
27
|
+
// await this.broker.call('metadata.fuzzyDelete', {key: this.cacherKey(objectConfig.name, '*')}, {meta: {}})
|
|
28
|
+
yield metadata_registrar_1.Register.fuzzyDelete(this.broker, this.cacherKey(objectConfig.name, '*'));
|
|
27
29
|
return true;
|
|
28
30
|
}
|
|
29
31
|
catch (error) {
|
|
@@ -212,7 +214,8 @@ class SummaryActionHandler {
|
|
|
212
214
|
try {
|
|
213
215
|
for (var fieldsSummaryConfig_1 = (0, tslib_1.__asyncValues)(fieldsSummaryConfig), fieldsSummaryConfig_1_1; fieldsSummaryConfig_1_1 = yield fieldsSummaryConfig_1.next(), !fieldsSummaryConfig_1_1.done;) {
|
|
214
216
|
const fieldSummary = fieldsSummaryConfig_1_1.value;
|
|
215
|
-
|
|
217
|
+
// await this.broker.call('metadata.add', {key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary}, {meta: {}})
|
|
218
|
+
yield metadata_registrar_1.Register.add(this.broker, { key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary }, {});
|
|
216
219
|
}
|
|
217
220
|
}
|
|
218
221
|
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
@@ -226,7 +229,8 @@ class SummaryActionHandler {
|
|
|
226
229
|
try {
|
|
227
230
|
for (var quoteMineSummaryConfigs_2 = (0, tslib_1.__asyncValues)(quoteMineSummaryConfigs), quoteMineSummaryConfigs_2_1; quoteMineSummaryConfigs_2_1 = yield quoteMineSummaryConfigs_2.next(), !quoteMineSummaryConfigs_2_1.done;) {
|
|
228
231
|
const fieldSummary = quoteMineSummaryConfigs_2_1.value;
|
|
229
|
-
|
|
232
|
+
// await this.broker.call('metadata.add', {key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary}, {meta: {}})
|
|
233
|
+
yield metadata_registrar_1.Register.add(this.broker, { key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary }, {});
|
|
230
234
|
}
|
|
231
235
|
}
|
|
232
236
|
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
@@ -255,7 +259,8 @@ class SummaryActionHandler {
|
|
|
255
259
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
256
260
|
const key = this.cacherKey(fieldApiFullName, summaryObjectApiName);
|
|
257
261
|
const configs = [];
|
|
258
|
-
const res =
|
|
262
|
+
// const res = await this.broker.call('metadata.filter', {key: key}, {meta: {}})
|
|
263
|
+
const res = yield metadata_registrar_1.Register.filter(this.broker, key);
|
|
259
264
|
_.forEach(res, (item) => {
|
|
260
265
|
configs.push(item.metadata);
|
|
261
266
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summaryActionHandler.js","sourceRoot":"","sources":["../../src/summary/summaryActionHandler.ts"],"names":[],"mappings":";;;;AAAA,iCAAyI;AACzI,0CAAuE;AACvE,4BAA4B;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAE9B,sDAAsB;AAEtB,OAAO;AACP,4CAA4C;AAC5C,0CAA0C;AAC1C,IAAI;AAEJ,MAAa,oBAAoB;IAE7B,YAAY,MAAM;QADlB,WAAM,GAAQ,IAAI,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEK,SAAS,CAAC,YAAY;;YACxB,IAAI;gBACA,IAAI,CAAC,YAAY,EAAE;oBACf,OAAO;iBACV;gBACD,2EAA2E;gBAC3E,MAAM,
|
|
1
|
+
{"version":3,"file":"summaryActionHandler.js","sourceRoot":"","sources":["../../src/summary/summaryActionHandler.ts"],"names":[],"mappings":";;;;AAAA,oEAAuD;AACvD,iCAAyI;AACzI,0CAAuE;AACvE,4BAA4B;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAE9B,sDAAsB;AAEtB,OAAO;AACP,4CAA4C;AAC5C,0CAA0C;AAC1C,IAAI;AAEJ,MAAa,oBAAoB;IAE7B,YAAY,MAAM;QADlB,WAAM,GAAQ,IAAI,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEK,SAAS,CAAC,YAAY;;YACxB,IAAI;gBACA,IAAI,CAAC,YAAY,EAAE;oBACf,OAAO;iBACV;gBACD,2EAA2E;gBAC3E,4GAA4G;gBAC5G,MAAM,6BAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;gBAChF,OAAO,IAAI,CAAA;aACd;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;KAAA;IAEK,eAAe,CAAC,aAAqB;;YACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,CAAA;YACpF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACvC,CAAC;KAAA;IAED;;;;OAIG;IACG,iBAAiB,CAAC,aAA4C,EAAE,aAAmB;;YACrF,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;YAClE,IAAG,CAAC,aAAa,EAAC;gBACd,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;gBAC3D,IAAI,CAAC,aAAa,EAAE;oBAChB,OAAQ;iBACX;aACJ;YACD,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC3D,OAAO,IAAI,CAAC,IAAI,KAAK,eAAe,IAAI,IAAI,CAAC,YAAY,KAAK,WAAW,CAAC;YAC9E,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,gBAAgB,EAAE;gBACnB,6JAA6J;gBAC7J,OAAQ;aACX;YACD,aAAa,CAAC,kBAAkB,GAAG,gBAAgB,CAAC,IAAI,CAAC;YACzD,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,+BAA+B,UAAU,oBAAoB,WAAW,6BAA6B,CAAC,CAAC;aAC1H;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YAC7E,IAAG,CAAC,QAAQ,EAAC;gBACT,OAAQ;aACX;YACD,IAAI,QAAQ,KAAK,aAAa,CAAC,SAAS,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,uCAAuC,UAAU,oBAAoB,WAAW,iCAAiC,QAAQ,oBAAoB,aAAa,CAAC,SAAS,IAAI,CAAC,CAAC;aAC7L;YACD,aAAa,CAAC,SAAS,GAAG,QAAQ,CAAC;QACvC,CAAC;KAAA;IAEK,kBAAkB,CAAC,aAA4C,EAAE,aAAkB;;YACrF,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;YAC/F,IAAI,MAAmC,CAAC;YACxC,IAAI,gBAAgB,GAAG,IAAI,CAAC;YAC5B,IAAI,YAAY,KAAK,8BAAuB,CAAC,KAAK,EAAE;gBAChD,wBAAwB;gBACxB,gBAAgB,GAAG,KAAK,CAAC;aAC5B;iBACI,IAAI,CAAC,aAAa,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,2DAA2D,UAAU,oBAAoB,WAAW,gDAAgD,CAAC,CAAC;aACzK;YACD,IAAI,aAAa,IAAI,gBAAgB,EAAE;gBACnC,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAClD,IAAI,KAAK,EAAE;oBACP,IAAI,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;oBAC3B,IAAI,SAAS,KAAK,SAAS,EAAE;wBACzB,2BAA2B;wBAC3B,iCAAiC;wBACjC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;wBAC5B,MAAM,eAAe,GAAG,MAAM,IAAA,2CAAoC,EAAC,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;wBAC7H,IAAI,eAAe,EAAE;4BACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,UAAU,2BAA2B,WAAW,kDAAkD,aAAa,2BAA2B,cAAc,0HAA0H,CAAC,CAAC;yBACjV;qBACJ;oBACD,IAAI,SAAS,KAAK,SAAS,EAAE;wBACzB,6BAA6B;wBAC7B,sDAAsD;wBACtD,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;qBAC/B;oBACD,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE;wBAC5D,MAAM,IAAI,KAAK,CAAC,0BAA0B,SAAS,mBAAmB,UAAU,oBAAoB,WAAW,4CAA4C,YAAY,qCAAqC,iCAA0B,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;qBAC5P;oBACD,MAAM,GAAgC,SAAS,CAAC;iBACnD;qBACI;oBACD,qHAAqH;oBACrH,OAAM;iBACT;aACJ;iBACI;gBACD,MAAM,GAAG,kCAA2B,CAAC,MAAM,CAAC;aAC/C;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAED,2BAA2B,CAAC,WAAmB,EAAE,gBAAwB;QACrE,OAAO,CAAC,CAAC,CAAC,iCAA0B,CAAC,WAAW,CAAC,IAAI,iCAA0B,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAChI,CAAC;IAEK,2BAA2B,CAAC,WAAgB,EAAE,YAAiB;;YACjE,IAAI,aAAa,GAAkC;gBAC/C,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE;gBAC/C,WAAW,EAAE,YAAY,CAAC,IAAI;gBAC9B,UAAU,EAAE,WAAW,CAAC,IAAI;gBAC5B,cAAc,EAAE,WAAW,CAAC,cAAc;gBAC1C,YAAY,EAA2B,WAAW,CAAC,YAAY;gBAC/D,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,aAAa,EAAE,WAAW,CAAC,aAAa;gBACxC,eAAe,EAAE,WAAW,CAAC,eAAe;gBAC5C,kBAAkB,EAAE,IAAI;aAC3B,CAAC;YACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;YAE5C,OAAO,aAAa,CAAC;QACzB,CAAC;KAAA;IAEK,4BAA4B,CAAC,MAAW,EAAE,UAAkB;;;YAC9D,MAAM,OAAO,GAAG,EAAE,CAAC;;gBACnB,KAA0B,IAAA,KAAA,2BAAA,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,IAAA;oBAAtC,MAAM,KAAK,WAAA,CAAA;oBAClB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;wBAC1B,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,SAAS,EAAE;4BACrD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,CAAC,IAAI,oBAAoB,MAAM,CAAC,IAAI,oEAAoE,CAAC,CAAC;yBAC5J;wBACD,IAAI;4BACA,kDAAkD;4BAClD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;4BACvF,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;yBACpC;wBAAC,OAAO,KAAK,EAAE;4BACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;4BAChC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBACxB;qBACJ;iBACJ;;;;;;;;;YAED,OAAO,OAAO,CAAC;;KAClB;IAEK,0BAA0B,CAAC,YAAY;;;YACzC,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,yCAAyC;YACzC,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;;gBACzF,KAAkC,IAAA,4BAAA,2BAAA,uBAAuB,CAAA,6BAAA;oBAA9C,MAAM,aAAa,oCAAA,CAAA;oBAC1B,IAAG,CAAC,aAAa,CAAC,kBAAkB,EAAC;wBACjC,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;wBACzD,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;qBACpC;iBACJ;;;;;;;;;YACD,OAAO,YAAY,CAAC;;KACvB;IAGD,iBAAiB;IACjB,oDAAoD;IACpD,SAAS,CAAC,gBAAwB,EAAE,oBAA6B;QAC7D,IAAG,CAAC,oBAAoB,EAAC;YACrB,oBAAoB,GAAG,GAAG,CAAC;SAC9B;QACD,OAAO,qBAAqB,gBAAgB,IAAI,oBAAoB,EAAE,CAAA;IAC1E,CAAC;IAEK,kBAAkB,CAAC,MAAW,EAAE,UAAkB;;;YACpD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;;gBACxF,KAAiC,IAAA,wBAAA,2BAAA,mBAAmB,CAAA,yBAAA;oBAAzC,MAAM,YAAY,gCAAA,CAAA;oBACzB,+IAA+I;oBAC/I,MAAM,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,EAAC,EAAE,EAAE,CAAC,CAAC;iBACjI;;;;;;;;;YACD,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;;gBAC9E,KAAiC,IAAA,4BAAA,2BAAA,uBAAuB,CAAA,6BAAA;oBAA7C,MAAM,YAAY,oCAAA,CAAA;oBACzB,+IAA+I;oBAC/I,MAAM,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,EAAC,EAAE,EAAE,CAAC,CAAC;iBACjI;;;;;;;;;YACD,OAAO,IAAI,CAAC;;KACf;IAEK,GAAG,CAAC,YAAY;;YAClB,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;gBACrE,OAAO,IAAI,CAAA;aACd;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;KAAA;IAEK,mBAAmB,CAAC,gBAAgB,EAAE,oBAAqB;;YAC7D,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;YAClE,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,gFAAgF;YAChF,MAAM,GAAG,GAAG,MAAM,6BAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YACnD,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAC,EAAE;gBACnB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAEK,MAAM,CAAC,GAAG;;YACZ,IAAI,EAAC,aAAa,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/C,IAAG,CAAC,aAAa,EAAC;gBACd,aAAa,GAAG,GAAG,CAAC;aACvB;YACD,IAAG,CAAC,YAAY,EAAC;gBACb,YAAY,GAAG,GAAG,CAAC;aACtB;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,aAAa,IAAI,YAAY,EAAE,CAAC,CAAC;YACnF,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAEK,GAAG,CAAC,GAAG;;YACT,IAAI,EAAC,gBAAgB,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YACpC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YAC7D,IAAG,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAC;gBACrB,OAAO,GAAG,CAAC,CAAC,CAAC,CAAA;aAChB;QACL,CAAC;KAAA;CACJ;AAhOD,oDAgOC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-metadata-objects",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.43",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/objects.service.js",
|
|
6
6
|
"scripts": {
|
|
@@ -20,7 +20,8 @@
|
|
|
20
20
|
"author": "",
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@steedos/formula": "2.2.
|
|
23
|
+
"@steedos/formula": "2.2.43",
|
|
24
|
+
"@steedos/metadata-registrar": "2.2.43",
|
|
24
25
|
"dotenv-flow": "^3.1.0",
|
|
25
26
|
"ioredis": "^4.22.0",
|
|
26
27
|
"lodash": "^4.17.21",
|
|
@@ -41,5 +42,5 @@
|
|
|
41
42
|
"publishConfig": {
|
|
42
43
|
"access": "public"
|
|
43
44
|
},
|
|
44
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "4aa9568edad23cdef05ebbee5299c17904a76dde"
|
|
45
46
|
}
|
package/src/actionsHandler.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import _ = require("lodash");
|
|
2
|
+
import { Register } from '@steedos/metadata-registrar';
|
|
2
3
|
import { METADATA_TYPE } from ".";
|
|
3
4
|
import { getObjectServiceName, getOriginalObject, refreshObject, MONGO_BASE_OBJECT, SQL_BASE_OBJECT } from "./objects";
|
|
4
5
|
export type SObject = {
|
|
@@ -40,7 +41,8 @@ export class ActionHandlers {
|
|
|
40
41
|
objectApiName != SQL_BASE_OBJECT && this.onRegister && _.isFunction(this.onRegister)) {
|
|
41
42
|
await this.onRegister(data)
|
|
42
43
|
}
|
|
43
|
-
await ctx.broker.call('metadata.add', {key: cacherKey(objectApiName), data: data}, {meta: meta});
|
|
44
|
+
// await ctx.broker.call('metadata.add', {key: cacherKey(objectApiName), data: data}, {meta: meta});
|
|
45
|
+
await Register.add(ctx.broker, {key: cacherKey(objectApiName), data: data}, meta)
|
|
44
46
|
if (objectApiName != MONGO_BASE_OBJECT &&
|
|
45
47
|
objectApiName != SQL_BASE_OBJECT && this.onRegistered && _.isFunction(this.onRegistered)) {
|
|
46
48
|
await this.onRegistered(data)
|
|
@@ -61,12 +63,13 @@ export class ActionHandlers {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
async get(ctx: any): Promise<MetadataObject> {
|
|
64
|
-
return await ctx.broker
|
|
66
|
+
return await Register.get(ctx.broker, cacherKey(ctx.params.objectApiName))
|
|
65
67
|
}
|
|
66
68
|
|
|
67
69
|
async getAll(ctx: any): Promise<Array<MetadataObject>> {
|
|
68
70
|
const datasource = ctx.params.datasource;
|
|
69
|
-
const objects = await ctx.broker.call('metadata.filter', {key: cacherKey("*")}, {meta: ctx.meta});
|
|
71
|
+
// const objects = await ctx.broker.call('metadata.filter', {key: cacherKey("*")}, {meta: ctx.meta});
|
|
72
|
+
const objects = await Register.filter(ctx.broker, cacherKey("*"));
|
|
70
73
|
if(datasource){
|
|
71
74
|
return _.filter(objects, (object)=>{
|
|
72
75
|
return object?.metadata?.datasource == datasource;
|
|
@@ -92,11 +95,17 @@ export class ActionHandlers {
|
|
|
92
95
|
}
|
|
93
96
|
const metadataApiName = config.name;
|
|
94
97
|
if(!config.isMain){
|
|
95
|
-
const metadataConfig = await ctx.broker.call('metadata.getServiceMetadata', {
|
|
98
|
+
// const metadataConfig = await ctx.broker.call('metadata.getServiceMetadata', {
|
|
99
|
+
// serviceName: ctx.meta.metadataServiceName,
|
|
100
|
+
// metadataType: METADATA_TYPE,
|
|
101
|
+
// metadataApiName: metadataApiName,
|
|
102
|
+
// }, {meta: ctx.meta});
|
|
103
|
+
|
|
104
|
+
const metadataConfig = await Register.getServiceMetadata(ctx.broker, {
|
|
96
105
|
serviceName: ctx.meta.metadataServiceName,
|
|
97
106
|
metadataType: METADATA_TYPE,
|
|
98
107
|
metadataApiName: metadataApiName,
|
|
99
|
-
},
|
|
108
|
+
}, ctx.meta)
|
|
100
109
|
|
|
101
110
|
if (metadataConfig && metadataConfig.metadata) {
|
|
102
111
|
config.list_views = _.defaultsDeep(metadataConfig.metadata.list_views || {}, config.list_views || {});
|
|
@@ -104,7 +113,9 @@ export class ActionHandlers {
|
|
|
104
113
|
}
|
|
105
114
|
}
|
|
106
115
|
|
|
107
|
-
await ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }) })
|
|
116
|
+
// await ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }) })
|
|
117
|
+
|
|
118
|
+
await Register.addServiceMetadata(ctx.broker, { key: cacherKey(metadataApiName), data: config }, Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }));
|
|
108
119
|
|
|
109
120
|
const objectConfig = await refreshObject(ctx, metadataApiName);
|
|
110
121
|
|
|
@@ -135,17 +146,30 @@ export class ActionHandlers {
|
|
|
135
146
|
}
|
|
136
147
|
const metadataApiName = config.name;
|
|
137
148
|
if (!config.isMain) {
|
|
138
|
-
const metadataConfig = await ctx.broker.call('metadata.getServiceMetadata', {
|
|
149
|
+
// const metadataConfig = await ctx.broker.call('metadata.getServiceMetadata', {
|
|
150
|
+
// serviceName: ctx.meta.metadataServiceName,
|
|
151
|
+
// metadataType: METADATA_TYPE,
|
|
152
|
+
// metadataApiName: metadataApiName,
|
|
153
|
+
// }, { meta: ctx.meta });
|
|
154
|
+
|
|
155
|
+
const metadataConfig = await Register.getServiceMetadata(ctx.broker, {
|
|
139
156
|
serviceName: ctx.meta.metadataServiceName,
|
|
140
157
|
metadataType: METADATA_TYPE,
|
|
141
158
|
metadataApiName: metadataApiName,
|
|
142
|
-
},
|
|
159
|
+
}, ctx.meta);
|
|
160
|
+
|
|
143
161
|
if (metadataConfig && metadataConfig.metadata) {
|
|
144
162
|
config.list_views = _.defaultsDeep(metadataConfig.metadata.list_views || {}, config.list_views || {});
|
|
145
163
|
config = _.defaultsDeep(config, metadataConfig.metadata);
|
|
146
164
|
}
|
|
147
165
|
}
|
|
148
|
-
await ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }) })
|
|
166
|
+
// await ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }) })
|
|
167
|
+
|
|
168
|
+
await Register.addServiceMetadata(ctx.broker, {
|
|
169
|
+
key: cacherKey(metadataApiName),
|
|
170
|
+
data: config
|
|
171
|
+
}, Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }));
|
|
172
|
+
|
|
149
173
|
const objectConfig = await refreshObject(ctx, metadataApiName);
|
|
150
174
|
if (!objectConfig) {
|
|
151
175
|
console.error(`not find extend object ${metadataApiName}, Please check 「${ctx.meta.metadataServiceName}」 package.service.js for dependencies`);
|
|
@@ -172,7 +196,8 @@ export class ActionHandlers {
|
|
|
172
196
|
// console.log(`change==================`, oldData.name, data.name);
|
|
173
197
|
await this.deleteObject(ctx, oldData.name)
|
|
174
198
|
}
|
|
175
|
-
await ctx.broker.call('metadata.add', {key: cacherKey(data.name), data: data}, {meta: ctx.meta})
|
|
199
|
+
// await ctx.broker.call('metadata.add', {key: cacherKey(data.name), data: data}, {meta: ctx.meta})
|
|
200
|
+
await Register.add(ctx.broker, {key: cacherKey(data.name), data: data}, ctx.meta);
|
|
176
201
|
ctx.broker.emit("metadata.objects.updated", {objectApiName: data.name, oldObjectApiName: oldData.name, isUpdate: true});
|
|
177
202
|
return true;
|
|
178
203
|
}
|
|
@@ -216,27 +241,38 @@ export class ActionHandlers {
|
|
|
216
241
|
}
|
|
217
242
|
}
|
|
218
243
|
async deleteObject(ctx, objectApiName): Promise<boolean>{
|
|
219
|
-
ctx.broker.broadcast(`delete.metadata.${METADATA_TYPE}`, {objectApiName: objectApiName});
|
|
244
|
+
await ctx.broker.broadcast(`delete.metadata.${METADATA_TYPE}`, {objectApiName: objectApiName});
|
|
220
245
|
return true;
|
|
221
246
|
}
|
|
222
247
|
async handleDeleteObject(ctx, objectApiName): Promise<boolean>{
|
|
223
|
-
const { metadata } = (await ctx.broker.call("metadata.get", { key: cacherKey(objectApiName) }, { meta: ctx.meta })) || {};
|
|
224
|
-
await ctx.broker
|
|
248
|
+
// const { metadata } = (await ctx.broker.call("metadata.get", { key: cacherKey(objectApiName) }, { meta: ctx.meta })) || {};
|
|
249
|
+
const { metadata } = (await Register.get(ctx.broker, cacherKey(objectApiName))) || {};
|
|
250
|
+
|
|
251
|
+
// await ctx.broker.call('metadata.delete', {key: cacherKey(objectApiName)}, {meta: ctx.meta})
|
|
252
|
+
await Register.delete(ctx.broker, cacherKey(objectApiName));
|
|
225
253
|
try {
|
|
226
|
-
await ctx.broker.call('metadata.deleteServiceMetadata', {
|
|
254
|
+
// await ctx.broker.call('metadata.deleteServiceMetadata', {
|
|
255
|
+
// nodeID: ctx.broker.nodeID,
|
|
256
|
+
// serviceName: '~database-objects',
|
|
257
|
+
// metadataType: METADATA_TYPE,
|
|
258
|
+
// metadataApiName: objectApiName
|
|
259
|
+
// }, {meta: ctx.meta})
|
|
260
|
+
|
|
261
|
+
await Register.deleteServiceMetadata(ctx.broker, {
|
|
227
262
|
nodeID: ctx.broker.nodeID,
|
|
228
263
|
serviceName: '~database-objects',
|
|
229
264
|
metadataType: METADATA_TYPE,
|
|
230
265
|
metadataApiName: objectApiName
|
|
231
|
-
}
|
|
266
|
+
});
|
|
267
|
+
|
|
232
268
|
} catch (error) {
|
|
233
269
|
console.log(error)
|
|
234
270
|
}
|
|
235
271
|
if(this.onDestroy && _.isFunction(this.onDestroy)){
|
|
236
272
|
await this.onDestroy(metadata)
|
|
237
273
|
}
|
|
238
|
-
ctx.broker.broadcast("metadata.objects.deleted", {objectApiName: objectApiName, isDelete: true, objectConfig: metadata});
|
|
239
|
-
ctx.broker.broadcast(`${metadata.datasource}.@${objectApiName}.metadata.objects.deleted`, { objectApiName: objectApiName, data: metadata });
|
|
274
|
+
await ctx.broker.broadcast("metadata.objects.deleted", {objectApiName: objectApiName, isDelete: true, objectConfig: metadata});
|
|
275
|
+
await ctx.broker.broadcast(`${metadata.datasource}.@${objectApiName}.metadata.objects.deleted`, { objectApiName: objectApiName, data: metadata });
|
|
240
276
|
return true;
|
|
241
277
|
}
|
|
242
278
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SteedosFieldFormulaTypeConfig, SteedosFieldFormulaQuoteTypeConfig, SteedosFormulaVarTypeConfig, SteedosFormulaVarPathTypeConfig, FormulaUserKey, SteedosFormulaBlankValue } from './type';
|
|
2
2
|
import { pickFormulaVars } from './core';
|
|
3
3
|
// import { isCodeObject } from '../util'; TODO
|
|
4
|
+
import { Register } from '@steedos/metadata-registrar';
|
|
4
5
|
|
|
5
6
|
import _ = require('lodash')
|
|
6
7
|
const clone = require('clone')
|
|
@@ -29,7 +30,8 @@ export class FormulaActionHandler{
|
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
32
|
// console.log(`deleteAll formula`, `${this.cacherKey(objectConfig.name)}.*`)
|
|
32
|
-
await this.broker.call('metadata.fuzzyDelete', {key: `${this.cacherKey(objectConfig.name)}.*`}, {meta: {}})
|
|
33
|
+
// await this.broker.call('metadata.fuzzyDelete', {key: `${this.cacherKey(objectConfig.name)}.*`}, {meta: {}})
|
|
34
|
+
await Register.fuzzyDelete(this.broker, `${this.cacherKey(objectConfig.name)}.*`)
|
|
33
35
|
return true
|
|
34
36
|
} catch (error) {
|
|
35
37
|
this.broker.logger.error(error);
|
|
@@ -191,7 +193,8 @@ export class FormulaActionHandler{
|
|
|
191
193
|
throw new Error(`computeFormulaVarAndQuotes:Can't find the object reference_to '${tempFieldConfig.reference_to}' by the field '${tempFieldConfig.name}' for the formula var '${formulaVar}'`);
|
|
192
194
|
}
|
|
193
195
|
else{
|
|
194
|
-
await this.broker.call('metadata.add', {key: this.cacherKey(getDynamicCalcMapCacherKey(tempFieldConfig.reference_to, objectConfig.name)), data: {objectApiName: objectConfig.name}}, {meta: {}})
|
|
196
|
+
// await this.broker.call('metadata.add', {key: this.cacherKey(getDynamicCalcMapCacherKey(tempFieldConfig.reference_to, objectConfig.name)), data: {objectApiName: objectConfig.name}}, {meta: {}})
|
|
197
|
+
await Register.add(this.broker, {key: this.cacherKey(getDynamicCalcMapCacherKey(tempFieldConfig.reference_to, objectConfig.name)), data: {objectApiName: objectConfig.name}}, {});
|
|
195
198
|
return;
|
|
196
199
|
}
|
|
197
200
|
}
|
|
@@ -280,7 +283,8 @@ export class FormulaActionHandler{
|
|
|
280
283
|
|
|
281
284
|
async getFormulaReferenceMaps(broker: any): Promise<any>{
|
|
282
285
|
const maps = [];
|
|
283
|
-
let records = (await broker.call('metadata.filter', { key: this.cacherKey(`${refMapName}.*`) }, { meta: {} })) || {};
|
|
286
|
+
// let records = (await broker.call('metadata.filter', { key: this.cacherKey(`${refMapName}.*`) }, { meta: {} })) || {};
|
|
287
|
+
let records: any = (await Register.filter(this.broker, this.cacherKey(`${refMapName}.*`))) || {};
|
|
284
288
|
for await (const item of records) {
|
|
285
289
|
const metadata = item?.metadata;
|
|
286
290
|
if(metadata){
|
|
@@ -304,8 +308,8 @@ export class FormulaActionHandler{
|
|
|
304
308
|
// //checkData
|
|
305
309
|
this.checkRefMapData(maps, data);
|
|
306
310
|
// maps.push(data);
|
|
307
|
-
|
|
308
|
-
await broker.call('metadata.add', {key: this.cacherKey(`${refMapName}.${key}.${value}`), data: data}, {meta: {}})
|
|
311
|
+
await Register.add(this.broker, {key: this.cacherKey(`${refMapName}.${key}.${value}`), data: data}, {});
|
|
312
|
+
// await broker.call('metadata.add', {key: this.cacherKey(`${refMapName}.${key}.${value}`), data: data}, {meta: {}})
|
|
309
313
|
}
|
|
310
314
|
|
|
311
315
|
async addFormulaMetadata(config: any, datasource: string){
|
|
@@ -314,13 +318,15 @@ export class FormulaActionHandler{
|
|
|
314
318
|
for await (const quote of fieldFormula.quotes) {
|
|
315
319
|
await this.addFormulaReferenceMaps(this.broker, `${fieldFormula._id}`, `${quote.object_name}.${quote.field_name}`);
|
|
316
320
|
}
|
|
317
|
-
await this.broker
|
|
321
|
+
await Register.add(this.broker, {key: this.cacherKey(fieldFormula._id), data: fieldFormula}, {});
|
|
322
|
+
// await this.broker.call('metadata.add', {key: this.cacherKey(fieldFormula._id), data: fieldFormula}, {meta: {}})
|
|
318
323
|
}
|
|
319
324
|
return true;
|
|
320
325
|
}
|
|
321
326
|
|
|
322
327
|
async getObjectDynamicCalcFormulaMap(objectApiName){
|
|
323
|
-
return await this.broker
|
|
328
|
+
return await Register.filter(this.broker, this.cacherKey(getDynamicCalcMapCacherKey(objectApiName, '*')))
|
|
329
|
+
// return await this.broker.call('metadata.filter', {key: this.cacherKey(getDynamicCalcMapCacherKey(objectApiName, '*'))}, {meta: {}});
|
|
324
330
|
}
|
|
325
331
|
|
|
326
332
|
async recalcObjectsFormulaMap(objectConfig){
|
|
@@ -340,7 +346,8 @@ export class FormulaActionHandler{
|
|
|
340
346
|
if (Object.prototype.hasOwnProperty.call(recalcObjects, objectName)) {
|
|
341
347
|
const recalcObjectConfig = recalcObjects[objectName];
|
|
342
348
|
await this.addFormulaMetadata(recalcObjectConfig, recalcObjectConfig.datasource);
|
|
343
|
-
await this.broker
|
|
349
|
+
await Register.delete(this.broker, this.cacherKey(getDynamicCalcMapCacherKey(objectConfig.name, objectName)))
|
|
350
|
+
// await this.broker.call('metadata.delete', {key: this.cacherKey(getDynamicCalcMapCacherKey(objectConfig.name, objectName))}, {meta: {}})
|
|
344
351
|
}
|
|
345
352
|
}
|
|
346
353
|
}
|
|
@@ -365,7 +372,8 @@ export class FormulaActionHandler{
|
|
|
365
372
|
}
|
|
366
373
|
const key = this.cacherKey(`${objectApiName}.${fieldApiName}`)
|
|
367
374
|
const configs = [];
|
|
368
|
-
const res = await this.broker.call('metadata.filter', {key: key}, {meta: {}})
|
|
375
|
+
// const res = await this.broker.call('metadata.filter', {key: key}, {meta: {}})
|
|
376
|
+
const res = await Register.filter(this.broker, key);
|
|
369
377
|
_.forEach(res, (item)=>{
|
|
370
378
|
configs.push(item?.metadata)
|
|
371
379
|
})
|
|
@@ -375,7 +383,8 @@ export class FormulaActionHandler{
|
|
|
375
383
|
async get(ctx){
|
|
376
384
|
let {fieldApiFullName} = ctx.params;
|
|
377
385
|
const key = this.cacherKey(fieldApiFullName)
|
|
378
|
-
const res = await this.broker.call('metadata.get', {key: key}, {meta: {}});
|
|
386
|
+
// const res = await this.broker.call('metadata.get', {key: key}, {meta: {}});
|
|
387
|
+
const res = await Register.get(this.broker, key)
|
|
379
388
|
return res?.metadata;
|
|
380
389
|
}
|
|
381
390
|
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { Register } from '@steedos/metadata-registrar';
|
|
2
|
+
|
|
1
3
|
import _ = require('lodash')
|
|
2
4
|
|
|
3
5
|
export class LookupActionHandler {
|
|
@@ -91,11 +93,12 @@ export class LookupActionHandler {
|
|
|
91
93
|
|
|
92
94
|
async getDetailsInfo(objectApiName: string){
|
|
93
95
|
const detailsInfo = [];
|
|
94
|
-
let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*") }, { meta: {} })) || {};
|
|
96
|
+
// let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*") }, { meta: {} })) || {};
|
|
97
|
+
let records: any = (await Register.filter(this.broker, this.getDetailKey(objectApiName, "*"))) || {};
|
|
95
98
|
for await (const item of records) {
|
|
96
99
|
const metadata = item?.metadata;
|
|
97
100
|
if(metadata){
|
|
98
|
-
detailsInfo.push(metadata);
|
|
101
|
+
detailsInfo.push(metadata.key);
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
104
|
return detailsInfo;
|
|
@@ -103,13 +106,15 @@ export class LookupActionHandler {
|
|
|
103
106
|
|
|
104
107
|
async removeDetail(objectApiName: any, detailObjectApiName: string, detailField: any) {
|
|
105
108
|
const detailFullName = `${detailObjectApiName}.${detailField.name}`
|
|
106
|
-
await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailFullName) }, { meta: {} });
|
|
109
|
+
// await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailFullName) }, { meta: {} });
|
|
110
|
+
await Register.delete(this.broker, this.getDetailKey(objectApiName, detailFullName));
|
|
107
111
|
return true;
|
|
108
112
|
}
|
|
109
113
|
|
|
110
114
|
async addDetail(objectApiName: any, detailObjectApiName: string, detailField: any) {
|
|
111
115
|
const detailFullName = `${detailObjectApiName}.${detailField.name}`
|
|
112
|
-
await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName, detailFullName), data: detailFullName }, { meta: {} })
|
|
116
|
+
// await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName, detailFullName), data: {type: 'detail', objectName: objectApiName, key: detailFullName} }, { meta: {} })
|
|
117
|
+
await Register.add(this.broker, { key: this.getDetailKey(objectApiName, detailFullName), data: {type: 'detail', objectName: objectApiName, key: detailFullName} }, {});
|
|
113
118
|
this.broker.broadcast(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
|
|
114
119
|
return true;
|
|
115
120
|
}
|
|
@@ -124,7 +129,8 @@ export class LookupActionHandler {
|
|
|
124
129
|
// }
|
|
125
130
|
|
|
126
131
|
async deleteObjectLookups(objectApiName: string) {
|
|
127
|
-
await this.broker
|
|
132
|
+
await Register.fuzzyDelete(this.broker, this.getDetailKey(objectApiName, '*'));
|
|
133
|
+
// await this.broker.call('metadata.fuzzyDelete', { key: this.getDetailKey(objectApiName, '*') }, { meta: {} });
|
|
128
134
|
return true;
|
|
129
135
|
}
|
|
130
136
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Register } from '@steedos/metadata-registrar';
|
|
1
2
|
import _ = require('lodash')
|
|
2
3
|
|
|
3
4
|
// 主子表有层级限制，超过3层就报错，该函数判断当前对象作为主表对象往下的层级最多不越过3层，
|
|
@@ -86,7 +87,8 @@ export class MasterDetailActionHandler{
|
|
|
86
87
|
return;
|
|
87
88
|
}
|
|
88
89
|
await this.deleteObjectMasterDetails(objectConfig.name);
|
|
89
|
-
await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey('*', objectConfig.name, '*')}, {meta: {}});
|
|
90
|
+
// await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey('*', objectConfig.name, '*')}, {meta: {}});
|
|
91
|
+
await Register.fuzzyDelete(this.broker, this.getDetailKey('*', objectConfig.name, '*'));
|
|
90
92
|
return true;
|
|
91
93
|
} catch (error) {
|
|
92
94
|
this.broker.logger.error(error);
|
|
@@ -220,11 +222,12 @@ export class MasterDetailActionHandler{
|
|
|
220
222
|
}
|
|
221
223
|
async getMastersInfo(objectApiName: string){
|
|
222
224
|
const mastersInfo = [];
|
|
223
|
-
let records = (await this.broker.call('metadata.filter', { key: this.getMasterKey(objectApiName, "*") }, { meta: {} })) || {};
|
|
225
|
+
// let records = (await this.broker.call('metadata.filter', { key: this.getMasterKey(objectApiName, "*") }, { meta: {} })) || {};
|
|
226
|
+
let records: any = (await Register.filter(this.broker, this.getMasterKey(objectApiName, "*"))) || {};
|
|
224
227
|
for await (const item of records) {
|
|
225
228
|
const metadata = item?.metadata;
|
|
226
229
|
if(metadata){
|
|
227
|
-
mastersInfo.push(metadata);
|
|
230
|
+
mastersInfo.push(metadata.key);
|
|
228
231
|
}
|
|
229
232
|
}
|
|
230
233
|
return mastersInfo;
|
|
@@ -232,13 +235,15 @@ export class MasterDetailActionHandler{
|
|
|
232
235
|
|
|
233
236
|
async addMaster(objectApiName: any, masterObjectApiName: string, field: any){
|
|
234
237
|
const masterFullName = `${masterObjectApiName}.${field.name}`
|
|
235
|
-
await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName, masterFullName), data: masterFullName}, {meta: {}})
|
|
238
|
+
// await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName, masterFullName), data: {type: 'master', objectName: objectApiName, key: masterFullName}}, {meta: {}})
|
|
239
|
+
await Register.add(this.broker, {key: this.getMasterKey(objectApiName, masterFullName), data: {type: 'master', objectName: objectApiName, key: masterFullName}}, {})
|
|
236
240
|
return true;
|
|
237
241
|
}
|
|
238
242
|
|
|
239
243
|
async removeMaster(objectApiName: any, masterObjectApiName: string, masterFieldName: any){
|
|
240
244
|
const masterFullName = `${masterObjectApiName}.${masterFieldName}`
|
|
241
|
-
await this.broker.call('metadata.delete', { key: this.getMasterKey(objectApiName, masterFullName) }, { meta: {} })
|
|
245
|
+
// await this.broker.call('metadata.delete', { key: this.getMasterKey(objectApiName, masterFullName) }, { meta: {} })
|
|
246
|
+
await Register.delete(this.broker, this.getMasterKey(objectApiName, masterFullName))
|
|
242
247
|
return true;
|
|
243
248
|
}
|
|
244
249
|
|
|
@@ -266,11 +271,12 @@ export class MasterDetailActionHandler{
|
|
|
266
271
|
|
|
267
272
|
async getDetailsInfo(objectApiName: string){
|
|
268
273
|
const detailsInfo = [];
|
|
269
|
-
let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*", "*") }, { meta: {} })) || {};
|
|
274
|
+
// let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*", "*") }, { meta: {} })) || {};
|
|
275
|
+
let records: any = (await Register.filter(this.broker, this.getDetailKey(objectApiName, "*", "*"))) || {}
|
|
270
276
|
for await (const item of records) {
|
|
271
277
|
const metadata = item?.metadata;
|
|
272
278
|
if(metadata){
|
|
273
|
-
detailsInfo.push(metadata);
|
|
279
|
+
detailsInfo.push(metadata.key);
|
|
274
280
|
}
|
|
275
281
|
}
|
|
276
282
|
return detailsInfo;
|
|
@@ -278,13 +284,15 @@ export class MasterDetailActionHandler{
|
|
|
278
284
|
|
|
279
285
|
async addDetail(objectApiName: any, detailObjectApiName: string, detailField: any){
|
|
280
286
|
const detailFullName = `${detailObjectApiName}.${detailField.name}`
|
|
281
|
-
await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName, detailObjectApiName, detailField.name), data: detailFullName}, {meta: {}})
|
|
287
|
+
// await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName, detailObjectApiName, detailField.name), data: {type: 'detail', objectName: objectApiName, key: detailFullName}}, {meta: {}})
|
|
288
|
+
await Register.add(this.broker, {key: this.getDetailKey(objectApiName, detailObjectApiName, detailField.name), data: {type: 'detail', objectName: objectApiName, key: detailFullName}}, {})
|
|
282
289
|
this.broker.broadcast(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
|
|
283
290
|
return true;
|
|
284
291
|
}
|
|
285
292
|
|
|
286
293
|
async removeDetail(objectApiName: any, detailObjectApiName: string, detailFieldName: any){
|
|
287
|
-
await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailObjectApiName, detailFieldName)}, { meta: {} })
|
|
294
|
+
// await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailObjectApiName, detailFieldName)}, { meta: {} })
|
|
295
|
+
await Register.delete(this.broker, this.getDetailKey(objectApiName, detailObjectApiName, detailFieldName))
|
|
288
296
|
return true;
|
|
289
297
|
}
|
|
290
298
|
|
|
@@ -354,8 +362,10 @@ export class MasterDetailActionHandler{
|
|
|
354
362
|
}
|
|
355
363
|
|
|
356
364
|
async deleteObjectMasterDetails(objectApiName: string){
|
|
357
|
-
await this.broker.call('metadata.fuzzyDelete', {key: this.getMasterKey(objectApiName, '*')}, {meta: {}});
|
|
358
|
-
await this.broker
|
|
365
|
+
// await this.broker.call('metadata.fuzzyDelete', {key: this.getMasterKey(objectApiName, '*')}, {meta: {}});
|
|
366
|
+
await Register.fuzzyDelete(this.broker, this.getMasterKey(objectApiName, '*'));
|
|
367
|
+
// await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey(objectApiName, '*', '*')}, {meta: {}});
|
|
368
|
+
await Register.fuzzyDelete(this.broker, this.getDetailKey(objectApiName, '*', '*'));
|
|
359
369
|
return true;
|
|
360
370
|
}
|
|
361
371
|
}
|
package/src/objects.service.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
|
|
3
|
+
import { Register } from '@steedos/metadata-registrar';
|
|
4
|
+
|
|
2
5
|
import { ActionHandlers } from './actionsHandler';
|
|
3
6
|
import { MasterDetailActionHandler } from './master-detail/masterDetailActionHandler'
|
|
4
7
|
import { FormulaActionHandler } from './formula/formulaActionHandler';
|
|
@@ -182,7 +185,24 @@ module.exports = {
|
|
|
182
185
|
const mastersInfo = this.masterDetailActionHandler.getMastersInfoKey(objectApiName);
|
|
183
186
|
const lookupDetailsInfo = this.lookupActionHandler.getDetailsInfoKey(objectApiName);
|
|
184
187
|
|
|
185
|
-
const results = await ctx.broker.call('metadata.mfilter', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
|
|
188
|
+
// const results = await ctx.broker.call('metadata.mfilter', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
|
|
189
|
+
const results = await Register.mfilter(ctx.broker, [detailsInfoKey, mastersInfo, lookupDetailsInfo])
|
|
190
|
+
return {
|
|
191
|
+
details: _.compact(_.map(results[0], 'metadata.key')),
|
|
192
|
+
masters: _.compact(_.map(results[1], 'metadata.key')),
|
|
193
|
+
lookup_details: _.compact(_.map(results[2], 'metadata.key')),
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
},
|
|
197
|
+
getAllRelationsInfo: {
|
|
198
|
+
async handler(ctx) {
|
|
199
|
+
const objectApiName = "*";
|
|
200
|
+
const detailsInfoKey = this.masterDetailActionHandler.getDetailsInfoKey(objectApiName);
|
|
201
|
+
const mastersInfo = this.masterDetailActionHandler.getMastersInfoKey(objectApiName);
|
|
202
|
+
const lookupDetailsInfo = this.lookupActionHandler.getDetailsInfoKey(objectApiName);
|
|
203
|
+
|
|
204
|
+
// const results = await ctx.broker.call('metadata.mfilter', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
|
|
205
|
+
const results = await Register.mfilter(ctx.broker, [detailsInfoKey, mastersInfo, lookupDetailsInfo])
|
|
186
206
|
return {
|
|
187
207
|
details: _.compact(_.map(results[0], 'metadata')),
|
|
188
208
|
masters: _.compact(_.map(results[1], 'metadata')),
|