@opengis/cms 0.0.51 → 0.0.53

package/locales/en.json

@@ -126,7 +126,10 @@
       "dragToBuild": "Drag and drop content blocks here to build your collection structure",
       "collectionCreated": "Collection created successfully",
       "collectionCreationFailed": "Error creating collection",
-      "pinPublication": "Pin Publication"
+      "pinPublication": "Pin Publication",
+      "enLocalization": "EN localization",
+      "translateContentSuccess": "Content translated successfully",
+      "translateContentError": "Error translating content"
     },
     "articles": {
       "title": "Articles",
@@ -478,6 +481,8 @@
       "configure": "Configure",
       "successTitle": "Success",
       "successMessage": "Settings saved successfully",
+      "translateContentSuccess": "Content translated successfully",
+      "translateContentError": "Error translating content",
       "errorTitle": "Error",
       "errorMessage": "Error saving settings",
       "generateNewKey": "Generate New Key",

package/locales/uk.json

@@ -126,7 +126,10 @@
       "dragToBuild": "Перетягніть блоки контенту сюди, щоб створити структуру колекції",
       "collectionCreated": "Колекція успішно створена",
       "collectionCreationFailed": "Помилка при створенні колекції",
-      "pinPublication": "Закріпити публікацію"
+      "pinPublication": "Закріпити публікацію",
+      "enLocalization": "EN локалізація",
+      "translateContentSuccess": "Контент успішно перекладений",
+      "translateContentError": "Помилка при перекладі контенту"
     },
     "articles": {
       "title": "Сторінки",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -41,10 +41,10 @@
   "devDependencies": {
     "@fastify/compress": "^8.1.0",
     "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.138",
+    "@opengis/fastify-table": "^2.0.143",
     "@opengis/filter": "^0.1.31",
     "@opengis/form": "^0.0.109",
-    "@opengis/richtext": "0.0.38",
+    "@opengis/richtext": "0.0.45",
     "@vueuse/head": "2.0.0",
     "js-yaml": "^4.1.0",
     "lucide-vue-next": "0.344.0",
@@ -65,4 +65,4 @@
     "vitest": "3.2.4",
     "vue-tsc": "^2.2.10"
   }
-}
+}

package/server/functions/getContent.js

@@ -1,25 +1,14 @@
 import { createHash } from 'node:crypto';
 
 import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
-
+import { createMockReply } from './utils/mock.reply.js';
 import getContent from '../routes/cms/controllers/getContent.js';
 
 const pg = pgClients.client;
 const rclient = getRedis();
 
-const mockReply = {
-  response: {},
-  status: (statusCode) => {
-    Object.assign(mockReply.response, { status: statusCode });
-    return mockReply;
-  },
-  send: (result) => {
-    Object.assign(mockReply.response, typeof result === 'object' ? result : { message: result });
-    return { ...mockReply.response };
-  },
-};
-
-export default async function getContentBySlug({ slug, filter, tags, state, locale, contextQuery, collection = 'pages', ttl = 3600, fields, limit = 12, page = 1 } = {}) {
+
+export default async function getContentBySlug({ slug, filter, tags, state, locale, contextQuery, collection = 'pages', ttl = 3600, fields, limit = 12, page = 1, order, desc } = {}) {
   if (!slug) {
     // return { error: 'not enough params: slug', code: 400 };
   }
@@ -43,7 +32,9 @@ export default async function getContentBySlug({ slug, filter, tags, state, loca
     return { cache: true, ...cacheData };
   }
 
-  const req = { pg: pgClients.client, params: { type: collection, id: slug }, query: { filter, tags, state, contextQuery, locale, fields, limit, page } };
+  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);
 
   if (ttl) {

package/server/functions/getSearchData.js

@@ -1,24 +1,13 @@
 import { createHash } from 'node:crypto';
 
 import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
+import { createMockReply } from './utils/mock.reply.js';
 
 import searchContent from '../routes/cms/controllers/searchContent.js';
 
 const pg = pgClients.client;
 const rclient = getRedis();
 
-const mockReply = {
-  response: {},
-  status: (statusCode) => {
-    Object.assign(mockReply.response, { status: statusCode });
-    return mockReply;
-  },
-  send: (result) => {
-    Object.assign(mockReply.response, typeof result === 'object' ? result : { message: result });
-    return { ...mockReply.response };
-  },
-};
-
 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;
@@ -31,6 +20,7 @@ export default async function getSearchData({ page = 1, limit = 12, ttl = 3600,
     return { cache: true, ...cacheData };
   }
 
+  const mockReply = createMockReply();
   const result = await searchContent({ pg, query: { search, locale, page, limit, tags, filter, contentType } }, mockReply);
 
   if (ttl) {

package/server/functions/getTags.js

@@ -0,0 +1,30 @@
+import { createHash } from 'node:crypto';
+
+import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
+import { createMockReply } from './utils/mock.reply.js';
+
+import getTagsApi from '../routes/tags/controllers/get.tags.js';
+
+const pg = pgClients.client;
+const rclient = getRedis();
+
+export default async function getTags({ page = 1, limit = 16, search, ttl = 3600 } = {}) {
+
+    const crudInc = await rclient.get(`pg:site.contents:tags`) || 0;
+
+    const cacheKey = createHash('md5').update([config.pg?.database, 'cms:tags', crudInc, page, limit, search].join(':')).digest('hex');
+    const cacheData = ttl === 0 ? null : JSON.parse(await rclient.get(cacheKey));
+
+    if (cacheData) {
+        return { cache: true, ...cacheData };
+    }
+
+    const mockReply = createMockReply();
+    const result = await getTagsApi({ pg, query: { page, limit, search } }, mockReply);
+
+    if (ttl) {
+        await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+    }
+
+    return result;
+}

package/server/functions/utils/mock.reply.js

@@ -0,0 +1,56 @@
+/**
+ * @template T
+ * @typedef {Object} MockReplyResponse
+ * @property {number} [status] - HTTP статус-код
+ * @property {T} [data] - Дані відповіді (якщо передано об'єкт)
+ * @property {string} [message] - Повідомлення (якщо передано рядок)
+ */
+
+/**
+ * Створює ізольований mock-об'єкт reply для тестування Fastify-хендлерів.
+ * Імітує методи `status()` та `send()`.
+ *
+ * @template T
+ * @returns {{
+ *   status: (statusCode: number) => any,
+ *   send: (result: T | string) => MockReplyResponse<T>
+ * }}
+ */
+export function createMockReply() {
+  /** @type {MockReplyResponse<any>} */
+ 
+  let response = {};
+
+  return {
+    /**
+     * Встановлює HTTP статус-код.
+     * Повертає той самий reply для чейнінгу.
+     *
+     * @param {number} statusCode
+     * @returns {any}
+     */
+    status(statusCode) {
+      response.status = statusCode;
+      return this;
+    },
+
+    /**
+     * Імітує Fastify reply.send().
+     * Якщо передано об'єкт — він додається як data.
+     * Якщо передано рядок — додається як message.
+     *
+     * @param {T | string} result
+     * @returns {MockReplyResponse<T>}
+     */
+    send(result) {
+      response = {
+        ...response,
+        ...(typeof result === 'object'
+          ? { data: result }
+          : { message: result }),
+      };
+
+      return response;
+    },
+  };
+}

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

@@ -23,7 +23,7 @@ const rootDir = path.resolve(getFolder(config, 'local'));
 const dir = '/files';
 
 const filesizeCache = {};
-const previewWidth = 300;
+const fileMtimeCache = {};
 
 mkdirSync(path.join(rootDir, dir), { recursive: true });
 
@@ -89,8 +89,33 @@ export default async function listMedia(req, reply) {
         const filepath = media ? media.url : ('/files/' + (el.path.split('/files/')[1] ? el.path.split('/files/')[1] + '/' : '') + el.name);
 
         if (!filesizeCache[filepath]) {
-            const { size } = await stat(path.join(rootDir, filepath));
+            const { mtime, size } = await stat(path.join(rootDir, filepath));
             Object.assign(filesizeCache, { [filepath]: size });
+            mtime.setHours(0, 0, 0, 0); // strip hours from timestamp, leave only date
+            Object.assign(fileMtimeCache, { [filepath]: mtime });
+        }
+
+
+        const [, from, to] = q ? (q.match(/between\s+'(\d{4}-\d{2}-\d{2})'::date\s+and\s+'(\d{4}-\d{2}-\d{2})'::date/i) || []) : [];
+
+        // skip entirely if invalid dates passed to query.filter
+        if ((from && new Date(from).toString() === 'Invalid Date') || (to && new Date(to).toString() === 'Invalid Date')) {
+            return null;
+        }
+
+        // skip  if file modification date does not match filter value
+        if (fileMtimeCache[filepath] && from && to && (new Date(from) > fileMtimeCache[filepath] || new Date(to) < fileMtimeCache[filepath])) {
+            return null;
+        }
+
+        const dt = q && !q.includes('between') ? query.filter.match(/\d{4}-\d{2}-\d{2}/)?.[0] : null;
+        const date = dt ? new Date(dt) : null;
+        // skip timezone offset
+        if (date) { date.setHours(0, 0, 0, 0); }
+
+        // filter by exact date
+        if (fileMtimeCache[filepath] && date && (new Date(date).getTime() !== fileMtimeCache[filepath].getTime())) {
+            return null;
         }
 
         const mime = getMimeType(el.name) || '';
@@ -116,10 +141,12 @@ export default async function listMedia(req, reply) {
             url: filepath,
             mime,
             preview,
+            updated_at: fileMtimeCache[filepath].toISOString(),
         }
     }));
 
-    Object.assign(result, { data: subdirs.concat(files) });
+    // filter empty items, such as filtered out by query.filter=updated_at (not from db, but from fs.stat)
+    Object.assign(result, { data: subdirs.concat(files.filter(Boolean)) });
     return result;
 
 }

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

@@ -94,11 +94,11 @@ export default async function searchContent({
   const collections = contents.filter(el => el.content_type === 'collection' && el.table_name);
 
   // const totals = await pg.query(`select json_object_agg(oid::regclass, reltuples) from pg_class`).then(el => el.rows?.[0]?.json_object_agg || {});
-  const allSingles = await pg.query(`select count(*)::int from site.contents where content_type_id in (select content_type_id from site.content_types where type = 'single' )`).then(el => el.rows?.[0]?.count || 0);
+  const allSingles = await pg.query(`select count(*)::int from site.contents where content_type_id in (select content_type_id from site.content_types where type = 'single') and status='published'`).then(el => el.rows?.[0]?.count || 0);
   const allCollectionTables = 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 allCollections = await Promise.all(allCollectionTables.map(async tablename => {
-    const total = pg.queryCache ? await pg.queryCache(`select count(*)::int from data."${tablename}"`, { table: `data.${tablename}` }).then(el => el.rows?.[0]?.count || 0) : 0;
+    const total = pg.queryCache ? await pg.queryCache(`select count(*)::int from data."${tablename}" where status='published'`, { table: `data.${tablename}` }).then(el => el.rows?.[0]?.count || 0) : 0;
     return total;
   })).then(el => el.reduce((acc, curr) => acc + (curr || 0), 0) || 0);
 

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

@@ -21,7 +21,7 @@ export async function translateContent({
         return reply.status(400).send({ error: 'not enough query params: to', code: 400 });
     }
 
-    const { id, collection = 'pages', from = 'uk', to, nocache } = query;
+    const { id, collection = 'pages', from = 'uk', to, nocache, skip } = query;
     const { id: collectionId, table, columns = [] } = await getCollectionId(collection, pg);
 
     if (!collectionId) {
@@ -34,7 +34,7 @@ export async function translateContent({
         return reply.status(400).send({ error: 'collection does not contain any fields with localization enabled', code: 400 });
     }
 
-    const result = await insertContentLocalization({ table, id, from, to, nocache, schemaKeys, user }, pg);
+    const result = await insertContentLocalization({ table, id, from, to, nocache, skip, schemaKeys, user }, pg);
 
     if (result?.error) {
         return reply.status(result.code).send(result);
@@ -80,7 +80,7 @@ export async function translateCollection({
 
         send(`target localization already exists for ${ids.length - filteredIds.length}/${ids.length} rows`);
 
-        await sequence(debug ? filteredIds.slice(0, 1) : filteredIds, { send, pg, from, to, table, nocache: true, schemaKeys, user }, insertContentLocalization);
+        await sequence(debug ? filteredIds.slice(0, 1) : filteredIds, { send, pg, from, to, table, nocache: true, skip, schemaKeys, user }, insertContentLocalization);
         return send('translation complete', true);
     } catch (err) {
         return send(err.toString(), true);

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

@@ -2,7 +2,7 @@ import { dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
 
 import requestTranslation from "./requestTranslation.js";
 
-export default async function insertContentLocalization({ send = () => { }, table, id, from, to, nocache, schemaKeys, user }, pg = pgClients.client) {
+export default async function insertContentLocalization({ send = () => { }, table, id, from, to, nocache, skip, schemaKeys, user }, pg = pgClients.client) {
     if (!to) {
         const resp = { error: 'not enough query params: to', code: 400 };
         send(resp.error + ': ' + id);
@@ -17,10 +17,13 @@ export default async function insertContentLocalization({ send = () => { }, tabl
         return resp;
     }
 
+    const targetLocalization = await pg.query('select json_object_agg(split_part(field_key,\':\',1),field_value) from site.localization where object_id=$1 and field_key is not null and split_part(field_key,\':\',2)=$2', [row.id, to])
+        .then(el => el.rows?.[0]?.json_object_agg);
+
     const localizationExists = await pg.query('select 1 from site.localization where object_id=$1 and field_key is not null and split_part(field_key,\':\',2)=$2', [row.id, to])
         .then(el => el.rowCount);
 
-    if (localizationExists && !nocache) {
+    if (localizationExists && !nocache && !skip) {
         const resp = { error: 'target localization already exists', code: 400 };
         send(resp.error + ': ' + id);
         return resp;
@@ -38,9 +41,18 @@ export default async function insertContentLocalization({ send = () => { }, tabl
     const obj = { ...row, ...localization };
 
     const entries = Object.entries(obj).filter(([key, value]) => value && schemaKeys.includes(key) && (typeof value === 'string' || (Array.isArray(value) && value?.[0] && typeof value?.[0] === 'object' && Object.keys(value).length)));
-    const skipped = schemaKeys.filter(key => !entries.map(([el]) => el).includes(key));
+    // do not old localization overwrite by default
+    const filteredEntries = skip && targetLocalization ? entries.filter(([key]) => !Object.keys(targetLocalization).includes(key)) : entries;
+
+    if (skip && targetLocalization && !filteredEntries.length) {
+        const resp = { error: 'nothing to localize after skipping of fields with existing localization', code: 400 };
+        send(resp.error + ': ' + id);
+        return resp;
+    }
+
+    const skipped = schemaKeys.filter(key => !filteredEntries.map(([el]) => el).includes(key));
 
-    const { result, error, code = 200 } = await requestTranslation(entries, from, to);
+    const { result, error, code = 200 } = await requestTranslation(filteredEntries, from, to);
 
     if (error && code) {
         send(error + ': ' + id);
@@ -67,6 +79,12 @@ export default async function insertContentLocalization({ send = () => { }, tabl
             console.log('deleted existing localizations: ', deleted, id);
         }
 
+        if (skip) {
+            const deleted = await client.query('delete from site.localization where object_id=$1 and not split_part(field_key,\':\',1)<>any($2)', [id, Object.keys(targetLocalization)]).then(el => el.rowCount || 0);
+            send(`deleted existing localizations1: ${deleted}, ${id}`);
+            console.log('deleted existing localizations1: ', deleted, id);
+        }
+
         await Promise.all(arr.map(async row => dataInsert({
             pg: client,
             table: 'site.localization',

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

@@ -23,9 +23,16 @@ export default async function builderGet({ pg = pgClients.client, params = {} },
   ).then(el => el.rows?.[0] || {});
   Object.assign(row, { space });
 
-  const loadTable = params.id === 'pages' ? await getTemplate('table', 'single.default.table') : {};
+  // const loadTable = params.id === 'pages' ? await getTemplate('table', 'single.default.table') : {};
+  // const columns = params.id === 'pages' ? loadTable?.columns : row.columns;
+
+  const loadTable = params.id === 'pages'
+    ? await getTemplate('table', 'single.default.table')
+    : await getTemplate('table', 'collection.default.table');
+  const { columns: defaultColumns = [] } = loadTable || {};
+  defaultColumns.forEach(col => Object.assign(col, { default: true }));
+  const columns = (defaultColumns || []).concat(row.columns.filter(col => !defaultColumns.map(el => el.name).includes(col.name)));
 
-  const columns = params.id === 'pages' ? loadTable?.columns : row.columns;
   Object.assign(row, { columns });
 
   // filter system / hidden

package/server/routes/tags/controllers/get.tags.js

@@ -11,6 +11,6 @@ export default async function getTags(req, reply) {
 
     const { rows } = await pg.query(selectSql);
 
-    return reply.code(200).send({ message: { total, filtered, rows }, status: 200 })
+    return reply.status(200).send({ message: { total, filtered, rows }, status: 200 })
 
 }

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

package/utils.js

@@ -3,5 +3,6 @@ export { default as getContent } from "./server/functions/getContent.js";
 export { default as getSettings } from "./server/routes/cms/functions/getSettings.js";
 export { default as getUser } from "./server/functions/getUser.js";
 export { default as getSearchData } from "./server/functions/getSearchData.js";
+export { default as getTags } from "./server/functions/getTags.js";
 
 export default null;