identity-admin 1.26.0 → 1.26.1

package/lib/helpers/ResourceHelper.d.ts

@@ -1,5 +1,5 @@
-import { IResourceFile } from "../types/IResourceFile";
-import { IModelConfigurationDocument } from "../models/modelConfiguration/IModelConfigurations";
+import { IResourceFile } from '../types/IResourceFile';
+import { IModelConfigurationDocument } from '../models/modelConfiguration/IModelConfigurations';
 export default class ResourcesHelper {
     static getSchemaTitle(schema: any, resource: any, modelConfiguration: IModelConfigurationDocument | undefined): any;
     static prepareProperties(properties: string[], modelName: string, model: any, resource: IResourceFile): {}[];

package/lib/helpers/ResourceHelper.js

@@ -52,12 +52,12 @@ class ResourcesHelper {
     }
     static prepareProperties(properties, modelName, model, resource) {
         var preparedProperties = [];
-        properties.forEach(key => {
+        properties.forEach((key) => {
             if (model[key]) {
                 // const refCheck = model[key].type === FieldTypes.REFERENCE
                 // var path = undefined
                 // if (refCheck) {
-                //     path = model[key].path 
+                //     path = model[key].path
                 // }
                 // const translation = this.checkResourceTranslation(resource, key)
                 // const propertyObject = {
@@ -85,15 +85,21 @@ class ResourcesHelper {
         const translatedKey = rawKey ? rawKey : key;
         const propertyObject = {
             key,
-            value: translation ? translation : model.value ? model.value : StringUtils_1.default.checkRefId(translatedKey) ? StringUtils_1.default.convertCamelCaseToWord(translatedKey.slice(0, -2)) : StringUtils_1.default.convertCamelCaseToWord(translatedKey),
-            path: path
+            value: translation
+                ? translation
+                : model.value
+                    ? model.value
+                    : StringUtils_1.default.checkRefId(translatedKey)
+                        ? StringUtils_1.default.convertCamelCaseToWord(translatedKey.slice(0, -2))
+                        : StringUtils_1.default.convertCamelCaseToWord(translatedKey),
+            path: path,
         };
         return propertyObject;
     }
     static getRawName(key) {
         if (key.includes('.')) {
             const nestedProperties = key.split('.');
-            return (nestedProperties[nestedProperties.length - 1]);
+            return nestedProperties[nestedProperties.length - 1];
         }
         return undefined;
     }
@@ -115,7 +121,12 @@ class ResourcesHelper {
         var filterProperties = [];
         for (var i = 0; i < properties.length; i++) {
             const property = properties[i];
-            if (!schema[property] || !schema[property].type || schema[property].type === helpers_1.FieldTypes.ARRAY || schema[property].type === helpers_1.FieldTypes.NESTEDSCHEMA || schema[property].type === helpers_1.FieldTypes.IMAGE || schema[property].type === helpers_1.FieldTypes.PASSWORD) {
+            if (!schema[property] ||
+                !schema[property].type ||
+                schema[property].type === helpers_1.FieldTypes.ARRAY ||
+                schema[property].type === helpers_1.FieldTypes.NESTEDSCHEMA ||
+                schema[property].type === helpers_1.FieldTypes.IMAGE ||
+                schema[property].type === helpers_1.FieldTypes.PASSWORD) {
                 continue;
             }
             filterProperties.push(property);
@@ -144,12 +155,12 @@ class ResourcesHelper {
         var arrayOfOptions = [];
         arrayOfOptions.push({
             key: 'all',
-            value: (0, i18n_1.__)({ phrase: 'ALL', locale: i18n_1.default.getLocale() })
+            value: (0, i18n_1.__)({ phrase: 'ALL', locale: i18n_1.default.getLocale() }),
         });
         options.forEach((key) => {
             const optionObject = {
                 key,
-                value: (0, i18n_1.__)({ phrase: key, locale: i18n_1.default.getLocale() })
+                value: (0, i18n_1.__)({ phrase: key, locale: i18n_1.default.getLocale() }),
             };
             arrayOfOptions.push(optionObject);
         });
@@ -158,22 +169,22 @@ class ResourcesHelper {
     static getFilters(filters) {
         var filterObject = {
             scopes: {},
-            searchBar: {}
+            searchBar: {},
         };
         if (!filters || Object.keys(filters).length === 0) {
             filterObject = {
                 scopes: {
-                    isAccessible: false
+                    isAccessible: false,
                 },
                 searchBar: {
-                    isAccessible: true
-                }
+                    isAccessible: true,
+                },
             };
             return filterObject;
         }
         if (!filters.searchBar || !filters.searchBar.hasOwnProperty('isAccessible')) {
             filterObject.searchBar = {
-                isAccessible: true
+                isAccessible: true,
             };
         }
         else {
@@ -181,7 +192,7 @@ class ResourcesHelper {
         }
         if (!filters.scopes || !filters.scopes.hasOwnProperty('isAccessible')) {
             filterObject.scopes = {
-                isAccessible: false
+                isAccessible: false,
             };
         }
         else {
@@ -193,7 +204,8 @@ class ResourcesHelper {
         return __awaiter(this, void 0, void 0, function* () {
             for (var i = 0; i < showProperties.length; i++) {
                 const key = showProperties[i].key;
-                if ((model[key].type === helpers_1.FieldTypes.REFERENCE && model.virtuals && model.virtuals[key]) || (model[key].type === helpers_1.FieldTypes.ARRAY && model.virtuals && model.virtuals[key] && model[key].arrayType === helpers_1.FieldTypes.REFERENCE)) {
+                if ((model[key].type === helpers_1.FieldTypes.REFERENCE && model.virtuals && model.virtuals[key]) ||
+                    (model[key].type === helpers_1.FieldTypes.ARRAY && model.virtuals && model.virtuals[key] && model[key].arrayType === helpers_1.FieldTypes.REFERENCE)) {
                     const resourceModel = resource.properties.model;
                     if (!resourceModel) {
                         return;
@@ -207,16 +219,15 @@ class ResourcesHelper {
                         return;
                     }
                     const repository = new Repository_1.default(virtualModel);
-                    filterBy = filterBy + "Id";
+                    const oneToManyFilterKey = virtuals[key].filterBy ? virtuals[key].filterBy : filterBy + 'Id';
                     const filterQuery = {};
-                    filterQuery[filterBy] = record._id;
+                    filterQuery[oneToManyFilterKey] = record._id;
                     const extraRecords = yield repository.findMany({
-                        filter: filterQuery
+                        filter: filterQuery,
                     });
                     record[showProperties[i].key] = extraRecords;
                 }
             }
-            ;
             return record;
         });
     }
@@ -251,7 +262,7 @@ class ResourcesHelper {
         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))) {
+        if (!model || !model.virtuals || !Object.keys(model.virtuals)) {
             return [listProperties, showProperties, formProperties, filterProperties];
         }
         const virtualFields = model.virtuals;
@@ -304,7 +315,13 @@ class ResourcesHelper {
         return arrayOfFields;
     }
     static checkUnwantedFields(fieldKey, title) {
-        if (fieldKey === '__v' || fieldKey === '_id' || fieldKey === title || fieldKey === 'salt' || fieldKey === 'hash' || fieldKey === 'forgotPasswordToken' || fieldKey === 'encryptedPassword') {
+        if (fieldKey === '__v' ||
+            fieldKey === '_id' ||
+            fieldKey === title ||
+            fieldKey === 'salt' ||
+            fieldKey === 'hash' ||
+            fieldKey === 'forgotPasswordToken' ||
+            fieldKey === 'encryptedPassword') {
             return true;
         }
         return false;
@@ -315,7 +332,7 @@ class ResourcesHelper {
     }
     static removeUnWantedFieldsFromCreateOrUpdate(arrayOfFields) {
         var modifiedArrayOfFields = [];
-        arrayOfFields.forEach(field => {
+        arrayOfFields.forEach((field) => {
             if (field !== '_id' && field !== 'createdAt' && field !== 'updatedAt') {
                 modifiedArrayOfFields.push(field);
             }

package/lib/types/IResourceFile.d.ts

@@ -333,6 +333,10 @@ export interface IVirtualValue {
      * 3) array: If this field is an array
      */
     type: VirtualFieldTypes;
+    /**
+     * Specify the key that should be filtered by in case of 1 to many realtionship
+     */
+    filterBy?: string;
     /**
      * Array type exists only if the type is array
      */

package/package.json

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