@opengis/fastify-table 1.1.36 → 1.1.38

package/server/migrations/properties.sql

@@ -67,11 +67,9 @@ ALTER TABLE admin.user_properties ADD CONSTRAINT user_properties_key_uid_unique
 
 COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';
 
-drop table if exists admin.custom_column cascade;
-
 CREATE TABLE IF NOT EXISTS admin.custom_column();
 ALTER TABLE admin.custom_column DROP CONSTRAINT IF EXISTS admin_custom_column_column_id_pkey cascade;
-alter table admin.custom_column drop constraint if exists admin_custom_column_key_entity_uid_unique;
+alter table admin.custom_column drop constraint if exists admin_custom_column_name_entity_uid_unique;
 
 ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS column_id text;
 ALTER TABLE admin.custom_column ALTER COLUMN column_id SET NOT NULL;

package/table/controllers/card.js

@@ -1,44 +1,44 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-
-export default async function card(req) {
-  const time = Date.now();
-  const {
-    pg, params = {}, query = {}, opt = {},
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, meta, sql, cardSql,
-  } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-  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 = opt.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} 
-  where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, [opt.id || params.id]);
-
-  await metaFormat({ rows, table: params.table });
-
-  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
-  return {
-    time: Date.now() - time, data,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+export default async function card(req) {
+  const time = Date.now();
+  const {
+    pg, params = {}, query = {}, opt = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  const {
+    table, columns, meta, sql, cardSql,
+  } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  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 = opt.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} 
+  where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, [opt.id || params.id]);
+
+  await metaFormat({ rows, table: params.table });
+
+  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
+  return {
+    time: Date.now() - time, data,
+  };
+}

package/table/controllers/form.js

@@ -1,28 +1,28 @@
-import getTemplate from './utils/getTemplate.js';
-
-const sql = `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 data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-  const { pg, params } = req;
-  const form = await getTemplate('form', params.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-  return { time: Date.now() - time, form };
-}
+import getTemplate from './utils/getTemplate.js';
+
+const sql = `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 data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+  const { pg, params } = req;
+  const form = await getTemplate('form', params.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+  return { time: Date.now() - time, form };
+}

package/table/controllers/table.js

@@ -5,7 +5,7 @@ import { applyHook } from '../../utils.js';
 
 export default async function tableAPI(req) {
   const {
-    pg, params = {}, query = {}, opt = {}, funcs,
+    pg, params = {}, query = {}, opt = {},
   } = req;
   if (!params.id) return { message: 'not enough params', status: 400 };
 
@@ -35,11 +35,11 @@ export default async function tableAPI(req) {
 
   const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
   const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+    ? 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(',');
   const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
-  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
-  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
+  const geom = columnList.includes('geom') ? ',st_asgeojson(geom)::json as geom' : '';
+  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
 
   if (query.sql === '1') return q;
 

package/test/api/crud.xss.test.js

@@ -1,72 +1,72 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-import setToken from '../../crud/funcs/setToken.js';
-import config from '../config.js';
-
-test('api crud xss', async (t) => {
-  const app = await build(t);
-  const session = { passport: { user: { uid: '1' } } };
-  app.addHook('onRequest', async (req) => {
-    req.session = session;
-  });
-  // app.decorateRequest('session', session);
-
-  const prefix = config.prefix || '/api';
-
-  let addTokens;
-  let editTokens;
-
-  // before
-  t.test('setToken', async () => {
-    addTokens = setToken({
-      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'a',
-      uid: 1,
-      array: 1,
-    });
-    editTokens = setToken({
-      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'w',
-      uid: 1,
-      array: 1,
-    });
-    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
-  });
-
-  await t.test('POST /insert', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/table/${addTokens[0]}`,
-      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep.status, 409);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
-      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.equal(rep.status, 409);
-  });
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/table/gis.dataset/5400000`,
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+import setToken from '../../crud/funcs/setToken.js';
+import config from '../config.js';
+
+test('api crud xss', async (t) => {
+  const app = await build(t);
+  const session = { passport: { user: { uid: '1' } } };
+  app.addHook('onRequest', async (req) => {
+    req.session = session;
+  });
+  // app.decorateRequest('session', session);
+
+  const prefix = config.prefix || '/api';
+
+  let addTokens;
+  let editTokens;
+
+  // before
+  t.test('setToken', async () => {
+    addTokens = setToken({
+      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'a',
+      uid: 1,
+      array: 1,
+    });
+    editTokens = setToken({
+      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'w',
+      uid: 1,
+      array: 1,
+    });
+    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
+  });
+
+  await t.test('POST /insert', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/table/${addTokens[0]}`,
+      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep.status, 409);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
+      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.equal(rep.status, 409);
+  });
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/table/gis.dataset/5400000`,
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep);
+  });
+});

package/test/config.example

@@ -1,18 +1,18 @@
-import config from '../config.js';
-
-Object.assign(config, {
-  folder: 'test/templates',
-  pg: {
-    host: '192.168.3.160',
-    port: 5434,
-    database: 'mbk_rivne_dma',
-    user: 'postgres',
-    password: 'postgres',
-  },
-  redis: {
-    host: '192.168.3.160',
-    port: 6379,
-    family: 4,
-  },
-});
-export default config;
+import config from '../config.js';
+
+Object.assign(config, {
+  folder: 'test/templates',
+  pg: {
+    host: '192.168.3.160',
+    port: 5434,
+    database: 'mbk_rivne_dma',
+    user: 'postgres',
+    password: 'postgres',
+  },
+  redis: {
+    host: '192.168.3.160',
+    port: 6379,
+    family: 4,
+  },
+});
+export default config;

package/test/funcs/pg.test.js

@@ -1,34 +1,34 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import '../config.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import autoIndex from '../../pg/funcs/autoIndex.js';
-import pgClients from '../../pg/pgClients.js';
-import rclient from '../../redis/client.js';
-// import pgClients from '../../pg/funcs/pgClients.js';
-
-test('funcs pg', async (t) => {
-  await pgClients.client.init();
-  await t.test('getMeta', async () => {
-    const { columns } = await getMeta({ table: 'gis.dataset' });
-    // console.log(columns)
-    assert.ok(columns);
-  });
-
-  /* await t.test('getPG', async (t) => {
-    const data = await getPG({});
-    assert.ok(data);
-  }); */
-
-  await t.test('autoIndex', async () => {
-    await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
-    assert.ok(1);
-  });
-  t.after(() => {
-    pgClients.client.end();
-
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import '../config.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import autoIndex from '../../pg/funcs/autoIndex.js';
+import pgClients from '../../pg/pgClients.js';
+import rclient from '../../redis/client.js';
+// import pgClients from '../../pg/funcs/pgClients.js';
+
+test('funcs pg', async (t) => {
+  await pgClients.client.init();
+  await t.test('getMeta', async () => {
+    const { columns } = await getMeta({ table: 'gis.dataset' });
+    // console.log(columns)
+    assert.ok(columns);
+  });
+
+  /* await t.test('getPG', async (t) => {
+    const data = await getPG({});
+    assert.ok(data);
+  }); */
+
+  await t.test('autoIndex', async () => {
+    await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
+    assert.ok(1);
+  });
+  t.after(() => {
+    pgClients.client.end();
+
+    rclient.quit();
+  });
+});

package/test/funcs/redis.test.js

@@ -1,19 +1,19 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import '../config.js';
-
-import rclient from '../../redis/client.js';
-
-test('funcs redis', async (t) => {
-  await t.test('get/set', async () => {
-    await rclient.set('test', '1');
-    const d = await rclient.get('test');
-    // console.log(columns)
-    assert.equal(d, '1');
-  });
-
-  t.after(() => {
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import '../config.js';
+
+import rclient from '../../redis/client.js';
+
+test('funcs redis', async (t) => {
+  await t.test('get/set', async () => {
+    await rclient.set('test', '1');
+    const d = await rclient.get('test');
+    // console.log(columns)
+    assert.equal(d, '1');
+  });
+
+  t.after(() => {
+    rclient.quit();
+  });
+});

package/test/templates/cls/test.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": 1,
-        "text": "test"
-    },
-    {
-        "id": 2,
-        "text": "test2"
-    }
+[
+    {
+        "id": 1,
+        "text": "test"
+    },
+    {
+        "id": 2,
+        "text": "test2"
+    }
 ]

package/test/templates/form/cp_building.form.json

@@ -1,33 +1,33 @@
-{
-    "schema": {
-        
-        "cp_umuni_id": {
-            "type": "Text",
-            "ua": "ID UMUNI"
-        },
-        "cp_year": {
-            "type": "Text",
-            "ua": "Рік будівництва"
-        },
-        "cp_date_en_audit": {
-            "type": "DatePicker",
-            "ua": "Дата проведення останнього енергоаудиту"
-        },
-        "cp_certificate": {
-            "type": "Text",
-            "ua": "Сертифікат енергоефективності будівлі",
-            "help": "Вкажіть посилання"
-        },
-        "cp_pkd": {
-            "type": "Autocomplete",
-            "data": "customer_name",
-            "add": {
-                "model": "crm_acc.crm_account",
-                "ua": "Додати",
-                "form": "account_light.form"
-            },
-            "ua": "Замовник ПКД"
-        }
-    },
-    "label_style": "vertical"
+{
+    "schema": {
+        
+        "cp_umuni_id": {
+            "type": "Text",
+            "ua": "ID UMUNI"
+        },
+        "cp_year": {
+            "type": "Text",
+            "ua": "Рік будівництва"
+        },
+        "cp_date_en_audit": {
+            "type": "DatePicker",
+            "ua": "Дата проведення останнього енергоаудиту"
+        },
+        "cp_certificate": {
+            "type": "Text",
+            "ua": "Сертифікат енергоефективності будівлі",
+            "help": "Вкажіть посилання"
+        },
+        "cp_pkd": {
+            "type": "Autocomplete",
+            "data": "customer_name",
+            "add": {
+                "model": "crm_acc.crm_account",
+                "ua": "Додати",
+                "form": "account_light.form"
+            },
+            "ua": "Замовник ПКД"
+        }
+    },
+    "label_style": "vertical"
 }

package/test/templates/select/account_id.json

@@ -1,4 +1,4 @@
-{
-    "db": "mbk_lviv_dma",
-    "searchColumn": "alternative_name"
+{
+    "db": "mbk_lviv_dma",
+    "searchColumn": "alternative_name"
 }

package/test/templates/select/storage.data.json

@@ -1,3 +1,3 @@
-{
-    "key": "dataset_id"
+{
+    "key": "dataset_id"
 }

package/test/templates/table/gis.dataset.table.json

@@ -1,21 +1,21 @@
-{
-    "columns": [
-        {
-            "name": "dataset_id",
-            "title": "22"
-        },
-        {
-            "name": "dataset_name",
-            "title": "dataset_name"
-        }
-    ],
-    "table": "gis.dataset",
-    "order": "dataset_name",
-    "filters": [
-        {
-            "ua": "Назва набору",
-            "name": "dataset_name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "dataset_id",
+            "title": "22"
+        },
+        {
+            "name": "dataset_name",
+            "title": "dataset_name"
+        }
+    ],
+    "table": "gis.dataset",
+    "order": "dataset_name",
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
 }

package/util/controllers/next.id.js

@@ -1,4 +1,4 @@
-export default async function nextId({ pg }) {
-  const { id } = await pg.one('select next_id() as id');
-  return { id: id.toString() };
-};
+export default async function nextId({ pg }) {
+  const { id } = await pg.one('select next_id() as id');
+  return { id: id.toString() };
+};