identity-admin 1.4.3 → 1.4.4

package/lib/controllers/DashboardController.js

@@ -266,7 +266,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             }
             record = record.toObject();
             //record = await this.getExtras(record._id.toString(), record, this.getExtraRepository())
-            record = yield ResourceHelper_1.default.addExtraFields(modifiedResource.showProperties, modifiedResource.properties.model, record, StringUtils_1.default.lowerCaseFirstLetter(modifiedResource.properties.modelName));
+            record = yield ResourceHelper_1.default.addExtraFields(modifiedResource.showProperties, modifiedResource.properties.model, record, StringUtils_1.default.lowerCaseFirstLetter(modifiedResource.properties.modelName), resource);
             return ResponseUtils_1.default.ok(res, {
                 record: record ? record : null,
                 // options: modifiedResource

package/lib/helpers/ResourceHelper.d.ts

@@ -10,7 +10,7 @@ export default class ResourcesHelper {
         scopes: {};
         searchBar: {};
     };
-    static addExtraFields(showProperties: any, model: any, record: any, filterBy: string): Promise<any>;
+    static addExtraFields(showProperties: any, model: any, record: any, filterBy: string, resource: IResourceFile): Promise<any>;
     static getTitle(schema: any): "title" | "name" | "_id" | "email";
     static exchangeFirstFieldWithTitle(arrayOfFields: any, title: string): any;
     static addVirtualFields(arrayOfFields: string[], model: any): any[];

package/lib/helpers/ResourceHelper.js

@@ -123,7 +123,7 @@ class ResourcesHelper {
         }
         return filterObject;
     }
-    static addExtraFields(showProperties, model, record, filterBy) {
+    static addExtraFields(showProperties, model, record, filterBy, resource) {
         return __awaiter(this, void 0, void 0, function* () {
             for (var i = 0; i < showProperties.length; i++) {
                 // if (!model.hasOwnProperty(showProperties[i].key)) {
@@ -139,8 +139,19 @@ class ResourcesHelper {
                 // }
                 const key = showProperties[i].key;
                 if ((model[key].type === 'ref' && model.virtuals && model.virtuals[key]) || (model[key].type === 'Array' && model.virtuals && model.virtuals[key] && model[key].arrayType === 'ref')) {
-                    const resourceModel = model.virtuals[key].resource;
-                    const repository = new Repository_1.default(resourceModel);
+                    const resourceModel = resource.properties.model;
+                    if (!resourceModel) {
+                        return;
+                    }
+                    const virtuals = resourceModel.virtuals;
+                    if (!virtuals) {
+                        return;
+                    }
+                    const virtualModel = virtuals[key].resource;
+                    if (!virtualModel) {
+                        return;
+                    }
+                    const repository = new Repository_1.default(virtualModel);
                     filterBy = filterBy + "Id";
                     const filterQuery = {};
                     filterQuery[filterBy] = record._id;

package/lib/types/IResourceFile.d.ts

@@ -47,7 +47,7 @@ interface IFieldValue {
     isEditable?: boolean;
     type?: string;
 }
-interface IVirtualValue {
+export interface IVirtualValue {
     type: VirtualFieldTypes;
     arrayType?: string;
     showIn: Virtuals;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "identity-admin",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "",
   "main": "lib/Dashboard.js",
   "types": "lib/Dashbord.d.ts",