@opengis/cms 0.0.44 → 0.0.46

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

@@ -1,83 +1,83 @@
-import { pgClients, getData, getMeta } from "@opengis/fastify-table/utils.js";
-
-import additionalData from "./additionalData.js";
-
-export default async function getCollection({
-    table, id, limit, maxLimit, order, search, tags, filter, state, page, desc, sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns, fields, defaultFields = [], defaultFilters = []
-}, reply, pg = pgClients.client) {
-    if (!table || !pg.pk?.['data.' + table]) {
-        return { message: 'content table not found', status: 404 };
-    }
-
-    const isPinExists = await pg.query(`
-        SELECT 1
-        FROM pg_catalog.pg_attribute a
-        JOIN pg_catalog.pg_class c ON a.attrelid = c.oid
-        JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid
-        WHERE n.nspname = 'data'
-        AND c.relname = $1
-        AND a.attname = 'is_pin'
-        AND a.attnum > 0
-        AND NOT a.attisdropped;
-    `, [table]).then(el => el.rowCount);
-
-    const defaultOrder = `case when status='archived' then true else false end ${isPinExists ? ', is_pin desc' : ''}, published_at desc nulls last`;
-
-    const localeQuery = locale && locale !== 'uk' ? `id in ( select object_id from site.localization where REVERSE(split_part(REVERSE(field_key), ':', 1)) = '${locale.replace(/'/g, "''")}' )` : undefined;
-    const tagQuery = tags ? `id in (SELECT data_id FROM site.tag_data td left join site.tags ts on td.tag_id=ts.tag_id WHERE ts.slug = any('{ ${tags.replace(/'/g, "''")} }'::text[]) or ts.tag_id = any('{ ${tags.replace(/'/g, "''")} }'::text[]))` : null;
-    const cQuery = [id ? `'${id}' in (id,slug)` : contextQuery, localeQuery, ((columns || []).concat(defaultColumns || [])).find(col => col.name === 'status') ? statusQuery : null, tagQuery].filter(Boolean).join(' and ');
-
-    const columnList = await getMeta({
-        pg,
-        table: 'data.' + `"${table}"`
-    }).then(el => el.columns?.map?.(col => col.name) || []);
-    const existingFields = fields && !id ? defaultFields.concat((fields || '').split(',')).filter(colName => columnList.includes(colName)).join(',') : null;
-
-    const filterList = defaultFilters.concat(columns.map(col => ({ name: col.name, type: col.type && ['date', 'datetime'].includes(col.type) ? 'Date' : 'Text', label: col.label, sql: col.sql })));
-
-    const res = await getData({
-        pg,
-        table: 'data.' + `"${table}"`,
-        columns: existingFields,
-        filterList,
-        query: {
-            filter,
-            state,
-            limit: Math.min(limit, maxLimit),
-            page,
-            search,
-            order: order ? order : defaultOrder,
-            desc,
-            sql
-        },
-        user,
-        contextQuery: cQuery,
-        actions: ['view']
-    }, reply, true);
-
-    const locales = await pg.query(`select array_agg(distinct REVERSE(split_part(REVERSE(field_key), ':', 1))) from site.localization where object_id in (select id from ${'data.' + `"${table}"`})`).then(el => el.rows?.[0]?.array_agg || []);
-
-    // Apply localization and tags etc.
-    if (res?.rows?.length) {
-        await additionalData(pg, res.rows, locale, id ? null : existingFields);
-    };
-
-    const columns1 = !id
-        ? columns?.map(col => Object.assign(col, { type: col.name === 'published_at' ? 'date' : col.type }))?.filter?.(el => !el.hidden)
-        : columns?.filter?.(el => !el.hidden);
-
-    const finalColumns = (defaultColumns || []).concat(columns1.filter(col => defaultColumns.findIndex(el => el.name === col.name) === -1));
-
-    finalColumns.filter(el => el.default).forEach(col => {
-        const { name, localization } = columns1.find(item => item.name === col.name) || {};
-        if (name) {
-            Object.assign(col, { localization });
-        }
-    });
-
-    if (res?.columns) {
-        Object.assign(res, { type: 'collection', locales, preview_path: preview, columns: finalColumns });
-    }
-
-    return res;
+import { pgClients, getData, getMeta } from "@opengis/fastify-table/utils.js";
+
+import additionalData from "./additionalData.js";
+
+export default async function getCollection({
+    table, id, limit, maxLimit, order, search, tags, filter, state, page, desc, sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns, fields, defaultFields = [], defaultFilters = []
+}, reply, pg = pgClients.client) {
+    if (!table || !pg.pk?.['data.' + table]) {
+        return { message: 'content table not found', status: 404 };
+    }
+
+    const isPinExists = await pg.query(`
+        SELECT 1
+        FROM pg_catalog.pg_attribute a
+        JOIN pg_catalog.pg_class c ON a.attrelid = c.oid
+        JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid
+        WHERE n.nspname = 'data'
+        AND c.relname = $1
+        AND a.attname = 'is_pin'
+        AND a.attnum > 0
+        AND NOT a.attisdropped;
+    `, [table]).then(el => el.rowCount);
+
+    const defaultOrder = `case when status='archived' then true else false end ${isPinExists ? ', is_pin desc' : ''}, published_at desc nulls last`;
+
+    const localeQuery = locale && locale !== 'uk' ? `id in ( select object_id from site.localization where REVERSE(split_part(REVERSE(field_key), ':', 1)) = '${locale.replace(/'/g, "''")}' )` : undefined;
+    const tagQuery = tags ? `id in (SELECT data_id FROM site.tag_data td left join site.tags ts on td.tag_id=ts.tag_id WHERE ts.slug = any('{ ${tags.replace(/'/g, "''")} }'::text[]) or ts.tag_id = any('{ ${tags.replace(/'/g, "''")} }'::text[]))` : null;
+    const cQuery = [id ? `'${id}' in (id,slug)` : contextQuery, localeQuery, ((columns || []).concat(defaultColumns || [])).find(col => col.name === 'status') ? statusQuery : null, tagQuery].filter(Boolean).join(' and ');
+
+    const columnList = await getMeta({
+        pg,
+        table: 'data.' + `"${table}"`
+    }).then(el => el.columns?.map?.(col => col.name) || []);
+    const existingFields = fields && !id ? defaultFields.concat((fields || '').split(',')).filter(colName => columnList.includes(colName)).join(',') : null;
+
+    const filterList = defaultFilters.concat(columns.map(col => ({ name: col.name, type: col.type && ['date', 'datetime'].includes(col.type) ? 'Date' : 'Text', label: col.label, sql: col.sql })));
+
+    const res = await getData({
+        pg,
+        table: 'data.' + `"${table}"`,
+        columns: existingFields,
+        filterList,
+        query: {
+            filter,
+            state,
+            limit: Math.min(limit, maxLimit),
+            page,
+            search,
+            order: order ? order : defaultOrder,
+            desc,
+            sql
+        },
+        user,
+        contextQuery: cQuery,
+        actions: ['view']
+    }, reply, true);
+
+    const locales = await pg.query(`select array_agg(distinct REVERSE(split_part(REVERSE(field_key), ':', 1))) from site.localization where object_id in (select id from ${'data.' + `"${table}"`})`).then(el => el.rows?.[0]?.array_agg || []);
+
+    // Apply localization and tags etc.
+    if (res?.rows?.length) {
+        await additionalData(pg, res.rows, locale, id ? null : existingFields);
+    };
+
+    const columns1 = !id
+        ? columns?.map(col => Object.assign(col, { type: col.name === 'published_at' ? 'date' : col.type }))?.filter?.(el => !el.hidden)
+        : columns?.filter?.(el => !el.hidden);
+
+    const finalColumns = (defaultColumns || []).concat(columns1.filter(col => defaultColumns.findIndex(el => el.name === col.name) === -1));
+
+    finalColumns.filter(el => el.default).forEach(col => {
+        const { name, localization } = columns1.find(item => item.name === col.name) || {};
+        if (name) {
+            Object.assign(col, { localization });
+        }
+    });
+
+    if (res?.columns) {
+        Object.assign(res, { type: 'collection', locales, preview_path: preview, columns: finalColumns });
+    }
+
+    return res;
 }

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

@@ -1,188 +1,188 @@
-import path from 'node:path';
-
-import { pgClients, metaFormat, getFilterSQL, getFilter, getMeta } from '@opengis/fastify-table/utils.js';
-
-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 = [],
-}, pg = pgClients.client) {
-    const id = id1 || (contentId1 === 'pages' ? undefined : contentId1) || '';
-    const contentId = id1 ? contentId1 : "pages";
-
-    // defaultColumns.push({
-    //     "name": "content_type_id",
-    //     "label": "Тип сторінки",
-    //     "type": "select",
-    //     "data": "cms.page_type"
-    // });
-
-    const customColumns = 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
-        `, [id1 || contentId]).then(el => el.rows?.[0]?.columns || []);
-
-    const contentQuery = contentId === 'pages' || !id
-        ? `(type = 'single' or content_type_id = 'pages')`
-        : 'content_type_id=(select content_type_id from site.contents where content_id=$2)';
-
-    const columns = defaultColumns.concat(customColumns.filter(col => defaultColumns.findIndex(el => el.name === col.name) === -1));
-
-    columns.filter(el => el.default).forEach(col => {
-        const { name, localization } = customColumns.find(item => item.name === col.name) || {};
-        if (name) {
-            Object.assign(col, { localization });
-        }
-    });
-
-    const limit = Math.min(maxLimit, +(queryLimit || 20));
-    const offset = page && page > 0 && !id ? (page - 1) * limit : 0;
-
-    const fData = filter
-        ? await getFilterSQL({
-            pg,
-            table: 'site.contents',
-            filter,
-            search,
-            filterList: defaultFilters,
-            query: `
-              content_type_id IN (
-              SELECT content_type_id
-              FROM site.content_types
-              WHERE ${contentQuery || 'true'}
-            )
-          `,
-        })
-        : {
-            optimizedSQL: 'SELECT * FROM site.contents WHERE true',
-        };
-
-    const localeQuery = locale && locale !== 'uk' && pg.pk?.['site.contents'] ? `${pg.pk?.['site.contents']} in ( select object_id from site.localization where REVERSE( split_part( REVERSE(field_key), ':', 1) ) = '${locale.replace(/'/g, "''")}' )` : undefined;
-
-    const columnList = await getMeta({
-        pg,
-        table: 'site.contents',
-    }).then(el => el.columns?.map?.(col => col.name) || []);
-    const existingFields = fields && contentId === 'pages' || !id ? defaultFields.concat((fields || '').split(',')).filter(colName => columnList.includes(colName)).concat(['content_id AS id']).join(',') : '';
-    const extraKeys = fields ? fields.split(',').filter(key => !defaultFields.includes(key)) : [];
-    const cols = existingFields.length ? existingFields.concat(extraKeys?.length ? `,"extraKeys"` : []) : `content_id AS id,
-        content_id,
-        created_by,
-        title,
-        slug,
-        meta,
-        published_by,
-        published_at,
-        status,
-        content_type_id,
-        /* content_type_id AS type, */
-        main_image
-        ${contentId === 'pages' || !id ? `,"extraKeys"` : ''}`;
-
-    const q = `
-      SELECT ${cols} FROM (${fData.optimizedSQL}) a
-      ${extraKeys || id ? `LEFT JOIN LATERAL (
-        SELECT json_agg(row_to_json(q)) AS "extraKeys"
-        FROM (
-          SELECT field_key, field_type, field_value, field_value_object
-          FROM site.content_data
-          WHERE content_id = a.content_id
-        ) q
-      ) b ON true` : ''}
-
-        LEFT JOIN LATERAL (
-            SELECT type FROM site.content_types WHERE content_type_id=a.content_type_id LIMIT 1
-        )c ON true
-
-      WHERE $1=$1 and $2=$2
-      and ${statusQuery || 'true'}
-      and ${localeQuery || '1=1'}
-      and ${contentQuery || 'true'} 
-      and ${id ? `$2 in (slug, content_id)` : 'true'}
-      and content_id<>'pages'
-      order by case when status='archived' then true else false end, published_at desc nulls last
-      LIMIT ${limit} OFFSET ${id ? 0 : offset}
-    `;
-
-    if (sql && user?.user_type?.includes?.('admin')) {
-        return q; // Expose raw SQL for debugging
-    }
-
-    const { total = 0, filtered = 0 } = await pg.query(`
-      SELECT COUNT(*)::int as total,
-      count(*) FILTER(WHERE ${fData.q || "true"})::int as filtered
-      FROM site.contents
-      WHERE content_type_id IN (
-        SELECT content_type_id
-        FROM site.content_types
-        WHERE ${localeQuery || '1=1'} 
-        and $1=$1 and $2=$2 and ${contentQuery || 'true'} 
-      )
-    and ${statusQuery || 'true'}
-    and content_id<>'pages'
-    `, [contentId, id]).then(el => el.rows?.[0] || {});
-
-    const { rows = [] } = await pg.query(q, [contentId, id || '']);
-
-    const locales = await pg.query(`select array_agg(distinct REVERSE(split_part(REVERSE(field_key), ':', 1))) from site.localization 
-        where object_id in (select content_id from site.contents 
-            where content_type_id IN (
-                SELECT content_type_id FROM site.content_types where $1=$1 and $2=$2 and ${contentQuery || 'true'}
-            )
-            and ${statusQuery || 'true'}
-        )`, [contentId, id]
-    ).then(el => el.rows?.[0]?.array_agg || []);
-
-    // Flatten extra fields into main object
-    const rows1 = rows.map(row => ({
-        ...row,
-        ...Object.fromEntries(
-            row.extraKeys?.filter(k => extraKeys?.length ? extraKeys.includes(k.field_key) : true)?.map(k =>
-                [k.field_key, inputTypes[k.field_type] === 'json' || k.field_key === 'meta'
-                    ? k.field_value_object
-                    : k.field_value]
-            ) || []
-        ),
-        extraKeys: undefined,
-    }));
-
-    // Apply localization and tags etc.
-    await additionalData(pg, rows1, locale, contentId === 'pages' || !id ? [existingFields, extraKeys].filter(Boolean).join(',') : null);
-
-    // Apply metadata formatting
-    await metaFormat({
-        rows: rows1,
-        cls: {
-            created_by: 'core.user_mentioned',
-            // content_type_id: 'cms.type_id',
-            // type: 'cms.type_id',
-        },
-        sufix: false,
-    }, pg);
-
-    const { list: filters = [] } = await getFilter({
-        pg, table: 'single.default.table', user, filter: `content_type_id in (select content_type_id from site.content_types where type='single' or content_type_id='pages')`
-    }) || {};
-
-    const finalColumns = !id
-        ? columns?.map?.(col => Object.assign(col, { type: col.name === 'published_at' ? 'date' : col.type }))?.filter?.(el => !el.hidden)
-        : columns?.filter?.(el => !el.hidden);
-
-    rows1.filter(row => row.single_sections?.length).forEach(row => {
-        row.single_sections.filter(section => section.documents?.length).forEach(section => {
-            section.documents.filter(doc => doc.file).forEach(doc => Object.assign(doc, { file_name: path.basename(doc.file) }));
-        });
-    });
-
-    return {
-        locales,
-        type: 'single',
-        total,
-        filtered,
-        count: rows1.length,
-        pk: 'id',
-        rows: rows1,
-        columns: finalColumns,
-        filters,
-    };
+import path from 'node:path';
+
+import { pgClients, metaFormat, getFilterSQL, getFilter, getMeta } from '@opengis/fastify-table/utils.js';
+
+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 = [],
+}, pg = pgClients.client) {
+    const id = id1 || (contentId1 === 'pages' ? undefined : contentId1) || '';
+    const contentId = id1 ? contentId1 : "pages";
+
+    // defaultColumns.push({
+    //     "name": "content_type_id",
+    //     "label": "Тип сторінки",
+    //     "type": "select",
+    //     "data": "cms.page_type"
+    // });
+
+    const customColumns = 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
+        `, [id1 || contentId]).then(el => el.rows?.[0]?.columns || []);
+
+    const contentQuery = contentId === 'pages' || !id
+        ? `(type = 'single' or content_type_id = 'pages')`
+        : 'content_type_id=(select content_type_id from site.contents where content_id=$2)';
+
+    const columns = defaultColumns.concat(customColumns.filter(col => defaultColumns.findIndex(el => el.name === col.name) === -1));
+
+    columns.filter(el => el.default).forEach(col => {
+        const { name, localization } = customColumns.find(item => item.name === col.name) || {};
+        if (name) {
+            Object.assign(col, { localization });
+        }
+    });
+
+    const limit = Math.min(maxLimit, +(queryLimit || 20));
+    const offset = page && page > 0 && !id ? (page - 1) * limit : 0;
+
+    const fData = filter
+        ? await getFilterSQL({
+            pg,
+            table: 'site.contents',
+            filter,
+            search,
+            filterList: defaultFilters,
+            query: `
+              content_type_id IN (
+              SELECT content_type_id
+              FROM site.content_types
+              WHERE ${contentQuery || 'true'}
+            )
+          `,
+        })
+        : {
+            optimizedSQL: 'SELECT * FROM site.contents WHERE true',
+        };
+
+    const localeQuery = locale && locale !== 'uk' && pg.pk?.['site.contents'] ? `${pg.pk?.['site.contents']} in ( select object_id from site.localization where REVERSE( split_part( REVERSE(field_key), ':', 1) ) = '${locale.replace(/'/g, "''")}' )` : undefined;
+
+    const columnList = await getMeta({
+        pg,
+        table: 'site.contents',
+    }).then(el => el.columns?.map?.(col => col.name) || []);
+    const existingFields = fields && contentId === 'pages' || !id ? defaultFields.concat((fields || '').split(',')).filter(colName => columnList.includes(colName)).concat(['content_id AS id']).join(',') : '';
+    const extraKeys = fields ? fields.split(',').filter(key => !defaultFields.includes(key)) : [];
+    const cols = existingFields.length ? existingFields.concat(extraKeys?.length ? `,"extraKeys"` : []) : `content_id AS id,
+        content_id,
+        created_by,
+        title,
+        slug,
+        meta,
+        published_by,
+        published_at,
+        status,
+        content_type_id,
+        /* content_type_id AS type, */
+        main_image
+        ${contentId === 'pages' || !id ? `,"extraKeys"` : ''}`;
+
+    const q = `
+      SELECT ${cols} FROM (${fData.optimizedSQL}) a
+      ${extraKeys || id ? `LEFT JOIN LATERAL (
+        SELECT json_agg(row_to_json(q)) AS "extraKeys"
+        FROM (
+          SELECT field_key, field_type, field_value, field_value_object
+          FROM site.content_data
+          WHERE content_id = a.content_id
+        ) q
+      ) b ON true` : ''}
+
+        LEFT JOIN LATERAL (
+            SELECT type FROM site.content_types WHERE content_type_id=a.content_type_id LIMIT 1
+        )c ON true
+
+      WHERE $1=$1 and $2=$2
+      and ${statusQuery || 'true'}
+      and ${localeQuery || '1=1'}
+      and ${contentQuery || 'true'} 
+      and ${id ? `$2 in (slug, content_id)` : 'true'}
+      and content_id<>'pages'
+      order by case when status='archived' then true else false end, published_at desc nulls last
+      LIMIT ${limit} OFFSET ${id ? 0 : offset}
+    `;
+
+    if (sql && user?.user_type?.includes?.('admin')) {
+        return q; // Expose raw SQL for debugging
+    }
+
+    const { total = 0, filtered = 0 } = await pg.query(`
+      SELECT COUNT(*)::int as total,
+      count(*) FILTER(WHERE ${fData.q || "true"})::int as filtered
+      FROM site.contents
+      WHERE content_type_id IN (
+        SELECT content_type_id
+        FROM site.content_types
+        WHERE ${localeQuery || '1=1'} 
+        and $1=$1 and $2=$2 and ${contentQuery || 'true'} 
+      )
+    and ${statusQuery || 'true'}
+    and content_id<>'pages'
+    `, [contentId, id]).then(el => el.rows?.[0] || {});
+
+    const { rows = [] } = await pg.query(q, [contentId, id || '']);
+
+    const locales = await pg.query(`select array_agg(distinct REVERSE(split_part(REVERSE(field_key), ':', 1))) from site.localization 
+        where object_id in (select content_id from site.contents 
+            where content_type_id IN (
+                SELECT content_type_id FROM site.content_types where $1=$1 and $2=$2 and ${contentQuery || 'true'}
+            )
+            and ${statusQuery || 'true'}
+        )`, [contentId, id]
+    ).then(el => el.rows?.[0]?.array_agg || []);
+
+    // Flatten extra fields into main object
+    const rows1 = rows.map(row => ({
+        ...row,
+        ...Object.fromEntries(
+            row.extraKeys?.filter(k => extraKeys?.length ? extraKeys.includes(k.field_key) : true)?.map(k =>
+                [k.field_key, inputTypes[k.field_type] === 'json' || k.field_key === 'meta'
+                    ? k.field_value_object
+                    : k.field_value]
+            ) || []
+        ),
+        extraKeys: undefined,
+    }));
+
+    // Apply localization and tags etc.
+    await additionalData(pg, rows1, locale, contentId === 'pages' || !id ? [existingFields, extraKeys].filter(Boolean).join(',') : null);
+
+    // Apply metadata formatting
+    await metaFormat({
+        rows: rows1,
+        cls: {
+            created_by: 'core.user_mentioned',
+            // content_type_id: 'cms.type_id',
+            // type: 'cms.type_id',
+        },
+        sufix: false,
+    }, pg);
+
+    const { list: filters = [] } = await getFilter({
+        pg, table: 'single.default.table', user, filter: `content_type_id in (select content_type_id from site.content_types where type='single' or content_type_id='pages')`
+    }) || {};
+
+    const finalColumns = !id
+        ? columns?.map?.(col => Object.assign(col, { type: col.name === 'published_at' ? 'date' : col.type }))?.filter?.(el => !el.hidden)
+        : columns?.filter?.(el => !el.hidden);
+
+    rows1.filter(row => row.single_sections?.length).forEach(row => {
+        row.single_sections.filter(section => section.documents?.length).forEach(section => {
+            section.documents.filter(doc => doc.file).forEach(doc => Object.assign(doc, { file_name: path.basename(doc.file) }));
+        });
+    });
+
+    return {
+        locales,
+        type: 'single',
+        total,
+        filtered,
+        count: rows1.length,
+        pk: 'id',
+        rows: rows1,
+        columns: finalColumns,
+        filters,
+    };
 }

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

@@ -1,6 +1,6 @@
-import path from 'node:path';
-import { existsSync, readFileSync } from 'node:fs';
-
-const inputTypes = ['input-types.json', path.join('node_modules/@opengis/cms', 'input-types.json')].filter(filepath => existsSync(filepath)).reduce((acc, curr) => ({ ...acc, ...JSON.parse(readFileSync(curr) || '{}') }), {});
-
+import path from 'node:path';
+import { existsSync, readFileSync } from 'node:fs';
+
+const inputTypes = ['input-types.json', path.join('node_modules/@opengis/cms', 'input-types.json')].filter(filepath => existsSync(filepath)).reduce((acc, curr) => ({ ...acc, ...JSON.parse(readFileSync(curr) || '{}') }), {});
+
 export default inputTypes