@opengis/fastify-table 2.4.0 → 2.4.2

package/dist/server/plugins/grpc/utils/convertp.proto

@@ -1,137 +1,137 @@
-syntax = "proto3";
-
-service Convert {
-  rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
-  rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
-  rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
-  rpc htmlToPdf(htmlToPdfParams) returns (FileBase64) {}
-  rpc excelToJson(excelToJsonParams) returns (FileBase64) {}
-  rpc xmlToJson(xmlToJsonParams) returns (FileBase64) {}
-  rpc htmlToDoc(htmlToDocParams) returns (FileBase64) {}
-  rpc htmlToImage(htmlToImageParams) returns (FileBase64) {}
-  rpc geojsonToShp(geojsonToShpParams) returns (FileBase64) {}
-  rpc shpToGeojson(shpToGeojsonParams) returns (FileBase64) {}
-  rpc docToPDF(docToPDFParams) returns (FileBase64) {}
-  rpc mergeImages(mergeImagesIn) returns (FileBase64) {}
-  rpc resizeImage(resizeImageIn) returns (FileBase64) {}
-  rpc jsonToYaml(jsonToYamlIn) returns (FileBase64) {}
-  rpc yamlToJson(yamlToJsonIn) returns (FileBase64) {}
-  rpc log(log_in) returns (log_out) {}
-  rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
-}
-
-message jsonToYamlIn {
-  string json = 1;
-}
-
-message yamlToJsonIn {
-  string yaml = 1;
-}
-
-message resizeImageIn {
-  string base64 = 1;
-  uint64 width = 2;
-  uint64 height = 3;
-  uint32 quality = 4;
-  uint32 subsampling = 5;
-}
-
-message pdfToImgIn {
-  string pdfPath = 1;
-  string imgPath = 2;
-}
-
-message pdfToImgOut {
-  string imgPath = 1;
-}
-
-message log_in {
-	uint32 rows = 1;
-	string level = 2;
-}
-
-message log_out {
-	repeated string logs = 1;
-}
-
-enum mergeImageFormat {
-  VERTICAL = 0;
-  HORIZONTAL = 1;
-  OVERLAY = 2;
-}
-
-message imageMeta {
-  string base64 = 1;
-  mergeImageFormat mergeFormat = 2;
-}
-
-message mergeImagesIn {
-  repeated string images = 1;
-  repeated imageMeta imagesMeta = 2;
-  string background = 3;
-  string mergeFormat = 4;
-}
-
-message docToPDFParams {
-  string base64 = 1;
-  string to = 2;
-  string ext = 3;
-}
-
-message shpToGeojsonParams {
-  string base64 = 1;
-}
-
-message geojsonToShpParams {
-  string geojson = 1;
-  string proj = 2;
-}
-
-message xmlToJsonParams {
-  string xml = 1;
-}
-
-message jsonToXlsParams {
-  string json = 1;
-  string header = 2;
-  string subheader = 3;
-  string colmodel = 4;
-}
-
-message csvToXlsParams {
-  string csv = 1;
-  string header = 2;
-  string subheader = 3;
-  string separator = 4;
-}
-
-message excelToJsonParams {
-  string base64 = 1;
-  string type = 2;
-  string delimiter = 3;
-  string encoding = 4;
-}
-
-message htmlToPdfParams {
-  string html = 1;
-  string pdfPageConfig = 2;
-}
-
-message pdfMergeParams {
-  repeated string mergeFiles = 1;
-}
-
-message htmlToImageParams {
-  string html = 1;
-  string format = 2;
-  uint64 width = 3;
-  uint64 height = 4;
-}
-
-message htmlToDocParams {
-  string html = 1;
-}
-
-message FileBase64 {
-  string result = 1;
+syntax = "proto3";
+
+service Convert {
+  rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
+  rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
+  rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
+  rpc htmlToPdf(htmlToPdfParams) returns (FileBase64) {}
+  rpc excelToJson(excelToJsonParams) returns (FileBase64) {}
+  rpc xmlToJson(xmlToJsonParams) returns (FileBase64) {}
+  rpc htmlToDoc(htmlToDocParams) returns (FileBase64) {}
+  rpc htmlToImage(htmlToImageParams) returns (FileBase64) {}
+  rpc geojsonToShp(geojsonToShpParams) returns (FileBase64) {}
+  rpc shpToGeojson(shpToGeojsonParams) returns (FileBase64) {}
+  rpc docToPDF(docToPDFParams) returns (FileBase64) {}
+  rpc mergeImages(mergeImagesIn) returns (FileBase64) {}
+  rpc resizeImage(resizeImageIn) returns (FileBase64) {}
+  rpc jsonToYaml(jsonToYamlIn) returns (FileBase64) {}
+  rpc yamlToJson(yamlToJsonIn) returns (FileBase64) {}
+  rpc log(log_in) returns (log_out) {}
+  rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
+}
+
+message jsonToYamlIn {
+  string json = 1;
+}
+
+message yamlToJsonIn {
+  string yaml = 1;
+}
+
+message resizeImageIn {
+  string base64 = 1;
+  uint64 width = 2;
+  uint64 height = 3;
+  uint32 quality = 4;
+  uint32 subsampling = 5;
+}
+
+message pdfToImgIn {
+  string pdfPath = 1;
+  string imgPath = 2;
+}
+
+message pdfToImgOut {
+  string imgPath = 1;
+}
+
+message log_in {
+	uint32 rows = 1;
+	string level = 2;
+}
+
+message log_out {
+	repeated string logs = 1;
+}
+
+enum mergeImageFormat {
+  VERTICAL = 0;
+  HORIZONTAL = 1;
+  OVERLAY = 2;
+}
+
+message imageMeta {
+  string base64 = 1;
+  mergeImageFormat mergeFormat = 2;
+}
+
+message mergeImagesIn {
+  repeated string images = 1;
+  repeated imageMeta imagesMeta = 2;
+  string background = 3;
+  string mergeFormat = 4;
+}
+
+message docToPDFParams {
+  string base64 = 1;
+  string to = 2;
+  string ext = 3;
+}
+
+message shpToGeojsonParams {
+  string base64 = 1;
+}
+
+message geojsonToShpParams {
+  string geojson = 1;
+  string proj = 2;
+}
+
+message xmlToJsonParams {
+  string xml = 1;
+}
+
+message jsonToXlsParams {
+  string json = 1;
+  string header = 2;
+  string subheader = 3;
+  string colmodel = 4;
+}
+
+message csvToXlsParams {
+  string csv = 1;
+  string header = 2;
+  string subheader = 3;
+  string separator = 4;
+}
+
+message excelToJsonParams {
+  string base64 = 1;
+  string type = 2;
+  string delimiter = 3;
+  string encoding = 4;
+}
+
+message htmlToPdfParams {
+  string html = 1;
+  string pdfPageConfig = 2;
+}
+
+message pdfMergeParams {
+  repeated string mergeFiles = 1;
+}
+
+message htmlToImageParams {
+  string html = 1;
+  string format = 2;
+  uint64 width = 3;
+  uint64 height = 4;
+}
+
+message htmlToDocParams {
+  string html = 1;
+}
+
+message FileBase64 {
+  string result = 1;
 }

package/dist/server/plugins/grpc/utils/htmlTemplate.js

@@ -1,13 +1,13 @@
 // TODO delete style when fully switch to the new code with merge
-const createTemplate = ({ domain, html }) => `<!DOCTYPE html>\
-<html>
-<head>
-  <base uri="http://${domain}/">
-  <meta charset="utf-8">
-  <style>html, body {font-size: 10pt !important;}</style>
-</head>
-<body>
-  ${html || ''}
-</body>
+const createTemplate = ({ domain, html }) => `<!DOCTYPE html>\
+<html>
+<head>
+  <base uri="http://${domain}/">
+  <meta charset="utf-8">
+  <style>html, body {font-size: 10pt !important;}</style>
+</head>
+<body>
+  ${html || ''}
+</body>
 </html`;
 export default createTemplate;

package/dist/server/plugins/grpc/utils/office2pdf.proto

@@ -1,14 +1,14 @@
-syntax = "proto3";
-
-service OfficeConverterService {
-  rpc OfficeToPdf(OfficeToPdfRequest) returns (OfficeToPdfResponse) {}
-}
-
-message OfficeToPdfRequest {
-  string file = 1;
-  string ext = 2;
-}
-
-message OfficeToPdfResponse {
-  string file = 1;
+syntax = "proto3";
+
+service OfficeConverterService {
+  rpc OfficeToPdf(OfficeToPdfRequest) returns (OfficeToPdfResponse) {}
+}
+
+message OfficeToPdfRequest {
+  string file = 1;
+  string ext = 2;
+}
+
+message OfficeToPdfResponse {
+  string file = 1;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"errorMessage.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/errorMessage.ts"],"names":[],"mappings":"AAOA,iBAAS,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,OAuB/C;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"errorMessage.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/errorMessage.ts"],"names":[],"mappings":"AAOA,iBAAS,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,OA0B/C;AAED,eAAe,YAAY,CAAC"}

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

@@ -7,6 +7,9 @@ function errorMessage(error, status) {
     const hook = applyHookSync("errorMessage", error);
     if (hook)
         return hook;
+    if (error.name === "FastifyError") {
+        return error.message;
+    }
     if (error.validation) {
         return error.message;
     }

package/dist/server/plugins/metric/loggerSystem.js

@@ -12,7 +12,7 @@ const rclient2 = getRedis({ db: 2 });
 // const rclient10 = getRedis({ db: 10 });
 const filesFolder = getFolder(config);
 const redisKey = "logger-process-online";
-const sqlQuery = `select datname as dbname, application_name as app, client_addr as client_ip, 
+const sqlQuery = `select datname as dbname, application_name as app, client_addr as client_ip, 
 (now()-backend_start)::text as msec, state, query from pg_stat_activity where datname=$1`;
 const prev = {};
 const cpuUsage = () => {

package/dist/server/plugins/pg/funcs/autoIndex.js

@@ -43,7 +43,7 @@ export default async function autoIndex({ table, columns: filter1, pg = pgClient
     }
     const cols = tbs
         ? await pg
-            .query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
+            .query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
     FROM  pg_attribute WHERE  attrelid::regclass::text = $1 and attname = any($2::text[])`, [tbs, attrs])
             .then((el) => el.rows || [])
         : [];
@@ -78,13 +78,13 @@ export default async function autoIndex({ table, columns: filter1, pg = pgClient
                 qIndex.push(`CREATE INDEX if not exists ${name}_lower ON ${el.nspname}.${el.relname} USING ${indexUsing} (lower(${el.aname}) ${suffix})`);
             }
             if (indexUsing === "gist") {
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "gist1")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "gist1")}  
           ON ${el.nspname}.${el.relname} USING gist (${el.aname})`);
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area")}  
           ON ${el.nspname}.${el.relname} USING btree (st_area(st_transform(${el.aname},3857)))`);
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area_true")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area_true")}  
           ON ${el.nspname}.${el.relname} USING btree (st_area(${el.aname}, true))`);
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "4326")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "4326")}  
           ON ${el.nspname}.${el.relname} USING gist (st_transform(${el.aname},4326))`);
             }
         }

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -21,9 +21,9 @@ export default async function getMeta(opt, nocache) {
     }
     const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
     const pks1 = await pg
-        .query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 
-  FROM pg_constraint c 
-    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
+        .query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 
+  FROM pg_constraint c 
+    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
   WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table])
         .then((el) => el.rows[0].pks1 || {});
     const pk = table.startsWith("public.")
@@ -32,13 +32,13 @@ export default async function getMeta(opt, nocache) {
     const geomColumns = fields.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry");
     const geomAttr = geomColumns.find((el) => el.name === "geom_4326") || geomColumns[0];
     const dbColumns = await pg
-        .query(`select json_object_agg(
-    attname, 
-    json_build_object(
-      'title', pg_catalog.col_description(attrelid,attnum)
-      /*,'type', atttypid::regtype */
-    )
-  ) from pg_catalog.pg_attribute a 
+        .query(`select json_object_agg(
+    attname, 
+    json_build_object(
+      'title', pg_catalog.col_description(attrelid,attnum)
+      /*,'type', atttypid::regtype */
+    )
+  ) from pg_catalog.pg_attribute a 
   where attrelid=$1::regclass and attnum>0`, [table])
         .then((el) => el.rows?.[0]?.json_object_agg || {});
     fields.forEach((el) => Object.assign(el, { ...(dbColumns[el.name] || {}) }));

package/dist/server/plugins/pg/funcs/init.js

@@ -22,15 +22,15 @@ async function init(client) {
         .query(`SELECT json_object_agg(t.oid:: text, pg_catalog.format_type(t.oid, NULL)) FROM pg_catalog.pg_type t`)
         .then((el) => el.rows[0]?.json_object_agg || {});
     const pks = await client
-        .query(`
-    SELECT
-      connamespace::regnamespace::text,
-      conrelid::regclass,
-      (
-        SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]
-      ) as pk
-    FROM pg_constraint c
-    WHERE contype = 'p'
+        .query(`
+    SELECT
+      connamespace::regnamespace::text,
+      conrelid::regclass,
+      (
+        SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]
+      ) as pk
+    FROM pg_constraint c
+    WHERE contype = 'p'
     AND connamespace::regnamespace::text NOT IN ('sde')`)
         .then((el) => el.rows || []);
     const pk = pks.reduce((acc, curr) => ({
@@ -40,36 +40,36 @@ async function init(client) {
             : curr.conrelid]: curr.pk,
     }), {});
     const tlist = await client
-        .query(`SELECT
-        array_agg(
-          (
-            SELECT
-              nspname
-            FROM
-              pg_namespace
-            WHERE
-              oid = relnamespace
-          ) || '.' || relname
-        ) tlist
-      FROM
-        pg_class
-      WHERE
+        .query(`SELECT
+        array_agg(
+          (
+            SELECT
+              nspname
+            FROM
+              pg_namespace
+            WHERE
+              oid = relnamespace
+          ) || '.' || relname
+        ) tlist
+      FROM
+        pg_class
+      WHERE
         relkind IN ('r', 'v', 'm')`)
         .then((d) => d.rows[0].tlist);
     const rows = await client
-        .query(`SELECT
-      (
-        SELECT
-          nspname
-        FROM
-          pg_namespace
-        WHERE
-          oid = relnamespace
-      ) || '.' || relname AS tname,
-      relkind
-    FROM
-      pg_class
-    WHERE
+        .query(`SELECT
+      (
+        SELECT
+          nspname
+        FROM
+          pg_namespace
+        WHERE
+          oid = relnamespace
+      ) || '.' || relname AS tname,
+      relkind
+    FROM
+      pg_class
+    WHERE
       relkind IN ('r', 'v', 'm')`)
         .then((el) => el.rows || []);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});

package/dist/server/plugins/sqlite/funcs/init.js

@@ -3,28 +3,28 @@ function init(client) {
     if (!client) {
         return;
     }
-    const rows = client.prepare(`WITH tables AS (
-    SELECT name AS table_name
-    FROM sqlite_master
-    WHERE type = 'table' AND name NOT LIKE 'sqlite_%'
-  ),
-  pk_columns AS (
-    SELECT
-      m.name AS table_name,
-      ti.name AS column_name,
-      ti.pk
-    FROM sqlite_master m
-    JOIN pragma_table_info(m.name) AS ti
-    WHERE ti.pk = 1
-  )
-  SELECT table_name, column_name
-  FROM pk_columns
-  WHERE table_name IN (
-    SELECT table_name
-    FROM pk_columns
-    GROUP BY table_name
-    HAVING COUNT(*) = 1
-  )
+    const rows = client.prepare(`WITH tables AS (
+    SELECT name AS table_name
+    FROM sqlite_master
+    WHERE type = 'table' AND name NOT LIKE 'sqlite_%'
+  ),
+  pk_columns AS (
+    SELECT
+      m.name AS table_name,
+      ti.name AS column_name,
+      ti.pk
+    FROM sqlite_master m
+    JOIN pragma_table_info(m.name) AS ti
+    WHERE ti.pk = 1
+  )
+  SELECT table_name, column_name
+  FROM pk_columns
+  WHERE table_name IN (
+    SELECT table_name
+    FROM pk_columns
+    GROUP BY table_name
+    HAVING COUNT(*) = 1
+  )
   ORDER BY table_name;`).all();
     const pk = Object.fromEntries(rows.map((row) => [row.table_name, row.column_name]));
     const tlist = client.prepare('SELECT name FROM sqlite_master WHERE type=\'table\' AND name NOT LIKE \'sqlite_%\';').all().reduce((acc, curr) => {

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

@@ -6,7 +6,7 @@ async function getCustomQuery({ pg, table, customFilter }) {
         ?.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)
+            .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 || [])
         : [];

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

@@ -4,7 +4,7 @@ import getTemplate from "./getTemplate.js";
 const loadCls = {};
 const sqls = {
     sql: "select data from admin.user_cls where name=$1 union all select data from admin.cls where name=$1",
-    json: `select json_agg(json_build_object('id', code, 'text', name, 'icon', icon, 'color', color)) as data from admin.user_cls where parent=$1
+    json: `select json_agg(json_build_object('id', code, 'text', name, 'icon', icon, 'color', color)) as data from admin.user_cls where parent=$1
   union all select json_agg(json_build_object('id', code, 'text', name, 'icon', icon, 'color', color)) as data from admin.cls where parent=$1`,
 };
 export default async function getSelect(name, pg = pgClients.client, nocache = false) {

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

@@ -18,7 +18,7 @@ export default async function gisIRColumn({ pg = pgClients.client, layer, column
         custom,
     });
     const { tlist } = await pg
-        .query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+        .query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
   where relkind in ('r','v','m')`)
         .then((el) => el.rows?.[0] || {});
     const tableName = body?.table || layer;
@@ -33,9 +33,9 @@ export default async function gisIRColumn({ pg = pgClients.client, layer, column
     const colField = pg.pgType?.[col.dataTypeID]?.includes("[]")
         ? `unnest(${column})`
         : column;
-    const q = `select ${colField} as id, count(*)::int from (
+    const q = `select ${colField} as id, count(*)::int from (
     ${fData?.optimizedSQL ||
-        `select * from ${tableName} where ${body?.query || "true"}`}
+        `select * from ${tableName} where ${body?.query || "true"}`}
   )t group by ${colField} order by count desc limit 15`;
     if (sql)
         return q;

package/dist/server/plugins/usercls/index.js

@@ -139,9 +139,9 @@ export async function getUserClsList({ name, search, sql, custom, type, }, pg =
         .filter(Boolean)
         .join(" and ") || "1=1";
     console.log(name, search, where);
-    const customQuery = `select true as custom, name, type, description, alias, case when type = 'sql' then 1 else (select count(*) from admin.user_cls where parent=t.name limit 1) end as count 
+    const customQuery = `select true as custom, name, type, description, alias, case when type = 'sql' then 1 else (select count(*) from admin.user_cls where parent=t.name limit 1) end as count 
   from admin.user_cls t where parent is null and ${where} and ${typeStr ? `type='${typeStr}'` : "true"}`;
-    const gitQuery = `select false as custom, name, type, null as description, null as alias, case when type = 'sql' then 1 else (select count(*) from admin.cls where parent=t.name limit 1) end as count 
+    const gitQuery = `select false as custom, name, type, null as description, null as alias, case when type = 'sql' then 1 else (select count(*) from admin.cls where parent=t.name limit 1) end as count 
   from admin.cls t where parent is null and ${where.replace(/admin.user_cls/g, "admin.cls")} and ${typeStr ? `type='${typeStr}'` : "true"}`;
     const q = [
         custom !== "0" ? customQuery : null,

package/dist/server/routes/access/controllers/access.group.js

@@ -10,18 +10,18 @@ export default async function accessGroup({ pg = pgClients.client, params, user
         user,
     });
     const routes = await pg
-        .query(`select a.route_id as path, b.actions from admin.routes a 
-    left join admin.role_access b on a.route_id=b.route_id
+        .query(`select a.route_id as path, b.actions from admin.routes a 
+    left join admin.role_access b on a.route_id=b.route_id
     where b.role_id=$1`, [params.id])
         .then((el) => el.rows || []);
     const resources = await pg
-        .query(`select resource_id, actions from admin.role_access
+        .query(`select resource_id, actions from admin.role_access
   where resource_id is not null and role_id=$1`, [params.id])
         .then((el) => el.rows || []);
     const users = await pg
-        .query(`select user_uid as id, user_name as name, access_granted, 
-    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
-    left join admin.users b on a.user_uid=b.uid
+        .query(`select user_uid as id, user_name as name, access_granted, 
+    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
+    left join admin.users b on a.user_uid=b.uid
     where a.role_id=$1`, [params.id])
         .then((el) => el.rows || []);
     return { routes, resources, users };

package/dist/server/routes/access/controllers/access.group.post.js

@@ -30,20 +30,20 @@ export default async function accessGroupPost({ pg = pgClients.client, params, u
             .filter((el) => el.resource && el.actions)
             .map((el) => pg.query("insert into admin.role_access(role_id,resource_id,route_id,actions)   values ($1,$2,$3,$4)", [id, el.resource, el.path, el.actions])));
         const rows = await pg
-            .query(`select a.route_id as path, b.actions as actions from admin.routes a 
-            left join admin.role_access b on a.route_id=b.route_id
+            .query(`select a.route_id as path, b.actions as actions from admin.routes a 
+            left join admin.role_access b on a.route_id=b.route_id
             where b.role_id=$1`, [id])
             .then((el) => el.rows || []);
         const resources = await pg
-            .query(`select resource_id, actions from admin.role_access
+            .query(`select resource_id, actions from admin.role_access
       where resource_id is not null and role_id=$1`, [id])
             .then((el) => el.rows || []);
         if (!users?.length) {
             return reply.status(200).send({ id, routes: rows, resources });
         }
     }
-    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
-    insert into admin.user_roles(role_id,user_uid,access_granted)
+    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
+    insert into admin.user_roles(role_id,user_uid,access_granted)
     values ${users
         .filter((el) => el?.id)
         .map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${user?.uid?.replace(/'/g, "''")}')`)}`;