@steedos/service-metadata-server 3.0.0-beta.12 → 3.0.0-beta.120

package/lib/metadataService.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 const _ = require("lodash");
 module.exports = {
     name: "#",
-    dependencies: ['metadata'],
+    dependencies: ["metadata"],
     methods: {
         getMatadataCacherKey: {
             handler(metadataApiName) {
                 return `$steedos.#${this.settings.metadataType}.${metadataApiName}`;
-            }
+            },
         },
         getServiceConfig: {
             handler(serviceName, apiName, meta) {
@@ -18,37 +18,37 @@ module.exports = {
                     const metadataConfig = yield this.broker.call(`metadata.getServiceMetadata`, {
                         serviceName,
                         metadataType,
-                        metadataApiName: apiName
+                        metadataApiName: apiName,
                     }, { meta: meta });
                     return metadataConfig === null || metadataConfig === void 0 ? void 0 : metadataConfig.metadata;
                 });
-            }
+            },
         },
         getServicesConfigs: {
             handler(apiName_1, meta_1) {
                 return tslib_1.__awaiter(this, arguments, void 0, function* (apiName, meta, pluck = true) {
-                    const serviceName = '*';
+                    const serviceName = "*";
                     const metadataType = this.settings.metadataType;
                     const configs = yield this.broker.call(`metadata.getServiceMetadatas`, {
                         serviceName,
                         metadataType,
-                        metadataApiName: apiName
+                        metadataApiName: apiName,
                     }, { meta: meta });
                     if (pluck) {
-                        return _.map(configs, 'metadata');
+                        return _.map(configs, "metadata");
                     }
                     else {
                         return configs;
                     }
                 });
-            }
+            },
         },
         register: {
             handler(apiName, data, meta) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    return yield this.broker.call('metadata.add', { key: this.getMatadataCacherKey(apiName), data: data }, { meta: meta });
+                    return yield this.broker.call("metadata.add", { key: this.getMatadataCacherKey(apiName), data: data }, { meta: meta });
                 });
-            }
+            },
         },
         mregister: {
             handler(data, meta) {
@@ -60,11 +60,11 @@ module.exports = {
                     _.map(data, (value, key) => {
                         mdata[this.getMatadataCacherKey(key)] = value;
                     });
-                    return yield this.broker.call('metadata.madd', {
-                        data: mdata
+                    return yield this.broker.call("metadata.madd", {
+                        data: mdata,
                     }, { meta: meta });
                 });
-            }
+            },
         },
         refresh: {
             handler(apiName, meta) {
@@ -79,7 +79,7 @@ module.exports = {
                     }), config);
                     return config;
                 });
-            }
+            },
         },
         mrefresh: {
             handler(meta) {
@@ -89,9 +89,12 @@ module.exports = {
                         return null;
                     }
                     let mconfig = {};
-                    _.map(_.groupBy(configs, 'metadataApiName'), (_configs, metadataApiName) => {
+                    _.map(_.groupBy(configs, "metadataApiName"), (_configs, metadataApiName) => {
                         let config = {};
-                        const __configs = _.map(_configs, 'metadata');
+                        const __configs = _.map(_configs, "metadata");
+                        _.sortBy(__configs, function (o) {
+                            return -o.__timestamp;
+                        });
                         config = _.defaultsDeep({}, ..._.sortBy(__configs, function (o) {
                             return o && o._id ? -1 : 1;
                         }), config);
@@ -99,43 +102,43 @@ module.exports = {
                     });
                     return mconfig;
                 });
-            }
+            },
         },
         removeServiceMetadata: {
             handler(serviceName, apiName, meta) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const metadataType = this.settings.metadataType;
-                    return yield this.broker.call('metadata.removeServiceMetadata', {
+                    return yield this.broker.call("metadata.removeServiceMetadata", {
                         serviceName,
                         metadataType,
-                        metadataApiName: apiName
+                        metadataApiName: apiName,
                     }, meta);
                 });
-            }
-        }
+            },
+        },
     },
     actions: {
         get: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    return yield ctx.broker.call('metadata.get', { key: this.getMatadataCacherKey(ctx.params.metadataApiName) }, { meta: ctx.meta });
+                    return yield ctx.broker.call("metadata.get", { key: this.getMatadataCacherKey(ctx.params.metadataApiName) }, { meta: ctx.meta });
                 });
-            }
+            },
         },
         getAll: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    return yield ctx.broker.call('metadata.filter', { key: this.getMatadataCacherKey("*") }, { meta: ctx.meta });
+                    return yield ctx.broker.call("metadata.filter", { key: this.getMatadataCacherKey("*") }, { meta: ctx.meta });
                 });
-            }
+            },
         },
         filter: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
                     let { pattern } = ctx.params;
-                    return yield ctx.broker.call('metadata.filter', { key: this.getMatadataCacherKey(pattern) }, { meta: ctx.meta });
+                    return yield ctx.broker.call("metadata.filter", { key: this.getMatadataCacherKey(pattern) }, { meta: ctx.meta });
                 });
-            }
+            },
         },
         add: {
             handler(ctx) {
@@ -147,49 +150,65 @@ module.exports = {
                     if (metadataConfig && metadataConfig.metadata) {
                         config = _.defaultsDeep(config, metadataConfig.metadata);
                     }
-                    yield ctx.broker.call('metadata.addServiceMetadata', { key: this.getMatadataCacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: this.settings.metadataType, metadataApiName: metadataApiName }) });
+                    yield ctx.broker.call("metadata.addServiceMetadata", { key: this.getMatadataCacherKey(metadataApiName), data: config }, {
+                        meta: Object.assign({}, ctx.meta, {
+                            metadataType: this.settings.metadataType,
+                            metadataApiName: metadataApiName,
+                        }),
+                    });
                     const newConfig = yield this.refresh(metadataApiName, ctx.meta);
                     if (newConfig) {
                         return yield this.register(metadataApiName, newConfig, ctx.meta);
                     }
                 });
-            }
+            },
         },
         madd: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
                     let data = ctx.params.data;
-                    yield ctx.broker.call('metadata.maddServiceMetadata', { data: data }, { meta: Object.assign({}, ctx.meta, { metadataType: this.settings.metadataType }) });
+                    yield ctx.broker.call("metadata.maddServiceMetadata", { data: data }, {
+                        meta: Object.assign({}, ctx.meta, {
+                            metadataType: this.settings.metadataType,
+                        }),
+                    });
                     const newmConfig = yield this.mrefresh(ctx.meta);
                     if (newmConfig) {
                         return yield this.mregister(newmConfig, ctx.meta);
                     }
                 });
-            }
+            },
         },
         delete: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const metadataApiName = ctx.params.apiName;
                     const serviceName = ctx.meta.metadataServiceName;
-                    yield this.removeServiceMetadata(serviceName, metadataApiName, { meta: Object.assign({}, ctx.meta, { metadataType: this.settings.metadataType, metadataApiName: metadataApiName }) });
+                    yield this.removeServiceMetadata(serviceName, metadataApiName, {
+                        meta: Object.assign({}, ctx.meta, {
+                            metadataType: this.settings.metadataType,
+                            metadataApiName: metadataApiName,
+                        }),
+                    });
                     const config = yield this.refresh(metadataApiName, ctx.meta);
                     if (!config) {
-                        yield ctx.broker.call('metadata.delete', { key: this.getMatadataCacherKey(metadataApiName) });
+                        yield ctx.broker.call("metadata.delete", {
+                            key: this.getMatadataCacherKey(metadataApiName),
+                        });
                     }
                     else {
                         yield this.register(metadataApiName, config, ctx.meta);
                     }
                 });
-            }
+            },
         },
         verify: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
                     return true;
                 });
-            }
-        }
+            },
+        },
     },
     merged(schema) {
         if (!schema.events) {
@@ -207,10 +226,12 @@ module.exports = {
                             const metadataApiName = _c;
                             const config = yield this.refresh(metadataApiName, ctx.meta);
                             if (!config) {
-                                yield ctx.broker.call('metadata.delete', { key: this.getMatadataCacherKey(metadataApiName) });
+                                yield ctx.broker.call("metadata.delete", {
+                                    key: this.getMatadataCacherKey(metadataApiName),
+                                });
                             }
                             else {
-                                yield this.register(ctx, metadataApiName, config, {});
+                                yield this.register(metadataApiName, config, {});
                             }
                         }
                     }
@@ -222,8 +243,8 @@ module.exports = {
                         finally { if (e_1) throw e_1.error; }
                     }
                 }
-            })
+            }),
         };
-    }
+    },
 };
 //# sourceMappingURL=metadataService.js.map

package/lib/metadataService.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadataService.js","sourceRoot":"","sources":["../src/metadataService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metadataService.js","sourceRoot":"","sources":["../src/metadataService.ts"],"names":[],"mappings":";;;AAAA,4BAA6B;AAE7B,MAAM,CAAC,OAAO,GAAG;IACf,IAAI,EAAE,GAAG;IAKT,YAAY,EAAE,CAAC,UAAU,CAAC;IAE1B,OAAO,EAAE;QACP,oBAAoB,EAAE;YACpB,OAAO,CAAC,eAAuB;gBAC7B,OAAO,aAAa,IAAI,CAAC,QAAQ,CAAC,YAAY,IAAI,eAAe,EAAE,CAAC;YACtE,CAAC;SACF;QACD,gBAAgB,EAAE;YACV,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI;;oBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAChD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC3C,6BAA6B,EAC7B;wBACE,WAAW;wBACX,YAAY;wBACZ,eAAe,EAAE,OAAO;qBACzB,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;oBACF,OAAO,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,CAAC;gBAClC,CAAC;aAAA;SACF;QACD,kBAAkB,EAAE;YACZ,OAAO;6EAAC,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,IAAI;oBACvC,MAAM,WAAW,GAAG,GAAG,CAAC;oBACxB,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACpC,8BAA8B,EAC9B;wBACE,WAAW;wBACX,YAAY;wBACZ,eAAe,EAAE,OAAO;qBACzB,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;oBACF,IAAI,KAAK,EAAE,CAAC;wBACV,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBACpC,CAAC;yBAAM,CAAC;wBACN,OAAO,OAAO,CAAC;oBACjB,CAAC;gBACH,CAAC;aAAA;SACF;QACD,QAAQ,EAAE;YACF,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI;;oBAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC3B,cAAc,EACd,EAAE,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EACvD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;gBACJ,CAAC;aAAA;SACF;QACD,SAAS,EAAE;YAIH,OAAO,CAAC,IAAI,EAAE,IAAI;;oBACtB,MAAM,KAAK,GAAG,EAAE,CAAC;oBACjB,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC7B,OAAO;oBACT,CAAC;oBACD,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;wBACzB,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;oBAChD,CAAC,CAAC,CAAC;oBACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC3B,eAAe,EACf;wBACE,IAAI,EAAE,KAAK;qBACZ,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;gBACJ,CAAC;aAAA;SACF;QACD,OAAO,EAAE;YACD,OAAO,CAAC,OAAO,EAAE,IAAI;;oBACzB,IAAI,MAAM,GAAQ,EAAE,CAAC;oBACrB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBAC7D,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;wBACxB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,MAAM,GAAG,CAAC,CAAC,YAAY,CACrB,EAAE,EACF,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;wBAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC7B,CAAC,CAAC,EACF,MAAM,CACP,CAAC;oBACF,OAAO,MAAM,CAAC;gBAChB,CAAC;aAAA;SACF;QACD,QAAQ,EAAE;YACF,OAAO,CAAC,IAAI;;oBAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;oBAChE,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;wBACxB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,IAAI,OAAO,GAAQ,EAAE,CAAC;oBACtB,CAAC,CAAC,GAAG,CACH,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,EACrC,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE;wBAC5B,IAAI,MAAM,GAAQ,EAAE,CAAC;wBACrB,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;wBAC9C,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC;4BAC7B,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;wBACxB,CAAC,CAAC,CAAC;wBACH,MAAM,GAAG,CAAC,CAAC,YAAY,CACrB,EAAE,EACF,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC;4BAChC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC7B,CAAC,CAAC,EACF,MAAM,CACP,CAAC;wBACF,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,CAAC;oBACpC,CAAC,CACF,CAAC;oBACF,OAAO,OAAO,CAAC;gBACjB,CAAC;aAAA;SACF;QACD,qBAAqB,EAAE;YACf,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI;;oBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAChD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC3B,gCAAgC,EAChC;wBACE,WAAW;wBACX,YAAY;wBACZ,eAAe,EAAE,OAAO;qBACzB,EACD,IAAI,CACL,CAAC;gBACJ,CAAC;aAAA;SACF;KACF;IAID,OAAO,EAAE;QAMP,GAAG,EAAE;YACG,OAAO,CAAC,GAAG;;oBACf,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAC1B,cAAc,EACd,EAAE,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,EAC9D,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CACnB,CAAC;gBACJ,CAAC;aAAA;SACF;QACD,MAAM,EAAE;YACA,OAAO,CAAC,GAAG;;oBACf,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAC1B,iBAAiB,EACjB,EAAE,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,EACvC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CACnB,CAAC;gBACJ,CAAC;aAAA;SACF;QACD,MAAM,EAAE;YACA,OAAO,CAAC,GAAG;;oBACf,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;oBAC7B,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAC1B,iBAAiB,EACjB,EAAE,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,EAC3C,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CACnB,CAAC;gBACJ,CAAC;aAAA;SACF;QACD,GAAG,EAAE;YACG,OAAO,CAAC,GAAG;;oBACf,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC7B,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC;oBACjD,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;oBAC3C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAChD,WAAW,EACX,GAAG,eAAe,EAAE,EACpB,GAAG,CAAC,IAAI,CACT,CAAC;oBACF,IAAI,cAAc,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;wBAC9C,MAAM,GAAG,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;oBAC3D,CAAC;oBACD,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CACnB,6BAA6B,EAC7B,EAAE,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EACjE;wBACE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE;4BAChC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;4BACxC,eAAe,EAAE,eAAe;yBACjC,CAAC;qBACH,CACF,CAAC;oBACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBAChE,IAAI,SAAS,EAAE,CAAC;wBACd,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBACnE,CAAC;gBACH,CAAC;aAAA;SACF;QACD,IAAI,EAAE;YACE,OAAO,CAAC,GAAG;;oBAEf,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC3B,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CACnB,8BAA8B,EAC9B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd;wBACE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE;4BAChC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;yBACzC,CAAC;qBACH,CACF,CAAC;oBACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,UAAU,EAAE,CAAC;wBACf,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBACpD,CAAC;gBACH,CAAC;aAAA;SACF;QACD,MAAM,EAAE;YACA,OAAO,CAAC,GAAG;;oBACf,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;oBAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC;oBACjD,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,eAAe,EAAE;wBAC7D,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE;4BAChC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;4BACxC,eAAe,EAAE,eAAe;yBACjC,CAAC;qBACH,CAAC,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC7D,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE;4BACvC,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;yBAChD,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBACzD,CAAC;gBACH,CAAC;aAAA;SACF;QACD,MAAM,EAAE;YACA,OAAO,CAAC,GAAG;;oBACf,OAAO,IAAI,CAAC;gBACd,CAAC;aAAA;SACF;KACF;IACD,MAAM,CAAC,MAAM;QACX,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;QACrB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,aAAa,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,GAAG;YAC7D,OAAO,EAAE,CAAO,GAAG,EAAE,EAAE;;gBACrB,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBACjD,IAAI,OAAO,EAAE,CAAC;;wBACZ,KAAoC,eAAA,qBAAA,sBAAA,gBAAgB,CAAA,sBAAA,0GAAE,CAAC;4BAAnB,gCAAgB;4BAAhB,WAAgB;4BAAzC,MAAM,eAAe,KAAA,CAAA;4BAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;4BAC7D,IAAI,CAAC,MAAM,EAAE,CAAC;gCACZ,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE;oCACvC,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;iCAChD,CAAC,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACN,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;4BACnD,CAAC;wBACH,CAAC;;;;;;;;;gBACH,CAAC;YACH,CAAC,CAAA;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/permissionFieldsService.js

@@ -2,11 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const _ = require("lodash");
-const metadataService = require('./metadataService');
-const SERVICE_NAME = 'permission_fields';
-const METADATA_TYPE = 'permission_fields';
+const metadataService = require("./metadataService");
+const SERVICE_NAME = "permission_fields";
+const METADATA_TYPE = "permission_fields";
 const objectql = require("@steedos/objectql");
-const systemFields = ['owner', 'created', 'created_by', 'modified', 'modified_by', 'locked', 'company_id', 'company_ids', 'instance_state'];
+const systemFields = [
+    "owner",
+    "created",
+    "created_by",
+    "modified",
+    "modified_by",
+    "locked",
+    "company_id",
+    "company_ids",
+    "instance_state",
+];
 function getFieldPermission(apiName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const schema = objectql.getSteedosSchema();
@@ -15,7 +25,8 @@ function getFieldPermission(apiName) {
     });
 }
 const getFieldDefaultEditable = (field) => {
-    if (_.includes(systemFields, field.name) && (field.omit || field.hidden || field.readonly || field.disabled)) {
+    if (_.includes(systemFields, field.name) &&
+        (field.omit || field.hidden || field.readonly || field.disabled)) {
         return false;
     }
     if (field.omit || field.hidden || field.readonly || field.disabled) {
@@ -36,33 +47,53 @@ module.exports = {
     name: SERVICE_NAME,
     mixins: [metadataService],
     settings: {
-        metadataType: METADATA_TYPE
+        metadataType: METADATA_TYPE,
     },
     methods: {
         resetFieldPermissions: {
             handler(permissionObjectId, userSession) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const record = yield objectql.getObject('permission_objects').findOne(permissionObjectId);
+                    const record = yield objectql
+                        .getObject("permission_objects")
+                        .findOne(permissionObjectId);
                     if (!record) {
                         return;
                     }
-                    const permissionSet = yield objectql.getObject('permission_set').findOne(record.permission_set_id);
-                    const fields = yield objectql.getObject('object_fields').find({ filters: [['object', '=', record.object_name]] });
+                    const permissionSet = yield objectql
+                        .getObject("permission_set")
+                        .findOne(record.permission_set_id);
+                    const fields = yield objectql
+                        .getObject("object_fields")
+                        .find({ filters: [["object", "=", record.object_name]] });
                     const now = new Date();
                     for (const field of fields) {
-                        const result = yield objectql.getObject('permission_fields').directFind({ filters: [['permission_set_id', '=', permissionSet.name], ['permission_object', '=', record.name], ['object_name', '=', record.object_name], ['field', '=', field.name], ['is_system', '!=', true]] });
+                        const result = yield objectql
+                            .getObject("permission_fields")
+                            .directFind({
+                            filters: [
+                                ["permission_set_id", "=", permissionSet.name],
+                                ["permission_object", "=", record.name],
+                                ["object_name", "=", record.object_name],
+                                ["field", "=", field.name],
+                                ["is_system", "!=", true],
+                            ],
+                        });
                         const count = result.length;
                         if (count == 0) {
                             const apiName = `${permissionSet.name}.${record.object_name}.${field.name}`;
                             const fieldPermission = yield getFieldPermission(apiName);
-                            yield objectql.getObject('permission_fields').directInsert({
+                            yield objectql.getObject("permission_fields").directInsert({
                                 name: apiName,
                                 permission_set_id: permissionSet.name,
                                 permission_object: record.name,
                                 object_name: record.object_name,
                                 field: field.name,
-                                editable: fieldPermission ? fieldPermission.editable : getFieldDefaultEditable(field),
-                                readable: fieldPermission ? fieldPermission.readable : getFieldDefaultReadable(field),
+                                editable: fieldPermission
+                                    ? fieldPermission.editable
+                                    : getFieldDefaultEditable(field),
+                                readable: fieldPermission
+                                    ? fieldPermission.readable
+                                    : getFieldDefaultReadable(field),
                                 owner: userSession.userId,
                                 space: userSession.spaceId,
                                 created: now,
@@ -70,23 +101,32 @@ module.exports = {
                                 created_by: userSession.userId,
                                 modified_by: userSession.userId,
                                 company_id: userSession.company_id,
-                                company_ids: userSession.company_ids
+                                company_ids: userSession.company_ids,
                             });
                         }
                     }
-                    const fieldsPermission = yield objectql.getObject('permission_fields').find({ filters: [['permission_set_id', '=', permissionSet.name], ['object_name', '=', record.object_name]] });
-                    const allFields = _.map(fieldsPermission, 'field');
-                    const objectFields = _.map(fields, 'name');
+                    const fieldsPermission = yield objectql
+                        .getObject("permission_fields")
+                        .find({
+                        filters: [
+                            ["permission_set_id", "=", permissionSet.name],
+                            ["object_name", "=", record.object_name],
+                        ],
+                    });
+                    const allFields = _.map(fieldsPermission, "field");
+                    const objectFields = _.map(fields, "name");
                     const diffFields = _.difference(allFields, objectFields);
                     for (const diffField of diffFields) {
                         const fieldPermission = _.find(fieldsPermission, (fp) => {
                             return fp.field == diffField;
                         });
-                        yield objectql.getObject('permission_fields').delete(fieldPermission._id);
+                        yield objectql
+                            .getObject("permission_fields")
+                            .delete(fieldPermission._id);
                     }
                 });
-            }
-        }
+            },
+        },
     },
     actions: {
         resetFieldPermissions: {
@@ -96,20 +136,22 @@ module.exports = {
                     const { permissionObjectId } = ctx.params;
                     return yield this.resetFieldPermissions(permissionObjectId, userSession);
                 });
-            }
+            },
         },
         resetAllPermissionSetFieldPermissions: {
             handler(ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const userSession = ctx.meta.user;
                     const { objectName } = ctx.params;
-                    const records = yield objectql.getObject('permission_objects').directFind({ filters: [['object_name', '=', objectName]] });
+                    const records = yield objectql
+                        .getObject("permission_objects")
+                        .directFind({ filters: [["object_name", "=", objectName]] });
                     for (const record of records) {
                         yield this.resetFieldPermissions(record._id, userSession);
                     }
                 });
-            }
-        }
-    }
+            },
+        },
+    },
 };
 //# sourceMappingURL=permissionFieldsService.js.map

package/lib/permissionFieldsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"permissionFieldsService.js","sourceRoot":"","sources":["../src/permissionFieldsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"permissionFieldsService.js","sourceRoot":"","sources":["../src/permissionFieldsService.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,31 +1,30 @@
 {
   "name": "@steedos/service-metadata-server",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.120",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/objectql": "3.0.0-beta.12",
-    "@steedos/service-metadata": "3.0.0-beta.12",
-    "@steedos/service-metadata-apps": "3.0.0-beta.12",
-    "@steedos/service-metadata-layouts": "3.0.0-beta.12",
-    "@steedos/service-metadata-objects": "3.0.0-beta.12",
-    "@steedos/service-metadata-permissionsets": "3.0.0-beta.12",
-    "@steedos/service-metadata-tabs": "3.0.0-beta.12",
-    "@steedos/service-metadata-translations": "3.0.0-beta.12",
-    "@steedos/service-metadata-triggers": "3.0.0-beta.12",
-    "@steedos/service-packages": "3.0.0-beta.12",
+    "@steedos/objectql": "3.0.0-beta.120",
+    "@steedos/service-metadata": "3.0.0-beta.120",
+    "@steedos/service-metadata-apps": "3.0.0-beta.120",
+    "@steedos/service-metadata-layouts": "3.0.0-beta.120",
+    "@steedos/service-metadata-objects": "3.0.0-beta.120",
+    "@steedos/service-metadata-permissionsets": "3.0.0-beta.120",
+    "@steedos/service-metadata-tabs": "3.0.0-beta.120",
+    "@steedos/service-metadata-translations": "3.0.0-beta.120",
+    "@steedos/service-metadata-triggers": "3.0.0-beta.120",
+    "@steedos/service-packages": "3.0.0-beta.120",
     "lodash": "^4.17.21",
     "underscore": "1.13.4"
   },
   "devDependencies": {
     "typescript": "5.7.3"
   },
-  "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0bf2a1c9ca82a02aa95ef37bc5fe376faa870cc8"
+  "gitHead": "7d47094f59490c8d6bd0c94395e1dba6e0d86bac"
 }

package/src/metadataService.ts

@@ -1,199 +1,275 @@
 import _ = require("lodash");
 
 module.exports = {
-    name: "#",
+  name: "#",
 
-    /**
-     * Dependencies
-     */
-    dependencies: ['metadata'],
+  /**
+   * Dependencies
+   */
+  dependencies: ["metadata"],
 
-    methods: {
-        getMatadataCacherKey: {
-            handler(metadataApiName: string) {
-                return `$steedos.#${this.settings.metadataType}.${metadataApiName}`
-            }
-        },
-        getServiceConfig: {
-            async handler(serviceName, apiName, meta) {
-                const metadataType = this.settings.metadataType;
-                const metadataConfig = await this.broker.call(`metadata.getServiceMetadata`, {
-                    serviceName,
-                    metadataType,
-                    metadataApiName: apiName
-                }, {meta: meta})
-                return metadataConfig?.metadata;
-            }
-        },
-        getServicesConfigs:{
-            async handler(apiName, meta, pluck = true) {
-                const serviceName = '*';
-                const metadataType = this.settings.metadataType;
-                const configs = await this.broker.call(`metadata.getServiceMetadatas`, {
-                    serviceName,
-                    metadataType,
-                    metadataApiName: apiName
-                }, {meta: meta})
-                if (pluck) {
-                    return _.map(configs, 'metadata');
-                } else {
-                    return configs;
-                }
-            }
-        },
-        register: {
-            async handler(apiName, data, meta) {
-                return await this.broker.call('metadata.add', { key: this.getMatadataCacherKey(apiName), data: data }, { meta: meta });
-            }
-        },
-        mregister: {
-            /**
-             * data: {apiName1: value1, apiName2: value2}
-             */
-            async handler(data, meta) {
-                const mdata = {};
-                if (!data || _.isEmpty(data)) {
-                    return;
-                }
-                _.map(data, (value, key) => {
-                    mdata[this.getMatadataCacherKey(key)] = value
-                })
-                return await this.broker.call('metadata.madd', {
-                    data: mdata
-                }, { meta: meta });
-            }
-        },
-        refresh: {
-            async handler(apiName, meta) {
-                let config: any = {};
-                const configs = await this.getServicesConfigs(apiName, meta);
-                if(configs.length == 0){
-                    return null
-                }
-                config = _.defaultsDeep({}, ..._.sortBy(configs, function (o) {
-                    return o && o._id ? -1 : 1;
-                }), config)
-                return config;
-            }
-        },
-        mrefresh: {
-            async handler(meta) {
-                const configs = await this.getServicesConfigs("*", meta, false);
-                if (configs.length == 0) {
-                    return null
-                }
-                let mconfig: any = {};
-                _.map(_.groupBy(configs, 'metadataApiName'), (_configs, metadataApiName) => {
-                    let config: any = {};
-                    const __configs = _.map(_configs, 'metadata');
-                    config = _.defaultsDeep({}, ..._.sortBy(__configs, function (o) {
-                        return o && o._id ? -1 : 1;
-                    }), config)
-                    mconfig[metadataApiName] = config
-                })
-                return mconfig;
-            }
-        },
-        removeServiceMetadata: {
-            async handler(serviceName, apiName, meta) {
-                const metadataType = this.settings.metadataType;
-                return await this.broker.call('metadata.removeServiceMetadata', {
-                    serviceName,
-                    metadataType,
-                    metadataApiName: apiName
-                }, meta);
-            }
+  methods: {
+    getMatadataCacherKey: {
+      handler(metadataApiName: string) {
+        return `$steedos.#${this.settings.metadataType}.${metadataApiName}`;
+      },
+    },
+    getServiceConfig: {
+      async handler(serviceName, apiName, meta) {
+        const metadataType = this.settings.metadataType;
+        const metadataConfig = await this.broker.call(
+          `metadata.getServiceMetadata`,
+          {
+            serviceName,
+            metadataType,
+            metadataApiName: apiName,
+          },
+          { meta: meta },
+        );
+        return metadataConfig?.metadata;
+      },
+    },
+    getServicesConfigs: {
+      async handler(apiName, meta, pluck = true) {
+        const serviceName = "*";
+        const metadataType = this.settings.metadataType;
+        const configs = await this.broker.call(
+          `metadata.getServiceMetadatas`,
+          {
+            serviceName,
+            metadataType,
+            metadataApiName: apiName,
+          },
+          { meta: meta },
+        );
+        if (pluck) {
+          return _.map(configs, "metadata");
+        } else {
+          return configs;
+        }
+      },
+    },
+    register: {
+      async handler(apiName, data, meta) {
+        return await this.broker.call(
+          "metadata.add",
+          { key: this.getMatadataCacherKey(apiName), data: data },
+          { meta: meta },
+        );
+      },
+    },
+    mregister: {
+      /**
+       * data: {apiName1: value1, apiName2: value2}
+       */
+      async handler(data, meta) {
+        const mdata = {};
+        if (!data || _.isEmpty(data)) {
+          return;
+        }
+        _.map(data, (value, key) => {
+          mdata[this.getMatadataCacherKey(key)] = value;
+        });
+        return await this.broker.call(
+          "metadata.madd",
+          {
+            data: mdata,
+          },
+          { meta: meta },
+        );
+      },
+    },
+    refresh: {
+      async handler(apiName, meta) {
+        let config: any = {};
+        const configs = await this.getServicesConfigs(apiName, meta);
+        if (configs.length == 0) {
+          return null;
+        }
+        config = _.defaultsDeep(
+          {},
+          ..._.sortBy(configs, function (o) {
+            return o && o._id ? -1 : 1;
+          }),
+          config,
+        );
+        return config;
+      },
+    },
+    mrefresh: {
+      async handler(meta) {
+        const configs = await this.getServicesConfigs("*", meta, false);
+        if (configs.length == 0) {
+          return null;
         }
+        let mconfig: any = {};
+        _.map(
+          _.groupBy(configs, "metadataApiName"),
+          (_configs, metadataApiName) => {
+            let config: any = {};
+            const __configs = _.map(_configs, "metadata");
+            _.sortBy(__configs, function (o) {
+              return -o.__timestamp;
+            });
+            config = _.defaultsDeep(
+              {},
+              ..._.sortBy(__configs, function (o) {
+                return o && o._id ? -1 : 1;
+              }),
+              config,
+            );
+            mconfig[metadataApiName] = config;
+          },
+        );
+        return mconfig;
+      },
     },
+    removeServiceMetadata: {
+      async handler(serviceName, apiName, meta) {
+        const metadataType = this.settings.metadataType;
+        return await this.broker.call(
+          "metadata.removeServiceMetadata",
+          {
+            serviceName,
+            metadataType,
+            metadataApiName: apiName,
+          },
+          meta,
+        );
+      },
+    },
+  },
+  /**
+   * Actions
+   */
+  actions: {
     /**
-     * Actions
+     * Say a 'Hello' action.
+     *
+     * @returns
      */
-    actions: {
-        /**
-         * Say a 'Hello' action.
-         *
-         * @returns
-         */
-        get: {
-            async handler(ctx) {
-                return await ctx.broker.call('metadata.get', {key: this.getMatadataCacherKey(ctx.params.metadataApiName)}, {meta: ctx.meta})
-            }
-        },
-        getAll: {
-            async handler(ctx) {
-                return await ctx.broker.call('metadata.filter', {key: this.getMatadataCacherKey("*")}, {meta: ctx.meta})
-            }
-        },
-        filter: {
-            async handler(ctx) {
-                let { pattern } = ctx.params;
-                return await ctx.broker.call('metadata.filter', { key: this.getMatadataCacherKey(pattern) }, { meta: ctx.meta })
-            }
-        },
-        add: {
-            async handler(ctx) {
-                let config = ctx.params.data;
-                const serviceName = ctx.meta.metadataServiceName
-                const metadataApiName = ctx.params.apiName;
-                const metadataConfig = await this.getServiceConfig(serviceName, `${metadataApiName}`, ctx.meta)
-                if(metadataConfig && metadataConfig.metadata){
-                    config = _.defaultsDeep(config, metadataConfig.metadata);
-                }
-                await ctx.broker.call('metadata.addServiceMetadata', {key: this.getMatadataCacherKey(metadataApiName), data: config}, {meta: Object.assign({}, ctx.meta, {metadataType: this.settings.metadataType, metadataApiName: metadataApiName})})
-                const newConfig = await this.refresh(metadataApiName, ctx.meta);
-                if (newConfig) {
-                    return await this.register(metadataApiName, newConfig, ctx.meta)
-                }
-            }
-        },
-        madd: {
-            async handler(ctx) {
-                // data : {k1:v1, k2:v2}
-                let data = ctx.params.data;
-                await ctx.broker.call('metadata.maddServiceMetadata', { data: data }, { meta: Object.assign({}, ctx.meta, { metadataType: this.settings.metadataType }) })
-                const newmConfig = await this.mrefresh(ctx.meta);
-                if (newmConfig) {
-                    return await this.mregister(newmConfig, ctx.meta)
-                }
-            }
-        },
-        delete: {
-            async handler(ctx) {
-                const metadataApiName = ctx.params.apiName;
-                const serviceName = ctx.meta.metadataServiceName
-                await this.removeServiceMetadata(serviceName, metadataApiName, { meta: Object.assign({}, ctx.meta, { metadataType: this.settings.metadataType, metadataApiName: metadataApiName }) });
-                const config = await this.refresh(metadataApiName, ctx.meta);
-                if (!config) {
-                    await ctx.broker.call('metadata.delete', { key: this.getMatadataCacherKey(metadataApiName) })
-                } else {
-                    await this.register(metadataApiName, config, ctx.meta);
-                }
-            }
-        },
-        verify: {
-            async handler(ctx) {
-                return true;
-            }
+    get: {
+      async handler(ctx) {
+        return await ctx.broker.call(
+          "metadata.get",
+          { key: this.getMatadataCacherKey(ctx.params.metadataApiName) },
+          { meta: ctx.meta },
+        );
+      },
+    },
+    getAll: {
+      async handler(ctx) {
+        return await ctx.broker.call(
+          "metadata.filter",
+          { key: this.getMatadataCacherKey("*") },
+          { meta: ctx.meta },
+        );
+      },
+    },
+    filter: {
+      async handler(ctx) {
+        let { pattern } = ctx.params;
+        return await ctx.broker.call(
+          "metadata.filter",
+          { key: this.getMatadataCacherKey(pattern) },
+          { meta: ctx.meta },
+        );
+      },
+    },
+    add: {
+      async handler(ctx) {
+        let config = ctx.params.data;
+        const serviceName = ctx.meta.metadataServiceName;
+        const metadataApiName = ctx.params.apiName;
+        const metadataConfig = await this.getServiceConfig(
+          serviceName,
+          `${metadataApiName}`,
+          ctx.meta,
+        );
+        if (metadataConfig && metadataConfig.metadata) {
+          config = _.defaultsDeep(config, metadataConfig.metadata);
+        }
+        await ctx.broker.call(
+          "metadata.addServiceMetadata",
+          { key: this.getMatadataCacherKey(metadataApiName), data: config },
+          {
+            meta: Object.assign({}, ctx.meta, {
+              metadataType: this.settings.metadataType,
+              metadataApiName: metadataApiName,
+            }),
+          },
+        );
+        const newConfig = await this.refresh(metadataApiName, ctx.meta);
+        if (newConfig) {
+          return await this.register(metadataApiName, newConfig, ctx.meta);
         }
+      },
     },
-    merged(schema) {
-        if(!schema.events){
-            schema.events = {}
+    madd: {
+      async handler(ctx) {
+        // data : {k1:v1, k2:v2}
+        let data = ctx.params.data;
+        await ctx.broker.call(
+          "metadata.maddServiceMetadata",
+          { data: data },
+          {
+            meta: Object.assign({}, ctx.meta, {
+              metadataType: this.settings.metadataType,
+            }),
+          },
+        );
+        const newmConfig = await this.mrefresh(ctx.meta);
+        if (newmConfig) {
+          return await this.mregister(newmConfig, ctx.meta);
         }
-        schema.events[`$METADATA.${schema.settings.metadataType}.*`] = {
-            handler: async (ctx) =>{
-                const { isClear, metadataApiNames } = ctx.params
-                if(isClear){
-                    for await (const metadataApiName of metadataApiNames) {
-                        const config = await this.refresh(metadataApiName, ctx.meta);
-                        if(!config){
-                            await ctx.broker.call('metadata.delete', {key: this.getMatadataCacherKey(metadataApiName)})
-                        }else{
-                            await this.register(ctx, metadataApiName, config, {});
-                        }
-                    }
-                }
-            }
-        };
+      },
+    },
+    delete: {
+      async handler(ctx) {
+        const metadataApiName = ctx.params.apiName;
+        const serviceName = ctx.meta.metadataServiceName;
+        await this.removeServiceMetadata(serviceName, metadataApiName, {
+          meta: Object.assign({}, ctx.meta, {
+            metadataType: this.settings.metadataType,
+            metadataApiName: metadataApiName,
+          }),
+        });
+        const config = await this.refresh(metadataApiName, ctx.meta);
+        if (!config) {
+          await ctx.broker.call("metadata.delete", {
+            key: this.getMatadataCacherKey(metadataApiName),
+          });
+        } else {
+          await this.register(metadataApiName, config, ctx.meta);
+        }
+      },
+    },
+    verify: {
+      async handler(ctx) {
+        return true;
+      },
+    },
+  },
+  merged(schema) {
+    if (!schema.events) {
+      schema.events = {};
     }
+    schema.events[`$METADATA.${schema.settings.metadataType}.*`] = {
+      handler: async (ctx) => {
+        const { isClear, metadataApiNames } = ctx.params;
+        if (isClear) {
+          for await (const metadataApiName of metadataApiNames) {
+            const config = await this.refresh(metadataApiName, ctx.meta);
+            if (!config) {
+              await ctx.broker.call("metadata.delete", {
+                key: this.getMatadataCacherKey(metadataApiName),
+              });
+            } else {
+              await this.register(metadataApiName, config, {});
+            }
+          }
+        }
+      },
+    };
+  },
 };

package/src/permissionFieldsService.ts

@@ -1,110 +1,160 @@
-import * as _ from 'lodash';
-const metadataService = require('./metadataService');
-const SERVICE_NAME = 'permission_fields';
-const METADATA_TYPE = 'permission_fields';
+import * as _ from "lodash";
+const metadataService = require("./metadataService");
+const SERVICE_NAME = "permission_fields";
+const METADATA_TYPE = "permission_fields";
 const objectql = require("@steedos/objectql");
 
-const systemFields = ['owner', 'created', 'created_by', 'modified', 'modified_by', 'locked', 'company_id', 'company_ids', 'instance_state'];
+const systemFields = [
+  "owner",
+  "created",
+  "created_by",
+  "modified",
+  "modified_by",
+  "locked",
+  "company_id",
+  "company_ids",
+  "instance_state",
+];
 
 async function getFieldPermission(apiName) {
-    const schema = objectql.getSteedosSchema();
-    const config = await objectql.registerPermissionFields.get(schema.broker, apiName)
-    return config ? config.metadata : null;
+  const schema = objectql.getSteedosSchema();
+  const config = await objectql.registerPermissionFields.get(
+    schema.broker,
+    apiName,
+  );
+  return config ? config.metadata : null;
 }
 
 const getFieldDefaultEditable = (field) => {
-    if (_.includes(systemFields, field.name) && (field.omit || field.hidden || field.readonly || field.disabled)) {
-        return false;
-    }
-    if (field.omit || field.hidden || field.readonly || field.disabled) {
-        return false;
-    }
-    return true;
-}
+  if (
+    _.includes(systemFields, field.name) &&
+    (field.omit || field.hidden || field.readonly || field.disabled)
+  ) {
+    return false;
+  }
+  if (field.omit || field.hidden || field.readonly || field.disabled) {
+    return false;
+  }
+  return true;
+};
 
 const getFieldDefaultReadable = (field) => {
-    if (_.includes(systemFields, field.name) && !field.hidden) {
-        return true;
-    }
-    if (field.hidden) {
-        return false
-    }
+  if (_.includes(systemFields, field.name) && !field.hidden) {
     return true;
-}
+  }
+  if (field.hidden) {
+    return false;
+  }
+  return true;
+};
 
 module.exports = {
-    name: SERVICE_NAME,
-    mixins: [metadataService],
-    settings: {
-        metadataType: METADATA_TYPE
-    },
-    methods: {
-        resetFieldPermissions: {
-            async handler(permissionObjectId: string, userSession: any) {
-                const record = await objectql.getObject('permission_objects').findOne(permissionObjectId)
-                if(!record){
-                    return ;
-                }
-                const permissionSet = await objectql.getObject('permission_set').findOne(record.permission_set_id)
-                //获取对象所有字段
-                const fields = await objectql.getObject('object_fields').find({ filters: [['object', '=', record.object_name]] });
-                const now = new Date();
-                for (const field of fields) {
-                    const result = await objectql.getObject('permission_fields').directFind({ filters: [['permission_set_id', '=', permissionSet.name], ['permission_object', '=', record.name], ['object_name', '=', record.object_name], ['field', '=', field.name], ['is_system', '!=', true]] });
-                    const count = result.length;
-                    if (count == 0) {
-                        const apiName = `${permissionSet.name}.${record.object_name}.${field.name}`
-                        const fieldPermission = await getFieldPermission(apiName)
-                        await objectql.getObject('permission_fields').directInsert({
-                            name: apiName,
-                            permission_set_id: permissionSet.name,
-                            permission_object: record.name,
-                            object_name: record.object_name,
-                            field: field.name,
-                            editable: fieldPermission ? fieldPermission.editable : getFieldDefaultEditable(field),
-                            readable: fieldPermission ? fieldPermission.readable : getFieldDefaultReadable(field),
-                            owner: userSession.userId,
-                            space: userSession.spaceId,
-                            created: now,
-                            modified: now,
-                            created_by: userSession.userId,
-                            modified_by: userSession.userId,
-                            company_id: userSession.company_id,
-                            company_ids: userSession.company_ids
-                        })
-                    }
-                }
-                //删除已删除、卸载的字段权限
-                const fieldsPermission = await objectql.getObject('permission_fields').find({ filters: [['permission_set_id', '=', permissionSet.name], ['object_name', '=', record.object_name]] });
-                const allFields = _.map(fieldsPermission, 'field');
-                const objectFields = _.map(fields, 'name');
-                const diffFields = _.difference(allFields, objectFields);
-                for (const diffField of diffFields) {
-                    const fieldPermission = _.find(fieldsPermission, (fp) => {
-                        return fp.field == diffField
-                    })
-                    await objectql.getObject('permission_fields').delete(fieldPermission._id)
-                }
-            }
+  name: SERVICE_NAME,
+  mixins: [metadataService],
+  settings: {
+    metadataType: METADATA_TYPE,
+  },
+  methods: {
+    resetFieldPermissions: {
+      async handler(permissionObjectId: string, userSession: any) {
+        const record = await objectql
+          .getObject("permission_objects")
+          .findOne(permissionObjectId);
+        if (!record) {
+          return;
         }
+        const permissionSet = await objectql
+          .getObject("permission_set")
+          .findOne(record.permission_set_id);
+        //获取对象所有字段
+        const fields = await objectql
+          .getObject("object_fields")
+          .find({ filters: [["object", "=", record.object_name]] });
+        const now = new Date();
+        for (const field of fields) {
+          const result = await objectql
+            .getObject("permission_fields")
+            .directFind({
+              filters: [
+                ["permission_set_id", "=", permissionSet.name],
+                ["permission_object", "=", record.name],
+                ["object_name", "=", record.object_name],
+                ["field", "=", field.name],
+                ["is_system", "!=", true],
+              ],
+            });
+          const count = result.length;
+          if (count == 0) {
+            const apiName = `${permissionSet.name}.${record.object_name}.${field.name}`;
+            const fieldPermission = await getFieldPermission(apiName);
+            await objectql.getObject("permission_fields").directInsert({
+              name: apiName,
+              permission_set_id: permissionSet.name,
+              permission_object: record.name,
+              object_name: record.object_name,
+              field: field.name,
+              editable: fieldPermission
+                ? fieldPermission.editable
+                : getFieldDefaultEditable(field),
+              readable: fieldPermission
+                ? fieldPermission.readable
+                : getFieldDefaultReadable(field),
+              owner: userSession.userId,
+              space: userSession.spaceId,
+              created: now,
+              modified: now,
+              created_by: userSession.userId,
+              modified_by: userSession.userId,
+              company_id: userSession.company_id,
+              company_ids: userSession.company_ids,
+            });
+          }
+        }
+        //删除已删除、卸载的字段权限
+        const fieldsPermission = await objectql
+          .getObject("permission_fields")
+          .find({
+            filters: [
+              ["permission_set_id", "=", permissionSet.name],
+              ["object_name", "=", record.object_name],
+            ],
+          });
+        const allFields = _.map(fieldsPermission, "field");
+        const objectFields = _.map(fields, "name");
+        const diffFields = _.difference(allFields, objectFields);
+        for (const diffField of diffFields) {
+          const fieldPermission = _.find(fieldsPermission, (fp) => {
+            return fp.field == diffField;
+          });
+          await objectql
+            .getObject("permission_fields")
+            .delete(fieldPermission._id);
+        }
+      },
     },
-    actions: {
-        resetFieldPermissions: {
-            async handler(ctx) {
-                const userSession = ctx.meta.user;
-                const { permissionObjectId } = ctx.params;
-                return await this.resetFieldPermissions(permissionObjectId, userSession)
-            }
-        },
-        resetAllPermissionSetFieldPermissions: {
-            async handler(ctx) {
-                const userSession = ctx.meta.user;
-                const { objectName } = ctx.params;
-                const records = await objectql.getObject('permission_objects').directFind({ filters: [['object_name', '=', objectName]] })
-                for (const record of records) {
-                    await this.resetFieldPermissions(record._id, userSession)
-                }
-            }
+  },
+  actions: {
+    resetFieldPermissions: {
+      async handler(ctx) {
+        const userSession = ctx.meta.user;
+        const { permissionObjectId } = ctx.params;
+        return await this.resetFieldPermissions(
+          permissionObjectId,
+          userSession,
+        );
+      },
+    },
+    resetAllPermissionSetFieldPermissions: {
+      async handler(ctx) {
+        const userSession = ctx.meta.user;
+        const { objectName } = ctx.params;
+        const records = await objectql
+          .getObject("permission_objects")
+          .directFind({ filters: [["object_name", "=", objectName]] });
+        for (const record of records) {
+          await this.resetFieldPermissions(record._id, userSession);
         }
-    }
-};
+      },
+    },
+  },
+};