@opengis/cms 0.0.35 → 0.0.36

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/module/cms/cls/content.status.json

@@ -1,18 +0,0 @@
-[
-    {
-        "id": "draft",
-        "text": "Чернетка"
-    },
-    {
-        "id": "published",
-        "text": "Опубліковано"
-    },
-    {
-        "id": "archived",
-        "text": "Архівовано"
-    },
-    {
-        "id": "delayPublished",
-        "text": "Затримка публікації"
-    }
-]

package/module/cms/cls/user_type.json

@@ -1,10 +0,0 @@
-[
-    {
-        "id": "regular",
-        "text": "Звичайний"
-    },
-    {
-        "id": "admin",
-        "text": "Admin"
-    }
-]

package/module/cms/form/admin.users.form.json

@@ -1,78 +0,0 @@
-{
-    "schema": {
-        "user_name": {
-            "type": "Text",
-            "rules": [
-                "required"
-            ],
-            "ua": "Ім'я",
-            "i": "Вноситься ім'я користувача, що буде відображатися у системі"
-        },
-        "sur_name": {
-            "type": "Text",
-            "rules": [
-                "required"
-            ],
-            "ua": "Прізвище",
-            "i": "Вноситься прізвище користувача, що буде відображатися у системі"
-        },
-        "father_name": {
-            "ua": "По-батькові",
-            "type": "Text"
-        },
-        "phone": {
-            "type": "Text",
-            "mask": "+389999999999",
-            "ua": "Телефон",
-            "i": "Вноситься телефон користувача"
-        },
-        "email": {
-            "type": "Text",
-            "ua": "E-mail",
-            "i": "Вноситься електронна адреса користувача",
-            "rules": [
-                "email"
-            ]
-        },
-        "login": {
-            "type": "Text",
-            "ua": "Логін",
-            "i": "Вноситься довільний логін користувача латинськими літерами, що буде використовуватися для входу в систему",
-            "rules": [
-                "required"
-            ]
-        },
-        "password": {
-            "type": "Text",
-            "ua": "Пароль",
-            "rules": [
-                "required",
-                {
-                    "type": "regexp",
-                    "pattern": "^.{8,}$",
-                    "message": "Пароль повинен бути більше 8 символів"
-                }
-            ],
-            "i": "Вноситься пароль, що буде використовуватися для входу в систему (рекомендоване використання складних паролів)"
-        },
-        "avatar": {
-            "type": "File",
-            "ua": "Аватар",
-            "i": "Додається зображення, що буде відображено в системі у якості аватара цього користувача"
-        },
-        "user_type": {
-            "type": "Select",
-            "ua": "Тип користувача",
-            "i": "Вноситься тип користувача",
-            "data": "user_type"
-        },
-        "enabled": {
-            "type": "Switcher",
-            "label": "Доступ"
-        },
-        "twofa": {
-            "type": "Switcher",
-            "label": "Двофакторна авторизація"
-        }
-    }
-}

package/module/cms/select/cms.page_type.sql

@@ -1,2 +0,0 @@
-select content_type_id, name || ' (' || title || ')' from site.content_types
-WHERE type = 'single'

package/module/cms/select/collection.sql

@@ -1 +0,0 @@
-SELECT content_type_id, name  FROM site.content_types where type='collection'

package/module/cms/select/news_tag_id.sql

@@ -1,12 +0,0 @@
-select a.id, a.title, tags from data.news a
-left join lateral(select array_agg(tag_id) as tags from site.tag_data b where a.id=b.data_id)b on 1=1
-
-where 
-case when '{{parent}}'<> '' 
-        then '{{parent}}'=any(b.tags)
-        else true 
-    end
-
-    and status='published' 
-
-order by a.updated_at

package/module/cms/select/tag_id.sql

@@ -1 +0,0 @@
-select tag_id, value from site.tags order by value

package/module/cms/table/admin.users.table.json

@@ -1,54 +0,0 @@
-{
-  "ua": "Користувачі",
-  "key": "uid",
-  "order": "cdate desc",
-  "access": "admin",
-  "sqlColumns": "*",
-  "form": "admin.users.form",
-  "table": "admin.users",
-  "sql": [
-    {
-      "name": "social_auth_sql",
-      "sql": "select social_auth_obj,social_auth_date from admin.users_social_auth where uid=t.uid limit 1"
-    },
-    {
-      "sql": "SELECT coalesce(sur_name, '') || ' ' || coalesce(user_name, '') || ' ' || coalesce(father_name, '') as full_name FROM admin.users WHERE uid = t.uid",
-      "name": "full_name_sql"
-    }
-  ],
-  "columns": [
-    {
-      "ua": "ПІБ",
-      "name": "full_name",
-      "format": "select",
-      "data": "full_name_sql"
-    },
-    {
-      "ua": "Тип користувача",
-      "name": "user_type_text",
-      "format": "select",
-      "data": "user_type_text"
-    },
-    {
-      "ua": "Статус доступу",
-      "name": "enabled"
-    }
-  ],
-  "filters": [
-    {
-      "label": "Тип користувача",
-      "type": "Check",
-      "name": "user_type",
-      "data": "user_type"
-    }
-  ],
-  "meta": {
-    "title": "full_name",
-    "search": "user_name,user_rnokpp"
-  },
-  "actions": [
-    "edit",
-    "del",
-    "add"
-  ]
-}

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

@@ -1,96 +0,0 @@
-{
-    "table": "site.contents",
-    "columns": [
-        {
-            "label": "Slug",
-            "name": "slug",
-            "parent": "title",
-            "required": true,
-            "type": "slug"
-        },
-        {
-            "label": "Title",
-            "name": "title",
-            "required": true,
-            "type": "text",
-            "localization": true
-        },
-        {
-            "label": "Status",
-            "name": "status",
-            "type": "select",
-            "data": "content.status",
-            "options": [
-                {
-                    "id": "draft",
-                    "text": "Draft"
-                },
-                {
-                    "id": "published",
-                    "text": "Published"
-                },
-                {
-                    "id": "archived",
-                    "text": "Archived"
-                },
-                {
-                    "id": "delayPublished",
-                    "text": "Delay Published"
-                }
-            ],
-            "required": true
-        },
-        {
-            "label": "Publish at",
-            "name": "published_at",
-            "required": true,
-            "type": "datetime"
-        },
-        {
-            "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,
-            "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/module/cms/table/single.default.table.json

@@ -1,114 +0,0 @@
-{
-    "table": "site.contents",
-    "columns": [
-        {
-            "label": "Slug",
-            "name": "slug",
-            "parent": "title",
-            "required": true,
-            "type": "slug"
-        },
-        {
-            "label": "Title",
-            "name": "title",
-            "required": true,
-            "type": "text",
-            "localization": true
-        },
-        {
-            "label": "Status",
-            "name": "status",
-            "type": "select",
-            "data": "content.status",
-            "options": [
-                {
-                    "id": "draft",
-                    "text": "Draft"
-                },
-                {
-                    "id": "published",
-                    "text": "Published"
-                },
-                {
-                    "id": "archived",
-                    "text": "Archived"
-                },
-                {
-                    "id": "delayPublished",
-                    "text": "Delay Published"
-                }
-            ],
-            "required": true
-        },
-        {
-            "label": "Publish at",
-            "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,
-            "label": "Контент",
-            "name": "single_body",
-            "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": "Дата створення"
-        }
-    ]
-}