@steedos/service-metadata-layouts 2.6.1-beta.7 → 2.6.2-beta.3
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 +21 -1
- package/lib/actionsHandler.js.map +1 -1
- package/package.json +2 -2
- package/src/actionsHandler.ts +19 -1
package/lib/actionsHandler.js
CHANGED
|
@@ -15,6 +15,26 @@ function register(ctx, apiName, data, meta) {
|
|
|
15
15
|
return yield ctx.broker.call('metadata.add', { key: cacherKey(data.object_name, apiName), data: data }, { meta: meta });
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
|
+
function defaultsDeep(obj, sources) {
|
|
19
|
+
let output = {};
|
|
20
|
+
_.toArray(arguments).reverse().forEach(item => {
|
|
21
|
+
_.mergeWith(output, item, (objectValue, sourceValue) => {
|
|
22
|
+
if (_.isArray(sourceValue)) {
|
|
23
|
+
if (_.isArray(objectValue)) {
|
|
24
|
+
return _.uniqBy(_.compact(_.concat(objectValue, sourceValue)), 'name');
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
return sourceValue;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
return output;
|
|
36
|
+
}
|
|
37
|
+
;
|
|
18
38
|
exports.ActionHandlers = {
|
|
19
39
|
get(ctx) {
|
|
20
40
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -33,7 +53,7 @@ exports.ActionHandlers = {
|
|
|
33
53
|
const metadataApiName = ctx.params.layoutApiName;
|
|
34
54
|
const metadataConfig = yield (0, _1.getServiceConfig)(ctx, serviceName, `${config.object_name}.${metadataApiName}`);
|
|
35
55
|
if (metadataConfig && metadataConfig.metadata) {
|
|
36
|
-
config =
|
|
56
|
+
config = defaultsDeep(config, metadataConfig.metadata);
|
|
37
57
|
}
|
|
38
58
|
yield ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(config.object_name, metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: _1.METADATA_TYPE, metadataApiName: metadataApiName }) });
|
|
39
59
|
const layoutConfig = yield (0, _1.refresh)(ctx, metadataApiName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actionsHandler.js","sourceRoot":"","sources":["../src/actionsHandler.ts"],"names":[],"mappings":";;;;AAAA,wBAA6D;AAC7D,4BAA6B;AAE7B,SAAS,SAAS,CAAC,aAAqB,EAAE,OAAe;IACrD,OAAO,aAAa,gBAAa,IAAI,aAAa,IAAI,OAAO,EAAE,CAAA;AACnE,CAAC;AAED,SAAS,oBAAoB,CAAC,eAAuB;IACjD,OAAO,aAAa,gBAAa,IAAI,eAAe,EAAE,CAAA;AAC1D,CAAC;AAED,SAAe,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI;;QAC5C,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAC,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;IACxH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"actionsHandler.js","sourceRoot":"","sources":["../src/actionsHandler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-metadata-layouts",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.2-beta.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/layouts.service.js",
|
|
6
6
|
"scripts": {
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"publishConfig": {
|
|
34
34
|
"access": "public"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "7842aa5d3023622c0e140009cfdd081180563bdd"
|
|
37
37
|
}
|
package/src/actionsHandler.ts
CHANGED
|
@@ -13,6 +13,24 @@ async function register(ctx, apiName, data, meta){
|
|
|
13
13
|
return await ctx.broker.call('metadata.add', {key: cacherKey(data.object_name, apiName), data: data}, {meta: meta});
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
function defaultsDeep(obj, sources) {
|
|
17
|
+
let output = {};
|
|
18
|
+
_.toArray(arguments).reverse().forEach(item=> {
|
|
19
|
+
_.mergeWith(output, item, (objectValue, sourceValue) => {
|
|
20
|
+
if(_.isArray(sourceValue)){
|
|
21
|
+
if(_.isArray(objectValue)){
|
|
22
|
+
return _.uniqBy(_.compact(_.concat(objectValue, sourceValue)), 'name')
|
|
23
|
+
}else{
|
|
24
|
+
return sourceValue
|
|
25
|
+
}
|
|
26
|
+
}else{
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
return output;
|
|
32
|
+
};
|
|
33
|
+
|
|
16
34
|
export const ActionHandlers = {
|
|
17
35
|
async get(ctx: any): Promise<any> {
|
|
18
36
|
return await ctx.broker.call('metadata.get', {key: getMatadataCacherKey(ctx.params.objectLayoutFullName)}, {meta: ctx.meta})
|
|
@@ -26,7 +44,7 @@ export const ActionHandlers = {
|
|
|
26
44
|
const metadataApiName = ctx.params.layoutApiName;
|
|
27
45
|
const metadataConfig = await getServiceConfig(ctx, serviceName, `${config.object_name}.${metadataApiName}`)
|
|
28
46
|
if(metadataConfig && metadataConfig.metadata){
|
|
29
|
-
config =
|
|
47
|
+
config = defaultsDeep(config, metadataConfig.metadata);
|
|
30
48
|
}
|
|
31
49
|
await ctx.broker.call('metadata.addServiceMetadata', {key: cacherKey(config.object_name, metadataApiName), data: config}, {meta: Object.assign({}, ctx.meta, {metadataType: METADATA_TYPE, metadataApiName: metadataApiName})})
|
|
32
50
|
const layoutConfig = await refresh(ctx, metadataApiName);
|