@opengis/fastify-table 2.0.145 → 2.0.147

package/dist/server/plugins/logger/checkUserAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkUserAccess.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/checkUserAccess.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,IAAS,EACT,KAAK,GACN,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;EAiBA"}
+{"version":3,"file":"checkUserAccess.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/checkUserAccess.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,IAAI,EACJ,KAAK,GACN,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;EAiBA"}

package/dist/server/plugins/logger/checkUserAccess.js

@@ -5,12 +5,12 @@ const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
  * @summary check user access to logger interface - per admin user type or user group
  * @returns {Object} message, status
  */
-export default function checkUserAccess({ user = {}, token, }) {
+export default function checkUserAccess({ user, token, }) {
     if (token && token === accessToken) {
         return { message: "access granted", status: 200 };
     }
     // console.log(user);
-    if (!user.user_type?.includes?.("admin") &&
+    if ((!user || !user.user_type?.includes?.("admin")) &&
         !config?.local &&
         !config.auth?.disable) {
         return { message: "access restricted", status: 403 };

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAiHA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAuHA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}

package/dist/server/routes/table/controllers/suggest.js

@@ -25,6 +25,14 @@ async function getTableColumnMeta({ table, template, column, selectName, filtere
         .filter((el) => !el.disabled && el.sql && el.sql.includes(column) && false)
         .map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)
         ?.join("") || "";
+    // w/out select
+    const searchQueryDefault = startsWith && key
+        ? `(left(lower("text"::text),${key.length}) = $1 )`
+        : '(lower("text"::text) ~ $1 )';
+    // w/ select
+    const searchQuerySelect = startsWith && key
+        ? `id in ( with cc(id, text) as (${select}) select id from cc where (left(lower("text"),${key.length})=$1) )`
+        : `id in ( with cc(id, text) as (${select}) select id from cc where (lower("text") ~ $1) )`;
     if (pg.pgType?.[dataTypeID]?.includes("[]")) {
         const original = filtered
             ? `with c(id,text) as (select id, id as text from (select unnest(${column}) as id from ${tableName} t ${sqlTable})q group by id) select id, text from c`
@@ -32,9 +40,7 @@ async function getTableColumnMeta({ table, template, column, selectName, filtere
         return {
             arr,
             original,
-            searchQuery: startsWith && key
-                ? `(left(lower("text"::text),${key.length}) = $1 )`
-                : '(lower("text"::text) ~ $1 )',
+            searchQuery: select ? searchQuerySelect : searchQueryDefault,
             pk: "id",
         };
     }
@@ -44,9 +50,7 @@ async function getTableColumnMeta({ table, template, column, selectName, filtere
     return {
         arr,
         original,
-        searchQuery: startsWith && key
-            ? `(left(lower("text"),${key.length}) = $1 )`
-            : '(lower("text") ~ $1 )',
+        searchQuery: select ? searchQuerySelect : searchQueryDefault,
         pk: "id",
     };
 }

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4EzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAw1Bb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAgFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA41Bb"}

package/dist/server/routes/table/functions/getData.js

@@ -35,7 +35,7 @@ const mockReply = {
     },
     send: (txt) => Object.assign(mockReply.response, txt),
 };
-function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = false) {
+function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, iscalled = false) {
     if (iscalled && queryOrder) {
         return `order by ${queryOrder}`;
     }
@@ -44,7 +44,7 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = fa
     }
     const orderArr = queryOrder.split(/[|]/g).map((el) => el.split(/[-]/));
     const validOrder = orderArr
-        .filter((el) => el[0] && (columnList || "").includes(el[0]))
+        .filter((el) => el[0] && (columnList || "").concat(sqlColumns || "").includes(el[0]))
         .map((el) => `${el[0]} ${queryDesc || el[1] === "desc" ? "desc" : ""}`)
         .join(",");
     return `order by ${validOrder || "true::boolean"} nulls last`;
@@ -267,7 +267,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const offset = query?.page && query?.page > 0 && !objectId
         ? ` offset ${(query?.page - 1) * limit}`
         : "";
-    const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, !!called);
+    const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, loadTable?.sqlColumns, !!called);
     if (config.trace)
         console.log(order);
     const search = loadTable?.meta?.search && query?.search

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.145",
+  "version": "2.0.147",
   "type": "module",
   "description": "core-plugins",
   "keywords": [