@opengis/fastify-table 1.1.92 → 1.1.94

package/index.js

@@ -71,6 +71,8 @@ async function plugin(fastify, opt) {
   // core templates && cls
   const filename = fileURLToPath(import.meta.url);
   const cwd = path.dirname(filename);
+
+  config.templates?.forEach(el => addTemplateDir(el));
   addTemplateDir(path.join(cwd, 'module/core'));
 }
 export default fp(plugin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.92",
+  "version": "1.1.94",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/plugins/crud/funcs/dataDelete.js

@@ -9,7 +9,7 @@ export default async function dataDelete({
   table, id, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
-  const { pk } = await getMeta(table);
+  const { pk } = await getMeta({ pg, table });
   if (!pg.tlist?.includes(table)) return 'table not exist';
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
   //  console.log(updateDataset);

package/server/plugins/crud/funcs/dataInsert.js

@@ -10,7 +10,7 @@ export default async function dataInsert({
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   if (!data) return null;
-  const { columns } = await getMeta(table);
+  const { columns } = await getMeta({ pg, table });
   if (!columns) return null;
 
   const names = columns.map((el) => el.name);

package/server/plugins/crud/funcs/dataUpdate.js

@@ -23,7 +23,7 @@ export default async function dataUpdate({
   if (!data || !table || !id) return null;
 
   const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta(table);
+  const { columns, pk } = await getMeta({ pg, table });
 
   const names = columns?.map((el) => el.name);
 
@@ -50,7 +50,7 @@ export default async function dataUpdate({
     Object.assign(srids, srids1);
   }
 
-  const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns},` : ''}
+  const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? ',' : ''}` : ''}
   ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326))?.join(',')} 
   WHERE ${pk} = $1 returning *`;
   // console.log(updateQuery, filterValue);

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

@@ -1,12 +1,22 @@
+import pgClients from '../../pg/pgClients.js';
 import getTemplate from './getTemplate.js';
 
 const loadCls = {};
 
-export default async function getSelect(name) {
+const sqls = {
+  sql: '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.cls where parent=$1',
+};
+
+export default async function getSelect(name, pg = pgClients.client) {
   if (loadCls[name]) return loadCls[name];
 
-  const clsData = await getTemplate(['cls', 'select'], name);
-  if (!clsData) { return null; }
+  const clsDataGIT = await getTemplate(['cls', 'select'], name);
+  const { type } = !clsDataGIT && pg.pk?.['admin.cls'] ? await pg.query('select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
+  const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
+  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : {};
+  const clsData = clsDataGIT || clsDataDB;
+  if (!clsData) return null;
 
   //  console.log(clsData);
   if (clsData && Array.isArray(clsData)) {

package/server/plugins/table/funcs/getSelectMeta.js

@@ -10,7 +10,7 @@ const selectMeta = {};
 export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
-  const cls = await getSelect(name);
+  const cls = await getSelect(name, pg);
 
   if (!cls) return null;
   if (cls.arr) return cls;

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

@@ -4,13 +4,14 @@ import getFilterSQL from './getFilterSQL/index.js';
 import getTemplate from './getTemplate.js';
 import pgClients from '../../pg/pgClients.js';
 import config from '../../../../config.js';
+import getSelectVal from './metaFormat/getSelectVal.js';
 
 export default async function gisIRColumn({
   pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
 }) {
   const time = Date.now();
 
-  const sel = await getSelect(query.cls || column);
+  const sel = await getSelect(query.cls || column, pg);
 
   const body = await getTemplate('table', layer);
   const fData = await getFilterSQL({
@@ -58,7 +59,9 @@ export default async function gisIRColumn({
 
   const { rows } = await pg.query(q);
   const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
+  const select = await getSelectVal({
+    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
+  });
   rows.forEach((el) => {
     const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
     Object.assign(el, data || {});

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

@@ -6,7 +6,7 @@ const selectIds = {};
 export default async function getSelectVal({ pg = pgClients.client, name, values: valuesOrigin }) {
   if (!valuesOrigin?.length) return null;
   const values = valuesOrigin.map(el => el.toString());
-  const cls = await getSelect(name);
+  const cls = await getSelect(name, pg);
 
   // === array  ===
   if (cls?.arr && Array.isArray(cls?.arr)) {

package/server/routes/crud/controllers/table.js

@@ -57,10 +57,10 @@ export default async function tableAPI(req) {
 
   const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${tableName} limit 0`) : {};
   const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
-    : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') && schema?.[col]?.type === 'Geom' ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
+    : fields.map((el) => (el?.name?.includes('geom') && pg.pgType[el?.dataTypeID] === 'geometry' ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
   const where = [`"${pk}" = $1`, loadTable.query, accessQuery].filter((el) => el);
-  const geom = columnList.includes('geom') ? ',st_asgeojson(geom)::json as geom' : '';
+  const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
   const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${tableName} t where ${where.join(' and ') || 'true'} limit 1`;
 
   if (query?.sql === '1') return q;

package/server/routes/table/controllers/card.js

@@ -41,14 +41,14 @@ export default async function card(req) {
   if (!pk) return { message: `table not found: ${table}`, status: 404 };
 
   const cols = columns.map((el) => el.name || el).join(',');
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
+
   const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
   const cardSqlFiltered = hookData?.id || params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
   const cardSqlTable = cardSqlFiltered?.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
 
   const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
   const cardColumns = cardSqlFiltered?.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? 'st_asgeojson(geom)::json as geom,' : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
   where ${where.join(' and ') || 'true'} limit 1`;
 
   if (query.sql === '1') { return q; }

package/server/routes/table/controllers/data.js

@@ -94,7 +94,7 @@ export default async function dataAPI(req) {
 
   const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
   const q = `select  ${pk ? `"${pk}" as id,` : ''} 
-                     ${dbColumns.map((el) => el.name || el).includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} 
+                     ${dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? 'st_asgeojson(geom)::json as geom,' : ''} 
                      ${query.id || query.key ? '*' : sqlColumns || cols || '*'} 
                      ${metaCols} 
                      ${cardColumns} 

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

@@ -27,7 +27,7 @@ export default async function filterAPI(req) {
 
   const filters = loadTable?.filters || loadTable?.filterList || [];
   await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-    const cls = await getSelect(el.data);
+    const cls = await getSelect(el.data, req.pg);
     if (!cls?.arr || !loadTable.table) return;
     const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
     const countArr = req.pg.pgType[dataTypeID]?.includes('[]')