@opengis/fastify-table 2.0.95 → 2.0.96

package/dist/server/plugins/file/getExport.d.ts

@@ -1,2 +1,2 @@
-export default function getExport({ pg, user, host, unittest, columns, cls, id, cols, search, format, table, tableSql, sourceName, filter, nocache, formatAnswer, sql }: any, reply: any): Promise<any>;
+export default function getExport({ pg, user, host, columns, cls, id, cols, search, format, table, tableSql, sourceName, filter, nocache, formatAnswer, sql, }: any, reply: any): Promise<any>;
 //# sourceMappingURL=getExport.d.ts.map

package/dist/server/plugins/file/getExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/getExport.ts"],"names":[],"mappings":"AAEA,wBAA8B,SAAS,CAAC,EACpC,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,GAAG,EACH,EAAE,EACF,IAAI,EACJ,MAAM,EACN,MAAM,EACN,KAAK,EACL,QAAQ,EACR,UAAU,EACV,MAAM,EACN,OAAO,EACP,YAAY,EACZ,GAAG,EACN,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAiBjB"}
+{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/getExport.ts"],"names":[],"mappings":"AAEA,wBAA8B,SAAS,CACrC,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,GAAG,EACH,EAAE,EACF,IAAI,EACJ,MAAM,EACN,MAAM,EACN,KAAK,EACL,QAAQ,EACR,UAAU,EACV,MAAM,EACN,OAAO,EACP,YAAY,EACZ,GAAG,GACJ,EAAE,GAAG,EACN,KAAK,EAAE,GAAG,gBA4BX"}

package/dist/server/plugins/file/getExport.js

@@ -1,5 +1,5 @@
-import routeExport from '../../routes/file/controllers/export.js';
-export default async function getExport({ pg, user, host, unittest, columns, cls, id, cols, search, format, table, tableSql, sourceName, filter, nocache, formatAnswer, sql }, reply) {
+import routeExport from "../../routes/file/controllers/export.js";
+export default async function getExport({ pg, user, host, columns, cls, id, cols, search, format, table, tableSql, sourceName, filter, nocache, formatAnswer, sql, }, reply) {
     const query = {
         id,
         cols,
@@ -12,7 +12,14 @@ export default async function getExport({ pg, user, host, unittest, columns, cls
         sql,
     };
     const result = await routeExport({
-        pg, user, host, unittest, columns, cls, query, tableSql, sourceName,
+        pg,
+        user,
+        host,
+        columns,
+        cls,
+        query,
+        tableSql,
+        sourceName,
     }, reply);
     return result;
 }

package/dist/server/routes/auth/controllers/2factor/providers/totp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAU1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAmBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA6D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}
+{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAU1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAmBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EAyD3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}

package/dist/server/routes/auth/controllers/2factor/providers/totp.js

@@ -44,15 +44,13 @@ const generate = async ({ uid, pg }) => {
         crypto.randomUUID(),
     ];
     const userData = await pg
-        .query(`select social_auth_id as code, login, email from admin.users where uid=$1`, [uid])
+        .query(`select social_auth_id as code, coalesce(login,email) as login, email from admin.users where uid=$1`, [uid])
         .then((el) => el.rows?.[0] || {});
-    if (config.auth?.["2fa"]?.["sufix"] &&
-        !userData[config.auth?.["2fa"]?.["sufix"]]) {
-        throw new Error("2fa prefix not found at userData");
+    const { sufix } = config.auth?.["2fa"] || {};
+    if (sufix && !userData[sufix]) {
+        console.warn("2fa prefix not found at userData");
     }
-    const otp = getOTP(config.auth?.["2fa"]?.["sufix"]
-        ? userData[config.auth?.["2fa"]?.["sufix"]]
-        : userData.login || userData.code || uid, secret);
+    const otp = getOTP((sufix ? userData[sufix] : null) || userData.login || userData.code || uid, secret);
     const qrCodeAsImageSource = await qrcode.toDataURL(otp);
     // no entry in db
     if (enabled === undefined) {

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

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

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

@@ -48,6 +48,12 @@ export default async function loginTemplate(req, reply) {
         const html = await handlebars.compile(bodyRecovery)({
             recovery: true,
             query: req.query,
+            // settings,
+            req,
+            protocol: req.protocol,
+            hostname: req.hostname,
+            port: process.env.PORT,
+            config,
         });
         return reply.headers(headers).send(html);
     }
@@ -61,6 +67,12 @@ export default async function loginTemplate(req, reply) {
         secretKey: qrCode ? secret || key : undefined,
         enabled,
         qrCode,
+        // settings,
+        req,
+        protocol: req.protocol,
+        hostname: req.hostname,
+        port: process.env.PORT,
+        config,
     });
     return reply.headers(headers).send(html);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"loginEuSign.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/page/loginEuSign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAkBvD,wBAA8B,aAAa,CACzC,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,YAAY,kBAWpB"}
+{"version":3,"file":"loginEuSign.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/page/loginEuSign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAoBvD,wBAA8B,aAAa,CACzC,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,YAAY,kBAoBpB"}

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

@@ -1,6 +1,8 @@
 import path from "node:path";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "url";
+import config from "../../../../../config.js";
+import { handlebars } from "../../../../helpers/index.js";
 import getTemplate from "../../../../plugins/table/funcs/getTemplate.js";
 // relative default template filepath
 const filename = fileURLToPath(import.meta.url);
@@ -11,10 +13,16 @@ const headers = {
     "Accept-CH": "Viewport-Width, Width",
 };
 export default async function loginTemplate(req, reply) {
-    const body = await getTemplate("page", "loginEuSign");
-    if (!body) {
-        const defaultBody = await readFile(path.join(dirname, "../../../../templates/page/loginEuSign.html"), "utf8");
-        return reply.headers(headers).send(defaultBody);
-    }
-    return reply.headers(headers).send(body);
+    const body1 = await getTemplate("page", "loginEuSign");
+    const body = !body1
+        ? await readFile(path.join(dirname, "../../../../templates/page/loginEuSign.html"), "utf8")
+        : body1;
+    const html = await handlebars.compile(body)({
+        req,
+        protocol: req.protocol,
+        hostname: req.hostname,
+        port: process.env.PORT,
+        config,
+    });
+    return reply.headers(headers).send(html);
 }

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,kBAwCpB"}
+{"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,kBA4CpB"}

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

@@ -30,7 +30,9 @@ export default async function loginTemplate(req, reply) {
         const html = await handlebars.compile(defaultBody)({
             settings,
             req,
+            protocol: req.protocol,
             hostname: req.hostname,
+            port: process.env.PORT,
             config,
         });
         return reply.headers(headers).send(html);
@@ -38,7 +40,9 @@ export default async function loginTemplate(req, reply) {
     const html = await handlebars.compile(body)({
         settings,
         req,
+        protocol: req.protocol,
         hostname: req.hostname,
+        port: process.env.PORT,
         config,
     });
     return reply.headers(headers).send(html);

package/dist/server/routes/file/controllers/export.d.ts

@@ -21,10 +21,10 @@ import type { ExtendedPG } from "../../../types/core.js";
  * @returns {String|Object} message Повертає SQL запит або opt або рядки SQL запиту
  * @returns {String} file Шлях до файла для скачування або відображення
  */
-export default function exportTable({ pg, user, unittest, columns: columns1, cls, query, host, tableSql, sourceName, }: {
+export default function exportTable({ pg, headers, user, columns: columns1, cls, query, host, tableSql, sourceName, }: {
     pg: ExtendedPG;
+    headers?: Record<string, any>;
     user?: Record<string, any>;
-    unittest?: any;
     columns?: string;
     cls?: any;
     query?: Record<string, any>;

package/dist/server/routes/file/controllers/export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAgWpB"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,OAAO,EACP,IAAI,EACJ,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBA8WpB"}

package/dist/server/routes/file/controllers/export.js

@@ -13,7 +13,7 @@ import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import getMeta from "../../../plugins/pg/funcs/getMeta.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import eventStream from "../../../plugins/util/funcs/eventStream.js";
-import getData from "../../../plugins/table/funcs/getData.js";
+import getData from "../../table/functions/getData.js";
 import getFolder from "../../../plugins/crud/funcs/utils/getFolder.js";
 import metaFormat from "../../../plugins/table/funcs/metaFormat/index.js";
 import jsonToXls from "./utils/jsonToXls.js";
@@ -42,7 +42,7 @@ const rootDir = getFolder(config, "local");
  * @returns {String|Object} message Повертає SQL запит або opt або рядки SQL запиту
  * @returns {String} file Шлях до файла для скачування або відображення
  */
-export default async function exportTable({ pg = pgClients.client, user, unittest, columns: columns1, cls, query = {}, host = "127.0.0.1", tableSql, sourceName, }, reply) {
+export default async function exportTable({ pg = pgClients.client, headers, user, columns: columns1, cls, query = {}, host = "127.0.0.1", tableSql, sourceName, }, reply) {
     const { id, cols, search, format = "json", table, filter = "empty", nocache, formatAnswer = "file", sql, stream, } = query;
     if (!table && !tableSql) {
         return reply.status(400).send("not enough params: table");
@@ -50,6 +50,7 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
     if (!["csv", "xlsx", "json", "geojson"].includes(format)) {
         return reply.status(400).send("param format is invalid");
     }
+    const slice = query.slice ? Math.min(+query.slice || 16, 16) : null;
     const date = new Date();
     const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}-${id}`;
     const sufixDate = [
@@ -101,19 +102,25 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
             .send("Ця форма не містить полів геометрії. Виберіть тип, який не потребує геометрії для вивантаження");
     }
     const options = {
-        id,
-        table,
         pg,
-        filter,
-        search,
+        params: {
+            id,
+            table,
+        },
+        query: {
+            filter,
+            search,
+            limit: slice,
+            sql,
+        },
+        headers,
         user,
-        sql,
         sufix: false,
     };
     // check total count, debug sql etc.
     const result = tableSql || viewSql
         ? await pg
-            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql || viewSql})q where ${loadTable?.key && id
+            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (select * from (${tableSql || viewSql})q ${slice ? `limit ${slice}` : ""} )q where ${loadTable?.key && id
             ? `${loadTable?.key}::text = '${id}'`
             : "true"}`)
             .then((el) => el.rows?.[0] || {})
@@ -123,7 +130,8 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
     if (!result?.rows?.length) {
         return reply.status(200).send("Немає даних, які можна експортувати");
     }
-    const { total, filtered = result.total || 0 } = result;
+    const { total, filtered: filtered1 = result.total || 0 } = result;
+    const filtered = slice ? result.count || slice : filtered1;
     const limit = startStreamWithTotal > filtered
         ? filtered
         : Math.min(query.limit || 1000, startStreamWithTotal) ||
@@ -157,9 +165,10 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
             .split(".")
             .pop()}` // check for json data
         : el.name);
-    const send = (+filtered > startStreamWithTotal || stream) && !unittest
+    const send = ((!slice && +filtered > startStreamWithTotal) || stream) &&
+        process.env.NODE_ENV !== "test"
         ? eventStream(reply)
-        : unittest
+        : process.env.NODE_ENV === "test"
             ? console.log
             : () => { };
     // export xlsx / csv / json
@@ -181,7 +190,7 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
                     ? await pg.query(`select * from (${tableSql || viewSql})q where ${loadTable?.key && id
                         ? `${loadTable?.key}::text = '${id}'`
                         : "true"} limit ${options.limit} offset ${offset}`)
-                    : await getData({ ...options, page }, reply, true);
+                    : await getData({ ...options, query: { page, ...options.query } }, reply, true);
                 send(`seq: ${++seq}`);
                 send(`Обробка ${rows.length} об'єктів...`);
                 if (!rows.length) {

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

@@ -5,6 +5,8 @@ export default function adminMenu({ user, session, pg, }: {
     session?: Record<string, any>;
     pg: ExtendedPG;
 }, reply: FastifyReply | null): Promise<{
+    menus: any;
+} | {
     settings: any;
     user: {
         uid: any;

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;;;;;;;;;;;;GAwG3B"}
+{"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;;;;;;;;;;;;;;GA0G3B"}

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

@@ -35,6 +35,8 @@ 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();
+    if (!pg)
+        return { menus };
     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"})'`)

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

@@ -1,7 +1,7 @@
 import type { FastifyReply } from "fastify";
 import type { ExtendedPG } from "../../../types/core.js";
 export default function dataAPI({ pg, params, table, id, headers, query, user, contextQuery, sufix, filterList, actions: actionsParam, columns: columnsParam, }: {
-    pg: ExtendedPG;
+    pg?: ExtendedPG;
     params?: {
         id?: string;
         query?: string;
@@ -9,9 +9,9 @@ export default function dataAPI({ pg, params, table, id, headers, query, user, c
     };
     table?: string;
     id?: string;
-    headers: Record<string, any>;
+    headers?: Record<string, any>;
     query?: Record<string, any>;
-    user: Record<string, any>;
+    user?: Record<string, any>;
     contextQuery?: string;
     sufix?: boolean;
     filterList?: any[];

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;AA4DzD,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,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,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,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,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,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAg0Bb"}
+{"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;AA4DzD,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,OAAO,EAAE,YAAY,GACtB,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,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAi0Bb"}

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

@@ -416,7 +416,8 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         const statusClsData = statusCls ? await getSelect(statusCls, pg) : {};
         statusClsData?.arr?.forEach((el) => status.push({
             ...el,
-            count: rows.filter((row) => el.id === row[statusColumn.name]).length,
+            count: rows.filter((row) => el.id === row[statusColumn.name])
+                .length,
         }));
     }
     const template = await getTemplate("card", templateName);

package/dist/server/templates/page/loginEuSign.html

@@ -89,7 +89,7 @@
 
         <div>
           <a
-          href="https://id.softpro.ua/oauth/authorize?response_type=code&provider=google&client_id=photo-client-123&redirect_uri=https://billing.local.ua/auth/by_data&scope=profile email"
+          href="https://id.softpro.ua/oauth/authorize?response_type=code&provider=google&client_id=photo-client-123&redirect_uri={{coalesce protocol 'https'}}://{{req.raw.headers.host}}/auth/by_data&scope=profile email"
             class="flex items-center justify-center mt-4 text-gray-600 transition-colors duration-300 transform border rounded-lg hover:bg-gray-50">
             <div class="px-4 py-2">
               <svg class="w-6 h-6" viewBox="0 0 40 40">

package/package.json

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