@opengis/cms 0.0.61 → 0.0.63

package/locales/en.json

@@ -301,6 +301,14 @@
       "documents": "Documents",
       "infoLine": "Information Line",
       "iframe": "Iframe",
+      "detailedBanner": "Detailed Banner",
+      "cardsReverse": "Cards Reverse",
+      "table": "Data Table",
+      "fileDownload": "File Download",
+      "bodyContent": "Body Content",
+      "columnList": "List of elements in two columns",
+      "list": "List of elements",
+      "linkList": "List of links",
       "manageContentCollections": "Manage content collections",
       "searchCollections": "Search collections...",
       "collections": "Collections",

package/locales/uk.json

@@ -301,6 +301,14 @@
       "documents": "Документи",
       "infoLine": "Інформаційна лінія",
       "iframe": "Iframe",
+      "detailedBanner": "Детальний банер",
+      "cardsReverse": "Картки зворотнього порядку",
+      "table": "Таблиця даних",
+      "fileDownload": "Завантажити файл",
+      "bodyContent": "Текстовий блок",
+      "columnList": "Список елементів у двох колонках",
+      "list": "Список елементів",
+      "linkList": "Список посилань",
       "manageContentCollections": "Керування колекціями контенту",
       "searchCollections": "Пошук колекцій...",
       "collections": "Структура колекцій",
@@ -327,7 +335,7 @@
       "actions": "Дії",
       "noColumnsFound": "Немає колонок",
       "editCollection": "Редагувати структуру",
-      "editPage": "Редагувати сторінку",
+      "editPage": "Редагувати сторінку1111111",
       "editContentForYourSite": "Редагувати контент для вашого сайту",
       "deleteObject": "Ви впевнені, що хочете видалити цей об'єкт?",
       "editField": "Редагувати поле",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "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/server/routes/cms/controllers/deleteMedia.js

@@ -1,77 +1,77 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { rm, stat, readdir } from 'node:fs/promises';
-
-import { config, dataDelete, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
-
-// 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 dir = '/files';
-
-export default async function deleteMedia({
-    pg = pgClients.client, params = {}, query = {}, user = {}, method = 'DELETE',
-}, reply) {
-    if (!config.debug && method !== 'DELETE') {
-        return reply.status(403).send('access restricted');
-    }
-
-    if (!params.id && query.subdir) {
-        const dirpath = path.join(rootDir, dir, query.subdir || '');
-        const exists = existsSync(dirpath);
-        const stats = await stat(dirpath);
-
-        if (!stats.isDirectory()) {
-            return reply.status(400).send('not a directory');
-        }
-
-        if (!exists) {
-            return reply.status(404).send('subdir not found: ' + query.subdir);
-        }
-
-        const content = await readdir(dirpath, { recursive: true });
-
-        if (query.subdir.startsWith('uploads') && !query.subdir.split('/')[1]) {
-            return reply.status(403).send('access restricted: uploads directory');
-        }
-
-        // only admins are allowed to delete non-empty directories
-        if (content?.length && !user?.user_type?.includes?.('admin')) {
-            return reply.status(400).send('directory is not empty');
-        }
-
-        await rm(dirpath, { recursive: true });
-        return reply.status(200).send('subdirectory successfully deleted');
-    }
-
-    if (!params?.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    const { url: relpath, id } = await pg.query(
-        'select media_id as id, 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);
-    }
-
-    const res = await dataDelete({
-        pg,
-        id,
-        table: 'site.media',
-        uid: user?.uid || 0,
-    });
-
-    const filepath = path.join(rootDir, relpath);
-
-    if (existsSync(filepath)) {
-        await rm(filepath, { recursive: true });
-    }
-
-    return { id, ...res || {} };
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { rm, stat, readdir } from 'node:fs/promises';
+
+import { config, dataDelete, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
+
+// 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 dir = '/files';
+
+export default async function deleteMedia({
+    pg = pgClients.client, params = {}, query = {}, user = {}, method = 'DELETE',
+}, reply) {
+    if (!config.debug && method !== 'DELETE') {
+        return reply.status(403).send('access restricted');
+    }
+
+    if (!params.id && query.subdir) {
+        const dirpath = path.join(rootDir, dir, query.subdir || '');
+        const exists = existsSync(dirpath);
+        const stats = await stat(dirpath);
+
+        if (!stats.isDirectory()) {
+            return reply.status(400).send('not a directory');
+        }
+
+        if (!exists) {
+            return reply.status(404).send('subdir not found: ' + query.subdir);
+        }
+
+        const content = await readdir(dirpath, { recursive: true });
+
+        if (query.subdir.startsWith('uploads') && !query.subdir.split('/')[1]) {
+            return reply.status(403).send('access restricted: uploads directory');
+        }
+
+        // only admins are allowed to delete non-empty directories
+        if (content?.length && !user?.user_type?.includes?.('admin')) {
+            return reply.status(400).send('directory is not empty');
+        }
+
+        await rm(dirpath, { recursive: true });
+        return reply.status(200).send('subdirectory successfully deleted');
+    }
+
+    if (!params?.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    const { url: relpath, id } = await pg.query(
+        'select media_id as id, 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);
+    }
+
+    const res = await dataDelete({
+        pg,
+        id,
+        table: 'site.media',
+        uid: user?.uid || 0,
+    });
+
+    const filepath = path.join(rootDir, relpath);
+
+    if (existsSync(filepath)) {
+        await rm(filepath, { recursive: true });
+    }
+
+    return { id, ...res || {} };
 }

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

@@ -1,39 +1,39 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-
-import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
-
-// 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'));
-
-export default async function metadataMedia({
-    routeOptions = {}, pg = pgClients.client, params = {},
-}, reply) {
-    if (!params?.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    const data = await pg.query(
-        'select * from site.media where media_id = $1 and url is not null',
-        [params.id],
-    ).then(el => el.rows?.[0]);
-
-    if (!data) {
-        return reply.status(404).send('media not found: ' + params.id);
-    }
-
-    const filepath = path.join(rootDir, data.url);
-
-    Object.assign(data, {
-        url: `${routeOptions.url.replace(':id', params.id)}/file`,
-        preview: `${routeOptions.url.replace(':id', params.id)}/preview`,
-        filepath: data.url,
-        exists: existsSync(filepath),
-    });
-
-    return reply.status(200).send(data);
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+
+import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
+
+// 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'));
+
+export default async function metadataMedia({
+    routeOptions = {}, pg = pgClients.client, params = {},
+}, reply) {
+    if (!params?.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    const data = await pg.query(
+        'select * from site.media where media_id = $1 and url is not null',
+        [params.id],
+    ).then(el => el.rows?.[0]);
+
+    if (!data) {
+        return reply.status(404).send('media not found: ' + params.id);
+    }
+
+    const filepath = path.join(rootDir, data.url);
+
+    Object.assign(data, {
+        url: `${routeOptions.url.replace(':id', params.id)}/file`,
+        preview: `${routeOptions.url.replace(':id', params.id)}/preview`,
+        filepath: data.url,
+        exists: existsSync(filepath),
+    });
+
+    return reply.status(200).send(data);
+}

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

@@ -1,80 +1,80 @@
-import path from 'node:path';
-import { mkdir } from 'node:fs/promises';
-
-import { uploadMultiPart, config, getFolder, dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
-
-// 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 dir = '/files';
-
-export default async function uploadMedia(req, reply) {
-    const { pg = pgClients.client, user = {}, query = {} } = req;
-
-    if (!pg?.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (query.subdir && (typeof query.subdir !== 'string' || query.subdir.includes('..'))) {
-        return reply.status(403).send('invalid query params: subdir');
-    }
-
-    // upload assets
-    if (req.headers['content-type']?.split?.(';')?.shift?.() === 'multipart/form-data') {
-        const file = await uploadMultiPart(req, { subdir: query.subdir || '', originalFilename: true }).catch(err => {
-            if (err.message === 'file with specified name already exists in directory') {
-                err.message = 'Файл з вказаною назвою вже існує';
-                err.statusCode = 400;
-            }
-            throw err;
-        });
-
-        const { originalFilename: filename, filetype, mimetype } = file;
-        const relpath = path.join(dir, query.subdir || '', file.originalFilename).replace(/\\/g, '/');
-
-        const id = await dataInsert({
-            pg,
-            table: 'site.media',
-            data: {
-                filename,
-                filetype,
-                subdir: query.subdir,
-                url: relpath,
-                mime: mimetype,
-                filesize: file.size,
-            },
-            uid: user?.uid,
-        }).then(el => el?.rows?.[0]?.media_id);
-
-        return reply.status(200).send({
-            res: 'ok',
-            name: filename,
-            type: 'file',
-            mimetype,
-            result: {
-                file_id: id,
-                format: file.extension,
-                size: file.size,
-                // entity_id: resultInsert?.entity_id,
-                file_path: relpath,
-                file_name: filename,
-                dir: path.dirname(relpath).replace(/\\/g, '/'),
-                native_file_name: filename,
-            },
-        });
-    }
-
-    if (!query.subdir) {
-        return reply.status(400).send('not enough query params: subdir');
-    }
-
-    // create directory
-    const relpath = path.join(dir, query.subdir).replace(/\\/g, '/');
-    const dirpath = path.join(rootDir, relpath);
-    await mkdir(dirpath, { recursive: true });
-
-    return reply.status(200).send({
-        relpath,
-        dirname: path.basename(query.subdir),
-        type: 'dir',
-    });
+import path from 'node:path';
+import { mkdir } from 'node:fs/promises';
+
+import { uploadMultiPart, config, getFolder, dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
+
+// 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 dir = '/files';
+
+export default async function uploadMedia(req, reply) {
+    const { pg = pgClients.client, user = {}, query = {} } = req;
+
+    if (!pg?.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (query.subdir && (typeof query.subdir !== 'string' || query.subdir.includes('..'))) {
+        return reply.status(403).send('invalid query params: subdir');
+    }
+
+    // upload assets
+    if (req.headers['content-type']?.split?.(';')?.shift?.() === 'multipart/form-data') {
+        const file = await uploadMultiPart(req, { subdir: query.subdir || '', originalFilename: true }).catch(err => {
+            if (err.message === 'file with specified name already exists in directory') {
+                err.message = 'Файл з вказаною назвою вже існує';
+                err.statusCode = 400;
+            }
+            throw err;
+        });
+
+        const { originalFilename: filename, filetype, mimetype } = file;
+        const relpath = path.join(dir, query.subdir || '', file.originalFilename).replace(/\\/g, '/');
+
+        const id = await dataInsert({
+            pg,
+            table: 'site.media',
+            data: {
+                filename,
+                filetype,
+                subdir: query.subdir,
+                url: relpath,
+                mime: mimetype,
+                filesize: file.size,
+            },
+            uid: user?.uid,
+        }).then(el => el?.rows?.[0]?.media_id);
+
+        return reply.status(200).send({
+            res: 'ok',
+            name: filename,
+            type: 'file',
+            mimetype,
+            result: {
+                file_id: id,
+                format: file.extension,
+                size: file.size,
+                // entity_id: resultInsert?.entity_id,
+                file_path: relpath,
+                file_name: filename,
+                dir: path.dirname(relpath).replace(/\\/g, '/'),
+                native_file_name: filename,
+            },
+        });
+    }
+
+    if (!query.subdir) {
+        return reply.status(400).send('not enough query params: subdir');
+    }
+
+    // create directory
+    const relpath = path.join(dir, query.subdir).replace(/\\/g, '/');
+    const dirpath = path.join(rootDir, relpath);
+    await mkdir(dirpath, { recursive: true });
+
+    return reply.status(200).send({
+        relpath,
+        dirname: path.basename(query.subdir),
+        type: 'dir',
+    });
 }

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/dist/CollectionsBreadcrumb.vue_vue_type_script_setup_true_lang-umRzB5mY.js

@@ -1,53 +0,0 @@
-import { defineComponent as b, openBlock as e, createElementBlock as t, createElementVNode as s, createVNode as c, unref as n, toDisplayString as u, Fragment as r, createBlock as x, createCommentVNode as k, renderList as h } from "vue";
-import { Layers as g, ChevronRight as i } from "lucide-vue-next";
-const p = { class: "flex items-center space-x-1 mb-4 overflow-hidden" }, w = { class: "truncate block max-w-[12rem]" }, f = ["onClick"], v = { class: "truncate block max-w-[20rem]" }, y = {
-  key: 1,
-  class: "flex gap-x-1 items-center px-2 py-1 rounded text-sm font-medium text-slate-700 dark:text-slate-300 min-w-0 overflow-hidden whitespace-nowrap text-ellipsis"
-}, C = { class: "truncate block max-w-[20rem]" }, V = /* @__PURE__ */ b({
-  __name: "CollectionsBreadcrumb",
-  props: {
-    items: {},
-    loading: { type: Boolean }
-  },
-  emits: ["navigate"],
-  setup(a) {
-    return (d, l) => (e(), t("div", p, [
-      s("button", {
-        class: "flex gap-x-1 items-center px-2 py-1 rounded text-sm font-medium transition-all duration-200 text-blue-600 dark:text-blue-400 bg-blue-50 dark:bg-blue-900/20 hover:bg-blue-100 dark:hover:bg-blue-900/30 min-w-0 overflow-hidden whitespace-nowrap text-ellipsis",
-        onClick: l[0] || (l[0] = (o) => d.$emit("navigate", "collections"))
-      }, [
-        c(n(g), { class: "w-3 h-3 flex-shrink-0" }),
-        s("span", w, u(d.$t("cms.navigation.collections")), 1)
-      ]),
-      a.loading ? (e(), t(r, { key: 0 }, [
-        c(n(i), { class: "w-3 h-3 text-slate-400 dark:text-slate-500 flex-shrink-0" }),
-        l[1] || (l[1] = s("div", { class: "h-7 w-24 rounded bg-slate-200 dark:bg-slate-700 animate-pulse" }, null, -1)),
-        c(n(i), { class: "w-3 h-3 text-slate-400 dark:text-slate-500 flex-shrink-0" }),
-        l[2] || (l[2] = s("div", { class: "h-7 w-20 rounded bg-slate-200 dark:bg-slate-700 animate-pulse" }, null, -1))
-      ], 64)) : (e(), t(r, { key: 1 }, [
-        a.items.length > 0 ? (e(), x(n(i), {
-          key: 0,
-          class: "w-3 h-3 text-slate-400 dark:text-slate-500 flex-shrink-0"
-        })) : k("", !0),
-        (e(!0), t(r, null, h(a.items, (o, m) => (e(), t(r, { key: m }, [
-          m < a.items.length - 1 ? (e(), t("button", {
-            key: 0,
-            class: "flex gap-x-1 items-center px-2 py-1 rounded text-sm font-medium transition-all duration-200 text-blue-700 dark:text-blue-300 bg-blue-50 dark:bg-blue-900/20 hover:bg-blue-100 dark:hover:bg-blue-900/30 min-w-0 overflow-hidden whitespace-nowrap text-ellipsis",
-            onClick: (B) => d.$emit("navigate", o.route)
-          }, [
-            s("span", v, u(o.label), 1)
-          ], 8, f)) : (e(), t("span", y, [
-            s("span", C, u(o.label), 1)
-          ])),
-          m < a.items.length - 1 ? (e(), x(n(i), {
-            key: 2,
-            class: "w-3 h-3 text-slate-400 dark:text-slate-500 flex-shrink-0"
-          })) : k("", !0)
-        ], 64))), 128))
-      ], 64))
-    ]));
-  }
-});
-export {
-  V as _
-};