@opengis/cms 0.0.56 → 0.0.58

package/server/routes/category/index.mjs

@@ -1,22 +1,22 @@
-import cmsCategoryGet from './controllers/cms.category.get.js';
-import cmsCategoryList from './controllers/cms.category.list.js';
-import cmsCategoryPut from './controllers/cms.category.put.js';
-import cmsCategoryPost from './controllers/cms.category.post.js';
-import cmsCategoryDelete from './controllers/cms.category.delete.js'
-
-export default async function route(app) {
-  // category add
-  app.post('/cms-category', {}, cmsCategoryPost);
-
-  // category edit
-  app.put('/cms-category/:id', {}, cmsCategoryPut);
-
-  // category list
-  app.get('/cms-category', {  config: { policy: ['site'] }}, cmsCategoryList);
-
-  // category get
-  app.get('/cms-category/:id', {}, cmsCategoryGet);
-
-  // category delete
-  app.delete('/cms-category/:id', {  config: { policy: ['site'] }}, cmsCategoryDelete);
-}
+import cmsCategoryGet from './controllers/cms.category.get.js';
+import cmsCategoryList from './controllers/cms.category.list.js';
+import cmsCategoryPut from './controllers/cms.category.put.js';
+import cmsCategoryPost from './controllers/cms.category.post.js';
+import cmsCategoryDelete from './controllers/cms.category.delete.js'
+
+export default async function route(app) {
+  // category add
+  app.post('/cms-category', {}, cmsCategoryPost);
+
+  // category edit
+  app.put('/cms-category/:id', {}, cmsCategoryPut);
+
+  // category list
+  app.get('/cms-category', {  config: { policy: ['site'] }}, cmsCategoryList);
+
+  // category get
+  app.get('/cms-category/:id', {}, cmsCategoryGet);
+
+  // category delete
+  app.delete('/cms-category/:id', {  config: { policy: ['site'] }}, cmsCategoryDelete);
+}

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

@@ -1,56 +1,56 @@
-import { metaFormat, pgClients } from '@opengis/fastify-table/utils.js';
-
-const q = `select 
-count(distinct object_id) as cdtotal,
-count(distinct object_id) filter( where date_trunc('month', created_at) = date_trunc('month', CURRENT_DATE) ) as cdnewcount from site.content_data`;
-
-const q1 = `select 
-count(*) as usercount,
-count(*) filter( where date_trunc('month', cdate) = date_trunc('month', CURRENT_DATE) ) as usernewcount from admin.users`;
-
-const q2 = `select 
-count(*) as mediacount,
-count(*) filter( where date_trunc('month', created_at) = date_trunc('month', CURRENT_DATE) ) as medianewcount from site.media`;
-
-const q3 = `select type, title, updated_at, content_type_id as object_id, slug as content_id from site.contents a 
-left join lateral (select type from site.content_types where content_type_id=a.content_type_id limit 1)b on 1=1
-where 1=1 order by updated_at desc limit 5`;
-
-export default async function cmsStat({ pg = pgClients.client }, reply) {
-    if (!pg) {
-        return reply.status(500).send('empty pg');
-    }
-
-    const { cdtotal = 0, cdnewcount = 0 } = await pg.query(q).then(el => el.rows?.[0] || {});
-
-    const customTables = await pg.query(`select array_agg(table_name) from site.content_types where type='collection' and table_name is not null`).then(el => el.rows?.[0]?.array_agg || []);
-
-    const custom = await Promise.all(customTables.filter(table => pg?.pk?.[`data.${table}`]).map(async table => {
-        // await pg.query(`alter table data.${table} add column if not exists created_at timestamp with time zone not null default now()`);
-        const { total = 0, newcount = 0 } = await pg.queryCache(`select count(*) as total, count(*) filter( where date_trunc('month', created_at) = date_trunc('month', CURRENT_DATE) ) as newcount from data.${table}`, { table: `data.${table}` }).then(el => el.rows?.[0] || {});
-        return { table, total, newcount };
-    }));
-
-    const totalContent = custom.reduce((acc, el) => acc + +el.total, +cdtotal);
-    const newContent = custom.reduce((acc, el) => acc + +el.newcount, +cdnewcount);
-
-    const { usercount = 0, usernewcount = 0 } = await pg.query(q1).then(el => el.rows?.[0] || {});
-
-    const { mediacount = 0, medianewcount = 0 } = await pg.query(q2).then(el => el.rows?.[0] || {});
-
-    const { rows = [] } = await pg.query(q3);
-
-    await metaFormat({ rows, cls: { updated_by: 'core.user_mentioned' }, sufix: false }, pg);
-
-    return {
-        stat: {
-            totalContent,
-            newContent,
-            totalUsers: +usercount,
-            newUsers: +usernewcount,
-            totalMediaFiles: +mediacount,
-            newMediaFiles: +medianewcount,
-        },
-        recentContent: rows,
-    };
+import { metaFormat, pgClients } from '@opengis/fastify-table/utils.js';
+
+const q = `select 
+count(distinct object_id) as cdtotal,
+count(distinct object_id) filter( where date_trunc('month', created_at) = date_trunc('month', CURRENT_DATE) ) as cdnewcount from site.content_data`;
+
+const q1 = `select 
+count(*) as usercount,
+count(*) filter( where date_trunc('month', cdate) = date_trunc('month', CURRENT_DATE) ) as usernewcount from admin.users`;
+
+const q2 = `select 
+count(*) as mediacount,
+count(*) filter( where date_trunc('month', created_at) = date_trunc('month', CURRENT_DATE) ) as medianewcount from site.media`;
+
+const q3 = `select type, title, updated_at, content_type_id as object_id, slug as content_id from site.contents a 
+left join lateral (select type from site.content_types where content_type_id=a.content_type_id limit 1)b on 1=1
+where 1=1 order by updated_at desc limit 5`;
+
+export default async function cmsStat({ pg = pgClients.client }, reply) {
+    if (!pg) {
+        return reply.status(500).send('empty pg');
+    }
+
+    const { cdtotal = 0, cdnewcount = 0 } = await pg.query(q).then(el => el.rows?.[0] || {});
+
+    const customTables = await pg.query(`select array_agg(table_name) from site.content_types where type='collection' and table_name is not null`).then(el => el.rows?.[0]?.array_agg || []);
+
+    const custom = await Promise.all(customTables.filter(table => pg?.pk?.[`data.${table}`]).map(async table => {
+        // await pg.query(`alter table data.${table} add column if not exists created_at timestamp with time zone not null default now()`);
+        const { total = 0, newcount = 0 } = await pg.queryCache(`select count(*) as total, count(*) filter( where date_trunc('month', created_at) = date_trunc('month', CURRENT_DATE) ) as newcount from data.${table}`, { table: `data.${table}` }).then(el => el.rows?.[0] || {});
+        return { table, total, newcount };
+    }));
+
+    const totalContent = custom.reduce((acc, el) => acc + +el.total, +cdtotal);
+    const newContent = custom.reduce((acc, el) => acc + +el.newcount, +cdnewcount);
+
+    const { usercount = 0, usernewcount = 0 } = await pg.query(q1).then(el => el.rows?.[0] || {});
+
+    const { mediacount = 0, medianewcount = 0 } = await pg.query(q2).then(el => el.rows?.[0] || {});
+
+    const { rows = [] } = await pg.query(q3);
+
+    await metaFormat({ rows, cls: { updated_by: 'core.user_mentioned' }, sufix: false }, pg);
+
+    return {
+        stat: {
+            totalContent,
+            newContent,
+            totalUsers: +usercount,
+            newUsers: +usernewcount,
+            totalMediaFiles: +mediacount,
+            newMediaFiles: +medianewcount,
+        },
+        recentContent: rows,
+    };
 }

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

@@ -1,58 +1,58 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 50;
-
-export default async function suggest({ pg = pgClients.client, params = {}, query = {}, user = {} }, reply) {
-    const t1 = Date.now();
-
-    const { id } = params;
-    const { key, val } = query;
-
-    if (!pg?.pk) {
-        return reply.status(500).send('empty pg');
-    }
-
-    if (!id) {
-        return reply.status(400).send('not enough params');
-    }
-
-    const limit = Math.min(query.limit || 16, maxLimit);
-    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-    const { ctid, table } = await pg.query(
-        'select content_type_id as ctid, table_name as table, columns from site.content_types where $1 in (content_type_id, name)',
-        [id],
-    ).then(el => el.rows?.[0] || {});
-
-    if (!ctid) {
-        return reply.status(404).send('content type not found');
-    }
-
-    // site.content_data
-    if (!table) {
-        const q = `select content_id as id, title as text from site.contents where content_type_id=$1 and ${key ? `lower(title) ~ lower($2)` : (val ? 'content_id=$2' : '1=1')} limit ${limit}`;
-
-        const { rows = [] } = await pg.query(q, [ctid, (key || val)].filter(Boolean));
-
-        return {
-            time: Date.now() - t1,
-            limit,
-            count: rows.length,
-            mode: 'array',
-            sql: (config.local || user?.user_type?.includes?.('admin')) ? q : undefined,
-            data: rows,
-        };
-    }
-
-    const q = `select id, title as text from data.${table} where ${key ? `lower(title) ~ lower($1)` : (val ? 'id=$1' : '1=1')} limit ${limit}`;
-    const { rows = [] } = await pg.query(q, [key || val].filter(Boolean));
-
-    return {
-        time: Date.now() - t1,
-        limit,
-        count: rows.length,
-        mode: 'array',
-        sql: (config.local || user?.user_type?.includes?.('admin')) ? q : undefined,
-        data: rows,
-    };
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 50;
+
+export default async function suggest({ pg = pgClients.client, params = {}, query = {}, user = {} }, reply) {
+    const t1 = Date.now();
+
+    const { id } = params;
+    const { key, val } = query;
+
+    if (!pg?.pk) {
+        return reply.status(500).send('empty pg');
+    }
+
+    if (!id) {
+        return reply.status(400).send('not enough params');
+    }
+
+    const limit = Math.min(query.limit || 16, maxLimit);
+    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+    const { ctid, table } = await pg.query(
+        'select content_type_id as ctid, table_name as table, columns from site.content_types where $1 in (content_type_id, name)',
+        [id],
+    ).then(el => el.rows?.[0] || {});
+
+    if (!ctid) {
+        return reply.status(404).send('content type not found');
+    }
+
+    // site.content_data
+    if (!table) {
+        const q = `select content_id as id, title as text from site.contents where content_type_id=$1 and ${key ? `lower(title) ~ lower($2)` : (val ? 'content_id=$2' : '1=1')} limit ${limit}`;
+
+        const { rows = [] } = await pg.query(q, [ctid, (key || val)].filter(Boolean));
+
+        return {
+            time: Date.now() - t1,
+            limit,
+            count: rows.length,
+            mode: 'array',
+            sql: (config.local || user?.user_type?.includes?.('admin')) ? q : undefined,
+            data: rows,
+        };
+    }
+
+    const q = `select id, title as text from data.${table} where ${key ? `lower(title) ~ lower($1)` : (val ? 'id=$1' : '1=1')} limit ${limit}`;
+    const { rows = [] } = await pg.query(q, [key || val].filter(Boolean));
+
+    return {
+        time: Date.now() - t1,
+        limit,
+        count: rows.length,
+        mode: 'array',
+        sql: (config.local || user?.user_type?.includes?.('admin')) ? q : undefined,
+        data: rows,
+    };
 } 

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

@@ -1,114 +1,114 @@
-import { config, pgClients, dataUpdate, dataDelete } from '@opengis/fastify-table/utils.js';
-
-export default async function deleteContent(req, reply) {
-    const {
-        pg = pgClients.client,
-        params = {},
-        user = {},
-        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 (id === 'pages') {
-        return reply.status(403).send('access restricted: pages contents cannot be deleted');
-    }
-
-    const { ctid, dbtable } = await pg.query('select content_type_id as ctid, table_name as dbtable from site.content_types where $1 in (content_type_id, name)', [params.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 || []) : [];
-
-    if (!arr.length && type !== 'pages') {
-        return reply.status(400).send('empty schema: data');
-    }
-
-    const table = arr.find(el => el === params.type);
-
-    // singletone with extra at site.content_data
-    if (!table && !dbtable && ctid) {
-        const { cid, status } = ctid === 'pages' && id
-            ? await pg.query(
-                'select content_id as cid, status from site.contents where content_id=$1 limit 1',
-                [id]).then(el => el.rows?.[0] || {})
-            : await pg.query(
-                'select content_id as cid, status from site.contents where content_type_id=$1 limit 1',
-                [ctid],
-            ).then(el => el.rows?.[0] || {});
-
-        if (!cid) {
-            return reply.status(404).send('contents not found');
-        }
-
-        if (cid === 'pages') {
-            return reply.status(403).send('access restricted: pages contents cannot be deleted');
-        }
-
-        if (status === 'archived') {
-            const row = await dataDelete({
-                pg,
-                id,
-                table: 'site.contents',
-                referer: headers?.referer,
-                uid: user?.uid || 0,
-            })
-            return { id, ...row || {} };
-        }
-
-        // archived
-        const row = await dataUpdate({
-            pg,
-            id,
-            table: 'site.contents',
-            data: {
-                status: 'archived',
-            },
-            referer: headers?.referer,
-            uid: user?.uid || 0,
-        })
-        return { id, ...row || {} };
-    }
-
-    // custom table
-    if (!table && !dbtable) {
-        return reply.status(400).send('invalid params: type');
-    }
-
-    const status = await pg.query(`select status from data."${(table || dbtable)}" where id =$1`, [id]).then(el => el.rows?.[0]?.status);
-
-    if (status === 'archived') {
-        const row = await dataDelete({
-            pg,
-            id,
-            table: 'data.' + `"${(table || dbtable)}"`,
-            referer: headers?.referer,
-            uid: user?.uid || 0,
-        })
-        return { id, ...row || {} };
-    }
-
-    // archived
-    const result = await dataUpdate({
-        pg,
-        id,
-        table: 'data.' + `"${(table || dbtable)}"`,
-        data: {
-            status: 'archived',
-        },
-        referer: headers?.referer,
-        uid: user?.uid || 0,
-    });
-
-    const pk = pg.pk?.['data.' + table || dbtable];
-    return reply.status(200).send({ id: result?.[pk], ...result || {} });
+import { config, pgClients, dataUpdate, dataDelete } from '@opengis/fastify-table/utils.js';
+
+export default async function deleteContent(req, reply) {
+    const {
+        pg = pgClients.client,
+        params = {},
+        user = {},
+        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 (id === 'pages') {
+        return reply.status(403).send('access restricted: pages contents cannot be deleted');
+    }
+
+    const { ctid, dbtable } = await pg.query('select content_type_id as ctid, table_name as dbtable from site.content_types where $1 in (content_type_id, name)', [params.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 || []) : [];
+
+    if (!arr.length && type !== 'pages') {
+        return reply.status(400).send('empty schema: data');
+    }
+
+    const table = arr.find(el => el === params.type);
+
+    // singletone with extra at site.content_data
+    if (!table && !dbtable && ctid) {
+        const { cid, status } = ctid === 'pages' && id
+            ? await pg.query(
+                'select content_id as cid, status from site.contents where content_id=$1 limit 1',
+                [id]).then(el => el.rows?.[0] || {})
+            : await pg.query(
+                'select content_id as cid, status from site.contents where content_type_id=$1 limit 1',
+                [ctid],
+            ).then(el => el.rows?.[0] || {});
+
+        if (!cid) {
+            return reply.status(404).send('contents not found');
+        }
+
+        if (cid === 'pages') {
+            return reply.status(403).send('access restricted: pages contents cannot be deleted');
+        }
+
+        if (status === 'archived') {
+            const row = await dataDelete({
+                pg,
+                id,
+                table: 'site.contents',
+                referer: headers?.referer,
+                uid: user?.uid || 0,
+            })
+            return { id, ...row || {} };
+        }
+
+        // archived
+        const row = await dataUpdate({
+            pg,
+            id,
+            table: 'site.contents',
+            data: {
+                status: 'archived',
+            },
+            referer: headers?.referer,
+            uid: user?.uid || 0,
+        })
+        return { id, ...row || {} };
+    }
+
+    // custom table
+    if (!table && !dbtable) {
+        return reply.status(400).send('invalid params: type');
+    }
+
+    const status = await pg.query(`select status from data."${(table || dbtable)}" where id =$1`, [id]).then(el => el.rows?.[0]?.status);
+
+    if (status === 'archived') {
+        const row = await dataDelete({
+            pg,
+            id,
+            table: 'data.' + `"${(table || dbtable)}"`,
+            referer: headers?.referer,
+            uid: user?.uid || 0,
+        })
+        return { id, ...row || {} };
+    }
+
+    // archived
+    const result = await dataUpdate({
+        pg,
+        id,
+        table: 'data.' + `"${(table || dbtable)}"`,
+        data: {
+            status: 'archived',
+        },
+        referer: headers?.referer,
+        uid: user?.uid || 0,
+    });
+
+    const pk = pg.pk?.['data.' + table || dbtable];
+    return reply.status(200).send({ id: result?.[pk], ...result || {} });
 }

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

@@ -1,77 +1,77 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { rm, stat, readdir } from 'node:fs/promises';
-
-import { config, dataDelete, 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'));
-const dir = '/files';
-
-export default async function deleteMedia({
-    pg = pgClients.client, params = {}, query = {}, user = {}, method = 'DELETE',
-}, reply) {
-    if (!config.debug && method !== 'DELETE') {
-        return reply.status(403).send('access restricted');
-    }
-
-    if (!params.id && query.subdir) {
-        const dirpath = path.join(rootDir, dir, query.subdir || '');
-        const exists = existsSync(dirpath);
-        const stats = await stat(dirpath);
-
-        if (!stats.isDirectory()) {
-            return reply.status(400).send('not a directory');
-        }
-
-        if (!exists) {
-            return reply.status(404).send('subdir not found: ' + query.subdir);
-        }
-
-        const content = await readdir(dirpath, { recursive: true });
-
-        if (query.subdir.startsWith('uploads') && !query.subdir.split('/')[1]) {
-            return reply.status(403).send('access restricted: uploads directory');
-        }
-
-        // only admins are allowed to delete non-empty directories
-        if (content?.length && !user?.user_type?.includes?.('admin')) {
-            return reply.status(400).send('directory is not empty');
-        }
-
-        await rm(dirpath, { recursive: true });
-        return reply.status(200).send('subdirectory successfully deleted');
-    }
-
-    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 { url: relpath, id } = await pg.query(
-        'select media_id as id, url from site.media where media_id = $1 and url is not null',
-        [params.id],
-    ).then(el => el.rows?.[0] || {});
-
-    if (!id) {
-        return reply.status(404).send('media not found: ' + params.id);
-    }
-
-    const res = await dataDelete({
-        pg,
-        id,
-        table: 'site.media',
-        uid: user?.uid || 0,
-    });
-
-    const filepath = path.join(rootDir, relpath);
-
-    if (existsSync(filepath)) {
-        await rm(filepath, { recursive: true });
-    }
-
-    return { id, ...res || {} };
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { rm, stat, readdir } from 'node:fs/promises';
+
+import { config, dataDelete, 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'));
+const dir = '/files';
+
+export default async function deleteMedia({
+    pg = pgClients.client, params = {}, query = {}, user = {}, method = 'DELETE',
+}, reply) {
+    if (!config.debug && method !== 'DELETE') {
+        return reply.status(403).send('access restricted');
+    }
+
+    if (!params.id && query.subdir) {
+        const dirpath = path.join(rootDir, dir, query.subdir || '');
+        const exists = existsSync(dirpath);
+        const stats = await stat(dirpath);
+
+        if (!stats.isDirectory()) {
+            return reply.status(400).send('not a directory');
+        }
+
+        if (!exists) {
+            return reply.status(404).send('subdir not found: ' + query.subdir);
+        }
+
+        const content = await readdir(dirpath, { recursive: true });
+
+        if (query.subdir.startsWith('uploads') && !query.subdir.split('/')[1]) {
+            return reply.status(403).send('access restricted: uploads directory');
+        }
+
+        // only admins are allowed to delete non-empty directories
+        if (content?.length && !user?.user_type?.includes?.('admin')) {
+            return reply.status(400).send('directory is not empty');
+        }
+
+        await rm(dirpath, { recursive: true });
+        return reply.status(200).send('subdirectory successfully deleted');
+    }
+
+    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 { url: relpath, id } = await pg.query(
+        'select media_id as id, url from site.media where media_id = $1 and url is not null',
+        [params.id],
+    ).then(el => el.rows?.[0] || {});
+
+    if (!id) {
+        return reply.status(404).send('media not found: ' + params.id);
+    }
+
+    const res = await dataDelete({
+        pg,
+        id,
+        table: 'site.media',
+        uid: user?.uid || 0,
+    });
+
+    const filepath = path.join(rootDir, relpath);
+
+    if (existsSync(filepath)) {
+        await rm(filepath, { recursive: true });
+    }
+
+    return { id, ...res || {} };
 }