@boarteam/boar-pack-users-frontend 2.3.2 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-users-frontend",
-  "version": "2.3.2",
+  "version": "2.4.1",
   "description": "Users frontend package for Boar Pack",
   "repository": "git@github.com:boarteam/boar-pack.git",
   "author": "Andrew Balakirev <balakirev.andrey@gmail.com>",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^2.3.2",
-    "@boarteam/boar-pack-common-frontend": "^2.7.0",
+    "@boarteam/boar-pack-common-frontend": "^2.8.0",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-brands-svg-icons": "^6.6.0",
     "@umijs/max": "^4.1.10",
@@ -34,5 +34,5 @@
     "build": "tsc --project tsconfig.build.json",
     "yalc:push": "yalc push"
   },
-  "gitHead": "fd26e1cd23414aaf4b2aed44640f2eeb2f84b611"
+  "gitHead": "bff974a7a00f6c4d66ffbb035f36ce9e5a7496f9"
 }

package/src/components/EventLogs/eventLogsContext.tsx

@@ -0,0 +1,7 @@
+import { createContext } from "react";
+
+type EventLogsHookResult = {
+  serviceNameToAbbreviation: Record<string, string>;
+}
+
+export const EventLogsContext = createContext<EventLogsHookResult | undefined>(undefined);

package/src/components/EventLogs/useEventLogsColumns.tsx

@@ -9,25 +9,15 @@ import {
   UserOutlined,
   WarningOutlined
 } from "@ant-design/icons";
-import { useEffect, useState } from "react";
+import { useContext, useEffect, useState } from "react";
 import UserAgentDisplay from "./UserAgentDisplay";
 import apiClient from "@@api/apiClient";
 import { getUserRoleIcon } from "./EventLogExplanation";
-
+import { EventLogsContext } from "./eventLogsContext";
 import { DateRange } from "@boarteam/boar-pack-common-frontend";
 
 const { Text } = Typography;
 
-const serviceNameToAbbreviation: Record<string, string> = {
-  'TID Main App': 'TID',
-  'Liquidity Manager': 'LM',
-  'Quotes Monitor': 'QM',
-  'Admin Panel - Main': 'ADM',
-  'Manager Panel - Main': 'MNG',
-  'Admin RealTimeData': 'ARTD',
-  'Manager RealTimeData': 'MRTD',
-} as const;
-
 const logTypes = {
   [EventLog.logType.AUDIT]: {
     text: 'Audit',
@@ -69,6 +59,8 @@ export const useEventLogsColumns = ({
   onDateRangeChange: (start: string | undefined, end: string | undefined) => void;
 }): ProColumns<EventLog>[] => {
   const [users, setUsers] = useState<{ text: string, value: string }[]>([]);
+  const [serviceNames, setServiceNames] = useState<string[]>([]);
+  const eventLogsContext = useContext(EventLogsContext);
 
   useEffect(() => {
     apiClient.users.getManyBaseUsersControllerUser({
@@ -76,6 +68,11 @@ export const useEventLogsColumns = ({
     }).then((users) => {
       setUsers(users.data.map((item) => ({ text: item.name, value: item.id })));
     });
+
+    apiClient.eventLogs.getServiceNames()
+      .then((names) => {
+        setServiceNames(names)
+      });
   }, []);
 
   return [
@@ -103,16 +100,16 @@ export const useEventLogsColumns = ({
       title: 'Service',
       dataIndex: 'service',
       render(dom, record) {
-        return serviceNameToAbbreviation[record.service]
-          ? <Tooltip title={record.service}>{serviceNameToAbbreviation[record.service]}</Tooltip>
+        return eventLogsContext?.serviceNameToAbbreviation?.[record.service]
+          ? <Tooltip title={record.service}>{eventLogsContext.serviceNameToAbbreviation[record.service]}</Tooltip>
           : record.service;
       },
       width: 10,
       valueEnum: Object.fromEntries(
-        Object.entries(serviceNameToAbbreviation).map(([key, value]) => [
-          key,
+        serviceNames.map((value) => [
+          value,
           {
-            text: key,
+            text: eventLogsContext?.serviceNameToAbbreviation?.[value] ?? value
           }
         ])
       ),

package/src/tools/api-client/generated/models/User.ts

@@ -13,7 +13,7 @@ export type User = {
     updatedAt: string;
     deletedAt: string;
     policies: Array<Record<string, any>>;
-    experimentalFeatures: Record<string, any>;
+    experimentalFeatures: Array<string>;
 };
 export namespace User {
     export enum role {

package/src/tools/api-client/generated/services/EventLogsService.ts

@@ -34,6 +34,16 @@ export class EventLogsService {
             },
         });
     }
+    /**
+     * @returns string
+     * @throws ApiError
+     */
+    public getServiceNames(): CancelablePromise<Array<string>> {
+        return this.httpRequest.request({
+            method: 'GET',
+            url: '/event-logs/service-names',
+        });
+    }
     /**
      * Retrieve multiple EventLogs
      * @returns GetManyEventLogResponseDto Get paginated response