@opengis/cms 0.0.47 → 0.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -40,9 +40,9 @@
   "devDependencies": {
     "@fastify/compress": "^8.1.0",
     "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.128",
+    "@opengis/fastify-table": "^2.0.137",
     "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.108",
+    "@opengis/form": "^0.0.109",
     "@opengis/richtext": "0.0.38",
     "@vueuse/head": "2.0.0",
     "js-yaml": "^4.1.0",
@@ -64,4 +64,4 @@
     "vitest": "3.2.4",
     "vue-tsc": "^2.2.10"
   }
-}
+}

package/server/functions/getContent.js

@@ -4,6 +4,7 @@ import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
 
 import getContent from '../routes/cms/controllers/getContent.js';
 
+const pg = pgClients.client;
 const rclient = getRedis();
 
 const mockReply = {
@@ -18,27 +19,36 @@ const mockReply = {
   },
 };
 
-export default async function getContentBySlug(slug, { locale, ttl = 3600, fields, limit = 12, page = 1, pg = pgClients.client } = {}) {
+export default async function getContentBySlug({ slug, filter, tags, state, locale, contextQuery, collection = 'pages', ttl = 3600, fields, limit = 12, page = 1 } = {}) {
   if (!slug) {
-    return { error: 'not enough params: slug', code: 400 };
+    // return { error: 'not enough params: slug', code: 400 };
   }
 
-  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:content', slug, fields && typeof fields !== 'string' ? JSON.stringify(fields) : fields].filter(Boolean).join(':')).digest('hex');
+  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 cache = ttl === 0 ? null : await rclient.get(cacheKey);
+  const table = collection === 'pages' ? 'site.contents' : tables[collection];
 
-  // return from cache
-  if (cache) {
-    return { cache: true, ...JSON.parse(cache) };
+  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:${table}:crud`) || 0;
 
-  const token = await pg.query(`select token_value from site.tokens where token_status = 'Active'`).then(el => el.rows?.[0]?.token_value);
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:content', slug, crudInc, filter, tags, state, locale, contextQuery, collection, fields, limit, page, fields && typeof fields !== 'string' ? JSON.stringify(fields) : fields].join(':')).digest('hex');
+  const cacheData = ttl === 0 ? null : JSON.parse(await rclient.get(cacheKey));
 
-  const req = { pg: pgClients.client, params: { type: slug }, query: { locale, fields, limit, page }, headers: { 'authorization': `Bearer ${token}` } };
-  const result = await getContent(req, mockReply);
+  // return from cache
+  if (cacheData) {
+    return { cache: true, ...cacheData };
+  }
 
-  if (ttl) await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+  const req = { pg: pgClients.client, params: { type: collection, id: slug }, query: { filter, tags, state, contextQuery, locale, fields, limit, page } };
+  const result = await getContent(req, mockReply, true);
+
+  if (ttl) {
+    await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+  }
 
   return result;
 }

package/server/functions/getSearchData.js

@@ -0,0 +1,41 @@
+import { createHash } from 'node:crypto';
+
+import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
+
+import searchContent from '../routes/cms/controllers/searchContent.js';
+
+const pg = pgClients.client;
+const rclient = getRedis();
+
+const mockReply = {
+  response: {},
+  status: (statusCode) => {
+    Object.assign(mockReply.response, { status: statusCode });
+    return mockReply;
+  },
+  send: (result) => {
+    Object.assign(mockReply.response, typeof result === 'object' ? result : { message: result });
+    return { ...mockReply.response };
+  },
+};
+
+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:site.contents:crud`) || 0;
+
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:search', crudInc, page, limit, ttl, 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 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;
+}

package/server/functions/getUser.js

@@ -4,10 +4,11 @@ import { config, getRedis } from "@opengis/fastify-table/utils.js";
 
 const rclient2 = getRedis({ db: 2 });
 
-// const test = await getUser(req.cookies);
+// const test = await getUser(req.cookies); - as object from request
+// const test = await getUser('_ga=GA...; session_auth=e0tQkaEI9yGab7pv--fZxbUJqTNmbqh; _dd_s=...'); - as string via astro
 
 export default async function getUser(cookies) {
-  const rawCookie = cookies?.['session_auth'];
+  const rawCookie = typeof cookies === 'string' ? decodeURIComponent(cookies.match(/(?:^|;\s*)session_auth=([^;]+)/)?.[1]) : cookies?.['session_auth'];
 
   // unauthorized
   if (!rawCookie) {
@@ -22,5 +23,5 @@ export default async function getUser(cookies) {
   }
 
   const str = await rclient2.get(`session_auth:${config.pg?.database || 'db'}:${sessionId}`);
-  return str ? JSON.parse(str).passport.user : null;
+  return str ? JSON.parse(str)?.passport?.user : null;
 }

package/server/migrations/fixes.sql

@@ -41,6 +41,11 @@ left join lateral (select content_type_id from site.content_types b where a.type
 */
 -- seamless migration finish
 
+ALTER TABLE if exists site.content_types add column if not exists template text;
+ALTER TABLE if exists site.content_types add column if not exists uid text;
+ALTER TABLE if exists site.contents add column if not exists template text;
+ALTER TABLE if exists site.contents add column if not exists uid text;
+
 --- insert default content types start
 insert into site.content_types(content_type_id,name,title,type,columns,template,uid)
 values('pages','pages','Сторінки','collection',

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

@@ -35,7 +35,7 @@ addHook('preFilter', async ({ pg = pgClients.client, table }) => {
 
 const defaultFields = ['title', 'slug', 'status', 'created_at', 'updated_at', 'main_image', 'published_at'];
 
-export default async function getContent(req, reply) {
+export default async function getContent(req, reply, called = false) {
     const { pg = pgClients.client, params = {}, query = {}, headers = {} } = req;
     const user = req.user || {};
     const { type, id } = params;
@@ -46,7 +46,7 @@ export default async function getContent(req, reply) {
 
     const { draftKey } = await getDraftKey();
     const showDrafts = query.draftKey && query.draftKey === draftKey;
-    const statusQuery = !!req.user?.uid || showDrafts ? '1=1' : `status='published'`;
+    const statusQuery = !!req.user?.uid || showDrafts || called ? '1=1' : `status='published'`;
 
     // headers.authorization = 'Bearer tokenExample'
     const isValidToken = await pg.query(
@@ -54,7 +54,7 @@ export default async function getContent(req, reply) {
         [headers.authorization?.split(' ')?.pop?.() || '']
     ).then(el => el.rows?.[0]?.isvalid);
 
-    if (!config.local && !isValidToken && config.mode !== 'cms') {
+    if (!config.local && !isValidToken && config.mode !== 'cms' && !called) {
         return reply.status(403).send('access restricted: token');
     }
 
@@ -91,7 +91,8 @@ export default async function getContent(req, reply) {
     const result = contentType === 'collection' && table
         ? await getCollection({
             table, id, limit, maxLimit, tags, order, search, filter, state, page, desc,
-            sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns, fields, defaultFields, defaultFilters,
+            sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns,
+            fields, defaultFields, defaultFilters, called,
         }, reply, pg)
         : await getSingle({
             contentId, id, limit, maxLimit, tags, search, filter, locale, statusQuery, user, sql, page, defaultColumns, fields, defaultFields, defaultFilters,

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

@@ -25,16 +25,17 @@ const matchFilterType = {
 const maxLimit = 100;
 
 export default async function searchContent({
-  pg = pgClients.client, query = {}, user = {},
+  pg = pgClients.client, query = {},
 }, reply) {
   if (!pg?.pk?.['site.contents']) {
-    return reply.status(404).send('table not found');
+    return reply.status(404).send({ error: 'table not found', code: 404 });
   }
 
   const t1 = Date.now();
 
   const {
     locale, // to do?
+    search,
     filter,
     contentType,
     asc,
@@ -42,11 +43,11 @@ export default async function searchContent({
   } = query;
 
   if (contentType && typeof contentType !== 'string') {
-    return reply.status(400).send('invalid query params: contentType must be a string');
+    return reply.status(400).send({ error: 'invalid query params: contentType must be a string', code: 400 });
   }
 
   if (tags && typeof tags !== 'string') {
-    return reply.status(400).send('invalid query params: tags must be a string');
+    return reply.status(400).send({ error: 'invalid query params: tags must be a string', code: 400 });
   }
 
   // add for singletone offset
@@ -58,6 +59,7 @@ export default async function searchContent({
     pg,
     table: 'site.contents',
     filter,
+    search,
     query: `status='published'`,
     filterList,
   }) : { q: `status='published'` };
@@ -82,7 +84,7 @@ export default async function searchContent({
     }) || {};
 
   if (!contents.length) {
-    return reply.status(404).send('content not found');
+    return reply.status(404).send({ error: 'content not found', code: 404 });
   }
 
   const singles = contents.filter(el => el.content_type === 'single');

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

@@ -1,8 +1,9 @@
 import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
 
+const pg = pgClients.client;
 const rclient = getRedis();
 
-export default async function getSettings({ entity = 'app', keys = ['cms'], uid = 0, ttl = 3600, pg = pgClients.client } = {}) {
+export default async function getSettings({ entity = 'app', keys = ['cms'], uid = 0, ttl = 3600 } = {}) {
   if (!pg) {
     return { error: "empty pg", code: 500 };
   }
@@ -11,7 +12,8 @@ export default async function getSettings({ entity = 'app', keys = ['cms'], uid
     return { error: "properties table not found", code: 404 };
   }
 
-  const cacheKey = [config.pg?.database, "cms:settings", entity, keys, uid].filter(Boolean).join(":");
+  const crudInc = await rclient.get(`pg:admin.properties:crud`) || 0;
+  const cacheKey = [config.pg?.database, "cms:settings", crudInc, entity, keys, uid].filter(Boolean).join(":");
   const cache = ttl === 0 ? null : await rclient.get(cacheKey);
 
   // return from cache

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

@@ -3,9 +3,11 @@ import { pgClients, getData, getMeta } from "@opengis/fastify-table/utils.js";
 import additionalData from "./additionalData.js";
 
 export default async function getCollection({
-    table, id, limit, maxLimit, order, search, tags, filter, state, page, desc, sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns, fields, defaultFields = [], defaultFilters = []
+    table, id, limit, maxLimit, order, search, tags, filter, state, page, desc, sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns, fields, defaultFields = [], defaultFilters = [], called = false,
 }, reply, pg = pgClients.client) {
-    if (!table || !pg.pk?.['data.' + table]) {
+    const meta = table ? await getMeta({ pg, table: 'data.' + table }) : {};
+
+    if (!table || !meta?.pk) {
         return { message: 'content table not found', status: 404 };
     }
 
@@ -60,7 +62,7 @@ export default async function getCollection({
     // Apply localization and tags etc.
     if (res?.rows?.length) {
         await additionalData(pg, res.rows, locale, id ? null : existingFields);
-    };
+    }
 
     const columns1 = !id
         ? columns?.map(col => Object.assign(col, { type: col.name === 'published_at' ? 'date' : col.type }))?.filter?.(el => !el.hidden)
@@ -79,5 +81,10 @@ export default async function getCollection({
         Object.assign(res, { type: 'collection', locales, preview_path: preview, columns: finalColumns });
     }
 
+    // add table name for cache via getContent function
+    if (called) {
+        Object.assign(res, { table: 'data.' + `"${table}"` });
+    }
+
     return res;
 }

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

@@ -8,11 +8,11 @@ export default async function updateLocalization(pg, id, body, contentTypeId, ui
     // const contentColumns = await pg.query('select columns from site.content_types where content_type_id=$1', [contentTypeId])
     //     .then(el => el.rows?.[0]?.columns || []);
 
-    const loadTable = contentTypeId === 'pages' ? await getTemplate('table', 'single.default.table') : {};
+    const loadTable = contentTypeId === 'pages'
+        ? await getTemplate('table', 'single.default.table')
+        : await getTemplate('table', 'collection.default.table');
 
-    const columns = contentTypeId === 'pages'
-        ? (loadTable?.columns || []).concat(contentColumns.filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1))
-        : contentColumns;
+    const columns = (loadTable?.columns || []).concat(contentColumns.filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1));
 
     const locales = await pg.query('select locales from site.spaces where space_id = $1 limit 1', ['default']).then(el => el.rows?.[0]?.locales || []);
 

package/server/routes/contentType/controllers/addContentType.js

@@ -80,8 +80,6 @@ export default async function builderPost(req, reply) {
     return reply.status(404).send('table not found');
   }
 
-  const { customTable = true } = body;
-
   if (!body.name) {
     return reply.status(400).send('not enough body params: name');
   }

package/server/routes/contentType/utils/updateCustomContentTable.js

@@ -43,12 +43,12 @@ export default async function updateCustomContentTable({ pg, id, columns = [] })
     await pg.query(`alter table data."${tablename}" drop constraint if exists c${id}_slug_unique;alter table data."${tablename}" add constraint c${id}_slug_unique UNIQUE (slug);`);
 
     // force meta columns refresh to avoid crud skips
-    getMeta({ pg, table: `data.${tablename}` }, true);
+    await getMeta({ pg, table: `data.${tablename}` }, true);
 
-    if (pg?.pk && pg.tlist && !pg.tlist.find(el => el === `data.${tablename}`)) {
-        pg.pk[`data.${tablename}`] = 'id';
-        pg.tlist?.push?.(`data.${tablename}`);
-    }
+    // if (pg?.pk && pg.tlist && !pg.tlist.find(el => el === `data.${tablename}`)) {
+    //     pg.pk[`data.${tablename}`] = 'id';
+    //     pg.tlist?.push?.(`data.${tablename}`);
+    // }
 
     return null;
 }

package/server/routes/menu/functions/getMenu.js

@@ -2,9 +2,10 @@ import { createHash } from 'node:crypto';
 
 import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
 
+const pg = pgClients.client;
 const rclient = getRedis();
 
-export default async function getMenu(name, { locale, ttl = 3600, page, limit = 16, sql, pg = pgClients.client } = {}) {
+export default async function getMenu(name, { locale, ttl = 3600, page, limit = 16, sql } = {}) {
   if (!pg?.pk) {
     return { error: 'empty pg', code: 400 };
   }
@@ -13,7 +14,8 @@ export default async function getMenu(name, { locale, ttl = 3600, page, limit =
     return { error: 'table not found', code: 404 };
   }
 
-  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', name, locale].filter(Boolean).join(':')).digest('hex');
+  const crudInc = await rclient.get(`pg:site.menus:crud`) || 0;
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', crudInc, name, locale].filter(Boolean).join(':')).digest('hex');
 
   const cache = ttl === 0 ? null : await rclient.get(cacheKey);
 

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/utils.d.ts

@@ -1,16 +1,52 @@
-interface Param {
-    locale?: string
-    ttl?: number
-    page?: number
-    fields?: string
-    limit?: number
+interface ContentParam {
+  slug?: string;
+  locale?: string;
+  ttl?: number;
+  page?: number;
+  fields?: string;
+  limit?: number;
+  filter?: string;
+  tags?: any;
+  state?: string;
+  contextQuery?: string;
+  collection?: string;
 }
+
+interface MenuParam {
+  locale?: string;
+  ttl?: number;
+  page?: number;
+  limit?: number;
+}
+
+interface SettingParam {
+  entity?: string;
+  keys?: string;
+  uid?: number;
+  ttl?: number;
+}
+
 interface Setting {
-    entity?: string
-    keys?: string
-    uid?: number
-    ttl?: number
+  entity?: string;
+  keys?: string;
+  uid?: number;
+  ttl?: number;
+}
+
+interface SearchParam {
+  contentType?: string;
+  filter?: string;
+  search?: string;
+  locale?: string;
+  tags?: string;
+  page?: number;
+  limit?: number;
+  asc?: number;
+  ttl?: number;
 }
-export function getContent(slug: string, param?: Param): any;
-export function getMenu(slug: string, param?: Param): any;
-export function getSettings(param?: Setting): any;
+
+export function getContent(param?: ContentParam): any;
+export function getMenu(slug: string, param?: MenuParam): any;
+export function getSettings(param?: SettingParam): any;
+export function getUser(cookies: string | Record<string, any>): any;
+export function getSearchData(param: SearchParam): any;

package/utils.js

@@ -2,5 +2,6 @@ export { default as getMenu } from "./server/routes/menu/functions/getMenu.js";
 export { default as getContent } from "./server/functions/getContent.js";
 export { default as getSettings } from "./server/routes/cms/functions/getSettings.js";
 export { default as getUser } from "./server/functions/getUser.js";
+export { default as getSearchData } from "./server/functions/getSearchData.js";
 
 export default null;

package/dist/MenuAddPage-DJPQEn2D.js

@@ -1,4 +0,0 @@
-import { MenuAddPage as e } from "./index.js";
-export {
-  e as default
-};

package/dist/MenuItemPage-EH8svyv5.js

@@ -1,4 +0,0 @@
-import { MenuItemPage as e } from "./index.js";
-export {
-  e as default
-};

package/dist/MenuPage-BgE0yNpY.js

@@ -1,4 +0,0 @@
-import { MenuPage as e } from "./index.js";
-export {
-  e as default
-};