@galadrim/galadmin 0.1.215 → 0.1.217

package/dist/types/config.d.ts

@@ -224,6 +224,7 @@ export type TableView = {
 export type Subview = {
     label: string;
     filters: string;
+    having?: string;
     orderBy?: string;
     notificationBadge?: {
         query: string;

package/package.json

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

package/src/api.ts

@@ -63,7 +63,7 @@ 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.orderBy || params.primaryId ? " ORDER BY " + (params.orderBy || `${params.table}.${params.primaryId}`) : "") + " LIMIT ? OFFSET ?")
+        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)
         if (err) {
@@ -201,16 +201,18 @@ export default (db, config, user) => {
     app.post('/records', async function (req, res, next) {
         const view = config.views[req.body.viewIndex];
         const isDesc = req.body.isDesc === null ? view.isDesc : req.body.isDesc
-        const orderBy = req.body.orderBy || (view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex]?.orderBy : null) || view.orderBy
+        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({
             table: view.tableName,
             page: req.body.page,
             filters: sqlAnd([
                 view.filters,
-                view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex].filters : null,
+                subview?.filters,
                 ...req.body.filters,
                 view.filtersFromUser ? view.filtersFromUser(user.userId, user.role) : null
             ]),
+            having: subview?.having,
             customQuery: view.customQuery,
             join: view.join,
             selectExpression: view.selectExpression,
@@ -232,7 +234,7 @@ 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 : "") + ") s", [view.tableName])
+        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,
@@ -322,11 +324,13 @@ export default (db, config, user) => {
         const view = config.views[req.body.viewIndex];
         const orderBy = req.body.orderBy || view.orderBy;
         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 { rows: records, error } = await getRecords({
             table: view.tableName,
             page: 1,
             allRecords: true,
-            filters: sqlAnd([view.filters, view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex].filters : null].concat(req.body.filters)),
+            filters: sqlAnd([view.filters, subview?.filters, req.body.filters]),
+            having: subview?.having,
             customQuery: view.customQuery,
             join: view.join,
             selectExpression: view.selectExpression,

package/src/types/config.ts

@@ -273,6 +273,7 @@ export type TableView = {
 export type Subview = {
   label: string;
   filters: string;
+  having?: string;
   orderBy?: string;
   notificationBadge?: {
     query: string;