@opengis/cms 0.0.61 → 0.0.62

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

@@ -1,70 +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 { 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();
-  }
-}
+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,57 +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({ 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);
-}
+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;
 }

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

@@ -1,54 +1,54 @@
-import { getMeta } from '@opengis/fastify-table/utils.js';
-
-import inputTypes from '../../cms/utils/inputTypes.js';
-
-const types = {
-    number: 'numeric',
-    datetime: 'timestamp without time zone',
-    boolean: 'boolean',
-    date: 'date',
-    array: 'text[]',
-    FileList: 'text[]',
-};
-
-export default async function updateCustomContentTable({ pg, id, columns = [] }) {
-    if (!pg?.pk || !id) return null;
-
-    const { table_name: tablename, dbcolumns } = await pg.query(
-        `select table_name, columns as dbcolumns from site.content_types where content_type_id = $1`,
-        [id],
-    ).then(el => el.rows?.[0] || {});
-
-    if (!tablename) return null;
-
-    const droppedColumns = (dbcolumns || []).filter(el => columns.findIndex(col => col.name === el.name) === -1);
-    // console.log(droppedColumns);
-
-    const q = `create table if not exists data."${tablename}" 
-    ( id text not null default next_id() PRIMARY KEY );
-     ${droppedColumns.map(col => `
-        alter table data."${tablename}" add column if not exists "${col.name}" text;
-        alter table data."${tablename}" alter column "${col.name}" drop not null;`).join('\n')}
-     ${columns?.filter?.(col => col.name)?.map?.(col => `
-        alter table data."${tablename}" add column if not exists "${col.name}" ${types[col.type] || inputTypes[col.type] || 'text'} ${col.required ? ' not null ' : ''};
-        alter table data."${tablename}" alter column "${col.name}" ${col.required ? ' set ' : ' drop '}  not null;
-        alter table data."${tablename}" alter column "${col.name}" set default ${col.default ? col.default : 'null'};
-        comment on column data."${tablename}"."${col.name}" is ${col.label ? `'${col.label.replace(/'/g, "''")}'` : 'null'} `
-    ).join(';') || ''}`;
-    await pg.query(q);
-    await pg.query(`alter table data."${tablename}" add column if not exists created_at timestamp with time zone not null default now()`);
-    await pg.query(`alter table data."${tablename}" add column if not exists updated_at timestamp with time zone not null default now()`);
-    await pg.query(`alter table data."${tablename}" add column if not exists created_by text`);
-    await pg.query(`alter table data."${tablename}" add column if not exists updated_by text`);
-    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
-    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}`);
-    // }
-
-    return null;
+import { getMeta } from '@opengis/fastify-table/utils.js';
+
+import inputTypes from '../../cms/utils/inputTypes.js';
+
+const types = {
+    number: 'numeric',
+    datetime: 'timestamp without time zone',
+    boolean: 'boolean',
+    date: 'date',
+    array: 'text[]',
+    FileList: 'text[]',
+};
+
+export default async function updateCustomContentTable({ pg, id, columns = [] }) {
+    if (!pg?.pk || !id) return null;
+
+    const { table_name: tablename, dbcolumns } = await pg.query(
+        `select table_name, columns as dbcolumns from site.content_types where content_type_id = $1`,
+        [id],
+    ).then(el => el.rows?.[0] || {});
+
+    if (!tablename) return null;
+
+    const droppedColumns = (dbcolumns || []).filter(el => columns.findIndex(col => col.name === el.name) === -1);
+    // console.log(droppedColumns);
+
+    const q = `create table if not exists data."${tablename}" 
+    ( id text not null default next_id() PRIMARY KEY );
+     ${droppedColumns.map(col => `
+        alter table data."${tablename}" add column if not exists "${col.name}" text;
+        alter table data."${tablename}" alter column "${col.name}" drop not null;`).join('\n')}
+     ${columns?.filter?.(col => col.name)?.map?.(col => `
+        alter table data."${tablename}" add column if not exists "${col.name}" ${types[col.type] || inputTypes[col.type] || 'text'} ${col.required ? ' not null ' : ''};
+        alter table data."${tablename}" alter column "${col.name}" ${col.required ? ' set ' : ' drop '}  not null;
+        alter table data."${tablename}" alter column "${col.name}" set default ${col.default ? col.default : 'null'};
+        comment on column data."${tablename}"."${col.name}" is ${col.label ? `'${col.label.replace(/'/g, "''")}'` : 'null'} `
+    ).join(';') || ''}`;
+    await pg.query(q);
+    await pg.query(`alter table data."${tablename}" add column if not exists created_at timestamp with time zone not null default now()`);
+    await pg.query(`alter table data."${tablename}" add column if not exists updated_at timestamp with time zone not null default now()`);
+    await pg.query(`alter table data."${tablename}" add column if not exists created_by text`);
+    await pg.query(`alter table data."${tablename}" add column if not exists updated_by text`);
+    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
+    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}`);
+    // }
+
+    return null;
 }

package/server/routes/feedback/controllers/email.list.js

@@ -1,25 +1,25 @@
-export default async function feedbackList(req, reply) {
-    const { pg, user = {}, query } = req;
-    const { uid } = user;
-    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
-
-    const { page = 1, limit = 16 } = query;
-    const offset = limit * (page - 1) || 0;
-
-    const { total, filtered } = await pg.one(`select count(*)::int as total from site.feedback`)
-
-    const { rows = [] } = await pg.query(`
-        select 
-            row_number() over(order by created_at desc) as num,
-            subscription_id,
-            email,
-            created_at,
-            enabled
-        from site.subscription
-        order by created_at desc
-        limit ${limit} offset ${offset}
-        `);
-
-    const status = rows?.length ? 200 : 204;
-    return reply.code(status).send({ message: { total, filtered, rows }, status })
+export default async function feedbackList(req, reply) {
+    const { pg, user = {}, query } = req;
+    const { uid } = user;
+    if (!uid) return reply.code(401).send({ message: 'Not authorized', status: 401 });
+
+    const { page = 1, limit = 16 } = query;
+    const offset = limit * (page - 1) || 0;
+
+    const { total, filtered } = await pg.one(`select count(*)::int as total from site.feedback`)
+
+    const { rows = [] } = await pg.query(`
+        select 
+            row_number() over(order by created_at desc) as num,
+            subscription_id,
+            email,
+            created_at,
+            enabled
+        from site.subscription
+        order by created_at desc
+        limit ${limit} offset ${offset}
+        `);
+
+    const status = rows?.length ? 200 : 204;
+    return reply.code(status).send({ message: { total, filtered, rows }, status })
 }