bfg-common 1.4.681 → 1.4.683

package/components/common/pages/home/StatusContent.vue

@@ -13,10 +13,10 @@
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Card } from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
 
 const props = defineProps<{
-  items: UI_I_Card
+  items: UI_I_Hosts
 }>()
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>

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

@@ -7,12 +7,14 @@ export interface UI_I_Hosts {
   connected: number
   disconnected: number
   maintenance: number
+  total: number
 }
 
 export interface UI_I_Vms {
   powered_on: number
   powered_off: number
   suspended: number
+  total: number
 }
 
 export interface UI_I_Alert {
@@ -42,4 +44,5 @@ export interface UI_I_HomeInfo {
 export interface UI_I_Card {
   text: string
   value: number
+  icon?: string
 }

package/components/common/pages/home/widgets/hosts/Hosts.vue

@@ -1,16 +1,14 @@
 <template>
   <common-pages-home-widgets-hosts-new
     v-if="isNewView"
-    :items="defaultHosts"
-    :total-hosts="totalHosts"
+    :hosts="props.hosts"
     :loading="props.loading"
-  ></common-pages-home-widgets-hosts-new>
+  />
 
   <common-pages-home-widgets-hosts-old
     v-else
     :hosts="props.hosts"
-    :total-hosts="totalHosts"
-  ></common-pages-home-widgets-hosts-old>
+  />
 </template>
 
 <script lang="ts" setup>
@@ -24,33 +22,6 @@ const props = defineProps<{
 const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const totalHosts = computed<number>(
-  () =>
-    props.hosts.connected +
-      props.hosts.maintenance +
-      props.hosts.disconnected || 0
-)
-
-const defaultHosts = ref([
-  // временно
-  {
-    value: 0,
-    text: 'connected',
-    icon: 'vsphere-icon-Host_Connect',
-  },
-  {
-    value: 0,
-    text: 'disconnected',
-    icon: 'vsphere-icon-Host_Disconnect',
-  },
-
-  {
-    value: 0,
-    text: 'maintenance',
-    icon: 'vsphere-icon-host-maintenance',
-  },
-])
 </script>
 
 <style lang="scss" scoped></style>

package/components/common/pages/home/widgets/hosts/HostsNew.vue

@@ -6,14 +6,11 @@
     <div v-else class="card-content">
       <div class="card-content__title">
         <h1>{{ localization.common.hosts }}</h1>
-        <span>({{ props.totalHosts }})</span>
+        <span>({{ props.hosts.total }})</span>
       </div>
 
       <div class="card-content__container">
-        <template
-          v-for="({ text, value, icon }, key) in props.items"
-          :key="key"
-        >
+        <template v-for="({ text, value, icon }, key) in itemsLocal" :key="key">
           <div v-if="key > 0" class="divider"></div>
 
           <div class="card-content-item">
@@ -29,15 +26,20 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Card } from '~/components/common/pages/home/lib/models/interfaces'
+import type {
+  UI_I_Card,
+  UI_I_Hosts,
+} from '~/components/common/pages/home/lib/models/interfaces'
+import { itemsFunc } from '~/components/common/pages/home/widgets/hosts/lib/config/items'
 
 const props = defineProps<{
-  items: UI_I_Card[]
-  totalHosts: number
+  hosts: UI_I_Hosts
   loading: boolean
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const itemsLocal = computed<UI_I_Card[]>(() => itemsFunc(props.hosts))
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/home/widgets/hosts/HostsOld.vue

@@ -3,7 +3,7 @@
     <div class="entity-status">
       <common-pages-home-card
         :title="localization.common.hosts"
-        :count="props.totalHosts"
+        :count="props.hosts.total"
         icon-name="vsphere-icon-host"
       >
         <common-pages-home-status-content :items="props.hosts" />
@@ -17,7 +17,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
 const props = defineProps<{
   hosts: UI_I_Hosts
-  totalHosts: number
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/pages/home/widgets/hosts/lib/config/items.ts

@@ -0,0 +1,23 @@
+import type {
+  UI_I_Card,
+  UI_I_Hosts,
+} from '~/components/common/pages/home/lib/models/interfaces'
+
+export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
+  {
+    value: hosts.connected,
+    text: 'connected',
+    icon: 'vsphere-icon-Host_Connect',
+  },
+  {
+    value: hosts.disconnected,
+    text: 'disconnected',
+    icon: 'vsphere-icon-Host_Disconnect',
+  },
+
+  {
+    value: hosts.maintenance,
+    text: 'maintenance',
+    icon: 'vsphere-icon-host-maintenance',
+  },
+]

package/components/common/pages/home/widgets/vms/Vms.vue

@@ -1,16 +1,14 @@
 <template>
   <common-pages-home-widgets-vms-new
     v-if="isNewView"
-    :items="defaultVms"
-    :total-vms="totalVms"
+    :vms="props.vms"
     :loading="props.loading"
-  ></common-pages-home-widgets-vms-new>
+  />
 
   <common-pages-home-widgets-vms-old
     v-else
     :vms="props.vms"
-    :total-vms="totalVms"
-  ></common-pages-home-widgets-vms-old>
+  />
 </template>
 
 <script lang="ts" setup>
@@ -24,30 +22,6 @@ const props = defineProps<{
 const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const totalVms = computed<number>(
-  () => props.vms.powered_on + props.vms.powered_off + props.vms.suspended || 0
-)
-
-const defaultVms = ref([
-  // временно
-  {
-    value: 0,
-    text: 'powered_on',
-    icon: 'vsphere-icon-vm-on',
-  },
-  {
-    value: 0,
-    text: 'powered_off',
-    icon: 'icon-vm-power-off',
-  },
-
-  {
-    value: 0,
-    text: 'suspended',
-    icon: 'vsphere-icon-vm-suspended',
-  },
-])
 </script>
 
 <style lang="scss" scoped></style>

package/components/common/pages/home/widgets/vms/VmsNew.vue

@@ -6,14 +6,11 @@
     <div v-else class="card-content">
       <div class="card-content__title">
         <h1>{{ localization.common.vms }}</h1>
-        <span>({{ props.totalVms }})</span>
+        <span>({{ props.vms.total }})</span>
       </div>
 
       <div class="card-content__container">
-        <template
-          v-for="({ text, value, icon }, key) in props.items"
-          :key="key"
-        >
+        <template v-for="({ text, value, icon }, key) in itemsLocal" :key="key">
           <div v-if="key > 0" class="divider"></div>
 
           <div class="card-content-item">
@@ -29,15 +26,20 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Card } from '~/components/common/pages/home/lib/models/interfaces'
+import type {
+  UI_I_Card,
+  UI_I_Vms,
+} from '~/components/common/pages/home/lib/models/interfaces'
+import { itemsFunc } from '~/components/common/pages/home/widgets/vms/lib/config/items'
 
 const props = defineProps<{
-  items: UI_I_Card[]
-  totalVms: number
+  vms: UI_I_Vms
   loading: boolean
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const itemsLocal = computed<UI_I_Card[]>(() => itemsFunc(props.vms))
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/home/widgets/vms/VmsOld.vue

@@ -3,7 +3,7 @@
     <div class="entity-status">
       <common-pages-home-card
         :title="localization.common.vms"
-        :count="props.totalVms"
+        :count="props.vms.total"
         icon-name="vsphere-icon-vm"
       >
         <common-pages-home-status-content :items="props.vms" />
@@ -17,7 +17,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
 const props = defineProps<{
   vms: UI_I_Vms
-  totalVms: number
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/pages/home/widgets/vms/lib/config/items.ts

@@ -0,0 +1,20 @@
+import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
+
+export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
+  {
+    value: vms.powered_on,
+    text: 'powered_on',
+    icon: 'vsphere-icon-vm-on',
+  },
+  {
+    value: vms.powered_off,
+    text: 'powered_off',
+    icon: 'icon-vm-power-off',
+  },
+
+  {
+    value: vms.suspended,
+    text: 'suspended',
+    icon: 'vsphere-icon-vm-suspended',
+  },
+]

package/package.json

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