@opengis/admin 0.3.64 → 0.3.66

package/dist/{profile-page-4waAht89.js → profile-page-5pEpnlCB.js}

@@ -1,4 +1,4 @@
-import { _ as n, e as m } from "./import-file-DRzOvv7x.js";
+import { _ as n, e as m } from "./import-file-Dt2mnHAW.js";
 import { u as p } from "./user-B_2kh6ic.js";
 import { resolveComponent as d, createElementBlock as f, openBlock as u, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.64",
+  "version": "0.3.66",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -46,9 +46,9 @@
     "@fullcalendar/list": "^6.1.15",
     "@fullcalendar/timegrid": "^6.1.15",
     "@fullcalendar/vue3": "^6.1.15",
-    "@opengis/fastify-auth": "^1.0.73",
-    "@opengis/fastify-file": "^1.0.42",
-    "@opengis/fastify-table": "^1.2.98",
+    "@opengis/fastify-auth": "1.0.80",
+    "@opengis/fastify-file": "1.0.66",
+    "@opengis/fastify-table": "1.3.25",
     "@opengis/v3-core": "^0.3.126",
     "@opengis/v3-filter": "^0.0.72",
     "@tiptap/core": "^2.8.0",

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

@@ -6,26 +6,20 @@ import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/
 
 export default async function getSettingsApp({
   pg = pgClients.client,
-}) {
+}, reply) {
   const time = Date.now();
+
   if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
+    return reply.status(404).send('table not found');
   }
 
-  /*const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
-  const cache = await redis.get(keyCache);
-
-  if (cache && !config?.local) {
-    return JSON.parse(cache);
-  }*/
+  const { rows = [] } = await pg.query('select property_key as key, property_text, property_json from admin.properties');
 
-  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 settings = rows.reduce((acc, { key, property_text, property_json }) => ({ ...acc, [key]: property_text || property_json }), {});
 
   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: settings1 }, status: 200 };
+  return reply.status(200).send({ time: Date.now() - time, forms, settings });
 }

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

@@ -1,6 +1,6 @@
 const table = 'admin.properties';
 
-import { dataInsert } from '@opengis/fastify-table/utils.js';
+import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
 
 function checkValueType(val) {
   if (val) {
@@ -15,28 +15,34 @@ function checkValueType(val) {
 }
 
 export default async function postSettingsApp({
-  pg, user = {}, body = {}, uid
-}) {
+  pg = pgClients.client, body = {}, user = {}, uid = user?.uid,
+}, reply) {
   if (!user?.user_type?.includes?.('admin')) {
-    return { message: 'access restricted', status: 403 };
+    return reply.status(403).send('access restricted');
   }
   const { key, val } = body;
+
   if ((!key || !val) && !Object.keys(body).length) {
-    return { message: 'not enough params', status: 400 };
+    return reply.status(400).send('not enough body params');
   }
 
   if (!pg?.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
+    return reply.status(404).send('table not found');
   }
+
   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 Promise.all(keys.filter(el => body[el]).map(async (el) => {
+    const columnType = table === 'admin.user_properties'
+      ? 'property_json'
+      : checkValueType(body[el]);
+
     await dataInsert({
-      pg, table, data, uid,
+      pg,
+      table,
+      data: { property_key: el, [columnType]: body[el] },
+      uid,
     });
 
   }));