@opengis/admin 0.1.21 → 0.1.23

package/module/settings/card/admin.roles.table/access.hbs

@@ -1,4 +1,4 @@
-{{#contentList table="admin.access" query="role_id='{{role_id}}'" order="cdate desc" sql1=1}}
+{{#contentList table="admin.access" query="role_id='{{id}}'" order="cdate desc" sql1=1}}
 <table class="min-w-full divide-y divide-gray-200">
     <thead class="bg-gray-50">
         <tr>
@@ -16,9 +16,11 @@
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
                 {{route_id}}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{select route_id data="core.routes"}}</td>
+                {{!-- {{route_id}} --}}
+            </td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{select actions data="core.actions"}}</td>
+                {{actions}}
+            </td>
         </tr>
         {{/each}}
     </tbody>

package/module/settings/card/admin.roles.table/index.yml

@@ -7,6 +7,6 @@ panels:
     title: Користувачі
     col: 8
     items:
-  - name: logs
+  - name: access
     title: Права до інтерфейсів
     col: 4

package/module/settings/card/admin.roles.table/users.hbs

@@ -1,4 +1,4 @@
-{{#contentList table="admin.user_roles" query="user_uid='{{id}}'" order="cdate desc" limit="50" sql1=1}}
+{{#contentList table="admin.user_roles" query="role_id='{{id}}'" order="cdate desc" limit="50" sql1=1}}
 <table class="min-w-full divide-y divide-gray-200">
     <thead class="bg-gray-50">
         <tr>
@@ -17,13 +17,10 @@
     <tbody class="bg-white divide-y divide-gray-200">
         {{#each rows}}
         <tr>
-            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{select user_uid data="core.user_uid"}}</td>
-            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{formatDate expiration}}</td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">{{user_uid}}</td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">{{formatDate expiration}}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">{{formatDate access_granted_time}}</td>
-            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">{{select name="access_granted"
-                data="core.user_uid"}}</td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">{{access_granted}}</td>
         </tr>
         {{/each}}
     </tbody>

package/module/settings/card/admin.routes.table/users.hbs

@@ -1,4 +1,4 @@
-{{#contentList table="admin.access" query="user_uid='{{id}}'" order="cdate desc" limit="50" sql1=1}}
+{{#contentList table="admin.access" query="route_id='{{id}}'" order="cdate desc" limit="50" sql1=1}}
 <table class="min-w-full divide-y divide-gray-200">
     <thead class="bg-gray-50">
         <tr>
@@ -16,11 +16,17 @@
         {{#each rows}}
         <tr>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{select user_uid data="core.user_uid"}}</td>
+                {{!-- {{select user_uid data="core.user_uid"}} --}}
+                {{user_uid}}
+            </td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{select actions data="core.actions"}}</td>
+                {{!-- {{select actions data="core.actions"}} --}}
+                {{actions}}
+            </td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-F500">
-                {{select access_granted data="core.user_uid"}}</td>
+                {{!-- {{select access_granted data="core.user_uid"}} --}}
+                {{access_granted}}
+            </td>
         </tr>
         {{/each}}
     </tbody>

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

@@ -5,7 +5,7 @@
     "order": "cdate desc",
     "sql": [
         {
-            "sql": "select count(user_uid) as user_count from admin.access where route_id=t.route_id",
+            "sql1": "select count(user_uid) as user_count from admin.access where route_id=t.route_id",
             "name": "user_count"
         },
         {
@@ -24,17 +24,19 @@
             "format": "text",
             "title": "Назва інтерфейсу українською"
         },
-        {
-            "name": "user_count",
-            "format": "text",
-            "title": "Кількість користувачів"
-        },
         {
             "name": "roles_count",
             "format": "text",
             "title": "Кількість груп"
         }
     ],
+    "columns1": [
+        {
+            "name1": "user_count",
+            "format1": "text",
+            "title1": "Кількість користувачів"
+        }
+    ],
     "meta": {
         "title": "cdate",
         "search": "alias,title"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -32,7 +32,7 @@
   "author": "Softpro",
   "license": "ISC",
   "dependencies": {
-    "@opengis/fastify-auth": "^1.0.20",
+    "@opengis/fastify-auth": "^1.0.33",
     "@opengis/fastify-file": "^1.0.17",
     "@opengis/fastify-table": "^1.1.16",
     "@opengis/v3-core": "^0.1.92",

package/server/routes/data/controllers/tableFilter.js

@@ -21,7 +21,7 @@ export default async function tableFilter(req) {
 
     const filters = loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || [];
     filters.forEach(el => {
-        Object.assign(el, { id: el.name });
+        Object.assign(el, { id: el.name || el.id, name: el.name || el.id });
     })
 
     await Promise.all(filters.filter((el) => el.data).map(async (el) => {
@@ -29,6 +29,7 @@ export default async function tableFilter(req) {
         const cls = await getTemplate(['cls', 'select'], el.data)
         const name = el.name || el.id
 
+
         if (!cls?.length || !Array.isArray(cls) || !loadTable.table || !name) return;
         const { dataTypeID } = columns.find((item) => item.name === name) || {};
         if (!dataTypeID) return;