adminmate-express-mongoose 1.3.4 → 1.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminmate-express-mongoose",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Adminmate Express/Mongoose connector",
   "author": "Marc Delalonde",
   "homepage": "http://adminmate.io",
@@ -23,7 +23,7 @@
     "url": "https://github.com/Adminmate/adminmate-express-mongoose.git"
   },
   "dependencies": {
-    "adminmate-express-core": "~1.2.1",
+    "adminmate-express-core": "~1.2.3",
     "joi": "^17.6.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",

package/src/controllers/chart-ranking.js

@@ -16,7 +16,7 @@ module.exports = _conf => {
         then: Joi.string().required(),
         otherwise: Joi.string()
       }),
-      limit: Joi.number().optional(),
+      limit: Joi.alternatives().try(Joi.string(), Joi.number()).optional(),
       filters: Joi.object({
         operator: Joi.string().valid('and', 'or').required(),
         list: Joi.array().required()
@@ -39,7 +39,7 @@ module.exports = _conf => {
     }
 
     // Default limit
-    let limit = data.limit || 10;
+    let limit = parseInt(data.limit) || 10;
 
     let _value = 1;
     if (data.relationship_field && ['sum', 'avg'].includes(data.relationship_operation)) {
@@ -73,10 +73,16 @@ module.exports = _conf => {
               value: '$count',
               _id: false
             }
+          },
+          {
+            $sort: { count: -1 }
+          },
+          {
+            $limit: limit
           }
-        ])
-        .limit(limit)
-        .sort({ value: -1 });
+        ]);
+        // .limit(limit)
+        // .sort({ value: -1 });
 
       const parentIds = repartitionData.map(d => d.key);
       const parentData = await currentModel.find({ _id: parentIds }).select(data.field).lean();

package/src/controllers/model-getall.js

@@ -10,6 +10,7 @@ module.exports = _conf => {
     const filters = req.query.filters;
     const fieldsToFetch = req.headers['am-model-fields'] || [];
     const refFields = req.headers['am-ref-fields'] || {};
+    const inlineActions = req.headers['am-inline-actions'] || [];
     const fieldsToSearchIn = req.query.search_in_fields || [];
     const page = parseInt(req.query.page || 1);
     const nbItemPerPage = 10;
@@ -21,6 +22,9 @@ module.exports = _conf => {
       return res.status(403).json({ message: 'Invalid request' });
     }
 
+    // Model actions
+    const currentModelActions = fnHelper.getModelActions(modelName);
+
     // Get model properties
     const keys = fnHelper.getModelProperties(currentModel);
 
@@ -104,6 +108,16 @@ module.exports = _conf => {
       return fnHelper.refFields(item, fieldsToPopulate);
     });
 
+    // Inline actions button
+    const _inlineActions = currentModelActions.filter(action => inlineActions.includes(action.code));
+    if (_inlineActions.length) {
+      formattedData.forEach(item => {
+        item._am_inline_actions = _inlineActions
+          .filter(action => typeof action.filter === 'undefined' || action.filter(item))
+          .map(action => action.code);
+      })
+    }
+
     res.json({
       data: formattedData,
       count: dataCount,

package/src/helpers/functions.js

@@ -434,6 +434,15 @@ module.exports = _conf => {
     return currentModel.segments;
   };
 
+  const getModelActions = modelCode => {
+    const currentModel = getModel(modelCode);
+    if (!currentModel) {
+      return null;
+    }
+
+    return currentModel.actions || [];
+  };
+
   const getModelSegment = (modelCode, segmentCode) => {
     const currentModel = getModel(modelCode);
     if (!currentModel || !currentModel.segments || currentModel.segments.length === 0) {
@@ -498,6 +507,7 @@ module.exports = _conf => {
     validateOrderStructure,
     getModelSegment,
     getModelSegments,
+    getModelActions,
     getModelObject,
     getModelAssociations,
     getModelPrimaryKeys,