@opengis/cms 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -12,6 +12,7 @@
     "plugin.js"
   ],
   "scripts": {
+    "patch": "npm version patch && git push && npm publish",
     "test": "node --test test/**/*.test.js",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "build": "vite build admin",
@@ -31,17 +32,17 @@
     "demo": "node --env-file=.env.demo --env-file=.env server",
     "i18n:sync": "node i18n-sync.cjs",
     "prepublishOnly": "bun build:lib",
-    "softpro": "bun --env-file=.env.softpro server"
-  },
-  "dependencies": {
+    "softpro": "bun --env-file=.env.softpro server",
+    "softpro1": "bun --env-file=.env.prod-softpro.local server"
   },
+  "dependencies": {},
   "resolutions": {
     "rollup": "4.30.0"
   },
   "devDependencies": {
     "@fastify/compress": "^8.1.0",
     "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.118",
+    "@opengis/fastify-table": "^2.0.128",
     "@opengis/filter": "^0.1.10",
     "@opengis/form": "^0.0.70",
     "@opengis/richtext": "0.0.38",

package/server/plugins/vite.js

@@ -6,6 +6,8 @@ import { config } from '@opengis/fastify-table/utils.js';
 
 const dir = dirname(fileURLToPath(import.meta.url));
 const root = `${dir}/../..`;
+const adminRoot = path.join(root, 'admin');
+
 const isProduction = process.env.NODE_ENV === 'production' || config.production;
 console.log({ isProduction })
 async function plugin(fastify) {
@@ -14,7 +16,8 @@ async function plugin(fastify) {
     const vite = await import('vite');
 
     const viteServer = await vite.createServer({
-      root: `${root}`,
+      root: adminRoot,
+      configFile: path.join(adminRoot, 'vite.config.js'),
       server: {
         middlewareMode: true,
       },

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

@@ -4,7 +4,8 @@ import { rm, stat, readdir } from 'node:fs/promises';
 
 import { config, dataDelete, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
 
-const rootDir = getFolder(config, 'local');
+// 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({

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

@@ -4,7 +4,8 @@ import { readFile } from 'node:fs/promises';
 
 import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
 
-const rootDir = getFolder(config, 'local');
+// 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 downloadMedia({
     pg = pgClients.client, params = {},

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

@@ -1,16 +1,16 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function getPermissions(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {} } = req;
-
-    if (!user?.uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    const { rows = [] } = await pg.query(
-        `select * from site.permissions where ${params.id ? 'user_id=$1' : 'true'}`,
-        [params.id].filter(Boolean),
-    );
-
-    return { permissions: rows };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getPermissions(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {} } = req;
+
+    if (!user?.uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    const { rows = [] } = await pg.query(
+        `select * from site.permissions where ${params.id ? 'user_id=$1' : 'true'}`,
+        [params.id].filter(Boolean),
+    );
+
+    return { permissions: rows };
 }

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

@@ -42,12 +42,6 @@ export default async function insertContent(req, reply) {
     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) {
-        return reply.status(400).send('empty schema: data');
-    }
-
-    const table = arr.find(el => el === params.type);
-
     const { content_id: contentId, type: contentType } = await pg.query(
         'select content_id, (select type from site.content_types where content_type_id=t.content_type_id) from site.contents t where slug=$1',
         [['single', 'pages'].includes(type) ? id : type],
@@ -58,6 +52,12 @@ export default async function insertContent(req, reply) {
         [contentId],
     ).then(el => el.rows?.[0]?.content_type_id) : null;
 
+    if (!arr.length && (ctypeId || type) !== 'pages') {
+        return reply.status(400).send('empty schema: data');
+    }
+
+    const table = arr.find(el => el === params.type);
+
     const { ctid, dbtable, columns: contentColumns } = await pg.query(
         'select content_type_id as ctid, table_name as dbtable, columns from site.content_types where $1 in (content_type_id, name)',
         [type === 'single' && id ? id : (ctypeId || type)],
@@ -70,7 +70,7 @@ export default async function insertContent(req, reply) {
         : contentColumns;
 
     // site.content_data, includes singletone
-    if (((!table && !dbtable) || type === 'pages')) {
+    if (((!table && !dbtable) || (ctypeId || type) === 'pages')) {
         const cid = await pg.query(
             'select content_id from site.contents where content_type_id=$1 limit 1',
             [ctid || 'pages'],

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

@@ -5,7 +5,8 @@ import { readdir, stat } from 'node:fs/promises';
 import { config, getFolder, pgClients, getMimeType } from '@opengis/fastify-table/utils.js';
 import { createHash } from 'node:crypto';
 
-const rootDir = getFolder(config, 'local');
+// 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 });

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

@@ -3,7 +3,8 @@ import { existsSync } from 'node:fs';
 
 import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
 
-const rootDir = getFolder(config, 'local');
+// 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 = {},

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/uploadMedia.js

@@ -3,7 +3,8 @@ import { mkdir } from 'node:fs/promises';
 
 import { uploadMultiPart, config, getFolder, dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
 
-const rootDir = getFolder(config, 'local');
+// 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) {

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

@@ -52,6 +52,7 @@ export default async function getCollection({
         },
         user,
         contextQuery: cQuery,
+        actions: ['view']
     }, reply, true);
 
     const locales = await pg.query(`select array_agg(distinct REVERSE(split_part(REVERSE(field_key), ':', 1))) from site.localization where object_id in (select id from ${'data.' + `"${table}"`})`).then(el => el.rows?.[0]?.array_agg || []);

package/server/routes/contentType/controllers/contentTypeList.js

@@ -1,4 +1,4 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
+import { logger, pgClients } from '@opengis/fastify-table/utils.js';
 
 const maxLimit = 100;
 
@@ -15,7 +15,7 @@ export default async function builderList({ pg = pgClients.client, query = {} },
   where ${query.type === 'collection' ? `type='collection'` : (query.type === 'single' ? `type='single'` : '1=1')}`;
 
   const where = query.search?.replace ? `(name ilike '%${query.search.replace(/'/, "''")}%' or title ilike '%${query.search.replace(/'/, "''")}%')` : '1=1';
-  const q1 = q + `and ${where} order by case when status='archived' then true else false end limit ${limit} offset ${offset}`;
+  const q1 = q + ` and ${where} order by case when status='archived' then true else false end limit ${limit} offset ${offset}`;
 
   if (query.sql) return q1;
 
@@ -39,13 +39,13 @@ export default async function builderList({ pg = pgClients.client, query = {} },
       ? `select count(*) from data."${row.table}" where $1=$1`
       : `select count(*) from site.contents where $1=$1 and ${row.id === 'pages' ? `slug <> 'pages' and content_type_id in (select content_type_id from site.content_types where type = 'single' or content_type_id='pages')` : 'content_type_id=$1'}`;
 
-    const q1 = row.table
+    const q3 = row.table
       ? `select updated_at from data."${row.table}" where $1=$1 order by updated_at desc limit 1`
       : `select updated_at from site.content_data where content_id in ( select content_id from site.contents where content_type_id=$1 limit 1) order by updated_at desc limit 1`;
 
     const count = await pg.queryCache(q2, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.count || '0');
 
-    const lastEdit = await pg.queryCache(q1, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.updated_at);
+    const lastEdit = await pg.queryCache(q3, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.updated_at);
 
     Object.assign(row, { columns: undefined, fields: row.columns?.length || '0', entries: +count, last_edit: lastEdit });
   }));

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,'')