@opengis/cms 0.0.32 → 0.0.34

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

@@ -1,95 +1,95 @@
-import path from 'node:path';
-import { existsSync, mkdirSync } from 'node:fs';
-import { readdir, stat } from 'node:fs/promises';
-
-import { config, getFolder, pgClients, getMimeType } from '@opengis/fastify-table/utils.js';
-import { createHash } from 'node:crypto';
-
-// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
-const rootDir = path.resolve(getFolder(config, 'local'));
-const dir = '/files';
-
-mkdirSync(path.join(rootDir, dir), { recursive: true });
-
-export default async function listMedia(req, reply) {
-    const { pg = pgClients.client, query = {} } = req;
-    const { subdir: subdir1 = '', search } = query;
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (typeof subdir1 !== 'string' || subdir1.includes('..')) {
-        return reply.status(403).send('invalid params: subdir');
-    }
-
-    const subdir = subdir1.replace(/\/{2,}/g, '/');
-    const relpath = path.join(dir, subdir1).replace(/\\/g, '/');
-    const dirpath = path.join(rootDir, relpath).replace(/\\/g, '/');
-
-    if (!existsSync(dirpath)) {
-        return { data: [], relpath, msg: 'directory not exists' };
-    }
-
-    const isDirectory = (await stat(dirpath)).isDirectory();
-
-    const allItems = isDirectory ? await readdir(dirpath, { withFileTypes: true, recursive: true }) : [];
-    const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
-
-    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 ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}`,
-        [subdir].filter(Boolean),
-    ).then(el => el.rows || []); // ?.filter(row => items.map(el => el.name).includes(row.filename))
-
-    const subdirs = items
-        .filter(el => el.isDirectory())
-        .map(el => ({ type: 'dir', name: el.name }))
-        .filter(el => search ? el.name.includes(search) : true);
-
-    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 };
-
-    if (config.debug) {
-        Object.assign(result, { rootDir });
-    }
-
-    const files = (search ? allItems.filter(el => el.name.includes(search)) : items)
-        .filter(el => el.isFile())
-        .map(el => {
-            const media = rows.find(row => row.filename === el.name);
-            const filepath = media ? media.url : ('/files/' + (el.path.split('/files/')[1] ? el.path.split('/files/')[1] + '/' : '') + el.name);
-            return media ? {
-                type: 'file',
-                ...media,
-                url: `${req.routeOptions.url}/${media.id}/file`,
-                preview: `${req.routeOptions.url}/${media.id}/preview`,
-                filepath,
-                metadata: `${req.routeOptions.url}/${media.id}`,
-            } : {
-                id: createHash('md5').update(filepath).digest('hex'),
-                hash: true,
-                type: 'file',
-                filename: el.name,
-                filepath,
-                filetype: getMimeType(el.name)?.startsWith('image/') ? "image" : "other",
-                filesize: 0,
-                url: filepath,
-                mime: getMimeType(el.name),
-                preview: filepath,
-            }
-        });
-
-    Object.assign(result, { data: subdirs.concat(files) });
-    return result;
-
+import path from 'node:path';
+import { existsSync, mkdirSync } from 'node:fs';
+import { readdir, stat } from 'node:fs/promises';
+
+import { config, getFolder, pgClients, getMimeType } from '@opengis/fastify-table/utils.js';
+import { createHash } from 'node:crypto';
+
+// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
+const rootDir = path.resolve(getFolder(config, 'local'));
+const dir = '/files';
+
+mkdirSync(path.join(rootDir, dir), { recursive: true });
+
+export default async function listMedia(req, reply) {
+    const { pg = pgClients.client, query = {} } = req;
+    const { subdir: subdir1 = '', search } = query;
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (typeof subdir1 !== 'string' || subdir1.includes('..')) {
+        return reply.status(403).send('invalid params: subdir');
+    }
+
+    const subdir = subdir1.replace(/\/{2,}/g, '/');
+    const relpath = path.join(dir, subdir1).replace(/\\/g, '/');
+    const dirpath = path.join(rootDir, relpath).replace(/\\/g, '/');
+
+    if (!existsSync(dirpath)) {
+        return { data: [], relpath, msg: 'directory not exists' };
+    }
+
+    const isDirectory = (await stat(dirpath)).isDirectory();
+
+    const allItems = isDirectory ? await readdir(dirpath, { withFileTypes: true, recursive: true }) : [];
+    const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
+
+    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 ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}`,
+        [subdir].filter(Boolean),
+    ).then(el => el.rows || []); // ?.filter(row => items.map(el => el.name).includes(row.filename))
+
+    const subdirs = items
+        .filter(el => el.isDirectory())
+        .map(el => ({ type: 'dir', name: el.name }))
+        .filter(el => search ? el.name.includes(search) : true);
+
+    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 };
+
+    if (config.debug) {
+        Object.assign(result, { rootDir });
+    }
+
+    const files = (search ? allItems.filter(el => el.name.includes(search)) : items)
+        .filter(el => el.isFile())
+        .map(el => {
+            const media = rows.find(row => row.filename === el.name);
+            const filepath = media ? media.url : ('/files/' + (el.path.split('/files/')[1] ? el.path.split('/files/')[1] + '/' : '') + el.name);
+            return media ? {
+                type: 'file',
+                ...media,
+                url: `${req.routeOptions.url}/${media.id}/file`,
+                preview: `${req.routeOptions.url}/${media.id}/preview`,
+                filepath,
+                metadata: `${req.routeOptions.url}/${media.id}`,
+            } : {
+                id: createHash('md5').update(filepath).digest('hex'),
+                hash: true,
+                type: 'file',
+                filename: el.name,
+                filepath,
+                filetype: getMimeType(el.name)?.startsWith('image/') ? "image" : "other",
+                filesize: 0,
+                url: filepath,
+                mime: getMimeType(el.name),
+                preview: filepath,
+            }
+        });
+
+    Object.assign(result, { data: subdirs.concat(files) });
+    return result;
+
 }

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

@@ -1,39 +1,39 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-
-import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
-
-// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
-const rootDir = path.resolve(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`,
-        preview: `${routeOptions.url.replace(':id', params.id)}/preview`,
-        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";
+
+// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
+const rootDir = path.resolve(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`,
+        preview: `${routeOptions.url.replace(':id', params.id)}/preview`,
+        filepath: data.url,
+        exists: existsSync(filepath),
+    });
+
+    return reply.status(200).send(data);
+}

package/server/routes/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

@@ -47,20 +47,19 @@ export default async function updateContent(req, reply) {
         return reply.status(400).send('empty body');
     }
 
+    // order priority - custom columns -> default for pages
+    const { ctid, ctname, dbtable, columns: contentColumns = [] } = await pg.query('select content_type_id as ctid, name as ctname, table_name as dbtable, columns from site.content_types where content_type_id in (select content_type_id from site.contents where content_id=$1) or content_type_id=$2 order by content_type_id = \'pages\'', [id, type]).then(el => el.rows?.[0] || {});
+
     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='data'`).then(el => el.rows?.[0]?.array_agg || []) : [];
+        left join pg_namespace b on a.relnamespace=b.oid 
+        where a.relam=2 and b.nspname='data'`).then(el => el.rows?.[0]?.array_agg || []) : [];
 
-    if (!arr.length) {
+    if (!arr.length && type !== 'pages') {
         return reply.status(400).send('empty schema: data');
     }
 
     const table = arr.find(el => el === params.type);
 
-    // order priority - custom columns -> default for pages
-    const { ctid, ctname, dbtable, columns: contentColumns = [] } = await pg.query('select content_type_id as ctid, name as ctname, table_name as dbtable, columns from site.content_types where content_type_id in (select content_type_id from site.contents where content_id=$1) or content_type_id=$2 order by content_type_id = \'pages\'', [id, type]).then(el => el.rows?.[0] || {});
-
-
     const loadTable = type === 'pages' ? await getTemplate('table', 'single.default.table') : {};
     const columns = type === 'pages'
         ? (loadTable?.columns || []).concat(contentColumns.filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1))
@@ -96,13 +95,14 @@ export default async function updateContent(req, reply) {
             return reply.status(404).send('contents not found');
         }
 
-        const contentId = cid === 'pages'
-            ? await pg.query('select content_id from site.content_data where object_id=$1', [id]).then(el => el.rows?.[0]?.content_id)
-            : cid;
+        // ? deprecated, blocks if only default columns provided, therefore commented for now
+        // const contentId = cid === 'pages'
+        //     ? await pg.query('select content_id from site.content_data where object_id=$1', [id]).then(el => el.rows?.[0]?.content_id)
+        //     : cid;
 
-        if (!contentId) {
-            return reply.status(404).send('contents not found: 2');
-        }
+        // if (!contentId) {
+        //     return reply.status(404).send('contents not found: 2');
+        // }
 
         const columnList = columns?.map?.(el => el.name) || [];
         const types = columns?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.type || 'text' }), {}) || {};
@@ -133,7 +133,9 @@ export default async function updateContent(req, reply) {
                 data: { ...body, content_type_id: ctid1 },
                 uid: user?.uid,
             });
-            await client.query(`delete from site.content_data where content_id=$1`, [contentId]);
+            // if (contentId) {
+            //     await client.query(`delete from site.content_data where content_id=$1`, [contentId]);
+            // }
             const objectId = (ctname === 'pages' || ['single', 'pages'].includes(type)) && id ? id : cid;
             await client.query(`delete from site.content_data where object_id=$1`, [objectId]);
             await Promise.all(keys.map(async key => dataInsert({

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

@@ -1,80 +1,80 @@
-import path from 'node:path';
-import { mkdir } from 'node:fs/promises';
-
-import { uploadMultiPart, config, getFolder, dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
-
-// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
-const rootDir = path.resolve(getFolder(config, 'local'));
-const dir = '/files';
-
-export default async function uploadMedia(req, reply) {
-    const { pg = pgClients.client, user = {}, query = {} } = req;
-
-    if (!pg?.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (query.subdir && (typeof query.subdir !== 'string' || query.subdir.includes('..'))) {
-        return reply.status(403).send('invalid query params: subdir');
-    }
-
-    // upload assets
-    if (req.headers['content-type']?.split?.(';')?.shift?.() === 'multipart/form-data') {
-        const file = await uploadMultiPart(req, { subdir: query.subdir || '', originalFilename: true }).catch(err => {
-            if (err.message === 'file with specified name already exists in directory') {
-                err.message = 'Файл з вказаною назвою вже існує';
-                err.statusCode = 400;
-            }
-            throw err;
-        });
-
-        const { originalFilename: filename, filetype, mimetype } = file;
-        const relpath = path.join(dir, query.subdir || '', file.originalFilename).replace(/\\/g, '/');
-
-        const id = await dataInsert({
-            pg,
-            table: 'site.media',
-            data: {
-                filename,
-                filetype,
-                subdir: query.subdir,
-                url: relpath,
-                mime: mimetype,
-                filesize: file.size,
-            },
-            uid: user?.uid,
-        }).then(el => el?.rows?.[0]?.media_id);
-
-        return reply.status(200).send({
-            res: 'ok',
-            name: filename,
-            type: 'file',
-            mimetype,
-            result: {
-                file_id: id,
-                format: file.extension,
-                size: file.size,
-                // entity_id: resultInsert?.entity_id,
-                file_path: relpath,
-                file_name: filename,
-                dir: path.dirname(relpath).replace(/\\/g, '/'),
-                native_file_name: filename,
-            },
-        });
-    }
-
-    if (!query.subdir) {
-        return reply.status(400).send('not enough query params: subdir');
-    }
-
-    // create directory
-    const relpath = path.join(dir, query.subdir).replace(/\\/g, '/');
-    const dirpath = path.join(rootDir, relpath);
-    await mkdir(dirpath, { recursive: true });
-
-    return reply.status(200).send({
-        relpath,
-        dirname: path.basename(query.subdir),
-        type: 'dir',
-    });
+import path from 'node:path';
+import { mkdir } from 'node:fs/promises';
+
+import { uploadMultiPart, config, getFolder, dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
+
+// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
+const rootDir = path.resolve(getFolder(config, 'local'));
+const dir = '/files';
+
+export default async function uploadMedia(req, reply) {
+    const { pg = pgClients.client, user = {}, query = {} } = req;
+
+    if (!pg?.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (query.subdir && (typeof query.subdir !== 'string' || query.subdir.includes('..'))) {
+        return reply.status(403).send('invalid query params: subdir');
+    }
+
+    // upload assets
+    if (req.headers['content-type']?.split?.(';')?.shift?.() === 'multipart/form-data') {
+        const file = await uploadMultiPart(req, { subdir: query.subdir || '', originalFilename: true }).catch(err => {
+            if (err.message === 'file with specified name already exists in directory') {
+                err.message = 'Файл з вказаною назвою вже існує';
+                err.statusCode = 400;
+            }
+            throw err;
+        });
+
+        const { originalFilename: filename, filetype, mimetype } = file;
+        const relpath = path.join(dir, query.subdir || '', file.originalFilename).replace(/\\/g, '/');
+
+        const id = await dataInsert({
+            pg,
+            table: 'site.media',
+            data: {
+                filename,
+                filetype,
+                subdir: query.subdir,
+                url: relpath,
+                mime: mimetype,
+                filesize: file.size,
+            },
+            uid: user?.uid,
+        }).then(el => el?.rows?.[0]?.media_id);
+
+        return reply.status(200).send({
+            res: 'ok',
+            name: filename,
+            type: 'file',
+            mimetype,
+            result: {
+                file_id: id,
+                format: file.extension,
+                size: file.size,
+                // entity_id: resultInsert?.entity_id,
+                file_path: relpath,
+                file_name: filename,
+                dir: path.dirname(relpath).replace(/\\/g, '/'),
+                native_file_name: filename,
+            },
+        });
+    }
+
+    if (!query.subdir) {
+        return reply.status(400).send('not enough query params: subdir');
+    }
+
+    // create directory
+    const relpath = path.join(dir, query.subdir).replace(/\\/g, '/');
+    const dirpath = path.join(rootDir, relpath);
+    await mkdir(dirpath, { recursive: true });
+
+    return reply.status(200).send({
+        relpath,
+        dirname: path.basename(query.subdir),
+        type: 'dir',
+    });
 }

package/server/routes/cms/utils/getSingle.js

@@ -101,6 +101,7 @@ export default async function getSingle({
       and ${localeQuery || '1=1'}
       and ${contentQuery || 'true'} 
       and ${id ? `$2 in (slug, content_id)` : 'true'}
+      and content_id<>'pages'
       order by case when status='archived' then true else false end, published_at desc nulls last
       LIMIT ${limit} OFFSET ${id ? 0 : offset}
     `;
@@ -120,6 +121,7 @@ export default async function getSingle({
         and $1=$1 and $2=$2 and ${contentQuery || 'true'} 
       )
     and ${statusQuery || 'true'}
+    and content_id<>'pages'
     `, [contentId, id]).then(el => el.rows?.[0] || {});
 
     const { rows = [] } = await pg.query(q, [contentId, id || '']);

package/server/templates/select/core.user_mentioned.sql

@@ -1,2 +1,2 @@
-select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
+select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
 where enabled order by coalesce(sur_name,'')||coalesce(' '||user_name,'')