@opengis/admin 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@opengis/fastify-auth": "^1.0.20",
     "@opengis/fastify-file": "^1.0.17",
-    "@opengis/fastify-table": "^1.1.5",
+    "@opengis/fastify-table": "^1.1.7",
     "@opengis/v3-core": "^0.1.92",
     "@opengis/v3-filter": "^0.0.31",
     "@turf/turf": "^7.1.0",
@@ -62,4 +62,4 @@
     "vitepress-plugin-tabs": "^0.5.0",
     "vitepress-sidebar": "^1.22.0"
   }
-}
+}

package/server/routes/data/controllers/cardData.js

@@ -11,19 +11,21 @@ export default async function getCardData({
     const template = await getTemplate('card', table);
 
     const tableTemplate = await getTemplate('table', table);
-    const index = template.find(el => el[0] === 'index.yml')?.[1] || {}
+    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {}
     //return template
 
     const data = {};
-    const { message, rows = [] } = await getTableData({ pg, funcs, params: { table, id }, session });
+    const { message, rows = [] } = await getTableData({ pg, funcs, params: { table, id }, session, mode: 'card' });
 
     if (message) return { message };
 
-    await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
-        const htmlContent = await funcs.handlebars.compile(el[1])(rows[0]);
-        const name = el[0].substring(0, el[0].lastIndexOf('.'))
-        data[name] = htmlContent;
-    }));
+    if (template) {
+        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
+            const htmlContent = await funcs.handlebars.compile(el[1])(rows[0]);
+            const name = el[0].substring(0, el[0].lastIndexOf('.'))
+            data[name] = htmlContent;
+        }));
+    }
 
     return { time: Date.now() - time, ...index, data, rows, columns: tableTemplate?.columns || tableTemplate?.colModel };
 

package/server/routes/data/controllers/tableData.js

@@ -9,13 +9,15 @@ import getFilterSQL from "./funcs/getFilterSQL/index.js";
 
 import assignTokens from './utils/assignTokens.js';
 
+import getColumns from './utils/getColumns.js';
+
 const maxLimit = 100;
 
 export default async function getTableData(req) {
     const time = Date.now();
 
     const {
-        pg, params, funcs = {}, query = {}, opt = {}, session = {},
+        pg, params, funcs = {}, query = {}, opt = {}, session = {}, mode = 'table',
     } = req;
     const { uid } = session.passport?.user || {};
 
@@ -37,14 +39,14 @@ export default async function getTableData(req) {
             return { message: `table not found: ${table}`, status: 404 };
         }
 
-        const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
+        const { cols, columnList, extraKeys, schema } = await getColumns({
+            columns, params, opt, loadTable, form, table, dbColumns, mode,
+        });
 
         const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
             ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
             : '';
 
-        const columnList = dbColumns.map((el) => el.name || el).join(',');
-
         const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
 
         if (params.id && columnList.includes(params.id)) {
@@ -95,6 +97,16 @@ export default async function getTableData(req) {
 
         const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
 
+        if (extraKeys?.length && mode === 'card') {
+            await Promise.all(rows?.map(async (row) => {
+                await Promise.all(extraKeys?.map(async (key) => {
+                const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+                const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+                Object.assign(row, { [key]: extraRows });
+                }));
+            }));
+        }
+
         await metaFormat({ funcs, rows, table: params.table });
 
         const res = {

package/server/routes/data/controllers/utils/getColumns.js

@@ -0,0 +1,22 @@
+import { getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function getColumns({
+    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
+}) {
+    const columnList = dbColumns.map((el) => el.name || el).join(',');
+    if (mode === 'table') {
+        const cols = columns.filter((el) => el?.name !== 'geom').map((el) => el?.name || el).join(',');
+        return { cols, columnList };
+    }
+    // card / edit form
+    const schema = await getTemplate('form', opt?.form || form) || {};
+    // skip DataTable from another table
+    const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+    // skip non-existing columns
+    const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
+    const cols = loadTable?.table
+        ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+        : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
+    
+    return { cols, columnList, extraKeys, schema };
+}

package/server/routes/menu/controllers/getMenu.js

@@ -1,50 +1,33 @@
 import { readdir, readFile } from 'fs/promises';
 import { join } from 'path';
-import config from '../../../../config.js';
+import userTemplateDir from '@opengis/fastify-table/table/controllers/utils/userTemplateDir.js'
+import { existsSync, readdirSync } from 'fs';
 
-const findMenuJsons = async (startPath, filter) => {
-    const files = await readdir(startPath, { withFileTypes: true });
+// check module dir
+const moduleDir = join(process.cwd(), 'module');
+const dirs = existsSync(moduleDir) ?
+    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
 
-    return await files.reduce(async (prevPromise, file) => {
-        const acc = await prevPromise;
-        const filePath = join(startPath, file.name);
+// all menu files module + user 
+const menuList = dirs.concat(userTemplateDir)
+    .map(el => join(el, 'menu.json'))
+    .filter(el => existsSync(el))
 
-        if (file.isDirectory()) {
-            const nestedFiles = await findMenuJsons(filePath, filter);
-            return acc.concat(nestedFiles);
-        } else if (file.name === filter) {
-            acc.push(filePath);
-        }
 
-        return acc;
-    }, Promise.resolve([]));
-
-}
-
-const readJsonFiles = async (filePaths) => {
-    const menu = []
-    await Promise.all(
-        filePaths.map(async (filePath) => {
-            const content = JSON.parse(await readFile(filePath, 'utf-8'));
-            content.forEach(el => {
-                menu.push(el)
-            });
+const isProduction = process.env.NODE_ENV === 'production';
+const menuCache = []
 
+async function readMenu() {
+    const list = await Promise.all(menuList.map(el => readFile(el, 'utf-8')));
+    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
+        .map(el => ({ order: 0, ...el }))
+        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
 
-        })
-    );
-    return menu;
+    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
+    return menus;
 }
-
 export default async function adminMenu() {
-    const cwd = process.cwd();
-    //const typeDir = join(cwd, (config.templateDir || 'server/templates'));
-    const modulesDir = join(cwd, 'module');
-
-    // const menus = await findMenuJsons(typeDir, 'menu.json');
-    const menuModules = await findMenuJsons(modulesDir, 'menu.json');
-
-    const jsons = await readJsonFiles(menuModules);
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
 
-    return jsons;
+    return menus;
 }

package/server/routes/templates/controllers/getTemplate.js

@@ -1,7 +1,15 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js"
+import { getTemplate } from "@opengis/fastify-table/utils.js";
 
-export default async function getTemplateApi({ params }) {
+export default async function getTemplateApi({ funcs, params, session = {} }) {
     const { type, name } = params;
     const data = await getTemplate(type, name);
-    return data || { message: `template not found "${name}"`, status: 404 };
+    if (!['interface', 'table'].includes(type)
+        && (!data?.public || !data?.ispublic)
+        && !funcs?.config?.auth?.disable
+        && !session.passport?.user?.uid
+        && false
+    ) {
+        return `access restricted ${name}`;
+    }
+    return data?.html || data || `template not found "${name}"`;
 }