@galadrim/galadmin 0.1.208 → 0.1.209

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.208",
+  "version": "0.1.209",
   "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}`) : "") + (params.isDesc ? " DESC" : "") + " LIMIT ? OFFSET ?")
+        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 queryParams = [params.table, limit, Math.max((params.page - 1) * limit, 0)]
         const { err, rows } = await db.query(query, queryParams)
         if (err) {
@@ -200,6 +200,8 @@ 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 { rows: records, queryString, input, error } = await getRecords({
             table: view.tableName,
             page: req.body.page,
@@ -212,8 +214,7 @@ export default (db, config, user) => {
             customQuery: view.customQuery,
             join: view.join,
             selectExpression: view.selectExpression,
-            orderBy: [req.body.orderBy || (view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex]?.orderBy : null) || view.orderBy, view.primaryId].filter(x => x).join(", "),
-            isDesc: req.body.isDesc === null ? view.isDesc : req.body.isDesc,
+            orderBy: [orderBy ? `${orderBy} ${isDesc ? "DESC" : "ASC"}` : null, view.primaryId].filter(x => x).join(", "),
             primaryId: view.primaryId,
             query: req.body.query,
             groupBy: view.groupBy,
@@ -319,6 +320,8 @@ export default (db, config, user) => {
 
     app.post('/recordsExport', async function (req, res) {
         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 { rows: records, error } = await getRecords({
             table: view.tableName,
             page: 1,
@@ -327,8 +330,7 @@ export default (db, config, user) => {
             customQuery: view.customQuery,
             join: view.join,
             selectExpression: view.selectExpression,
-            orderBy: req.body.orderBy || view.orderBy,
-            isDesc: req.body.isDesc === null ? view.isDesc : req.body.isDesc,
+            orderBy: orderBy ? `${orderBy} ${isDesc ? "DESC" : "ASC"}` : null,
             primaryId: view.primaryId,
             query: req.body.query,
             groupBy: view.groupBy,