identity-admin 1.15.0 → 1.16.0

package/lib/controllers/DashboardController.d.ts

@@ -27,7 +27,7 @@ export default class DashboardController {
     }, scope: string): {
         [key: string]: any;
     };
-    protected getVisibileExtrsActions(currentUser: Document, record: any, resource: IResourceFile, repository: any, modelName: string): Promise<string[] | undefined>;
+    protected getVisibileExtraActions(currentUser: Document, record: any, resource: IResourceFile, repository: any, modelName: string): Promise<string[] | undefined>;
     index(req: IRequest, res: Response): Promise<void | Response<any, Record<string, any>>>;
     create(req: IRequest, res: Response): Promise<void>;
     update(req: IRequest, res: Response): Promise<void | Response<any, Record<string, any>>>;

package/lib/controllers/DashboardController.js

@@ -81,7 +81,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
     getScopeFilter(filter, scope) {
         return {};
     }
-    getVisibileExtrsActions(currentUser, record, resource, repository, modelName) {
+    getVisibileExtraActions(currentUser, record, resource, repository, modelName) {
         return __awaiter(this, void 0, void 0, function* () {
             const data = {
                 record: record.toObject(),
@@ -159,7 +159,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             if (searchableSubString) {
                 filter = this.getSearchableSubStringFilter(resource, filter, searchableSubString);
             }
-            filter = FiltersHelper_1.default.appendFilters(filter, filters);
+            filter = yield FiltersHelper_1.default.appendFilters(filter, filters, resource);
             const crudOperations = resource.properties.crudOperations;
             if (crudOperations && crudOperations.index && crudOperations.index.before) {
                 filter = yield crudOperations.index.before(req, filter, currentUser);
@@ -186,7 +186,9 @@ let DashboardController = DashboardController_1 = class DashboardController {
             var documents = [];
             for (var i = 0; i < records.length; i++) {
                 const record = records[i];
-                const extraActionKeys = yield this.getVisibileExtrsActions(currentUser, record, resource, repository, modifiedResource.properties.modelName);
+                //let record: any = records[i]
+                //const recordFlatten = await ResourcesHelper.addExtraFields(modifiedResource.listProperties, modifiedResource.properties.model, record.toObject(), StringUtils.lowerCaseFirstLetter(modifiedResource.properties.modelName), resource)
+                const extraActionKeys = yield this.getVisibileExtraActions(currentUser, record, resource, repository, modifiedResource.properties.modelName);
                 if (extraActionKeys) {
                     const recordFlatten = record.toObject();
                     recordFlatten.extraActionKeys = extraActionKeys;

package/lib/helpers/FiltersHelper.d.ts

@@ -1,7 +1,9 @@
+import { IResourceFile } from "../types/IResourceFile";
 export default class FilterHelper {
     static appendFilters(filterQuery: {
         [key: string]: any;
-    }, filters: string[] | undefined): {
+    }, filters: string[] | undefined, resource?: IResourceFile): Promise<{
         [key: string]: any;
-    };
+    }>;
+    private static getVirtualFilter;
 }

package/lib/helpers/FiltersHelper.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,64 +17,89 @@ const helpers_1 = require("../types/helpers");
 const LocalizedStringHelper_1 = __importDefault(require("./LocalizedStringHelper"));
 var pluralize = require('pluralize');
 class FilterHelper {
-    static appendFilters(filterQuery, filters) {
-        if (!filters) {
-            return filterQuery;
-        }
-        for (var i = 0; i < filters.length; i++) {
-            const filter = filters[i];
-            if (!filter || filter === '' || !filter.includes(';;')) {
-                continue;
+    static appendFilters(filterQuery, filters, resource) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!filters) {
+                return filterQuery;
             }
-            const filterQueryString = filter.split(';;');
-            const fieldType = filterQueryString[1];
-            if (fieldType === helpers_1.FieldTypes.NUMBER || fieldType === helpers_1.FieldTypes.DATE) {
-                const rangeObject = filterQueryString[0].split(':');
-                const fieldName = rangeObject[0];
-                const fromToObject = rangeObject[1].split(',');
-                const from = fromToObject[0].split('=')[1];
-                const to = fromToObject[1].split('=')[1];
-                var filterRange = {};
-                if (from && from !== '' && from !== 'null') {
-                    filterRange.$gte = from;
+            for (var i = 0; i < filters.length; i++) {
+                const filter = filters[i];
+                if (!filter || filter === '' || !filter.includes(';;')) {
+                    continue;
                 }
-                if (to && to !== '' && to !== 'null') {
-                    filterRange.$lte = to;
+                const filterQueryString = filter.split(';;');
+                const fieldType = filterQueryString[1];
+                if (fieldType === helpers_1.FieldTypes.NUMBER || fieldType === helpers_1.FieldTypes.DATE) {
+                    const rangeObject = filterQueryString[0].split(':');
+                    const fieldName = rangeObject[0];
+                    const fromToObject = rangeObject[1].split(',');
+                    const from = fromToObject[0].split('=')[1];
+                    const to = fromToObject[1].split('=')[1];
+                    var filterRange = {};
+                    if (from && from !== '' && from !== 'null') {
+                        filterRange.$gte = from;
+                    }
+                    if (to && to !== '' && to !== 'null') {
+                        filterRange.$lte = to;
+                    }
+                    if (filterRange.$lte || filterRange.$gte) {
+                        filterQuery[fieldName] = filterRange;
+                    }
+                    continue;
                 }
-                if (filterRange.$lte || filterRange.$gte) {
-                    filterQuery[fieldName] = filterRange;
+                if (!filterQueryString[0] || !fieldType || !filterQueryString[0].includes('=')) {
+                    continue;
                 }
-                continue;
-            }
-            if (!filterQueryString[0] || !fieldType || !filterQueryString[0].includes('=')) {
-                continue;
-            }
-            const splittedQueryString = filterQueryString[0].split('=');
-            const key = splittedQueryString[0];
-            const value = splittedQueryString[1].includes('%20') ? splittedQueryString[1].replace(/%20/g, ' ') : splittedQueryString[1];
-            switch (fieldType) {
-                case helpers_1.FieldTypes.OBJECTID:
-                    if (!mongoose_1.default.isValidObjectId(value)) {
+                const splittedQueryString = filterQueryString[0].split('=');
+                const key = splittedQueryString[0];
+                const value = splittedQueryString[1].includes('%20') ? splittedQueryString[1].replace(/%20/g, ' ') : splittedQueryString[1];
+                switch (fieldType) {
+                    case helpers_1.FieldTypes.OBJECTID:
+                        if (!mongoose_1.default.isValidObjectId(value)) {
+                            break;
+                        }
+                        filterQuery[key] = value;
                         break;
-                    }
+                    case helpers_1.FieldTypes.STRING:
+                        filterQuery[key] = new RegExp(value, 'i');
+                        break;
+                    case helpers_1.FieldTypes.LOCALIZEDSTRING:
+                        filterQuery.$or = [
+                            LocalizedStringHelper_1.default.getFilterObject(key, "0", new RegExp(value, 'i')),
+                            LocalizedStringHelper_1.default.getFilterObject(key, "1", new RegExp(value, 'i')),
+                        ];
+                        break;
+                    case helpers_1.FieldTypes.REFERENCE:
+                        if (value !== 'null' && value !== 'undefined') {
+                            filterQuery = yield this.getVirtualFilter(filterQuery, key, value, resource);
+                        }
+                        break;
+                    default:
+                        if (value !== 'null' && value !== 'undefined') {
+                            filterQuery[key] = value;
+                        }
+                }
+            }
+            return filterQuery;
+        });
+    }
+    static getVirtualFilter(filterQuery, key, value, resource) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (resource && resource.properties.model) {
+                const virtuals = resource.properties.model.virtuals;
+                if (virtuals && virtuals[key] && virtuals[key].showIn === helpers_1.Virtuals.FILTER && virtuals[key].handler) {
+                    const virtual = virtuals[key];
+                    filterQuery = yield virtual.handler(filterQuery, value);
+                }
+                else {
                     filterQuery[key] = value;
-                    break;
-                case helpers_1.FieldTypes.STRING:
-                    filterQuery[key] = new RegExp(value, 'i');
-                    break;
-                case helpers_1.FieldTypes.LOCALIZEDSTRING:
-                    filterQuery.$or = [
-                        LocalizedStringHelper_1.default.getFilterObject(key, "0", new RegExp(value, 'i')),
-                        LocalizedStringHelper_1.default.getFilterObject(key, "1", new RegExp(value, 'i')),
-                    ];
-                    break;
-                default:
-                    if (value !== 'null' && value !== 'undefined') {
-                        filterQuery[key] = value;
-                    }
+                }
             }
-        }
-        return filterQuery;
+            else {
+                filterQuery[key] = value;
+            }
+            return filterQuery;
+        });
     }
 }
 exports.default = FilterHelper;

package/lib/helpers/ResourceGenerator.js

@@ -59,6 +59,7 @@ class ResourceGenerator {
         const modifiedListProperties = modifiedProperties[0];
         const modifiedShowProperties = modifiedProperties[1];
         const modifiedFormProperties = modifiedProperties[2];
+        const modifiedFilterProperties = modifiedProperties[3];
         if (!resource.properties.parent) {
             modifiedResource.properties.parent = SetupParent;
         }
@@ -76,7 +77,7 @@ class ResourceGenerator {
             modifiedResource.showProperties = modifiedShowProperties;
         }
         if (!resource.filterProperties) {
-            modifiedResource.filterProperties = recordFields;
+            modifiedResource.filterProperties = modifiedFilterProperties;
         }
         if (!resource.listProperties) {
             modifiedResource.listProperties = ResourceHelper_1.default.exchangeFirstFieldWithTitle(JSON.parse(JSON.stringify(modifiedListProperties)), title);

package/lib/helpers/ResourceHelper.js

@@ -247,8 +247,9 @@ class ResourcesHelper {
         var showProperties = JSON.parse(JSON.stringify(arrayOfFields));
         var listProperties = JSON.parse(JSON.stringify(arrayOfFields));
         var formProperties = JSON.parse(JSON.stringify(arrayOfFields));
+        var filterProperties = JSON.parse(JSON.stringify(arrayOfFields));
         if (!model || !model.virtuals || !(Object.keys(model.virtuals))) {
-            return [listProperties, showProperties, formProperties];
+            return [listProperties, showProperties, formProperties, filterProperties];
         }
         const virtualFields = model.virtuals;
         for (const extraField in virtualFields) {
@@ -263,15 +264,19 @@ class ResourcesHelper {
                     case helpers_1.Virtuals.FORM:
                         formProperties.push(extraField);
                         break;
+                    case helpers_1.Virtuals.FILTER:
+                        filterProperties.push(extraField);
+                        break;
                 }
             }
             else {
                 showProperties.push(extraField);
                 listProperties.push(extraField);
                 formProperties.push(extraField);
+                filterProperties.push(extraField);
             }
         }
-        return [listProperties, showProperties, formProperties];
+        return [listProperties, showProperties, formProperties, filterProperties];
     }
     static manageFields(schema, title, hiddenProperties) {
         var arrayOfFields = [];

package/lib/locales/en.json

@@ -48,5 +48,7 @@
 	"unprocessable": "unprocessable",
 	"Server Error": "Server Error",
 	"actions_new": "actions_new",
-	"Setup": "Setup"
+	"Setup": "Setup",
+	"Country": "Country",
+	"Country User": "Country User"
 }

package/lib/types/IResourceFile.d.ts

@@ -212,6 +212,11 @@ export interface IFieldValue {
      * @default false
      */
     withTime?: boolean;
+    /**
+    * Specify the api route that to be called for getting the referenced values
+    * @default undefined
+    */
+    apiRoute?: string;
 }
 export interface IVirtualValue {
     /**
@@ -234,8 +239,16 @@ export interface IVirtualValue {
      * Define Virtual field's resource in case of ref type or array of ref type
      */
     resource?: Model<any, any>;
+    /**
+     * Define Filter query creator required in case of showIn Filter
+     */
+    handler?: (filterQuery: {
+        [key: string]: any;
+    }, value: any | any[]) => Promise<{
+        [key: string]: any;
+    }>;
 }
-interface IModel {
+export interface IModel {
     /**
      * virtual data props
      */

package/lib/types/helpers.d.ts

@@ -1,7 +1,8 @@
 export declare enum Virtuals {
     SHOW = "SHOW",
     LIST = "LIST",
-    FORM = "FORM"
+    FORM = "FORM",
+    FILTER = "FILTER"
 }
 export declare enum ActionNames {
     SHOW = "SHOW",

package/lib/types/helpers.js

@@ -6,6 +6,7 @@ var Virtuals;
     Virtuals["SHOW"] = "SHOW";
     Virtuals["LIST"] = "LIST";
     Virtuals["FORM"] = "FORM";
+    Virtuals["FILTER"] = "FILTER";
 })(Virtuals = exports.Virtuals || (exports.Virtuals = {}));
 var ActionNames;
 (function (ActionNames) {

package/package.json

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