adminmate-express-mongoose 1.3.9 → 1.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminmate-express-mongoose",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "Adminmate Express/Mongoose connector",
   "author": "Marc Delalonde",
   "homepage": "http://adminmate.io",

package/src/controllers/model-getall.js

@@ -84,23 +84,29 @@ module.exports = _conf => {
 
     const findParams = queriesArray.length ? { $and: queriesArray } : {};
 
-    const data = await currentModel
+    const findQuery = currentModel
       .find(findParams)
       .select(fieldsToFetchSafe)
       .populate(fieldsToPopulate)
       .sort(orderSafe)
       .skip(rowsPerPage * (page - 1))
       .limit(rowsPerPage)
-      .lean()
+      .lean();
+
+    const countQuery = queriesArray.length
+      ? currentModel.countDocuments(findParams)
+      : currentModel.estimatedDocumentCount();
+
+    const [data, dataCount] = await Promise.all([findQuery, countQuery])
       .catch(e => {
         res.status(403).json({ message: e.message });
+        return [];
       });
 
     if (!data) {
       return res.status(403).json();
     }
 
-    const dataCount = await currentModel.countDocuments(findParams);
     const nbPage = Math.ceil(dataCount / rowsPerPage);
 
     // Make ref fields appeared as link in the dashboard

package/src/helpers/functions.js

@@ -284,7 +284,8 @@ module.exports = _conf => {
     let fieldsToPopulate = [];
     fieldsToFetch.forEach(field => {
       const matchingField = keys.find(k => k.path === field);
-      if (matchingField && matchingField.type === 'ObjectID' && (matchingField.ref || matchingField.refPath)) {
+      const isItObjectIdField = matchingField && matchingField.type?.toLowerCase() === 'objectid';
+      if (isItObjectIdField && (matchingField.ref || matchingField.refPath)) {
 
         let fieldToSelect = '_id';
         let toPush = {