@opengis/fastify-table 1.1.40 → 1.1.42

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/user/controllers/user.cls.js

@@ -11,6 +11,10 @@ export default async function userCls(req) {
     return { message: 'access restricted', status: 403 };
   }
 
+  if (query.type && !['json', 'sql'].includes(query.type)) {
+    return { message: 'param type is invalid', status: 400 };
+  }
+
   const q = `select user_clsid as id, name, type, 
   case when type='json' then (
       ${params?.id
@@ -28,7 +32,7 @@ export default async function userCls(req) {
       case when type='sql' then data else null end as sql from admin.user_cls u
     where (case when type='json' then parent is null else true end)
     and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
-    and parent is null and ${params?.id ? 'u.name=$2' : '1=1'}`;
+    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
 
   if (query?.sql) return q;
 
@@ -40,8 +44,8 @@ export default async function userCls(req) {
       if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
     });
 
-    const clsList = getTemplatePath('cls');
-    const selectList = getTemplatePath('select');
+    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
+    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
 
     const userClsNames = rows.map((el) => el.name);
     const selectNames = selectList.map((el) => el[0]);

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() };
+};

package/util/controllers/properties.get.js

@@ -1,20 +1,20 @@
-export default async function getExtraProperties({
-    pg, params = {},
-}) {
-    const { id } = params;
-    if (!id) {
-        return { message: 'not enougn params', status: 400 };
-    }
-    try {
-        const { rows = [] } = pg.pk?.['crm.properties']
-            ? await pg.query(`select property_key, property_type, property_text, property_int,
-            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
-            : {};
-        if (!rows.length) return {};
-
-        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
-        return { message: data, status: 200 };
-    } catch (err) {
-        return { error: err.toString(), status: 500 };
-    }
+export default async function getExtraProperties({
+    pg, params = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params', status: 400 };
+    }
+    try {
+        const { rows = [] } = pg.pk?.['crm.properties']
+            ? await pg.query(`select property_key, property_type, property_text, property_int,
+            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
+            : {};
+        if (!rows.length) return {};
+
+        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
+        return { message: data, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
 }

package/util/index.js

@@ -1,23 +1,23 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-import nextId from './controllers/next.id.js';
-import statusMonitor from './controllers/status.monitor.js';
-import loggerFile from './controllers/logger.file.js';
-
-const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-
-  fastify.get(`${prefix}/next-id`, {}, nextId);
-  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
-  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-  fastify.get('/logger-file/*', { config: { policy: ['log'] } }, loggerFile);
-}
-
-export default plugin;
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+import loggerFile from './controllers/logger.file.js';
+
+const propertiesSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
+  fastify.get('/logger-file/*', { config: { policy: ['log'] } }, loggerFile);
+}
+
+export default plugin;

package/utils.js

@@ -21,7 +21,7 @@ import dataDelete from './crud/funcs/dataDelete.js';
 import getToken from './crud/funcs/getToken.js';
 import setToken from './crud/funcs/setToken.js';
 import checkXSS from './crud/controllers/utils/checkXSS.js';
-import gisIRColumn from './table/controllers/utils/gisIRColumn.js';
+import getTableColumn from './table/controllers/utils/gisIRColumn.js';
 import getMeta from './pg/funcs/getMeta.js';
 import getAccess from './crud/funcs/getAccess.js';
 import getSelectVal from './table/funcs/metaFormat/getSelectVal.js';
@@ -32,38 +32,69 @@ import addHook from './hook/funcs/addHook.js';
 import execMigrations from './migration/exec.migrations.js';
 import addNotification from './notification/funcs/addNotification.js';
 import sendNotification from './notification/funcs/sendNotification.js';
+import getFilterSQL from './table/funcs/getFilterSQL/index.js';
+
+import addCron from './cron/funcs/addCron.js';
+import getOpt from './crud/funcs/getOpt.js';
+import setOpt from './crud/funcs/setOpt.js';
+
+import isFileExists from './crud/funcs/isFileExists.js';
+
 import logger from './logger/getLogger.js';
 // const logger = false; // test!
 
 export default null;
 export {
+
+  addCron,
+  execMigrations,
+  getRedis,
   logger,
+  isFileExists,
+
+  // hook
+  addHook,
+  applyHook,
+
+  // template
   getTemplate,
   getTemplatePath,
-  userTemplateDir,
-  metaFormat,
-  autoIndex,
   addTemplateDir,
-  getPG,
-  getPGAsync,
-  initPG,
-  pgClients,
+  userTemplateDir,
+
+  // notification
+  addNotification,
+  sendNotification,
+
+  // security
+  checkXSS,
+  getAccess,
+  getToken,
+  getOpt,
+  setOpt,
+  setToken,
+
+  // crud
   dataInsert,
   dataUpdate,
   dataDelete,
-  getRedis,
-  getToken,
-  setToken,
-  checkXSS,
-  gisIRColumn,
+
+  // table
+  autoIndex,
+  metaFormat,
+  getFilterSQL,
   getMeta,
-  getAccess,
+  getTableColumn,
+
+  // pg
+  initPG,
+  getPG,
+  getPGAsync,
+  pgClients,
+
+  // select
   getSelectVal,
   getSelectMeta,
   getSelect,
-  applyHook,
-  addHook,
-  execMigrations,
-  addNotification,
-  sendNotification,
+
 };