@opengis/admin 0.3.22 → 0.3.24

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

@@ -1,120 +1,120 @@
-import { pgClients, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
-
-import getColumnMetaData from '../utils/getColumnMetaData.js';
-
-/**
- *
- * @method GET
- * @priority 4
- * @alias getSettingsTable
- * @type api
- * @tag custom
-
- * @returns {String} message and status
- */
-
-export default async function getSettingsTable({
-  pg = pgClients.client, params = {}, user = {}, query = {},
-}) {
-  const { table, entity } = params;
-  const { uid } = user;
-  const time = [];
-
-  if (!uid) {
-    return { message: 'access restricted', status: 401 };
-  }
-
-  if (!table) {
-    return { message: 'not enough params: table', status: 400 };
-  }
-
-  const loadTable = await getTemplate('table', table);
-
-  const tableName = loadTable?.table || table;
-  const meta = await getMeta({ pg, table: tableName });
-  const { view, pk } = meta || {};
-  time.push(Date.now());
-
-  if (!pk && !view) {
-    return {
-      message: `table primary key not found: ${tableName}`,
-      status: 400,
-    };
-  }
-
-  const { rows: geometry } = meta?.geom
-    ? await pg.queryCache(`select st_geometrytype(${meta?.geom}) as type ,count(*) 
-    from ${tableName} group by st_geometrytype(${meta?.geom})`, { table: tableName }) : [];
-  time.push(Date.now());
-
-  const stat = !view ? await getColumnMetaData({ pg, table: tableName }) : {};
-  time.push(Date.now());
-
-  const { total = 0 } = await pg.queryCache(`select count(*) as total from ${tableName}`, { table: tableName })
-    .then(el => el.rows?.[0] || {});
-  time.push(Date.now());
-
-  const { property_json: customColumns = [] } = await pg.query(`select property_json::json from setting.property 
-  where property_entity='customColumn' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const { property_json: tableSettingColumns } = await pg.query(`select property_json::json from setting.property 
-  where property_entity='column' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const columns = (tableSettingColumns || loadTable?.columns || meta?.columns)?.map((el) => ({ ...el, title: el.title || el.name }))
-    ?.filter((value, index, array) => array?.map((el) => el.name).indexOf(value.name) === index); // get unique columns
-
-  const cls = columns?.filter((el) => ['badge', 'select'].includes(el.format) && (el.option || el.data))
-    ?.map((el) => (el.option || el.data))
-    ?.filter((value, index, array) => array.indexOf(value) === index); // get unique cls
-
-  const { property_json: userFilterList } = await pg.query(`select property_json::json from setting.property
-    where property_entity='filter' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const { property_json: customQuery } = await pg.query(`select json_agg(json_build_object('id',property_id,'name', property_key,
-  'query', property_text, 'disabled', coalesce((property_json::json->>'disabled')::boolean,false) )) as property_json
-  from setting.property where 1=1 and property_entity='customQuery' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  time.push(Date.now());
-
-  const debug = user?.user_type?.includes('admin') && query?.debug
-    ? {
-      view,
-      tableName,
-      opt,
-      colModel,
-      metaColumns: meta?.columns,
-      columnProperties: tableSettingColumns,
-    }
-    : undefined;
-
-  const res = {
-    message: {
-      time: {
-        geom: time[1] - time[0],
-        stat: time[2] - time[1],
-        count: time[3] - time[2],
-        total: time[4] - time[0],
-      },
-      debug,
-      model: tableName,
-      total,
-      geometry,
-      stat,
-      cls,
-      columns,
-      filters: userFilterList?.length
-        ? userFilterList
-        : loadTable?.filters?.map((el) => ({ ...el, title: el.title || el.ua })),
-      customQuery: customQuery?.length ? customQuery : [],
-      customColumns,
-      customFilters: userFilterList || [],
-    },
-    status: 200,
-  };
-
-  if (entity) {
-    return { [entity]: res.message[entity] };
-  }
-
-  return res;
-};
+import { pgClients, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+import getColumnMetaData from '../utils/getColumnMetaData.js';
+
+/**
+ *
+ * @method GET
+ * @priority 4
+ * @alias getSettingsTable
+ * @type api
+ * @tag custom
+
+ * @returns {String} message and status
+ */
+
+export default async function getSettingsTable({
+  pg = pgClients.client, params = {}, user = {}, query = {},
+}) {
+  const { table, entity } = params;
+  const { uid } = user;
+  const time = [];
+
+  if (!uid) {
+    return { message: 'access restricted', status: 401 };
+  }
+
+  if (!table) {
+    return { message: 'not enough params: table', status: 400 };
+  }
+
+  const loadTable = await getTemplate('table', table);
+
+  const tableName = loadTable?.table || table;
+  const meta = await getMeta({ pg, table: tableName });
+  const { view, pk } = meta || {};
+  time.push(Date.now());
+
+  if (!pk && !view) {
+    return {
+      message: `table primary key not found: ${tableName}`,
+      status: 400,
+    };
+  }
+
+  const { rows: geometry } = meta?.geom
+    ? await pg.queryCache(`select st_geometrytype(${meta?.geom}) as type ,count(*) 
+    from ${tableName} group by st_geometrytype(${meta?.geom})`, { table: tableName }) : [];
+  time.push(Date.now());
+
+  const stat = !view ? await getColumnMetaData({ pg, table: tableName }) : {};
+  time.push(Date.now());
+
+  const { total = 0 } = await pg.queryCache(`select count(*) as total from ${tableName}`, { table: tableName })
+    .then(el => el.rows?.[0] || {});
+  time.push(Date.now());
+
+  const { property_json: customColumns = [] } = await pg.query(`select property_json::json from setting.property 
+  where property_entity='customColumn' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  const { property_json: tableSettingColumns } = await pg.query(`select property_json::json from setting.property 
+  where property_entity='column' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  const columns = (tableSettingColumns || loadTable?.columns || meta?.columns)?.map((el) => ({ ...el, title: el.title || el.name }))
+    ?.filter((value, index, array) => array?.map((el) => el.name).indexOf(value.name) === index); // get unique columns
+
+  const cls = columns?.filter((el) => ['badge', 'select'].includes(el.format) && (el.option || el.data))
+    ?.map((el) => (el.option || el.data))
+    ?.filter((value, index, array) => array.indexOf(value) === index); // get unique cls
+
+  const { property_json: userFilterList } = await pg.query(`select property_json::json from setting.property
+    where property_entity='filter' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  const { property_json: customQuery } = await pg.query(`select json_agg(json_build_object('id',property_id,'name', property_key,
+  'query', property_text, 'disabled', coalesce((property_json::json->>'disabled')::boolean,false) )) as property_json
+  from setting.property where 1=1 and property_entity='customQuery' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  time.push(Date.now());
+
+  const debug = user?.user_type?.includes('admin') && query?.debug
+    ? {
+      view,
+      tableName,
+      opt,
+      colModel,
+      metaColumns: meta?.columns,
+      columnProperties: tableSettingColumns,
+    }
+    : undefined;
+
+  const res = {
+    message: {
+      time: {
+        geom: time[1] - time[0],
+        stat: time[2] - time[1],
+        count: time[3] - time[2],
+        total: time[4] - time[0],
+      },
+      debug,
+      model: tableName,
+      total,
+      geometry,
+      stat,
+      cls,
+      columns,
+      filters: userFilterList?.length
+        ? userFilterList
+        : loadTable?.filters?.map((el) => ({ ...el, title: el.title || el.ua })),
+      customQuery: customQuery?.length ? customQuery : [],
+      customColumns,
+      customFilters: userFilterList || [],
+    },
+    status: 200,
+  };
+
+  if (entity) {
+    return { [entity]: res.message[entity] };
+  }
+
+  return res;
+};

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

@@ -1,115 +1,115 @@
-import { getRedis, pgClients } from '@opengis/fastify-table/utils.js';
-
-import refreshData from '../utils/refreshData.js';
-
-const rclient = getRedis();
-
-/**
- *
- * @method POST
- * @priority 4
- * @alias postSettingsTable
- * @type api
- * @tag custom
- * @returns {String} message and status
- */
-
-export default async function postTablpostSettingsTableeProperties({
-  pg = pgClients.client, params = {}, body = {}, user = {},
-}) {
-  const { table } = params;
-  const { uid } = user;
-
-  if (!uid) {
-    return { message: 'access restricted', status: 401 };
-  }
-
-  if (!table) {
-    return { message: 'not enough params: table', status: 400 };
-  }
-
-  const {
-    deleted = [],
-    columns = [],
-    filters = [],
-    customColumns = [],
-    customQuery = [],
-  } = body;
-
-  const cacheKey = `${pg.options?.database}:filter-list:${table}`;
-
-  if (Array.isArray(deleted) && deleted?.length) {
-    const sqlList = {
-      columns: `delete from setting.property where property_entity='column' and object_id=$1`,
-      filters: `delete from setting.property where property_entity='filter' and object_id=$1`,
-      customColumns: `delete from setting.custom_data where attr in (select cf_id from setting.custom_field where object_id=$1);
-      delete from setting.custom_field where object_id=$1;
-      delete from setting.property where property_entity='customColumn' and object_id=$1;`,
-      customQuery: `delete from setting.property where property_entity='customQuery' and object_id=$1;`,
-    };
-    const q = deleted.map((item) => sqlList[item])?.filter((el) => el)?.join(' ');
-    const { rowCount = 0 } = await pg.query(q, [table]);
-
-    if (['customColumn', 'column'].find((el) => deleted.includes(el))) {
-      // await funcs.applyHook('preTemplate', { pg, name: table, type: 'table' });
-    }
-    if (['customQuery', 'filter'].find((el) => deleted.includes(el))) {
-      await rclient.del(cacheKey);
-    }
-
-    if (rowCount === 0) {
-      return { message: 'nothing to restore', status: 200 };
-    }
-
-    return {
-      message: {
-        command: 'DELETE',
-        deleted,
-        table,
-        result: 'success',
-      },
-      status: 200,
-    };
-  }
-
-  const result = {};
-  // custom filter query (sql)
-  if (customQuery?.length) {
-    const res = await refreshData({ pg, entity: 'customQuery', table, uid, data: customQuery });
-    if (res?.error) return res;
-    Object.assign(result, { customQuery: res });
-  }
-
-  // columns
-  if (columns?.length) {
-    const res = await refreshData({ pg, entity: 'column', table, uid, data: columns });
-    if (res?.error) return res;
-    Object.assign(result, { columns: res });
-  }
-
-  // custom columns
-  if (customColumns?.length) {
-    const colModel = await pg.query(`select property_json::json from setting.property
-    where property_entity='customColumn' and object_id=$1`, [table]).then((el) => el.rows?.[0]?.property_json);
-
-    const res = await refreshData({ pg, entity: 'customColumn', table, uid, data: customColumns, colModel });
-    if (res?.error) return res;
-    Object.assign(result, { customColumns: res });
-  }
-
-  // filters
-  if (filters?.length) {
-    const res = await refreshData({ pg, entity: 'filter', table, uid, data: filters });
-    if (res?.error) return res;
-    Object.assign(result, { filters: res });
-  }
-
-  if (columns?.length || customColumns?.length) {
-    // await funcs.applyHook('preTemplate', { pg, type: 'table', name: table });
-  }
-  if (filters?.length || customQuery?.length) {
-    await rclient.del(cacheKey);
-  }
-
-  return { message: result, status: 200 };
-};
+import { getRedis, pgClients } from '@opengis/fastify-table/utils.js';
+
+import refreshData from '../utils/refreshData.js';
+
+const rclient = getRedis();
+
+/**
+ *
+ * @method POST
+ * @priority 4
+ * @alias postSettingsTable
+ * @type api
+ * @tag custom
+ * @returns {String} message and status
+ */
+
+export default async function postTablpostSettingsTableeProperties({
+  pg = pgClients.client, params = {}, body = {}, user = {},
+}) {
+  const { table } = params;
+  const { uid } = user;
+
+  if (!uid) {
+    return { message: 'access restricted', status: 401 };
+  }
+
+  if (!table) {
+    return { message: 'not enough params: table', status: 400 };
+  }
+
+  const {
+    deleted = [],
+    columns = [],
+    filters = [],
+    customColumns = [],
+    customQuery = [],
+  } = body;
+
+  const cacheKey = `${pg.options?.database}:filter-list:${table}`;
+
+  if (Array.isArray(deleted) && deleted?.length) {
+    const sqlList = {
+      columns: `delete from setting.property where property_entity='column' and object_id=$1`,
+      filters: `delete from setting.property where property_entity='filter' and object_id=$1`,
+      customColumns: `delete from setting.custom_data where attr in (select cf_id from setting.custom_field where object_id=$1);
+      delete from setting.custom_field where object_id=$1;
+      delete from setting.property where property_entity='customColumn' and object_id=$1;`,
+      customQuery: `delete from setting.property where property_entity='customQuery' and object_id=$1;`,
+    };
+    const q = deleted.map((item) => sqlList[item])?.filter((el) => el)?.join(' ');
+    const { rowCount = 0 } = await pg.query(q, [table]);
+
+    if (['customColumn', 'column'].find((el) => deleted.includes(el))) {
+      // await funcs.applyHook('preTemplate', { pg, name: table, type: 'table' });
+    }
+    if (['customQuery', 'filter'].find((el) => deleted.includes(el))) {
+      await rclient.del(cacheKey);
+    }
+
+    if (rowCount === 0) {
+      return { message: 'nothing to restore', status: 200 };
+    }
+
+    return {
+      message: {
+        command: 'DELETE',
+        deleted,
+        table,
+        result: 'success',
+      },
+      status: 200,
+    };
+  }
+
+  const result = {};
+  // custom filter query (sql)
+  if (customQuery?.length) {
+    const res = await refreshData({ pg, entity: 'customQuery', table, uid, data: customQuery });
+    if (res?.error) return res;
+    Object.assign(result, { customQuery: res });
+  }
+
+  // columns
+  if (columns?.length) {
+    const res = await refreshData({ pg, entity: 'column', table, uid, data: columns });
+    if (res?.error) return res;
+    Object.assign(result, { columns: res });
+  }
+
+  // custom columns
+  if (customColumns?.length) {
+    const colModel = await pg.query(`select property_json::json from setting.property
+    where property_entity='customColumn' and object_id=$1`, [table]).then((el) => el.rows?.[0]?.property_json);
+
+    const res = await refreshData({ pg, entity: 'customColumn', table, uid, data: customColumns, colModel });
+    if (res?.error) return res;
+    Object.assign(result, { customColumns: res });
+  }
+
+  // filters
+  if (filters?.length) {
+    const res = await refreshData({ pg, entity: 'filter', table, uid, data: filters });
+    if (res?.error) return res;
+    Object.assign(result, { filters: res });
+  }
+
+  if (columns?.length || customColumns?.length) {
+    // await funcs.applyHook('preTemplate', { pg, type: 'table', name: table });
+  }
+  if (filters?.length || customQuery?.length) {
+    await rclient.del(cacheKey);
+  }
+
+  return { message: result, status: 200 };
+};

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

@@ -1,19 +1,19 @@
-const table = 'admin.user_properties';
-
-
-export default async function getSettingsUser({
-  pg = {}, 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 };
-  }
-
-
-
-  return { message: 'user', status: 200 };
-}
+const table = 'admin.user_properties';
+
+
+export default async function getSettingsUser({
+  pg = {}, 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 };
+  }
+
+
+
+  return { message: 'user', status: 200 };
+}

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

@@ -1,10 +1,10 @@
-const table = 'admin.user_properties';
-
-
-
-export default async function postSettingsUser({
-  pg, session = {}, body = {},
-}) {
-
-  return { message: 'ok', status: 200 };
-}
+const table = 'admin.user_properties';
+
+
+
+export default async function postSettingsUser({
+  pg, session = {}, body = {},
+}) {
+
+  return { message: 'ok', status: 200 };
+}

package/server/routes/properties/index.mjs

@@ -1,21 +1,21 @@
-import getSettingsApp from './controllers/admin.properties.get.js';
-import postSettingsApp from './controllers/admin.properties.post.js';
-
-//import getSettingsUser from './controllers/user.properties.get.js';
-//import postSettingsUser from './controllers/user.properties.post.js';
-
-import getSettingsTable from './controllers/table.properties.get.js';
-import postSettingsTable from './controllers/table.properties.post.js';
-
-import { propertiesSchema } from './schema.js';
-
-export default async function route(fastify) {
-  fastify.get('/settings-app/:key?', { scheme: propertiesSchema }, getSettingsApp);
-  fastify.post('/settings-app', { config: { policy: ['admin'] } }, postSettingsApp);
-
-  //fastify.get('/settings-user/:key?', { scheme: propertiesSchema }, getSettingsUser);
-  // fastify.post('/settings-user', {}, postSettingsUser);
-
-  fastify.get('/settings-table/:table/:entity?', {}, getSettingsTable);
-  fastify.post('/settings-table/:table', {}, postSettingsTable);
-}
+import getSettingsApp from './controllers/admin.properties.get.js';
+import postSettingsApp from './controllers/admin.properties.post.js';
+
+//import getSettingsUser from './controllers/user.properties.get.js';
+//import postSettingsUser from './controllers/user.properties.post.js';
+
+import getSettingsTable from './controllers/table.properties.get.js';
+import postSettingsTable from './controllers/table.properties.post.js';
+
+import { propertiesSchema } from './schema.js';
+
+export default async function route(fastify) {
+  fastify.get('/settings-app/:key?', { scheme: propertiesSchema }, getSettingsApp);
+  fastify.post('/settings-app', { config: { policy: ['admin'] } }, postSettingsApp);
+
+  //fastify.get('/settings-user/:key?', { scheme: propertiesSchema }, getSettingsUser);
+  // fastify.post('/settings-user', {}, postSettingsUser);
+
+  fastify.get('/settings-table/:table/:entity?', {}, getSettingsTable);
+  fastify.post('/settings-table/:table', {}, postSettingsTable);
+}

package/server/routes/properties/utils/dataInsert.js

@@ -1,26 +1,26 @@
-import { getMeta, getPG } from '@opengis/fastify-table/utils.js';
-
-export default async function dataInsert({
-  table, data, pg: pg1,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta(table);
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-
-    values  (${filterData?.map((key, i) => (key[0] === 'property_json' ? `to_json($${i + 1}::${key[1] && typeof key[1] === 'object' ? 'json' : 'text'})` : `$${i + 1}`)).join(',')}) 
-    
-    returning *`;
-
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
-
-  return res;
-}
+import { getMeta, getPG } from '@opengis/fastify-table/utils.js';
+
+export default async function dataInsert({
+  table, data, pg: pg1,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  if (!data) return null;
+  const { columns } = await getMeta(table);
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
+
+  const insertQuery = `insert into ${table}
+
+    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
+
+    values  (${filterData?.map((key, i) => (key[0] === 'property_json' ? `to_json($${i + 1}::${key[1] && typeof key[1] === 'object' ? 'json' : 'text'})` : `$${i + 1}`)).join(',')}) 
+    
+    returning *`;
+
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+
+  return res;
+}

package/server/routes/properties/utils/getColumnMetaData.js

@@ -1,17 +1,17 @@
-import { pgClients, getMeta } from '@opengis/fastify-table/utils.js';
-
-export default async function getColumnMetaData({
-  pg = pgClients.client, table,
-}) {
-  if (!table) return null;
-
-  const { columns = [] } = await getMeta({ pg, table });
-  const columnList = columns.filter(el => !['files', 'uid', 'editor_date', 'editor_id', 'cdate'].includes(el.name)).map(el => el.name);
-
-  const sql = `select count(*) as total, ${columnList.map((item) => `(count(*) filter(where ${item} is not null)) as "${item}"`).join(',')} from ${table}`;
-  const res = await pg.queryCache(sql, { table }).then(el => el.rows?.[0] || {});
-
-  return columns
-    .filter(el => !['files', 'uid', 'editor_date', 'editor_id', 'cdate'].includes(el.name))
-    .map((row) => Object.assign(row, { percent: ((+res[row.name] / +res.total) * 100).toFixed(0) }));
-};
+import { pgClients, getMeta } from '@opengis/fastify-table/utils.js';
+
+export default async function getColumnMetaData({
+  pg = pgClients.client, table,
+}) {
+  if (!table) return null;
+
+  const { columns = [] } = await getMeta({ pg, table });
+  const columnList = columns.filter(el => !['files', 'uid', 'editor_date', 'editor_id', 'cdate'].includes(el.name)).map(el => el.name);
+
+  const sql = `select count(*) as total, ${columnList.map((item) => `(count(*) filter(where ${item} is not null)) as "${item}"`).join(',')} from ${table}`;
+  const res = await pg.queryCache(sql, { table }).then(el => el.rows?.[0] || {});
+
+  return columns
+    .filter(el => !['files', 'uid', 'editor_date', 'editor_id', 'cdate'].includes(el.name))
+    .map((row) => Object.assign(row, { percent: ((+res[row.name] / +res.total) * 100).toFixed(0) }));
+};