@galadrim/galadmin 0.1.217 → 0.1.219

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.217",
+  "version": "0.1.219",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/api.ts

@@ -32,7 +32,7 @@ export default (db, config, user) => {
         next();
     })
 
-    async function getRecords(params) {
+    async function getRecords(params, computeCount = false) {
         let queryString = "";
         if (params.filters) {
             queryString = " WHERE (" + params.filters + ")";
@@ -63,22 +63,37 @@ export default (db, config, user) => {
             queryString += ")"
         }
         const limit = params.allRecords ? 999999 : parseInt(params.limit)
-        const query = params.customQuery || ("SELECT " + (params.selectExpression || "*") + " FROM ?? " + (params.join || "") + queryString + " " + (params.groupBy ? "GROUP BY " + params.groupBy : "") + (params.having ? " HAVING " + params.having : "") + (params.orderBy || params.primaryId ? " ORDER BY " + (params.orderBy || `${params.table}.${params.primaryId}`) : "") + " LIMIT ? OFFSET ?")
-        const queryParams = [params.table, limit, Math.max((params.page - 1) * limit, 0)]
-        const { err, rows } = await db.query(query, queryParams)
+        const query = params.customQuery || `SELECT 
+            ${params.selectExpression || "*"} 
+        FROM ${params.table} 
+        ${params.join || ""} 
+        ${queryString} 
+        ${params.groupBy ? "GROUP BY " + params.groupBy : ""} 
+        ${params.having ? " HAVING " + params.having : ""} 
+        ${params.orderBy || params.primaryId ? " ORDER BY " + (params.orderBy || `${params.table}.${params.primaryId}`) : ""}`
+        const { err, rows } = await db.query(`${query} LIMIT ${limit} OFFSET ${Math.max((params.page - 1) * limit, 0)}`)
         if (err) {
             console.error(err)
             return {
                 error: err
             }
         }
+        let count = undefined;
+        if (computeCount) {
+            const { err: countErr, rows: countRows } = await db.query(`SELECT COUNT(*) AS count FROM (${query}) s`)
+            if (countErr) {
+                console.error(countErr)
+            }
+            count = countRows?.[0]?.count || 0
+        }
         return {
             rows,
             queryString,
             input: {
                 query,
                 params
-            }
+            },
+            count
         }
     }
 
@@ -203,7 +218,7 @@ export default (db, config, user) => {
         const isDesc = req.body.isDesc === null ? view.isDesc : req.body.isDesc
         const subview = view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex] : null
         const orderBy = req.body.orderBy || subview?.orderBy || view.orderBy
-        const { rows: records, queryString, input, error } = await getRecords({
+        const { rows: records, input, error, count } = await getRecords({
             table: view.tableName,
             page: req.body.page,
             filters: sqlAnd([
@@ -222,7 +237,7 @@ export default (db, config, user) => {
             groupBy: view.groupBy,
             columns: view.columns,
             limit: view.limit || 10,
-        })
+        }, true)
         if (error) {
             return res.status(500).send(error)
         }
@@ -234,21 +249,11 @@ export default (db, config, user) => {
                 }
             }
         }
-        const { err, rows: counts } = await db.query("SELECT COUNT(*) AS count FROM (SELECT 1 FROM ?? " + (view.join || "") + queryString + " " + (view.groupBy ? "GROUP BY " + view.groupBy : "") + (subview?.having ? " HAVING " + subview?.having : "") + ") s", [view.tableName])
-        if (err) {
-            res.send({
-                records,
-                input,
-                count: "-",
-                countErr: err
-            })
-        } else {
-            res.send({
-                records,
-                input,
-                count: counts[0].count
-            })
-        }
+        res.send({
+            records,
+            input,
+            count
+        })
     })
 
     const formattedValueToFunction = {}