@opengis/admin 0.1.64 → 0.1.66

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;
+}

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

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

package/server/routes/properties/funcs/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/index.mjs

@@ -1,26 +1,26 @@
-import getAdminProperties from './controllers/admin.properties.get.js';
-import postAdminProperties from './controllers/admin.properties.post.js';
-
-import getUserProperties from './controllers/user.properties.get.js';
-import postUserProperties from './controllers/user.properties.post.js';
-
-export default async function route(fastify) {
-  fastify.get('/admin-properties/:key?', {}, getAdminProperties);
-
-  fastify.route({
-    method: 'POST',
-    path: '/admin-properties',
-    config: {
-      policy: ['superadmin'],
-    },
-    handler: postAdminProperties,
-  });
-
-  fastify.get('/user-properties/:key?', {}, getUserProperties);
-
-  fastify.route({
-    method: 'POST',
-    path: '/user-properties',
-    handler: postUserProperties,
-  });
-}
+import getAdminProperties from './controllers/admin.properties.get.js';
+import postAdminProperties from './controllers/admin.properties.post.js';
+
+import getUserProperties from './controllers/user.properties.get.js';
+import postUserProperties from './controllers/user.properties.post.js';
+
+export default async function route(fastify) {
+  fastify.get('/admin-properties/:key?', {}, getAdminProperties);
+
+  fastify.route({
+    method: 'POST',
+    path: '/admin-properties',
+    config: {
+      policy: ['superadmin'],
+    },
+    handler: postAdminProperties,
+  });
+
+  fastify.get('/user-properties/:key?', {}, getUserProperties);
+
+  fastify.route({
+    method: 'POST',
+    path: '/user-properties',
+    handler: postUserProperties,
+  });
+}

package/server/routes/root.mjs

@@ -1,3 +1,3 @@
-export default async function (fastify, opts) {
-  fastify.get(`/test`, () => { return { test: true } });
-}
+export default async function (fastify, opts) {
+  fastify.get(`/test`, () => { return { test: true } });
+}

package/server/routes/templates/controllers/getTemplate.js

@@ -1,23 +1,23 @@
-import { applyHook, getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function getTemplateApi(req) {
-    const { user } = req?.session?.passport || {};
-    const { funcs, params = {}, session = {} } = req;
-    const res = await applyHook('preTemplate', { req, name: params?.name, type: params?.type, user });
-    if (res) return res;
-
-
-    const { type, name } = params;
-
-    const data = await getTemplate(type, name);
-    if (!['interface', 'table'].includes(type)
-        && (!data?.public || !data?.ispublic)
-        && !funcs?.config?.auth?.disable
-        && !session.passport?.user?.uid
-        && false
-    ) {
-        return `access restricted ${name}`;
-    }
-    await applyHook('afterTemplate', { req, data, user })
-    return data?.html || data || `template not found "${name}"`;
+import { applyHook, getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function getTemplateApi(req) {
+    const { user } = req?.session?.passport || {};
+    const { funcs, params = {}, session = {} } = req;
+    const { type, name } = params;
+    const hookData = await applyHook('preTemplate', { name, type, user });
+    if (hookData?.message && hookData?.status) {
+        return hookData;
+    }
+
+    const data = await getTemplate(type, hookData?.name || name);
+    if (!['interface', 'table'].includes(type)
+        && (!data?.public || !data?.ispublic)
+        && !funcs?.config?.auth?.disable
+        && !session.passport?.user?.uid
+        && false
+    ) {
+        return `access restricted ${name}`;
+    }
+    await applyHook('afterTemplate', { name, type, data, user });
+    return data?.html || data || `template not found "${name}"`;
 }

package/server/routes/templates/index.mjs

@@ -1,14 +1,14 @@
-import getTemplateApi from './controllers/getTemplate.js';
-
-export default async function route(fastify) {
-    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
-    fastify.get(`/template/:type/:name`, getTemplateApi);
-
-    /*fastify.addHook('onListen', async () => {
-        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
-        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
-      });*/
-
-
-
-}
+import getTemplateApi from './controllers/getTemplate.js';
+
+export default async function route(fastify) {
+    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
+    fastify.get(`/template/:type/:name`, getTemplateApi);
+
+    /*fastify.addHook('onListen', async () => {
+        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
+        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
+      });*/
+
+
+
+}

package/server/templates/cls/itree.recrzone_category.json

@@ -1,74 +1,74 @@
-[
-    {
-        "id": "12",
-        "text": "Розділювальна смуга",
-        "color": "#85754e",
-        "en": "Dividing line"
-    },
-    {
-        "id": "6",
-        "text": "Бульвар",
-        "color": "#00703c",
-        "en": "Boulevard"
-    },
-    {
-        "id": "1",
-        "text": "Вуличні насадження",
-        "color": "#8fbc8f",
-        "en": "Street plantings"
-    },
-    {
-        "id": "2",
-        "text": "Парк",
-        "color": "#a2cd5a",
-        "en": "Park"
-    },
-    {
-        "id": "3",
-        "text": "Сад",
-        "color": "#5e8c31",
-        "en": "Garden"
-    },
-    {
-        "id": "4",
-        "text": "Сквер",
-        "color": "#00ced1",
-        "en": "Square"
-    },
-    {
-        "id": "9",
-        "text": "Рекреаційна зона",
-        "color": "#e1a95f",
-        "en": "Recreational zone"
-    },
-    {
-        "id": "10",
-        "text": "Санітарно-захисна зона",
-        "color": "#6e7b8b",
-        "en": "Sanitary protection zone"
-    },
-    {
-        "id": "11",
-        "text": "Зелені насадження прибудинкової території",
-        "color": "#ace1af",
-        "en": "Green plantations in local areas"
-    },
-    {
-        "id": "5",
-        "text": "Прибережні зелені насадження",
-        "color": "#698b69",
-        "en": "Coastal green plantations"
-    },
-    {
-        "id": "7",
-        "text": "Лісопарк",
-        "color": "#6e8b3d",
-        "en": "Forest park"
-    },
-    {
-        "id": "8",
-        "text": "Міський ліс",
-        "color": "#4a5d23",
-        "en": "Urban forest"
-    }
+[
+    {
+        "id": "12",
+        "text": "Розділювальна смуга",
+        "color": "#85754e",
+        "en": "Dividing line"
+    },
+    {
+        "id": "6",
+        "text": "Бульвар",
+        "color": "#00703c",
+        "en": "Boulevard"
+    },
+    {
+        "id": "1",
+        "text": "Вуличні насадження",
+        "color": "#8fbc8f",
+        "en": "Street plantings"
+    },
+    {
+        "id": "2",
+        "text": "Парк",
+        "color": "#a2cd5a",
+        "en": "Park"
+    },
+    {
+        "id": "3",
+        "text": "Сад",
+        "color": "#5e8c31",
+        "en": "Garden"
+    },
+    {
+        "id": "4",
+        "text": "Сквер",
+        "color": "#00ced1",
+        "en": "Square"
+    },
+    {
+        "id": "9",
+        "text": "Рекреаційна зона",
+        "color": "#e1a95f",
+        "en": "Recreational zone"
+    },
+    {
+        "id": "10",
+        "text": "Санітарно-захисна зона",
+        "color": "#6e7b8b",
+        "en": "Sanitary protection zone"
+    },
+    {
+        "id": "11",
+        "text": "Зелені насадження прибудинкової території",
+        "color": "#ace1af",
+        "en": "Green plantations in local areas"
+    },
+    {
+        "id": "5",
+        "text": "Прибережні зелені насадження",
+        "color": "#698b69",
+        "en": "Coastal green plantations"
+    },
+    {
+        "id": "7",
+        "text": "Лісопарк",
+        "color": "#6e8b3d",
+        "en": "Forest park"
+    },
+    {
+        "id": "8",
+        "text": "Міський ліс",
+        "color": "#4a5d23",
+        "en": "Urban forest"
+    }
 ]

package/server/templates/cls/test.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": 1,
-        "text": "test"
-    },
-    {
-        "id": 2,
-        "text": "test2"
-    }
+[
+    {
+        "id": 1,
+        "text": "test"
+    },
+    {
+        "id": 2,
+        "text": "test2"
+    }
 ]

package/server/templates/form/admin.user_cls.data.form.json

@@ -1,50 +1,50 @@
-{
-    "label_style": "vertical",
-    "schema": {
-        "code": {
-            "type": "Text",
-            "ua": "Код",
-            "ru": "Код",
-            "en": "Code",
-            "placeholder": {
-                "ua": "Код",
-                "ru": "Код",
-                "en": "Code"
-            },
-            "validators": [
-                "required"
-            ],
-            "col": 6
-        },        
-        "name": {
-            "type": "Text",
-            "ua": "Назва",
-            "ru": "Название",
-            "en": "Name",
-            "placeholder": {
-                "ua": "Назва",
-                "ru": "Название",
-                "en": "Name"
-            },
-            "validators": [
-                "required"
-            ],
-            "col": 6
-        },
-        "icon": {
-            "type": "File",
-            "multi": false,
-            "ua": "Іконка",
-            "ru": "Иконка",
-            "en": "Icon",
-            "col": 6
-        },
-        "color": {
-            "type": "ColorPicker",
-            "ua": "Колір",
-            "ru": "Цвет",
-            "en": "Color",
-            "col": 6
-        }        
-    }
+{
+    "label_style": "vertical",
+    "schema": {
+        "code": {
+            "type": "Text",
+            "ua": "Код",
+            "ru": "Код",
+            "en": "Code",
+            "placeholder": {
+                "ua": "Код",
+                "ru": "Код",
+                "en": "Code"
+            },
+            "validators": [
+                "required"
+            ],
+            "col": 6
+        },        
+        "name": {
+            "type": "Text",
+            "ua": "Назва",
+            "ru": "Название",
+            "en": "Name",
+            "placeholder": {
+                "ua": "Назва",
+                "ru": "Название",
+                "en": "Name"
+            },
+            "validators": [
+                "required"
+            ],
+            "col": 6
+        },
+        "icon": {
+            "type": "File",
+            "multi": false,
+            "ua": "Іконка",
+            "ru": "Иконка",
+            "en": "Icon",
+            "col": 6
+        },
+        "color": {
+            "type": "ColorPicker",
+            "ua": "Колір",
+            "ru": "Цвет",
+            "en": "Color",
+            "col": 6
+        }        
+    }
 }