@opengis/admin 0.3.56 → 0.3.58

package/module/settings/form/admin.users_edit.form.json

@@ -44,6 +44,33 @@
                 "email"
             ]
         },
+        "d2": {
+            "type": "HTML",
+            "title": false,
+            "text": "<h4 class='text-center'>Логін / Пароль</h4><br>",
+            "hidden": true,
+            "col": 12
+        },
+        "login": {
+            "type": "Text",
+            "ua": "Логін",
+            "i": "Вноситься довільний логін користувача латинськими літерами, що буде використовуватися для входу в систему",
+            "ru": "Логин"
+        },
+        "password": {
+            "type": "Password",
+            "validators": [
+                {
+                    "type": "regexp",
+                    "regexp": "^.{8,}$",
+                    "flags": "gm",
+                    "message": "Пароль повинен бути більше 8 символів"
+                }
+            ],
+            "ua": "Пароль",
+            "i": "Вноситься пароль, що буде використовуватися для входу в систему (рекомендоване використання складних паролів)",
+            "ru": "Пароль"
+        },
         "d3": {
             "type": "HTML",
             "text": "<h4 class='text-center'>Доступ</h4><br>",

package/package.json

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

package/server/helpers/list/tableList.js

@@ -46,7 +46,7 @@ export default async function tableList(data, opt) {
         skip[name] = name.includes('{{') && !nameHBS;
         if (skip[name]) continue;
 
-        result.push(`<th class="py-2">
+        result.push(`<th class="py-2 min-w-[200px] last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0">
                     ${nameHBS || name}
         </th>`)
     }
@@ -55,7 +55,7 @@ export default async function tableList(data, opt) {
     // body 
     for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
-        result.push('<tr class="odd:bg-gray-50">');
+        result.push('<tr class="bg-white odd:bg-gray-50 ">');
         const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
         const token = hash.table ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
         for (let i = 0; i < keys.length; i += 2) {
@@ -67,7 +67,7 @@ export default async function tableList(data, opt) {
 
             const tokenData = key == 'actions' ? token : null;
             const d1 = key.includes('{{') ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
-            result.push(`<td class="py-2 pr-5">
+            result.push(`<td class="py-2 pr-5  last:sticky last:right-0 ">
                                ${d1 || format(tokenData || row[key], key, row, hash)}
                             </td>`);
 
@@ -79,5 +79,5 @@ export default async function tableList(data, opt) {
     result.push('</tbody>');
 
     //    console.log(Date.now() - time)
-    return '<table class="min-w-full divide-y-2 divide-gray-200 bg-white min-w-full divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600">' + result.join('') + '</table>';
+    return '<table class="min-w-full relative divide-y-2 divide-gray-200 bg-white min-w-full overflow-auto divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600">' + result.join('') + '</table>';
 }

package/server/plugins/hook.js

@@ -123,6 +123,7 @@ export default async function plugin(fastify) {
             const hashes = await rclient.hgetall('cls-insert-hashes').then(obj => Object.keys(obj));
             const dbdata = await client.query(`select json_object_agg(name, hash) from admin.cls where parent is null`).then(el => el.rows?.[0]?.json_object_agg || {});
             const names = Object.keys(dbdata);
+            console.log('admin/hook cls promise start');
             const qHashes = await Promise.all(cls.filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) === idx).map(async (el) => {
                 const { name, module, type } = el;
                 const loadTemplate = await getTemplate(type, name);
@@ -134,20 +135,20 @@ export default async function plugin(fastify) {
 
                 if (type === 'select' && (loadTemplate?.sql || loadTemplate) && el.update) {
                     clsQuery.push(`insert into admin.cls(name,type,data,module,hash) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}','${el.hash}')`);
-                    console.log(name, type, 'insert fresh select');
+                    if (config.trace) console.log(name, type, 'insert fresh select');
                     return el.hash;
                 } else if (type === 'cls' && loadTemplate?.length && el.update) {
                     clsQuery.push(`insert into admin.cls(name,type, module,hash) values('${name}','json', '${module?.replace(/'/g, "''")}','${el.hash}'); 
                 insert into admin.cls(code,name,parent,icon,data) 
                 select value->>'id',value->>'text','${name}',value->>'icon',value->>'data' 
                 from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json)`);
-                    console.log(name, type, 'insert fresh cls');
+                    if (config.trace) console.log(name, type, 'insert fresh cls');
                     return el.hash;
                 } else if (hashes.includes(el.hash)) {
-                    console.log(name, type, names.includes(name) ? 'skip equal hash' : 'insert missing cls');
+                    if (config.trace) console.log(name, type, names.includes(name) ? 'skip equal hash' : 'insert missing cls');
                     return el.hash;
                 } else {
-                    console.log(name, type, 'empty');
+                    if (config.trace) console.log(name, type, 'empty');
                     return el.hash;
                 }
             }));
@@ -165,6 +166,7 @@ export default async function plugin(fastify) {
                 logger.file('migration/hash', { list: qHashes.filter(el => el) });
                 console.log('admin/hook cls sql finish', clsQuery?.length);
             }
+            console.log('admin/hook cls promise finish', rowCount);
         } catch (err) {
             console.error('admin/hook cls sql error', err.toString());
             console.trace(err);

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

@@ -37,6 +37,9 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
 
     const { rows } = await pgClients.client.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || 'site|map|admin'})'`);
     const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
+
+    if (config.settings) Object.assign(settings, config.settings);
+
     // update user access
     const { user_name, sur_name, father_name, email, phone, uid } = user;
     const result = { settings, user: { uid, user_name, sur_name, father_name, email, phone } };