bfg-common 1.5.882 → 1.5.883

package/assets/localization/local_ru.json

@@ -3245,8 +3245,8 @@
     "networkPackets": "Сетевые пакеты",
     "diskRate": "Скорость диска",
     "diskRequests": "Запросы к диску",
-    "nfsRate": "Ставка NFS",
-    "nfsRequests": "NFS запросы",
+    "nfsRate": "Скорость операций NFS",
+    "nfsRequests": "Количество запросов NFS",
     "priority": "Приоритет",
     "recommendation": "Рекомендация",
     "recommendationId": "Идентификатор рекомендации",

package/components/common/pages/scheduledTasks/table/lib/models/enums.ts

@@ -0,0 +1,4 @@
+export enum UI_E_SchedulerRunStatus {
+  RUNNING = 'this task has been started',
+  SUCCESS = 'success',
+}

package/components/common/pages/scheduledTasks/table/new/lib/config/scheduledTasksTable.ts

@@ -4,50 +4,41 @@ import type {
   UI_I_DataTableOptions,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-// import { UI_E_TabsByType } from '~/lib/models/enums'
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-// import {
-//   E_StatusEnum,
-//   E_TreeNodeKind,
-// } from '~/components/templates/inventory/treeView/lib/models/enums'
-// import {
-//   E_EventsChipColor,
-//   E_EventsChipIcon,
-//   E_EventsType,
-// } from '~/components/common/pages/events/table/new/lib/models/enums'
+import { UI_E_SchedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/models/enums'
+import {
+  E_SchedulerStatus,
+  E_SchedulerChipColor,
+  E_SchedulerChipIcon,
+} from '~/components/common/pages/scheduledTasks/table/new/lib/models/enums'
 
 // Маппинг для статусов
-// const STATUS_MAPPING = {
-//   [E_EventsType.Information]: {
-//     textKey: 'information',
-//     icon: E_EventsChipIcon.Information,
-//     chipColor: E_EventsChipColor.Primary,
-//   },
-//   [E_EventsType.Warning]: {
-//     textKey: 'warning',
-//     icon: E_EventsChipIcon.Warning,
-//     chipColor: E_EventsChipColor.Yellow,
-//   },
-//   [E_EventsType.Error]: {
-//     textKey: 'error',
-//     icon: E_EventsChipIcon.Information,
-//     chipColor: E_EventsChipColor.Red,
-//   },
-//   [E_EventsType.User]: {
-//     textKey: 'user',
-//     icon: E_EventsChipIcon.User,
-//     chipColor: E_EventsChipColor.Primary,
-//   },
-// }
+const STATUS_MAPPING = {
+  [E_SchedulerStatus.Completed]: {
+    textKey: 'complete',
+    icon: E_SchedulerChipIcon.StatusCheck,
+    chipColor: E_SchedulerChipColor.Green,
+  },
+  [E_SchedulerStatus.Running]: {
+    textKey: 'running',
+    icon: E_SchedulerChipIcon.StatusCheck,
+    chipColor: E_SchedulerChipColor.Green,
+  },
+  [E_SchedulerStatus.Failed]: {
+    textKey: 'failed',
+    icon: E_SchedulerChipIcon.Information,
+    chipColor: E_SchedulerChipColor.Red,
+  },
+}
 
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTableHeader[] => [
   {
     col: 'col0',
-    colName: 'description',
-    text: localization.common.description,
+    colName: 'name',
+    text: localization.common.scheduledTask,
     isSortable: true,
     sort: 'asc',
     width: '240px',
@@ -56,8 +47,8 @@ export const getHeaderDataFunc = (
   },
   {
     col: 'col1',
-    colName: 'severity',
-    text: localization.common.type,
+    colName: 'sheduler',
+    text: localization.common.schedule,
     isSortable: true,
     sort: 'asc',
     width: '180px',
@@ -66,8 +57,8 @@ export const getHeaderDataFunc = (
   },
   {
     col: 'col2',
-    colName: 'created_time',
-    text: localization.common.dateTime,
+    colName: 'last_modified',
+    text: localization.common.lastRun,
     isSortable: true,
     sort: 'asc',
     width: '180px',
@@ -76,54 +67,25 @@ export const getHeaderDataFunc = (
   },
   {
     col: 'col3',
-    colName: 'task_id',
-    text: localization.tasks.task,
+    colName: 'last_run_result',
+    text: localization.common.lastRunResult,
     isSortable: true,
     sort: 'asc',
     width: '110px',
     show: true,
     filter: true,
   },
+
   {
     col: 'col4',
-    colName: 'object_name',
-    text: localization.common.target,
+    colName: 'next_run',
+    text: localization.common.nextRun,
     isSortable: true,
     sort: 'asc',
     width: '160px',
     show: true,
     filter: true,
   },
-  {
-    col: 'col5',
-    colName: 'user_name',
-    text: localization.common.user,
-    isSortable: false,
-    sort: 'asc',
-    width: '120px',
-    show: true,
-    filter: true,
-  },
-  {
-    col: 'col6',
-    colName: 'event_type_id',
-    text: localization.common.eventTypeId,
-    isSortable: false,
-    sort: 'asc',
-    width: '120px',
-    show: true,
-    filter: true,
-  },
-  {
-    col: 'col7',
-    colName: 'error_message',
-    text: localization.events.errorMessage,
-    isSortable: false,
-    sort: 'asc',
-    width: '120px',
-    show: true,
-    filter: true,
-  },
 ]
 
 export const getTargetActionsFunc = (
@@ -179,40 +141,28 @@ export const getBodyDataFunc = (
   bodyData: UI_I_ScheduledTasksTableItem[],
   localization: UI_I_Localization
 ): UI_I_DataTableBody[] => {
+  const { $formattedDatetime }: any = useNuxtApp()
   return bodyData.map((scheduler, index: number) => {
-    const date = new Date(scheduler.created_time)
-    const formattedDateTime = date.toLocaleString('en-US', {
-      month: '2-digit',
-      day: '2-digit',
-      year: 'numeric',
-      hour: 'numeric',
-      minute: '2-digit',
-      second: '2-digit',
-      hour12: true,
-    })
+    const historyLastRun = scheduler?.last_5_run?.at(-1)
 
-    // const statusKey = event.severity as E_EventsType
-    // const statusData = {
-    //   ...STATUS_MAPPING[statusKey],
-    //   testId: `${event.id}-${index}-status`,
-    // }
+    const lastRun = historyLastRun?.start
+    const formattedLastRun =
+      lastRun && $formattedDatetime(+lastRun * 1000, { hasSeconds: true })
 
-    // const objectKind =
-    //   event.object_type ??
-    //   (event.object_id
-    //     ? parseInt(event.object_id.split('.')[0], 10)
-    //     : undefined)
-    // const objectType = E_TreeNodeKind[objectKind]
-    // const iconClassName =
-    //   E_StatusEnum[`${objectType}_Normal` as keyof typeof E_StatusEnum]
+    const nextRun = scheduler.next_run
+    const formattedNextRun =
+      nextRun && $formattedDatetime(+nextRun * 1000, { hasSeconds: true })
 
-    // const dataTarget = {
-    //   id: event.object_id,
-    //   nav: UI_E_TabsByType[objectType as keyof typeof UI_E_TabsByType],
-    //   type: objectType,
-    //   isLink: !!event.object_id,
-    //   iconClassName,
-    // }
+    const statusKey =
+      historyLastRun?.result.toLowerCase() === UI_E_SchedulerRunStatus.SUCCESS
+        ? E_SchedulerStatus.Completed
+        : historyLastRun?.result === UI_E_SchedulerRunStatus.RUNNING
+        ? E_SchedulerStatus.Running
+        : E_SchedulerStatus.Failed
+    const statusData = {
+      ...STATUS_MAPPING[statusKey],
+      testId: `${scheduler.rid}-${index}-status`,
+    }
 
     return {
       row: scheduler.rid,
@@ -223,53 +173,38 @@ export const getBodyDataFunc = (
         {
           key: 'icon',
           col: 'col0',
-          text: scheduler.description,
+          text: scheduler.name,
           data: {
             iconClassName: 'icon-events',
-            expandData: event,
+            expandData: scheduler,
           },
           testId: `table-item-${scheduler.rid}`,
         },
         {
-          key: 'status',
           col: 'col1',
-          text: 'localization.common[statusData.textKey]',
+          text: scheduler.sheduler || '--',
           data: 'statusData',
           testId: `table-item-${scheduler.rid}`,
         },
         {
           col: 'col2',
-          text: formattedDateTime,
+          text: formattedLastRun,
           testId: `table-item-${scheduler.rid}`,
         },
         {
+          key: 'status',
           col: 'col3',
-          text: scheduler.task_id || '--',
+          text: localization.common[statusData.textKey],
+          data: statusData,
           testId: `table-item-${scheduler.rid}`,
         },
         {
           key: 'icon',
           col: 'col4',
-          text: scheduler.object_name || '--',
+          text: formattedNextRun,
           data: 'dataTarget',
           testId: `table-item-${scheduler.rid}`,
         },
-
-        {
-          col: 'col5',
-          text: scheduler.user_name,
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          col: 'col6',
-          text: scheduler.event_type_id,
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          col: 'col7',
-          text: scheduler.error_message || '--',
-          testId: `table-item-${scheduler.rid}`,
-        },
         {
           key: 'default-actions',
           col: 'default-actions',

package/components/common/pages/scheduledTasks/table/new/lib/models/enums.ts

@@ -1,16 +1,14 @@
-export enum E_EventsType {
-  Information = 1,
-  Warning,
-  Error,
-  User,
+export enum E_SchedulerStatus {
+  Completed = 'completed',
+  Running = 'running',
+  Failed = 'failed',
 }
-export enum E_EventsChipColor {
+
+export enum E_SchedulerChipColor {
+  Green = 'green',
   Red = 'red',
-  Primary = 'primary',
-  Yellow = 'yellow',
 }
-export enum E_EventsChipIcon {
+export enum E_SchedulerChipIcon {
+  StatusCheck = 'status-check',
   Information = 'info-stroke',
-  User = 'user-icon',
-  Warning = 'warning-outline',
 }

package/components/common/pages/scheduledTasks/table/old/lib/config/scheduledTasksTable.ts

@@ -9,8 +9,8 @@ import {
 } from '~/lib/models/store/tasks/enums'
 import * as defaultSettings from '~/components/atoms/table/dataGrid/lib/config/settingsTable'
 import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import { UI_E_SchedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/models/enums'
 import { scheduledTaskTableItemsKeys } from '~/components/common/pages/scheduledTasks/table/old/lib/config/tableKeys'
-import { schedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/config/schedulerStatus'
 
 const getItems = (
   localization: UI_I_Localization
@@ -67,16 +67,20 @@ export const bodyItems = (
     const statusText =
       historyLastRun &&
       UI_E_RecentTaskStatus[
-        historyLastRun?.result?.toLowerCase() === 'success' ? 2 : -1
+        historyLastRun?.result?.toLowerCase() ===
+        UI_E_SchedulerRunStatus.SUCCESS
+          ? 2
+          : -1
       ]
 
     const statusData = {
       iconClassName:
         historyLastRun &&
         UI_E_IconNameByRecentTaskStatus[
-          historyLastRun?.result.toLowerCase() === schedulerRunStatus.SUCCESS
+          historyLastRun?.result.toLowerCase() ===
+          UI_E_SchedulerRunStatus.SUCCESS
             ? 2
-            : historyLastRun?.result === schedulerRunStatus.RUNNING
+            : historyLastRun?.result === UI_E_SchedulerRunStatus.RUNNING
             ? 1
             : 3
         ],
@@ -113,8 +117,8 @@ export const bodyItems = (
         id: task.rid,
         testId: `adapter-table-${key}-row-item`,
         data: {
-          sortValue: lastRun || 0
-        }
+          sortValue: lastRun || 0,
+        },
       },
       {
         key: 'icon',
@@ -129,8 +133,8 @@ export const bodyItems = (
         id: task.rid,
         testId: `adapter-table-${key}-row-item`,
         data: {
-          sortValue: task[scheduledTaskTableItemsKeys[4]]
-        }
+          sortValue: task[scheduledTaskTableItemsKeys[4]],
+        },
       },
     ])
   })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.882",
+  "version": "1.5.883",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/components/common/pages/scheduledTasks/table/lib/config/schedulerStatus.ts

@@ -1,4 +0,0 @@
-export const schedulerRunStatus = {
-  RUNNING: 'this task has been started',
-  SUCCESS: 'success',
-}

package/components/common/pages/scheduledTasks/table/old/lib/models/interfaces.ts

@@ -1,11 +0,0 @@
-import { UI_I_TableRowDropDetails } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-
-export interface UI_I_ScheduleTableRowDetails
-  extends UI_I_TableRowDropDetails<
-    string | UI_I_ScheduledTasksTableItem['last_5_run']
-  > {}
-
-// export interface I_ScheduledTaskTableItem extends API_I_ScheduledTaskTableItem {
-//   type: T_ScheduledTasksActionsType
-// }