identity-admin 1.27.2 → 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;
@@ -451,19 +453,23 @@ let DashboardController = DashboardController_1 = class DashboardController {
                 populate: modifiedPopulatedObject,
             });
             var documents = [];
-            var documents = [];
             for (var i = 0; i < records.length; i++) {
                 const record = records[i];
                 const recordFlatten = record.toObject();
                 documents.push(recordFlatten);
             }
             if (crudOperations && crudOperations.index && crudOperations.index.after) {
-                documents = yield crudOperations.index.after(req, documents, currentUser);
+                try {
+                    documents = yield crudOperations.index.after(req, documents, currentUser);
+                }
+                catch (e) {
+                    documents = yield crudOperations.index.after(req, records, currentUser);
+                }
             }
             const fields = req.query.fields.map((v) => JSON.parse(v));
             const fileType = req.query.fileType;
             if (fileType === 'xlsx') {
-                const buffer = ReportsGenerator_1.default.CreateXlsxFile(fields, documents, modelName, language);
+                const buffer = ReportsGenerator_1.default.CreateXlsxFile(fields, documents, modelName, language, resource);
                 res.writeHead(200, {
                     'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
                     'Content-disposition': 'attachment;filename=' + `${modelName}.xlsx`,
@@ -472,7 +478,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
                 res.end(buffer);
             }
             if (fileType === 'pdf') {
-                const buffer = yield ReportsGenerator_1.default.CreatePdfFile(fields, documents, modelName, language);
+                const buffer = yield ReportsGenerator_1.default.CreatePdfFile(fields, documents, modelName, language, resource);
                 res.writeHead(200, {
                     'Content-Type': 'application/pdf',
                     'Content-disposition': 'attachment;filename=' + `${modelName}.pdf`,
@@ -522,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);
@@ -530,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) {
@@ -673,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/lib/helpers/ReportsGenerator.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { FieldTypes } from '../types/helpers';
+import { IResourceFile } from '../types/IResourceFile';
 export interface Columns {
     label: string;
     value: string;
@@ -16,10 +17,10 @@ export interface ILanguage {
     value?: string;
 }
 export default class ReportsGenerator {
-    static CreateXlsxFile(columns: Columns[], data: any[], name: string, language: Languages): Buffer;
-    static CreatePdfFile(columns: Columns[], data: any[], name: string, language: Languages): Promise<Buffer>;
-    static getRows(columns: Columns[], data: any[], language: Languages): any[][];
-    static getFieldValue(field: Columns, row: any, language: Languages): any;
+    static CreateXlsxFile(columns: Columns[], data: any[], name: string, language: Languages, resource: IResourceFile): Buffer;
+    static CreatePdfFile(columns: Columns[], data: any[], name: string, language: Languages, resource: IResourceFile): Promise<Buffer>;
+    static getRows(columns: Columns[], data: any[], language: Languages, resource: IResourceFile): any[][];
+    static getFieldValue(field: Columns, row: any, language: Languages, resource: IResourceFile): any;
     static checkLocalizedStringExistence(columns: Columns[]): boolean;
     static getReferenceValueByTitleType(rowValue: any, language: Languages, titleType?: FieldTypes): any;
 }

package/lib/helpers/ReportsGenerator.js

@@ -42,15 +42,16 @@ const helpers_1 = require("../types/helpers");
 const pdfjs_1 = __importDefault(require("pdfjs"));
 const fs = __importStar(require("fs"));
 const LocalizedStringHelper_1 = __importDefault(require("./LocalizedStringHelper"));
+const DateUtils_1 = require("../utils/DateUtils");
 var Languages;
 (function (Languages) {
     Languages["ARABIC"] = "ar";
     Languages["ENGLISH"] = "en";
 })(Languages = exports.Languages || (exports.Languages = {}));
 class ReportsGenerator {
-    static CreateXlsxFile(columns, data, name, language) {
+    static CreateXlsxFile(columns, data, name, language, resource) {
         const header = columns.map((field) => field.label);
-        const rows = this.getRows(columns, data, language);
+        const rows = this.getRows(columns, data, language, resource);
         const sheets = [
             {
                 name,
@@ -61,9 +62,9 @@ class ReportsGenerator {
         const buffer = node_xlsx_1.default.build(sheets);
         return buffer;
     }
-    static CreatePdfFile(columns, data, name, language) {
+    static CreatePdfFile(columns, data, name, language, resource) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rows = this.getRows(columns, data, language);
+            const rows = this.getRows(columns, data, language, resource);
             const ArabicFont = new pdfjs_1.default.Font(fs.readFileSync(__dirname + '/../assets/Amiri-Regular.ttf'));
             const localizedStringIsExisted = this.checkLocalizedStringExistence(columns);
             const doc = new pdfjs_1.default.Document({
@@ -75,28 +76,43 @@ class ReportsGenerator {
                 borderWidth: 1,
             });
             const header = table.header({
-                backgroundColor: 0x000,
-                color: 0xffffff,
+                backgroundColor: 0xdddddd,
+                color: 0x333333,
+                paddingBottom: 5,
+                paddingTop: 5,
             });
-            columns.map((field) => header.cell(field.label));
+            columns.map((field) => header.cell(field.label, {
+                textAlign: 'center',
+                alignment: 'center',
+            }));
             rows.forEach((row) => {
                 const tableRow = table.row();
-                row.map((cell) => tableRow.cell(`${cell !== null && cell !== void 0 ? cell : '---'}`));
+                row.map((cell) => tableRow.cell(`${cell !== null && cell !== void 0 ? cell : '---'}`, {
+                    textAlign: 'center',
+                    alignment: 'center',
+                    paddingBottom: 5,
+                    paddingTop: 5,
+                }));
             });
             return yield doc.asBuffer();
         });
     }
-    static getRows(columns, data, language) {
-        const rows = data.map((row) => columns.map((field) => this.getFieldValue(field, row, language)));
+    static getRows(columns, data, language, resource) {
+        const rows = data.map((row) => columns.map((field) => this.getFieldValue(field, row, language, resource)));
         return rows;
     }
-    static getFieldValue(field, row, language) {
+    static getFieldValue(field, row, language, resource) {
         var _a, _b, _c;
+        const schema = resource.properties.model;
+        const fieldProps = schema ? schema[field.value] : undefined;
         switch (field.type) {
             case helpers_1.FieldTypes.OBJECTID:
                 return (_b = (_a = (0, lodash_1.get)(row, field.value)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
             case helpers_1.FieldTypes.LOCALIZEDSTRING:
                 return LocalizedStringHelper_1.default.getLocalizedValue(row, field.value, language);
+            case helpers_1.FieldTypes.DATE:
+                const withTime = fieldProps && fieldProps.withTime ? true : false;
+                return DateUtils_1.DateUtils.getIsoDate((0, lodash_1.get)(row, field.value), withTime);
             case helpers_1.FieldTypes.REFERENCE:
                 const valuePath = (_c = field.titlePath) !== null && _c !== void 0 ? _c : field.value;
                 const rowValue = (0, lodash_1.get)(row, valuePath);

package/lib/utils/DateUtils.d.ts

@@ -0,0 +1,7 @@
+import { Languages } from '../helpers/ReportsGenerator';
+export declare class DateUtils {
+    static addBegginingZero(value: number): string;
+    static localizingToArabicAMPM(amOrPm: string): "صباحاً" | "مساءاً";
+    static formatAMPM(date: Date, language: Languages): string;
+    static getIsoDate(date: Date | string, withTime: boolean): string;
+}

package/lib/utils/DateUtils.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateUtils = void 0;
+const ReportsGenerator_1 = require("../helpers/ReportsGenerator");
+class DateUtils {
+    static addBegginingZero(value) {
+        return value % 10 === value ? `0${value.toString()}` : value.toString();
+    }
+    static localizingToArabicAMPM(amOrPm) {
+        switch (amOrPm) {
+            case 'am':
+                return 'صباحاً';
+            case 'pm':
+                return 'مساءاً';
+            default:
+                return 'صباحاً';
+        }
+    }
+    static formatAMPM(date, language) {
+        var hours = date.getHours();
+        var minutes = date.getMinutes();
+        var ampm = hours >= 12 ? 'pm' : 'am';
+        if (language === ReportsGenerator_1.Languages.ARABIC) {
+            ampm = this.localizingToArabicAMPM(ampm);
+        }
+        hours = hours % 12;
+        hours = hours ? hours : 12;
+        minutes = minutes < 10 ? '0' + minutes : minutes;
+        var strTime = hours + ':' + minutes + ' ' + ampm;
+        return strTime;
+    }
+    static getIsoDate(date, withTime) {
+        date = new Date(date);
+        const month = date.getMonth() + 1;
+        const day = date.getDate();
+        const mappedMonth = this.addBegginingZero(month);
+        const mappedDay = this.addBegginingZero(day);
+        var isoDate = date.getFullYear() + '-' + mappedMonth + '-' + mappedDay;
+        if (withTime) {
+            isoDate = isoDate + ' ' + this.formatAMPM(date, ReportsGenerator_1.Languages.ENGLISH);
+        }
+        return isoDate;
+    }
+}
+exports.DateUtils = DateUtils;

package/package.json

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