@opengis/admin 0.1.35 → 0.1.37

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

@@ -1,56 +1,56 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function tableFilter(req) {
-    const time = Date.now();
-    const { pg, funcs = {}, params = {}, query = {}, session = {} } = req;
-    const { uid } = session.passport?.user || {};
-
-    if (!params.name) {
-        return { message: 'not enouggh params: name', status: 400 };
-    }
-
-    const loadTable = await getTemplate('table', params.name);
-
-    if (!loadTable) {
-        return { message: 'table not found', status: 404 };
-    }
-
-    const { columns } = await funcs.getMeta({ table: loadTable.table });
-
-    const filters = loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || [];
-    filters.forEach(el => {
-        Object.assign(el, { id: el.name || el.id, name: el.name || el.id });
-    });
-
-    // table_properties - user filter
-    const { rows: properties = [] } = await pg.query(`select property_id, property_key, property_title, property_format, property_data from admin.table_properties where property_type='filter' and property_entity=$1 and uid=$2`, [params.name, uid]);
-    properties.forEach((row) => filters.push({ id: row.property_key, name: row.property_key, ua: row.property_title, type: row.property_format, data: row.property_data }));
-
-    await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        const name = el.name || el.id;
-
-        if (!cls?.length || !Array.isArray(cls) || !loadTable.table || !name) return;
-        const { dataTypeID } = columns.find((item) => item.name === name) || {};
-        if (!dataTypeID) return;
-
-        const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
-            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} group by unnest(${name})`)
-            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} group by ${name}`);
-
-        const options = countArr.rows.map(cel => {
-            const data = cls.find(c => c.id === cel.id);
-            return { ...cel, ...data };
-        });
-        Object.assign(el, { options });
-    }));
-
-    return {
-        time: Date.now() - time,
-        list: filters,
-        custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
-        inline: loadTable?.filterInline,
-        state: loadTable?.filterState?.map(el => ({ label: el.label })),
-    };
+import { getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function tableFilter(req) {
+    const time = Date.now();
+    const { pg, funcs = {}, params = {}, query = {}, session = {} } = req;
+    const { uid } = session.passport?.user || {};
+
+    if (!params.name) {
+        return { message: 'not enouggh params: name', status: 400 };
+    }
+
+    const loadTable = await getTemplate('table', params.name);
+
+    if (!loadTable) {
+        return { message: 'table not found', status: 404 };
+    }
+
+    const { columns } = await funcs.getMeta({ table: loadTable.table });
+
+    const filters = loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || [];
+    filters.forEach(el => {
+        Object.assign(el, { id: el.name || el.id, name: el.name || el.id });
+    });
+
+    // table_properties - user filter
+    const { rows: properties = [] } = await pg.query(`select property_id, property_key, property_title, property_format, property_data from admin.table_properties where property_type='filter' and property_entity=$1 and uid=$2`, [params.name, uid]);
+    properties.forEach((row) => filters.push({ id: row.property_key, name: row.property_key, ua: row.property_title, type: row.property_format, data: row.property_data }));
+
+    await Promise.all(filters.filter((el) => el.data).map(async (el) => {
+
+        const cls = await getTemplate(['cls', 'select'], el.data);
+        const name = el.name || el.id;
+
+        if (!cls?.length || !Array.isArray(cls) || !loadTable.table || !name) return;
+        const { dataTypeID } = columns.find((item) => item.name === name) || {};
+        if (!dataTypeID) return;
+
+        const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
+            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} group by unnest(${name})`)
+            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} group by ${name}`);
+
+        const options = countArr.rows.map(cel => {
+            const data = cls.find(c => c.id === cel.id);
+            return { ...cel, ...data };
+        });
+        Object.assign(el, { options });
+    }));
+
+    return {
+        time: Date.now() - time,
+        list: filters,
+        custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+        inline: loadTable?.filterInline,
+        state: loadTable?.filterState?.map(el => ({ label: el.label })),
+    };
 }

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

@@ -1,31 +1,31 @@
-import setToken from "@opengis/fastify-table/crud/funcs/setToken.js";
-
-export default function assignTokens({
-    rows = [], funcs = {}, ispublic, uid, loadTable = {},
-}) {
-    if (funcs.config?.security?.disableToken) return;
-
-    if (!funcs.config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
-    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
-
-    const form = loadTable?.form || loadTable?.add_form;
-    const addTokens = setToken({
-        ids: [JSON.stringify({ add: loadTable.table, form })],
-        mode: 'a',
-        uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
-        array: 1,
-    });
-    if (!rows.length) return addTokens[0];
-
-    rows.forEach((row) => {
-        const editTokens = setToken({
-            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
-            mode: 'w',
-            uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
-            array: 1,
-        });
-        Object.assign(row, { token: editTokens[0] });
-    });
-    return addTokens[0];
-
+import setToken from "@opengis/fastify-table/crud/funcs/setToken.js";
+
+export default function assignTokens({
+    rows = [], funcs = {}, ispublic, uid, loadTable = {},
+}) {
+    if (funcs.config?.security?.disableToken) return;
+
+    if (!funcs.config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
+    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
+
+    const form = loadTable?.form || loadTable?.add_form;
+    const addTokens = setToken({
+        ids: [JSON.stringify({ add: loadTable.table, form })],
+        mode: 'a',
+        uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
+        array: 1,
+    });
+    if (!rows.length) return addTokens[0];
+
+    rows.forEach((row) => {
+        const editTokens = setToken({
+            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
+            mode: 'w',
+            uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
+            array: 1,
+        });
+        Object.assign(row, { token: editTokens[0] });
+    });
+    return addTokens[0];
+
 }

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

@@ -1,22 +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 };
+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/data/index.mjs

@@ -1,12 +1,12 @@
-import tableData from "./controllers/tableData.js";
-// import tableDataId from "./controllers/tableDataId.js";
-import cardData from "./controllers/cardData.js";
-import cardTabData from './controllers/cardTabData.js';
-import tableFilter from "./controllers/tableFilter.js";
-
-export default async function route(fastify) {
-    fastify.get(`/table-data/:table`, tableData);
-    fastify.get(`/card-data/:token`, cardTabData);
-    fastify.get(`/table-data/:table/:id`, cardData);
-    fastify.get(`/table-filter/:name`, tableFilter);
-}
+import tableData from "./controllers/tableData.js";
+// import tableDataId from "./controllers/tableDataId.js";
+import cardData from "./controllers/cardData.js";
+import cardTabData from './controllers/cardTabData.js';
+import tableFilter from "./controllers/tableFilter.js";
+
+export default async function route(fastify) {
+    fastify.get(`/table-data/:table`, tableData);
+    fastify.get(`/card-data/:token`, cardTabData);
+    fastify.get(`/table-data/:table/:id`, cardData);
+    fastify.get(`/table-filter/:name`, tableFilter);
+}

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

@@ -1,34 +1,34 @@
-
-import { join } from 'path';
-import { userTemplateDir } from '@opengis/fastify-table/utils.js';
-
-import { existsSync, readdirSync, readFileSync } from 'fs';
-const menuCache = [];
-// check module dir
-const moduleDir = join(process.cwd(), 'module');
-const dirs = existsSync(moduleDir) ?
-    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
-
-// all menu files module + user 
-const menuList = dirs.concat(userTemplateDir)
-    .map(el => join(el, 'menu.json'))
-    .filter(el => existsSync(el))
-
-
-const isProduction = process.env.NODE_ENV === 'production';
-readMenu();
-
-async function readMenu() {
-    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
-    const list = await Promise.all(menuList.map(el => readFileSync(el, 'utf-8'))); // sync 
-    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))
-
-    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
-    return menus;
-}
-export default async function adminMenu() {
-    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
-    return menus;
+
+import { join } from 'path';
+import { userTemplateDir } from '@opengis/fastify-table/utils.js';
+
+import { existsSync, readdirSync, readFileSync } from 'fs';
+const menuCache = [];
+// check module dir
+const moduleDir = join(process.cwd(), 'module');
+const dirs = existsSync(moduleDir) ?
+    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
+
+// all menu files module + user 
+const menuList = dirs.concat(userTemplateDir)
+    .map(el => join(el, 'menu.json'))
+    .filter(el => existsSync(el))
+
+
+const isProduction = process.env.NODE_ENV === 'production';
+readMenu();
+
+async function readMenu() {
+    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
+    const list = await Promise.all(menuList.map(el => readFileSync(el, 'utf-8'))); // sync 
+    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))
+
+    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
+    return menus;
+}
+export default async function adminMenu() {
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
+    return menus;
 }

package/server/routes/menu/index.mjs

@@ -1,5 +1,5 @@
-import getMenu from './controllers/getMenu.js';
-
-export default async function (fastify, opts) {
-  fastify.get(`/user-menu`, getMenu);
-}
+import getMenu from './controllers/getMenu.js';
+
+export default async function (fastify, opts) {
+  fastify.get(`/user-menu`, getMenu);
+}

package/server/routes/properties/controllers/admin.properties.get.js

@@ -1,29 +1,29 @@
-const table = 'admin.properties';
-
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-
-export default async function getSettingsAPI({
-  pg = {}, funcs = {}, params = {}, query = {},
-}) {
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
-
-  const cache = await redis.get(keyCache);
-  if (cache && !funcs.config?.local) return JSON.parse(cache);
-
-  try {
-    const res = await getSettings({
-      pg, key: params.key, json: query.json, redis, table,
-    });
-    return { message: res, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+const table = 'admin.properties';
+
+import { getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+
+export default async function getSettingsAPI({
+  pg = {}, funcs = {}, params = {}, query = {},
+}) {
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const redis = getRedis();
+  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
+
+  const cache = await redis.get(keyCache);
+  if (cache && !funcs.config?.local) return JSON.parse(cache);
+
+  try {
+    const res = await getSettings({
+      pg, key: params.key, json: query.json, redis, table,
+    });
+    return { message: res, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/properties/controllers/user.properties.get.js

@@ -1,34 +1,34 @@
-const table = 'admin.user_properties';
-
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-
-export default async function getUserProperties({
-  pg = {}, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-  if (!uid) {
-    return { message: 'access restreicted', status: 403 };
-  }
-
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
-
-  const cache = await redis.get(keyCache);
-  if (cache) return JSON.parse(cache);
-
-  try {
-    const res = await getSettings({
-      pg, key: params.key, json: query.json, redis, table, uid,
-    });
-    return { message: res, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+const table = 'admin.user_properties';
+
+import { getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+
+export default async function getUserProperties({
+  pg = {}, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  if (!uid) {
+    return { message: 'access restreicted', status: 403 };
+  }
+
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const redis = getRedis();
+  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
+
+  const cache = await redis.get(keyCache);
+  if (cache) return JSON.parse(cache);
+
+  try {
+    const res = await getSettings({
+      pg, key: params.key, json: query.json, redis, table, uid,
+    });
+    return { message: res, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/properties/controllers/user.properties.post.js

@@ -1,30 +1,30 @@
-const table = 'admin.user_properties';
-
-import { setSettings } from '../../../../utils.js';
-
-export default async function postUserProperties({
-  pg, session = {}, body = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { key, val } = body;
-
-  if ((!key || !val) && !Object.keys(body).length) {
-    return { message: 'not enough params', status: 400 };
-  }
-
-  if (!pg?.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const res = await setSettings({
-    pg, key, val, body, table, uid,
-  });
-  if (res?.error) return res;
-
-  return { message: res, status: 200 };
-}
+const table = 'admin.user_properties';
+
+import { setSettings } from '../../../../utils.js';
+
+export default async function postUserProperties({
+  pg, session = {}, body = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { key, val } = body;
+
+  if ((!key || !val) && !Object.keys(body).length) {
+    return { message: 'not enough params', status: 400 };
+  }
+
+  if (!pg?.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const res = await setSettings({
+    pg, key, val, body, table, uid,
+  });
+  if (res?.error) return res;
+
+  return { message: res, status: 200 };
+}

package/server/routes/properties/funcs/getSettings.js

@@ -1,56 +1,56 @@
-import { getMeta } from '@opengis/fastify-table/utils.js';
-
-const match = {
-  property_key: 'key',
-  property_json: 'json',
-  property_int: 'int',
-  property_text: 'text',
-};
-
-function getQuery({
-  table, columns = [], key, uid,
-}) {
-  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
-  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
-
-  if (table === 'admin.user_properties') {
-    const args = [uid, key].filter((el) => el);
-    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-    return { q, args };
-  }
-  const args = [key].filter((el) => el);
-  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-  return { q, args };
-}
-
-export default async function getSettings({
-  pg, redis, json, key, table = 'admin.properties', uid,
-}) {
-  const { columns = [] } = await getMeta({ table });
-
-  const { q, args } = getQuery({
-    table, columns, key, uid,
-  });
-
-  const { rows } = await pg.query(q, args);
-  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  
-  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
-    const [ckey, csubkey] = curr.split('.');
-    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
-    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
-    Object.assign(acc[ckey], { [csubkey]: data[curr] });
-    return acc;
-  }, {});
-
-  // save both
-  if (redis) {
-    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
-    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
-
-    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
-    await redis.set(keyCachePlain, JSON.stringify(data));
-  }
-
-  return json ? jsonData : data;
-}
+import { getMeta } from '@opengis/fastify-table/utils.js';
+
+const match = {
+  property_key: 'key',
+  property_json: 'json',
+  property_int: 'int',
+  property_text: 'text',
+};
+
+function getQuery({
+  table, columns = [], key, uid,
+}) {
+  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
+  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
+
+  if (table === 'admin.user_properties') {
+    const args = [uid, key].filter((el) => el);
+    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
+    return { q, args };
+  }
+  const args = [key].filter((el) => el);
+  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
+  return { q, args };
+}
+
+export default async function getSettings({
+  pg, redis, json, key, table = 'admin.properties', uid,
+}) {
+  const { columns = [] } = await getMeta({ table });
+
+  const { q, args } = getQuery({
+    table, columns, key, uid,
+  });
+
+  const { rows } = await pg.query(q, args);
+  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  
+  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
+    const [ckey, csubkey] = curr.split('.');
+    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
+    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
+    Object.assign(acc[ckey], { [csubkey]: data[curr] });
+    return acc;
+  }, {});
+
+  // save both
+  if (redis) {
+    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
+    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
+
+    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
+    await redis.set(keyCachePlain, JSON.stringify(data));
+  }
+
+  return json ? jsonData : data;
+}