@opengis/cms 0.0.56 → 0.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@fastify/compress": "^8.1.0",
     "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.143",
+    "@opengis/fastify-table": "^2.0.147",
     "@opengis/filter": "^0.1.31",
     "@opengis/form": "^0.0.109",
     "@opengis/richtext": "0.0.45",

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

@@ -65,7 +65,7 @@ export default async function getContent(req, reply, opt) {
     }
 
     const { contentId, contentTypeId, meta } = params.type === 'pages'
-        ? { contentId: params.id || 'pages', contentTypeId: params.id || 'pages', meta: null }
+        ? await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where content_id=$1`, [params.type]).then(el => el.rows?.[0] || {})
         : await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where $1 in (slug, content_id, content_type_id)`, [params.type]).then(el => el.rows?.[0] || {});
 
     if (!contentId) {
@@ -77,7 +77,7 @@ export default async function getContent(req, reply, opt) {
         [contentTypeId],
     ).then(el => el.rows?.[0] || {});
 
-    if (!contentType) {
+    if (!contentType && params.type !== 'pages') {
         return reply.status(404).send('content type not found');
     }
 
@@ -97,7 +97,7 @@ export default async function getContent(req, reply, opt) {
             fields, defaultFields, defaultFilters, called,
         }, reply, pg)
         : await getSingle({
-            contentId, id, limit, maxLimit, tags, search, filter, locale, statusQuery, user, sql, page, defaultColumns, fields, defaultFields, defaultFilters,
+            contentId, contentTypeId, id, limit, maxLimit, tags, search, filter, locale, statusQuery, user, sql, page, defaultColumns, fields, defaultFields, defaultFilters,
         }, pg);
 
     if (!result) {

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

@@ -65,7 +65,7 @@ export default async function insertContent(req, reply) {
     const loadTable = (ctypeId || type) === 'pages' ? await getTemplate('table', 'single.default.table') : {};
 
     const columns = (ctypeId || type) === 'pages'
-        ? (loadTable?.columns || []).concat(contentColumns.filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1))
+        ? (loadTable?.columns || []).concat((contentColumns || []).filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1))
         : contentColumns;
 
     // site.content_data, includes singletone

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

@@ -60,7 +60,7 @@ export default async function updateContent(req, reply) {
 
     const loadTable = type === 'pages' ? await getTemplate('table', 'single.default.table') : {};
     const columns = type === 'pages'
-        ? (loadTable?.columns || []).concat(contentColumns.filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1))
+        ? (loadTable?.columns || []).concat((contentColumns || []).filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1))
         : contentColumns;
 
     // const xss = checkXSS({ body });
@@ -121,9 +121,9 @@ export default async function updateContent(req, reply) {
         }
 
         const single = await pg.query(
-            `select 1 FROM site.contents
+            `select content_id, content_type_id, slug FROM site.contents
            where content_id=$1`, [params.id]
-        ).then(el => el.rowCount || 0);
+        ).then(el => el.rows?.[0]);
 
         const customCtExists = await pg.query(
             `select 1 FROM site.content_types
@@ -137,12 +137,14 @@ export default async function updateContent(req, reply) {
 
             const res = {};
 
-            if (single && !customCtExists) {
+            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 || {};
                 const res1 = await dataInsert({
                     pg: client,
                     table: 'site.content_types',
                     id: params.id,
-                    data: body,
+                    data: { ...body, type: 'single', name: body.name === 'pages' ? (single.slug || params.id) : (body.name || body.slug) /*, columns: defaultColumns*/ },
                     uid: user?.uid,
                 });
                 Object.assign(res, res1);

package/server/routes/cms/utils/getSingle.js

@@ -6,14 +6,19 @@ import inputTypes from '../utils/inputTypes.js';
 import additionalData from "./additionalData.js";
 
 export default async function getSingle({
-    contentId: contentId1, id: id1, limit: queryLimit, maxLimit, search, filter, locale, statusQuery, user, sql, page, defaultColumns = [], fields, defaultFields = [], defaultFilters = [],
+    contentId: contentId1, contentTypeId, id: id1, limit: queryLimit, maxLimit, search, filter, locale, statusQuery, user, sql, page, defaultColumns = [], fields, defaultFields = [], defaultFilters = [],
 }, pg = pgClients.client) {
     const id = id1 || (contentId1 === 'pages' ? undefined : contentId1) || '';
     const contentId = id1 ? contentId1 : "pages";
 
-    const customColumns = await pg.query(
-        `select columns FROM site.content_types where content_type_id=$1`, [id || contentId]
-    ).then(el => el.rows?.[0]?.columns || []);
+    // new ? 1 : 2
+    const customColumns = contentTypeId === (id || contentId)
+        ? await pg.query(
+            `SELECT columns FROM site.content_types WHERE content_type_id=$1`, [id || contentId]
+        ).then(el => el.rows?.[0]?.columns || [])
+        : await pg.query(`
+        SELECT columns FROM site.content_types WHERE content_type_id in (select content_type_id from site.contents where content_id=$1) limit 1
+    `, [id || contentId]).then(el => el.rows?.[0]?.columns || []);
 
     const contentQuery = contentId === 'pages' || !id
         ? `(type = 'single' or content_type_id = 'pages')`
@@ -168,7 +173,7 @@ export default async function getSingle({
     });
 
     // temporary solution, before front makes changes to call by id, not type
-    rows1.forEach(row => Object.assign(row, { content_type_id: row.content_id }));
+    rows1.forEach(row => Object.assign(row, { content_type_id: !row.content_type_id || row.content_type_id === 'pages' ? row.content_id : row.content_type_id }));
 
     return {
         locales,

package/server/routes/cms/utils/updateLocalization.js

@@ -12,7 +12,7 @@ export default async function updateLocalization(pg, id, body, contentTypeId, ui
         ? await getTemplate('table', 'single.default.table')
         : await getTemplate('table', 'collection.default.table');
 
-    const columns = (loadTable?.columns || []).concat(contentColumns.filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1));
+    const columns = (loadTable?.columns || []).concat((contentColumns || []).filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1));
 
     const locales = await pg.query('select locales from site.spaces where space_id = $1 limit 1', ['default']).then(el => el.rows?.[0]?.locales || []);
 

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

@@ -1,4 +1,4 @@
-import { dataInsert, dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
+import { dataInsert, dataUpdate, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
 
 import updateCustomContentTable from '../utils/updateCustomContentTable.js';
 import updateContents from '../utils/updateContents.js';
@@ -14,8 +14,8 @@ export default async function builderPut(req, reply) {
   }
 
   const single = await pg.query(
-    `select content_id as id FROM site.contents
-   where $1 in (content_id, slug)`, [params.id]
+    `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(
@@ -45,29 +45,36 @@ export default async function builderPut(req, reply) {
   try {
     await client.query('begin');
 
+    const cid1 = cid || single?.content_type_id;
+
     if (table) {
-      await updateCustomContentTable({ pg: client, id: cid, columns });
+      await updateCustomContentTable({ pg: client, id: cid1, columns });
     }
 
-    if (single && !customCtExists) {
+    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,
+        data: { ...body, type: 'single', name /*, columns: defaultColumns */ },
         uid: user?.uid,
       });
     } else {
       await dataUpdate({
         pg: client,
         table: 'site.content_types',
-        id: cid,
-        data: body,
+        id: cid1,
+        data: { ...body, content_type_id: cid1, name },
         uid: user?.uid,
       });
     }
 
-    const row = await updateContents(client, cid, { ...body, slug: body.slug || body.name }, user?.uid);
+    const row = await updateContents(client, cid1, { ...body, slug: name }, user?.uid);
 
     await client.query('commit');
 

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

@@ -11,13 +11,21 @@ export default async function builderGet({ pg = pgClients.client, params = {} },
 
   const single = await pg.query(
     `select content_id as id, * FROM site.contents
-   where $1 in (content_id, slug)`, [params.id]
+   where $1 in (content_id, content_type_id, slug)`, [params.id]
   ).then(el => el.rows?.[0]);
 
-  const row = await pg.query(
-    `select content_type_id as id, * FROM site.content_types
+  // 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]);
+    ).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');
@@ -44,7 +52,7 @@ export default async function builderGet({ pg = pgClients.client, params = {} },
     : 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)));
+  const columns = (defaultColumns || []).concat((row.columns || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name)));
 
   Object.assign(row, { columns });
 

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

@@ -3,32 +3,32 @@ 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 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
+    const single = await pg.query(
+        `select 1 from site.contents where content_id=$1`,
         [id],
-    ).then(el => el.rows?.[0]?.content_id);
+    ).then(el => el.rowCount || 0);
 
-    if (contentId) {
+    if (single) {
         const result = await dataUpdate({
             pg,
-            id: contentId,
             table: 'site.contents',
+            id,
             data,
             uid,
         });
         return result;
     }
 
-    const single = await pg.query(
-        `select content_id from site.contents where content_id=$1`,
+    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.rowCount || 0);
+    ).then(el => el.rows?.[0]?.content_id);
 
-    if (single) {
+    if (contentId) {
         const result = await dataUpdate({
             pg,
+            id: data?.type === 'single' ? id : contentId,
             table: 'site.contents',
-            id,
             data,
             uid,
         });