@opengis/cms 0.0.33 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -15,8 +15,10 @@
     "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",
-    "build:lib": "LIB=true vite build",
+    "dev": "NODE_ENV=dev bun --env-file=.env.softpro server ",
+    "admin": "vite admin",
+    "build": "vite build && vite build admin",
+    "build:lib": "vite build",
     "proxy": "vite dev admin",
     "build-npm": "vite build",
     "start": "bun --env-file=.env.ip server",
@@ -25,7 +27,6 @@
     "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
     "prod-ip": "PORT=3019 node server --config=ip",
     "prod-ip-test": "PORT=3025 node server --config=ip",
-    "dev": "node server --config=softpro",
     "debug": "bun --watch server --config=softpro",
     "ip-test": "node server --config=ip-test",
     "ip": "node --env-file=.env.ip server",

package/server/plugins/vite.js

@@ -1,58 +1,46 @@
 import fs from 'node:fs';
-import path, { dirname } from 'node:path';
-import { fileURLToPath } from 'url';
+import path from 'node:path';
+import { createServer } from 'vite';
 
 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;
+const isProduction = process.env.NODE_ENV !== 'dev';
 console.log({ isProduction })
 async function plugin(fastify) {
   // vite server
-  if (!isProduction) {
-    const vite = await import('vite');
-
-    const viteServer = await vite.createServer({
-      root: adminRoot,
-      configFile: path.join(adminRoot, 'vite.config.js'),
-      server: {
-        middlewareMode: true,
-      },
-    });
+   const viteServer = !isProduction ? await createServer({
+    root: 'admin',
+    server: {
+      middlewareMode: true,
+    },
+  }) : null;
 
-    // add root to watch
-    viteServer.watcher.add(root);
-
-    // hot relaod template
+  if (!isProduction) {
+    const dir1 = process.cwd();
+    viteServer.watcher.add(dir1);
     viteServer.watcher.on('all', (d, t) => {
       if (!t.includes('module')) return;
       console.log(d, t);
       viteServer.ws.send({ type: 'full-reload' });
     });
 
-    // this is middleware for vite's dev servert
+    // this is middleware for vite's dev server
     fastify.addHook('onRequest', async (req, reply) => {
       const { user } = req.session?.passport || {};
-      if (!user && config.pg && !req.url.startsWith('/src/') && !config.auth?.disable) {
-        return reply.redirect('/login');
-      }
+      // console.log(req.url);
 
       const next = () => new Promise((resolve) => {
         viteServer.middlewares(req.raw, reply.raw, () => resolve());
       });
+
       await next();
     });
-    fastify.get('*', async () => { });
-    return;
   }
 
   // From Build
   fastify.get('*', async (req, reply) => {
     const { user } = req.session?.passport || {};
-    const indexPath = path.join(root, 'dist', 'index.html');
+    const indexPath = path.join('admin/dist', 'index.html');
     if (!user && config.pg && !req.url.startsWith('/src/') && !config.auth?.disable) {
       return reply.redirect('/login');
     }
@@ -65,8 +53,8 @@ async function plugin(fastify) {
 
   const fileSize = {};
   async function staticFile(req, reply) {
-    const assetsDir = '/dist';
-    const filePath = path.join(root, assetsDir, req.url);
+    const assetsDir = 'admin/dist';
+    const filePath = path.join( assetsDir, req.url);
     const ext = path.extname(filePath);
 
     if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' };

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

@@ -18,24 +18,23 @@ export default async function deleteContent(req, reply) {
         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 || []) : [];
+        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);
 
-    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] || {});
-
     // singletone with extra at site.content_data
     if (!table && !dbtable && ctid) {
         const { cid, status } = ctid === 'pages' && id

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/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 || '']);