@opengis/fastify-table 2.6.1 → 2.6.2

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

@@ -153,12 +153,12 @@ export default async function filterAPI(req, reply, iscalled) {
         fields?.find?.((item) => item?.name === el.name))
         .map(async (el) => {
         const data = await pg
-            .queryCache(`select array[
-        min(${el.name}),
-        percentile_disc(0.25) within group (order by ${el.name}),
-        percentile_disc(0.5) within group (order by ${el.name}),
-        percentile_disc(0.75) within group (order by ${el.name}),
-        max(${el.name})
+            .queryCache(`select array[
+        min(${el.name}),
+        percentile_disc(0.25) within group (order by ${el.name}),
+        percentile_disc(0.5) within group (order by ${el.name}),
+        percentile_disc(0.75) within group (order by ${el.name}),
+        max(${el.name})
     ] as range from ${table} where ${tableQuery || "1=1"}`, { table })
             .then((res) => {
             if (res.timeout) {

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

@@ -1,6 +1,6 @@
 import { NotFoundError } from "../../../../errors.js";
 import { applyHook, getTemplate, pgClients } from "../../../../utils.js";
-const q = `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 = pg?.pk?.["admin.properties"]

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

@@ -9,12 +9,12 @@ import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import getEditData from "../../crud/controllers/table.js";
 import formatSchema from "./utils/formatSchema.js";
 import { ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
-const q = `select
-    property_key as key,
-    property_json as json,
-    property_int as int,
-    property_text as text
-from admin.properties
+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`;
 export default async function getForm({ pg = pgClients.client, params, user = {}, query = {}, method, }, reply) {
     const time = Date.now();

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

@@ -47,13 +47,13 @@ export async function getTableColumnMeta({ table, template, column, selectName,
         : `id in ( with cc(id, text) as (${select}) select id from cc where (lower("text") ~ $1) )`;
     const counts = pg.queryCache
         ? await pg
-            .queryCache(`SELECT json_object_agg(          (
-            SELECT
-              nspname
-            FROM
-              pg_namespace
-            WHERE
-              oid = relnamespace
+            .queryCache(`SELECT json_object_agg(          (
+            SELECT
+              nspname
+            FROM
+              pg_namespace
+            WHERE
+              oid = relnamespace
           ) || '.' || relname, reltuples::bigint) FROM pg_class WHERE relkind = 'r'`)
             .then((r) => r.rows[0].json_object_agg)
         : {};
@@ -345,11 +345,11 @@ export default async function suggest(req) {
     const whereQuery = where.filter(Boolean).join(" and ") || "true";
     args.push(Math.min(query.limit || meta.limit || limit, limit));
     let sqlSuggest = tableName && column
-        ? `${meta.original}
-          WHERE EXISTS ( SELECT 1 FROM ${tableName} o 
+        ? `${meta.original}
+          WHERE EXISTS ( SELECT 1 FROM ${tableName} o 
             WHERE ${pg.pgType[dataTypeID]?.includes("[]")
             ? `c.id = ANY(o."${column}")`
-            : `o."${column}" IS NOT DISTINCT FROM c.id`} ) and ${whereQuery || "true"}
+            : `o."${column}" IS NOT DISTINCT FROM c.id`} ) and ${whereQuery || "true"}
           ${order} LIMIT $${args.length}::int`
         : `with c(id,text) as ( ${meta.original} where ${whereQuery} ${order}) select * from c LIMIT $${args.length}::int`;
     if (sqlSuggest.includes("{{parent}}")) {

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

@@ -3,8 +3,8 @@ import getData from "../functions/getData.js";
 export default async function tableData(req, reply, called) {
     const { user, params, headers, query, pg = pgClients.client } = req;
     // це можна від користувача
-    const q = `select attr,
-    (select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) 
+    const q = `select attr,
+    (select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) 
     from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`;
     const { rows = [] } = pg?.pk?.["admin.rules"] && pg?.pk?.["admin.account_grants"] && user?.uid
         ? await pg.query(q, [params.table, user.uid])

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

@@ -59,21 +59,21 @@ export default async function tableInfo({ pg = pgClients.client, params, query =
     if (!metaInfoCols.length) {
         throw BadRequestError("invalid meta info: columns not found");
     }
-    const q = `select  ${pk ? `"${pk}" as id,` : ""} 
-                        ${metaInfoCols.join(",")} 
-                        from (select * from ${table} where ${sqlTable ? "true" : where.join(" and ") || "true"}) t 
-                        ${sqlTable} 
-                        ${cardSqlTable} 
-                        where ${where.join(" and ") || "true"} 
+    const q = `select  ${pk ? `"${pk}" as id,` : ""} 
+                        ${metaInfoCols.join(",")} 
+                        from (select * from ${table} where ${sqlTable ? "true" : where.join(" and ") || "true"}) t 
+                        ${sqlTable} 
+                        ${cardSqlTable} 
+                        where ${where.join(" and ") || "true"} 
                         limit 1`.replace(/{{uid}}/g, uid);
     if (query.sql === "1") {
         return q;
     }
     const { rows } = await pg.query(q, [params.id]);
-    const qCount = `select 
-                count(*)::int as total,  
-                count(*) FILTER(WHERE ${[interfaceQuery].filter((el) => el).join(" and ") || "true"})::int as filtered 
-                from ${table} t ${sqlTable} 
+    const qCount = `select 
+                count(*)::int as total,  
+                count(*) FILTER(WHERE ${[interfaceQuery].filter((el) => el).join(" and ") || "true"})::int as filtered 
+                from ${table} t ${sqlTable} 
                 where ${[loadTable.query].filter((el) => el).join(" and ") || "true"} `.replace(/{{uid}}/g, uid);
     const { total, filtered } = params.id
         ? rows.length

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

@@ -355,9 +355,9 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         interfaceQuery1,
     ].filter(Boolean);
     const omitGeometry = !objectId && loadTable?.showGeometryMode === "card";
-    const q1 = `select  ${pk ? `"${pk}" as id,` : ""} 
-  ${objectId || query?.key ? "*" : columnsParam || sqlColumns || cols || "*"} 
-  ${metaCols}
+    const q1 = `select  ${pk ? `"${pk}" as id,` : ""} 
+  ${objectId || query?.key ? "*" : columnsParam || sqlColumns || cols || "*"} 
+  ${metaCols}
   ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry")
         .length &&
         !columnsParam &&
@@ -366,14 +366,14 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             .filter((el) => pg.pgType?.[el.dataTypeID] === "geometry")
             .map((el) => `st_asgeojson("${el.name.replace(/'/g, "''")}")::json as "${el.name.replace(/'/g, "''")}"`)
             .join(",")}`
-        : ""} 
+        : ""} 
   from (select * ${sql
         ?.filter((el) => el.inline && !(isExport && el.export === false))
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t  ${sqlTable} ) t 
-                      
-  ${objectId ? cardSqlTable : ""} 
-  where ${where.join(" and ") || "true"} 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t  ${sqlTable} ) t 
+                      
+  ${objectId ? cardSqlTable : ""} 
+  where ${where.join(" and ") || "true"} 
   ${order} limit $${idx.limit}::bigint offset $${idx.offset}::bigint`;
     if (q1.includes("{{uid}}")) {
         args.push(uid || "");
@@ -458,18 +458,18 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         type: pg.pgType?.[el.dataTypeID],
     }))
         .filter((el) => ["numeric", "double precision"].includes(el.type) && aggColumns[el.name]);
-    const qCount = `select 
-  count(*)::int as total,  
-  count(*) FILTER(WHERE ${filterWhere.join(" and ") || "true"})::int as filtered
+    const qCount = `select 
+  count(*)::int as total,  
+  count(*) FILTER(WHERE ${filterWhere.join(" and ") || "true"})::int as filtered
   ${aggregates.length
         ? `,${aggregates
             .map((el) => `${aggColumns[el.name]}(${el.name}) FILTER(WHERE ${filterWhere.join(" and ") || "true"}) as ${el.name}`)
             .join(",")}`
-        : ""}
+        : ""}
   from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})t 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})t 
   where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
         .join(" and ") || "true"} `.replace(/'{{uid}}'/g, `$${idx1.uid}`);

package/dist/server/routes/widget/controllers/widget.get.js

@@ -39,49 +39,49 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
     }
     const sqls = {
         comment: pg.pk["admin.users"]
-            ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    ${username} as username, u.login, u.avatar
-    from crm.communications c
-    left join admin.users u on u.uid=c.uid 
+            ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    ${username} as username, u.login, u.avatar
+    from crm.communications c
+    left join admin.users u on u.uid=c.uid 
     where entity_id=$1 order by cdate desc`
             : "select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc",
-        history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-      ${username} as username, u.login, u.avatar
-      FROM log.table_changes a
-      left join admin.users u on a.change_user_id = u.uid
-      left join lateral(
-        select json_agg(row_to_json(q)) from (
-          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
-          where change_id=a.change_id
-        )q
-      )b on 1=1
-      where a.change_type != 'INSERT' and b.json_agg is not null and (entity_id=$1 or entity_id in (
-        select communication_id from crm.communications where entity_id=$1
-        union all select checklist_id from crm.checklists where entity_id=$1
-        union all select file_id from crm.files where entity_id=$1) 
-      )
+        history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+      ${username} as username, u.login, u.avatar
+      FROM log.table_changes a
+      left join admin.users u on a.change_user_id = u.uid
+      left join lateral(
+        select json_agg(row_to_json(q)) from (
+          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
+          where change_id=a.change_id
+        )q
+      )b on 1=1
+      where a.change_type != 'INSERT' and b.json_agg is not null and (entity_id=$1 or entity_id in (
+        select communication_id from crm.communications where entity_id=$1
+        union all select checklist_id from crm.checklists where entity_id=$1
+        union all select file_id from crm.files where entity_id=$1) 
+      )
       order by cdate desc limit 100`,
         checklist: pg.pk["admin.users"]
-            ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
-      FROM crm.checklists c
-      left join admin.users u on u.uid=c.uid
+            ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
+      FROM crm.checklists c
+      left join admin.users u on u.uid=c.uid
       where entity_id=$1 order by cdate desc`
             : "SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc",
         file: pg.pk["admin.users"]
-            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
-    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
+            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
+    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
     where entity_id=$1 and file_status<>3 order by cdate desc`
-            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
+            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
       isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
         gallery: pg.pk["admin.users"]
-            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
+            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
     where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
-            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
+            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
       isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
         reaction: "SELECT count(*), reaction_type FROM crm.reactions c where entity_id=$1 group by reaction_type",
     };
@@ -127,7 +127,7 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
     }
     const cdateColumn = columns.find((col) => ["cdate", "created_at"].includes(col.name))?.name;
     const editorDateColumn = columns.find((col) => ["editor_date", "updated_at"].includes(col.name))?.name;
-    const q1 = `select ${username} as author, u.login ${cdateColumn ? `,a.${cdateColumn} as cdate` : ""} ${editorDateColumn ? `,a.${editorDateColumn} as editor_date` : ""} from ${tableName} a 
+    const q1 = `select ${username} as author, u.login ${cdateColumn ? `,a.${cdateColumn} as cdate` : ""} ${editorDateColumn ? `,a.${editorDateColumn} as editor_date` : ""} from ${tableName} a 
   left join admin.users u on a.${authorIdColumn}=u.uid where a.${pk}=$1 limit 1`;
     const data = pg.pk["admin.users"] && pk && tableName
         ? await pg

package/dist/server/routes/widget/controllers/widget.set.js

@@ -68,9 +68,9 @@ export default async function widgetSet(req, reply) {
             uid: user?.uid,
         });
         if (type === "gallery") {
-            await pg.query(`update crm.files set ismain=true 
-      where entity_id=$1 
-      and file_id=$2 
+            await pg.query(`update crm.files set ismain=true 
+      where entity_id=$1 
+      and file_id=$2 
       and (select count(*) = 0 from crm.files where entity_id=$1 and ismain)`, [objectid, rows[0]?.file_id]);
         }
         return {
@@ -111,7 +111,7 @@ export default async function widgetSet(req, reply) {
         });
     // put w/ out file
     if (type === "gallery" && body?.ismain && id) {
-        await pg.query(`update crm.files set ismain=false 
+        await pg.query(`update crm.files set ismain=false 
         where entity_id=$1 and file_id<>$2`, [objectid, id]);
     }
     return reply.status(200).send({

package/dist/server/routes/widget/services/widget.entity.get.js

@@ -36,49 +36,49 @@ export default async function widgetEntityGet({ type, entityType, objectid, uid,
     }
     const sqls = {
         comment: pg.pk["admin.users"]
-            ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    ${username} as username, u.login, u.avatar
-    from crm.communications c
-    left join admin.users u on u.uid=c.uid 
+            ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    ${username} as username, u.login, u.avatar
+    from crm.communications c
+    left join admin.users u on u.uid=c.uid 
     where entity_id=$1 and entity_type=$2 order by cdate desc`
             : "select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 and entity_type=$2 order by cdate desc",
-        history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-      ${username} as username, u.login, u.avatar
-      FROM log.table_changes a
-      left join admin.users u on a.change_user_id = u.uid
-      left join lateral(
-        select json_agg(row_to_json(q)) from (
-          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
-          where change_id=a.change_id
-        )q
-      )b on 1=1
-      where a.change_type != 'INSERT' and b.json_agg is not null and ((entity_id=$1 and entity_type=$2) or entity_id in (
-        select communication_id from crm.communications where entity_id=$1 and entity_type=$2
-        union all select checklist_id from crm.checklists where entity_id=$1 and entity_type=$2
-        union all select file_id from crm.files where entity_id=$1 and entity_type=$2) 
-      )
+        history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+      ${username} as username, u.login, u.avatar
+      FROM log.table_changes a
+      left join admin.users u on a.change_user_id = u.uid
+      left join lateral(
+        select json_agg(row_to_json(q)) from (
+          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
+          where change_id=a.change_id
+        )q
+      )b on 1=1
+      where a.change_type != 'INSERT' and b.json_agg is not null and ((entity_id=$1 and entity_type=$2) or entity_id in (
+        select communication_id from crm.communications where entity_id=$1 and entity_type=$2
+        union all select checklist_id from crm.checklists where entity_id=$1 and entity_type=$2
+        union all select file_id from crm.files where entity_id=$1 and entity_type=$2) 
+      )
       order by cdate desc limit 100`,
         checklist: pg.pk["admin.users"]
-            ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
-      FROM crm.checklists c
-      left join admin.users u on u.uid=c.uid
+            ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
+      FROM crm.checklists c
+      left join admin.users u on u.uid=c.uid
       where entity_id=$1 and entity_type=$2 order by cdate desc`
             : "SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 and entity_type=$2 order by cdate desc",
         file: pg.pk["admin.users"]
-            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
-    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
+            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
+    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
     where entity_id=$1 and entity_type=$2 and file_status<>3 order by cdate desc`
-            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
+            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
       isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and entity_type=$2 and file_status<>3 order by cdate desc`,
         gallery: pg.pk["admin.users"]
-            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
+            ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
     where entity_id=$1 and entity_type=$2 and file_status<>3 and ext = any($3) order by cdate desc`
-            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
+            : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
       isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and entity_type=$2 and file_status<>3 and ext = any($3) order by cdate desc`,
         reaction: "SELECT count(*), reaction_type FROM crm.reactions c where entity_id=$1 and entity_type=$2 group by reaction_type",
     };
@@ -117,7 +117,7 @@ export default async function widgetEntityGet({ type, entityType, objectid, uid,
     }
     const cdateColumn = columns.find((col) => ["cdate", "created_at"].includes(col.name))?.name;
     const editorDateColumn = columns.find((col) => ["editor_date", "updated_at"].includes(col.name))?.name;
-    const q1 = `select ${username} as author, u.login ${cdateColumn ? `,a.${cdateColumn} as cdate` : ""} ${editorDateColumn ? `,a.${editorDateColumn} as editor_date` : ""} from ${entityType} a 
+    const q1 = `select ${username} as author, u.login ${cdateColumn ? `,a.${cdateColumn} as cdate` : ""} ${editorDateColumn ? `,a.${editorDateColumn} as editor_date` : ""} from ${entityType} a 
   left join admin.users u on a.${authorIdColumn}=u.uid where a.${pk}=$1 limit 1`;
     const data = pg.pk["admin.users"] && pk && entityType
         ? await pg

package/dist/server/routes/widget/services/widget.entity.set.js

@@ -75,9 +75,9 @@ export default async function widgetEntitySet({ type, entityType, objectid, id,
             uid,
         }).then((r) => r.rows?.[0]);
         if (type === "gallery") {
-            await pg.query(`update crm.files set ismain=true 
-      where entity_id=$1 and entity_type=$2
-      and file_id=$3
+            await pg.query(`update crm.files set ismain=true 
+      where entity_id=$1 and entity_type=$2
+      and file_id=$3
       and (select count(*) = 0 from crm.files where entity_id=$1 and entity_type=$2 and ismain)`, [objectid, entityType, row?.file_id]);
         }
         return {
@@ -119,7 +119,7 @@ export default async function widgetEntitySet({ type, entityType, objectid, id,
         });
     // put w/ out file
     if (type === "gallery" && body?.ismain && id) {
-        await pg.query(`update crm.files set ismain=false 
+        await pg.query(`update crm.files set ismain=false 
       where entity_id=$1 and entity_type=$2 and file_id<>$3`, [objectid, entityType, id]);
     }
     return {

package/dist/server/templates/page/2factor-recovery.html

@@ -1,102 +1,102 @@
-<!DOCTYPE html>
-<html lang="en" dir="" class="relative min-h-full">
-  <head>
-    <!-- scripts -->
-    <script src="https://cdn.tailwindcss.com"></script>
-  </head>
-  <body class="bg-white dark:bg-neutral-900">
-    <main class="flex min-h-full">    
-
-      <!-- Content -->
-      <div class="grow px-5">
-        <div class="h-full min-h-screen sm:w-[448px] flex flex-col justify-center mx-auto space-y-5">
-
-          {{#if codes}}
-            <div><h1 class="text-xl sm:text-2xl font-semibold text-gray-800 dark:text-neutral-200">Your recovery codes:</h1></div>
-          {{/if}}
-          {{#if recovery}}
-            <div>
-              <a href="/2factor/recovery" class="py-2.5 px-3 w-full inline-flex justify-center items-center gap-x-2 text-sm font-semibold rounded-lg border border-transparent bg-blue-600 text-white hover:bg-blue-700 disabled:opacity-50 disabled:pointer-events-none dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-neutral-600">
-                Send recovery code via E-mail
-              </a>
-                <h1 class="text-xl sm:text-2xl font-semibold text-gray-800 dark:text-neutral-200">Reset 2factor settings via recovery code:</h1>
-            </div>
-          {{/if}}
-
-          <form action="/2factor/recovery" method="post">
-            <div class="space-y-5">
-              <div>
-                <label for="hs-pro-dale" class="block mb-2 text-sm font-medium text-gray-800 dark:text-white">
-                  Code
-                </label>
-
-                {{#if query.recovery}}
-                <input type="text" name="code" id="hs-pro-dale" class="py-2.5 px-3 block w-full border-gray-200 rounded-lg text-sm placeholder:text-gray-400 focus:border-blue-500 focus:ring-blue-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-transparent dark:border-neutral-700 dark:text-neutral-300 dark:placeholder:text-white/60 dark:focus:ring-neutral-600" placeholder="999999">
-                {{^}}
-                
-                <input type="text" name="code"  class="form-input hidden">
-                   <div class="space-y-5">
-                   <div class="my-3 flex gap-x-2" data-hs-pin-input>
-                  <input id="input-1" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
-                  <input id="input-2" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
-                  <input id="input-3" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
-                  <input id="input-4" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
-                  <input id="input-5" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
-                  <input id="input-6" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
-                </div>
-                </div>
-                {{/if}}
-              </div>
-
-              <button type="submit" class="py-2.5 px-3 w-full inline-flex justify-center items-center gap-x-2 text-sm font-semibold rounded-lg border border-transparent bg-blue-600 text-white hover:bg-blue-700 disabled:opacity-50 disabled:pointer-events-none dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-neutral-600">
-                Reset 2factor settings
-              </button>
-            </div>
-          </form>
-
-        </div>
-      </div>
-      <!-- End Content -->
-    </main><script>
-  const inputs = document.querySelectorAll(".input-code");
-  const formInput = document.querySelector(".form-input");
-
-  const inputTextToInput = (event) => {
-    const input = event.target;
-    const value = input.value;
-
-    if (value.length > 1) {
-      input.value = value.slice(-1); 
-    }
-
-    const currentIndex = Array.from(inputs).indexOf(input);
-    if (value && currentIndex < inputs.length - 1) {
-      inputs[currentIndex + 1].focus();
-    }
-
-    const combinedValue = Array.from(inputs)
-      .map((input) => input.value)
-      .join("");
-
-    formInput.value = combinedValue;
-  };
-
-  const handleBackspace = (event) => {
-    const input = event.target;
-
-    if (event.key === "Backspace" && input.value === "") {
-      const currentIndex = Array.from(inputs).indexOf(input);
-      if (currentIndex > 0) {
-        inputs[currentIndex - 1].focus();
-      }
-    }
-  };
-
-  inputs.forEach((input) => {
-    input.addEventListener("input", inputTextToInput);
-    input.addEventListener("keydown", handleBackspace);
-  });
-</script>
-  </body>
-
+<!DOCTYPE html>
+<html lang="en" dir="" class="relative min-h-full">
+  <head>
+    <!-- scripts -->
+    <script src="https://cdn.tailwindcss.com"></script>
+  </head>
+  <body class="bg-white dark:bg-neutral-900">
+    <main class="flex min-h-full">    
+
+      <!-- Content -->
+      <div class="grow px-5">
+        <div class="h-full min-h-screen sm:w-[448px] flex flex-col justify-center mx-auto space-y-5">
+
+          {{#if codes}}
+            <div><h1 class="text-xl sm:text-2xl font-semibold text-gray-800 dark:text-neutral-200">Your recovery codes:</h1></div>
+          {{/if}}
+          {{#if recovery}}
+            <div>
+              <a href="/2factor/recovery" class="py-2.5 px-3 w-full inline-flex justify-center items-center gap-x-2 text-sm font-semibold rounded-lg border border-transparent bg-blue-600 text-white hover:bg-blue-700 disabled:opacity-50 disabled:pointer-events-none dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-neutral-600">
+                Send recovery code via E-mail
+              </a>
+                <h1 class="text-xl sm:text-2xl font-semibold text-gray-800 dark:text-neutral-200">Reset 2factor settings via recovery code:</h1>
+            </div>
+          {{/if}}
+
+          <form action="/2factor/recovery" method="post">
+            <div class="space-y-5">
+              <div>
+                <label for="hs-pro-dale" class="block mb-2 text-sm font-medium text-gray-800 dark:text-white">
+                  Code
+                </label>
+
+                {{#if query.recovery}}
+                <input type="text" name="code" id="hs-pro-dale" class="py-2.5 px-3 block w-full border-gray-200 rounded-lg text-sm placeholder:text-gray-400 focus:border-blue-500 focus:ring-blue-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-transparent dark:border-neutral-700 dark:text-neutral-300 dark:placeholder:text-white/60 dark:focus:ring-neutral-600" placeholder="999999">
+                {{^}}
+                
+                <input type="text" name="code"  class="form-input hidden">
+                   <div class="space-y-5">
+                   <div class="my-3 flex gap-x-2" data-hs-pin-input>
+                  <input id="input-1" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
+                  <input id="input-2" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
+                  <input id="input-3" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
+                  <input id="input-4" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
+                  <input id="input-5" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
+                  <input id="input-6" type="text" class="input-code block w-[38px] h-[38px] text-center border rounded-md focus:outline-blue-600" >
+                </div>
+                </div>
+                {{/if}}
+              </div>
+
+              <button type="submit" class="py-2.5 px-3 w-full inline-flex justify-center items-center gap-x-2 text-sm font-semibold rounded-lg border border-transparent bg-blue-600 text-white hover:bg-blue-700 disabled:opacity-50 disabled:pointer-events-none dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-neutral-600">
+                Reset 2factor settings
+              </button>
+            </div>
+          </form>
+
+        </div>
+      </div>
+      <!-- End Content -->
+    </main><script>
+  const inputs = document.querySelectorAll(".input-code");
+  const formInput = document.querySelector(".form-input");
+
+  const inputTextToInput = (event) => {
+    const input = event.target;
+    const value = input.value;
+
+    if (value.length > 1) {
+      input.value = value.slice(-1); 
+    }
+
+    const currentIndex = Array.from(inputs).indexOf(input);
+    if (value && currentIndex < inputs.length - 1) {
+      inputs[currentIndex + 1].focus();
+    }
+
+    const combinedValue = Array.from(inputs)
+      .map((input) => input.value)
+      .join("");
+
+    formInput.value = combinedValue;
+  };
+
+  const handleBackspace = (event) => {
+    const input = event.target;
+
+    if (event.key === "Backspace" && input.value === "") {
+      const currentIndex = Array.from(inputs).indexOf(input);
+      if (currentIndex > 0) {
+        inputs[currentIndex - 1].focus();
+      }
+    }
+  };
+
+  inputs.forEach((input) => {
+    input.addEventListener("input", inputTextToInput);
+    input.addEventListener("keydown", handleBackspace);
+  });
+</script>
+  </body>
+
 </html>