@opengis/cms 0.0.43 → 0.0.45

package/dist/{uk-TyVZmyOZ.js → uk-rH4IPxG5.js}

@@ -43,7 +43,8 @@ const e = {
     general: "Основні",
     apiKeys: "API ключі",
     appearance: "Вигляд",
-    logs: "Логи"
+    logs: "Логи",
+    cms: "ЦМС"
   },
   dashboard: {
     title: "Панель керування",
@@ -316,7 +317,8 @@ const e = {
     localization: "Локалізація",
     actions: "Дії",
     noColumnsFound: "Немає колонок",
-    editCollection: "Редагувати колекцію",
+    editCollection: "Редагувати структуру",
+    editPage: "Редагувати сторінку",
     editContentForYourSite: "Редагувати контент для вашого сайту",
     deleteObject: "Ви впевнені, що хочете видалити цей об'єкт?",
     editField: "Редагувати поле",
@@ -484,6 +486,7 @@ const e = {
       contacts: "Контакти",
       socials: "Соціальні мережі",
       showSocialsNumber: "Кількість соціальних мереж для відображення",
+      headerBtn: "Текст кнопки в хедері",
       mapCoords: "Координати для відображення на карті",
       saveChanges: "Зберегти зміни",
       cancel: "Скасувати",

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

@@ -2,46 +2,46 @@
     "table": "site.contents",
     "columns": [
         {
-            "label": "Slug",
-            "name": "slug",
-            "parent": "title",
-            "required": true,
-            "type": "slug"
-        },
-        {
-            "label": "Title",
+            "label": "Заголовок",
             "name": "title",
             "required": true,
             "type": "text",
             "localization": true
         },
         {
-            "label": "Status",
+            "label": "Посилання",
+            "name": "slug",
+            "parent": "title",
+            "required": true,
+            "type": "slug"
+        },
+        {
+            "label": "Статус",
             "name": "status",
             "type": "select",
             "data": "content.status",
             "options": [
                 {
                     "id": "draft",
-                    "text": "Draft"
+                    "text": "Чернетка"
                 },
                 {
                     "id": "published",
-                    "text": "Published"
+                    "text": "Опубліковано"
                 },
                 {
                     "id": "archived",
-                    "text": "Archived"
+                    "text": "Архівовано"
                 },
                 {
                     "id": "delayPublished",
-                    "text": "Delay Published"
+                    "text": "Відкладена публікація"
                 }
             ],
             "required": true
         },
         {
-            "label": "Publish at",
+            "label": "Дата публікації",
             "name": "published_at",
             "required": true,
             "type": "datetime"
@@ -93,4 +93,4 @@
             "ua": "Дата створення"
         }
     ]
-}
+}

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

@@ -2,46 +2,46 @@
     "table": "site.contents",
     "columns": [
         {
-            "label": "Slug",
-            "name": "slug",
-            "parent": "title",
-            "required": true,
-            "type": "slug"
-        },
-        {
-            "label": "Title",
+            "label": "Заголовок",
             "name": "title",
             "required": true,
             "type": "text",
             "localization": true
         },
         {
-            "label": "Status",
+            "label": "Посилання",
+            "name": "slug",
+            "parent": "title",
+            "required": true,
+            "type": "slug"
+        },
+        {
+            "label": "Статус",
             "name": "status",
             "type": "select",
             "data": "content.status",
             "options": [
                 {
                     "id": "draft",
-                    "text": "Draft"
+                    "text": "Чернетка"
                 },
                 {
                     "id": "published",
-                    "text": "Published"
+                    "text": "Опубліковано"
                 },
                 {
                     "id": "archived",
-                    "text": "Archived"
+                    "text": "Архівовано"
                 },
                 {
                     "id": "delayPublished",
-                    "text": "Delay Published"
+                    "text": "Відкладена публікація"
                 }
             ],
             "required": true
         },
         {
-            "label": "Publish at",
+            "label": "Дата публікації",
             "name": "published_at",
             "required": true,
             "type": "datetime"
@@ -82,8 +82,10 @@
         },
         {
             "extra": false,
-            "label": "Контент",
-            "name": "single_body",
+            "placeholder": "Пошук по тексту",
+            "label": "Пошук по тексту",
+            "columns": "slug,title",
+            "name": "search",
             "type": "Text"
         },
         {
@@ -111,4 +113,4 @@
             "ua": "Дата створення"
         }
     ]
-}
+}

package/package.json

@@ -1,65 +1,65 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.43",
-  "description": "cms",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "license": "EULA",
-  "files": [
-    "module",
-    "dist",
-    "server",
-    "plugin.js",
-    "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.softpro 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.128",
-    "@opengis/filter": "^0.1.10",
-    "@opengis/form": "^0.0.70",
-    "@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.45",
+  "description": "cms",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "license": "EULA",
+  "files": [
+    "module",
+    "dist",
+    "server",
+    "plugin.js",
+    "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.128",
+    "@opengis/filter": "^0.1.31",
+    "@opengis/form": "^0.0.108",
+    "@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"
+  }
+}

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

@@ -2,48 +2,83 @@ import path from 'node:path';
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 
-import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
+import sharp from "sharp";
+import { imageSize } from "image-size";
+
+import { config, getFolder, pgClients, grpc, getMimeType } from "@opengis/fastify-table/utils.js";
+
+const { resizeImage } = grpc();
 
 // path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
 const rootDir = path.resolve(getFolder(config, 'local'));
 
+const previewWidth = 200;
+const resizeQuality = 75;
+
 export default async function downloadMedia({
-    pg = pgClients.client, params = {},
+    pg = pgClients.client, params = {}, query,
 }, reply) {
     if (!params?.id) {
-        return reply.status(400).send('not enough params: id');
+        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
     }
 
     if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
+        return reply.status(404).send({ error: 'table not found', code: 404 });
     }
 
-    const { filename, mime, id, url: relpath } = await pg.query(
-        'select media_id as id, filename, mime, url from site.media where media_id = $1 and url is not null',
+    const media = await pg.query(
+        `select media_id as id, filename, mime, url from site.media where media_id = $1 and url is not null`,
         [params.id],
     ).then(el => el.rows?.[0] || {});
 
-    if (!id) {
-        return reply.status(404).send('media not found: ' + params.id);
+    if (!media.id) {
+        // return reply.status(404).send('media not found: ' + params.id);
+        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+        Object.assign(media, { url: decodedPath, mime: getMimeType(decodedPath) });
+    }
+
+    if (!media.url || media.url.includes('..')) {
+        return reply.status(403).send({ error: "wrong params", code: 403 });
     }
 
-    const filepath = path.join(rootDir, relpath);
+    const filepath = path.join(rootDir, media.url);
 
     if (!existsSync(filepath)) {
-        return reply.status(404).send('file not found');
+        return reply.status(404).send({ error: 'file not found', code: 404 });
     }
 
     const buffer = await readFile(filepath, { buffer: true });
+    const headers = { 'Content-Type': media.mime, 'Cache-Control': query.nocache ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' };
+
+    // without nocache - cache resized images for 30d
+    if (params.type === 'preview' && media.mime && media.mime.startsWith('image/') && !media.mime.endsWith('/svg+xml')) {
+        const { width, height } = imageSize(buffer) || {};
+        const ratio = width / height;
+        const resizeWidth = Math.min(previewWidth, width);
+        const resizeHeight = resizeWidth / ratio;
+
+        const { result } = await resizeImage({
+            base64: buffer.toString("base64"),
+            width: resizeWidth,
+            height: resizeHeight,
+            quality: resizeQuality,
+        });
+        if (media.mime && media.mime.endsWith('/webp')) {
+            const webp = await sharp(Buffer.from(result, "base64")).webp({ quality: resizeQuality }).toBuffer({ resolveWithObject: false });
+            return reply.headers(headers).send(webp);
+        }
+        return reply.headers(headers).send(Buffer.from(result, "base64"));
+    }
 
     // skip xml load for preview
-    if (params.type === 'preview' && path.extname(filename) !== '.xml') {
-        return reply.headers({ 'Content-Type': mime }).send(buffer);
+    if (params.type === 'preview' && ['.xml'].includes(path.extname(filepath))) {
+        return reply
+            .headers({
+                'Content-Type': media.mime,
+                'Content-Disposition': `attachment; filename=${path.basename(filepath)}`,
+            })
+            .send(buffer);
     }
 
-    return reply
-        .headers({
-            'Content-Type': mime,
-            'Content-Disposition': `attachment; filename=${filename || path.basename(filepath)}`,
-        })
-        .send(buffer);
+    return reply.headers(headers).send(buffer);
 }

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

@@ -9,6 +9,9 @@ import { createHash } from 'node:crypto';
 const rootDir = path.resolve(getFolder(config, 'local'));
 const dir = '/files';
 
+const filesizeCache = {};
+const previewWidth = 300;
+
 mkdirSync(path.join(rootDir, dir), { recursive: true });
 
 export default async function listMedia(req, reply) {
@@ -63,31 +66,42 @@ export default async function listMedia(req, reply) {
         Object.assign(result, { rootDir });
     }
 
-    const files = (search ? allItems.filter(el => el.name.includes(search)) : items)
-        .filter(el => el.isFile())
-        .map(el => {
-            const media = rows.find(row => row.filename === el.name);
-            const filepath = media ? media.url : ('/files/' + (el.path.split('/files/')[1] ? el.path.split('/files/')[1] + '/' : '') + el.name);
-            return media ? {
-                type: 'file',
-                ...media,
-                url: `${req.routeOptions.url}/${media.id}/file`,
-                preview: `${req.routeOptions.url}/${media.id}/preview`,
-                filepath,
-                metadata: `${req.routeOptions.url}/${media.id}`,
-            } : {
-                id: createHash('md5').update(filepath).digest('hex'),
-                hash: true,
-                type: 'file',
-                filename: el.name,
-                filepath,
-                filetype: getMimeType(el.name)?.startsWith('image/') ? "image" : "other",
-                filesize: 0,
-                url: filepath,
-                mime: getMimeType(el.name),
-                preview: filepath,
-            }
-        });
+    const filteredFiles = (search ? allItems.filter(el => el.name.includes(search)) : items).filter(el => el.isFile());
+
+    const files = await Promise.all(filteredFiles.map(async el => {
+        const media = rows.find(row => row.filename === el.name);
+        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));
+            Object.assign(filesizeCache, { [filepath]: size });
+        }
+
+        const mime = getMimeType(el.name) || '';
+        const preview = mime.startsWith('image/') /* && mime !== 'image/svg+xml' */
+            ? `${req.routeOptions.url}/${media ? media.id : Buffer.from(filepath).toString('base64url')}/preview`
+            : undefined;
+
+        return media ? {
+            type: 'file',
+            ...media,
+            url: `${req.routeOptions.url}/${media.id}/file`,
+            preview,
+            filepath,
+            metadata: `${req.routeOptions.url}/${media.id}`,
+        } : {
+            id: createHash('md5').update(filepath).digest('hex'),
+            hash: true,
+            type: 'file',
+            filename: el.name,
+            filepath,
+            filetype: mime.startsWith('image/') ? "image" : "other",
+            filesize: filesizeCache[filepath] || 0,
+            url: filepath,
+            mime,
+            preview,
+        }
+    }));
 
     Object.assign(result, { data: subdirs.concat(files) });
     return result;

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