@opengis/cms 0.0.60 → 0.0.62

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

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

@@ -1,88 +1,70 @@
-import { dataInsert, dataUpdate, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
-
-import updateCustomContentTable from '../utils/updateCustomContentTable.js';
-import updateContents from '../utils/updateContents.js';
-
-export default async function builderPut(req, reply) {
-  const { pg = pgClients.client, body = {}, params = {}, user = {} } = req;
-  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 single = await pg.query(
-    `select content_id as id, content_type_id, slug FROM site.contents
-   where $1 in (content_id, content_type_id, slug)`, [params.id]
-  ).then(el => el.rows?.[0]);
-
-  const customCtExists = await pg.query(
-    `select 1 FROM site.content_types
-   where content_type_id=$1`, [params.id]
-  ).then(el => el.rowCount || 0);
-
-  const { cid, table } = await pg.query(
-    `select content_type_id as cid, table_name as table, type from site.content_types where $1 in (content_type_id, name)`,
-    [params.id],
-  ).then(el => el.rows?.[0] || {});
-
-  if (!cid && !single) {
-    return reply.status(404).send('content type not found');
-  }
-
-  const columns = (body.fields || body.columns)?.filter?.(el => el.name)?.map?.(el => Object.assign(el, { name: el.name.toLowerCase() })); // for rest crud
-
-  const client = await pg.connect();
-
-  client.options = pg.options;
-  client.tlist = pg.tlist;
-  client.pgType = pg.pgType;
-  client.relkinds = pg.relkinds;
-  client.pk = pg.pk;
-
-  try {
-    await client.query('begin');
-
-    const cid1 = cid || single?.content_type_id;
-
-    if (table) {
-      await updateCustomContentTable({ pg: client, id: cid1, columns });
-    }
-
-    const name = body.name === 'pages' ? (single?.slug || params.id) : (body.name || body.slug);
-
-    // insert new, 
-    if (single && !customCtExists && (single?.content_type_id === 'pages' || single?.content_type_id === params.id)) {
-      // const loadTable = await getTemplate('table', 'single.default.table');
-      // const { columns: defaultColumns } = loadTable || {};
-      await dataInsert({
-        pg,
-        table: 'site.content_types',
-        id: params.id,
-        data: { ...body, type: 'single', name /*, columns: defaultColumns */ },
-        uid: user?.uid,
-      });
-    } else {
-      await dataUpdate({
-        pg: client,
-        table: 'site.content_types',
-        id: cid1,
-        data: { ...body, content_type_id: cid1, name },
-        uid: user?.uid,
-      });
-    }
-
-    const row = await updateContents(client, cid1, { ...body, slug: name }, user?.uid);
-
-    await client.query('commit');
-
-    return { id: row?.content_type_id, rows: [row].filter(Boolean) };
-  } catch (err) {
-    await client.query('rollback');
-    throw err;
-  } finally {
-    client.release();
-  }
-}
+import { dataInsert, dataUpdate, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
+
+import updateCustomContentTable from '../utils/updateCustomContentTable.js';
+import updateContents from '../utils/updateContents.js';
+
+export default async function builderPut(req, reply) {
+  const { pg = pgClients.client, body = {}, params = {}, user = {} } = req;
+  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 single = await pg.query(
+    `select content_id as id, content_type_id, slug FROM site.contents
+   where $1 in (content_id, content_type_id, slug)`, [params.id]
+  ).then(el => el.rows?.[0]);
+
+  const { cid, table } = await pg.query(
+    `select content_type_id as cid, table_name as table, type from site.content_types where $1 in (content_type_id, name)`,
+    [params.id],
+  ).then(el => el.rows?.[0] || {});
+
+  if (!cid && !single) {
+    return reply.status(404).send('content type not found');
+  }
+
+  const columns = (body.fields || body.columns)?.filter?.(el => el.name)?.map?.(el => Object.assign(el, { name: el.name.toLowerCase() })); // for rest crud
+
+  const client = await pg.connect();
+
+  client.options = pg.options;
+  client.tlist = pg.tlist;
+  client.pgType = pg.pgType;
+  client.relkinds = pg.relkinds;
+  client.pk = pg.pk;
+
+  try {
+    await client.query('begin');
+
+    const cid1 = cid || single?.content_type_id;
+
+    if (table) {
+      await updateCustomContentTable({ pg: client, id: cid1, columns });
+    }
+
+    const name = body.name === 'pages' ? (single?.slug || params.id) : (body.name || body.slug);
+
+    await dataUpdate({
+      pg: client,
+      table: 'site.content_types',
+      id: cid1,
+      data: { ...body, content_type_id: cid1, name },
+      uid: user?.uid,
+    });
+
+    const row = await updateContents(client, cid1, { ...body, slug: name }, user?.uid);
+
+    await client.query('commit');
+
+    return { id: row?.content_type_id, rows: [row].filter(Boolean) };
+  } catch (err) {
+    await client.query('rollback');
+    throw err;
+  } finally {
+    client.release();
+  }
+}

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

@@ -1,65 +1,57 @@
-import { pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function builderGet({ pg = pgClients.client, 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 single = await pg.query(
-    `select content_id as id, * FROM site.contents
-   where $1 in (content_id, content_type_id, slug)`, [params.id]
-  ).then(el => el.rows?.[0]);
-
-  // new ? 1 : 2
-  const isNew = single && single.content_type_id === params.id;
-  const row = isNew
-    ? await pg.query(
-      `select content_type_id as id, * FROM site.content_types
-   where $1 in (content_type_id, name)`, [params.id]
-    ).then(el => el.rows?.[0])
-    : await pg.query(`SELECT content_type_id as id, * FROM site.content_types WHERE content_type_id in (select content_type_id from site.contents where content_id=$1) limit 1`, [params.id]).then(el => el.rows?.[0]);
-
-  if (!isNew && single.content_type_id === 'pages') {
-    Object.assign(row, { id: params.id, type: 'single', title: single.title || params.id, content_type_id: params.id, name: single.slug || params.id });
-  }
-
-  if (single && !row) {
-    const loadTable = await getTemplate('table', 'single.default.table');
-    const { columns: defaultColumns } = loadTable || {};
-    (defaultColumns || []).forEach(col => Object.assign(col, { default: true }));
-    const columns = (defaultColumns || []).filter(col => !col.hidden);
-    return reply.status(200).send({ default: true, id: single.id, name: single.slug, type: 'single', ...single, columns });
-  }
-
-  if (!row) {
-    return reply.status(404).send('content type not found');
-  }
-
-  const space = await pg.query(
-    'select name, default_locale, locales from site.spaces where space_id = $1', ['default'],
-  ).then(el => el.rows?.[0] || {});
-  Object.assign(row, { space });
-
-  // const loadTable = params.id === 'pages' ? await getTemplate('table', 'single.default.table') : {};
-  // const columns = params.id === 'pages' ? loadTable?.columns : row.columns;
-
-  const loadTable = params.id === 'pages'
-    ? await getTemplate('table', 'single.default.table')
-    : await getTemplate('table', 'collection.default.table');
-  const { columns: defaultColumns = [] } = loadTable || {};
-  defaultColumns.forEach(col => Object.assign(col, { default: true }));
-  const columns = (defaultColumns || []).concat((row.columns || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name)));
-
-  Object.assign(row, { columns });
-
-  // filter system / hidden
-  if (Array.isArray(row.columns)) {
-    row.columns.filter(col => !col.hidden);
-  }
-
-  return reply.status(200).send(row);
-}
+import { pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function builderGet({ pg = pgClients.client, params = {} }, reply) {
+  if (!params.id) {
+    return reply.status(400).send({ error: 'not enough params: id', code: 400 });
+  }
+
+  if (!pg?.pk?.['site.content_types']) {
+    return reply.status(404).send({ error: 'table not found', code: 404 });
+  }
+
+  const single = await pg.query(
+    `select content_id as id, * FROM site.contents
+   where $1 in (content_id, content_type_id, slug)`, [params.id]
+  ).then(el => el.rows?.[0]);
+
+  // new ? 1 : 2
+  const isNew = single && single.content_type_id === params.id;
+  const row = isNew
+    ? await pg.query(
+      `select content_type_id as id, * FROM site.content_types
+   where $1 in (content_type_id, name)`, [params.id]
+    ).then(el => el.rows?.[0])
+    : await pg.query(`SELECT content_type_id as id, * FROM site.content_types WHERE content_type_id in (select content_type_id from site.contents where content_id=$1) limit 1`, [params.id]).then(el => el.rows?.[0]);
+
+  if (!isNew && single.content_type_id === 'pages') {
+    Object.assign(row, { id: params.id, type: 'single', title: single.title || params.id, content_type_id: params.id, name: single.slug || params.id });
+  }
+
+  if (single && !row) {
+    const loadTable = await getTemplate('table', 'single.default.table');
+    const { columns: defaultColumns } = loadTable || {};
+    (defaultColumns || []).forEach(col => Object.assign(col, { defaultColumn: true }));
+    const columns = (defaultColumns || []).filter(col => !col.hidden);
+    return reply.status(200).send({ default: true, id: single.id, name: single.slug, type: 'single', ...single, columns });
+  }
+
+  if (!row) {
+    return reply.status(404).send({ error: 'content type not found', code: 404 });
+  }
+
+  const loadTable = params.id === 'pages'
+    ? await getTemplate('table', 'single.default.table')
+    : await getTemplate('table', 'collection.default.table');
+  const { columns: defaultColumns = [] } = loadTable || {};
+  defaultColumns.forEach(col => Object.assign(col, { defaultColumn: true }));
+  const columns = (defaultColumns || []).concat((row.columns || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name)));
+
+  Object.assign(row, { columns });
+
+  // filter system / hidden
+  if (Array.isArray(row.columns)) {
+    row.columns.filter(col => !col.hidden);
+  }
+
+  return reply.status(200).send(row);
+}

package/server/routes/contentType/index.mjs

@@ -1,35 +1,35 @@
-import getContentType from './controllers/getContentType.js';
-import contentTypeList from './controllers/contentTypeList.js';
-import editContentType from './controllers/editContentType.js';
-import addContentType from './controllers/addContentType.js';
-import delContentType from './controllers/delContentType.js';
-
-const params = { config: { policy: ['public'] } };
-
-export default async function route(app) {
-  const schema = {
-    params: {
-      type: 'object',
-      properties: {
-        id: {
-          type: 'string'
-        },
-      },
-    },
-    body: {
-      type: 'object',
-      required: ['name'],
-      properties: {
-        name: { type: 'string' }
-      }
-    }
-  };
-
-  app.get('/cms', params, contentTypeList);
-  app.get('/cms-type', params, contentTypeList);
-
-  app.post('/cms-type', { ...params, schema }, addContentType);
-  app.put('/cms-type/:id', { ...params, schema }, editContentType);
-  app.get('/cms-type/:id', params, getContentType);
-  app.delete('/cms-type/:id', params, delContentType);
-}
+import getContentType from './controllers/getContentType.js';
+import contentTypeList from './controllers/contentTypeList.js';
+import editContentType from './controllers/editContentType.js';
+import addContentType from './controllers/addContentType.js';
+import delContentType from './controllers/delContentType.js';
+
+const params = { config: { policy: ['public'] } };
+
+export default async function route(app) {
+  const schema = {
+    params: {
+      type: 'object',
+      properties: {
+        id: {
+          type: 'string'
+        },
+      },
+    },
+    body: {
+      type: 'object',
+      required: ['name'],
+      properties: {
+        name: { type: 'string' }
+      }
+    }
+  };
+
+  app.get('/cms', params, contentTypeList);
+  app.get('/cms-type', params, contentTypeList);
+
+  app.post('/cms-type', { ...params, schema }, addContentType);
+  app.put('/cms-type/:id', { ...params, schema }, editContentType);
+  app.get('/cms-type/:id', params, getContentType);
+  app.delete('/cms-type/:id', params, delContentType);
+}

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

@@ -1,45 +1,45 @@
-import { dataInsert, dataUpdate } from "@opengis/fastify-table/utils.js";
-
-export default async function updateContents(pg, id, data, uid) {
-    if (!pg?.pk || !id) return null;
-
-    const single = await pg.query(
-        `select 1 from site.contents where content_id=$1`,
-        [id],
-    ).then(el => el.rowCount || 0);
-
-    if (single) {
-        const result = await dataUpdate({
-            pg,
-            table: 'site.contents',
-            id,
-            data,
-            uid,
-        });
-        return result;
-    }
-
-    const contentId = await pg.query(
-        `select content_id from site.contents where content_type_id = $1 order by content_id=content_type_id desc limit 1`, // update pages collection, avoid singles
-        [id],
-    ).then(el => el.rows?.[0]?.content_id);
-
-    if (contentId) {
-        const result = await dataUpdate({
-            pg,
-            id: data?.type === 'single' ? id : contentId,
-            table: 'site.contents',
-            data,
-            uid,
-        });
-        return result;
-    }
-
-    const result = await dataInsert({
-        pg,
-        table: 'site.contents',
-        data: { ...data || {}, content_type_id: id },
-        uid,
-    }).then(el => el.rows?.[0]);
-    return result;
+import { dataInsert, dataUpdate } from "@opengis/fastify-table/utils.js";
+
+export default async function updateContents(pg, id, data, uid) {
+    if (!pg?.pk || !id) return null;
+
+    const single = await pg.query(
+        `select 1 from site.contents where content_id=$1`,
+        [id],
+    ).then(el => el.rowCount || 0);
+
+    if (single) {
+        const result = await dataUpdate({
+            pg,
+            table: 'site.contents',
+            id,
+            data,
+            uid,
+        });
+        return result;
+    }
+
+    const contentId = await pg.query(
+        `select content_id from site.contents where content_type_id = $1 order by content_id=content_type_id desc limit 1`, // update pages collection, avoid singles
+        [id],
+    ).then(el => el.rows?.[0]?.content_id);
+
+    if (contentId) {
+        const result = await dataUpdate({
+            pg,
+            id: data?.type === 'single' ? id : contentId,
+            table: 'site.contents',
+            data,
+            uid,
+        });
+        return result;
+    }
+
+    const result = await dataInsert({
+        pg,
+        table: 'site.contents',
+        data: { ...data || {}, content_type_id: id },
+        uid,
+    }).then(el => el.rows?.[0]);
+    return result;
 }