@opengis/cms 0.0.49 → 0.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -8,6 +8,7 @@
   "license": "EULA",
   "files": [
     "module",
+    "locales",
     "dist",
     "server",
     "plugin.js",
@@ -40,7 +41,7 @@
   "devDependencies": {
     "@fastify/compress": "^8.1.0",
     "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.137",
+    "@opengis/fastify-table": "^2.0.138",
     "@opengis/filter": "^0.1.31",
     "@opengis/form": "^0.0.109",
     "@opengis/richtext": "0.0.38",

package/server/functions/getSearchData.js

@@ -23,7 +23,7 @@ export default async function getSearchData({ page = 1, limit = 12, ttl = 3600,
   // 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 cacheKey = createHash('md5').update([config.pg?.database, 'cms:search', crudInc, page, limit, search, locale, tags, filter, contentType, asc].join(':')).digest('hex');
   const cacheData = ttl === 0 ? null : JSON.parse(await rclient.get(cacheKey));
 
   // return from cache

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

@@ -2,9 +2,22 @@ import path from 'node:path';
 import { existsSync, mkdirSync } from 'node:fs';
 import { readdir, stat } from 'node:fs/promises';
 
-import { config, getFolder, pgClients, getMimeType } from '@opengis/fastify-table/utils.js';
+import { config, getFolder, pgClients, getMimeType, getFilterSQL } from '@opengis/fastify-table/utils.js';
 import { createHash } from 'node:crypto';
 
+const filterList = [
+    {
+        name: "created_at",
+        type: "Date",
+        ua: "Дата створення"
+    },
+    {
+        name: "updated_at",
+        type: "Date",
+        ua: "Дата редагування"
+    }
+]
+
 // 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';
@@ -39,12 +52,15 @@ export default async function listMedia(req, reply) {
     const allItems = isDirectory ? await readdir(dirpath, { withFileTypes: true, recursive: true }) : [];
     const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
 
+    const { q = '' } = await getFilterSQL({ table: 'site.media', filter: query?.filter, filterList, pg });
+
     const rows = await pg.query(
         `select 
             media_id as id, filename, filetype, filesize, url, description, alt,
             mime, preview_url, created_at, updated_at, created_by, updated_by
         from site.media
-        where ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}`,
+        where ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}
+        ${q ? ` and (${q})` : ''}`,
         [subdir].filter(Boolean),
     ).then(el => el.rows || []); // ?.filter(row => items.map(el => el.name).includes(row.filename))
 

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

@@ -1,4 +1,6 @@
-import { config, pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+import additionalData from '../utils/additionalData.js';
 
 const filterList = [
   {
@@ -55,11 +57,12 @@ export default async function searchContent({
   const limit = Math.min(query.limit || 16, maxLimit);
   const offset = (page - 1) * limit;
 
-  const { q } = filter ? await getFilterSQL({
+  const { q } = filter || search ? await getFilterSQL({
     pg,
     table: 'site.contents',
     filter,
     search,
+    searchColumn: 'a.slug,a.title',
     query: `status='published'`,
     filterList,
   }) : { q: `status='published'` };
@@ -121,10 +124,12 @@ export default async function searchContent({
     }[!!asc];
 
     const { optimizedSQL = `SELECT * FROM data."${table}" where status='published' ORDER BY ${order}` } =
-      filter ? await getFilterSQL({
+      filter || search ? await getFilterSQL({
         pg,
         table: `data."${table}"`,
         filter,
+        search,
+        searchColumn: 'slug,title',
         query: `status='published'`,
         filterList: collectionFilters,
         order: 'published_at DESC NULLS LAST'
@@ -141,6 +146,8 @@ export default async function searchContent({
       return { rows: [], /*total: total // totals[`data.${table}`] || totals[`data."${table}"`] || 0*/ };
     });
 
+    // await additionalData(pg, items, locale);
+
     return {
       rows: items.map(el => ({
         ...row,

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

@@ -22,7 +22,7 @@ export default async function additionalData(pg, rows, locale, fields = '*') {
         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;
+        const localizationObj = fields?.length && fields !== '*' ? 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) {