@opengis/cms 0.0.61 → 0.0.62

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

@@ -1,160 +1,160 @@
-import { config, logger, dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
-
-import updateCustomContentTable from '../utils/updateCustomContentTable.js'; // custom table
-import updateContents from '../utils/updateContents.js'; // site.contents + site.content_data
-
-const columns = [
-  {
-    name: 'slug',
-    label: 'Slug',
-    type: 'slug',
-    parent: 'title',
-    required: true
-  },
-  {
-    name: 'title',
-    label: 'Заголовок',
-    type: 'text',
-    required: true
-  },
-  {
-    name: 'status',
-    label: 'Статус',
-    type: 'select',
-    data: "content.status",
-    required: true
-  },
-  {
-    name: 'published_at',
-    label: 'Дата публікації',
-    type: 'date',
-    required: true
-  },
-  {
-    name: 'is_pin',
-    label: 'Закріпити контент',
-    type: 'boolean',
-    required: false,
-    default: 'false',
-    hidden: true,
-  },
-  {
-    name: 'meta',
-    label: 'Meta',
-    type: 'datalist',
-    hidden: true,
-  },
-  {
-    name: 'created_at',
-    label: 'Дата та час створення',
-    type: 'datetime',
-    default: 'now()',
-    hidden: true,
-  },
-  {
-    name: 'updated_at',
-    label: 'Дата та час редагування',
-    type: 'datetime',
-    default: 'now()',
-    hidden: true,
-  },
-  {
-    name: 'created_by',
-    type: 'text',
-    label: 'Автор',
-    hidden: true
-  },
-  {
-    name: 'updated_by',
-    type: 'text',
-    label: 'Редактор',
-    default: 'now()',
-    hidden: true
-  }
-];
-
-export default async function builderPost(req, reply) {
-  const { pg = pgClients.client, user = {}, body = {} } = req;
-
-  if (!pg?.pk?.['site.content_types']) {
-    return reply.status(404).send('table not found');
-  }
-
-  if (!body.name) {
-    return reply.status(400).send('not enough body params: name');
-  }
-
-  if (typeof body.name !== 'string') {
-    return reply.status(400).send('invalid body params: name not as string');
-  }
-
-  const rowCount = await pg.query('select content_type_id as id from site.content_types where name=$1', [body.name]).then(el => el.rowCount);
-
-  if (rowCount > 0) {
-    return reply.status(400).send('Тип контенту з даною назвою вже існує');
-  }
-
-  const tablename = body.type === 'collection' && true ? body.name.toLowerCase().replace(/ /g, '').replace(/'/g, "''").replace(/'/g, '').replace(/-/g, '_') : undefined; // customTable
-
-  const client = await pg.connect();
-
-  try {
-    await client.query('BEGIN');
-
-    const columns1 = (body.fields || body.columns || columns.filter(el => !el.hidden)).filter(el => el.name).map(el => Object.assign(el, { name: el.name.toLowerCase() })); // for rest crud
-
-    if (body.type === 'single') {
-      const singleColumns = [
-        {
-          name: 'main_image',
-          label: 'Головне зображення',
-          type: 'image',
-          required: false
-        },
-        {
-          name: 'single_body',
-          label: 'Контент',
-          type: 'richtext',
-          required: false
-        },
-        {
-          name: 'single_sections',
-          label: 'Секції',
-          type: 'reference',
-          required: false
-        },
-      ]
-      columns1.push(...singleColumns);
-    }
-
-    const { rows = [] } = await dataInsert({
-      pg: client,
-      table: 'site.content_types',
-      data: {
-        ...body,
-        table_name: tablename,
-        columns: columns1,
-      },
-      uid: user?.uid,
-    });
-
-    Object.assign(body, { slug: body.slug || body.name });
-
-    if (tablename) {
-      await updateCustomContentTable({ pg: client, id: rows?.[0]?.content_type_id, columns });
-    }
-
-    const res = await updateContents(client, rows?.[0]?.content_type_id, body, user?.uid);
-    Object.assign(rows?.[0], res || {}); // update rows with contents
-
-    await client.query('COMMIT');
-
-    return reply.status(200).send({ id: rows?.[0]?.content_type_id, rows });
-  } catch (err) {
-    await client.query('ROLLBACK');
-    logger.file('cms/contentType', { error: err.toString(), stack: err.stack });
-    return reply.status(500).send('Помилка при додаванні типу контенту');
-  } finally {
-    client.release();
-  }
-}
+import { config, logger, dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
+
+import updateCustomContentTable from '../utils/updateCustomContentTable.js'; // custom table
+import updateContents from '../utils/updateContents.js'; // site.contents + site.content_data
+
+const columns = [
+  {
+    name: 'slug',
+    label: 'Slug',
+    type: 'slug',
+    parent: 'title',
+    required: true
+  },
+  {
+    name: 'title',
+    label: 'Заголовок',
+    type: 'text',
+    required: true
+  },
+  {
+    name: 'status',
+    label: 'Статус',
+    type: 'select',
+    data: "content.status",
+    required: true
+  },
+  {
+    name: 'published_at',
+    label: 'Дата публікації',
+    type: 'date',
+    required: true
+  },
+  {
+    name: 'is_pin',
+    label: 'Закріпити контент',
+    type: 'boolean',
+    required: false,
+    default: 'false',
+    hidden: true,
+  },
+  {
+    name: 'meta',
+    label: 'Meta',
+    type: 'datalist',
+    hidden: true,
+  },
+  {
+    name: 'created_at',
+    label: 'Дата та час створення',
+    type: 'datetime',
+    default: 'now()',
+    hidden: true,
+  },
+  {
+    name: 'updated_at',
+    label: 'Дата та час редагування',
+    type: 'datetime',
+    default: 'now()',
+    hidden: true,
+  },
+  {
+    name: 'created_by',
+    type: 'text',
+    label: 'Автор',
+    hidden: true
+  },
+  {
+    name: 'updated_by',
+    type: 'text',
+    label: 'Редактор',
+    default: 'now()',
+    hidden: true
+  }
+];
+
+export default async function builderPost(req, reply) {
+  const { pg = pgClients.client, user = {}, body = {} } = req;
+
+  if (!pg?.pk?.['site.content_types']) {
+    return reply.status(404).send('table not found');
+  }
+
+  if (!body.name) {
+    return reply.status(400).send('not enough body params: name');
+  }
+
+  if (typeof body.name !== 'string') {
+    return reply.status(400).send('invalid body params: name not as string');
+  }
+
+  const rowCount = await pg.query('select content_type_id as id from site.content_types where name=$1', [body.name]).then(el => el.rowCount);
+
+  if (rowCount > 0) {
+    return reply.status(400).send('Тип контенту з даною назвою вже існує');
+  }
+
+  const tablename = body.type === 'collection' && true ? body.name.toLowerCase().replace(/ /g, '').replace(/'/g, "''").replace(/'/g, '').replace(/-/g, '_') : undefined; // customTable
+
+  const client = await pg.connect();
+
+  try {
+    await client.query('BEGIN');
+
+    const columns1 = (body.fields || body.columns || columns.filter(el => !el.hidden)).filter(el => el.name).map(el => Object.assign(el, { name: el.name.toLowerCase() })); // for rest crud
+
+    if (body.type === 'single') {
+      const singleColumns = [
+        {
+          name: 'main_image',
+          label: 'Головне зображення',
+          type: 'image',
+          required: false
+        },
+        {
+          name: 'single_body',
+          label: 'Контент',
+          type: 'richtext',
+          required: false
+        },
+        {
+          name: 'single_sections',
+          label: 'Секції',
+          type: 'reference',
+          required: false
+        },
+      ]
+      columns1.push(...singleColumns);
+    }
+
+    const { rows = [] } = await dataInsert({
+      pg: client,
+      table: 'site.content_types',
+      data: {
+        ...body,
+        table_name: tablename,
+        columns: columns1,
+      },
+      uid: user?.uid,
+    });
+
+    Object.assign(body, { slug: body.slug || body.name });
+
+    if (tablename) {
+      await updateCustomContentTable({ pg: client, id: rows?.[0]?.content_type_id, columns });
+    }
+
+    const res = await updateContents(client, rows?.[0]?.content_type_id, body, user?.uid);
+    Object.assign(rows?.[0], res || {}); // update rows with contents
+
+    await client.query('COMMIT');
+
+    return reply.status(200).send({ id: rows?.[0]?.content_type_id, rows });
+  } catch (err) {
+    await client.query('ROLLBACK');
+    logger.file('cms/contentType', { error: err.toString(), stack: err.stack });
+    return reply.status(500).send('Помилка при додаванні типу контенту');
+  } finally {
+    client.release();
+  }
+}

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

@@ -1,47 +1,47 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 100;
-
-export default async function contentTypeList({ pg = pgClients.client, query = {} }, reply) {
-  if (!pg) {
-    return reply.status(200).send({ total: 0, msg: 'empty pg', rows: [] });
-  }
-
-  const limit = Math.min(maxLimit, query.limit || 16);
-  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-  const q = `select a.content_type_id as id, a.name, a.title, a.description, a.table_name as table, type, columns, a.include_search FROM site.content_types a
-  
-  where ${query.type === 'collection' ? `type='collection'` : (query.type === 'single' ? `type='single'` : '1=1')}`;
-
-  const where = query.search?.replace ? `(name ilike '%${query.search.replace(/'/, "''")}%' or title ilike '%${query.search.replace(/'/, "''")}%')` : '1=1';
-  const q1 = q + ` and ${where} order by case when status='archived' then true else false end limit ${limit} offset ${offset}`;
-
-  if (query.sql) return q1;
-
-  const { rows = [] } = await pg.query(q1);
-
-  const { total = 0, filtered = 0 } = await pg.query(`select 
-    count(*)::int as total,
-    count(*) filter (where ${where})::int as filtered 
-    from (${q})q`
-  ).then(el => el.rows?.[0] || {});
-
-  await Promise.all(rows.map(async row => {
-    const q2 = row.table
-      ? `select count(*) from data."${row.table}" where $1=$1`
-      : `select count(*) from site.contents where $1=$1 and ${row.id === 'pages' ? `slug <> 'pages' and content_type_id in (select content_type_id from site.content_types where type = 'single' or content_type_id='pages')` : 'content_type_id=$1'}`;
-
-    const q3 = row.table
-      ? `select updated_at from data."${row.table}" where $1=$1 order by updated_at desc limit 1`
-      : `select updated_at from site.content_data where content_id in ( select content_id from site.contents where content_type_id=$1 limit 1) order by updated_at desc limit 1`;
-
-    const count = await pg.queryCache(q2, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.count || '0');
-
-    const lastEdit = await pg.queryCache(q3, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.updated_at);
-
-    Object.assign(row, { columns: undefined, fields: row.columns?.length || '0', entries: +count, last_edit: lastEdit });
-  }));
-
-  return reply.status(200).send({ total, filtered, count: rows.length, provider: 'pg', rows });
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 100;
+
+export default async function contentTypeList({ pg = pgClients.client, query = {} }, reply) {
+  if (!pg) {
+    return reply.status(200).send({ total: 0, msg: 'empty pg', rows: [] });
+  }
+
+  const limit = Math.min(maxLimit, query.limit || 16);
+  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+  const q = `select a.content_type_id as id, a.name, a.title, a.description, a.table_name as table, type, columns, a.include_search FROM site.content_types a
+  
+  where ${query.type === 'collection' ? `type='collection'` : (query.type === 'single' ? `type='single'` : '1=1')}`;
+
+  const where = query.search?.replace ? `(name ilike '%${query.search.replace(/'/, "''")}%' or title ilike '%${query.search.replace(/'/, "''")}%')` : '1=1';
+  const q1 = q + ` and ${where} order by case when status='archived' then true else false end limit ${limit} offset ${offset}`;
+
+  if (query.sql) return q1;
+
+  const { rows = [] } = await pg.query(q1);
+
+  const { total = 0, filtered = 0 } = await pg.query(`select 
+    count(*)::int as total,
+    count(*) filter (where ${where})::int as filtered 
+    from (${q})q`
+  ).then(el => el.rows?.[0] || {});
+
+  await Promise.all(rows.map(async row => {
+    const q2 = row.table
+      ? `select count(*) from data."${row.table}" where $1=$1`
+      : `select count(*) from site.contents where $1=$1 and ${row.id === 'pages' ? `slug <> 'pages' and content_type_id in (select content_type_id from site.content_types where type = 'single' or content_type_id='pages')` : 'content_type_id=$1'}`;
+
+    const q3 = row.table
+      ? `select updated_at from data."${row.table}" where $1=$1 order by updated_at desc limit 1`
+      : `select updated_at from site.content_data where content_id in ( select content_id from site.contents where content_type_id=$1 limit 1) order by updated_at desc limit 1`;
+
+    const count = await pg.queryCache(q2, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.count || '0');
+
+    const lastEdit = await pg.queryCache(q3, { table: row.table ? `data.${row.table}` : 'site.content_data', args: [row.id] }).then(el => el.rows?.[0]?.updated_at);
+
+    Object.assign(row, { columns: undefined, fields: row.columns?.length || '0', entries: +count, last_edit: lastEdit });
+  }));
+
+  return reply.status(200).send({ total, filtered, count: rows.length, provider: 'pg', rows });
+}

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

@@ -1,75 +1,75 @@
-import { dataUpdate, dataDelete, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function builderDelete({ pg = pgClients.client, user = {}, params = {} }, reply) {
-  if (!params.id) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  if (!pg?.pk?.['site.content_types']) {
-    return reply.status(404).send('table not found');
-  }
-
-  const { cid, table, title, type } = await pg.query(
-    `select content_type_id as cid, table_name as table, title, type from site.content_types where $1 in (content_type_id, name)`,
-    [params.id],
-  ).then(el => el.rows?.[0] || {});
-
-  if (!cid) {
-    return reply.status(404).send('content type not found');
-  }
-
-  if (cid === 'pages') {
-    return reply.status(403).send('access restricted: pages content type cannot be deleted');
-  }
-
-  // await pg.query('delete from site.content_data where content_id in (select content_id from site.contents where content_type_id=$1)', [cid]);
-  // await pg.query('delete from site.contents where content_type_id=$1', [cid]);
-
-  if (table) {
-    // await pg.query(`drop table if exists data."${table}"`);
-    if (pg?.pk && false) {
-      delete pg.pk[`data."${table}"`];
-      pg.tlist = pg.tlist.filter(el => el !== `data."${table}"`);
-    }
-
-    // await pg.query('delete from site.content_data where content_id in (select content_id from site.contents where content_type_id=$1)', [cid])
-
-    // await pg.query('delete from site.contents where content_type_id=$1', [cid]);
-  }
-
-  // cascade
-  const contentIds = await pg.query('select array_agg(content_id) from site.contents where content_type_id=$1 and title<>$2', [cid, title])
-    .then(el => el.rows?.[0]?.array_agg || []);
-
-  if (contentIds.length) {
-    // await pg.query('delete from site.content_data where content_id=any($1)', [contentIds]);
-  }
-
-  if (type === 'collection' && table) {
-    const count = await pg.query(`select count(*)::int from data."${table}"`).then(el => el.rows?.[0]?.count || 0);
-    if (count === 0) {
-      await pg.query('delete from site.contents where content_type_id=$1', [cid]);
-      const res = await dataDelete({
-        pg,
-        table: 'site.content_types',
-        id: cid,
-        uid: user?.uid
-      });
-      // await pg.query(`drop table if exists data."${table}"`);
-      return { id: cid, rows: [res].filter(Boolean) };
-    }
-  }
-
-  // console.log('archived', cid, contentIds);
-  const res = await dataUpdate({
-    pg,
-    table: 'site.content_types',
-    id: cid,
-    data: {
-      status: 'archived',
-    },
-    uid: user?.uid
-  });
-
-  return { id: cid, rows: [res].filter(Boolean) };
-}
+import { dataUpdate, dataDelete, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function builderDelete({ pg = pgClients.client, user = {}, params = {} }, reply) {
+  if (!params.id) {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  if (!pg?.pk?.['site.content_types']) {
+    return reply.status(404).send('table not found');
+  }
+
+  const { cid, table, title, type } = await pg.query(
+    `select content_type_id as cid, table_name as table, title, type from site.content_types where $1 in (content_type_id, name)`,
+    [params.id],
+  ).then(el => el.rows?.[0] || {});
+
+  if (!cid) {
+    return reply.status(404).send('content type not found');
+  }
+
+  if (cid === 'pages') {
+    return reply.status(403).send('access restricted: pages content type cannot be deleted');
+  }
+
+  // await pg.query('delete from site.content_data where content_id in (select content_id from site.contents where content_type_id=$1)', [cid]);
+  // await pg.query('delete from site.contents where content_type_id=$1', [cid]);
+
+  if (table) {
+    // await pg.query(`drop table if exists data."${table}"`);
+    if (pg?.pk && false) {
+      delete pg.pk[`data."${table}"`];
+      pg.tlist = pg.tlist.filter(el => el !== `data."${table}"`);
+    }
+
+    // await pg.query('delete from site.content_data where content_id in (select content_id from site.contents where content_type_id=$1)', [cid])
+
+    // await pg.query('delete from site.contents where content_type_id=$1', [cid]);
+  }
+
+  // cascade
+  const contentIds = await pg.query('select array_agg(content_id) from site.contents where content_type_id=$1 and title<>$2', [cid, title])
+    .then(el => el.rows?.[0]?.array_agg || []);
+
+  if (contentIds.length) {
+    // await pg.query('delete from site.content_data where content_id=any($1)', [contentIds]);
+  }
+
+  if (type === 'collection' && table) {
+    const count = await pg.query(`select count(*)::int from data."${table}"`).then(el => el.rows?.[0]?.count || 0);
+    if (count === 0) {
+      await pg.query('delete from site.contents where content_type_id=$1', [cid]);
+      const res = await dataDelete({
+        pg,
+        table: 'site.content_types',
+        id: cid,
+        uid: user?.uid
+      });
+      // await pg.query(`drop table if exists data."${table}"`);
+      return { id: cid, rows: [res].filter(Boolean) };
+    }
+  }
+
+  // console.log('archived', cid, contentIds);
+  const res = await dataUpdate({
+    pg,
+    table: 'site.content_types',
+    id: cid,
+    data: {
+      status: 'archived',
+    },
+    uid: user?.uid
+  });
+
+  return { id: cid, rows: [res].filter(Boolean) };
+}