@opengis/fastify-table 2.0.44 → 2.0.46

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/formatValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK/D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,EAAE,EACF,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAO,EACP,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,OAyLA"}
+{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/formatValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAe/D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,EAAE,EACF,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAO,EACP,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,OAmLA"}

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -1,5 +1,14 @@
 import applyHookSync from "../../../../hook/applyHookSync.js";
 import getRangeQuery from "./getRangeQuery.js";
+const selectFilterTypes = [
+    "check",
+    "autocomplete",
+    "tags",
+    "avatar",
+    "radio",
+    "select",
+    "button",
+];
 export default function formatValue({ pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize, }) {
     const { extra, sql, select, strict, options /* default: defaultValue, */ } = filter;
     const pk = pg?.pk && table ? pg.pk[table] : undefined;
@@ -33,7 +42,7 @@ export default function formatValue({ pg, table, filter = {}, name, value, dataT
         !value ||
         (!dataTypeID && !extra && !sql && !options) ||
         extra?.input?.toLowerCase?.() === "datatable" ||
-        (!["check", "autocomplete", "tags", "avatar", "radio"].includes(filterType) &&
+        (!selectFilterTypes.includes(filterType) &&
             options?.find?.((el) => el?.sql))) {
         return {};
     }
@@ -105,11 +114,11 @@ export default function formatValue({ pg, table, filter = {}, name, value, dataT
         return { op: "between", query };
     }
     /* select query - from admin.cls / filter options */
-    if (["check", "autocomplete", "tags", "avatar", "radio", "select"].includes(filterType)) {
+    if (selectFilterTypes.includes(filterType)) {
         // multiple checks with predefined query
         if (options?.find?.((el) => el?.sql)) {
             const query = options
-                .filter((el) => value.split(",").includes(el.id))
+                .filter((el) => value.split(",").includes(el.id?.toString?.()))
                 .map((el) => el.sql || "false")
                 .join(" and ") || "false";
             return { op: "=", query };

package/dist/server/plugins/table/funcs/getSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAmB,gBAkCvE"}
+{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAmB,gBA6BvE"}

package/dist/server/plugins/table/funcs/getSelect.js

@@ -11,20 +11,17 @@ export default async function getSelect(name, pg = pgClients.client) {
     if (loadCls[name] && !config.local)
         return loadCls[name];
     const clsDataGIT = await getTemplate(["cls", "select"], name);
-    const { type } = !clsDataGIT && pg.pk?.["admin.user_cls"]
+    const { type } = pg.pk?.["admin.user_cls"]
         ? await pg
             .query("select type from admin.user_cls where parent is null and name=$1 union all select type from admin.cls where parent is null and name=$1 limit 1", [name])
             .then((el) => el.rows?.[0] || {})
         : {};
-    const q = !clsDataGIT && type && ["sql", "json"].includes(type)
-        ? sqls[type]
-        : undefined;
-    const clsDataDB = q
+    const clsDataDB = sqls[type || ""]
         ? await pg
-            .query(q, [name])
+            .query(sqls[type || ""], [name])
             .then((el) => el.rows?.find((item) => item?.data)?.data)
         : undefined;
-    const clsData = clsDataGIT || clsDataDB;
+    const clsData = clsDataDB ?? clsDataGIT;
     if (!clsData)
         return null;
     //  console.log(clsData);

package/package.json

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