@opengis/cms 0.0.60 → 0.0.62

package/module/cms/table/single.default.table.json

@@ -1,116 +1,116 @@
-{
-    "table": "site.contents",
-    "columns": [
-        {
-            "label": "Заголовок",
-            "name": "title",
-            "required": true,
-            "type": "text",
-            "localization": true
-        },
-        {
-            "label": "Посилання",
-            "name": "slug",
-            "parent": "title",
-            "required": true,
-            "type": "slug"
-        },
-        {
-            "label": "Статус",
-            "name": "status",
-            "type": "select",
-            "data": "content.status",
-            "options": [
-                {
-                    "id": "draft",
-                    "text": "Чернетка"
-                },
-                {
-                    "id": "published",
-                    "text": "Опубліковано"
-                },
-                {
-                    "id": "archived",
-                    "text": "Архівовано"
-                },
-                {
-                    "id": "delayPublished",
-                    "text": "Відкладена публікація"
-                }
-            ],
-            "required": true
-        },
-        {
-            "label": "Дата публікації",
-            "name": "published_at",
-            "required": true,
-            "type": "datetime"
-        },
-        {
-            "label": "Контент",
-            "name": "single_body",
-            "type": "richtext",
-            "localization": true
-        },
-        {
-            "name": "single_sections",
-            "label": "Секції",
-            "type": "reference",
-            "localization": true
-        },
-        {
-            "label": "Зображення",
-            "name": "main_image",
-            "type": "mediaselect"
-        }
-    ],
-    "filters": [
-        {
-            "extra": false,
-            "id": "status",
-            "name": "status",
-            "title": "Статус",
-            "type": "Check",
-            "data": "content.status",
-            "ua": "Статус"
-        },
-        {
-            "extra": false,
-            "label": "Publish at",
-            "name": "published_at",
-            "type": "Date"
-        },
-        {
-            "extra": false,
-            "placeholder": "Пошук по тексту",
-            "label": "Пошук по тексту",
-            "columns": "slug,title",
-            "name": "search",
-            "type": "Text"
-        },
-        {
-            "extra": false,
-            "name": "tag_list",
-            "type": "Tags",
-            "sql": "id in (select b.data_id from site.tags a left join site.tag_data b on a.tag_id=b.tag_id where a.tag_id=any($1))",
-            "label": "Теги"
-        },
-        {
-            "extra": false,
-            "columns": "slug,title",
-            "id": "search",
-            "name": "search",
-            "placeholder": "Пошук по тексту",
-            "title": "Пошук по тексту",
-            "type": "Text"
-        },
-        {
-            "extra": false,
-            "id": "created_at",
-            "name": "created_at",
-            "title": "Дата створення",
-            "type": "Date",
-            "ua": "Дата створення"
-        }
-    ]
-}
+{
+    "table": "site.contents",
+    "columns": [
+        {
+            "label": "Заголовок",
+            "name": "title",
+            "required": true,
+            "type": "text",
+            "localization": true
+        },
+        {
+            "label": "Посилання",
+            "name": "slug",
+            "parent": "title",
+            "required": true,
+            "type": "slug"
+        },
+        {
+            "label": "Статус",
+            "name": "status",
+            "type": "select",
+            "data": "content.status",
+            "options": [
+                {
+                    "id": "draft",
+                    "text": "Чернетка"
+                },
+                {
+                    "id": "published",
+                    "text": "Опубліковано"
+                },
+                {
+                    "id": "archived",
+                    "text": "Архівовано"
+                },
+                {
+                    "id": "delayPublished",
+                    "text": "Відкладена публікація"
+                }
+            ],
+            "required": true
+        },
+        {
+            "label": "Дата публікації",
+            "name": "published_at",
+            "required": true,
+            "type": "datetime"
+        },
+        {
+            "label": "Контент",
+            "name": "single_body",
+            "type": "richtext",
+            "localization": true
+        },
+        {
+            "name": "single_sections",
+            "label": "Секції",
+            "type": "reference",
+            "localization": true
+        },
+        {
+            "label": "Зображення",
+            "name": "main_image",
+            "type": "mediaselect"
+        }
+    ],
+    "filters": [
+        {
+            "extra": false,
+            "id": "status",
+            "name": "status",
+            "title": "Статус",
+            "type": "Check",
+            "data": "content.status",
+            "ua": "Статус"
+        },
+        {
+            "extra": false,
+            "label": "Publish at",
+            "name": "published_at",
+            "type": "Date"
+        },
+        {
+            "extra": false,
+            "placeholder": "Пошук по тексту",
+            "label": "Пошук по тексту",
+            "columns": "slug,title",
+            "name": "search",
+            "type": "Text"
+        },
+        {
+            "extra": false,
+            "name": "tag_list",
+            "type": "Tags",
+            "sql": "id in (select b.data_id from site.tags a left join site.tag_data b on a.tag_id=b.tag_id where a.tag_id=any($1))",
+            "label": "Теги"
+        },
+        {
+            "extra": false,
+            "columns": "slug,title",
+            "id": "search",
+            "name": "search",
+            "placeholder": "Пошук по тексту",
+            "title": "Пошук по тексту",
+            "type": "Text"
+        },
+        {
+            "extra": false,
+            "id": "created_at",
+            "name": "created_at",
+            "title": "Дата створення",
+            "type": "Date",
+            "ua": "Дата створення"
+        }
+    ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -44,7 +44,7 @@
     "@fastify/compress": "^8.1.0",
     "@opengis/core": "^0.0.30",
     "@opengis/fastify-table": "^2.0.147",
-    "@opengis/filter": "^0.1.31",
+    "@opengis/filter": "^0.1.33",
     "@opengis/form": "^0.0.121",
     "@tailwindcss/typography": "0.5.10",
     "@tsconfig/node22": "^22.0.2",

package/plugin.js

@@ -1,43 +1,43 @@
-import path from 'node:path';
-import { fileURLToPath } from 'url';
-
-import { config, execMigrations, getPGAsync, addTemplateDir } from '@opengis/fastify-table/utils.js';
-// for cms as plugin only
-addTemplateDir(path.join(process.cwd(), 'node_modules/@opengis/cms/module/cms'));
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-
-const { prefix = '/api' } = config;
-
-export default async function (app) {
-  app.register(import('./server/routes/menu/index.mjs'), { prefix });
-  app.register(import('./server/routes/migration/index.mjs'), { prefix });
-  app.register(import('./server/routes/cms/index.mjs'), { prefix });
-  app.register(import('./server/routes/cmsSpace/index.mjs'), { prefix });
-  app.register(import('./server/routes/contentType/index.mjs'), { prefix });
-  app.register(import('./server/routes/category/index.mjs'), { prefix });
-  app.register(import('./server/routes/tags/index.mjs'), { prefix });
-  app.register(import('./server/routes/logs/index.mjs'), { prefix });
-  app.register(import('./server/routes/feedback/index.mjs'), { prefix });
-  const pg = await getPGAsync(config.pg);
-  execMigrations(path.join(dirname, 'server/migrations'), pg).catch(err => console.log(err));
-  if (pg?.pk?.['site.content_types']) {
-    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').catch(err => console.log(err)).then(el => el?.rows?.[0]?.array_agg || []);
-
-    await Promise.all(customTables.filter(table => pg.pk?.[`data.${table}`])?.map(async (table) => {
-      await pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err));
-      await pg.query(`alter table data.${table} add column if not exists main_image text`).catch(err => console.log(err));
-      await pg.query(`update site.content_types
-      SET columns = columns::jsonb || jsonb_build_object('name', 'main_image', 'type', 'image', 'label', 'Зображення')
-      WHERE not EXISTS (
-        SELECT 1
-        FROM jsonb_array_elements(columns::jsonb) AS obj(elem)
-        JOIN LATERAL jsonb_each_text(elem) AS kv(key, value) ON true
-        WHERE key = 'name' and value='main_image'
-      )`);
-      await pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err));
-      await pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err));
-      await pg.query(`alter table data.${table} drop column if exists publish_at`).catch(err => console.log(err));
-    }));
-  }
-}
+import path from 'node:path';
+import { fileURLToPath } from 'url';
+
+import { config, execMigrations, getPGAsync, addTemplateDir } from '@opengis/fastify-table/utils.js';
+// for cms as plugin only
+addTemplateDir(path.join(process.cwd(), 'node_modules/@opengis/cms/module/cms'));
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const { prefix = '/api' } = config;
+
+export default async function (app) {
+  app.register(import('./server/routes/menu/index.mjs'), { prefix });
+  app.register(import('./server/routes/migration/index.mjs'), { prefix });
+  app.register(import('./server/routes/cms/index.mjs'), { prefix });
+  app.register(import('./server/routes/cmsSpace/index.mjs'), { prefix });
+  app.register(import('./server/routes/contentType/index.mjs'), { prefix });
+  app.register(import('./server/routes/category/index.mjs'), { prefix });
+  app.register(import('./server/routes/tags/index.mjs'), { prefix });
+  app.register(import('./server/routes/logs/index.mjs'), { prefix });
+  app.register(import('./server/routes/feedback/index.mjs'), { prefix });
+  const pg = await getPGAsync(config.pg);
+  execMigrations(path.join(dirname, 'server/migrations'), pg).catch(err => console.log(err));
+  if (pg?.pk?.['site.content_types']) {
+    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').catch(err => console.log(err)).then(el => el?.rows?.[0]?.array_agg || []);
+
+    await Promise.all(customTables.filter(table => pg.pk?.[`data.${table}`])?.map(async (table) => {
+      await pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} add column if not exists main_image text`).catch(err => console.log(err));
+      await pg.query(`update site.content_types
+      SET columns = columns::jsonb || jsonb_build_object('name', 'main_image', 'type', 'image', 'label', 'Зображення')
+      WHERE not EXISTS (
+        SELECT 1
+        FROM jsonb_array_elements(columns::jsonb) AS obj(elem)
+        JOIN LATERAL jsonb_each_text(elem) AS kv(key, value) ON true
+        WHERE key = 'name' and value='main_image'
+      )`);
+      await pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} drop column if exists publish_at`).catch(err => console.log(err));
+    }));
+  }
+}

package/server/app.js

@@ -1,35 +1,35 @@
-import { config, addHook } from '@opengis/fastify-table/utils.js';
-
-config.rateLimit = false;
-config.prefix = config.prefix || '/api';
-config.mode = config.mode || 'cms';
-// config.auth.oneUser = true;
-config.auth = config.auth || {};
-config.auth['2fa'] = config.auth['2fa'] || {};
-config.auth['2fa'].prefix = config.auth['2fa'].prefix || 'cms';
-config.auth['2fa'].sufix = config.auth['2fa'].sufix || 'login';
-
-// when frontend is implemented/used
-// config.auth.loginPage = true; // disable core loginPage api, use vue component instead
-// config.auth.link = config.auth.link || { '2fa': { login: '/2fa' } };
-
-export default function (app) {
-  // core
-  app.register(import('@fastify/compress'), { encodings: ['br', 'gzip'], });
-  app.register(import('./plugins/adminHook.js'));
-  app.register(import('./plugins/hook.js'));
-
-  app.register(import('@opengis/fastify-table'), config);
-
-  app.register(import('./plugins/vite.js'));
-  // API
-  app.register(import('./routes/root.mjs'));
-  app.register(import('../plugin.js'));
-
-  addHook('errorMessage', (params) => {
-    if (params?.constraint && params.constraint === 'content_data_content_id_fkey') {
-      return 'Перед видаленням даного типу контенту, необхідно видалити всі дані, що до нього відносяться.';
-    }
-    return params?.message || 'Помилка API';
-  });
-}
+import { config, addHook } from '@opengis/fastify-table/utils.js';
+
+config.rateLimit = false;
+config.prefix = config.prefix || '/api';
+config.mode = config.mode || 'cms';
+// config.auth.oneUser = true;
+config.auth = config.auth || {};
+config.auth['2fa'] = config.auth['2fa'] || {};
+config.auth['2fa'].prefix = config.auth['2fa'].prefix || 'cms';
+config.auth['2fa'].sufix = config.auth['2fa'].sufix || 'login';
+
+// when frontend is implemented/used
+// config.auth.loginPage = true; // disable core loginPage api, use vue component instead
+// config.auth.link = config.auth.link || { '2fa': { login: '/2fa' } };
+
+export default function (app) {
+  // core
+  app.register(import('@fastify/compress'), { encodings: ['br', 'gzip'], });
+  app.register(import('./plugins/adminHook.js'));
+  app.register(import('./plugins/hook.js'));
+
+  app.register(import('@opengis/fastify-table'), config);
+
+  app.register(import('./plugins/vite.js'));
+  // API
+  app.register(import('./routes/root.mjs'));
+  app.register(import('../plugin.js'));
+
+  addHook('errorMessage', (params) => {
+    if (params?.constraint && params.constraint === 'content_data_content_id_fkey') {
+      return 'Перед видаленням даного типу контенту, необхідно видалити всі дані, що до нього відносяться.';
+    }
+    return params?.message || 'Помилка API';
+  });
+}

package/server/config.js

@@ -1,5 +1,5 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-const config = fs.existsSync('config.json') ? JSON.parse(await readFile('config.json')) : {};
-
+import { readFile } from 'fs/promises';
+import fs from 'fs';
+const config = fs.existsSync('config.json') ? JSON.parse(await readFile('config.json')) : {};
+
 export default config;

package/server/functions/getContent.js

@@ -1,45 +1,45 @@
-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();
-
-
-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 };
-  }
-
-  const tables = await pg.queryCache('select json_object_agg(name, \'data.\'||table_name) from site.content_types', { table: 'site.content_types' }).then(el => el.rows?.[0]?.json_object_agg || {});
-
-  const table = collection === 'pages' ? 'site.contents' : tables[collection];
-
-  if (!table) {
-    return { error: 'invalid params: collection', code: 400 };
-  }
-
-  // check if any crud operations performed, if not - return cached response
-  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, 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
-  if (cacheData) {
-    return { cache: true, ...cacheData };
-  }
-
-  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) {
-    await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
-  }
-
-  return result;
-}
+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();
+
+
+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 };
+  }
+
+  const tables = await pg.queryCache('select json_object_agg(name, \'data.\'||table_name) from site.content_types', { table: 'site.content_types' }).then(el => el.rows?.[0]?.json_object_agg || {});
+
+  const table = collection === 'pages' ? 'site.contents' : tables[collection];
+
+  if (!table) {
+    return { error: 'invalid params: collection', code: 400 };
+  }
+
+  // check if any crud operations performed, if not - return cached response
+  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, 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
+  if (cacheData) {
+    return { cache: true, ...cacheData };
+  }
+
+  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) {
+    await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+  }
+
+  return result;
+}

package/server/functions/getDraftKey.js

@@ -1,22 +1,22 @@
-import { randomUUID } from "node:crypto";
-
-import { config, getRedis } from "@opengis/fastify-table/utils.js";
-
-const rclient = getRedis();
-const redisKey = [config.pg?.database, "draftKey"].filter(Boolean).join(":");
-
-// allow users to view content in draft status if passed as query param
-export default async function getDraftKey(nocache = false) {
-  const cacheKey = await rclient.get(redisKey);
-  const ttl = await rclient.ttl(redisKey) || 0;
-
-  if (cacheKey && !nocache) {
-    return { draftKey: cacheKey, ttl: (ttl / 60).toFixed(0) + " minutes" };
-  }
-
-  const draftKey = randomUUID().replace(/-/g, "").substring(0, 10);
-
-  // refresh every hour
-  await rclient.set(redisKey, draftKey, "EX", 60 * 60);
-  return { draftKey };
-}
+import { randomUUID } from "node:crypto";
+
+import { config, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient = getRedis();
+const redisKey = [config.pg?.database, "draftKey"].filter(Boolean).join(":");
+
+// allow users to view content in draft status if passed as query param
+export default async function getDraftKey(nocache = false) {
+  const cacheKey = await rclient.get(redisKey);
+  const ttl = await rclient.ttl(redisKey) || 0;
+
+  if (cacheKey && !nocache) {
+    return { draftKey: cacheKey, ttl: (ttl / 60).toFixed(0) + " minutes" };
+  }
+
+  const draftKey = randomUUID().replace(/-/g, "").substring(0, 10);
+
+  // refresh every hour
+  await rclient.set(redisKey, draftKey, "EX", 60 * 60);
+  return { draftKey };
+}

package/server/functions/getSearchData.js

@@ -1,31 +1,31 @@
-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();
-
-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:${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));
-
-  // return from cache
-  if (cacheData) {
-    return { cache: true, ...cacheData };
-  }
-
-  const mockReply = createMockReply();
-  const result = await searchContent({ pg, query: { search, locale, page, limit, tags, filter, contentType } }, mockReply);
-
-  if (ttl) {
-    await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
-  }
-
-  return result;
-}
+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();
+
+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:${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));
+
+  // return from cache
+  if (cacheData) {
+    return { cache: true, ...cacheData };
+  }
+
+  const mockReply = createMockReply();
+  const result = await searchContent({ pg, query: { search, locale, page, limit, tags, filter, contentType } }, mockReply);
+
+  if (ttl) {
+    await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+  }
+
+  return result;
+}