bfg-common 1.3.401 → 1.3.402

package/components/common/context/Context.vue

@@ -1,99 +1,99 @@
-<template>
-  <div
-    :id="elementId"
-    class="context-popup"
-    :style="{
-      top: currentContextMenuY,
-      left: currentContextMenuX,
-    }"
-  >
-    <common-context-recursion
-      :action-loading="props.actionLoading"
-      :items="props.contextMenu.items"
-      @select-item="selectItem"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import {
-  UI_I_ContextMenuItem,
-  UI_I_ContextMenu,
-} from '~/components/common/context/lib/models/interfaces'
-
-const props = defineProps<{
-  contextMenu: UI_I_ContextMenu
-  actionLoading: string | null
-}>()
-const emits = defineEmits<{
-  (event: 'select-item', value: UI_I_ContextMenuItem): void
-  (event: 'hide'): void
-}>()
-const selectItem = (item: UI_I_ContextMenuItem): void => {
-  emits('select-item', item)
-}
-
-const elementId = ref<string>(`context-${useUniqueId()}`)
-
-const currentContextMenuY = ref<string>('')
-const currentContextMenuX = ref<string>('')
-const setCurrentPositionsPopup = (): void => {
-  const contextMenuY = props.contextMenu.y
-  const contextMenuX = props.contextMenu.x
-
-  const contextWrap: HTMLElement | null =
-    document.querySelector(`#${elementId.value} .context-wrap`)
-  const contextW = contextWrap?.offsetWidth || 0
-  const contextH = contextWrap?.offsetHeight || 0
-
-  const windowW = window.innerWidth
-  const windowH = window.innerHeight
-
-  if (contextMenuY + contextH >= windowH) {
-    currentContextMenuY.value = 'auto'
-  } else {
-    currentContextMenuY.value = `${contextMenuY}px`
-  }
-
-  if (contextMenuX + contextW >= windowW) {
-    const divisionW = windowW - contextW
-    currentContextMenuX.value = `${divisionW}px`
-  } else {
-    currentContextMenuX.value = `${contextMenuX}px`
-  }
-}
-
-const windowMousedown = (): void => {
-  emits('hide')
-}
-watch(
-  () => props.contextMenu.y,
-  (newValue: number) => {
-    if (!newValue) return
-
-    if (newValue < 0) {
-      window.removeEventListener('mousedown', windowMousedown)
-    } else {
-      window.addEventListener('mousedown', windowMousedown)
-    }
-
-    setTimeout(() => {
-      setCurrentPositionsPopup()
-    }, 0)
-  }
-)
-</script>
-
-<style scoped lang="scss">
-.context-popup {
-  top: -9999px;
-  left: -9999px;
-  bottom: 0;
-  border: none;
-  box-sizing: content-box;
-  overflow: visible;
-  display: block;
-  position: fixed;
-  z-index: 10002;
-}
-</style>
+<template>
+  <div
+    :id="elementId"
+    class="context-popup"
+    :style="{
+      top: currentContextMenuY,
+      left: currentContextMenuX,
+    }"
+  >
+    <common-context-recursion
+      :action-loading="props.actionLoading"
+      :items="props.contextMenu.items"
+      @select-item="selectItem"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  UI_I_ContextMenuItem,
+  UI_I_ContextMenu,
+} from '~/components/common/context/lib/models/interfaces'
+
+const props = defineProps<{
+  contextMenu: UI_I_ContextMenu
+  actionLoading: string | null
+}>()
+const emits = defineEmits<{
+  (event: 'select-item', value: UI_I_ContextMenuItem): void
+  (event: 'hide'): void
+}>()
+const selectItem = (item: UI_I_ContextMenuItem): void => {
+  emits('select-item', item)
+}
+
+const elementId = ref<string>(`context-${useUniqueId()}`)
+
+const currentContextMenuY = ref<string>('')
+const currentContextMenuX = ref<string>('')
+const setCurrentPositionsPopup = (): void => {
+  const contextMenuY = props.contextMenu.y
+  const contextMenuX = props.contextMenu.x
+
+  const contextWrap: HTMLElement | null =
+    document.querySelector(`#${elementId.value} .context-wrap`)
+  const contextW = contextWrap?.offsetWidth || 0
+  const contextH = contextWrap?.offsetHeight || 0
+
+  const windowW = window.innerWidth
+  const windowH = window.innerHeight
+
+  if (contextMenuY + contextH >= windowH) {
+    currentContextMenuY.value = 'auto'
+  } else {
+    currentContextMenuY.value = `${contextMenuY}px`
+  }
+
+  if (contextMenuX + contextW >= windowW) {
+    const divisionW = windowW - contextW
+    currentContextMenuX.value = `${divisionW}px`
+  } else {
+    currentContextMenuX.value = `${contextMenuX}px`
+  }
+}
+
+const windowMousedown = (): void => {
+  emits('hide')
+}
+watch(
+  () => props.contextMenu.y,
+  (newValue: number) => {
+    if (!newValue) return
+
+    if (newValue < 0) {
+      window.removeEventListener('mousedown', windowMousedown)
+    } else {
+      window.addEventListener('mousedown', windowMousedown)
+    }
+
+    setTimeout(() => {
+      setCurrentPositionsPopup()
+    }, 0)
+  }
+)
+</script>
+
+<style scoped lang="scss">
+.context-popup {
+  top: -9999px;
+  left: -9999px;
+  bottom: 0;
+  border: none;
+  box-sizing: content-box;
+  overflow: visible;
+  display: block;
+  position: fixed;
+  z-index: 10002;
+}
+</style>

package/components/common/lib/config/states.ts

@@ -1,126 +1,126 @@
-export const clusterLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-]
-
-export const clusterIconByState = [
-  'cluster-error',
-  'cluster',
-  'cluster-warning',
-  'cluster-error',
-  // TODO Добавил на скорую руку нужно дополнить, если есть что добавить
-]
-
-export const hostLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-  'maintenance',
-  'notResponding',
-  'disconnected',
-]
-
-export const hostIconByState = [
-  'host-error',
-  'host',
-  'host-warning',
-  'host-error',
-  'host-maintenance',
-  'host-not-responding',
-  'host-disconnected',
-]
-
-export const vmLocalizationByState = [
-  'unknown',
-  'powerOff',
-  'poweredOn',
-  'suspended',
-  'error',
-  'warning',
-  'pending',
-  'paused',
-  'blocked',
-  'shuttingDown',
-  'shuttingOff',
-]
-
-export const vmIconByState = [
-  'vm-error',
-  'vm',
-  'vm-on',
-  'vm-suspended',
-  'vm-error',
-  'vm-warning',
-  'vm-warning',
-  'vm-suspended',
-  'vm-warning',
-  'vm-warning',
-  'vm-warning',
-]
-
-export const datastoreLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-  'maintenance',
-  'inaccessible',
-  'disconnected',
-]
-
-export const datastoreIconByState = [
-  'datastore-error',
-  'datastore',
-  'datastore-warning',
-  'datastore-error',
-  'datastore-maintenance',
-  'datastore-inaccessible',
-  'datastore-unmount', // 'datastore-disconnected',
-]
-
-export const networkLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-]
-
-export const networkIconByState = [
-  'network-error',
-  'network',
-  'network-warning',
-  'network-error',
-]
-
-export const switchLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-]
-
-export const switchIconByState = [
-  'switch-error',
-  'switch',
-  'switch-warning',
-  'switch-error',
-]
-
-export const resourcePoolLocalizationByState = [
-  'unknown',
-  'normal',
-  'warning',
-  'error',
-  'alert',
-]
-
-export const resourcePoolIconByState = [
-  'resourcePoolAlert',
-  'resource-pool',
-  'resourcePoolWarning',
-  'resourcePoolAlert',
-  'resourcePoolAlert',
-]
+export const clusterLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const clusterIconByState = [
+  'cluster-error',
+  'cluster',
+  'cluster-warning',
+  'cluster-error',
+  // TODO Добавил на скорую руку нужно дополнить, если есть что добавить
+]
+
+export const hostLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+  'maintenance',
+  'notResponding',
+  'disconnected',
+]
+
+export const hostIconByState = [
+  'host-error',
+  'host',
+  'host-warning',
+  'host-error',
+  'host-maintenance',
+  'host-not-responding',
+  'host-disconnected',
+]
+
+export const vmLocalizationByState = [
+  'unknown',
+  'powerOff',
+  'poweredOn',
+  'suspended',
+  'error',
+  'warning',
+  'pending',
+  'paused',
+  'blocked',
+  'shuttingDown',
+  'shuttingOff',
+]
+
+export const vmIconByState = [
+  'vm-error',
+  'vm',
+  'vm-on',
+  'vm-suspended',
+  'vm-error',
+  'vm-warning',
+  'vm-warning',
+  'vm-suspended',
+  'vm-warning',
+  'vm-warning',
+  'vm-warning',
+]
+
+export const datastoreLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+  'maintenance',
+  'inaccessible',
+  'disconnected',
+]
+
+export const datastoreIconByState = [
+  'datastore-error',
+  'datastore',
+  'datastore-warning',
+  'datastore-error',
+  'datastore-maintenance',
+  'datastore-inaccessible',
+  'datastore-unmount', // 'datastore-disconnected',
+]
+
+export const networkLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const networkIconByState = [
+  'network-error',
+  'network',
+  'network-warning',
+  'network-error',
+]
+
+export const switchLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const switchIconByState = [
+  'switch-error',
+  'switch',
+  'switch-warning',
+  'switch-error',
+]
+
+export const resourcePoolLocalizationByState = [
+  'unknown',
+  'normal',
+  'warning',
+  'error',
+  'alert',
+]
+
+export const resourcePoolIconByState = [
+  'resourcePoolAlert',
+  'resource-pool',
+  'resourcePoolWarning',
+  'resourcePoolAlert',
+  'resourcePoolAlert',
+]

package/components/common/pages/hardwareHealth/HardwareHealth.vue

@@ -79,25 +79,21 @@ const hardwareHealthDescription = computed<string>(() => {
   const { thereIsAlertAndWarningOutOfSensors, noAlertsOrWarningsOutOfSensors } =
     localization.value
 
-
   let alertCount = 0
   let warningCount = 0
 
-
-  hardwareHealth.value.forEach(sensor => {
-    if (sensor.status === 'alert') alertCount++
-    if (sensor.status === 'warning') warningCount++
+  hardwareHealth.value.forEach((sensor: UI_I_HardwareHealthSensors) => {
+    if (sensor.status === 3) alertCount++
+    if (sensor.status === 2) warningCount++
   })
 
-  // console.log(hardwareHealth.value, 'hardwareHealth')
-  //
   // const hasStatusTwoOrThree = hardwareHealth.value.some((sensor) =>
   //   ['warning', 'alert'].includes(sensor.status)
   // )
 
   type Replacements = {
-    alert: number,
-    warning: number,
+    alert: number
+    warning: number
     sensors: number
   }
 
@@ -111,7 +107,10 @@ const hardwareHealthDescription = computed<string>(() => {
     ? thereIsAlertAndWarningOutOfSensors
     : noAlertsOrWarningsOutOfSensors
 
-  return text?.replace(/{(\w+)}/g, (_, key: keyof Replacements) => replacements[key])
+  return text?.replace(
+    /{(\w+)}/g,
+    (_, key: keyof Replacements) => replacements[key]
+  )
 })
 
 const generateAlertTextWithLink = computed<UI_I_StorageSensorsAlert>(() => {

package/components/common/pages/hardwareHealth/tableView/TableView.vue

@@ -42,12 +42,12 @@
           {{ item.text }}
 
           <a
-            v-if="false"
+            v-if="item.data.warning"
             id="sensor-item-warning"
             :data-id="item.data.testId"
             href="javascript:void(0)"
             class="row-details__text"
-            @click="onShowFieldWarning(item.data.error)"
+            @click="onShowFieldWarning(item.data.warning)"
             >{{ localization.details }}...
           </a>
         </template>

package/components/common/pages/hardwareHealth/tableView/lib/config/sensorTable.ts

@@ -64,9 +64,11 @@ export const bodyItems = (
 ): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((sensor: UI_I_HardwareHealthSensors, key) => {
-    // const data = {
-    //   current: sensor,
-    // }
+    const statusData = {
+      iconClassName: sensorsIconByStatus[sensor.status],
+      isSprite: false,
+      warning: sensor.warning,
+    }
 
     bodyItems.push([
       // {
@@ -87,10 +89,7 @@ export const bodyItems = (
           sensorsLocalizationByStatus[sensor[hardwareHealthSensorTableKeys[1]]]
         ],
         id: key,
-        data: {
-          iconClassName: sensorsIconByStatus[sensor.status],
-          isSprite: false,
-        },
+        data: statusData,
       },
       {
         key: 'col2',

package/components/common/pages/hardwareHealth/tableView/lib/models/interfaces.ts

@@ -8,6 +8,7 @@ export interface UI_I_HardwareHealthSensors {
   reading: string
   category: string
   lastUpdated: string
+  warning?: string
   selEntries?: UI_I_HardwareHealthEventEntries[]
 }