identity-admin 1.9.0 → 1.10.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: any, repository: any, modelName: string): Promise<any[] | undefined>;
+    protected getVisibileExtrsActions(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

@@ -102,7 +102,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
                 if (!extraAction.isVisible) {
                     break;
                 }
-                const isVisible = extraAction.isVisible(data);
+                const isVisible = yield extraAction.isVisible(data);
                 if (isVisible) {
                     extraActionsArray.push(extraAction.key);
                 }
@@ -140,7 +140,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
             var filter = {};
             if (scope && resource.properties.filters && resource.properties.filters.scopes && resource.properties.filters.scopes.isAccessible) {
                 if (resource.properties.filters.scopes.manual) {
-                    filter = resource.properties.filters.scopes.manual.handler(filter, scope);
+                    filter = yield resource.properties.filters.scopes.manual.handler(filter, scope);
                 }
                 else if (resource.properties.filters.scopes.auto) {
                     const key = resource.properties.filters.scopes.auto.key;
@@ -154,8 +154,8 @@ let DashboardController = DashboardController_1 = class DashboardController {
             }
             filter = FiltersHelper_1.default.appendFilters(filter, filters);
             const crudOperations = resource.properties.crudOperations;
-            if (crudOperations && crudOperations.index) {
-                filter = crudOperations.index.before(req, filter, currentUser);
+            if (crudOperations && crudOperations.index && crudOperations.index.before) {
+                filter = yield crudOperations.index.before(req, filter, currentUser);
             }
             var records = [];
             var pageInfo = undefined;
@@ -189,6 +189,9 @@ let DashboardController = DashboardController_1 = class DashboardController {
                     documents.push(record);
                 }
             }
+            if (crudOperations && crudOperations.index && crudOperations.index.after) {
+                documents = yield crudOperations.index.after(req, documents, currentUser);
+            }
             return ResponseUtils_1.default.send(res, 200, 'OK', {
                 records: documents,
                 pageInfo,
@@ -213,8 +216,8 @@ let DashboardController = DashboardController_1 = class DashboardController {
             const currentUser = req.user;
             recordParams = LocalizedStringHelper_1.default.mapLocalizableString(recordParams, resource);
             const crudOperations = resource.properties.crudOperations;
-            if (crudOperations && crudOperations.create) {
-                recordParams = crudOperations.create.before(req, recordParams, currentUser);
+            if (crudOperations && crudOperations.create && crudOperations.create.before) {
+                recordParams = yield crudOperations.create.before(req, recordParams, currentUser);
             }
             var record;
             if (recordParams.password) {
@@ -228,6 +231,9 @@ let DashboardController = DashboardController_1 = class DashboardController {
             if (!record.isValid() || !record.document) {
                 return ResponseUtils_1.default.unprocessable(res, 'Invalid Data', record.getErrors());
             }
+            if (crudOperations && crudOperations.create && crudOperations.create.after) {
+                record = yield crudOperations.create.after(req, record, currentUser);
+            }
             return ResponseUtils_1.default.created(res, {
                 record
             });
@@ -247,10 +253,15 @@ let DashboardController = DashboardController_1 = class DashboardController {
             const repository = (_c = this.repository) !== null && _c !== void 0 ? _c : new Repository_1.default(resource.properties.resource);
             const recordId = req.params.id;
             var recordParams = req.body;
+            const currentUser = req.user;
             var record = yield repository.findById(recordId);
             if (!record) {
                 return ResponseUtils_1.default.send(res, 404, 'record Not Found');
             }
+            const crudOperations = resource.properties.crudOperations;
+            if (crudOperations && crudOperations.update && crudOperations.update.before) {
+                recordParams = yield crudOperations.update.before(req, recordParams, currentUser);
+            }
             const recordSaveResult = yield repository.update(record, recordParams);
             if (!recordSaveResult.isValid()) {
                 return ResponseUtils_1.default.unprocessable(res, 'Invalid Data', recordSaveResult.getErrors());
@@ -258,6 +269,9 @@ let DashboardController = DashboardController_1 = class DashboardController {
             // if (resource.properties.modelName === ModelNames.Settings) {
             //     await AppSettings.run()
             // }
+            // if (crudOperations && crudOperations.update && crudOperations.update.after) {
+            //     recordSaveResult = await crudOperations.update.after(req, recordSaveResult, currentUser)
+            // }
             return ResponseUtils_1.default.ok(res, {
                 record: recordSaveResult
             });

package/lib/helpers/ResourceHelper.d.ts

@@ -2,6 +2,8 @@ import { IResourceFile } from "../types/IResourceFile";
 export default class ResourcesHelper {
     static getSchemaTitle(schema: any, resource: any): any;
     static prepareProperties(properties: string[], modelName: string, model: any, resource: IResourceFile): {}[];
+    private static getPropertyObject;
+    private static getRawName;
     static getFieldType(schemaField: any): any;
     static prepareFilterProperties(properties: string[], schema: any): string[];
     static checkResourceTranslation(resource: IResourceFile, key: string): string | undefined;
@@ -20,4 +22,6 @@ export default class ResourcesHelper {
     static getModelPath(modelName: string): any;
     static removeUnWantedFieldsFromCreateOrUpdate(arrayOfFields: string[]): string[];
     static checkCreateBeforeHandler(resource: any): boolean;
+    private static checkNestedField;
+    private static getSchemaOfNestedProperty;
 }

package/lib/helpers/ResourceHelper.js

@@ -51,22 +51,49 @@ class ResourcesHelper {
         var preparedProperties = [];
         properties.forEach(key => {
             if (model[key]) {
-                const refCheck = model[key].type === helpers_1.FieldTypes.REFERENCE;
-                var path = undefined;
-                if (refCheck) {
-                    path = model[key].path;
-                }
-                const translation = this.checkResourceTranslation(resource, key);
-                const propertyObject = {
-                    key,
-                    value: translation ? translation : StringUtils_1.default.checkRefId(key) ? StringUtils_1.default.convertCamelCaseToWord(key.slice(0, -2)) : StringUtils_1.default.convertCamelCaseToWord(key),
-                    path: path
-                };
-                preparedProperties.push(propertyObject);
+                // const refCheck = model[key].type === FieldTypes.REFERENCE
+                // var path = undefined
+                // if (refCheck) {
+                //     path = model[key].path 
+                // }
+                // const translation = this.checkResourceTranslation(resource, key)
+                // const propertyObject = {
+                //     key,
+                //     value: translation? translation: StringUtils.checkRefId(key)? StringUtils.convertCamelCaseToWord(key.slice(0, -2)): StringUtils.convertCamelCaseToWord(key),
+                //     path: path
+                // }
+                preparedProperties.push(this.getPropertyObject(key, model[key], resource));
+            }
+            else if (key.includes('.') && this.checkNestedField(key, model)) {
+                const nestedModel = this.getSchemaOfNestedProperty(key, model);
+                preparedProperties.push(this.getPropertyObject(key, nestedModel, resource));
             }
         });
         return preparedProperties;
     }
+    static getPropertyObject(key, model, resource) {
+        const refCheck = model.type === helpers_1.FieldTypes.REFERENCE;
+        var path = undefined;
+        if (refCheck) {
+            path = model.path;
+        }
+        const translation = this.checkResourceTranslation(resource, key);
+        var rawKey = this.getRawName(key);
+        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
+        };
+        return propertyObject;
+    }
+    static getRawName(key) {
+        if (key.includes('.')) {
+            const nestedProperties = key.split('.');
+            return (nestedProperties[nestedProperties.length - 1]);
+        }
+        return undefined;
+    }
     static getFieldType(schemaField) {
         if (schemaField.instance === 'Embedded') {
             return helpers_1.FieldTypes.NESTEDSCHEMA;
@@ -301,5 +328,41 @@ class ResourcesHelper {
         }
         return false;
     }
+    static checkNestedField(nestedProperty, model) {
+        const nestedProperties = nestedProperty.split('.');
+        if (nestedProperties.length === 0) {
+            return false;
+        }
+        const parentProperty = nestedProperties[0];
+        if (!model[parentProperty] || (!model[parentProperty].schema && nestedProperties.length > 1)) {
+            return false;
+        }
+        if (nestedProperties.length === 1) {
+            return true;
+        }
+        var nextProperty = '';
+        for (var i = 1; i < nestedProperties.length; i++) {
+            nextProperty = nextProperty + nestedProperties[i];
+            if (i !== nestedProperties.length - 1) {
+                nextProperty = nextProperty + '.';
+            }
+        }
+        return this.checkNestedField(nextProperty, model[parentProperty].schema);
+    }
+    static getSchemaOfNestedProperty(nestedProperty, model) {
+        const nestedProperties = nestedProperty.split('.');
+        const parentProperty = nestedProperties[0];
+        if (nestedProperties.length === 1) {
+            return model[parentProperty];
+        }
+        var nextProperty = '';
+        for (var i = 1; i < nestedProperties.length; i++) {
+            nextProperty = nextProperty + nestedProperties[i];
+            if (i !== nestedProperties.length - 1) {
+                nextProperty = nextProperty + '.';
+            }
+        }
+        return this.getSchemaOfNestedProperty(nextProperty, model[parentProperty].schema);
+    }
 }
 exports.default = ResourcesHelper;

package/lib/helpers/SchemaGenerator.js

@@ -39,13 +39,13 @@ class SchemaGenerator {
                     const modelAndPopulatedString = this.setNestedSchema(schema[field].schema.paths, modelName, model, field, populatedString, resource);
                     model = modelAndPopulatedString[0];
                     populatedString = modelAndPopulatedString[1];
-                    model[field].arrayType = helpers_1.FieldTypes.NESTEDSCHEMA;
+                    model[field].arrayType = model[field].arrayType ? model[field].arrayType : helpers_1.FieldTypes.NESTEDSCHEMA;
                 }
                 else if (schema[field].caster.options.ref) {
                     populatedString = StringUtils_1.default.getPopulatedString(populatedString, field);
                     model[field].path = StringUtils_1.default.lowerCaseFirstLetter(schema[field].caster.options.ref);
                     model[field].apiRoute = 'admin/' + StringUtils_1.default.lowerCaseFirstLetter(pluralize(schema[field].caster.options.ref));
-                    model[field].arrayType = helpers_1.FieldTypes.REFERENCE;
+                    model[field].arrayType = model[field].arrayType ? model[field].arrayType : helpers_1.FieldTypes.REFERENCE;
                 }
                 else {
                     model[field].arrayType = model[field].arrayType ? model[field].arrayType : schema[field].caster.instance;

package/lib/locales/en.json

@@ -47,5 +47,6 @@
 	"Unauthorized": "Unauthorized",
 	"unprocessable": "unprocessable",
 	"Server Error": "Server Error",
-	"actions_new": "actions_new"
+	"actions_new": "actions_new",
+	"Setup": "Setup"
 }

package/lib/router/index.js

@@ -47,6 +47,9 @@ const createMainRouter = (router, controller) => {
         .route(`/api/:resource`)
         .get((req, res) => controller.index(req, res))
         .post((req, res) => controller.create(req, res));
+    router
+        .route('/api/all')
+        .delete((req, res) => controller.deleteAll(req, res));
     router
         .route("/api/:resource/:id")
         .get((req, res) => controller.show(req, res))