bfg-common 1.4.855 → 1.4.857

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

@@ -1,48 +1,48 @@
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
-import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
-
-export interface UI_I_ZoneList extends UI_I_Option {}
-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 {
-  item: string
-  type: UI_T_NodeType
-  id: number
-  alerts: number
-  warnings: number
-}
-
-export interface UI_I_Service {
-  id: number
-  item: string
-  statusIcon: string
-  statusText: string
-  version: string
-}
-
-export interface UI_I_HomeInfo {
-  resource_meter: UI_I_Resources[]
-  vms: UI_I_Vms
-  alerts: UI_I_Alert[]
-  services: UI_I_Service[]
-  hosts?: UI_I_Hosts
-}
-
-export interface UI_I_Card {
-  text: string
-  value: number
-  icon?: string
-}
+import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
+
+export interface UI_I_ZoneList extends UI_I_Option {}
+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 {
+  item: string
+  type: UI_T_NodeType
+  id: number
+  alerts: number
+  warnings: number
+}
+
+export interface UI_I_Service {
+  id: number
+  item: string
+  statusIcon: string
+  statusText: string
+  version: string
+}
+
+export interface UI_I_HomeInfo {
+  resource_meter: UI_I_Resources[]
+  vms: UI_I_Vms
+  alerts: UI_I_Alert[]
+  services: UI_I_Service[]
+  hosts?: UI_I_Hosts
+}
+
+export interface UI_I_Card {
+  text: string
+  value: number
+  icon?: string
+}

package/components/common/pages/home/widgets/Widgets.vue

@@ -1,49 +1,49 @@
-<template>
-  <common-pages-home-widgets-new
-    v-if="isNewView"
-    :vms="vms"
-    :hosts="hosts"
-    :alerts="alerts || []"
-    :services="services || []"
-    :loading="props.loading"
-    :project="props.project"
-  />
-
-  <common-pages-home-widgets-old
-    v-else
-    :vms="vms"
-    :hosts="hosts"
-    :alerts="alerts || []"
-    :services="services || []"
-    :project="props.project"
-  />
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_Alert,
-  UI_I_HomeInfo,
-  UI_I_Hosts,
-  UI_I_Vms,
-  UI_I_Service,
-} from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-const props = defineProps<{
-  homeInfo: UI_I_HomeInfo
-  loading: boolean
-  project?: UI_T_Project
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const vms = computed<UI_I_Vms>(() => props.homeInfo.vms || {})
-const hosts = computed<UI_I_Hosts>(() => props.homeInfo.hosts || {})
-
-const alerts = computed<UI_I_Alert[]>(() => props.homeInfo.alerts || 0)
-const services = computed<UI_I_Service[]>(() => props.homeInfo.services || 0)
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-pages-home-widgets-new
+    v-if="isNewView"
+    :vms="vms"
+    :hosts="hosts"
+    :alerts="alerts || []"
+    :services="services || []"
+    :loading="props.loading"
+    :project="props.project"
+  />
+
+  <common-pages-home-widgets-old
+    v-else
+    :vms="vms"
+    :hosts="hosts"
+    :alerts="alerts || []"
+    :services="services || []"
+    :project="props.project"
+  />
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_Alert,
+  UI_I_HomeInfo,
+  UI_I_Hosts,
+  UI_I_Vms,
+  UI_I_Service,
+} from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+const props = defineProps<{
+  homeInfo: UI_I_HomeInfo
+  loading: boolean
+  project?: UI_T_Project
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const vms = computed<UI_I_Vms>(() => props.homeInfo.vms || {})
+const hosts = computed<UI_I_Hosts>(() => props.homeInfo.hosts || {})
+
+const alerts = computed<UI_I_Alert[]>(() => props.homeInfo.alerts || 0)
+const services = computed<UI_I_Service[]>(() => props.homeInfo.services || 0)
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/home/widgets/WidgetsNew.vue

@@ -1,86 +1,86 @@
-<template>
-  <div class="home-total-quantities">
-    <h1>
-      {{ localization.home.totalQuantities }}
-    </h1>
-
-    <div :class="['grid-container', props.project === 'procurator' && 'mono']">
-      <common-pages-home-widgets-vms :vms="vms" :loading="props.loading" />
-
-      <common-pages-home-widgets-hosts
-        v-if="props.project === 'sphere'"
-        :hosts="hosts"
-        :loading="props.loading"
-      />
-    </div>
-  </div>
-
-  <div class="home-total-warnings">
-    <h1>
-      {{ localization.home.totalAlertsWarnings }}
-    </h1>
-
-    <div class="grid-container">
-      <common-pages-home-widgets-warnings
-        :alerts="alerts || []"
-        :loading="props.loading"
-      />
-
-      <common-pages-home-widgets-services
-        :services="services || []"
-        :loading="props.loading"
-      />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_Alert,
-  UI_I_Hosts,
-  UI_I_Vms,
-  UI_I_Service,
-} from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-const props = defineProps<{
-  vms: UI_I_Vms
-  hosts: UI_I_Hosts
-  alerts: UI_I_Alert[]
-  services: UI_I_Service[]
-  loading: boolean
-  project?: UI_T_Project
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped>
-.home-total-warnings,
-.home-total-quantities {
-  margin-top: 24px;
-  & > h1 {
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 16.94px;
-    color: #9da6ad;
-    margin-bottom: 12px;
-  }
-}
-
-.grid-container {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  grid-column-gap: 12px;
-
-  &.mono {
-    grid-template-columns: 1fr;
-  }
-
-  @media (max-width: 1024px) {
-    grid-template-columns: 1fr;
-    grid-row-gap: 12px;
-  }
-}
-</style>
+<template>
+  <div class="home-total-quantities">
+    <h1>
+      {{ localization.home.totalQuantities }}
+    </h1>
+
+    <div :class="['grid-container', props.project === 'procurator' && 'mono']">
+      <common-pages-home-widgets-vms :vms="vms" :loading="props.loading" />
+
+      <common-pages-home-widgets-hosts
+        v-if="props.project === 'sphere'"
+        :hosts="hosts"
+        :loading="props.loading"
+      />
+    </div>
+  </div>
+
+  <div class="home-total-warnings">
+    <h1>
+      {{ localization.home.totalAlertsWarnings }}
+    </h1>
+
+    <div class="grid-container">
+      <common-pages-home-widgets-warnings
+        :alerts="alerts || []"
+        :loading="props.loading"
+      />
+
+      <common-pages-home-widgets-services
+        :services="services || []"
+        :loading="props.loading"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_Alert,
+  UI_I_Hosts,
+  UI_I_Vms,
+  UI_I_Service,
+} from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+const props = defineProps<{
+  vms: UI_I_Vms
+  hosts: UI_I_Hosts
+  alerts: UI_I_Alert[]
+  services: UI_I_Service[]
+  loading: boolean
+  project?: UI_T_Project
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped>
+.home-total-warnings,
+.home-total-quantities {
+  margin-top: 24px;
+  & > h1 {
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 16.94px;
+    color: #9da6ad;
+    margin-bottom: 12px;
+  }
+}
+
+.grid-container {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-column-gap: 12px;
+
+  &.mono {
+    grid-template-columns: 1fr;
+  }
+
+  @media (max-width: 1024px) {
+    grid-template-columns: 1fr;
+    grid-row-gap: 12px;
+  }
+}
+</style>

package/components/common/pages/home/widgets/WidgetsOld.vue

@@ -1,34 +1,34 @@
-<template>
-  <div class="clr-row">
-    <common-pages-home-widgets-vms :vms="props.vms" :project="props.project" />
-
-    <common-pages-home-widgets-hosts
-      v-if="props.project === 'sphere'"
-      :hosts="props.hosts"
-    />
-
-    <common-pages-home-widgets-warnings :alerts="props.alerts" />
-
-    <common-pages-home-widgets-services :services="props.services" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_Alert,
-  UI_I_Hosts,
-  UI_I_Vms,
-  UI_I_Service,
-} from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-const props = defineProps<{
-  vms: UI_I_Vms
-  hosts: UI_I_Hosts
-  alerts: UI_I_Alert[]
-  services: UI_I_Service[]
-  project?: UI_T_Project
-}>()
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div class="clr-row">
+    <common-pages-home-widgets-vms :vms="props.vms" :project="props.project" />
+
+    <common-pages-home-widgets-hosts
+      v-if="props.project === 'sphere'"
+      :hosts="props.hosts"
+    />
+
+    <common-pages-home-widgets-warnings :alerts="props.alerts" />
+
+    <common-pages-home-widgets-services :services="props.services" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_Alert,
+  UI_I_Hosts,
+  UI_I_Vms,
+  UI_I_Service,
+} from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+const props = defineProps<{
+  vms: UI_I_Vms
+  hosts: UI_I_Hosts
+  alerts: UI_I_Alert[]
+  services: UI_I_Service[]
+  project?: UI_T_Project
+}>()
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,27 +1,27 @@
-<template>
-  <common-pages-home-widgets-hosts-new
-    v-if="isNewView"
-    :hosts="props.hosts"
-    :loading="props.loading"
-  />
-
-  <common-pages-home-widgets-hosts-old
-    v-else
-    :hosts="props.hosts"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
-
-const props = defineProps<{
-  hosts: UI_I_Hosts
-  loading: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-pages-home-widgets-hosts-new
+    v-if="isNewView"
+    :hosts="props.hosts"
+    :loading="props.loading"
+  />
+
+  <common-pages-home-widgets-hosts-old
+    v-else
+    :hosts="props.hosts"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
+
+const props = defineProps<{
+  hosts: UI_I_Hosts
+  loading: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -84,7 +84,7 @@ const itemsLocal = computed<UI_I_Card[]>(() => itemsFunc(props.hosts))
     .label {
       color: #9da6ad;
       font-size: 14px;
-      font-weight: 500;
+      font-weight: 400;
       line-height: 16.94px;
       margin-bottom: 12px;
     }

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

@@ -1,23 +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',
-  },
-]
+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/services/ServicesNew.vue

@@ -29,6 +29,24 @@
             </span>
           </span>
         </template>
+
+        <template #status="{ item }">
+          <ui-chip
+            :test-id="item.data.testId"
+            :color="item.data.chipColor"
+            rounded
+            size="sm"
+            class="services-table__chip"
+          >
+            <ui-icon
+              :name="item.data.icon"
+              width="12px"
+              height="12px"
+              class="chip-icon"
+            ></ui-icon>
+            {{ item.text }}
+          </ui-chip>
+        </template>
       </ui-data-table>
     </div>
   </ui-widget>
@@ -100,6 +118,14 @@ watch(
       margin-left: 5px;
     }
   }
+  &__chip {
+    :deep(.ui-chip__label) {
+      font-size: 10px;
+    }
+    .chip-icon {
+      min-width: 12px;
+    }
+  }
 }
 
 .target-link {
@@ -113,10 +139,6 @@ watch(
     color: var(--bottom-pannel-rtask-link-hover-text);
   }
 }
-.chip-icon {
-  min-width: 14px;
-  margin-right: 4px;
-}
 .icon {
   margin-right: 4px;
 }

package/components/common/pages/home/widgets/services/lib/config/config.ts

@@ -4,13 +4,34 @@ import type {
   UI_I_DataTableOptions,
   UI_I_DataTableHeader,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import { UI_E_RecentTaskStatus } from '~/lib/models/store/tasks/enums'
+// import { UI_E_RecentTaskStatus } from '~/lib/models/store/tasks/enums'
 import type { UI_I_Service } from '~/components/common/pages/home/lib/models/interfaces'
 import {
-  E_RTaskChipColor,
-  E_RTaskStatusIcon,
+  E_ServicesStatus,
+  E_ServicesChipColor,
+  E_ServicesStatusIcon,
 } from '~/components/common/pages/home/widgets/services/lib/models/enums'
 
+// Маппинг для статусов
+const STATUS_MAPPING = {
+  [E_ServicesStatus.Running]: {
+    icon: E_ServicesStatusIcon.Running,
+    chipColor: E_ServicesChipColor.Primary,
+  },
+  [E_ServicesStatus.Success]: {
+    icon: E_ServicesStatusIcon.StatusCheck,
+    chipColor: E_ServicesChipColor.Green,
+  },
+  [E_ServicesStatus.Error]: {
+    icon: E_ServicesStatusIcon.ErrorOutline,
+    chipColor: E_ServicesChipColor.Red,
+  },
+  [E_ServicesStatus.Info]: {
+    icon: E_ServicesStatusIcon.HelpIcon,
+    chipColor: E_ServicesChipColor.Default,
+  },
+}
+
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTableHeader[] => [
@@ -75,11 +96,12 @@ export const getBodyDataFunc = (
       // type,
     }
 
+    const statusKey =
+      E_ServicesStatus[service.statusText as keyof typeof E_ServicesStatus]
     const statusData = {
-      icon: E_RTaskStatusIcon[service.statusText],
-      chipColor: E_RTaskChipColor[service.statusText] || 'default',
-      error: service.statusText,
-      testId: `${service.statusText}-progress`,
+      ...STATUS_MAPPING[statusKey],
+      testId: `${service.statusText}-${index}-status`,
+      // error: service.statusText,
     }
 
     return {