@opengis/admin 0.2.2 → 0.2.3

package/server/routes/access/controllers/access.group.js

@@ -1,30 +1,30 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-
-export default async function accessGroup({
-    pg = pgClients.client, params = {}, session = {},
-}) {
-    const { user = {} } = session?.passport || {};
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({
-        id: params.id, user,
-    });
-    if (check) return check;
-
-    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
-    left join admin.role_access b on a.route_id=b.route_id
-    where b.role_id=$1`, [params.id]);
-
-    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
-    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
-    left join admin.users b on a.user_uid=b.uid
-    where a.role_id=$1`, [params.id]);
-
-    return { routes, users };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+
+export default async function accessGroup({
+    pg = pgClients.client, params = {}, session = {},
+}) {
+    const { user = {} } = session?.passport || {};
+
+    if (!params?.id) {
+        return { message: 'not enough params: id', status: 400 };
+    }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({
+        id: params.id, user,
+    });
+    if (check) return check;
+
+    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
+    left join admin.role_access b on a.route_id=b.route_id
+    where b.role_id=$1`, [params.id]);
+
+    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
+    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
+    left join admin.users b on a.user_uid=b.uid
+    where a.role_id=$1`, [params.id]);
+
+    return { routes, users };
 }

package/server/routes/access/controllers/access.group.post.js

@@ -1,49 +1,49 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-import accessGroup from './access.group.js';
-
-export default async function accessGroupPost({
-    pg = pgClients.client, params = {}, session = {}, body = {},
-}) {
-    const { id } = params;
-    const { user } = session?.passport || {};
-    if (!user) return { status: 403, message: 'access restricted' }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({ id, user });
-    if (check) return check;
-
-    const { users = [], routes = [] } = body;
-
-    if (!routes?.length && !users?.length) {
-        return { message: 'not enough params: users / routes', status: 400 };
-    }
-
-    if (routes?.length) {
-
-        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
-
-
-        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
-        await Promise.all(routes.filter(el => el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
-
-        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
-            left join admin.role_access b on a.route_id=b.route_id
-            where b.role_id=$1`, [id]);
-
-        if (!users?.length) {
-            return { message: { id, routes: rows }, status: 200 };
-        }
-    }
-
-    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
-    insert into admin.user_roles(role_id,user_uid,access_granted)
-    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
-
-    await pg.query(q);
-
-    const res = await accessGroup({ pg, params, session });
-
-    return res;
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+import accessGroup from './access.group.js';
+
+export default async function accessGroupPost({
+    pg = pgClients.client, params = {}, session = {}, body = {},
+}) {
+    const { id } = params;
+    const { user } = session?.passport || {};
+    if (!user) return { status: 403, message: 'access restricted' }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({ id, user });
+    if (check) return check;
+
+    const { users = [], routes = [] } = body;
+
+    if (!routes?.length && !users?.length) {
+        return { message: 'not enough params: users / routes', status: 400 };
+    }
+
+    if (routes?.length) {
+
+        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
+
+
+        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
+        await Promise.all(routes.filter(el => el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
+
+        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
+            left join admin.role_access b on a.route_id=b.route_id
+            where b.role_id=$1`, [id]);
+
+        if (!users?.length) {
+            return { message: { id, routes: rows }, status: 200 };
+        }
+    }
+
+    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
+    insert into admin.user_roles(role_id,user_uid,access_granted)
+    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
+
+    await pg.query(q);
+
+    const res = await accessGroup({ pg, params, session });
+
+    return res;
 }

package/server/routes/access/index.mjs

@@ -1,8 +1,8 @@
-import accessGroup from "./controllers/access.group.js";
-import accessGroupPost from "./controllers/access.group.post.js";
-import { accessGroupPostSchema, accessGroupSchema } from "./schema.mjs";
-
-export default async function route(fastify) {
-    fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);
-    fastify.post('/access-group/:id', { schema: accessGroupPostSchema }, accessGroupPost);
-}
+import accessGroup from "./controllers/access.group.js";
+import accessGroupPost from "./controllers/access.group.post.js";
+import { accessGroupPostSchema, accessGroupSchema } from "./schema.mjs";
+
+export default async function route(fastify) {
+    fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);
+    fastify.post('/access-group/:id', { schema: accessGroupPostSchema }, accessGroupPost);
+}

package/server/routes/access/schema.mjs

@@ -1,58 +1,58 @@
-export default null;
-export { accessGroupSchema, accessGroupPostSchema }
-
-const accessGroupSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['id'],
-    },
-};
-
-const accessGroupPostSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['id'],
-    },
-    body: {
-        type: 'object',
-        properties: {
-            users: {
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: {
-                        id: {
-                            type: 'string',
-                            pattern: '^([\\d\\w._-]+)$',
-                        },
-                    },
-                },
-            },
-            routes: {
-                type: 'array',
-                /*items: {
-                    type: 'object',
-                    properties: {
-                        path: {
-                            type: 'string',
-                            pattern: '^([\\d\\w._-]+)$',
-                        },
-                        actions: {
-                            type: 'array',
-                            items: {
-                                type: 'string',
-                                enum: ['get', 'add', 'edit', 'del'],
-                            },
-                        },
-                    },
-                },*/
-            },
-        },
-    },
+export default null;
+export { accessGroupSchema, accessGroupPostSchema }
+
+const accessGroupSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['id'],
+    },
+};
+
+const accessGroupPostSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['id'],
+    },
+    body: {
+        type: 'object',
+        properties: {
+            users: {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        id: {
+                            type: 'string',
+                            pattern: '^([\\d\\w._-]+)$',
+                        },
+                    },
+                },
+            },
+            routes: {
+                type: 'array',
+                /*items: {
+                    type: 'object',
+                    properties: {
+                        path: {
+                            type: 'string',
+                            pattern: '^([\\d\\w._-]+)$',
+                        },
+                        actions: {
+                            type: 'array',
+                            items: {
+                                type: 'string',
+                                enum: ['get', 'add', 'edit', 'del'],
+                            },
+                        },
+                    },
+                },*/
+            },
+        },
+    },
 };

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

@@ -1,88 +1,88 @@
-import { handlebars, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function calendarData({
-    pg, params = {}, query = {}, session = {},
-}) {
-    const { name } = params;
-    const { uid } = session.passport?.user || {};
-    if (!name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-    const { date, sql } = query;
-    
-
-    const body = await getTemplate('calendar', name);
-
-    if (!body) {
-        return { message: `calendar not found: ${name}`, status: 404 };
-    }
-
-    const {
-        title,
-        table,
-        query: query1 = '1=1',
-        meta = {},
-        filter = [],
-    } = body;
-
-    if (!table) {
-        return { message: 'not enough calendar params: table', status: 404 };
-    }
-    if (!pg.pk?.[table]) {
-        return { message: `table pkey not found: ${table}`, status: 404 };
-    }
-
-    const filterWhere = filter?.length && query.filter?.length
-        ? filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
-            .map((el) => {
-                const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
-                if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g,"''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
-            }).filter((el) => el).join(' and ')
-        : undefined;
-    // console.log(filterWhere);
-
-        const queryWhere = await handlebars.compile(query1)({ uid });
-        const filterDate = date ? `date_trunc('month', "${meta?.date || meta?.start}"::date)='${date}'::date` : undefined;
-        const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
-
-    const filtersByColumn = filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
-    
-    const filters = [];
-    if (filtersByColumn?.length) {
-        await Promise.all(filtersByColumn.map(async (el) => {
-            const { rows: filterData = [] } = await pg.query(`select $1 as id, count(*) from $2 
-            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by $1`, [el.column, table] );
-            if (!filterData?.length) return;
-            
-            // const clsData = await getSelectVal({ pg, name: el.cls, values: filterData.map((el) => el.id) });
-            const clsData = el.cls ? await getTemplate(['cls', 'select'], el.cls) : undefined;
-            
-            if (!el.cls) {
-                filterData.forEach((el1) => filters.push(el1));
-                return;
-            }
-
-            filterData.forEach((el1) => {
-                const cls = clsData.find((item) => item.id === el1.id.toString());
-                Object.assign(el1, { title: cls?.text, color: cls?.color });
-                filters.push(el1);
-            });
-        }));
-    }
-
-    const tableMeta = await getMeta({ pg, table });
-    const columnList = tableMeta?.columns?.map((el) => el?.name);
-    const columns = Object.keys(meta).filter((el) => ['date', 'start','end','title','status'].includes(el) && columnList.includes(meta[el])).map((el) => `"${meta[el]}" as ${el}`);
-    
-    if (!columns?.length) {
-        return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
-    }
-
-    const q = `select &1 from $2 where $3`;
-    if (sql) return q;
-
-    const { rows = [] } = await pg.query(q, [columns.join(','), table, where]); 
-    
-    return { title, filters, rows };
-
+import { handlebars, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function calendarData({
+    pg, params = {}, query = {}, session = {},
+}) {
+    const { name } = params;
+    const { uid } = session.passport?.user || {};
+    if (!name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+    const { date, sql } = query;
+    
+
+    const body = await getTemplate('calendar', name);
+
+    if (!body) {
+        return { message: `calendar not found: ${name}`, status: 404 };
+    }
+
+    const {
+        title,
+        table,
+        query: query1 = '1=1',
+        meta = {},
+        filter = [],
+    } = body;
+
+    if (!table) {
+        return { message: 'not enough calendar params: table', status: 404 };
+    }
+    if (!pg.pk?.[table]) {
+        return { message: `table pkey not found: ${table}`, status: 404 };
+    }
+
+    const filterWhere = filter?.length && query.filter?.length
+        ? filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
+            .map((el) => {
+                const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
+                if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g,"''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
+            }).filter((el) => el).join(' and ')
+        : undefined;
+    // console.log(filterWhere);
+
+        const queryWhere = await handlebars.compile(query1)({ uid });
+        const filterDate = date ? `date_trunc('month', "${meta?.date || meta?.start}"::date)='${date}'::date` : undefined;
+        const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+
+    const filtersByColumn = filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
+    
+    const filters = [];
+    if (filtersByColumn?.length) {
+        await Promise.all(filtersByColumn.map(async (el) => {
+            const { rows: filterData = [] } = await pg.query(`select $1 as id, count(*) from $2 
+            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by $1`, [el.column, table] );
+            if (!filterData?.length) return;
+            
+            // const clsData = await getSelectVal({ pg, name: el.cls, values: filterData.map((el) => el.id) });
+            const clsData = el.cls ? await getTemplate(['cls', 'select'], el.cls) : undefined;
+            
+            if (!el.cls) {
+                filterData.forEach((el1) => filters.push(el1));
+                return;
+            }
+
+            filterData.forEach((el1) => {
+                const cls = clsData.find((item) => item.id === el1.id.toString());
+                Object.assign(el1, { title: cls?.text, color: cls?.color });
+                filters.push(el1);
+            });
+        }));
+    }
+
+    const tableMeta = await getMeta({ pg, table });
+    const columnList = tableMeta?.columns?.map((el) => el?.name);
+    const columns = Object.keys(meta).filter((el) => ['date', 'start','end','title','status'].includes(el) && columnList.includes(meta[el])).map((el) => `"${meta[el]}" as ${el}`);
+    
+    if (!columns?.length) {
+        return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
+    }
+
+    const q = `select &1 from $2 where $3`;
+    if (sql) return q;
+
+    const { rows = [] } = await pg.query(q, [columns.join(','), table, where]); 
+    
+    return { title, filters, rows };
+
 }

package/server/routes/calendar/index.mjs

@@ -1,7 +1,7 @@
-import calendarData from "./controllers/calendar.data.js";
-
-import { calendarDataSchema } from './schema.js';
-
-export default async function route(fastify) {
-    fastify.get('/calendar/:name', { schema: calendarDataSchema }, calendarData);
-}
+import calendarData from "./controllers/calendar.data.js";
+
+import { calendarDataSchema } from './schema.js';
+
+export default async function route(fastify) {
+    fastify.get('/calendar/:name', { schema: calendarDataSchema }, calendarData);
+}

package/server/routes/calendar/schema.js

@@ -1,22 +1,22 @@
-const calendarDataSchema = {
-  params: {
-    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-  },
-  querystring: {
-    date: { type: 'string', pattern: '^([\\d\\s\\/,.:-]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-
-  // query: {
-  //     type: 'object',
-  //     properties: {
-  //         date: {
-  //             type: 'string',
-  //             format: 'date',
-  //         },
-  //     },
-  // },
-};
-
-export { calendarDataSchema }
+const calendarDataSchema = {
+  params: {
+    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+  },
+  querystring: {
+    date: { type: 'string', pattern: '^([\\d\\s\\/,.:-]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+
+  // query: {
+  //     type: 'object',
+  //     properties: {
+  //         date: {
+  //             type: 'string',
+  //             format: 'date',
+  //         },
+  //     },
+  // },
+};
+
+export { calendarDataSchema }
 export default null;