identity-admin 1.26.22 → 1.27.0

package/lib/controllers/DashboardController.js

@@ -124,7 +124,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
                 return (_b = this.modelConfigurations) === null || _b === void 0 ? void 0 : _b.get(modelName);
             }
             const collection = mongoose_1.default.connection.db.collection('modelconfigurations');
-            return yield collection.findOne({ modelName: modelName });
+            return (yield collection.findOne({ modelName: modelName }));
         });
     }
     index(req, res) {
@@ -396,6 +396,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             const scope = req.query.scope;
             const currentUser = req.user;
             const modelName = req.params.resource;
+            const language = req.headers.language ? req.headers.language : 'en';
             const filtersQuery = req.query.filters;
             const filters = filtersQuery ? filtersQuery.split('^^') : undefined;
             const resource = (_a = this.resource) !== null && _a !== void 0 ? _a : (0, ResourceUtils_1.getResource)(modelName, (_b = this.resources) !== null && _b !== void 0 ? _b : []);
@@ -460,7 +461,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             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);
+                const buffer = ReportsGenerator_1.default.CreateXlsxFile(fields, documents, modelName, language);
                 res.writeHead(200, {
                     'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
                     'Content-disposition': 'attachment;filename=' + `${modelName}.xlsx`,
@@ -469,7 +470,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
                 res.end(buffer);
             }
             if (fileType === 'pdf') {
-                const buffer = yield ReportsGenerator_1.default.CreatePdfFile(fields, documents, modelName);
+                const buffer = yield ReportsGenerator_1.default.CreatePdfFile(fields, documents, modelName, language);
                 res.writeHead(200, {
                     'Content-Type': 'application/pdf',
                     'Content-disposition': 'attachment;filename=' + `${modelName}.pdf`,
@@ -692,7 +693,7 @@ __decorate([
     __param(1, (0, inversify_express_utils_1.response)())
 ], DashboardController.prototype, "validateRequest", null);
 __decorate([
-    (0, inversify_express_utils_1.httpGet)("/"),
+    (0, inversify_express_utils_1.httpGet)('/'),
     __param(0, (0, inversify_express_utils_1.request)()),
     __param(1, (0, inversify_express_utils_1.response)())
 ], DashboardController.prototype, "index", null);

package/lib/helpers/FiltersHelper.js

@@ -64,7 +64,6 @@ class FilterHelper {
                         filterQuery[key] = new RegExp(value, 'i');
                         break;
                     case helpers_1.FieldTypes.LOCALIZEDSTRING:
-                    case helpers_1.FieldTypes.LOCALIZED_TEXT_AREA:
                         filterQuery.$or = [
                             LocalizedStringHelper_1.default.getFilterObject(key, "0", new RegExp(value, 'i')),
                             LocalizedStringHelper_1.default.getFilterObject(key, "1", new RegExp(value, 'i')),

package/lib/helpers/LocalizedStringHelper.d.ts

@@ -1,4 +1,5 @@
 import { IResourceFile } from '../types/IResourceFile';
+import { Languages } from './ReportsGenerator';
 export default class LocalizedStringHelper {
     static mapLocalizableString(recordParams: any, resource: IResourceFile): any;
     private static getArrayOfLanguages;
@@ -6,4 +7,5 @@ export default class LocalizedStringHelper {
     static getFilterObject(searchBy: string, index: string, value: any): {
         [key: string]: any;
     };
+    static getLocalizedValue(document: any, field: string, language?: Languages): any;
 }

package/lib/helpers/LocalizedStringHelper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("../types/helpers");
+const ReportsGenerator_1 = require("./ReportsGenerator");
 class LocalizedStringHelper {
     static mapLocalizableString(recordParams, resource) {
         const modelObject = resource.properties.model;
@@ -12,15 +13,10 @@ class LocalizedStringHelper {
                 continue;
             }
             const castedModelObject = modelObject;
-            if (castedModelObject[key].type &&
-                (castedModelObject[key].type === helpers_1.FieldTypes.LOCALIZEDSTRING || castedModelObject[key].type === helpers_1.FieldTypes.LOCALIZED_TEXT_AREA) &&
-                recordParams[key]) {
+            if (castedModelObject[key].type && castedModelObject[key].type === helpers_1.FieldTypes.LOCALIZEDSTRING && recordParams[key]) {
                 recordParams[key] = this.getArrayOfLanguages(recordParams[key]);
             }
-            else if (castedModelObject[key].arrayType &&
-                (castedModelObject[key].arrayType === helpers_1.FieldTypes.LOCALIZEDSTRING || castedModelObject[key].arrayType === helpers_1.FieldTypes.LOCALIZED_TEXT_AREA) &&
-                recordParams[key] &&
-                recordParams[key].length !== 0) {
+            else if (castedModelObject[key].arrayType && castedModelObject[key].arrayType === helpers_1.FieldTypes.LOCALIZEDSTRING && recordParams[key] && recordParams[key].length !== 0) {
                 for (var j = 0; j < recordParams[key].length; j++) {
                     recordParams[key][j] = this.getArrayOfLanguages(recordParams[key][j]);
                 }
@@ -48,8 +44,7 @@ class LocalizedStringHelper {
             return false;
         }
         const castedModelObject = modelObject;
-        if (castedModelObject[fieldName].type &&
-            (castedModelObject[fieldName].type === helpers_1.FieldTypes.LOCALIZEDSTRING || castedModelObject[fieldName].type === helpers_1.FieldTypes.LOCALIZED_TEXT_AREA)) {
+        if (castedModelObject[fieldName].type && castedModelObject[fieldName].type === helpers_1.FieldTypes.LOCALIZEDSTRING) {
             return true;
         }
         return false;
@@ -59,5 +54,21 @@ class LocalizedStringHelper {
         filterObject[`${searchBy}.${index}.value`] = value;
         return filterObject;
     }
+    static getLocalizedValue(document, field, language) {
+        if (!language) {
+            language = ReportsGenerator_1.Languages.ENGLISH;
+        }
+        if (!document[field] || document[field].length === 0) {
+            return '';
+        }
+        switch (language) {
+            case ReportsGenerator_1.Languages.ENGLISH:
+                return document[field][0].value;
+            case ReportsGenerator_1.Languages.ARABIC:
+                return document[field].length >= 2 && document[field][1].value ? document[field][1].value : document[field][0].value;
+            default:
+                return document[field][0].value;
+        }
+    }
 }
 exports.default = LocalizedStringHelper;

package/lib/helpers/ReportsGenerator.d.ts

@@ -14,9 +14,9 @@ export interface ILanguage {
     value?: string;
 }
 export default class ReportsGenerator {
-    static CreateXlsxFile(columns: Columns[], data: any[], name: string): Buffer;
-    static CreatePdfFile(columns: Columns[], data: any[], name: string): Promise<Buffer>;
-    static getRows(columns: Columns[], data: any[]): any[][];
-    static getFieldValue(field: Columns, row: any): any;
+    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 checkLocalizedStringExistence(columns: Columns[]): boolean;
 }

package/lib/helpers/ReportsGenerator.js

@@ -41,15 +41,16 @@ const lodash_1 = require("lodash");
 const helpers_1 = require("../types/helpers");
 const pdfjs_1 = __importDefault(require("pdfjs"));
 const fs = __importStar(require("fs"));
+const LocalizedStringHelper_1 = __importDefault(require("./LocalizedStringHelper"));
 var Languages;
 (function (Languages) {
     Languages["ARABIC"] = "ar";
     Languages["ENGLISH"] = "en";
 })(Languages = exports.Languages || (exports.Languages = {}));
 class ReportsGenerator {
-    static CreateXlsxFile(columns, data, name) {
+    static CreateXlsxFile(columns, data, name, language) {
         const header = columns.map((field) => field.label);
-        const rows = this.getRows(columns, data);
+        const rows = this.getRows(columns, data, language);
         const sheets = [
             {
                 name,
@@ -60,9 +61,9 @@ class ReportsGenerator {
         const buffer = node_xlsx_1.default.build(sheets);
         return buffer;
     }
-    static CreatePdfFile(columns, data, name) {
+    static CreatePdfFile(columns, data, name, language) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rows = this.getRows(columns, data);
+            const rows = this.getRows(columns, data, language);
             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({
@@ -85,29 +86,23 @@ class ReportsGenerator {
             return yield doc.asBuffer();
         });
     }
-    static getRows(columns, data) {
-        const rows = data.map((row) => columns.map((field) => this.getFieldValue(field, row)));
+    static getRows(columns, data, language) {
+        const rows = data.map((row) => columns.map((field) => this.getFieldValue(field, row, language)));
         return rows;
     }
-    static getFieldValue(field, row) {
+    static getFieldValue(field, row, language) {
         var _a, _b;
         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:
-            case helpers_1.FieldTypes.LOCALIZED_TEXT_AREA:
-                const items = (0, lodash_1.get)(row, field.value);
-                var formattedString = ``;
-                items.forEach((item) => {
-                    formattedString += `${item.key} --> ${item.value}\n`;
-                });
-                return formattedString;
+                return LocalizedStringHelper_1.default.getLocalizedValue(row, field.value, language);
             default:
                 return (0, lodash_1.get)(row, field.value);
         }
     }
     static checkLocalizedStringExistence(columns) {
-        return columns.some((column) => column.type === helpers_1.FieldTypes.LOCALIZEDSTRING || column.type === helpers_1.FieldTypes.LOCALIZED_TEXT_AREA);
+        return columns.some((column) => column.type === helpers_1.FieldTypes.LOCALIZEDSTRING);
     }
 }
 exports.default = ReportsGenerator;

package/lib/types/IResourceFile.d.ts

@@ -361,6 +361,11 @@ export interface IFieldValue {
      * @default false
      */
     enableCreateNewButtonOnReference?: boolean;
+    /**
+     * Used only with text field types like Text field or Localized string
+     * @default false
+     */
+    textArea?: boolean;
 }
 export interface IVirtualValue {
     /**

package/lib/types/helpers.d.ts

@@ -36,9 +36,7 @@ export declare enum FieldTypes {
     RICH_TEXT_I = "RICH_TEXT_I",
     RICH_TEXT_II = "RICH_TEXT_II",
     EXTERNAL_LINK = "EXTERNAL_LINK",
-    MULTIPLE_TEXT = "MULTIPLE_TEXT",
-    TEXT_AREA = "TEXT_AREA",
-    LOCALIZED_TEXT_AREA = "LOCALIZED_TEXT_AREA"
+    MULTIPLE_TEXT = "MULTIPLE_TEXT"
 }
 export declare enum FileTypes {
     ALL = "ALL",

package/lib/types/helpers.js

@@ -44,8 +44,6 @@ var FieldTypes;
     FieldTypes["RICH_TEXT_II"] = "RICH_TEXT_II";
     FieldTypes["EXTERNAL_LINK"] = "EXTERNAL_LINK";
     FieldTypes["MULTIPLE_TEXT"] = "MULTIPLE_TEXT";
-    FieldTypes["TEXT_AREA"] = "TEXT_AREA";
-    FieldTypes["LOCALIZED_TEXT_AREA"] = "LOCALIZED_TEXT_AREA";
 })(FieldTypes = exports.FieldTypes || (exports.FieldTypes = {}));
 var FileTypes;
 (function (FileTypes) {

package/package.json

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