bfg-common 1.4.460 → 1.4.462

package/assets/localization/local_be.json

@@ -2267,7 +2267,10 @@
     "logout": "Выйсці"
   },
   "home": {
-    "objectsWithMostAlerts": "Аб'екты з большасцю папярэджанняў"
+    "objectsWithMostAlerts": "Аб'екты з большасцю папярэджанняў",
+    "totalUsages": "Агульная колькасць выкарыстанняў",
+    "totalQuantities": "Агульныя колькасці",
+    "totalAlertsWarnings": "Усяго абвестак і папярэджанняў"
   },
   "tasks": {
     "task": "Задача",

package/assets/localization/local_en.json

@@ -2271,7 +2271,10 @@
     "logout": "Log Out"
   },
   "home": {
-    "objectsWithMostAlerts": "Objects with most alerts"
+    "objectsWithMostAlerts": "Objects with most alerts",
+    "totalUsages": "Total Usages",
+    "totalQuantities": "Total Quantities",
+    "totalAlertsWarnings": "Total Alerts & Warnings"
   },
   "tasks": {
     "task": "Task",

package/assets/localization/local_hy.json

@@ -2271,7 +2271,10 @@
     "logout": "Դուրս գալ"
   },
   "home": {
-    "objectsWithMostAlerts": "Առավելագույն նախազգուշացումներով օբյեկտներ"
+    "objectsWithMostAlerts": "Առավելագույն նախազգուշացումներով օբյեկտներ",
+    "totalUsages": "Ընդհանուր կիրառումներ",
+    "totalQuantities": "Ընդհանուր քանակություններ",
+    "totalAlertsWarnings": "Ընդհանուր հիշեցումներ և նախազգուշացումներ"
   },
   "tasks": {
     "task": "Առաջադրանք",

package/assets/localization/local_kk.json

@@ -2270,7 +2270,10 @@
     "logout": "Шығу"
   },
   "home": {
-    "objectsWithMostAlerts": "Көптеген ескертулері бар нысандар"
+    "objectsWithMostAlerts": "Көптеген ескертулері бар нысандар",
+    "totalUsages": "Жалпы пайдаланулар",
+    "totalQuantities": "Жалпы мөлшерлер",
+    "totalAlertsWarnings": "Жалпы ескертулер мен ескертулер"
   },
   "tasks": {
     "task": "Тапсырма",

package/assets/localization/local_ru.json

@@ -2272,7 +2272,10 @@
     "logout": "Выйти"
   },
   "home": {
-    "objectsWithMostAlerts": " Объекты с большим количестом оповещений"
+    "objectsWithMostAlerts": " Объекты с большим количестом оповещений",
+    "totalUsages": "Всего использований",
+    "totalQuantities": "Общее количество",
+    "totalAlertsWarnings": "Всего оповещений и предупреждений"
   },
   "tasks": {
     "task": "Задача",

package/assets/localization/local_zh.json

@@ -2269,7 +2269,10 @@
     "logout": "退出"
   },
   "home": {
-    "objectsWithMostAlerts": "警报最多的对象"
+    "objectsWithMostAlerts": "警报最多的对象",
+    "totalUsages": "总使用量",
+    "totalQuantities": "总数量",
+    "totalAlertsWarnings": "警报和警告总数"
   },
   "tasks": {
     "task": "任务",

package/components/common/home/lib/models/interfaces.ts

@@ -5,7 +5,8 @@ export interface UI_I_ZoneList {
   id: number
 }
 
-export interface UI_I_ResourceMeter<T> {
+export interface UI_I_ResourceMeter<T = UI_I_MeterBlockItem> {
+  // TODO такой интерфасе есть (UI_I_Resources)
   type: string
   capacity?: T
   free?: T

package/components/common/pages/home/resource/Resource.vue

@@ -14,13 +14,10 @@
 </template>
 
 <script lang="ts" setup>
-import type {
-  UI_I_ResourceMeter,
-  UI_I_MeterBlockItem,
-} from '~/components/common/home/lib/models/interfaces'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
 
 const props = defineProps<{
-  items: UI_I_ResourceMeter<UI_I_MeterBlockItem>[]
+  items: UI_I_Resources[]
 }>()
 
 const { $store }: any = useNuxtApp()

package/components/common/pages/home/resource/ResourceNew.vue

@@ -1,33 +1,35 @@
 <template>
-  <ui-widget v-for="(item, key) in resourceMeter" :key="key">
-    <template v-if="props.loading">
-      <ui-widget-items-skeleton-line-bar />
-    </template>
-    <ui-widget-items-progress-bar-linear
-      v-else
-      id="host-summary-memory"
-      container-id="host"
-      :icon="item.icon"
-      :title="item.title"
-      :data="item.data"
-      :used-title="item.usedTitle"
-      :capacity-title="item.capacityTitle"
-      :status="item.status"
-    />
-  </ui-widget>
+  <div class="total-usages">
+    <h1>{{ localization.home.totalUsages }}</h1>
+    <div class="total-usages__container">
+      <ui-widget v-for="(item, key) in resourceMeter" :key="key">
+        <template v-if="props.loading">
+          <ui-widget-items-skeleton-line-bar />
+        </template>
+        <ui-widget-items-progress-bar-linear
+          v-else
+          id="host-summary-memory"
+          container-id="host"
+          :icon="item.icon"
+          :title="item.title"
+          :data="item.data"
+          :used-title="item.usedTitle"
+          :capacity-title="item.capacityTitle"
+          :status="item.status"
+        />
+      </ui-widget>
+    </div>
+  </div>
 </template>
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ResourceMeter,
-  UI_I_MeterBlockItem,
-} from '~/components/common/home/lib/models/interfaces'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
 import type { UI_I_ResourceBlock } from '~/components/common/pages/home/resource/lib/models/interfaces'
 import { constructResourceMeter } from '~/components/common/pages/home/resource/lib/utils/resourceMeter'
 
 const props = defineProps<{
-  items: UI_I_ResourceMeter<UI_I_MeterBlockItem>[]
+  items: UI_I_Resources[]
   loading: boolean
 }>()
 
@@ -38,4 +40,19 @@ const resourceMeter = computed<UI_I_ResourceBlock[]>(() =>
 )
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.total-usages {
+  & > h1 {
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 16.94px;
+    color: #9da6ad;
+    margin-bottom: 12px;
+  }
+  &__container {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-column-gap: 12px;
+  }
+}
+</style>

package/components/common/pages/home/resource/ResourceOld.vue

@@ -35,13 +35,10 @@
 </template>
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ResourceMeter,
-  UI_I_MeterBlockItem,
-} from '~/components/common/home/lib/models/interfaces'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
 
 const props = defineProps<{
-  items: UI_I_ResourceMeter<UI_I_MeterBlockItem>[]
+  items: UI_I_Resources[]
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/pages/home/resource/lib/models/interfaces.ts

@@ -1,5 +1,4 @@
 import type { UI_I_ProgressWidgetData } from '~/node_modules/bfg-uikit/components/ui/widget/lib/models/interfaces'
-
 export interface UI_I_ResourceBlock {
   id: string
   containerId?: string

package/components/common/pages/home/resource/lib/utils/resourceMeter.ts

@@ -1,50 +1,49 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ResourceMeter,
-  UI_I_MeterBlockItem,
-} from '~/components/common/home/lib/models/interfaces'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
 import type { UI_I_ResourceBlock } from '~/components/common/pages/home/resource/lib/models/interfaces'
 
 export const constructResourceMeter = (
-  data: UI_I_ResourceMeter<UI_I_MeterBlockItem>[],
+  data: UI_I_Resources[],
   localization: UI_I_Localization
 ): UI_I_ResourceBlock[] => {
   if (!data) return []
 
   return (
-    data
-      .filter((item) => ['memory', 'storage'].includes(item.type))
-      .map((item, key) => {
-        let title = ''
-        let icon = ''
+    data.map((item, key) => {
+      let title = ''
+      let icon = ''
 
-        switch (item.type) {
-          case 'memory':
-            title = localization.common.memory
-            icon = 'widget-memory'
-            break
-          case 'storage':
-            title = localization.common.storage
-            icon = 'widget-datastore'
-            break
-        }
+      switch (item.type) {
+        case 'memory':
+          title = localization.common.memory
+          icon = 'widget-memory'
+          break
+        case 'storage':
+          title = localization.common.storage
+          icon = 'widget-datastore'
+          break
+        case 'cpu':
+          title = localization.common.cpu
+          icon = 'widget-cpu'
+          break
+      }
 
-        return {
-          id: `${item.type}-${key}`,
-          containerId: `${key}`,
-          icon,
-          title,
-          data: {
-            used: item.used.text,
-            usedPureValue: item.used.value,
-            capacity: item.capacity.text,
-            capacityPureValue: item.capacity.value,
-            free: item.free.text,
-          },
-          usedTitle: localization.common.used,
-          capacityTitle: localization.common.capacity,
-          status: localization.common.available,
-        }
-      }) || []
+      return {
+        id: `${item.type}-${key}`,
+        containerId: `${key}`,
+        icon,
+        title,
+        data: {
+          used: item.used.text,
+          usedPureValue: item.used.value as number,
+          capacity: item.capacity.text,
+          capacityPureValue: item.capacity.value as number,
+          free: item.free.text,
+        },
+        usedTitle: localization.common.used,
+        capacityTitle: localization.common.capacity,
+        status: localization.common.available,
+      }
+    }) || []
   )
 }

package/package.json

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