@opengis/cms 0.0.14 → 0.0.15

package/server/routes/{site → cms}/controllers/insertContent.js

@@ -1,48 +1,69 @@
-import { pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function insertContent(req, reply) {
-    const {
-        pg = pgClients.client,
-        params = {},
-        user = {},
-        body = {},
-        headers = {},
-    } = req;
-
-    const { type, id = body?.id } = params;
-
-    if (!type) {
-        return reply.status(400).send('not enough params: type');
-    }
-
-    const arr = await pg.query(`select array_agg(relname)::text[] from pg_class a 
-    left join pg_namespace b on a.relnamespace=b.oid 
-    where a.relam=2 and b.nspname='site'`).then(el => el.rows?.[0]?.array_agg || []);
-
-    if (!arr.length) {
-        return reply.status(400).send('empty schema: site');
-    }
-
-    const table = arr.find(el => el === params.type);
-
-    if (!table) {
-        return reply.status(400).send('invalid params: type');
-    }
-
-    const { rows = [] } = await dataInsert({
-        pg,
-        id,
-        table: 'site.' + table,
-        data: body,
-        referer: headers?.referer,
-        uid: user?.uid || 0,
-    }).catch(err => {
-        if (err.message?.includes?.('unique constraint')) {
-            return reply.status(400).send('Порушенні унікальності: ' + err.message?.match?.(/([^"]+)/g)?.[1]);
-        }
-        return reply.status(500).send(err.toString());
-    });
-
-    const pk = pg.pk?.['site.' + table];
-    return reply.status(200).send({ id: rows[0]?.[pk], rows });
+import { config, pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
+
+import builderCache from '../../contentType/utils/builderCache.js';
+
+export default async function insertContent(req, reply) {
+    const {
+        pg = pgClients.client,
+        params = {},
+        user = {},
+        body = {},
+        headers = {},
+    } = req;
+
+    const { type, id = body?.id } = params;
+
+    if (!type) {
+        return reply.status(400).send('not enough params: type');
+    }
+
+    if (builderCache[type]?.table && builderCache[type]?.provider === 'pg' && config.pg) {
+        const { rows = [] } = await dataInsert({
+            pg,
+            id,
+            table: 'site.' + builderCache[type]?.table,
+            data: body,
+            referer: headers?.referer,
+            uid: user?.uid || 0,
+        }).catch(err => {
+            if (err.message?.includes?.('unique constraint')) {
+                return reply.status(400).send('Порушенні унікальності: ' + err.message?.match?.(/([^"]+)/g)?.[1]);
+            }
+            return reply.status(500).send(err.toString());
+        });
+
+        const pk = pg.pk?.['site.' + builderCache[type]?.table];
+        return reply.status(200).send({ id: rows[0]?.[pk], rows });
+    }
+
+    const arr = config.pg ? await pg.query(`select array_agg(relname)::text[] from pg_class a 
+    left join pg_namespace b on a.relnamespace=b.oid 
+    where a.relam=2 and b.nspname='site'`).then(el => el.rows?.[0]?.array_agg || []) : [];
+
+    if (!arr.length) {
+        return reply.status(400).send('empty schema: site');
+    }
+
+    const table = arr.find(el => el === params.type);
+
+    if (!table) {
+        return reply.status(400).send('invalid params: type');
+    }
+
+    const { rows = [] } = await dataInsert({
+        pg,
+        id,
+        table: 'site.' + table,
+        data: body,
+        referer: headers?.referer,
+        uid: user?.uid || 0,
+    }).catch(err => {
+        if (err.message?.includes?.('unique constraint')) {
+            return reply.status(400).send('Порушенні унікальності: ' + err.message?.match?.(/([^"]+)/g)?.[1]);
+        }
+        return reply.status(500).send(err.toString());
+    });
+
+    const pk = pg.pk?.['site.' + table];
+    return reply.status(200).send({ id: rows[0]?.[pk], rows });
 }

package/server/routes/{site → cms}/controllers/listMedia.js

@@ -1,73 +1,73 @@
-import path from 'node:path';
-import { existsSync, mkdirSync } from 'node:fs';
-import { readdir, stat } from 'node:fs/promises';
-
-import { config, getFolder, pgClients } from '@opengis/fastify-table/utils.js';
-
-const rootDir = getFolder(config, 'local');
-mkdirSync(path.join(rootDir, 'media'), { recursive: true });
-
-export default async function listMedia(req, reply) {
-    const { pg = pgClients.client, query = {} } = req;
-    const { subdir = '' } = query;
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (typeof subdir !== 'string' || subdir.includes('..')) {
-        return reply.status(403).send('invalid params: subdir');
-    }
-
-    const relpath = path.join('/media', subdir).replace(/\\/g, '/');
-    const dirpath = path.join(rootDir, relpath).replace(/\\/g, '/');
-
-    if (!existsSync(dirpath)) {
-        return { data: [], relpath, msg: 'directory not exists' };
-    }
-
-    const { rows = [] } = await pg.query(
-        `select 
-            media_id as id, filename, filetype, filesize, url, description, alt,
-            mime, preview_url, created_at, updated_at, created_by, updated_by
-        from site.media
-        where url ~ $1`,
-        [relpath],
-    );
-
-    const isDirectory = (await stat(dirpath)).isDirectory();
-
-    const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
-
-    const subdirs = items
-        .filter(el => el.isDirectory())
-        .map(el => ({ type: 'dir', name: el.name }));
-
-    if (subdirs.length) {
-        await Promise.all(subdirs.map(async (item) => {
-            const items = isDirectory ? await readdir(path.join(dirpath, item.name)) : [];
-            Object.assign(item, { count: items.length });
-        }));
-    }
-
-    const result = { relpath, data: rows.concat(subdirs) };
-
-    if (config.debug) {
-        Object.assign(result, { rootDir });
-    }
-
-    if (!rows.length) {
-        return result;
-    }
-
-    rows.forEach(row => Object.assign(row, {
-        type: 'file',
-        url: `${req.routeOptions.url}/${row.id}/file`,
-        filepath: row.url,
-        name: row.filename,
-        metadata: `${req.routeOptions.url}/${row.id}`,
-        exists: !!items.find(el => el.isFile() && el.name === path.basename(row.url))
-    }));
-
-    return result;
+import path from 'node:path';
+import { existsSync, mkdirSync } from 'node:fs';
+import { readdir, stat } from 'node:fs/promises';
+
+import { config, getFolder, pgClients } from '@opengis/fastify-table/utils.js';
+
+const rootDir = getFolder(config, 'local');
+mkdirSync(path.join(rootDir, 'media'), { recursive: true });
+
+export default async function listMedia(req, reply) {
+    const { pg = pgClients.client, query = {} } = req;
+    const { subdir = '' } = query;
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (typeof subdir !== 'string' || subdir.includes('..')) {
+        return reply.status(403).send('invalid params: subdir');
+    }
+
+    const relpath = path.join('/media', subdir).replace(/\\/g, '/');
+    const dirpath = path.join(rootDir, relpath).replace(/\\/g, '/');
+
+    if (!existsSync(dirpath)) {
+        return { data: [], relpath, msg: 'directory not exists' };
+    }
+
+    const { rows = [] } = await pg.query(
+        `select 
+            media_id as id, filename, filetype, filesize, url, description, alt,
+            mime, preview_url, created_at, updated_at, created_by, updated_by
+        from site.media
+        where url ~ $1`,
+        [relpath],
+    );
+
+    const isDirectory = (await stat(dirpath)).isDirectory();
+
+    const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
+
+    const subdirs = items
+        .filter(el => el.isDirectory())
+        .map(el => ({ type: 'dir', name: el.name }));
+
+    if (subdirs.length) {
+        await Promise.all(subdirs.map(async (item) => {
+            const items = isDirectory ? await readdir(path.join(dirpath, item.name)) : [];
+            Object.assign(item, { count: items.length });
+        }));
+    }
+
+    const result = { relpath, data: rows.concat(subdirs) };
+
+    if (config.debug) {
+        Object.assign(result, { rootDir });
+    }
+
+    if (!rows.length) {
+        return result;
+    }
+
+    rows.forEach(row => Object.assign(row, {
+        type: 'file',
+        url: `${req.routeOptions.url}/${row.id}/file`,
+        filepath: row.url,
+        name: row.filename,
+        metadata: `${req.routeOptions.url}/${row.id}`,
+        exists: !!items.find(el => el.isFile() && el.name === path.basename(row.url))
+    }));
+
+    return result;
 }

package/server/routes/{site → cms}/controllers/metadataMedia.js

@@ -1,37 +1,37 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-
-import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
-
-const rootDir = getFolder(config, 'local');
-
-export default async function metadataMedia({
-    routeOptions = {}, pg = pgClients.client, params = {},
-}, reply) {
-    if (!params?.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    const data = await pg.query(
-        'select * from site.media where media_id = $1 and url is not null',
-        [params.id],
-    ).then(el => el.rows?.[0]);
-
-    if (!data) {
-        return reply.status(404).send('media not found: ' + params.id);
-    }
-
-    const filepath = path.join(rootDir, data.url);
-
-    Object.assign(data, {
-        url: `${routeOptions.url.replace(':id', params.id)}/file`,
-        filepath: data.url,
-        exists: existsSync(filepath),
-    });
-
-    return reply.status(200).send(data);
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+
+import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
+
+const rootDir = getFolder(config, 'local');
+
+export default async function metadataMedia({
+    routeOptions = {}, pg = pgClients.client, params = {},
+}, reply) {
+    if (!params?.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    const data = await pg.query(
+        'select * from site.media where media_id = $1 and url is not null',
+        [params.id],
+    ).then(el => el.rows?.[0]);
+
+    if (!data) {
+        return reply.status(404).send('media not found: ' + params.id);
+    }
+
+    const filepath = path.join(rootDir, data.url);
+
+    Object.assign(data, {
+        url: `${routeOptions.url.replace(':id', params.id)}/file`,
+        filepath: data.url,
+        exists: existsSync(filepath),
+    });
+
+    return reply.status(200).send(data);
+}

package/server/routes/{site → cms}/controllers/setPermissions.js

@@ -1,50 +1,50 @@
-import { logger, pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function setPermissions(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {}, body = {} } = req;
-
-    if (!user?.uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    if (!params.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    const client = await pg.connect()
-    const result = {};
-    try {
-        await client.query('BEGIN');
-
-        const { rowCount = 0 } = await client.query(
-            `delete from site.permissions where user_id=$1`,
-            [params.id].filter(Boolean),
-        );
-
-        Object.assign(result, { deleted: rowCount });
-
-        if (Array.isArray(body.permissions) && body.permissions?.length) {
-            body.permissions.forEach((el) => {
-                Object.assign(el, { user_id: el.user_id || params.id });
-            });
-
-            await Promise.all(body.permissions.map(async (el) => dataInsert({
-                pg: client,
-                table: 'site.permissions',
-                data: el,
-                uid: user.uid,
-            })));
-
-            Object.assign(result, { inserted: body.permissions.length });
-        }
-
-        await client.query('COMMIT');
-        return reply.status(200).send(result);
-    } catch (err) {
-        await client.query('ROLLBACK');
-        logger.file('cms/permissions', { error: err.toString(), stack: err.stack });
-        return reply.status(500).send('set permissions error');
-    } finally {
-        client.release();
-    }
+import { logger, pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
+
+export default async function setPermissions(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {}, body = {} } = req;
+
+    if (!user?.uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    if (!params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    const client = await pg.connect()
+    const result = {};
+    try {
+        await client.query('BEGIN');
+
+        const { rowCount = 0 } = await client.query(
+            `delete from site.permissions where user_id=$1`,
+            [params.id].filter(Boolean),
+        );
+
+        Object.assign(result, { deleted: rowCount });
+
+        if (Array.isArray(body.permissions) && body.permissions?.length) {
+            body.permissions.forEach((el) => {
+                Object.assign(el, { user_id: el.user_id || params.id });
+            });
+
+            await Promise.all(body.permissions.map(async (el) => dataInsert({
+                pg: client,
+                table: 'site.permissions',
+                data: el,
+                uid: user.uid,
+            })));
+
+            Object.assign(result, { inserted: body.permissions.length });
+        }
+
+        await client.query('COMMIT');
+        return reply.status(200).send(result);
+    } catch (err) {
+        await client.query('ROLLBACK');
+        logger.file('cms/permissions', { error: err.toString(), stack: err.stack });
+        return reply.status(500).send('set permissions error');
+    } finally {
+        client.release();
+    }
 }

package/server/routes/cms/controllers/updateContent.js

@@ -0,0 +1,112 @@
+import { config, pgClients, dataUpdate, dataInsert } from '@opengis/fastify-table/utils.js';
+
+import builderCache from '../../contentType/utils/builderCache.js';
+
+export default async function updateContent(req, reply) {
+    const {
+        pg = pgClients.client,
+        params = {},
+        user = {},
+        body = {},
+        headers = {},
+    } = req;
+
+    const { type, id } = params;
+
+    if (!type) {
+        return reply.status(400).send('not enough params: type');
+    }
+
+    if (!id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (!Object.keys(body || {}).length) {
+        return reply.status(400).send('empty body');
+    }
+
+    if (type === 'single') {
+        const cache = builderCache(id) || {};
+        if (!cache) {
+            return reply.status(400).send('invalid params: id');
+        }
+
+        const client = await pg.connect();
+
+        try {
+            await client.query('BEGIN');
+            // await client.query('SET statement_timeout = 100000000;');
+            await client.query(`delete from site.single_type_values where type_name=$1`, [id]);
+
+            await Promise.all(Object.keys(body).filter(key => body[key]).map(async key => dataInsert({
+                pg: client,
+                table: 'site.single_type_values',
+                data: { key, value: body[key], type_name: id },
+                referer: headers?.referer,
+                uid: user?.uid || 0,
+            })));
+
+            // await client.query('SET statement_timeout = 0;');
+
+            await client.query('COMMIT');
+            return reply.status(200).send({ id, ...body });
+        }
+        catch (err) {
+            await client.query('ROLLBACK');
+            return reply.status(500).send(err.toString());
+        }
+        finally {
+            client.release();
+        }
+    }
+
+    if (builderCache[type]?.table && builderCache[type]?.provider === 'pg' && config.pg) {
+        const result = await dataUpdate({
+            pg,
+            id,
+            table: 'site.' + builderCache[type]?.table,
+            data: body,
+            referer: headers?.referer,
+            uid: user?.uid || 0,
+        }).catch(err => {
+            if (err.message?.includes?.('unique constraint')) {
+                return reply.status(400).send('Порушенні унікальності: ' + err.message?.match?.(/([^"]+)/g)?.[1]);
+            }
+            return reply.status(500).send(err.toString());
+        });
+
+        const pk = pg.pk?.['site.' + builderCache[type]?.table];
+        return reply.status(200).send({ id: result?.[pk], ...result || {} });
+    }
+
+    const arr = config.pg ? await pg.query(`select array_agg(relname)::text[] from pg_class a 
+    left join pg_namespace b on a.relnamespace=b.oid 
+    where a.relam=2 and b.nspname='site'`).then(el => el.rows?.[0]?.array_agg || []) : [];
+
+    if (!arr.length) {
+        return reply.status(400).send('empty schema: site');
+    }
+
+    const table = arr.find(el => el === params.type);
+
+    if (!table) {
+        return reply.status(400).send('invalid params: type');
+    }
+
+    const result = await dataUpdate({
+        pg,
+        id,
+        table: 'site.' + table,
+        data: body,
+        referer: headers?.referer,
+        uid: user?.uid || 0,
+    }).catch(err => {
+        if (err.message?.includes?.('unique constraint')) {
+            return reply.status(400).send('Порушенні унікальності: ' + err.message?.match?.(/([^"]+)/g)?.[1]);
+        }
+        return reply.status(500).send(err.toString());
+    });
+
+    const pk = pg.pk?.['site.' + table];
+    return reply.status(200).send({ id: result?.[pk], ...result || {} });
+}