identity-admin 1.27.3 → 1.27.4

package/lib/controllers/DashboardController.js

@@ -41,6 +41,8 @@ const ReportsGenerator_1 = __importDefault(require("../helpers/ReportsGenerator"
 const IUserActionsLog_1 = require("../models/userActionsLog/IUserActionsLog");
 const UserActionsLog_1 = __importDefault(require("../models/userActionsLog/UserActionsLog"));
 const PermissionResource_1 = require("../helpers/Permissions/PermissionResource");
+const RecordsCounter_1 = require("../helpers/RecordsCounter");
+const FilterQueryHelper_1 = require("../helpers/FilterQueryHelper");
 let DashboardController = DashboardController_1 = class DashboardController {
     constructor(resource, repository, resources, modelConfigurations) {
         this.resource = resource;
@@ -526,6 +528,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             if (!record) {
                 return ResponseUtils_1.default.send(res, 404, 'record not found');
             }
+            const recordPageResult = yield RecordsCounter_1.RecordsCounter.count(req, resource, repository, record, this.modelConfigurations);
             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), resource);
@@ -534,7 +537,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             if (afterMethod && record) {
                 extras = yield afterMethod(req, record);
             }
-            return ResponseUtils_1.default.ok(res, Object.assign(Object.assign({}, extras), { record: record ? record : null }));
+            return ResponseUtils_1.default.ok(res, Object.assign(Object.assign({}, extras), { record: record ? record : null, numberOfRecords: recordPageResult === null || recordPageResult === void 0 ? void 0 : recordPageResult.recordsCount, recordIndex: recordPageResult === null || recordPageResult === void 0 ? void 0 : recordPageResult.recordIndex }));
         });
     }
     deleteAll(req, res) {
@@ -677,11 +680,12 @@ let DashboardController = DashboardController_1 = class DashboardController {
                 ? resource.properties.crudOperations.show.nextPreviousButtonHandler
                 : undefined;
             var neighbor;
+            const filter = yield FilterQueryHelper_1.FilterQueryHelper.getFilter(req, resource, this.modelConfigurations);
             if (neighborRecordType === helpers_1.NeighborTypes.NEXT) {
-                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(handler ? yield handler(req, nextQuery, currentUser, neighborRecordType) : nextQuery).sort(nextSortQuery).limit(1));
+                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(handler ? yield handler(req, nextQuery, currentUser, neighborRecordType) : Object.assign(Object.assign({}, nextQuery), filter)).sort(nextSortQuery).limit(1));
             }
             else {
-                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(handler ? yield handler(req, prevQuery, currentUser, neighborRecordType) : prevQuery).sort(previousSortQuery).limit(1));
+                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(handler ? yield handler(req, prevQuery, currentUser, neighborRecordType) : Object.assign(Object.assign({}, prevQuery), filter)).sort(previousSortQuery).limit(1));
             }
             const hasNeighbor = record && neighbor && neighbor._id ? true : false;
             const neighborRecordId = hasNeighbor ? neighbor._id : undefined;

package/lib/helpers/FilterQueryHelper.d.ts

@@ -0,0 +1,9 @@
+import { IRequest } from '../middlewares/isAuth';
+import { IResourceFile } from '../types/IResourceFile';
+import { IModelConfigurationDocument } from '../models/modelConfiguration/IModelConfigurations';
+export declare class FilterQueryHelper {
+    static getFilter(req: IRequest, resource: IResourceFile, modelConfigurations?: Map<string, IModelConfigurationDocument> | undefined): Promise<{
+        [key: string]: any;
+    } | undefined>;
+    private static getSearchableSubStringFilter;
+}

package/lib/helpers/FilterQueryHelper.js

@@ -0,0 +1,83 @@
+"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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterQueryHelper = void 0;
+const mongoose_1 = __importDefault(require("mongoose"));
+const FiltersHelper_1 = __importDefault(require("./FiltersHelper"));
+const LocalizedStringHelper_1 = __importDefault(require("./LocalizedStringHelper"));
+const ResourceHelper_1 = __importDefault(require("./ResourceHelper"));
+class FilterQueryHelper {
+    static getFilter(req, resource, modelConfigurations) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const searchableSubString = req.query.filter ? new RegExp(req.query.filter, 'i') : undefined;
+            const scope = req.query.scope;
+            const currentUser = req.user;
+            const filtersQuery = req.query.filters;
+            const filters = filtersQuery ? filtersQuery.split('^^') : undefined;
+            if (!resource) {
+                return;
+            }
+            if (!currentUser) {
+                return;
+            }
+            const sort = req.query.order;
+            const sortBy = req.query.orderBy;
+            const sortQuery = {};
+            sortQuery[sortBy] = sort;
+            if (sortBy !== '_id') {
+                sortQuery._id = 'asc';
+            }
+            var filter = {};
+            if (scope && resource.properties.filters && resource.properties.filters.scopes && resource.properties.filters.scopes.isAccessible) {
+                if (resource.properties.filters.scopes.manual) {
+                    filter = yield resource.properties.filters.scopes.manual.handler(filter, scope, currentUser);
+                }
+                else if (resource.properties.filters.scopes.auto) {
+                    const key = resource.properties.filters.scopes.auto.key;
+                    if (key) {
+                        filter[key] = scope;
+                    }
+                }
+            }
+            if (searchableSubString) {
+                filter = this.getSearchableSubStringFilter(resource, filter, searchableSubString, modelConfigurations);
+            }
+            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);
+            }
+            return filter;
+        });
+    }
+    static getSearchableSubStringFilter(resource, filter, subString, modelConfigurations) {
+        const schema = resource.properties.resource.schema.paths;
+        const searchBy = ResourceHelper_1.default.getSchemaTitle(schema, resource, modelConfigurations === null || modelConfigurations === void 0 ? void 0 : modelConfigurations.get(resource.properties.modelName));
+        if (searchBy === '_id') {
+            if (!mongoose_1.default.isValidObjectId(subString.source)) {
+                return filter;
+            }
+            filter[searchBy] = subString.source;
+            return filter;
+        }
+        if (LocalizedStringHelper_1.default.checkLocalizedStringType(resource, searchBy)) {
+            filter.$or = [LocalizedStringHelper_1.default.getFilterObject(searchBy, '0', subString), LocalizedStringHelper_1.default.getFilterObject(searchBy, '1', subString)];
+        }
+        else {
+            filter[searchBy] = subString;
+        }
+        return filter;
+    }
+}
+exports.FilterQueryHelper = FilterQueryHelper;

package/lib/helpers/RecordsCounter.d.ts

@@ -0,0 +1,10 @@
+import { IRequest } from '../middlewares/isAuth';
+import Repository from '../repositories/Repository';
+import { IResourceFile } from '../types/IResourceFile';
+import { IModelConfigurationDocument } from '../models/modelConfiguration/IModelConfigurations';
+export declare class RecordsCounter {
+    static count(req: IRequest, resource: IResourceFile, repository: Repository<any>, currentRecord: any, modelConfigurations?: Map<string, IModelConfigurationDocument> | undefined): Promise<{
+        recordsCount: number;
+        recordIndex: number;
+    }>;
+}

package/lib/helpers/RecordsCounter.js

@@ -0,0 +1,33 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecordsCounter = void 0;
+const FilterQueryHelper_1 = require("./FilterQueryHelper");
+class RecordsCounter {
+    static count(req, resource, repository, currentRecord, modelConfigurations) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sort = req.query.order;
+            const sortBy = req.query.orderBy;
+            const sortQuery = {};
+            sortQuery[sortBy] = sort;
+            if (sortBy !== '_id') {
+                sortQuery._id = 'asc';
+            }
+            const filter = yield FilterQueryHelper_1.FilterQueryHelper.getFilter(req, resource, modelConfigurations);
+            const comparisonQuery = { $or: [] };
+            comparisonQuery.$or.push({ [sortBy]: { [sort === 'asc' ? '$lt' : '$gt']: currentRecord[sortBy] } }, { [sortBy]: currentRecord[sortBy], _id: { $lt: currentRecord._id } });
+            const recordIndex = (yield repository.count(Object.assign(Object.assign({}, filter), comparisonQuery))) + 1;
+            const recordsCount = yield repository.count(filter);
+            return { recordsCount, recordIndex };
+        });
+    }
+}
+exports.RecordsCounter = RecordsCounter;

package/package.json

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