@opengis/fastify-table 1.0.5 → 1.0.7

package/package.json

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

package/table/controllers/filter.js

@@ -9,9 +9,16 @@ export default async function filter(req) {
   const loadTable = await getTemplate('table', params.table);
   if (!loadTable) { return { status: 404, message: 'not found' }; }
 
-  await Promise.all(loadTable?.filters.filter((el) => el.data).map(async (el) => {
+  const filters = loadTable?.filters || loadTable?.filterList || [];
+  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
     const cls = await getSelect(el.data);
     Object.assign(el, { options: cls?.arr });
   }));
-  return { time: Date.now() - time, filters: loadTable?.filters || [] };
+  return {
+    time: Date.now() - time,
+    list: filters,
+    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+    inline: loadTable?.filterInline,
+    state: loadTable?.filterState?.map(el => ({ label: el.label })),
+  };
 }

package/table/controllers/suggest.js

@@ -9,12 +9,13 @@ export default async function suggest(req) {
 
   const lang = query.lang || 'ua';
   const time = Date.now();
+  const parent = query.parent || '';
 
   const selectName = query.sel || query.name || params.data;
   if (!selectName) return { headers, status: 400, message: 'name is required' };
 
   const meta = await getSelectMeta({ name: selectName });
-  const pg = meta.db ? getPG(meta.db) : pg1;
+  const pg = meta.db ? getPG({ db: meta.db }) : pg1;
   if (!meta) return { headers, status: 404, message: 'Not found query select ' };
 
   const { arr, searchQuery } = meta;
@@ -36,7 +37,7 @@ export default async function suggest(req) {
   const pk = meta.originalCols.split(',')[0];
   const val = query.val ? ` ${pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
 
-  const sqlSuggest = `with rows(id,text) as (${meta.original} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows limit ${limit}`;
+  const sqlSuggest = `with rows(id,text) as (${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows limit ${limit}`;
   if (query.sql) return sqlSuggest;
 
   // query

package/table/controllers/utils/getSelectMeta.js

@@ -39,7 +39,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
 
   // column name
   const cols = dataOrigin.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType[el.dataTypeID]);
+  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
 
   const searchColumn = cls?.searchColumn || (
     dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);

package/test/api/crud.test.js

@@ -11,13 +11,38 @@ test('api crud', async (t) => {
     const res = await app.inject({
       method: 'POST',
       url: '/api/crud/gis.dataset',
-      body: { dataset_name: '111' },
+      body: { dataset_name: '111', dataset_id: '5400000' },
     });
 
     const rep = JSON.parse(res?.body);
     // rep.dataset_id
-    // console.log(rep.total);
-    pgClients.client.query('delete from gis.dataset where dataset_id=$1', [rep.dataset_id]);
+    // console.log(rep);
+    // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [rep.dataset_id]);
     assert.ok(rep.dataset_id);
   });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: '/api/crud/gis.dataset/5400000',
+      body: { editor_id: '11' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    assert.equal(rep.editor_id, '11')
+  });
+
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: '/api/crud/gis.dataset/5400000',
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    assert.ok(rep);
+  });
 });

package/test/api/table.test.js

@@ -26,4 +26,24 @@ test('api table', async (t) => {
     // console.log(rep.total);
     assert.ok(rep.total);
   });
+  await t.test('GET /form', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/form/cp_building.form',
+    });
+    // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
+  await t.test('GET /filter', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/filter/gis.dataset.table',
+    });
+    // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
 });

package/test/funcs/crud.test.js

@@ -7,17 +7,21 @@ import rclient from '../../redis/client.js';
 
 import dataInsert from '../../crud/funcs/dataInsert.js';
 import dataUpdate from '../../crud/funcs/dataUpdate.js';
+import dataDelete from '../../crud/funcs/dataDelete.js';
+import isFileExists from '../../crud/funcs/isFileExists.js';
 
 import getOpt from '../../crud/funcs/getOpt.js';
 import setOpt from '../../crud/funcs/setOpt.js';
 
-test('fucns crud', async (t) => {
+test('funcs crud', async (t) => {
+
   await t.test('getOpt/setOpt', async () => {
     const opt = await setOpt({ table: 'gis.dataset' });
     const data = await getOpt(opt);
     // console.log(data);
     assert.equal(data.table, 'gis.dataset');
   });
+  
   const id = (Math.random() * 10000).toFixed();
   await t.test('dataInsert', async () => {
     const data = await dataInsert({ table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' } });
@@ -29,7 +33,17 @@ test('fucns crud', async (t) => {
     assert.equal(data.dataset_name, '22211');
   });
 
-  pgClients.client.query('delete from gis.dataset where dataset_id=$1', [id]);
+  await t.test('dataDelete', async () => {
+    const data = await dataDelete({ table: 'gis.dataset', id });
+    assert.ok(data);
+  });
+
+  await t.test('isFileExists', async () => {
+    const data = await isFileExists({filepath: '../../crud/funcs/isFileExists.js'});
+    assert.equal(data, false);
+  });
+
+  // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [id]);
   t.after(() => {
     pgClients.client?.end();
     rclient.quit();

package/test/funcs/pg.test.js

@@ -7,6 +7,7 @@ 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 getPG from '../../pg/funcs/getPG.js'
 
 test('funcs pg', async (t) => {
   await t.test('getMeta', async () => {
@@ -15,6 +16,11 @@ test('funcs pg', async (t) => {
     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);

package/test/funcs/table.test.js

@@ -4,6 +4,11 @@ import '../config.js';
 import pgClients from '../../pg/pgClients.js';
 import rclient from '../../redis/client.js';
 import getFilterSQL from '../../table/funcs/getFilterSQL/index.js';
+import getTableSql from '../../table/funcs/getFilterSQL/index.js';
+import getCustomQuery from '../../table/funcs/getFilterSQL/index.js';
+import getFilterQuery from '../../table/funcs/getFilterSQL/index.js';
+import formatValue from '../../table/funcs/getFilterSQL/index.js';
+import getOptimizedQuery from '../../table/funcs/getFilterSQL/index.js';
 
 test('fucns table', async (t) => {
   await t.test('getMeta', async () => {
@@ -11,7 +16,31 @@ test('fucns table', async (t) => {
     // console.log(data);
     assert.ok(data.q);
   });
-
+  
+  await t.test('formatValue', async (t) => {
+    const data = await formatValue( {table: 'gis.dataset'} );
+    assert.ok(data);
+  });
+  
+  await t.test('getCustomQuery', async (t) => {
+    const data = await getCustomQuery( {table: 'gis.dataset'} );
+    assert.ok(data);
+  });
+  
+  await t.test('getFilterQuery', async (t) => {
+    const data = await getFilterQuery( {table: 'gis.dataset'} );
+    assert.ok(data);
+  });
+  
+  await t.test('getOptimizedQuery', async (t) => {
+    const data = await getOptimizedQuery( {table: 'gis.dataset'} );
+    assert.ok(data);
+  });
+  
+  await t.test('getTableSql', async (t) => {
+    const data = await getTableSql( {table: 'gis.dataset'} );
+    assert.ok(data);
+  });
   t.after(() => {
     pgClients.client.end();
     rclient.quit();

package/test/templates/table/green_space.table.json

@@ -0,0 +1,383 @@
+{
+  "ua": "Зелені насадження",
+  "key": "green_space_id",
+  "sql": [
+    {
+      "sql": "select short_ukr,short_rus,full_rus,full_ukr,latin,tr_family,genus from itree.green_space_species where gss_id in (t.type_tree,t.type_bush) limit 1",
+      "name": "green_space_species_sql"
+    },
+    {
+      "sql": "select json_agg(file_path) as img_list from admin.doc_file where object_id=t.green_space_id and file_status=1",
+      "name": "image_sql"
+    }
+  ],
+  "table": "itree.green_space_pass",
+  "form": "green_space.form",
+  "columns": [
+    {
+      "ua": "Інвентарний номер",
+      "name": "invent_number",
+      "meta": "id",
+      "format": "text"
+    },
+    {
+      "en": "Object name",
+      "ru": "Назва объекта",
+      "ua": "Назва об'єкта",
+      "name": "type_tree",
+      "meta": "title",
+      "data": "itree.type_plant",
+      "format": "select",
+      "html": "{{#ifCond type_plant 'in' '1,2,3,4,5,8'}}{{#ifCond type_plant '==' '1'}}{{select type_bush data=\"itree.type_bush\"}}{{/ifCond}}{{#ifCond type_plant 'in' '2,8'}}{{select type_tree data=\"itree.type_tree\" }}{{/ifCond}}{{#ifCond type_plant '==' '3'}}{{select type_hedge data=\"itree.type_hedge\"}}{{/ifCond}}{{#ifCond type_plant '==' '4'}}{{select type_lawn data=\"itree.type_lawn\"}}{{/ifCond}}{{#ifCond type_plant '==' '5'}}{{select type_flower data=\"itree.type_flower\"}}{{/ifCond}} {{^}}...{{/ifCond}}"
+    },
+    {
+      "en": "Type",
+      "ru": "Тип",
+      "ua": "Тип насадження",
+      "name": "type_plant",
+      "meta": "type",
+      "data": "itree.type_plant",
+      "format": "select"
+    },
+    {
+      "name": "quality_condition",
+      "ua": "Якісний стан об'єкта",
+      "data": "itree.quality_condition",
+      "meta": "status",
+      "format": "badge"
+    },
+    {
+      "en": "Recomendations",
+      "ru": "Рекомендации",
+      "ua": "Рекомендації",
+      "name": "recommend",
+      "data": "itree.recommend",
+      "meta": "other",
+      "format": "badge"
+    },
+    {
+      "name": "uid",
+      "ua": "Хто додав",
+      "width": "70",
+      "data": "contact_id",
+      "format": "select"
+    },
+    {
+      "ua": "Зона відпочинку",
+      "hidden": true,
+      "meta": "other",
+      "name": "rz_id",
+      "format": "select",
+      "data": "rz_id"
+    },
+    {
+      "name": "address_id",
+      "ua": "Адреса",
+      "hidden": true,
+      "meta": "other",
+      "format": "select",
+      "data": "itree.address_id"
+    },
+    {
+      "name": "age",
+      "ua": "Вік, років",
+      "meta": "other",
+      "hidden": true,
+      "format": "number"
+    },
+    {
+      "name": "height",
+      "ua": "Висота, м",
+      "meta": "other",
+      "hidden": true,
+      "format": "number"
+    },
+    {
+      "name": "diameter",
+      "ua": "Діаметр стовбура на висоті 1.3 м, см",
+      "meta": "other",
+      "hidden": true,
+      "format": "number"
+    },
+    {
+      "name": "cdate",
+      "ua": "Дата",
+      "meta": "other",
+      "format": "date"
+    },
+    {
+      "name": "amount",
+      "ua": "Кількіть (шт./м2)",
+      "meta": "other",
+      "hidden": true,
+      "format": "number"
+    },
+    {
+      "name": "area",
+      "ua": "Площа кв.м.",
+      "meta": "other",
+      "hidden": true,
+      "format": "number"
+    },
+    {
+      "ua": "Балансова вартість, грн",
+      "name": "cost",
+      "meta": "other",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Штрих-код",
+      "hidden": true,
+      "meta": "other",
+      "name": "barcode",
+      "format": "text"
+    },
+    {
+      "name": "trunk_circ",
+      "ua": "Окружність стовбура, см",
+      "hidden": true,
+      "meta": "other",
+      "format": "number"
+    },
+    {
+      "name": "soil_condi",
+      "ua": "Розмір лунки",
+      "hidden": true,
+      "meta": "other",
+      "format": "select",
+      "data": "itree.soil_condi"
+    },
+    {
+      "name": "discrete_s",
+      "ua": "Рівень нахилу в градусах",
+      "hidden": true,
+      "meta": "other",
+      "format": "select",
+      "data": "itree.discrete_s"
+    },
+    {
+      "name": "undercut",
+      "ua": "Підрізка",
+      "hidden": true,
+      "meta": "other",
+      "format": "select",
+      "data": "itree.undercut"
+    },
+    {
+      "name": "bark_damag",
+      "ua": "Пошкодження кори (в відсотках)",
+      "hidden": true,
+      "meta": "other",
+      "format": "select",
+      "data": "itree.bark_damag"
+    },
+    {
+      "name": "fungus",
+      "ua": "Гриби",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "woodworms",
+      "ua": "Древоточець",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "rottenness",
+      "ua": "Трухлявість",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "hollow",
+      "ua": "Дупла",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "frost_bump",
+      "ua": "Морозобоїни",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "burns",
+      "ua": "Опіки",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "nails",
+      "ua": "Цвяхи",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "lamps_and_wires",
+      "ua": "Лампи та дроти",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "trunk_inje",
+      "ua": "Інєкції в стовбур",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "needs_trea",
+      "ua": "Потребує лікування",
+      "hidden": true,
+      "meta": "other",
+      "format": "yes/no"
+    },
+    {
+      "name": "crown_bare",
+      "ua": "Оцінка стану крони (частка голих гілок в вегетаційний період)",
+      "hidden": true,
+      "meta": "other",
+      "format": "select",
+      "data": "itree.crown_bare"
+    },
+    {
+      "name": "diameter_stump",
+      "ua": "Діаметр пенька, см",
+      "hidden": true,
+      "meta": "other",
+      "format": "number"
+    },
+    {
+      "en": "Photo",
+      "ru": "Фото",
+      "ua": "Фото",
+      "html": "{{#each img_list}}<a class='btn btn-xs btn-default' href=\"{{this}}\" download><i class='fa fa-file-text'></i></a><a target=\"_blank\" class='btn btn-xs btn-default' href=\"{{this}}\"><i class='fa fa-eye'></i></a><br>{{/each}}",
+      "name": "image",
+      "format": "image"
+    },
+    {
+      "ua": "Верифіковано",
+      "html": " {{#ifCond verif '==' true}} \r\n <span class=\"label\" style=\"color:#fff;background:green\"> Так</span> \r\n   {{else}}  \r\n   <span class=\"label\" style=\"color:#fff;background:red\"> Ні</span>\r\n                    {{/ifCond}}",
+      "name": "verif",
+      "format": "verify"
+    }
+  ],
+  "filterInline": [
+    {
+      "label": "Дата",
+      "id": "cdate",
+      "type": "Date"
+    }
+  ],
+  "filterCustom": [
+    {
+      "label": "Поточний рік",
+      "sql": "date_trunc('year',cdate) = date_trunc('year',now())"
+    }
+  ],
+  "filterState": [
+    {
+      "label": "Не верифіковано",
+      "sql": "yes_no=false"
+    },
+    {
+      "label": "Верифіковано",
+      "sql": "yes_no=true"
+    }
+  ],
+  "filterList": [
+    {
+      "label": "Інвентарний номер",
+      "id": "invent_number",
+      "type": "Text"
+    },
+    {
+      "label": "Дата",
+      "id": "cdate",
+      "type": "Date"
+    },
+    {
+      "label": "Тип насадження",
+      "data": "itree.type_plant",
+      "id": "type_plant",
+      "type": "Check"
+    },
+    {
+      "label": "Якісний стан об'єкта",
+      "data": "itree.quality_condition",
+      "id": "quality_condition",
+      "type": "Check"
+    },
+    {
+      "label": "Рекомендації",
+      "data": "itree.recommend",
+      "id": "recommend",
+      "type": "Check"
+    },
+    {
+      "label": "Зона відпочинку",
+      "data": "rz_id",
+      "id": "rz_id",
+      "type": "Text"
+    },
+    {
+      "label": "Адреса",
+      "data": "itree.address_id",
+      "id": "address_id",
+      "type": "Text"
+    },
+    {
+      "id": "bark_damag",
+      "label": "Пошкодження кори (в відсотках)",
+      "data": "itree.bark_damag",
+      "type": "Check"
+    },
+    {
+      "id": "undercut",
+      "label": "Підрізка",
+      "data": "itree.undercut",
+      "type": "Check"
+    },
+    {
+      "id": "crown_bare",
+      "label": "Оцінка стану крони (частка голих гілок в вегетаційний період)",
+      "data": "itree.crown_bare",
+      "type": "Check"
+    },
+    {
+      "id": "needs_trea",
+      "label": "Потребує лікування",
+      "data": "yes_no",
+      "type": "Check"
+    },
+    {
+      "id": "verif",
+      "label": "Верифіковано?",
+      "data": "yes_no",
+      "type": "Check"
+    },
+    {
+      "label": "Балансова вартість, грн",
+      "id": "cost",
+      "type": "Range"
+    }
+  ],
+  "meta": {
+    "title": "invent_number",
+    "search": "invent_number"
+  },
+  "actions": [
+    "edit",
+    "del"
+  ]
+}