@opengis/cms 0.0.56 → 0.0.58

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

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

@@ -1,49 +1,49 @@
-import { pgClients, dataInsert, config } from '@opengis/fastify-table/utils.js';
-
-const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
-
-function checkReferer(headers) {
-    if (config?.local) return true;
-    if (!headers?.referer) return false;
-    return refererAllow.some(allowed => headers.referer.includes(allowed));
-}
-
-export default async function feedback({ body = {}, pg = pgClients.client, headers, params }, reply) {
-    reply
-        .header('Access-Control-Allow-Origin', '*')
-        .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-        .header('Access-Control-Allow-Headers', 'Content-Type');
-
-    if (!checkReferer(headers)) {
-        return reply.status(403).send('access restricted');
-    }
-
-    if ((params?.type !== 'vacancy') && (!body?.message_text || !body?.email)) {
-        return reply.status(400).send('message_text and email is required');
-    }
-
-    if ((params?.type === 'vacancy') && !body?.user_name) {
-        return reply.status(400).send('user_name is required');
-    }
-
-    const allowedFields = ['title', 'message_text', 'email', 'phone', 'user_name', 'resume_link', 'linkedin_link', 'portfolio_link', 'telegram_link'];
-    const data = Object.fromEntries(
-        Object.entries(body).filter(([key]) => allowedFields.includes(key))
-    );
-    data["feedback_type"] = params?.type;
-
-    const { rows } = await dataInsert({
-        table: 'site.feedback',
-        data: {
-            ...data,
-            headers
-        },
-        pg
-    });
-
-    if (!rows?.length) {
-        return reply.status(500).send('insert error');
-    }
-
-    return reply.status(200).send('Звернення додано успішно');
+import { pgClients, dataInsert, config } from '@opengis/fastify-table/utils.js';
+
+const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
+
+function checkReferer(headers) {
+    if (config?.local) return true;
+    if (!headers?.referer) return false;
+    return refererAllow.some(allowed => headers.referer.includes(allowed));
+}
+
+export default async function feedback({ body = {}, pg = pgClients.client, headers, params }, reply) {
+    reply
+        .header('Access-Control-Allow-Origin', '*')
+        .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+        .header('Access-Control-Allow-Headers', 'Content-Type');
+
+    if (!checkReferer(headers)) {
+        return reply.status(403).send('access restricted');
+    }
+
+    if ((params?.type !== 'vacancy') && (!body?.message_text || !body?.email)) {
+        return reply.status(400).send('message_text and email is required');
+    }
+
+    if ((params?.type === 'vacancy') && !body?.user_name) {
+        return reply.status(400).send('user_name is required');
+    }
+
+    const allowedFields = ['title', 'message_text', 'email', 'phone', 'user_name', 'resume_link', 'linkedin_link', 'portfolio_link', 'telegram_link'];
+    const data = Object.fromEntries(
+        Object.entries(body).filter(([key]) => allowedFields.includes(key))
+    );
+    data["feedback_type"] = params?.type;
+
+    const { rows } = await dataInsert({
+        table: 'site.feedback',
+        data: {
+            ...data,
+            headers
+        },
+        pg
+    });
+
+    if (!rows?.length) {
+        return reply.status(500).send('insert error');
+    }
+
+    return reply.status(200).send('Звернення додано успішно');
 }

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

@@ -1,38 +1,38 @@
-import { getFilterSQL } from '@opengis/fastify-table/utils.js';
-
-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, filter = null } = query;
-    const offset = limit * (page - 1) || 0;
-
-    const { q: filterQuery } = await getFilterSQL({
-        filter, table: 'site.feedback'
-    });
-
-    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from site.feedback`)
-
-    const { rows = [] } = await pg.query(`
-        select 
-            row_number() over(order by created_at desc) as num,
-            email,
-            message_id,
-            user_name,
-            message_text,
-            feedback_type,
-            phone,
-            created_at,
-            linkedin_link,
-            portfolio_link,
-            telegram_link
-        from site.feedback
-        where created_at is not null ${filterQuery ? `and ${filterQuery}` : ''}
-        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 })
+import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+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, filter = null } = query;
+    const offset = limit * (page - 1) || 0;
+
+    const { q: filterQuery } = await getFilterSQL({
+        filter, table: 'site.feedback'
+    });
+
+    const { total, filtered } = await pg.one(`select count(*)::int as total, (count(*) filter(where ${filterQuery ? `${filterQuery}` : '1=1'}))::int as  filtered from site.feedback`)
+
+    const { rows = [] } = await pg.query(`
+        select 
+            row_number() over(order by created_at desc) as num,
+            email,
+            message_id,
+            user_name,
+            message_text,
+            feedback_type,
+            phone,
+            created_at,
+            linkedin_link,
+            portfolio_link,
+            telegram_link
+        from site.feedback
+        where created_at is not null ${filterQuery ? `and ${filterQuery}` : ''}
+        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 })
 }

package/server/routes/feedback/controllers/news.subscriptions.js

@@ -1,44 +1,44 @@
-import { pgClients, config } from '@opengis/fastify-table/utils.js';
-
-const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
-
-function checkReferer(headers) {
-  if (config?.local) return true;
-  if (!headers?.referer) return false;
-  return refererAllow.some(allowed => headers.referer.includes(allowed));
-}
-
-export default async function subscribeToNews({
-  body = {},
-  pg = pgClients.client,
-  headers
-}, reply) {
-  reply
-    .header('Access-Control-Allow-Origin', '*')
-    .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-    .header('Access-Control-Allow-Headers', 'Content-Type');
-
-  if (!checkReferer(headers)) {
-    return reply.status(403).send('access restricted');
-  }
-
-  const { email } = body;
-  if (!email) return reply.status(400).send('email is required');
-
-  const { rows: subscriptions } = await pg.query(`
-    SELECT subscription_id
-    FROM site.subscription
-    WHERE email = $1
-    LIMIT 1
-  `, [email]);
-
-  if (subscriptions?.length === 0) {
-    await pg.query(`
-      INSERT INTO site.subscription (email)
-      VALUES ($1)
-    `, [email]);
-
-  } 
-
-  return reply.status(200).send('Успішно');
-}
+import { pgClients, config } from '@opengis/fastify-table/utils.js';
+
+const refererAllow = config?.refererAllow || ['127.0.0.1', 'localhost', 'softpro.ua', 'opengis.info'];
+
+function checkReferer(headers) {
+  if (config?.local) return true;
+  if (!headers?.referer) return false;
+  return refererAllow.some(allowed => headers.referer.includes(allowed));
+}
+
+export default async function subscribeToNews({
+  body = {},
+  pg = pgClients.client,
+  headers
+}, reply) {
+  reply
+    .header('Access-Control-Allow-Origin', '*')
+    .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+    .header('Access-Control-Allow-Headers', 'Content-Type');
+
+  if (!checkReferer(headers)) {
+    return reply.status(403).send('access restricted');
+  }
+
+  const { email } = body;
+  if (!email) return reply.status(400).send('email is required');
+
+  const { rows: subscriptions } = await pg.query(`
+    SELECT subscription_id
+    FROM site.subscription
+    WHERE email = $1
+    LIMIT 1
+  `, [email]);
+
+  if (subscriptions?.length === 0) {
+    await pg.query(`
+      INSERT INTO site.subscription (email)
+      VALUES ($1)
+    `, [email]);
+
+  } 
+
+  return reply.status(200).send('Успішно');
+}

package/server/routes/feedback/index.mjs

@@ -1,72 +1,72 @@
-import feedback from './controllers/feedback.js';
-import newsSubs from './controllers/news.subscriptions.js';
-import feedbackList from './controllers/feedback.list.js';
-import emailList from './controllers/email.list.js';
-
-export default async function route(fastify) {
-    fastify.route({
-        method: 'POST',
-        url: '/cms-feedback/:type',
-        handler: feedback,
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'GET',
-        url: '/feedback',
-        handler: feedbackList,
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'GET',
-        url: '/email-list',
-        handler: emailList,
-        config: {
-            policy: ['public'],
-        },
-    });
-    
-    fastify.route({
-        method: 'OPTIONS',
-        url: '/cms-feedback/:type',
-        handler: (req, reply) => {
-            reply
-                .header('Access-Control-Allow-Origin', '*')
-                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-                .header('Access-Control-Allow-Headers', 'Content-Type')
-                .send();
-        },
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'POST',
-        url: '/cms-subscribtion',
-        handler: newsSubs,
-        config: {
-            policy: ['public'],
-        },
-    });
-
-    fastify.route({
-        method: 'OPTIONS',
-        url: '/cms-subscribtion',
-        handler: (req, reply) => {
-            reply
-                .header('Access-Control-Allow-Origin', '*')
-                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
-                .header('Access-Control-Allow-Headers', 'Content-Type')
-                .send();
-        },
-        config: {
-            policy: ['public'],
-        },
-    });
+import feedback from './controllers/feedback.js';
+import newsSubs from './controllers/news.subscriptions.js';
+import feedbackList from './controllers/feedback.list.js';
+import emailList from './controllers/email.list.js';
+
+export default async function route(fastify) {
+    fastify.route({
+        method: 'POST',
+        url: '/cms-feedback/:type',
+        handler: feedback,
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'GET',
+        url: '/feedback',
+        handler: feedbackList,
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'GET',
+        url: '/email-list',
+        handler: emailList,
+        config: {
+            policy: ['public'],
+        },
+    });
+    
+    fastify.route({
+        method: 'OPTIONS',
+        url: '/cms-feedback/:type',
+        handler: (req, reply) => {
+            reply
+                .header('Access-Control-Allow-Origin', '*')
+                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+                .header('Access-Control-Allow-Headers', 'Content-Type')
+                .send();
+        },
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'POST',
+        url: '/cms-subscribtion',
+        handler: newsSubs,
+        config: {
+            policy: ['public'],
+        },
+    });
+
+    fastify.route({
+        method: 'OPTIONS',
+        url: '/cms-subscribtion',
+        handler: (req, reply) => {
+            reply
+                .header('Access-Control-Allow-Origin', '*')
+                .header('Access-Control-Allow-Methods', 'POST, OPTIONS')
+                .header('Access-Control-Allow-Headers', 'Content-Type')
+                .send();
+        },
+        config: {
+            policy: ['public'],
+        },
+    });
 }