@opengis/cms 0.0.54 → 0.0.56

package/package.json

@@ -1,68 +1,68 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.54",
-  "description": "cms",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "license": "EULA",
-  "files": [
-    "module",
-    "locales",
-    "dist",
-    "server",
-    "plugin.js",
-    "utils.js",
-    "utils.d.ts",
-    "input-types.json"
-  ],
-  "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",
-    "dev": "NODE_ENV=dev bun --env-file=.env.ip server ",
-    "admin": "vite admin",
-    "build": "vite build && vite build admin",
-    "build:lib": "vite build",
-    "proxy": "vite dev admin",
-    "start": "bun --env-file=.env.ip server",
-    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
-    "ip": "bun --env-file=.env.ip server",
-    "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",
-    "softpro1": "NODE_ENV=production 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.143",
-    "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.109",
-    "@opengis/richtext": "0.0.45",
-    "@vueuse/head": "2.0.0",
-    "js-yaml": "^4.1.0",
-    "lucide-vue-next": "0.344.0",
-    "vite": "5.1.4",
-    "vue": "^3.5.17",
-    "vue-i18n": "11.1.5",
-    "vue-router": "4.4.3",
-    "vuedraggable": "4.1.0",
-    "@tailwindcss/typography": "0.5.10",
-    "@tsconfig/node22": "^22.0.2",
-    "@vitejs/plugin-vue": "5.0.4",
-    "autoprefixer": "10.4.18",
-    "eslint": "8.49.0",
-    "postcss": "8.4.35",
-    "sass": "^1.92.1",
-    "tailwindcss": "3.4.1",
-    "typescript": "~5.8.0",
-    "vitest": "3.2.4",
-    "vue-tsc": "^2.2.10"
-  }
-}
+{
+  "name": "@opengis/cms",
+  "version": "0.0.56",
+  "description": "cms",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "license": "EULA",
+  "files": [
+    "module",
+    "locales",
+    "dist",
+    "server",
+    "plugin.js",
+    "utils.js",
+    "utils.d.ts",
+    "input-types.json"
+  ],
+  "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",
+    "dev": "NODE_ENV=dev bun --env-file=.env.ip server ",
+    "admin": "vite admin",
+    "build": "vite build && vite build admin",
+    "build:lib": "vite build",
+    "proxy": "vite dev admin",
+    "start": "bun --env-file=.env.ip server",
+    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
+    "ip": "bun --env-file=.env.ip server",
+    "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",
+    "softpro1": "NODE_ENV=production 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.143",
+    "@opengis/filter": "^0.1.31",
+    "@opengis/form": "^0.0.109",
+    "@opengis/richtext": "0.0.45",
+    "@vueuse/head": "2.0.0",
+    "js-yaml": "^4.1.0",
+    "lucide-vue-next": "0.344.0",
+    "vite": "5.1.4",
+    "vue": "^3.5.17",
+    "vue-i18n": "11.1.5",
+    "vue-router": "4.4.3",
+    "vuedraggable": "4.1.0",
+    "@tailwindcss/typography": "0.5.10",
+    "@tsconfig/node22": "^22.0.2",
+    "@vitejs/plugin-vue": "5.0.4",
+    "autoprefixer": "10.4.18",
+    "eslint": "8.49.0",
+    "postcss": "8.4.35",
+    "sass": "^1.92.1",
+    "tailwindcss": "3.4.1",
+    "typescript": "~5.8.0",
+    "vitest": "3.2.4",
+    "vue-tsc": "^2.2.10"
+  }
+}

package/server/functions/getContent.js

@@ -22,9 +22,9 @@ export default async function getContentBySlug({ slug, filter, tags, state, loca
   }
 
   // check if any crud operations performed, if not - return cached response
-  const crudInc = await rclient.get(`pg:${table}:crud`) || 0;
+  const crudInc = await rclient.get(`pg:${config.pg?.database}:${table}:crud`) || 0;
 
-  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:content', slug, crudInc, filter, tags, state, locale, contextQuery, collection, fields, limit, page, fields && typeof fields !== 'string' ? JSON.stringify(fields) : fields].join(':')).digest('hex');
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:content', slug, crudInc, filter, tags, state, locale, contextQuery, collection, fields, limit, page, order, desc, fields && typeof fields !== 'string' ? JSON.stringify(fields) : fields].join(':')).digest('hex');
   const cacheData = ttl === 0 ? null : JSON.parse(await rclient.get(cacheKey));
 
   // return from cache
@@ -33,7 +33,7 @@ export default async function getContentBySlug({ slug, filter, tags, state, loca
   }
 
   const req = { pg: pgClients.client, params: { type: collection, id: slug }, query: { filter, tags, state, contextQuery, locale, fields, limit, page, order, desc } };
-  
+
   const mockReply = createMockReply();
   const result = await getContent(req, mockReply, true);
 

package/server/functions/getSearchData.js

@@ -10,7 +10,7 @@ const rclient = getRedis();
 
 export default async function getSearchData({ page = 1, limit = 12, ttl = 3600, search, locale, tags, filter, contentType, asc } = {}) {
   // check if any crud operations performed, if not - return cached response
-  const crudInc = await rclient.get(`pg:site.contents:crud`) || 0;
+  const crudInc = await rclient.get(`pg:${config.pg?.database}:site.contents:crud`) || 0;
 
   const cacheKey = createHash('md5').update([config.pg?.database, 'cms:search', crudInc, page, limit, search, locale, tags, filter, contentType, asc].join(':')).digest('hex');
   const cacheData = ttl === 0 ? null : JSON.parse(await rclient.get(cacheKey));

package/server/migrations/site.sql

@@ -370,8 +370,8 @@ CREATE TABLE if not exists site.contents (
     FOREIGN KEY (updated_by) REFERENCES admin.users(uid)
 );
 
-alter table site.contents add column if not exists  space_id text;
-alter table site.contents add column if not exists  content_type_id text;
+alter table site.contents add column if not exists space_id text;
+alter table site.contents add column if not exists content_type_id text;
 ALTER TABLE site.contents add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
 ALTER TABLE site.contents add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
 ALTER TABLE site.contents add COLUMN if not exists created_by text REFERENCES admin.users(uid);

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

@@ -35,7 +35,9 @@ addHook('preFilter', async ({ pg = pgClients.client, table }) => {
 
 const defaultFields = ['title', 'slug', 'status', 'created_at', 'updated_at', 'main_image', 'published_at'];
 
-export default async function getContent(req, reply, called = false) {
+export default async function getContent(req, reply, opt) {
+    const called = !!opt;
+    const { showDrafts: showDrafts1 } = opt || {};
     const { pg = pgClients.client, params = {}, query = {}, headers = {} } = req;
     const user = req.user || {};
     const { type, id } = params;
@@ -46,7 +48,7 @@ export default async function getContent(req, reply, called = false) {
 
     const { draftKey } = await getDraftKey();
     const showDrafts = query.draftKey && query.draftKey === draftKey;
-    const statusQuery = !!req.user?.uid || showDrafts || called ? '1=1' : `status='published'`;
+    const statusQuery = !!req.user?.uid || showDrafts || showDrafts1 ? '1=1' : `status='published'`;
 
     // headers.authorization = 'Bearer tokenExample'
     const isValidToken = await pg.query(
@@ -63,7 +65,7 @@ export default async function getContent(req, reply, called = false) {
     }
 
     const { contentId, contentTypeId, meta } = params.type === 'pages'
-        ? await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where content_id=$1`, [params.type]).then(el => el.rows?.[0] || {})
+        ? { contentId: params.id || 'pages', contentTypeId: params.id || 'pages', meta: null }
         : await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where $1 in (slug, content_id, content_type_id)`, [params.type]).then(el => el.rows?.[0] || {});
 
     if (!contentId) {
@@ -86,7 +88,7 @@ export default async function getContent(req, reply, called = false) {
 
     defaultColumns.forEach(col => Object.assign(col, { default: true }));
 
-    const columns = columns1.filter(col => !defaultColumns.map(el => el.name).includes(col.name));
+    const columns = (columns1 || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name));
 
     const result = contentType === 'collection' && table
         ? await getCollection({

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/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

@@ -120,17 +120,43 @@ export default async function updateContent(req, reply) {
             return reply.status(400).send('access restricted: empty/invalid block ' + emptyBlock);
         }
 
+        const single = await pg.query(
+            `select 1 FROM site.contents
+           where content_id=$1`, [params.id]
+        ).then(el => el.rowCount || 0);
+
+        const customCtExists = await pg.query(
+            `select 1 FROM site.content_types
+           where content_type_id=$1`, [params.id]
+        ).then(el => el.rowCount || 0);
+
         const client = await pg.connect();
 
         try {
             await client.query('begin');
-            const res = await dataUpdate({
+
+            const res = {};
+
+            if (single && !customCtExists) {
+                const res1 = await dataInsert({
+                    pg: client,
+                    table: 'site.content_types',
+                    id: params.id,
+                    data: body,
+                    uid: user?.uid,
+                });
+                Object.assign(res, res1);
+            }
+
+            const res1 = await dataUpdate({
                 pg: client,
                 table: 'site.contents',
                 id,
                 data: { ...body, content_type_id: ctid1 },
                 uid: user?.uid,
             });
+            Object.assign(res, res1);
+
             // if (contentId) {
             //     await client.query(`delete from site.content_data where content_id=$1`, [contentId]);
             // }

package/server/routes/cms/functions/getSettings.js

@@ -12,7 +12,7 @@ export default async function getSettings({ entity = 'app', keys = ['cms'], uid
     return { error: "properties table not found", code: 404 };
   }
 
-  const crudInc = await rclient.get(`pg:admin.properties:crud`) || 0;
+  const crudInc = await rclient.get(`pg:${config.pg?.database}:admin.properties:crud`) || 0;
   const cacheKey = [config.pg?.database, "cms:settings", crudInc, entity, keys, uid].filter(Boolean).join(":");
   const cache = ttl === 0 ? null : await rclient.get(cacheKey);
 

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

@@ -11,16 +11,9 @@ export default async function getSingle({
     const id = id1 || (contentId1 === 'pages' ? undefined : contentId1) || '';
     const contentId = id1 ? contentId1 : "pages";
 
-    // defaultColumns.push({
-    //     "name": "content_type_id",
-    //     "label": "Тип сторінки",
-    //     "type": "select",
-    //     "data": "cms.page_type"
-    // });
-
-    const customColumns = await pg.query(`
-            SELECT columns FROM site.content_types WHERE content_type_id in (select content_type_id from site.contents where content_id=$1) limit 1
-        `, [id1 || contentId]).then(el => el.rows?.[0]?.columns || []);
+    const customColumns = await pg.query(
+        `select columns FROM site.content_types where content_type_id=$1`, [id || contentId]
+    ).then(el => el.rows?.[0]?.columns || []);
 
     const contentQuery = contentId === 'pages' || !id
         ? `(type = 'single' or content_type_id = 'pages')`
@@ -174,6 +167,9 @@ export default async function getSingle({
         });
     });
 
+    // temporary solution, before front makes changes to call by id, not type
+    rows1.forEach(row => Object.assign(row, { content_type_id: row.content_id }));
+
     return {
         locales,
         type: 'single',

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

@@ -1,4 +1,4 @@
-import { config, dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
+import { dataInsert, dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
 
 import updateCustomContentTable from '../utils/updateCustomContentTable.js';
 import updateContents from '../utils/updateContents.js';
@@ -13,12 +13,22 @@ export default async function builderPut(req, reply) {
     return reply.status(404).send('table not found');
   }
 
+  const single = await pg.query(
+    `select content_id as id FROM site.contents
+   where $1 in (content_id, slug)`, [params.id]
+  ).then(el => el.rows?.[0]);
+
+  const customCtExists = await pg.query(
+    `select 1 FROM site.content_types
+   where content_type_id=$1`, [params.id]
+  ).then(el => el.rowCount || 0);
+
   const { cid, table } = await pg.query(
     `select content_type_id as cid, table_name as table, type from site.content_types where $1 in (content_type_id, name)`,
     [params.id],
   ).then(el => el.rows?.[0] || {});
 
-  if (!cid) {
+  if (!cid && !single) {
     return reply.status(404).send('content type not found');
   }
 
@@ -39,13 +49,23 @@ export default async function builderPut(req, reply) {
       await updateCustomContentTable({ pg: client, id: cid, columns });
     }
 
-    await dataUpdate({
-      pg: client,
-      table: 'site.content_types',
-      id: cid,
-      data: body,
-      uid: user?.uid,
-    });
+    if (single && !customCtExists) {
+      await dataInsert({
+        pg,
+        table: 'site.content_types',
+        id: params.id,
+        data: body,
+        uid: user?.uid,
+      });
+    } else {
+      await dataUpdate({
+        pg: client,
+        table: 'site.content_types',
+        id: cid,
+        data: body,
+        uid: user?.uid,
+      });
+    }
 
     const row = await updateContents(client, cid, { ...body, slug: body.slug || body.name }, user?.uid);
 

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

@@ -9,11 +9,24 @@ export default async function builderGet({ pg = pgClients.client, params = {} },
     return reply.status(404).send('table not found');
   }
 
+  const single = await pg.query(
+    `select content_id as id, * FROM site.contents
+   where $1 in (content_id, slug)`, [params.id]
+  ).then(el => el.rows?.[0]);
+
   const row = await pg.query(
     `select content_type_id as id, * FROM site.content_types
    where $1 in (content_type_id, name)`, [params.id]
   ).then(el => el.rows?.[0]);
 
+  if (single && !row) {
+    const loadTable = await getTemplate('table', 'single.default.table');
+    const { columns: defaultColumns } = loadTable || {};
+    (defaultColumns || []).forEach(col => Object.assign(col, { default: true }));
+    const columns = (defaultColumns || []).filter(col => !col.hidden);
+    return reply.status(200).send({ default: true, id: single.id, name: single.slug, type: 'single', ...single, columns });
+  }
+
   if (!row) {
     return reply.status(404).send('content type not found');
   }

package/server/routes/contentType/utils/updateContents.js

@@ -19,6 +19,22 @@ export default async function updateContents(pg, id, data, uid) {
         return result;
     }
 
+    const single = await pg.query(
+        `select content_id from site.contents where content_id=$1`,
+        [id],
+    ).then(el => el.rowCount || 0);
+
+    if (single) {
+        const result = await dataUpdate({
+            pg,
+            table: 'site.contents',
+            id,
+            data,
+            uid,
+        });
+        return result;
+    }
+
     const result = await dataInsert({
         pg,
         table: 'site.contents',

package/server/routes/menu/controllers/getMenu.js

@@ -10,7 +10,7 @@ export default async function getMenuAPI(req, reply) {
         page: query.page,
         limit: Math.min(query.limit || limit, limit),
         sql: query.sql,
-        ttl: 3600
+        ttl: 0
     });
 
     if (result.error) {
@@ -21,5 +21,5 @@ export default async function getMenuAPI(req, reply) {
         return reply.status(200).send(result);
     }
 
-    return reply.status(200).send({ rows: result.rows });
+    return reply.status(200).send({ cache: result.cache, rows: result.rows });
 }

package/server/routes/menu/functions/getMenu.js

@@ -14,8 +14,8 @@ export default async function getMenu(name, { locale, ttl = 3600, page, limit =
     return { error: 'table not found', code: 404 };
   }
 
-  const crudInc = await rclient.get(`pg:site.menus:crud`) || 0;
-  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', crudInc, name, locale].filter(Boolean).join(':')).digest('hex');
+  const crudInc = await rclient.get(`pg:${config.pg?.database}:site.menus:crud`) || 0;
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', crudInc, name, locale, page, limit].filter(Boolean).join(':')).digest('hex');
 
   const cache = ttl === 0 ? null : await rclient.get(cacheKey);
 
@@ -46,5 +46,5 @@ export default async function getMenu(name, { locale, ttl = 3600, page, limit =
   // save to cache, default = 1 hour
   if (ttl) await rclient.set(cacheKey, JSON.stringify(payload), 'EX', ttl);
 
-  return payload;
+  return { cache: false, ...payload };
 }

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