@opengis/fastify-table 1.0.44 → 1.0.45

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.45 - 19.06.2024
+
+- fix data api table template order
+
 ## 1.0.44 - 18.06.2024
 
 - add extra data support (form DataTable)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/data.js

@@ -17,9 +17,10 @@ export default async function data(req) {
   const {
     table, columns, sql, cardSql, filters, form, meta,
   } = loadTable;
-  const { pk } = await getMeta(table);
+  const { pk, columns: dbColumns } = await getMeta(table);
 
   const cols = columns.map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
   const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
   const cardSqlFiltered = params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
   const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
@@ -38,7 +39,7 @@ export default async function data(req) {
   // id, query, filter
   const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
 
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+  const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
   const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
   const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
   const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;