@opengis/cms 0.0.50 → 0.0.52

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,68 +1,68 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.50",
-  "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.137",
-    "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.109",
-    "@opengis/richtext": "0.0.38",
-    "@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.52",
+  "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

@@ -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,29 +1,18 @@
 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;
 
-  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:search', crudInc, page, limit, ttl, locale, tags, filter, contentType, asc].join(':')).digest('hex');
+  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));
 
   // return from cache
@@ -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/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/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

@@ -1,4 +1,6 @@
-import { config, pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+import additionalData from '../utils/additionalData.js';
 
 const filterList = [
   {
@@ -55,11 +57,12 @@ export default async function searchContent({
   const limit = Math.min(query.limit || 16, maxLimit);
   const offset = (page - 1) * limit;
 
-  const { q } = filter ? await getFilterSQL({
+  const { q } = filter || search ? await getFilterSQL({
     pg,
     table: 'site.contents',
     filter,
     search,
+    searchColumn: 'a.slug,a.title',
     query: `status='published'`,
     filterList,
   }) : { q: `status='published'` };
@@ -91,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);
 
@@ -121,10 +124,12 @@ export default async function searchContent({
     }[!!asc];
 
     const { optimizedSQL = `SELECT * FROM data."${table}" where status='published' ORDER BY ${order}` } =
-      filter ? await getFilterSQL({
+      filter || search ? await getFilterSQL({
         pg,
         table: `data."${table}"`,
         filter,
+        search,
+        searchColumn: 'slug,title',
         query: `status='published'`,
         filterList: collectionFilters,
         order: 'published_at DESC NULLS LAST'
@@ -141,6 +146,8 @@ export default async function searchContent({
       return { rows: [], /*total: total // totals[`data.${table}`] || totals[`data."${table}"`] || 0*/ };
     });
 
+    // await additionalData(pg, items, locale);
+
     return {
       rows: items.map(el => ({
         ...row,

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

@@ -22,7 +22,7 @@ export default async function additionalData(pg, rows, locale, fields = '*') {
         const localization = localizations.find(el => el.object_id === row.id);
         const localizationKeys = Object.keys(localization?.json_object_agg || {}).filter(key => row[key.split(':').shift()]);
         const localizationObj1 = Object.entries(localization?.json_object_agg || {}).filter(([key]) => rows.length > 1 ? true : localizationKeys.includes(key)).reduce((acc, curr) => ({ ...acc, [curr[0]]: typeof curr[1] === 'string' && curr[1].startsWith('[') && curr[1].endsWith(']') ? JSON.parse(curr[1]) : curr[1] }), {});
-        const localizationObj = fields?.length ? Object.fromEntries(Object.entries(localizationObj1).filter(([key]) => fields.split(',').includes(key.split(':').shift()))) : localizationObj1;
+        const localizationObj = fields?.length && fields !== '*' ? Object.fromEntries(Object.entries(localizationObj1).filter(([key]) => fields.split(',').includes(key.split(':').shift()))) : localizationObj1;
         if (locale && locale !== 'uk') {
             Object.assign(row, Object.keys(localizationObj).reduce((acc, curr) => ({ ...acc, [curr.replace(`:${locale}`, '')]: localizationObj[curr] }), {}));
         } else if (!locale) {

package/dist/MonacoEditor.vue_vue_type_script_setup_true_lang-C8cip9Ci.js

@@ -1,84 +0,0 @@
-import { defineComponent as s, mergeModels as m, useModel as c, ref as f, onMounted as h, watch as d, onBeforeUnmount as p, openBlock as g, createElementBlock as v, normalizeStyle as w } from "vue";
-async function M() {
-  if (window.monaco)
-    return window.monaco;
-  const i = "https://cdn.jsdelivr.net/npm/monaco-editor@0.45.0/min";
-  return window.require || (window.require = { paths: { vs: `${i}/vs` } }, await new Promise((t, l) => {
-    const n = document.createElement("script");
-    n.src = `${i}/vs/loader.min.js`, n.onload = () => t(), n.onerror = l, document.head.appendChild(n);
-  })), new Promise((t) => {
-    window.require(["vs/editor/editor.main"], () => t(window.monaco));
-  });
-}
-const C = /* @__PURE__ */ s({
-  __name: "MonacoEditor",
-  props: /* @__PURE__ */ m({
-    language: { default: "javascript" },
-    theme: { default: "vs-dark" },
-    width: { default: "100%" },
-    height: { default: "100%" },
-    options: { default: () => ({
-      minimap: { enabled: !1 }
-    }) }
-  }, {
-    modelValue: {
-      required: !0
-    },
-    modelModifiers: {}
-  }),
-  emits: ["update:modelValue"],
-  setup(i) {
-    const t = i, l = c(i, "modelValue"), n = f(null);
-    let o = null, r = null;
-    return h(async () => {
-      var e;
-      if (n.value)
-        try {
-          r = await M();
-          const a = ((e = l.value) == null ? void 0 : e.replace(/\\n/g, `
-`)) || "";
-          o = r.editor.create(n.value, {
-            value: a,
-            language: t.language,
-            theme: t.theme,
-            automaticLayout: !0,
-            ...t.options
-          }), o.onDidChangeModelContent(() => {
-            const u = (o == null ? void 0 : o.getValue()) || "";
-            l.value = u;
-          });
-        } catch (a) {
-          console.error("Failed to load Monaco Editor:", a);
-        }
-    }), d(
-      () => l.value,
-      (e) => {
-        if (o) {
-          const a = (e == null ? void 0 : e.replace(/\\n/g, `
-`)) || "";
-          a !== o.getValue() && o.setValue(a);
-        }
-      },
-      { immediate: !0 }
-    ), d(
-      () => t.language,
-      (e) => {
-        o && e && r && r.editor.setModelLanguage(o.getModel(), e);
-      }
-    ), d(
-      () => t.theme,
-      (e) => {
-        o && e && r && r.editor.setTheme(e);
-      }
-    ), p(() => {
-      o && (o.dispose(), o = null);
-    }), (e, a) => (g(), v("div", {
-      ref_key: "editorContainer",
-      ref: n,
-      style: w({ width: e.width, height: e.height })
-    }, null, 4));
-  }
-});
-export {
-  C as _
-};