identity-admin 1.4.0 → 1.4.2

package/lib/Dashboard.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/controllers/ActionController.js

@@ -73,6 +73,7 @@ __decorate([
     __param(1, (0, inversify_express_utils_1.response)())
 ], ActionController.prototype, "execute", null);
 ActionController = __decorate([
-    (0, inversify_1.injectable)()
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.unmanaged)())
 ], ActionController);
 exports.default = ActionController;

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), repository);
+            record = yield ResourceHelper_1.default.addExtraFields(modifiedResource.showProperties, modifiedResource.properties.model, record, StringUtils_1.default.lowerCaseFirstLetter(modifiedResource.properties.modelName));
             return ResponseUtils_1.default.ok(res, {
                 record: record ? record : null,
                 // options: modifiedResource

package/lib/controllers/ResourceController.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -94,6 +98,7 @@ __decorate([
     __param(1, (0, inversify_express_utils_1.response)())
 ], ResourceController.prototype, "getOne", null);
 ResourceController = __decorate([
-    (0, inversify_1.injectable)()
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.unmanaged)())
 ], ResourceController);
 exports.default = ResourceController;

package/lib/helpers/ResourceHelper.d.ts

@@ -1,5 +1,4 @@
 import { IResourceFile } from "../types/IResourceFile";
-import { IDashboardRepository } from "../repositories/Repository";
 export default class ResourcesHelper {
     static getSchemaTitle(schema: any, resource: any): any;
     static prepareProperties(properties: string[], modelName: string, model: any, resource: IResourceFile): {}[];
@@ -11,7 +10,7 @@ export default class ResourcesHelper {
         scopes: {};
         searchBar: {};
     };
-    static addExtraFields(showProperties: any, model: any, record: any, filterBy: string, repo: IDashboardRepository): Promise<any>;
+    static addExtraFields(showProperties: any, model: any, record: any, filterBy: string): 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

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("../types/helpers");
 const StringUtils_1 = __importDefault(require("../utils/StringUtils"));
 const i18n_1 = require("i18n");
+const Repository_1 = __importDefault(require("../repositories/Repository"));
 var pluralize = require('pluralize');
 class ResourcesHelper {
     static getSchemaTitle(schema, resource) {
@@ -122,7 +123,7 @@ class ResourcesHelper {
         }
         return filterObject;
     }
-    static addExtraFields(showProperties, model, record, filterBy, repo) {
+    static addExtraFields(showProperties, model, record, filterBy) {
         return __awaiter(this, void 0, void 0, function* () {
             for (var i = 0; i < showProperties.length; i++) {
                 // if (!model.hasOwnProperty(showProperties[i].key)) {
@@ -138,8 +139,8 @@ 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 modelName = pluralize.singular(showProperties[i].key);
-                    const repository = repo;
+                    const resourceModel = model[key].resource;
+                    const repository = new Repository_1.default(resourceModel);
                     filterBy = filterBy + "Id";
                     const filterQuery = {};
                     filterQuery[filterBy] = record._id;

package/lib/router/index.d.ts

@@ -3,6 +3,6 @@ import DashboardController from "../controllers/DashboardController";
 import ResourceController from "../controllers/ResourceController";
 import { AuthenticateMiddleWare } from "../types/DashbordConfig";
 import ActionController from "../controllers/ActionController";
-declare const createRouter: (dashboardController: DashboardController, resourceController: ResourceController, ActionController: ActionController, authenticate?: AuthenticateMiddleWare | undefined) => Router;
+declare const createRouter: (dashboardController: DashboardController, resourceController: ResourceController, ActionController: ActionController, authenticate?: AuthenticateMiddleWare) => Router;
 export declare const createViewRoute: (router: Router, appPath: string) => void;
 export default createRouter;

package/lib/router/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/types/IResourceFile.d.ts

@@ -52,6 +52,7 @@ interface IVirtualValue {
     arrayType?: string;
     showIn: Virtuals;
     required: boolean;
+    resource?: Model<any, any>;
 }
 interface IModel {
     virtuals?: {

package/package.json

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