@opengis/cms 0.0.57 → 0.0.58

package/server/routes/logs/controllers/export.user.logs.js

@@ -1,78 +1,78 @@
-import path from 'node:path';
-import { mkdir, writeFile } from 'node:fs/promises';
-import { createReadStream } from 'node:fs';
-import { config, getFolder, jsonToCsv, getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-const rootDir = getFolder(config, 'local');
-
-export default async function exportUserLogs(req, reply) {
-    const { pg, query, user = {} } = req;
-    const { uid } = user;
-    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
-
-    const { filter = null } = query;
-
-    const { q: filterQuery } = await getFilterSQL({
-        filter, table: 'log.table_changes'
-    });
-
-    const { rows = [] } = await pg.query(`
-        select 
-        row_number() over(order by cdate desc) as num,
-        change_id,
-        change_type,
-        cdate,
-        entity_type,
-        entity_id,
-        b.data_log 
-        from log.table_changes a
-        left join lateral (
-            select json_agg(
-                row_to_json(q)
-                ) as data_log 
-            from log.table_changes_data q 
-            where change_id=a.change_id 
-            
-        )b on 1=1
-
-        where change_user_id='${uid}' 
-        ${filterQuery ? `and ${filterQuery}` : ''}
-        order by cdate desc
-    `);
-
-    const filePath = path.join(rootDir, `/files/tmp/logs_${uid}.csv`);
-    const ext = path.extname(filePath);
-    const filePathJSON = filePath.replace(ext, '.json');
-
-    await mkdir(path.dirname(filePathJSON), { recursive: true });
-    await writeFile(filePathJSON, JSON.stringify(rows));
-
-    await jsonToCsv({
-        filePath: filePathJSON,
-        colmodel: [
-            { name: 'num', title: '№', ua: '№' },
-            { name: 'change_id', title: 'Ідентифікатор зміни', ua: 'Ідентифікатор зміни' },
-            { name: 'change_type', title: 'Тип зміни', ua: 'Тип зміни' },
-            { name: 'cdate', title: 'Дата та час зміни', ua: 'Дата та час зміни' },
-            { name: 'entity_type', title: 'Тип об\'єкта', ua: 'Тип об\'єкта' },
-            { name: 'entity_id', title: 'Ідентифікатор об\'єкта', ua: 'Ідентифікатор об\'єкта' },
-            { name: 'data_log', title: 'Дані зміни', ua: 'Дані зміни' }
-        ],
-        columnList: [
-            'num',
-            'change_id',
-            'change_type',
-            'cdate',
-            'entity_type',
-            'entity_id',
-            'data_log'
-        ],
-    });
-
-    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(filePath))}`);
-    reply.header('Content-Type', 'text/csv');
-
-    const fileStream = createReadStream(filePath);
-    return reply.send(fileStream);
-
+import path from 'node:path';
+import { mkdir, writeFile } from 'node:fs/promises';
+import { createReadStream } from 'node:fs';
+import { config, getFolder, jsonToCsv, getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+const rootDir = getFolder(config, 'local');
+
+export default async function exportUserLogs(req, reply) {
+    const { pg, query, user = {} } = req;
+    const { uid } = user;
+    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
+
+    const { filter = null } = query;
+
+    const { q: filterQuery } = await getFilterSQL({
+        filter, table: 'log.table_changes'
+    });
+
+    const { rows = [] } = await pg.query(`
+        select 
+        row_number() over(order by cdate desc) as num,
+        change_id,
+        change_type,
+        cdate,
+        entity_type,
+        entity_id,
+        b.data_log 
+        from log.table_changes a
+        left join lateral (
+            select json_agg(
+                row_to_json(q)
+                ) as data_log 
+            from log.table_changes_data q 
+            where change_id=a.change_id 
+            
+        )b on 1=1
+
+        where change_user_id='${uid}' 
+        ${filterQuery ? `and ${filterQuery}` : ''}
+        order by cdate desc
+    `);
+
+    const filePath = path.join(rootDir, `/files/tmp/logs_${uid}.csv`);
+    const ext = path.extname(filePath);
+    const filePathJSON = filePath.replace(ext, '.json');
+
+    await mkdir(path.dirname(filePathJSON), { recursive: true });
+    await writeFile(filePathJSON, JSON.stringify(rows));
+
+    await jsonToCsv({
+        filePath: filePathJSON,
+        colmodel: [
+            { name: 'num', title: '№', ua: '№' },
+            { name: 'change_id', title: 'Ідентифікатор зміни', ua: 'Ідентифікатор зміни' },
+            { name: 'change_type', title: 'Тип зміни', ua: 'Тип зміни' },
+            { name: 'cdate', title: 'Дата та час зміни', ua: 'Дата та час зміни' },
+            { name: 'entity_type', title: 'Тип об\'єкта', ua: 'Тип об\'єкта' },
+            { name: 'entity_id', title: 'Ідентифікатор об\'єкта', ua: 'Ідентифікатор об\'єкта' },
+            { name: 'data_log', title: 'Дані зміни', ua: 'Дані зміни' }
+        ],
+        columnList: [
+            'num',
+            'change_id',
+            'change_type',
+            'cdate',
+            'entity_type',
+            'entity_id',
+            'data_log'
+        ],
+    });
+
+    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(filePath))}`);
+    reply.header('Content-Type', 'text/csv');
+
+    const fileStream = createReadStream(filePath);
+    return reply.send(fileStream);
+
 }

package/server/routes/logs/controllers/user.logs.js

@@ -1,45 +1,45 @@
-import { getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-export default async function userLogs(req, reply) {
-    const { pg, user = {}, query } = req;
-    const { uid } = user;
-    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
-
-    const { page = 1, limit = 16, filter = null } = query;
-    const offset = limit * (page - 1) || 0;
-
-    const { q: filterQuery } = await getFilterSQL({
-        filter, table: 'log.table_changes', filterList: [{ name: 'cdate', type: 'date' }, { name: 'change_type', type: 'check' }]
-    });
-    //return filterData
-
-    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from log.table_changes where change_user_id=$1`, [uid])
-
-    const { rows = [] } = await pg.query(`
-        select 
-        row_number() over(order by cdate desc) as num,
-        change_id,
-        change_type,
-        cdate,
-        entity_type,
-        entity_id,
-        b.data_log 
-        from log.table_changes a
-        left join lateral (
-            select json_agg(
-                row_to_json(q)
-                ) as data_log 
-            from log.table_changes_data q 
-            where change_id=a.change_id 
-            
-        )b on 1=1
-
-        where change_user_id='${uid}' 
-        ${filterQuery ? `and ${filterQuery}` : ''}
-        order by cdate desc
-        limit ${limit} offset ${offset}
-        `);
-
-    const status = rows?.length ? 200 : 204;
-    return reply.code(status).send({ message: { total, filtered, rows }, status })
+import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+export default async function userLogs(req, reply) {
+    const { pg, user = {}, query } = req;
+    const { uid } = user;
+    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
+
+    const { page = 1, limit = 16, filter = null } = query;
+    const offset = limit * (page - 1) || 0;
+
+    const { q: filterQuery } = await getFilterSQL({
+        filter, table: 'log.table_changes', filterList: [{ name: 'cdate', type: 'date' }, { name: 'change_type', type: 'check' }]
+    });
+    //return filterData
+
+    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from log.table_changes where change_user_id=$1`, [uid])
+
+    const { rows = [] } = await pg.query(`
+        select 
+        row_number() over(order by cdate desc) as num,
+        change_id,
+        change_type,
+        cdate,
+        entity_type,
+        entity_id,
+        b.data_log 
+        from log.table_changes a
+        left join lateral (
+            select json_agg(
+                row_to_json(q)
+                ) as data_log 
+            from log.table_changes_data q 
+            where change_id=a.change_id 
+            
+        )b on 1=1
+
+        where change_user_id='${uid}' 
+        ${filterQuery ? `and ${filterQuery}` : ''}
+        order by cdate desc
+        limit ${limit} offset ${offset}
+        `);
+
+    const status = rows?.length ? 200 : 204;
+    return reply.code(status).send({ message: { total, filtered, rows }, status })
 }

package/server/routes/logs/index.mjs

@@ -1,9 +1,9 @@
-import userLogs from './controllers/user.logs.js';
-import exportUserLogs from './controllers/export.user.logs.js';
-
-const params = { config: { policy: ['public'] } };
-
-export default async function route(app) {
-    app.get('/user-logs', params, userLogs);
-    app.get('/export-user-logs', params, exportUserLogs);
-}
+import userLogs from './controllers/user.logs.js';
+import exportUserLogs from './controllers/export.user.logs.js';
+
+const params = { config: { policy: ['public'] } };
+
+export default async function route(app) {
+    app.get('/user-logs', params, userLogs);
+    app.get('/export-user-logs', params, exportUserLogs);
+}

package/server/routes/menu/controllers/addMenu.js

@@ -1,38 +1,38 @@
-import { dataInsert, yml2json, json2yml } from "@opengis/fastify-table/utils.js";
-
-export default async function addMenu(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {}, headers = {}, body = {} } = req;
-
-    if (!pg?.pk) {
-        return reply.status(400).send('empty pg');
-    }
-
-    if (!pg?.pk?.['site.menus']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (!body.name) {
-        return reply.status(404).send('not enough body params: name');
-    }
-
-    if (typeof body.content === 'string') {
-        body.items = yml2json(body.content);
-    } else if (body.items && typeof body.items === 'object') {
-        body.content = json2yml(body.items);
-    }
-
-    const res = await dataInsert({
-        pg,
-        table: 'site.menus',
-        id: params.id,
-        data: body,
-        referer: headers.referer,
-        uid: user.uid,
-    }).then(el => el.rows[0]);
-
-    if (!res) {
-        return reply.status(500).send('insert menu error');
-    }
-
-    return reply.status(200).send(res);
+import { dataInsert, yml2json, json2yml } from "@opengis/fastify-table/utils.js";
+
+export default async function addMenu(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {}, headers = {}, body = {} } = req;
+
+    if (!pg?.pk) {
+        return reply.status(400).send('empty pg');
+    }
+
+    if (!pg?.pk?.['site.menus']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (!body.name) {
+        return reply.status(404).send('not enough body params: name');
+    }
+
+    if (typeof body.content === 'string') {
+        body.items = yml2json(body.content);
+    } else if (body.items && typeof body.items === 'object') {
+        body.content = json2yml(body.items);
+    }
+
+    const res = await dataInsert({
+        pg,
+        table: 'site.menus',
+        id: params.id,
+        data: body,
+        referer: headers.referer,
+        uid: user.uid,
+    }).then(el => el.rows[0]);
+
+    if (!res) {
+        return reply.status(500).send('insert menu error');
+    }
+
+    return reply.status(200).send(res);
 }

package/server/routes/menu/controllers/delMenu.js

@@ -1,32 +1,32 @@
-import { dataDelete } from "@opengis/fastify-table/utils.js";
-
-export default async function delMenu(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {}, headers = {}, body = {} } = req;
-
-    if (!pg?.pk) {
-        return reply.status(400).send('empty pg');
-    }
-
-    if (!pg?.pk?.['site.menus']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (!params.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    const res = await dataDelete({
-        pg,
-        table: 'site.menus',
-        id: params.id,
-        data: body,
-        referer: headers.referer,
-        uid: user.uid,
-    });
-
-    if (!res) {
-        return reply.status(500).send('delete menu error');
-    }
-
-    return reply.status(200).send(res);
+import { dataDelete } from "@opengis/fastify-table/utils.js";
+
+export default async function delMenu(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {}, headers = {}, body = {} } = req;
+
+    if (!pg?.pk) {
+        return reply.status(400).send('empty pg');
+    }
+
+    if (!pg?.pk?.['site.menus']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (!params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    const res = await dataDelete({
+        pg,
+        table: 'site.menus',
+        id: params.id,
+        data: body,
+        referer: headers.referer,
+        uid: user.uid,
+    });
+
+    if (!res) {
+        return reply.status(500).send('delete menu error');
+    }
+
+    return reply.status(200).send(res);
 }

package/server/routes/menu/controllers/editMenu.js

@@ -1,42 +1,42 @@
-import { dataUpdate, yml2json, json2yml } from "@opengis/fastify-table/utils.js";
-
-export default async function editMenu(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {}, headers = {}, body = {} } = req;
-
-    if (!pg?.pk) {
-        return reply.status(400).send('empty pg');
-    }
-
-    if (!pg?.pk?.['site.menus']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (!params.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (typeof body.content === 'string') {
-        body.items = yml2json(body.content || '');
-    } else if (body.items && typeof body.items === 'object') {
-        body.content = json2yml(body.items || {});
-    }
-
-    if (!Object.keys(body.items || {}).length) {
-        return reply.status(400).send('access restricted: empty json items / invalid yml content');
-    }
-
-    const res = await dataUpdate({
-        pg,
-        table: 'site.menus',
-        id: params.id,
-        data: body,
-        referer: headers.referer,
-        uid: user.uid,
-    });
-
-    if (!res) {
-        return reply.status(500).send('update menu error');
-    }
-
-    return reply.status(200).send(res);
+import { dataUpdate, yml2json, json2yml } from "@opengis/fastify-table/utils.js";
+
+export default async function editMenu(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {}, headers = {}, body = {} } = req;
+
+    if (!pg?.pk) {
+        return reply.status(400).send('empty pg');
+    }
+
+    if (!pg?.pk?.['site.menus']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (!params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (typeof body.content === 'string') {
+        body.items = yml2json(body.content || '');
+    } else if (body.items && typeof body.items === 'object') {
+        body.content = json2yml(body.items || {});
+    }
+
+    if (!Object.keys(body.items || {}).length) {
+        return reply.status(400).send('access restricted: empty json items / invalid yml content');
+    }
+
+    const res = await dataUpdate({
+        pg,
+        table: 'site.menus',
+        id: params.id,
+        data: body,
+        referer: headers.referer,
+        uid: user.uid,
+    });
+
+    if (!res) {
+        return reply.status(500).send('update menu error');
+    }
+
+    return reply.status(200).send(res);
 }

package/server/routes/menu/controllers/getMenu.js

@@ -1,25 +1,25 @@
-import getMenu from "../functions/getMenu.js";
-
-const limit = 16;
-
-export default async function getMenuAPI(req, reply) {
-    const { query = {}, params = {} } = req;
-
-    const result = await getMenu(params.id, {
-        locale: query.locale,
-        page: query.page,
-        limit: Math.min(query.limit || limit, limit),
-        sql: query.sql,
-        ttl: 0
-    });
-
-    if (result.error) {
-        return reply.status(result.code || 500).send(result);
-    }
-
-    if (params.id) {
-        return reply.status(200).send(result);
-    }
-
-    return reply.status(200).send({ cache: result.cache, rows: result.rows });
+import getMenu from "../functions/getMenu.js";
+
+const limit = 16;
+
+export default async function getMenuAPI(req, reply) {
+    const { query = {}, params = {} } = req;
+
+    const result = await getMenu(params.id, {
+        locale: query.locale,
+        page: query.page,
+        limit: Math.min(query.limit || limit, limit),
+        sql: query.sql,
+        ttl: 0
+    });
+
+    if (result.error) {
+        return reply.status(result.code || 500).send(result);
+    }
+
+    if (params.id) {
+        return reply.status(200).send(result);
+    }
+
+    return reply.status(200).send({ cache: result.cache, rows: result.rows });
 }

package/server/routes/menu/functions/getMenu.js

@@ -1,50 +1,50 @@
-import { createHash } from 'node:crypto';
-
-import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
-
-const pg = pgClients.client;
-const rclient = getRedis();
-
-export default async function getMenu(name, { locale, ttl = 3600, page, limit = 16, sql } = {}) {
-  if (!pg?.pk) {
-    return { error: 'empty pg', code: 400 };
-  }
-
-  if (!pg?.pk?.['site.menus']) {
-    return { error: 'table not found', code: 404 };
-  }
-
-  const crudInc = await rclient.get(`pg:${config.pg?.database}:site.menus:crud`) || 0;
-  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', crudInc, name, locale, page, limit].filter(Boolean).join(':')).digest('hex');
-
-  const cache = ttl === 0 ? null : await rclient.get(cacheKey);
-
-  // return from cache
-  if (cache) {
-    return { cache: true, ...JSON.parse(cache) };
-  }
-
-  const offset = page && page > 0 ? (page - 1) * limit : 0;
-  const args = name ? [name, locale].filter(Boolean) : [locale].filter(Boolean);
-  const where = name ?
-    `$1 in (menu_id, name) and ${locale ? `locale=$2` : 'true'}`
-    : (locale ? `locale=$1` : 'true');
-
-  const q = `select menu_id, name, locale, description ${name ? ', items::json, content' : ''} 
-  from site.menus
-  where ${where} 
-  order by (case when locale='uk' then false else true end)
-  limit ${limit} 
-  offset ${offset}`;
-
-  if (sql) return q;
-
-  const rows = pg ? await pg.query(q, args).then(el => el.rows || []) : [];
-
-  const payload = name ? (rows[0] || { error: 'menu not found', code: 404 }) : { rows };
-
-  // save to cache, default = 1 hour
-  if (ttl) await rclient.set(cacheKey, JSON.stringify(payload), 'EX', ttl);
-
-  return { cache: false, ...payload };
-}
+import { createHash } from 'node:crypto';
+
+import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
+
+const pg = pgClients.client;
+const rclient = getRedis();
+
+export default async function getMenu(name, { locale, ttl = 3600, page, limit = 16, sql } = {}) {
+  if (!pg?.pk) {
+    return { error: 'empty pg', code: 400 };
+  }
+
+  if (!pg?.pk?.['site.menus']) {
+    return { error: 'table not found', code: 404 };
+  }
+
+  const crudInc = await rclient.get(`pg:${config.pg?.database}:site.menus:crud`) || 0;
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', crudInc, name, locale, page, limit].filter(Boolean).join(':')).digest('hex');
+
+  const cache = ttl === 0 ? null : await rclient.get(cacheKey);
+
+  // return from cache
+  if (cache) {
+    return { cache: true, ...JSON.parse(cache) };
+  }
+
+  const offset = page && page > 0 ? (page - 1) * limit : 0;
+  const args = name ? [name, locale].filter(Boolean) : [locale].filter(Boolean);
+  const where = name ?
+    `$1 in (menu_id, name) and ${locale ? `locale=$2` : 'true'}`
+    : (locale ? `locale=$1` : 'true');
+
+  const q = `select menu_id, name, locale, description ${name ? ', items::json, content' : ''} 
+  from site.menus
+  where ${where} 
+  order by (case when locale='uk' then false else true end)
+  limit ${limit} 
+  offset ${offset}`;
+
+  if (sql) return q;
+
+  const rows = pg ? await pg.query(q, args).then(el => el.rows || []) : [];
+
+  const payload = name ? (rows[0] || { error: 'menu not found', code: 404 }) : { rows };
+
+  // save to cache, default = 1 hour
+  if (ttl) await rclient.set(cacheKey, JSON.stringify(payload), 'EX', ttl);
+
+  return { cache: false, ...payload };
+}