@opengis/admin 0.2.132 → 0.2.133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.132",
+  "version": "0.2.133",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

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

@@ -1,13 +1,11 @@
 const table = 'admin.properties';
 
-import { config, getRedis, pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
 
-import { getSettings } from '../../../../utils.js';
 
-const redis = getRedis();
 
 export default async function getSettingsApp({
-  pg = pgClients.client, params = {}, query = {},
+  pg = pgClients.client,
 }) {
   const time = Date.now();
   if (!pg.pk?.[table]) {
@@ -21,13 +19,13 @@ export default async function getSettingsApp({
     return JSON.parse(cache);
   }*/
 
-  const settings = await getSettings({
-    pg, key: params.key, json: query.json, redis, table,
-  });
+  const { rows } = await pgClients.client.query("select property_key as key,property_text as val from admin.properties /*where property_key~'^(site|map)'*/");
+  const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
+  const settings1 = rows.reduce((p, { key, val }) => ({ ...p, [key]: val }), {});
 
   const forms = await Promise.all(getTemplatePath('setting')
     .map(async (el) => ({ name: el[0], body: await getTemplate('setting', el[0]) }))
   );
 
-  return { message: { time: Date.now() - time, forms, settings }, status: 200 };
+  return { message: { time: Date.now() - time, forms, settings: settings1 }, status: 200 };
 }

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

@@ -1,9 +1,21 @@
 const table = 'admin.properties';
 
-import { setSettings } from '../../../../utils.js';
+import { dataInsert } from '@opengis/fastify-table/utils.js';
+
+function checkValueType(val) {
+  if (val) {
+    if (typeof val === 'object') {
+      return 'property_json';
+    }
+    if (typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
+      return 'property_int';
+    }
+  }
+  return 'property_text';
+}
 
 export default async function postSettingsApp({
-  pg, user = {}, body = {},
+  pg, user = {}, body = {}, uid
 }) {
   if (!user?.user_type?.includes?.('admin')) {
     return { message: 'access restricted', status: 403 };
@@ -16,11 +28,20 @@ export default async function postSettingsApp({
   if (!pg?.pk?.[table]) {
     return { message: 'table not found', status: 404 };
   }
+  const keys = Object.keys(body);
+  await pg.query(`delete from ${table} where property_key=any($1)`, [keys]);
+
+  await Promise.all(keys.map(async (el) => {
+    const columnType = table === 'admin.user_properties' ? 'property_json' : checkValueType(body[el]);
+    const data = { property_key: el, [columnType]: body[el], uid };
+    if (!body[el]) return;
+    await dataInsert({
+      pg, table, data, uid,
+    });
+
+  }));
+
 
-  const res = await setSettings({
-    pg, key, val, body,
-  });
-  if (res?.error) return res;
 
-  return { message: res, status: 200 };
+  return { message: 'ok', status: 200 };
 }

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

@@ -1,11 +1,8 @@
 const table = 'admin.user_properties';
 
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
 
 export default async function getSettingsUser({
-  pg = {}, params = {}, query = {}, session = {},
+  pg = {}, session = {},
 }) {
   const { uid } = session.passport?.user || {};
   if (!uid) {
@@ -16,15 +13,7 @@ export default async function getSettingsUser({
     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);
 
-  const res = await getSettings({
-    pg, key: params.key, json: query.json, redis, table, uid,
-  });
 
-  return { message: res, status: 200 };
+  return { message: 'user', status: 200 };
 }

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

@@ -1,30 +1,10 @@
 const table = 'admin.user_properties';
 
-import { setSettings } from '../../../../utils.js';
+
 
 export default async function postSettingsUser({
   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 };
+  return { message: 'ok', status: 200 };
 }

package/server/routes/properties/index.mjs

@@ -1,8 +1,8 @@
 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 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';
@@ -13,8 +13,8 @@ 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-user/:key?', { scheme: propertiesSchema }, getSettingsUser);
+  // fastify.post('/settings-user', {}, postSettingsUser);
 
   fastify.get('/settings-table/:table/:entity?', {}, getSettingsTable);
   fastify.post('/settings-table/:table', {}, postSettingsTable);

package/utils.js

@@ -1,14 +1,13 @@
 import yamlSafe from 'js-yaml';
 
-import getSettings from './server/routes/properties/funcs/getSettings.js';
-import setSettings from './server/routes/properties/funcs/setSettings.js';
+
 
 import addNotification from './server/routes/notifications/funcs/addNotification.js';
 import sendNotification from './server/routes/notifications/funcs/sendNotification.js';
 
 import getAdminAccess from './server/plugins/access/funcs/getAdminAccess.js';
 
-function loadSafe (yml) {
+function loadSafe(yml) {
   try {
     return yamlSafe.load(yml);
   } catch (err) {
@@ -21,8 +20,6 @@ Object.assign(yamlSafe, { loadSafe });
 export default null;
 export {
   yamlSafe,
-  getSettings,
-  setSettings,
   addNotification,
   sendNotification,
   getAdminAccess,

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

@@ -1,56 +0,0 @@
-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;
-}

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

@@ -1,44 +0,0 @@
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-import dataInsert from '../utils/dataInsert.js';
-
-function checkValueType(val) {
-  if (val) {
-    if (typeof val === 'object') {
-      return 'property_json';
-    }
-    if (typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
-      return 'property_int';
-    }
-  }
-  return 'property_text';
-}
-
-export default async function setSettings({
-  pg, key, val, body = {}, table = 'admin.properties', uid,
-}) {
-  const body1 = key && val ? { [key]: val } : body;
-  const keys = Object.keys(body1);
-  try {
-    const redis = getRedis();
-    await pg.query(`delete from ${table} where property_key=any($1)`, [keys]);
-
-    await Promise.all(keys.map(async (el) => {
-      const columnType = table === 'admin.user_properties' ? 'property_json' : checkValueType(body1[el]);
-      const data = { property_key: el, [columnType]: body1[el], uid };
-      const { rows } = await dataInsert({
-        pg, table, data, uid,
-      });
-      return { key: el, rows: { val: body[el], data: rows?.[0] } };
-    }));
-
-    const res = await getSettings({
-      pg, redis, table, uid,
-    });
-    return res;
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}