@opengis/admin 0.2.54 → 0.2.56

package/module/settings/form/context.account_grants.form.json

@@ -1,24 +1,25 @@
 {
   "rule_id": {
     "ua": "id Правила",
-    "type": "Select",
+    "type": "Autocomplete",
     "data": "core.rules"
   },
   "rule_values": {
     "ua": "Значення",
-    "type": "text"
+    "type": "Text"
   },
   "expire_date": {
     "ua": "Дата закінчення дії дозволу",
-    "type": "Datepicker"
+    "type": "DatePicker"
   },
   "actions": {
     "ua": "Дії",
-    "type": "checkbox",
+    "type": "Checkbox",
     "options": [
+      "view",
+      "add",
       "edit",
-      "edit",
-      "add"
+      "del"
     ]
   }
 }

package/module/settings/form/context.account_users.form.json

@@ -1,11 +1,11 @@
 {
   "account_id": {
-    "ua": "id Організації",
-    "type": "Select",
+    "ua": "Організація",
+    "type": "Autocomplete",
     "data": "core.accounts"
   },
-  "user_id": {
-    "ua": "id Користувача",
+  "user_uid": {
+    "ua": "Користувач",
     "type": "Autocomplete",
     "data": "core.user_uid"
   }

package/module/settings/form/user.user_roles.form.json

@@ -1,7 +1,7 @@
 {
     "role_id": {
         "ua": "Група",
-        "type": "Select",
+        "type": "Autocomplete",
         "data": "core.roles",
         "validators": [
             "required"

package/module/settings/table/admin.accounts.table.json

@@ -37,6 +37,13 @@
       "ua": "Назва",
       "name": "account_name",
       "type": "text"
+    },
+    {
+      "ua": "Хто створив",
+      "name": "uid",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
+      "data": "core.user_uid"
     }
   ]
 }

package/module/settings/table/admin.custom_column.table.json

@@ -43,12 +43,12 @@
         {
             "name": "filter",
             "title": "Фільтр по колонці",
-            "format": "yes_no"
+            "format": "check"
         },
         {
             "name": "_table",
             "title": "Відображати в таблиці",
-            "format": "yes_no"
+            "format": "check"
         },
         {
             "name": "uid",
@@ -92,9 +92,10 @@
         },
         {
             "name": "uid",
-            "title": "Користувач",
+            "ua": "Користувач",
             "data": "core.user_uid",
-            "type": "Text"
+            "apiPrefix": "api",
+            "type": "Autocomplete"
         }
     ]
 }

package/module/settings/table/admin.roles.table.json

@@ -47,7 +47,7 @@
         },
         {
             "name": "enabled",
-            "format": "switcher",
+            "format": "check",
             "title": "On / Off"
         }
     ],
@@ -60,6 +60,19 @@
             "ua": "Назва",
             "name": "name",
             "type": "text"
+        },
+        {
+            "ua": "Хто створив",
+            "name": "uid",
+            "type": "Autocomplete",
+            "apiPrefix": "api",
+            "data": "core.user_uid"
+        },
+        {
+            "name": "enabled",
+            "type": "Check",
+            "data": "yes_no",
+            "ua": "On / Off"
         }
     ]
 }

package/module/settings/table/admin.routes.table.json

@@ -51,7 +51,7 @@
     ],
     "meta": {
         "title": "cdate",
-        "search": "alias,title"
+        "search": "title"
     },
     "filters": [
         {
@@ -60,7 +60,7 @@
             "type": "text"
         },
         {
-            "ua": "Title",
+            "ua": "Назва інтерфейсу українською",
             "name": "title",
             "type": "text"
         },

package/module/settings/table/admin.rules.table.json

@@ -31,17 +31,17 @@
     },
     {
       "name": "rule_query",
-      "format": "Text",
+      "format": "text",
       "ua": "Запит"
     },
     {
       "name": "CLS",
-      "format": "Text",
+      "format": "text",
       "ua": "CLS"
     },
     {
       "name": "routes",
-      "format": "Text",
+      "format": "text",
       "ua": "Роути"
     },
     {
@@ -60,17 +60,18 @@
     {
       "ua": "Назва",
       "name": "name",
-      "type": "text"
+      "type": "Text"
     },
     {
       "ua": "Тип повноваження",
       "name": "type",
-      "type": "text"
+      "type": "Text"
     },
     {
       "ua": "Хто створив",
       "name": "uid",
-      "type": "select",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
       "data": "core.user_uid"
     }
   ]

package/module/settings/table/admin.user_roles.table.json

@@ -15,6 +15,11 @@
             "title": "Закінчення терміну дії доступу до групи",
             "format": "date"
         },
+        {
+            "name": "actions",
+            "title": "Доступ",
+            "format": "text"
+        },
         {
             "name": "access_granted",
             "data": "core.user_uid",

package/module/settings/table/admin.users.table.json

@@ -43,7 +43,8 @@
         {
             "ua": "Права",
             "name": "user_type",
-            "format": "text"
+            "data": "users.user_type",
+            "format": "select"
         },
         {
             "ua": "Email",
@@ -85,9 +86,9 @@
         },
         {
             "name": "enabled",
-            "ua": "Вимикач",
+            "ua": "On / Off",
             "data": "yes_no",
-            "format": "select"
+            "format": "check"
         }
     ],
     "filter_list": [
@@ -113,11 +114,10 @@
             "type": "Text"
         },
         {
-            "en": "On/Off",
-            "ua": "On/Off",
-            "data": "enabled",
             "name": "enabled",
-            "type": "Check"
+            "type": "Check",
+            "data": "yes_no",
+            "ua": "On / Off"
         },
         {
             "ua": "Дата створення",

package/module/settings/table/context.account_grants.table.json

@@ -13,35 +13,33 @@
   "columns": [
     {
       "name": "account_id",
-      "ua": "id Організації",
-      "format": "Select",
+      "ua": "Організація",
+      "format": "select",
       "data": "core.accounts"
     },
     {
       "name": "rule_id",
-      "ua": "id Правила",
+      "ua": "Правило",
       "data": "core.rules",
       "format": "Select"
     },
     {
       "name": "routes",
       "ua": "Роути",
-      "format": "Text"
-    },
-    {
-      "name": "values",
-      "ua": "Значення",
-      "format": "Text"
+      "format": "Text",
+      "hidden": true
     },
     {
       "name": "grants_doc_id",
-      "ua": "id Документу",
-      "format": "Text"
+      "ua": "Документ",
+      "format": "Text",
+      "hidden": true
     },
     {
       "name": "grant_scan",
-      "ua": "id Скану",
-      "format": "Text"
+      "ua": "Скан",
+      "format": "Text",
+      "hidden": true
     },
     {
       "name": "expire_date",
@@ -64,5 +62,28 @@
       "ua": "Дата створення",
       "format": "Dat"
     }
+  ],
+  "filterList":[
+    {
+      "ua": "Організація",
+      "name": "account_id",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
+      "data": "core.accounts"
+    },
+    {
+      "ua": "Правило",
+      "name": "rule_id",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
+      "data": "core.rules"
+    },
+    {
+      "ua": "Хто створив",
+      "name": "uid",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
+      "data": "core.user_uid"
+    }
   ]
 }

package/module/settings/table/context.account_users.table.json

@@ -13,15 +13,15 @@
   "columns": [
     {
       "name": "account_id",
-      "format": "Select",
+      "format": "select",
       "data": "core.accounts",
-      "ua": "id Організації"
+      "ua": "Організація"
     },
     {
-      "name": "user_id",
-      "format": "Select",
+      "name": "user_uid",
+      "format": "select",
       "data": "core.user_uid",
-      "ua": "id Користувача"
+      "ua": "Користувач"
     },
     {
       "name": "uid",
@@ -34,5 +34,21 @@
       "format": "date",
       "ua": "Дата створення"
     }
+  ],
+  "filterList": [
+    {
+      "ua": "Організація",
+      "name": "account_id",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
+      "data": "core.accounts"
+    },
+    {
+      "ua": "Контакт",
+      "name": "user_uid",
+      "type": "Autocomplete",
+      "apiPrefix": "api",
+      "data": "core.user_uid"
+    }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.54",
+  "version": "0.2.56",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -44,7 +44,7 @@
     "@opengis/fastify-auth": "^1.0.60",
     "@opengis/fastify-file": "^1.0.30",
     "@opengis/fastify-table": "^1.1.134",
-    "@opengis/v3-core": "^0.3.20",
+    "@opengis/v3-core": "^0.3.29",
     "@opengis/v3-filter": "^0.0.41",
     "@tiptap/core": "^2.8.0",
     "@tiptap/extension-color": "^2.8.0",

package/server/helpers/list/descriptionList.js

@@ -33,12 +33,12 @@ export default async function descriptionList(data, opt) {
         const key = keys[i + 1];
         const d1 = ['{{format', '{{select', '{{badge', '{{ifCond', '{{json'].filter(el => key.includes(el)).length ? await handlebars.compile(key)(data) || '-' : null
 
-        result.push(`<div class="flex py-[16px] text-[14px] border-b border-[#E5E7EB">
-            <div class="text-[#6B7280] font-[400] w-[50%]">${nameHBS || name}</div>
-            <div class="font-[600] text-black w-[50%]">${d1 || format(data[key], key, data)}</div>
+        result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4">
+            <dt class="font-medium text-gray-900">${nameHBS || name}</dt>
+            <dd class="text-gray-700 sm:col-span-2">${d1 || format(data[key], key, data)}</dd>
             </div>
             `);
 
     }
-    return '<div class="w-full">' + result.join('') + '</div>';
+    return '<dl class=" divide-y divide-gray-100 text-sm">' + result.join('') + '</dl>';
 }

package/server/helpers/list/tableList.js

@@ -28,7 +28,7 @@ export default async function tableList(data, opt) {
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma, 'g'), ',') : el.trim()).concat(hash.uid && hash.table && hash.id && !hash.noactions ? ['Дії', 'actions'] : []);
 
     const result = [];
-    result.push('<thead> <tr>');
+    result.push('<thead class="text-left"> <tr>');
 
     // thead 
     const skip = {}
@@ -44,10 +44,8 @@ export default async function tableList(data, opt) {
         skip[name] = name.includes('{{') && !nameHBS;
         if (skip[name]) continue;
 
-        result.push(`<th scope="col">
-                <div class="px-[20px] py-[12px] text-start text-nowrap font-medium text-[14px] text-[#6B7280] ">
+        result.push(`<th class="whitespace-nowrap px-4 py-2 font-medium text-gray-900">
                     ${nameHBS || name}
-                </div>
         </th>`)
     }
     result.push('</tr></thead>');
@@ -55,7 +53,7 @@ export default async function tableList(data, opt) {
     // body 
     for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
-        result.push('<tbody><tr class="border-t border-gray-200">');
+        result.push('<tbody class="divide-y divide-gray-200"><tr>');
         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,8 +65,8 @@ export default async function tableList(data, opt) {
 
             const tokenData = key == 'actions' ? token : null;
             const d1 = ['{{format', '{{select', '{{badge', '{{#ifCond'].filter(el => key.includes(el)).length ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
-            result.push(`<td >
-                                <div class="px-[20px] py-[12px] text-start font-medium text-[14px] text-black">${d1 || format(tokenData || row[key], key, row, hash)}</div>
+            result.push(`<td class="whitespace-nowrap px-4 py-2 text-gray-700">
+                               ${d1 || format(tokenData || row[key], key, row, hash)}
                             </td>`);
 
         }
@@ -78,5 +76,5 @@ export default async function tableList(data, opt) {
     }
 
 
-    return '<table class="min-w-full divide-y divide-gray-200"> ' + result.join('') + '</table>';
+    return '<div class="overflow-x-auto"><table class="min-w-full divide-y-2 divide-gray-200 bg-white text-sm"> ' + result.join('') + '</table></div>';
 }

package/server/plugins/hook.js

@@ -47,7 +47,7 @@ export default async function plugin(fastify) {
                     access: loadTable?.access,
                 });
             }));
-            console.log(values)
+            // console.log(values)
             const q1 = `insert into admin.routes(route_id, alias, title, menu_id, table_name, actions, access, query) 
             values ${values.filter((el) => el?.path).map((el) => `('${el.path}', ${el.table ? `'${el.table}'` : null}, 
             ${(el.title || el.ua) ? `'${(el.title || el.ua).replace(/'/g, "''")}'` : null},