@opengis/fastify-table 2.0.35 → 2.0.37

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

@@ -1 +1 @@
-{"version":3,"file":"getCustomQuery.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.ts"],"names":[],"mappings":"AAAA,iBAAe,cAAc,CAAC,EAC5B,EAAE,EACF,KAAK,EACL,YAAY,EACb,EAAE,GAAG,0BAQL;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"getCustomQuery.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.ts"],"names":[],"mappings":"AAAA,iBAAe,cAAc,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,GAAG,0BAoB7D;AAED,eAAe,cAAc,CAAC"}

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

@@ -1,11 +1,20 @@
 async function getCustomQuery({ pg, table, customFilter }) {
     if (!customFilter)
         return null;
-    const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-    const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-    const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-    const customQuery = data?.map((el) => el.query).join(' and ');
+    const customFilterList = customFilter
+        ?.split(",")
+        ?.map((el) => el?.split("_").pop());
+    const customFilterSQL = pg?.pk?.["admin.properties"]
+        ? await pg
+            .query(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table])
+            .then((el) => el.rows?.[0]?.property_json || [])
+        : [];
+    const data = customFilterSQL?.length
+        ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) ||
+            []
+        : [];
+    const customQuery = data?.map((el) => el.query).join(" and ");
     return `${customQuery}`;
 }
 export default getCustomQuery;

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectVal.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/getSelectVal.ts"],"names":[],"mappings":"AAaA,wBAA8B,YAAY,CAAC,EACzC,EAAqB,EACrB,IAAI,EACJ,MAAM,EAAE,YAAY,EACpB,EAAU,GACX,EAAE,GAAG,gBA2FL"}
+{"version":3,"file":"getSelectVal.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/getSelectVal.ts"],"names":[],"mappings":"AAaA,wBAA8B,YAAY,CAAC,EACzC,EAAqB,EACrB,IAAI,EACJ,MAAM,EAAE,YAAY,EACpB,EAAU,GACX,EAAE,GAAG,gBAmGL"}

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -33,7 +33,7 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
     const id = selectIds[name];
     // cache
     const key = `select:${name}`;
-    const cache = values?.length && config.redis
+    const cache = values?.length && config.redis && !config.disableCache
         ? (await rclient.hmget(key, values)).reduce((p, el, i) => ({
             ...p,
             [values[i]]: el,
@@ -58,7 +58,10 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
             [el.id.toString()]: el.color ? el : el.text,
         }), {}),
     };
-    if (data?.length && config.redis) {
+    const cacheableValues = Object.entries(clsObj).find(([key, val]) => typeof val !== "object")
+        ? Object.fromEntries(Object.entries(clsObj).filter(([key, val]) => typeof val !== "object"))
+        : null;
+    if (data?.length && config.redis && cacheableValues) {
         rclient.hmset(key, clsObj);
     }
     if (ar) {

package/dist/server/routes/auth/controllers/page/loginTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loginTemplate.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/page/loginTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkB,MAAM,SAAS,CAAC;AAUvD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAY5D,wBAA8B,aAAa,CACzC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAuCpB"}
+{"version":3,"file":"loginTemplate.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/page/loginTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkB,MAAM,SAAS,CAAC;AAUvD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAY5D,wBAA8B,aAAa,CACzC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAwCpB"}

package/dist/server/routes/auth/controllers/page/loginTemplate.js

@@ -16,7 +16,7 @@ const headers = {
 export default async function loginTemplate(req, reply) {
     const { pg = pgClients.client } = req;
     const body = await getTemplate("page", "login");
-    const { rows = [] } = config.pg
+    const { rows = [] } = config.pg && pg?.pk?.["admin.properties"]
         ? await pg.query("select property_key as key, property_text as val from admin.properties where property_key is not null")
         : {};
     const settings = rows.reduce((p, { key, val }) => {

package/dist/server/routes/menu/controllers/getMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMenu.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/getMenu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4CzD,wBAA8B,SAAS,CACrC,EACE,IAAS,EACT,OAAO,EACP,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,EAAE,EAAE,UAAU,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,GAAG,IAAI;;;;;;;;;;;;GAkG3B"}
+{"version":3,"file":"getMenu.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/getMenu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4CzD,wBAA8B,SAAS,CACrC,EACE,IAAS,EACT,OAAO,EACP,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,EAAE,EAAE,UAAU,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,GAAG,IAAI;;;;;;;;;;;;GAuG3B"}

package/dist/server/routes/menu/controllers/getMenu.js

@@ -35,7 +35,11 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
         return reply.status(403).send("access restricted");
     }
     const menus = isProduction && menuCache.length ? menuCache : await readMenu();
-    const { rows } = await pgClients.client.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || "site|map|admin"})'`);
+    const rows = pgClients.client?.pk?.["admin.properties"]
+        ? await pgClients.client
+            .query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || "site|map|admin"})'`)
+            .then((el) => el.rows || [])
+        : [];
     const settings = rows.reduce((p, { key, val }) => {
         const [k1, k2] = key.split(".");
         p[k1] = p[k1] || {};

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

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAUA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAqRvE"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAUA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAyRvE"}

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

@@ -37,7 +37,11 @@ export default async function filterAPI(req, reply, iscalled) {
         loadTable?.filterList ||
         []).concat(loadTable?.filterSql || []);
     // admin.custom_column - user filter NA-165
-    const { rows: properties = [] } = await pg.query("select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2 and filter", [params.table, user?.uid]);
+    const properties = pg.pk?.["admin.custom_column"]
+        ? await pg
+            .query("select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2 and filter", [params.table, user?.uid])
+            .then((el) => el.rows || [])
+        : [];
     properties.forEach((row) => filters.push({
         id: row.name,
         name: row.name,

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

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/form.ts"],"names":[],"mappings":"AAeA,wBAA8B,YAAY,CAAC,GAAG,EAAE,GAAG,eA6ClD"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/form.ts"],"names":[],"mappings":"AAiBA,wBAA8B,YAAY,CAAC,GAAG,EAAE,GAAG,eA6ClD"}

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

@@ -1,8 +1,10 @@
 import { applyHook, getTemplate } from "../../../../utils.js";
-const sql = `select property_key as key, property_json as json, property_int as int,
+const q = `select property_key as key, property_json as json, property_int as int,
 property_text as text from admin.properties where 1=1`;
 async function getSettings({ pg }) {
-    const { rows = [] } = await pg.query(sql);
+    const rows = pg?.pk?.["admin.properties"]
+        ? await pg.query(q).then((el) => el.rows || [])
+        : [];
     const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
     return data;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;CACvB,EACD,KAAK,EAAE,YAAY,gBAqJpB"}
+{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;CACvB,EACD,KAAK,EAAE,YAAY,gBAuJpB"}

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

@@ -93,7 +93,9 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
     const arr = JSON.stringify(loadTemplate).match(/{{settings.([^}]*)}}/g);
     if (arr?.length) {
         const string = JSON.stringify(loadTemplate);
-        const { rows = [] } = await pg.query(q);
+        const rows = pg?.pk?.["admin.properties"]
+            ? await pg.query(q).then((el) => el.rows || [])
+            : [];
         const settings = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
         const match = arr.reduce((acc, curr) => Object.assign(acc, {
             [curr]: settings[curr.replace(/^{{settings./g, "").replace(/}}$/, "")],

package/package.json

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

package/dist/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -1,22 +0,0 @@
-import config from "../../../../../config.js";
-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, }) {
-    if (token && token === accessToken) {
-        return { message: "access granted", status: 200 };
-    }
-    // console.log(user);
-    if (!user.user_type?.includes?.("admin") &&
-        !config?.local &&
-        !config.auth?.disable) {
-        return { message: "access restricted", status: 403 };
-    }
-    /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
-      return { message: 'access restricted', status: 403 };
-    } */
-    return { message: "access granted", status: 200 };
-}

package/dist/server/routes/logger/controllers/utils/getRootDir.js

@@ -1,25 +0,0 @@
-/* eslint-disable no-console */
-import fs from "node:fs";
-import path from "node:path";
-import config from "../../../../../config.js";
-// import { existsSync } from 'fs';
-let logDir = null;
-export default function getRootDir() {
-    // absolute / relative path
-    if (logDir)
-        return logDir;
-    const file = ["config.json", "/data/local/config.json"].find((el) => fs.existsSync(el) ? el : null);
-    const root = file === "config.json" ? process.cwd() : "/data/local";
-    logDir = config.logDir || path.join(root, config.log?.dir || "log");
-    console.log({ logDir });
-    return logDir;
-    // windows debug support
-    /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
-    // docker default path
-    if (existsSync(customLogDir)) {
-      return path.join(customLogDir, config.folder || '', 'log');
-    }
-  
-    // non-docker default path
-    return path.join(config.root || '/data/local', config.folder || '', 'log'); */
-}