identity-admin 1.26.10 → 1.26.12

package/lib/controllers/DashboardController.js

@@ -236,7 +236,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
         });
     }
     create(req, res) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.validateRequest(req, res)) {
                 return;
@@ -272,7 +272,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
                     const validation = crudOperations.create.validators[index];
                     const result = yield validation.run(req);
                     if (!result.isEmpty()) {
-                        return ResponseUtils_1.default.unprocessable(res, 'Invalid data', result.array());
+                        return ResponseUtils_1.default.unprocessable(res, (_f = (result.array() && ((_e = result.array()[0]) === null || _e === void 0 ? void 0 : _e.msg))) !== null && _f !== void 0 ? _f : 'Invalid data', result.array());
                     }
                 }
             }
@@ -289,11 +289,11 @@ let DashboardController = DashboardController_1 = class DashboardController {
             if (!record.isValid() || !record.document) {
                 return ResponseUtils_1.default.unprocessable(res, 'Invalid Data', record.getErrors());
             }
-            if ((_e = resource.properties) === null || _e === void 0 ? void 0 : _e.enableLog) {
+            if ((_g = resource.properties) === null || _g === void 0 ? void 0 : _g.enableLog) {
                 const newRecord = yield repository.findById(record.getDocument()._id);
                 const userActionsLog = new UserActionsLog_1.default({
                     action: IUserActionsLog_1.UserActions.CREATE,
-                    modelName: (_f = resource === null || resource === void 0 ? void 0 : resource.properties) === null || _f === void 0 ? void 0 : _f.modelName,
+                    modelName: (_h = resource === null || resource === void 0 ? void 0 : resource.properties) === null || _h === void 0 ? void 0 : _h.modelName,
                     userId: req.user._id,
                     dataAfter: JSON.stringify(newRecord),
                     resourceId: newRecord === null || newRecord === void 0 ? void 0 : newRecord._id,
@@ -309,7 +309,7 @@ let DashboardController = DashboardController_1 = class DashboardController {
         });
     }
     update(req, res) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.validateRequest(req, res)) {
                 return;
@@ -349,12 +349,12 @@ let DashboardController = DashboardController_1 = class DashboardController {
                     const validation = crudOperations.update.validators[index];
                     const result = yield validation.run(req);
                     if (!result.isEmpty()) {
-                        return ResponseUtils_1.default.unprocessable(res, 'Invalid data', result.array());
+                        return ResponseUtils_1.default.unprocessable(res, (_f = (result.array() && ((_e = result.array()[0]) === null || _e === void 0 ? void 0 : _e.msg))) !== null && _f !== void 0 ? _f : 'Invalid data', result.array());
                     }
                 }
             }
             var recordSaveResult = {};
-            if ((_e = crudOperations === null || crudOperations === void 0 ? void 0 : crudOperations.update) === null || _e === void 0 ? void 0 : _e.update) {
+            if ((_g = crudOperations === null || crudOperations === void 0 ? void 0 : crudOperations.update) === null || _g === void 0 ? void 0 : _g.update) {
                 recordSaveResult = yield crudOperations.update.update(req, record, recordParams, currentUser);
             }
             else {
@@ -366,11 +366,11 @@ let DashboardController = DashboardController_1 = class DashboardController {
             // if (resource.properties.modelName === ModelNames.Settings) {
             //     await AppSettings.run()
             // }
-            if ((_f = resource.properties) === null || _f === void 0 ? void 0 : _f.enableLog) {
+            if ((_h = resource.properties) === null || _h === void 0 ? void 0 : _h.enableLog) {
                 const newRecord = yield repository.findById(record._id);
                 const userActionsLog = new UserActionsLog_1.default({
                     action: IUserActionsLog_1.UserActions.EDIT,
-                    modelName: (_g = resource === null || resource === void 0 ? void 0 : resource.properties) === null || _g === void 0 ? void 0 : _g.modelName,
+                    modelName: (_j = resource === null || resource === void 0 ? void 0 : resource.properties) === null || _j === void 0 ? void 0 : _j.modelName,
                     userId: req.user._id,
                     dataBefore: JSON.stringify(record),
                     dataAfter: JSON.stringify(newRecord),

package/lib/helpers/Permissions/PermissionFetcher.d.ts

@@ -1,7 +1,8 @@
-import { Model } from "mongoose";
+import { Model } from 'mongoose';
 export declare class PermissionFetcher {
     private permissionGroupId?;
     private Permission;
-    constructor(Permission: Model<any, any>, permissionGroupId?: string);
+    private userPermissionGroupId?;
+    constructor(Permission: Model<any, any>, permissionGroupId?: string, userPermissionGroupId?: string);
     fetch(): Promise<import("./types").IPermissions[]>;
 }

package/lib/helpers/Permissions/PermissionFetcher.js

@@ -16,39 +16,56 @@ exports.PermissionFetcher = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const PermissionMapper_1 = require("./PermissionMapper");
 class PermissionFetcher {
-    constructor(Permission, permissionGroupId) {
+    constructor(Permission, permissionGroupId, userPermissionGroupId) {
         this.permissionGroupId = permissionGroupId;
         this.Permission = Permission;
+        this.userPermissionGroupId = userPermissionGroupId;
     }
     fetch() {
         return __awaiter(this, void 0, void 0, function* () {
             const ObjectId = mongoose_1.default.Types.ObjectId;
-            const pipeline = [
-                {
-                    $sort: {
-                        modelName: 1,
-                    },
-                },
-                {
-                    $group: {
-                        _id: "$modelName",
-                        documents: { $push: "$$ROOT" },
+            const pipeline = [];
+            if (this.userPermissionGroupId) {
+                pipeline.push({
+                    $lookup: {
+                        from: 'adminpermissions',
+                        localField: '_id',
+                        foreignField: 'permissionId',
+                        as: 'adminPermissionDetails',
+                        pipeline: [
+                            {
+                                $match: {
+                                    permissionGroupId: new ObjectId(this.userPermissionGroupId),
+                                },
+                            },
+                        ],
                     },
+                }, {
+                    $unwind: '$adminPermissionDetails',
+                });
+            }
+            // Sorting and grouping stages
+            pipeline.push({
+                $sort: {
+                    modelName: 1,
                 },
-                {
-                    $unwind: "$documents",
-                },
-                {
-                    $sort: { order: 1 },
+            }, {
+                $group: {
+                    _id: '$modelName',
+                    documents: { $push: '$$ROOT' },
                 },
-            ];
+            }, {
+                $unwind: '$documents',
+            }, {
+                $sort: { 'documents.order': 1 },
+            });
             if (this.permissionGroupId) {
                 pipeline.push({
                     $lookup: {
-                        from: "adminpermissions",
-                        localField: "documents._id",
-                        foreignField: "permissionId",
-                        as: "checkedPermissions",
+                        from: 'adminpermissions',
+                        localField: 'documents._id',
+                        foreignField: 'permissionId',
+                        as: 'checkedPermissions',
                         pipeline: [
                             {
                                 $match: {
@@ -61,9 +78,9 @@ class PermissionFetcher {
             }
             pipeline.push({
                 $group: {
-                    _id: "$_id",
-                    documents: { $push: "$documents" },
-                    checkedPermissions: { $push: "$checkedPermissions" },
+                    _id: '$_id',
+                    documents: { $push: '$documents' },
+                    checkedPermissions: { $push: '$checkedPermissions' },
                 },
             }, {
                 $sort: { _id: 1 },

package/package.json

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