@opengis/cms 0.0.44 → 0.0.46

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/routes/cms/functions/getSettings.js

@@ -0,0 +1,46 @@
+import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient = getRedis();
+
+export default async function getSettings({ entity = 'app', keys = ['cms'], uid = 0, ttl = 3600, pg = pgClients.client } = {}) {
+  if (!pg) {
+    return { error: "empty pg", code: 500 };
+  }
+
+  if (!pg.pk?.["admin.properties"]) {
+    return { error: "properties table not found", code: 404 };
+  }
+
+  const cacheKey = [config.pg?.database, "cms:settings", entity, keys, uid].filter(Boolean).join(":");
+  const cache = ttl === 0 ? null : await rclient.get(cacheKey);
+
+  // return from cache
+  if (cache) {
+    return { cache: true, ...JSON.parse(cache) };
+  }
+
+  const rows = await pg.query(
+    "select property_key as key, property_text, property_json from admin.properties where property_entity=$1",
+    entity === "user" ? [uid] : [entity || "app"]
+  ).then(el => el.rows || []);
+
+  const settings = rows
+    .filter((row) =>
+      typeof keys === "string" ? keys.includes(row.key) : true
+    )
+    .reduce(
+      (
+        acc,
+        { key, property_text, property_json }
+      ) => ({
+        ...acc,
+        [key]: property_text || property_json,
+      }),
+      {}
+    );
+
+  // save to cache, default = 1 hour
+  if (ttl) await rclient.set(cacheKey, JSON.stringify(settings), 'EX', ttl);
+
+  return settings;
+}

package/server/routes/cms/index.mjs

@@ -1,112 +1,112 @@
-// perimissions
-import getPermissions from './controllers/getPermissions.js';
-import setPermissions from './controllers/setPermissions.js';
-
-// media
-import listMedia from './controllers/listMedia.js';
-import metadata from './controllers/metadataMedia.js';
-import uploadMedia from './controllers/uploadMedia.js';
-import del from './controllers/deleteMedia.js';
-import download from './controllers/downloadMedia.js';
-
-// content
-import getContent from './controllers/getContent.js';
-import getContentBySlug from './controllers/getContentBySlug.js';
-import insertContent from './controllers/insertContent.js';
-import updateContent from './controllers/updateContent.js';
-import deleteContent from './controllers/deleteContent.js';
-import { translateContent, translateCollection } from './controllers/translate.js';
-
-// suggest
-import cmsSuggest from './controllers/cmsSuggest.js';
-
-// statistics
-import cmsStat from './controllers/cmsStat.js';
-import searchContent from './controllers/searchContent.js';
-
-import getAppSettings from "./controllers/properties.get.js";
-import postAppSettings from "./controllers/properties.post.js";
-
-const suggestSchema = {
-    querystring: {
-        type: 'object',
-        properties: {
-            search: { type: 'string' },
-            filter: { type: 'string' },
-            limit: { type: 'number', exclusiveMinimum: 0 },
-        },
-    },
-};
-
-const propertiesSchema = {
-    type: "object",
-    properties: {
-        params: {
-            id: { type: "string", pattern: "^([\\d\\w]+)$" },
-            key: { type: "string", pattern: "^([\\d\\w._]+)$" },
-        },
-        querystring: {
-            json: { type: "string", pattern: "^([\\d\\w]+)$" },
-        },
-    },
-};
-
-const translateContentSchema = {
-    type: "object",
-    properties: {
-        params: {
-            id: {
-                type: "string"
-            },
-        },
-        querystring: {
-            required: ['to'],
-            additionalProperties: false,
-            from: {
-                type: "string"
-            },
-            to: {
-                type: "string"
-            },
-        },
-    },
-};
-
-const params = { config: { policy: 'L0' } };
-
-export default function route(app) {
-    app.post('/cms-permissions/:id', { config: { role: 'admin' } }, setPermissions);
-    app.get('/cms-permissions/:id?', params, getPermissions);
-    app.get('/cms-translate', { config: { role: "admin" }, schema: translateContentSchema }, translateContent);
-    app.get('/cms-translate-collection/:id', { config: { role: "admin" }, schema: translateContentSchema }, translateCollection);
-
-    app.post('/cms-media/upload', params, uploadMedia);
-    app.get('/cms-media', params, listMedia);
-    app.get('/cms-media/:id/:type', params, download);
-    app.get('/cms-media/:id', params, metadata);
-    app.delete('/cms-media/:id?', params, del); // media file with id / subdir without
-    app.get('/cms-media/:id/delete', params, del); // debug
-
-    // Bearer token required
-    app.get('/cms-content/:slug/:lang?', params, getContentBySlug);
-    app.get('/cms-search', params, searchContent);
-    app.get('/cms/:type', params, getContent);
-    app.get('/cms/:type/:id/:lang?', params, getContent);
-
-    app.post('/cms/:type/:id?', params, insertContent);
-    app.put('/cms/:type/:id?', params, updateContent);
-    app.delete('/cms/:type/:id', params, deleteContent);
-
-    app.get('/cms-suggest/:id', { ...params, schema: suggestSchema }, cmsSuggest);
-    app.get('/cms-stat', params, cmsStat);
-    app.get(
-        "/settings",
-        { config: { policy: "L0" }, schema: propertiesSchema },
-        getAppSettings
-    );
-    app.post(
-        "/settings",
-        { config: { policy: "L0" } },
-        postAppSettings
-    );
-}
+// perimissions
+import getPermissions from './controllers/getPermissions.js';
+import setPermissions from './controllers/setPermissions.js';
+
+// media
+import listMedia from './controllers/listMedia.js';
+import metadata from './controllers/metadataMedia.js';
+import uploadMedia from './controllers/uploadMedia.js';
+import del from './controllers/deleteMedia.js';
+import download from './controllers/downloadMedia.js';
+
+// content
+import getContent from './controllers/getContent.js';
+import getContentBySlug from './controllers/getContentBySlug.js';
+import insertContent from './controllers/insertContent.js';
+import updateContent from './controllers/updateContent.js';
+import deleteContent from './controllers/deleteContent.js';
+import { translateContent, translateCollection } from './controllers/translate.js';
+
+// suggest
+import cmsSuggest from './controllers/cmsSuggest.js';
+
+// statistics
+import cmsStat from './controllers/cmsStat.js';
+import searchContent from './controllers/searchContent.js';
+
+import getAppSettings from "./controllers/properties.get.js";
+import postAppSettings from "./controllers/properties.post.js";
+
+const suggestSchema = {
+    querystring: {
+        type: 'object',
+        properties: {
+            search: { type: 'string' },
+            filter: { type: 'string' },
+            limit: { type: 'number', exclusiveMinimum: 0 },
+        },
+    },
+};
+
+const propertiesSchema = {
+    type: "object",
+    properties: {
+        params: {
+            id: { type: "string", pattern: "^([\\d\\w]+)$" },
+            key: { type: "string", pattern: "^([\\d\\w._]+)$" },
+        },
+        querystring: {
+            json: { type: "string", pattern: "^([\\d\\w]+)$" },
+        },
+    },
+};
+
+const translateContentSchema = {
+    type: "object",
+    properties: {
+        params: {
+            id: {
+                type: "string"
+            },
+        },
+        querystring: {
+            required: ['to'],
+            additionalProperties: false,
+            from: {
+                type: "string"
+            },
+            to: {
+                type: "string"
+            },
+        },
+    },
+};
+
+const params = { config: { policy: 'L0' } };
+
+export default function route(app) {
+    app.post('/cms-permissions/:id', { config: { role: 'admin' } }, setPermissions);
+    app.get('/cms-permissions/:id?', params, getPermissions);
+    app.get('/cms-translate', { config: { role: "admin" }, schema: translateContentSchema }, translateContent);
+    app.get('/cms-translate-collection/:id', { config: { role: "admin" }, schema: translateContentSchema }, translateCollection);
+
+    app.post('/cms-media/upload', params, uploadMedia);
+    app.get('/cms-media', params, listMedia);
+    app.get('/cms-media/:id/:type', params, download);
+    app.get('/cms-media/:id', params, metadata);
+    app.delete('/cms-media/:id?', params, del); // media file with id / subdir without
+    app.get('/cms-media/:id/delete', params, del); // debug
+
+    // Bearer token required
+    app.get('/cms-content/:slug/:lang?', params, getContentBySlug);
+    app.get('/cms-search', params, searchContent);
+    app.get('/cms/:type', params, getContent);
+    app.get('/cms/:type/:id/:lang?', params, getContent);
+
+    app.post('/cms/:type/:id?', params, insertContent);
+    app.put('/cms/:type/:id?', params, updateContent);
+    app.delete('/cms/:type/:id', params, deleteContent);
+
+    app.get('/cms-suggest/:id', { ...params, schema: suggestSchema }, cmsSuggest);
+    app.get('/cms-stat', params, cmsStat);
+    app.get(
+        "/settings",
+        { config: { policy: "L0" }, schema: propertiesSchema },
+        getAppSettings
+    );
+    app.post(
+        "/settings",
+        { config: { policy: "L0" } },
+        postAppSettings
+    );
+}

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

@@ -1,36 +1,36 @@
-export default async function additionalData(pg, rows, locale, fields = '*') {
-    const { rows: localizations = [] } = await pg.query(`select json_object_agg(field_key, field_value), object_id from site.localization 
-    where object_id=any($1) and ${locale && locale !== 'uk' ? 'REVERSE(split_part(REVERSE(field_key), \':\', 1)) = $2' : '1=1'} group by object_id`, [rows.map(el => el.id), locale && locale !== 'uk' ? locale : null].filter(Boolean));
-
-    const { rows: tagsList = [] } = await pg.query(`
-    SELECT 
-    td.data_id,
-    json_agg(
-        json_build_object('id', t.tag_id, 'text', t.value, 'color', t.color, 'slug', t.slug, 'locale', t.locale)
-    ) AS tag
-    FROM site.tag_data td
-    JOIN site.tags t ON t.tag_id = td.tag_id
-    where data_id=any($1) 
-    GROUP BY td.data_id;    
-    `, [rows.map(el => el.id)]);
-
-    rows.forEach(row => {
-        if (locale && locale !== 'uk' && row.meta && Object.keys(row.meta || {}).find(key => key.split(':').pop() === locale)) {
-            row.meta = Object.fromEntries(Object.keys(row.meta || {}).filter(key => key.split(':').pop() === locale && row.meta?.[key]).map(key => [key.split(':').shift(), row.meta[key]]));
-        }
-
-        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;
-        if (locale && locale !== 'uk') {
-            Object.assign(row, Object.keys(localizationObj).reduce((acc, curr) => ({ ...acc, [curr.replace(`:${locale}`, '')]: localizationObj[curr] }), {}));
-        } else if (!locale) {
-            Object.assign(row, localizationObj);
-        }
-
-        const { tag = [] } = tagsList.find(el => el?.data_id === row?.id) || {};
-        const localizedTags = locale ? tag.map(el => ({ ...el, text: el.locale?.[locale] || el.text })) : tag;
-        Object.assign(row, { tag_list: localizedTags });
-    });
+export default async function additionalData(pg, rows, locale, fields = '*') {
+    const { rows: localizations = [] } = await pg.query(`select json_object_agg(field_key, field_value), object_id from site.localization 
+    where object_id=any($1) and ${locale && locale !== 'uk' ? 'REVERSE(split_part(REVERSE(field_key), \':\', 1)) = $2' : '1=1'} group by object_id`, [rows.map(el => el.id), locale && locale !== 'uk' ? locale : null].filter(Boolean));
+
+    const { rows: tagsList = [] } = await pg.query(`
+    SELECT 
+    td.data_id,
+    json_agg(
+        json_build_object('id', t.tag_id, 'text', t.value, 'color', t.color, 'slug', t.slug, 'locale', t.locale)
+    ) AS tag
+    FROM site.tag_data td
+    JOIN site.tags t ON t.tag_id = td.tag_id
+    where data_id=any($1) 
+    GROUP BY td.data_id;    
+    `, [rows.map(el => el.id)]);
+
+    rows.forEach(row => {
+        if (locale && locale !== 'uk' && row.meta && Object.keys(row.meta || {}).find(key => key.split(':').pop() === locale)) {
+            row.meta = Object.fromEntries(Object.keys(row.meta || {}).filter(key => key.split(':').pop() === locale && row.meta?.[key]).map(key => [key.split(':').shift(), row.meta[key]]));
+        }
+
+        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;
+        if (locale && locale !== 'uk') {
+            Object.assign(row, Object.keys(localizationObj).reduce((acc, curr) => ({ ...acc, [curr.replace(`:${locale}`, '')]: localizationObj[curr] }), {}));
+        } else if (!locale) {
+            Object.assign(row, localizationObj);
+        }
+
+        const { tag = [] } = tagsList.find(el => el?.data_id === row?.id) || {};
+        const localizedTags = locale ? tag.map(el => ({ ...el, text: el.locale?.[locale] || el.text })) : tag;
+        Object.assign(row, { tag_list: localizedTags });
+    });
 }