@opengis/admin 0.4.34 → 0.4.35

package/server/templates/table/management.user_group.table.json

@@ -1,113 +1,113 @@
-{
-  "en": "Users group",
-  "ru": "Групы пользователей",
-  "ua": "Групи користувачів",
-  "key": "user_group_id",
-  "help": "https://docs.softpro.ua/admin/ManagementSystem/groups/",
-  "model": "admin.user_group",
-  "table": "admin.user_group",
-  "title_column": "group_name",
-  "search_column": "group_name,module",
-  "action_deafult": [
-    "edit",
-    "del"
-  ],
-  "setting": [
-    "export",
-    "view",
-    "import",
-    "column_visible",
-    "title",
-    "add",
-    "card"
-  ],
-  "sql": [
-    {
-      "sql": "SELECT array_agg(uid) as user_id,count(*) as user_count,json_agg(row_to_json(r)) user_list from\n(select user_name,uid::text,sur_name FROM admin.users where uid in (select user_uid from admin.user_group_rel where user_group_id=t.user_group_id))r",
-      "name": "user_group_rel_sql"
-    },
-    {
-      "sql": "select count(*) as permission_count,array_agg(doct_id) as  permission_id from  admin.user_group_access where user_group_id=t.user_group_id",
-      "name": "user_group_access_sql"
-    }
-  ],
-  "columns": [
-    {
-      "ru": "Название",
-      "ua": "Назва",
-      "name": "group_name",
-      "format": "text"
-    },
-    {
-      "ru": "Модуль",
-      "ua": "Модуль",
-      "name": "module",
-      "format": "text"
-    },
-    {
-      "ru": "Пользователи",
-      "ua": "Користувачі",
-      "html": "{{#each user_list}}\n    <span class='label'>{{sur_name}} {{user_name}}</span>\n{{/each}}",
-      "name": "user_id",
-      "width": "200",
-      "hidden": true,
-      "option": "user_id",
-      "format": "html"
-    },
-    {
-      "ru": "Количество пользователей",
-      "ua": "Кількість користувачів",
-      "html": "<a title=\"{{#each user_list}}{{sur_name}} {{user_name}}, {{/each}}\"> {{user_count}}</a>",
-      "name": "user_count",
-      "format": "html"
-    },
-    {
-      "en": "Interfaces",
-      "ru": "Интерфейсы",
-      "ua": "Інтерфейси",
-      "html": "{{#each permission_id}}\n    <span class='label label-default'> {{select this data='interface_list'}}</span>\n{{/each}}",
-      "name": "permission_id",
-      "hidden": true,
-      "format": "html"
-    },
-    {
-      "en": "rule",
-      "ru": "Права",
-      "ua": "Права",
-      "html": "<a title=\"{{#each i_title}}{{this}}&#13;{{/each}}\"> {{permission_count}}</a>\n\n<!--<a class='link' modal-info='permission_list/user_group?id={{{user_group_id}}}'>{{{permission_count}}}</a>-->",
-      "name": "permission_count",
-      "format": "html"
-    },
-    {
-      "ru": "Описание",
-      "ua": "Опис",
-      "name": "info",
-      "format": "text"
-    }
-  ],
-  "filterList": [
-    {
-      "en": "User",
-      "ru": "Пользователь",
-      "ua": "Користувач",
-      "data": "user_id",
-      "name": "user_id",
-      "type": "Select"
-    },
-    {
-      "en": "Interface",
-      "ru": "Интерфейс",
-      "ua": "Інтерфейс",
-      "data": "core.interface_list",
-      "name": "permission_id",
-      "type": "Autocomplete"
-    },
-    {
-      "en": "Module",
-      "ru": "Модуль",
-      "ua": "Модуль",
-      "name": "module",
-      "type": "Check"
-    }
-  ]
+{
+  "en": "Users group",
+  "ru": "Групы пользователей",
+  "ua": "Групи користувачів",
+  "key": "user_group_id",
+  "help": "https://docs.softpro.ua/admin/ManagementSystem/groups/",
+  "model": "admin.user_group",
+  "table": "admin.user_group",
+  "title_column": "group_name",
+  "search_column": "group_name,module",
+  "action_deafult": [
+    "edit",
+    "del"
+  ],
+  "setting": [
+    "export",
+    "view",
+    "import",
+    "column_visible",
+    "title",
+    "add",
+    "card"
+  ],
+  "sql": [
+    {
+      "sql": "SELECT array_agg(uid) as user_id,count(*) as user_count,json_agg(row_to_json(r)) user_list from\n(select user_name,uid::text,sur_name FROM admin.users where uid in (select user_uid from admin.user_group_rel where user_group_id=t.user_group_id))r",
+      "name": "user_group_rel_sql"
+    },
+    {
+      "sql": "select count(*) as permission_count,array_agg(doct_id) as  permission_id from  admin.user_group_access where user_group_id=t.user_group_id",
+      "name": "user_group_access_sql"
+    }
+  ],
+  "columns": [
+    {
+      "ru": "Название",
+      "ua": "Назва",
+      "name": "group_name",
+      "format": "text"
+    },
+    {
+      "ru": "Модуль",
+      "ua": "Модуль",
+      "name": "module",
+      "format": "text"
+    },
+    {
+      "ru": "Пользователи",
+      "ua": "Користувачі",
+      "html": "{{#each user_list}}\n    <span class='label'>{{sur_name}} {{user_name}}</span>\n{{/each}}",
+      "name": "user_id",
+      "width": "200",
+      "hidden": true,
+      "option": "user_id",
+      "format": "html"
+    },
+    {
+      "ru": "Количество пользователей",
+      "ua": "Кількість користувачів",
+      "html": "<a title=\"{{#each user_list}}{{sur_name}} {{user_name}}, {{/each}}\"> {{user_count}}</a>",
+      "name": "user_count",
+      "format": "html"
+    },
+    {
+      "en": "Interfaces",
+      "ru": "Интерфейсы",
+      "ua": "Інтерфейси",
+      "html": "{{#each permission_id}}\n    <span class='label label-default'> {{select this data='interface_list'}}</span>\n{{/each}}",
+      "name": "permission_id",
+      "hidden": true,
+      "format": "html"
+    },
+    {
+      "en": "rule",
+      "ru": "Права",
+      "ua": "Права",
+      "html": "<a title=\"{{#each i_title}}{{this}}&#13;{{/each}}\"> {{permission_count}}</a>\n\n<!--<a class='link' modal-info='permission_list/user_group?id={{{user_group_id}}}'>{{{permission_count}}}</a>-->",
+      "name": "permission_count",
+      "format": "html"
+    },
+    {
+      "ru": "Описание",
+      "ua": "Опис",
+      "name": "info",
+      "format": "text"
+    }
+  ],
+  "filterList": [
+    {
+      "en": "User",
+      "ru": "Пользователь",
+      "ua": "Користувач",
+      "data": "user_id",
+      "name": "user_id",
+      "type": "Select"
+    },
+    {
+      "en": "Interface",
+      "ru": "Интерфейс",
+      "ua": "Інтерфейс",
+      "data": "core.interface_list",
+      "name": "permission_id",
+      "type": "Autocomplete"
+    },
+    {
+      "en": "Module",
+      "ru": "Модуль",
+      "ua": "Модуль",
+      "name": "module",
+      "type": "Check"
+    }
+  ]
 }

package/server/templates/table/management.users.table.json

@@ -1,127 +1,127 @@
-{
-  "key": "uid",
-  "help": "https://docs.softpro.ua/admin/ManagementSystem/users_action/",
-  "en": "Users",
-  "ru": "Пользователи",
-  "ua": "Користувачі",
-  "model": "admin.users",
-  "table": "admin.users",
-  "add_form": "form-users",
-  "title_column": "user_name",
-  "action": "<a edit='admin.users/{{uid}}' modal=1 title='Пароль' user_role='true' form='form-user-pass'>\r\n    <i class=\"fa fa-keyboard-o\"></i> Змінити пароль\r\n</a>",
-  "html_panel_right": "<div class=\"btn-group\">\n    <div class=\"input-group pull-left input-group-sm m-l-xs\" style=\"width:auto\"><a class=\"dropdown-toggle btn btn-default btn-sm\" data-toggle=\"dropdown\">Сесія <i class=\"fa fa-caret-down\"></i></a>\n        <ul class=\"dropdown-menu\">\n            <li><a href=\"/api-user/session/list\" target=\"_blank\">Кількість активних</a></li>\n            <li><a href=\"/api-user/session/list/*\" target=\"_blank\">Перелік активних</a></li>\n            <li><a href=\"/api-user/session/clear\" target=\"_blank\">Закрити всі сесії</a></li>\n            <li><a>Закрити вказану сесію</a></li>\n        </ul>\n    </div>\n</div>",
-  "search_column": "sur_name,user_name,uid,father_name,email,phone,login",
-  "action_deafult": [
-    "edit",
-    "del"
-  ],
-  "sql": [
-    {
-      "sql": "select count(*) as group_count from admin.user_group_rel where user_uid=t.uid",
-      "name": "group_count_sql"
-    },
-    {
-      "sql": "select coalesce(user_name,'') ||' '|| coalesce(sur_name,'') ||' '|| coalesce(father_name,'') as full_name",
-      "name": "full_name_sql"
-    },
-    {
-      "sql": "select string_agg(group_name,',') as groups from admin.user_group where user_group_id in (select user_group_id from admin.user_group_rel where user_uid=t.uid)",
-      "name": "group_list_sql"
-    }
-  ],
-  "columns": [
-    {
-      "ru": "ФИО",
-      "ua": "ПІБ",
-      "html": "{{full_name}}<br>\n{{email}}<br>\n{{phone}}",
-      "icon": "fa fa-user",
-      "name": "full_name",
-      "format": "text"
-    },
-    {
-      "ua": "Email",
-      "name": "email",
-      "hidden": true,
-      "format": "text"
-    },
-    {
-      "ru": "Фото",
-      "ua": "Фото",
-      "html": "<img src='{{#if avatar}}{{avatar}}{{^}}https://cdn.softpro.ua/tpl/module/core/images/user_default.png{{/if}}' alt=\"image\" class=\"img img-md\" file-show=1 file-path=\"{{#if avatar}}{{avatar}}{{^}}https://cdn.softpro.ua/tpl/module/core/images/user_default.png{{/if}}\">",
-      "icon": "fa fa-user",
-      "hidden": true,
-      "name": "avatar",
-      "format": "html"
-    },
-    {
-      "en": "Логін",
-      "ru": "Логин",
-      "ua": "Логін",
-      "name": "login",
-      "hidden": true,
-      "format": "text"
-    },
-    {
-      "name": "group_count",
-      "ua": "Кількість груп",
-      "format": "text"
-    },
-    {
-      "name": "groups",
-      "ua": "Групи",
-      "format": "text"
-    },
-    {
-      "name": "cdate",
-      "ua": "Створено",
-      "format": "date"
-    },
-    {
-      "name": "editor_date",
-      "ua": "Дата останньої активності",
-      "format": "date"
-    },
-    {
-      "name": "enabled",
-      "ua": "Вимикач",
-      "format": "yes/no"
-    }
-  ],
-  "filter_list": [
-    {
-      "ua": "РНОКПП",
-      "name": "user_rnokpp",
-      "type": "Text"
-    },
-    {
-      "ua": "Email",
-      "name": "email",
-      "type": "Text"
-    },
-    {
-      "en": "Group",
-      "ru": "Группа",
-      "ua": "Група",
-      "name": "groups",
-      "type": "Text"
-    },
-    {
-      "en": "On/Off",
-      "ru": "On/Off",
-      "ua": "On/Off",
-      "data": "enabled",
-      "name": "enabled",
-      "type": "Check"
-    },
-    {
-      "ua": "Дата створення",
-      "name": "cdate",
-      "type": "Date"
-    },
-    {
-      "name": "editor_date",
-      "type": "Date",
-      "ua": "Дата останньої активності"
-    }
-  ]
+{
+  "key": "uid",
+  "help": "https://docs.softpro.ua/admin/ManagementSystem/users_action/",
+  "en": "Users",
+  "ru": "Пользователи",
+  "ua": "Користувачі",
+  "model": "admin.users",
+  "table": "admin.users",
+  "add_form": "form-users",
+  "title_column": "user_name",
+  "action": "<a edit='admin.users/{{uid}}' modal=1 title='Пароль' user_role='true' form='form-user-pass'>\r\n    <i class=\"fa fa-keyboard-o\"></i> Змінити пароль\r\n</a>",
+  "html_panel_right": "<div class=\"btn-group\">\n    <div class=\"input-group pull-left input-group-sm m-l-xs\" style=\"width:auto\"><a class=\"dropdown-toggle btn btn-default btn-sm\" data-toggle=\"dropdown\">Сесія <i class=\"fa fa-caret-down\"></i></a>\n        <ul class=\"dropdown-menu\">\n            <li><a href=\"/api-user/session/list\" target=\"_blank\">Кількість активних</a></li>\n            <li><a href=\"/api-user/session/list/*\" target=\"_blank\">Перелік активних</a></li>\n            <li><a href=\"/api-user/session/clear\" target=\"_blank\">Закрити всі сесії</a></li>\n            <li><a>Закрити вказану сесію</a></li>\n        </ul>\n    </div>\n</div>",
+  "search_column": "sur_name,user_name,uid,father_name,email,phone,login",
+  "action_deafult": [
+    "edit",
+    "del"
+  ],
+  "sql": [
+    {
+      "sql": "select count(*) as group_count from admin.user_group_rel where user_uid=t.uid",
+      "name": "group_count_sql"
+    },
+    {
+      "sql": "select coalesce(user_name,'') ||' '|| coalesce(sur_name,'') ||' '|| coalesce(father_name,'') as full_name",
+      "name": "full_name_sql"
+    },
+    {
+      "sql": "select string_agg(group_name,',') as groups from admin.user_group where user_group_id in (select user_group_id from admin.user_group_rel where user_uid=t.uid)",
+      "name": "group_list_sql"
+    }
+  ],
+  "columns": [
+    {
+      "ru": "ФИО",
+      "ua": "ПІБ",
+      "html": "{{full_name}}<br>\n{{email}}<br>\n{{phone}}",
+      "icon": "fa fa-user",
+      "name": "full_name",
+      "format": "text"
+    },
+    {
+      "ua": "Email",
+      "name": "email",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ru": "Фото",
+      "ua": "Фото",
+      "html": "<img src='{{#if avatar}}{{avatar}}{{^}}https://cdn.softpro.ua/tpl/module/core/images/user_default.png{{/if}}' alt=\"image\" class=\"img img-md\" file-show=1 file-path=\"{{#if avatar}}{{avatar}}{{^}}https://cdn.softpro.ua/tpl/module/core/images/user_default.png{{/if}}\">",
+      "icon": "fa fa-user",
+      "hidden": true,
+      "name": "avatar",
+      "format": "html"
+    },
+    {
+      "en": "Логін",
+      "ru": "Логин",
+      "ua": "Логін",
+      "name": "login",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "name": "group_count",
+      "ua": "Кількість груп",
+      "format": "text"
+    },
+    {
+      "name": "groups",
+      "ua": "Групи",
+      "format": "text"
+    },
+    {
+      "name": "cdate",
+      "ua": "Створено",
+      "format": "date"
+    },
+    {
+      "name": "editor_date",
+      "ua": "Дата останньої активності",
+      "format": "date"
+    },
+    {
+      "name": "enabled",
+      "ua": "Вимикач",
+      "format": "yes/no"
+    }
+  ],
+  "filter_list": [
+    {
+      "ua": "РНОКПП",
+      "name": "user_rnokpp",
+      "type": "Text"
+    },
+    {
+      "ua": "Email",
+      "name": "email",
+      "type": "Text"
+    },
+    {
+      "en": "Group",
+      "ru": "Группа",
+      "ua": "Група",
+      "name": "groups",
+      "type": "Text"
+    },
+    {
+      "en": "On/Off",
+      "ru": "On/Off",
+      "ua": "On/Off",
+      "data": "enabled",
+      "name": "enabled",
+      "type": "Check"
+    },
+    {
+      "ua": "Дата створення",
+      "name": "cdate",
+      "type": "Date"
+    },
+    {
+      "name": "editor_date",
+      "type": "Date",
+      "ua": "Дата останньої активності"
+    }
+  ]
 }

package/server/utils/addNotification.js

@@ -1,21 +1,21 @@
-import { dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function addNotification({
-  pg, user = {}, subject, body, link, uid, entity,
-}) {
-  const { uid: author } = user || {};
-  const res = await dataInsert({
-    pg,
-    table: 'crm.notifications',
-    data: {
-      subject,
-      body,
-      link,
-      addressee_id: uid,
-      author_id: author,
-      entity_id: entity,
-      uid: author,
-    },
-  });
-  return res?.rows?.[0] || {};
-}
+import { dataInsert } from '@opengis/fastify-table/utils.js';
+
+export default async function addNotification({
+  pg, user = {}, subject, body, link, uid, entity,
+}) {
+  const { uid: author } = user || {};
+  const res = await dataInsert({
+    pg,
+    table: 'crm.notifications',
+    data: {
+      subject,
+      body,
+      link,
+      addressee_id: uid,
+      author_id: author,
+      entity_id: entity,
+      uid: author,
+    },
+  });
+  return res?.rows?.[0] || {};
+}