bfg-common 1.3.40 → 1.3.41

package/components/common/resource/lib/utils.ts

@@ -1,33 +1,44 @@
-import { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
 
 export const parseResourceUnit = (
-  arr: UI_I_Resources<number>[]
+  arr: UI_I_Resources<number>[],
+  isMainValue: boolean = false
 ): UI_I_Resources[] => {
   return arr.map((resource: UI_I_Resources<number>) => {
     return {
       type: resource.type,
       free: {
         value: resource.free || 0,
-        text: setResourceNumeric(resource.type, resource.free || 0),
+        text: isMainValue
+          ? String(resource.free) || '0'
+          : setResourceNumeric(resource.type, resource.free || 0),
       },
       used: {
         value: resource.used || 0,
-        text: setResourceNumeric(resource.type, resource.used || 0),
+        text: isMainValue
+          ? String(resource.used) || '0'
+          : setResourceNumeric(resource.type, resource.used || 0),
       },
       capacity: {
         value: resource.capacity || 0,
-        text: setResourceNumeric(resource.type, resource.capacity || 0),
+        text: isMainValue
+          ? String(resource.capacity) || '0'
+          : setResourceNumeric(resource.type, resource.capacity || 0),
       },
     }
   })
 }
 
-export const setResourceNumeric = (type: string, value: number): string => {
+export const setResourceNumeric = (
+  type: string,
+  value: number,
+  lang: string = 'en'
+): string => {
   if (value === undefined) return ''
 
   const { $binary } = useNuxtApp()
 
-  if (type === 'cpu') return $binary.roundHz(value)
+  if (type === 'cpu') return $binary.roundHz(value, lang)
 
-  return $binary.round(value)
+  return $binary.round(value, false, lang)
 }

package/package.json

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

package/store/tasks/mappers/tasks.ts

@@ -1,45 +1,42 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  API_UI_I_Task,
-  UI_I_TaskItem,
-  UI_I_Task,
-  API_UI_I_TaskItem,
-} from '~/lib/models/store/tasks/interfaces'
-import {
-  UI_E_TaskStatus,
-  UI_E_IconNameByTaskStatus,
-} from '~/lib/models/store/tasks/enums'
-
-export const tasksConstructor = (
-  data: API_UI_I_Task<string>
-): UI_I_Task<string> => {
-  const localization: UI_I_Localization = useLocal()
-
-  const items: UI_I_TaskItem<string>[] =
-    data.items?.map((task: API_UI_I_TaskItem<string>) => {
-      return {
-        // relatedEvents: task?.RelatedEvents || '',
-        relatedEvents: '',
-        completion: task.completion || '-',
-        queuedFor: task.creation_time - task.start_time,
-        execution: Math.abs(task.start_time - task.completion),
-        details: task.details,
-        error: task.error,
-        initiator: task.initiator,
-        server: task.server,
-        startTime: task.start_time || '-',
-        statusIcon: UI_E_IconNameByTaskStatus[task.status],
-        statusText: task.error || localization[UI_E_TaskStatus[task.status]],
-        status: task.status,
-        target: task.target,
-        targetType: task.target_type,
-        taskName: task.task_name,
-        id: task.id,
-        zone: task.zone,
-      }
-    }) || []
-  return {
-    ...data,
-    items,
-  }
-}
+import type {
+  API_UI_I_Task,
+  UI_I_TaskItem,
+  UI_I_Task,
+  API_UI_I_TaskItem,
+} from '~/lib/models/store/tasks/interfaces'
+import {
+  UI_E_TaskStatus,
+  UI_E_IconNameByTaskStatus,
+} from '~/lib/models/store/tasks/enums'
+
+export const tasksConstructor = (
+  data: API_UI_I_Task<string>
+): UI_I_Task<string> => {
+  const items: UI_I_TaskItem<string>[] =
+    data.items?.map((task: API_UI_I_TaskItem<string>) => {
+      return {
+        // relatedEvents: task?.RelatedEvents || '',
+        relatedEvents: '',
+        completion: task.completion || '-',
+        queuedFor: task.creation_time - task.start_time,
+        execution: Math.abs(task.start_time - task.completion),
+        details: task.details,
+        error: task.error,
+        initiator: task.initiator,
+        server: task.server,
+        startTime: task.start_time || '-',
+        statusIcon: UI_E_IconNameByTaskStatus[task.status],
+        statusText: task.error || UI_E_TaskStatus[task.status],
+        status: task.status,
+        target: task.target,
+        targetType: task.target_type,
+        taskName: task.task_name,
+        id: task.id,
+        zone: task.zone,
+      }
+    }) || []
+  return {
+    ...data,
+    items,
+  }
+}