@opengis/cms 0.0.58 → 0.0.60

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

@@ -1,214 +1,214 @@
-import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-import additionalData from '../utils/additionalData.js';
-
-const filterList = [
-  {
-    ua: 'Статус',
-    name: 'status',
-    type: 'Check'
-  },
-  {
-    name: 'published_at',
-    type: 'Date'
-  },
-  {
-    name: 'search',
-    columns: 'slug,title',
-    type: 'Text'
-  },
-];
-
-const matchFilterType = {
-  select: 'check',
-  datetime: 'date'
-};
-
-const maxLimit = 100;
-
-export default async function searchContent({
-  pg = pgClients.client, query = {},
-}, reply) {
-  if (!pg?.pk?.['site.contents']) {
-    return reply.status(404).send({ error: 'table not found', code: 404 });
-  }
-
-  const t1 = Date.now();
-
-  const {
-    locale, // to do?
-    search,
-    filter,
-    contentType,
-    asc,
-    tags,
-  } = query;
-
-  if (contentType && typeof contentType !== '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({ error: 'invalid query params: tags must be a string', code: 400 });
-  }
-
-  // add for singletone offset
-  const page = Math.max(1, parseInt(query.page || 1, 10));
-  const limit = Math.min(query.limit || 16, maxLimit);
-  const offset = (page - 1) * limit;
-
-  const { q } = filter || search ? await getFilterSQL({
-    pg,
-    table: 'site.contents',
-    filter,
-    search,
-    searchColumn: 'a.slug,a.title',
-    query: `status='published'`,
-    filterList,
-  }) : { q: `status='published'` };
-
-  // 1. Query all metadata
-  const q1 = `
-    SELECT a.title, a.slug, a.status, a.content_type_id, b.name as content_type_name, b.title as content_type_title, a.content_id,
-      b.type as content_type, b.columns, b.table_name, case when b.type = 'single' then main_image else null end as main_image
-    FROM site.contents a
-    LEFT JOIN site.content_types b ON a.content_type_id = b.content_type_id
-    WHERE b.visible
-      AND a.slug IS NOT NULL
-      ${tags ? `AND case when b.type = 'single' then a.content_id in (SELECT data_id FROM site.tag_data td left join site.tags ts on td.tag_id=ts.tag_id WHERE ts.slug = any($1) or ts.tag_id = any($1)) else true end` : ''}
-      ${contentType ? `and ((b.name=any($${tags ? 2 : 1}) or a.content_type_id=any($${tags ? 2 : 1}) or b.title=any($${tags ? 2 : 1})) ${contentType.includes('pages') ? `or b.type='single')` : ')'}` : ''}
-      ${q ? `AND (CASE WHEN b.type = 'single' THEN ${q.replace(/"title"/g, 'a.title').replace(/"slug"/g, 'a.slug').replace(/status/g, 'a.status')} ELSE TRUE END)` : ''}
-  `;
-
-  const { rows: contents = [] } = await pg.query(q1, [(tags ? tags.split(',') : null), (contentType ? contentType.split(',') : null)].filter(Boolean))
-    .catch(err => {
-      console.error(q1, err.toString(), err.stack);
-      return {};
-    }) || {};
-
-  if (!contents.length) {
-    return reply.status(404).send({ error: 'content not found', code: 404 });
-  }
-
-  const singles = contents.filter(el => el.content_type === 'single');
-  const collections = contents.filter(el => el.content_type === 'collection' && el.table_name);
-
-  // const totals = await pg.query(`select json_object_agg(oid::regclass, reltuples) from pg_class`).then(el => el.rows?.[0]?.json_object_agg || {});
-  const allSingles = await pg.query(`select count(*)::int from site.contents where content_type_id in (select content_type_id from site.content_types where type = 'single') and status='published'`).then(el => el.rows?.[0]?.count || 0);
-  const allCollectionTables = await pg.query(`select array_agg(table_name) from site.content_types where type = 'collection' and table_name is not null`).then(el => el.rows?.[0]?.array_agg || []);
-
-  const allCollections = await Promise.all(allCollectionTables.map(async tablename => {
-    const total = pg.queryCache ? await pg.queryCache(`select count(*)::int from data."${tablename}" where status='published'`, { table: `data.${tablename}` }).then(el => el.rows?.[0]?.count || 0) : 0;
-    return total;
-  })).then(el => el.reduce((acc, curr) => acc + (curr || 0), 0) || 0);
-
-  // collections
-  const collectionResults = await Promise.all(collections.map(async row => {
-    const { table_name: table, columns = [] } = row;
-
-    const collectionFilters = columns.filter(el =>
-      ['title', 'status', 'published_at'].includes(el.name) || el.type === 'text'
-    ).map(({ name, type }) => ({ name, type: matchFilterType[type] || type })); // select column => check type filter
-
-    collectionFilters.push({
-      name: 'search',
-      columns: collectionFilters
-        .filter(({ type }) => type === 'text')
-        .map(({ name }) => name).join(','),
-      type: 'Text',
-    });
-
-    const order = {
-      true: 'published_at ASC NULLS LAST',
-      false: 'published_at DESC NULLS LAST'
-    }[!!asc];
-
-    const { optimizedSQL = `SELECT * FROM data."${table}" where status='published' ORDER BY ${order}` } =
-      filter || search ? await getFilterSQL({
-        pg,
-        table: `data."${table}"`,
-        filter,
-        search,
-        searchColumn: 'slug,title',
-        query: `status='published'`,
-        filterList: collectionFilters,
-        order: 'published_at DESC NULLS LAST'
-      }) : {};
-
-    const q2 = `select id, ${columns.filter(el =>
-      ['title', 'status', 'published_at', 'slug', 'main_image'].includes(el.name) || el.type === 'text'
-    ).map(({ name }) => name === 'published_at' ? name : `"${name}"`).join(',')} from (${optimizedSQL}) q where ${tags ? 'id in (SELECT data_id FROM site.tag_data td left join site.tags ts on td.tag_id=ts.tag_id WHERE ts.slug = any($1))' : '1=1'} limit ${offset + limit}`;
-
-    // const total = pg.queryCache ? await pg.queryCache(`select count(*)::int from data."${table}"`, { table: `data.${table}` }).then(el => el.rows?.[0]?.count || 0) : 0;
-
-    const { rows: items = [] } = await pg.query(q2, [tags ? tags.split(',') : null].filter(Boolean)).catch(err => {
-      console.error(q2, err.toString(), err.stack);
-      return { rows: [], /*total: total // totals[`data.${table}`] || totals[`data."${table}"`] || 0*/ };
-    });
-
-    // await additionalData(pg, items, locale);
-
-    return {
-      rows: items.map(el => ({
-        ...row,
-        ...el,
-        slug: el.slug,
-        title: el.title,
-        status: el.status,
-        published_at: el.published_at,
-        table_name: undefined,
-        columns: undefined
-      })),
-      // total: total /*totals[`data.${table}`] || totals[`data."${table}"`] || 0,*/
-    };
-  }));
-
-  const allRows = [
-    ...singles.map(row => ({
-      ...row,
-      columns: undefined,
-      table_name: undefined
-    })),
-    ...collectionResults.map(el => el.rows || []).flat()
-  ];
-
-  const collectionIds = pg.queryCache ? await Promise.all(contents.filter(el => el.content_type === 'collection' && el.table_name).map(async row => pg.queryCache(`select array_agg(id) from data."${row.table_name}"`))).then(el => el.map(res => res.rows[0]?.array_agg || []).flat()) : [];
-
-  // add tags etc. for current page of rows
-  const allTags = pg.queryCache ? await pg.queryCache(
-    `select a.data_id, b.tag_id, b.value, b.color, b.slug from site.tag_data a left join site.tags b on a.tag_id=b.tag_id 
-    where a.data_id = any($1)`,
-    { args: [contents.map(el => el.content_id).concat(collectionIds)], table: 'site.tag_data' },
-  ).then(el => el.rows || []) : [];
-
-  // sort
-  const sorted = allRows.sort((a, b) => {
-    const aDate = new Date(a.published_at || 0);
-    const bDate = new Date(b.published_at || 0);
-    return bDate - aDate;
-  });
-
-  const paginated = sorted.slice(offset, offset + limit);
-
-  paginated.forEach(row => {
-    if (row.content_type === 'single' && row.content_id) {
-      row.tag_list = allTags
-        .filter(tag => tag.data_id === row.content_id)
-        .map(({ tag_id: id, value: text, color, slug }) => ({ id, text, color, slug }));
-    } else if (row.content_type === 'collection' && row.id) {
-      row.tag_list = allTags
-        .filter(tag => tag.data_id === row.id)
-        .map(({ tag_id: id, value: text, color, slug }) => ({ id, text, color, slug }));
-    }
-  });
-
-  return reply.status(200).send({
-    time: Date.now() - t1,
-    page,
-    limit,
-    total: allSingles + allCollections,
-    filtered: sorted.length,
-    count: paginated.length,
-    rows: paginated,
-  });
-}
+import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+import additionalData from '../utils/additionalData.js';
+
+const filterList = [
+  {
+    ua: 'Статус',
+    name: 'status',
+    type: 'Check'
+  },
+  {
+    name: 'published_at',
+    type: 'Date'
+  },
+  {
+    name: 'search',
+    columns: 'slug,title',
+    type: 'Text'
+  },
+];
+
+const matchFilterType = {
+  select: 'check',
+  datetime: 'date'
+};
+
+const maxLimit = 100;
+
+export default async function searchContent({
+  pg = pgClients.client, query = {},
+}, reply) {
+  if (!pg?.pk?.['site.contents']) {
+    return reply.status(404).send({ error: 'table not found', code: 404 });
+  }
+
+  const t1 = Date.now();
+
+  const {
+    locale, // to do?
+    search,
+    filter,
+    contentType,
+    asc,
+    tags,
+  } = query;
+
+  if (contentType && typeof contentType !== '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({ error: 'invalid query params: tags must be a string', code: 400 });
+  }
+
+  // add for singletone offset
+  const page = Math.max(1, parseInt(query.page || 1, 10));
+  const limit = Math.min(query.limit || 16, maxLimit);
+  const offset = (page - 1) * limit;
+
+  const { q } = filter || search ? await getFilterSQL({
+    pg,
+    table: 'site.contents',
+    filter,
+    search,
+    searchColumn: 'a.slug,a.title',
+    query: `status='published'`,
+    filterList,
+  }) : { q: `status='published'` };
+
+  // 1. Query all metadata
+  const q1 = `
+    SELECT a.title, a.slug, a.status, a.content_type_id, b.name as content_type_name, b.title as content_type_title, a.content_id,
+      b.type as content_type, b.columns, b.table_name, case when b.type = 'single' then main_image else null end as main_image
+    FROM site.contents a
+    LEFT JOIN site.content_types b ON a.content_type_id = b.content_type_id
+    WHERE b.visible
+      AND a.slug IS NOT NULL
+      ${tags ? `AND case when b.type = 'single' then a.content_id in (SELECT data_id FROM site.tag_data td left join site.tags ts on td.tag_id=ts.tag_id WHERE ts.slug = any($1) or ts.tag_id = any($1)) else true end` : ''}
+      ${contentType ? `and ((b.name=any($${tags ? 2 : 1}) or a.content_type_id=any($${tags ? 2 : 1}) or b.title=any($${tags ? 2 : 1})) ${contentType.includes('pages') ? `or b.type='single')` : ')'}` : ''}
+      ${q ? `AND (CASE WHEN b.type = 'single' THEN ${q.replace(/"title"/g, 'a.title').replace(/"slug"/g, 'a.slug').replace(/status/g, 'a.status')} ELSE TRUE END)` : ''}
+  `;
+
+  const { rows: contents = [] } = await pg.query(q1, [(tags ? tags.split(',') : null), (contentType ? contentType.split(',') : null)].filter(Boolean))
+    .catch(err => {
+      console.error(q1, err.toString(), err.stack);
+      return {};
+    }) || {};
+
+  if (!contents.length) {
+    return reply.status(404).send({ error: 'content not found', code: 404 });
+  }
+
+  const singles = contents.filter(el => el.content_type === 'single');
+  const collections = contents.filter(el => el.content_type === 'collection' && el.table_name);
+
+  // const totals = await pg.query(`select json_object_agg(oid::regclass, reltuples) from pg_class`).then(el => el.rows?.[0]?.json_object_agg || {});
+  const allSingles = await pg.query(`select count(*)::int from site.contents where content_type_id in (select content_type_id from site.content_types where type = 'single') and status='published'`).then(el => el.rows?.[0]?.count || 0);
+  const allCollectionTables = await pg.query(`select array_agg(table_name) from site.content_types where type = 'collection' and table_name is not null`).then(el => el.rows?.[0]?.array_agg || []);
+
+  const allCollections = await Promise.all(allCollectionTables.map(async tablename => {
+    const total = pg.queryCache ? await pg.queryCache(`select count(*)::int from data."${tablename}" where status='published'`, { table: `data.${tablename}` }).then(el => el.rows?.[0]?.count || 0) : 0;
+    return total;
+  })).then(el => el.reduce((acc, curr) => acc + (curr || 0), 0) || 0);
+
+  // collections
+  const collectionResults = await Promise.all(collections.map(async row => {
+    const { table_name: table, columns = [] } = row;
+
+    const collectionFilters = columns.filter(el =>
+      ['title', 'status', 'published_at'].includes(el.name) || el.type === 'text'
+    ).map(({ name, type }) => ({ name, type: matchFilterType[type] || type })); // select column => check type filter
+
+    collectionFilters.push({
+      name: 'search',
+      columns: collectionFilters
+        .filter(({ type }) => type === 'text')
+        .map(({ name }) => name).join(','),
+      type: 'Text',
+    });
+
+    const order = {
+      true: 'published_at ASC NULLS LAST',
+      false: 'published_at DESC NULLS LAST'
+    }[!!asc];
+
+    const { optimizedSQL = `SELECT * FROM data."${table}" where status='published' ORDER BY ${order}` } =
+      filter || search ? await getFilterSQL({
+        pg,
+        table: `data."${table}"`,
+        filter,
+        search,
+        searchColumn: 'slug,title',
+        query: `status='published'`,
+        filterList: collectionFilters,
+        order: 'published_at DESC NULLS LAST'
+      }) : {};
+
+    const q2 = `select id, ${columns.filter(el =>
+      ['title', 'status', 'published_at', 'slug', 'main_image'].includes(el.name) || el.type === 'text'
+    ).map(({ name }) => name === 'published_at' ? name : `"${name}"`).join(',')} from (${optimizedSQL}) q where ${tags ? 'id in (SELECT data_id FROM site.tag_data td left join site.tags ts on td.tag_id=ts.tag_id WHERE ts.slug = any($1))' : '1=1'} limit ${offset + limit}`;
+
+    // const total = pg.queryCache ? await pg.queryCache(`select count(*)::int from data."${table}"`, { table: `data.${table}` }).then(el => el.rows?.[0]?.count || 0) : 0;
+
+    const { rows: items = [] } = await pg.query(q2, [tags ? tags.split(',') : null].filter(Boolean)).catch(err => {
+      console.error(q2, err.toString(), err.stack);
+      return { rows: [], /*total: total // totals[`data.${table}`] || totals[`data."${table}"`] || 0*/ };
+    });
+
+    // await additionalData(pg, items, locale);
+
+    return {
+      rows: items.map(el => ({
+        ...row,
+        ...el,
+        slug: el.slug,
+        title: el.title,
+        status: el.status,
+        published_at: el.published_at,
+        table_name: undefined,
+        columns: undefined
+      })),
+      // total: total /*totals[`data.${table}`] || totals[`data."${table}"`] || 0,*/
+    };
+  }));
+
+  const allRows = [
+    ...singles.map(row => ({
+      ...row,
+      columns: undefined,
+      table_name: undefined
+    })),
+    ...collectionResults.map(el => el.rows || []).flat()
+  ];
+
+  const collectionIds = pg.queryCache ? await Promise.all(contents.filter(el => el.content_type === 'collection' && el.table_name).map(async row => pg.queryCache(`select array_agg(id) from data."${row.table_name}"`))).then(el => el.map(res => res.rows[0]?.array_agg || []).flat()) : [];
+
+  // add tags etc. for current page of rows
+  const allTags = pg.queryCache ? await pg.queryCache(
+    `select a.data_id, b.tag_id, b.value, b.color, b.slug from site.tag_data a left join site.tags b on a.tag_id=b.tag_id 
+    where a.data_id = any($1)`,
+    { args: [contents.map(el => el.content_id).concat(collectionIds)], table: 'site.tag_data' },
+  ).then(el => el.rows || []) : [];
+
+  // sort
+  const sorted = allRows.sort((a, b) => {
+    const aDate = new Date(a.published_at || 0);
+    const bDate = new Date(b.published_at || 0);
+    return bDate - aDate;
+  });
+
+  const paginated = sorted.slice(offset, offset + limit);
+
+  paginated.forEach(row => {
+    if (row.content_type === 'single' && row.content_id) {
+      row.tag_list = allTags
+        .filter(tag => tag.data_id === row.content_id)
+        .map(({ tag_id: id, value: text, color, slug }) => ({ id, text, color, slug }));
+    } else if (row.content_type === 'collection' && row.id) {
+      row.tag_list = allTags
+        .filter(tag => tag.data_id === row.id)
+        .map(({ tag_id: id, value: text, color, slug }) => ({ id, text, color, slug }));
+    }
+  });
+
+  return reply.status(200).send({
+    time: Date.now() - t1,
+    page,
+    limit,
+    total: allSingles + allCollections,
+    filtered: sorted.length,
+    count: paginated.length,
+    rows: paginated,
+  });
+}

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();
+    }
 }