@opengis/fastify-table 1.1.6 → 1.1.8

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/{server → test}/templates/select/test.storage.data.json

@@ -1,4 +1,4 @@
-{   
-    "key": "dataset_id",
-    "searchColumn": "table_name"
+{   
+    "key": "dataset_id",
+    "searchColumn": "table_name"
 }

package/test/templates/select/test.suggest.ato_new.json

@@ -0,0 +1,4 @@
+{
+    "db": "mbk_state_old",
+    "port": 5437
+}

package/{server → test}/templates/select/test.suggest.ato_new.sql

@@ -1,26 +1,26 @@
-select
-    codifier,
-    case
-        when object_type = 'A' then name_ua
-        else case
-            when object_type in ('P', 'H', 'O', 'B') then name_ua || ' ' || prefix_ua
-            else prefix_ua || ' ' || name_ua
-        end
-    end as title
-from
-    ato_new.ato_new_all
-    left join ato_new.ato_settings_city_and_terrytory on ato_type = object_type
-where
-    codifier is not null
-union
-all
-select
-    country_id,
-    name_ua as title
-from
-    ato_new.country
-where
-    country_id = '2845832997045798794'
-union
-all
+select
+    codifier,
+    case
+        when object_type = 'A' then name_ua
+        else case
+            when object_type in ('P', 'H', 'O', 'B') then name_ua || ' ' || prefix_ua
+            else prefix_ua || ' ' || name_ua
+        end
+    end as title
+from
+    ato_new.ato_new_all
+    left join ato_new.ato_settings_city_and_terrytory on ato_type = object_type
+where
+    codifier is not null
+union
+all
+select
+    country_id,
+    name_ua as title
+from
+    ato_new.country
+where
+    country_id = '2845832997045798794'
+union
+all
 select 'UA00000000000000000', 'Україна'

package/{server → test}/templates/select/test.suggest.data.json

@@ -1,5 +1,5 @@
-{   
-    "db": "mbk_poltava",
-    "key": "dataset_id",
-    "searchColumn": "table_name"
+{   
+    "db": "mbk_poltava",
+    "key": "dataset_id",
+    "searchColumn": "table_name"
 }

package/{server → test}/templates/select/test.suggest.parent.sql

@@ -1,3 +1,2 @@
-select dataset_id, dataset_name, table_name from gis.dataset
-where
-    dataset_id = '{{parent}}'
+select dataset_id, dataset_name, table_name from gis.dataset
+where   dataset_id = '{{parent}}'

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/logger.file.js

@@ -1,90 +1,90 @@
-import path from 'path';
-import { lstat, readdir } from 'fs/promises';
-import { createReadStream, existsSync } from 'fs';
-import readline from 'readline';
-
-import checkUserAccess from './utils/checkUserAccess.js';
-import getRootDir from './utils/getRootDir.js';
-
-/**
- *
- * @method GET
- * @summary API для перегляду логів
- *
- */
-
-export default async function loggerFile({
-  pg, params = {}, user = {}, query = {}, originalUrl, funcs = {},
-}, reply) {
-  const limit = 200000;
-  const access = pg ? await checkUserAccess({ user, pg }) : {};
-
-  const { config = {} } = funcs;
-  if (access?.status === 403 && !config?.local) return access;
-
-  // absolute / relative path
-  const rootDir = getRootDir(config);
-  const filepath = path.join(rootDir, params['*'] || '');
-
-  if (!existsSync(filepath)) {
-    return { error: 'file not exists', status: 404 };
-  }
-  const stat = await lstat(filepath);
-  const isFile = stat.isFile();
-
-  if (query.download && isFile) {
-    return reply.download(filepath);
-  }
-
-  if (query.full && isFile) {
-    if (stat.size > 20 * 1000 * 1000) {
-      return { message: 'file size > 20MB' };
-    }
-    const buffer = await readFile(filepath, { buffer: true });
-    return buffer;
-  }
-
-  if (isFile) {
-    const ext = path.extname(filepath);
-
-    const lines = await new Promise((resolve) => {
-      const rl = readline.createInterface({
-        input: createReadStream(filepath, { start: stat.size > limit ? stat.size - limit : 0 }),
-      });
-      const lines1 = [];
-      rl.on('close', () => resolve(lines1));
-      rl.on('line', (line) => lines1.push(line));
-    });
-
-    if (ext === '.html') {
-      const buffer = await readFile(filepath, { buffer: true });
-      reply.headers({ 'Content-type': 'text/html; charset=UTF-8' });
-      return buffer;
-    }
-
-    reply.headers({ 'Content-type': 'text/plain' });
-    return stat.size > limit && lines.length > 1
-      ? lines.reverse().slice(0, -1).join('\n')
-      : lines.reverse().join('\n');
-  }
-
-  // dir
-  const files = await readdir(filepath);
-
-  if (query.dir) {
-    return files.filter((el) => !['backup', 'marker_icon', 'error', 'migration'].includes(el));
-  }
-
-  const lstatsArr = await Promise.all(files.map(async (file) => [file, await lstat(path.join(filepath, file))]));
-  const lstats = Object.fromEntries(lstatsArr);
-
-  const message = (params['*'] ? '<a href="/logger-file/">...</a><br>' : '')
-    + files.map((file) => `<a href="${originalUrl}/${file}">${file}</a> (${lstats[file].size} bytes)`).join('</br>');
-
-  reply.headers({
-    'Content-Type': 'text/html; charset=UTF-8',
-    'Content-Security-Policy': "default-src 'none'",
-    'X-Content-Type-Options': 'nosniff',
-  });
-  return message;
-}
+import path from 'path';
+import { lstat, readdir } from 'fs/promises';
+import { createReadStream, existsSync } from 'fs';
+import readline from 'readline';
+
+import checkUserAccess from './utils/checkUserAccess.js';
+import getRootDir from './utils/getRootDir.js';
+
+/**
+ *
+ * @method GET
+ * @summary API для перегляду логів
+ *
+ */
+
+export default async function loggerFile({
+  pg, params = {}, user = {}, query = {}, originalUrl, funcs = {},
+}, reply) {
+  const limit = 200000;
+  const access = pg ? await checkUserAccess({ user, pg }) : {};
+
+  const { config = {} } = funcs;
+  if (access?.status === 403 && !config?.local) return access;
+
+  // absolute / relative path
+  const rootDir = getRootDir(config);
+  const filepath = path.join(rootDir, params['*'] || '');
+
+  if (!existsSync(filepath)) {
+    return { error: 'file not exists', status: 404 };
+  }
+  const stat = await lstat(filepath);
+  const isFile = stat.isFile();
+
+  if (query.download && isFile) {
+    return reply.download(filepath);
+  }
+
+  if (query.full && isFile) {
+    if (stat.size > 20 * 1000 * 1000) {
+      return { message: 'file size > 20MB' };
+    }
+    const buffer = await readFile(filepath, { buffer: true });
+    return buffer;
+  }
+
+  if (isFile) {
+    const ext = path.extname(filepath);
+
+    const lines = await new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: createReadStream(filepath, { start: stat.size > limit ? stat.size - limit : 0 }),
+      });
+      const lines1 = [];
+      rl.on('close', () => resolve(lines1));
+      rl.on('line', (line) => lines1.push(line));
+    });
+
+    if (ext === '.html') {
+      const buffer = await readFile(filepath, { buffer: true });
+      reply.headers({ 'Content-type': 'text/html; charset=UTF-8' });
+      return buffer;
+    }
+
+    reply.headers({ 'Content-type': 'text/plain' });
+    return stat.size > limit && lines.length > 1
+      ? lines.reverse().slice(0, -1).join('\n')
+      : lines.reverse().join('\n');
+  }
+
+  // dir
+  const files = await readdir(filepath);
+
+  if (query.dir) {
+    return files.filter((el) => !['backup', 'marker_icon', 'error', 'migration'].includes(el));
+  }
+
+  const lstatsArr = await Promise.all(files.map(async (file) => [file, await lstat(path.join(filepath, file))]));
+  const lstats = Object.fromEntries(lstatsArr);
+
+  const message = (params['*'] ? '<a href="/logger-file/">...</a><br>' : '')
+    + files.map((file) => `<a href="${originalUrl}/${file}">${file}</a> (${lstats[file].size} bytes)`).join('</br>');
+
+  reply.headers({
+    'Content-Type': 'text/html; charset=UTF-8',
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Type-Options': 'nosniff',
+  });
+  return message;
+}

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/controllers/utils/checkUserAccess.js

@@ -1,19 +1,19 @@
-/**
- * 
- * @summary check user access to logger interface - per admin user type or user group
- * @returns {Object} message, status
- */
-
-export default async function checkUserAccess({
-  user = {}, pg,
-}) {
-    const { count = '0' } = pg.pk?.['admin.access']
-      ? await pg.query(`select count(*) from admin.access 
-        where user_uid=$1 and route_id='logger'`, [user.uid]).then((res) => res.rows[0] || {})
-      : {};
-
-    if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
-      return { message: 'access restricted', status: 403 };
-    }
-    return { message: 'access granted', status: 200 };
-}
+/**
+ * 
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+
+export default async function checkUserAccess({
+  user = {}, pg,
+}) {
+    const { count = '0' } = pg.pk?.['admin.access']
+      ? await pg.query(`select count(*) from admin.access 
+        where user_uid=$1 and route_id='logger'`, [user.uid]).then((res) => res.rows[0] || {})
+      : {};
+
+    if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+      return { message: 'access restricted', status: 403 };
+    }
+    return { message: 'access granted', status: 200 };
+}

package/util/controllers/utils/getRootDir.js

@@ -1,21 +1,21 @@
-import path from 'path';
-import { existsSync } from 'fs';
-
-export default function getRootDir(config) {
-  // absolute / relative path
-  if (config.log?.dir) {
-    return config.log.dir.startsWith('/') || config.log.dir.includes(':')
-      ? config.log.dir
-      : path.join(process.cwd(), config.log.dir);
-  }
-
-  // windows debug support
-  const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
-  // docker default path
-  if (existsSync(customLogDir)) {
-    return path.join(customLogDir, config.folder || '', 'log');
-  }
-
-  // non-docker default path
-  return path.join(config.root || '/data/local', config.folder || '', 'log');
+import path from 'path';
+import { existsSync } from 'fs';
+
+export default function getRootDir(config) {
+  // absolute / relative path
+  if (config.log?.dir) {
+    return config.log.dir.startsWith('/') || config.log.dir.includes(':')
+      ? config.log.dir
+      : path.join(process.cwd(), config.log.dir);
+  }
+
+  // windows debug support
+  const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+  // docker default path
+  if (existsSync(customLogDir)) {
+    return path.join(customLogDir, config.folder || '', 'log');
+  }
+
+  // non-docker default path
+  return path.join(config.root || '/data/local', config.folder || '', 'log');
 }

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

@@ -2,7 +2,9 @@
 // between our tests.
 
 import getTemplate from './table/controllers/utils/getTemplate.js';
+import getTemplatePath from './table/controllers/utils/getTemplatePath.js';
 import addTemplateDir from './table/controllers/utils/addTemplateDir.js';
+import userTemplateDir from './table/controllers/utils/userTemplateDir.js';
 import metaFormat from './table/funcs/metaFormat/index.js';
 import autoIndex from './pg/funcs/autoIndex.js';
 
@@ -25,6 +27,8 @@ import getAccess from './crud/funcs/getAccess.js';
 export default null;
 export {
   getTemplate,
+  getTemplatePath,
+  userTemplateDir,
   metaFormat,
   autoIndex,
   addTemplateDir,