bfg-common 1.4.732 → 1.4.734

package/components/common/{chartOptionsModal → pages/hardwareHealth/historyTestimony/tools/chartOptionsModal}/counters/timespan/form/lib/config/dateForm.ts

@@ -1,116 +1,115 @@
-import type {
-  UI_I_ArbitraryObject,
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-export const timespanFunc = (
-  localization: UI_I_Localization
-): UI_I_OptionItem[] => [
-  {
-    text: localization.inventoryMonitor.realTime,
-    value: 'real_time',
-  },
-  {
-    text: localization.inventoryMonitor.lastDay,
-    value: 'last_day',
-  },
-  {
-    text: localization.inventoryMonitor.lastWeek,
-    value: 'last_week',
-  },
-  {
-    text: localization.inventoryMonitor.lastMonth,
-    value: 'last_month',
-  },
-  // {
-  //   text: localization.inventoryMonitor.lastYear,
-  //   value: 'last_year',
-  // },
-  {
-    text: localization.inventoryMonitor.customInterval,
-    value: 'custom_interval',
-  },
-]
-
-export const customTimeFunc = (
-  localization: UI_I_Localization,
-  value: number,
-  lang: string
-): UI_I_OptionItem[] => {
-  const isLangRu = lang === 'ru_RU'
-
-  const hourText = isLangRu
-    ? getCorrectRuForm(value, 'hour')
-    : localization.common.hours2
-  const dayText = isLangRu
-    ? getCorrectRuForm(value, 'day')
-    : localization.common.days2
-  const weekText = isLangRu
-    ? getCorrectRuForm(value, 'week')
-    : localization.common.weeks2
-  const monthText = isLangRu
-    ? getCorrectRuForm(value, 'month')
-    : localization.common.months2
-
-  return [
-    {
-      text: hourText,
-      value: 'hours',
-    },
-    {
-      text: dayText,
-      value: 'days',
-    },
-    {
-      text: weekText,
-      value: 'weeks',
-    },
-    {
-      text: monthText,
-      value: 'months',
-    },
-  ]
-}
-
-export const chartTypeFunc = (
-  localization: UI_I_Localization
-): UI_I_OptionItem[] => [
-  {
-    text: localization.inventoryMonitor.lineGraph,
-    value: 'line_graph',
-  },
-  {
-    text: localization.inventoryMonitor.stackedGraph,
-    value: 'stacked_graph',
-  },
-]
-
-const getCorrectRuForm = (value: number, type: string): string => {
-  // TODO поправить используя correctRuUnit из плагина date
-  const forms: UI_I_ArbitraryObject<string[]> = {
-    hour: ['Час', 'Часа', 'Часов'],
-    day: ['День', 'Дня', 'Дней'],
-    week: ['Неделя', 'Недели', 'Недель'],
-    month: ['Месяц', 'Месяца', 'Месяцев'],
-  }
-
-  let text: string
-
-  if (!value) {
-    return getCorrectRuForm[type]
-  }
-
-  if (value % 10 === 1 && value % 100 !== 11) {
-    text = forms[type][0]
-  } else if (
-    [2, 3, 4].includes(value % 10) &&
-    ![12, 13, 14].includes(value % 100)
-  ) {
-    text = forms[type][1]
-  } else {
-    text = forms[type][2]
-  }
-  getCorrectRuForm[type] = text
-  return text
-}
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+export const timespanFunc = (
+  localization: UI_I_Localization
+): UI_I_OptionItem[] => [
+  {
+    text: localization.inventoryMonitor.realTime,
+    value: 'real_time',
+  },
+  {
+    text: localization.inventoryMonitor.lastDay,
+    value: 'last_day',
+  },
+  {
+    text: localization.inventoryMonitor.lastWeek,
+    value: 'last_week',
+  },
+  {
+    text: localization.inventoryMonitor.lastMonth,
+    value: 'last_month',
+  },
+  // {
+  //   text: localization.inventoryMonitor.lastYear,
+  //   value: 'last_year',
+  // },
+  {
+    text: localization.inventoryMonitor.customInterval,
+    value: 'custom_interval',
+  },
+]
+
+export const customTimeFunc = (
+  localization: UI_I_Localization,
+  value: number,
+  lang: string
+): UI_I_OptionItem[] => {
+  const isLangRu = lang === 'ru_RU'
+
+  const hourText = isLangRu
+    ? getCorrectRuForm(value, 'hour')
+    : localization.common.hours2
+  const dayText = isLangRu
+    ? getCorrectRuForm(value, 'day')
+    : localization.common.days2
+  const weekText = isLangRu
+    ? getCorrectRuForm(value, 'week')
+    : localization.common.weeks2
+  const monthText = isLangRu
+    ? getCorrectRuForm(value, 'month')
+    : localization.common.months2
+
+  return [
+    {
+      text: hourText,
+      value: 'hours',
+    },
+    {
+      text: dayText,
+      value: 'days',
+    },
+    {
+      text: weekText,
+      value: 'weeks',
+    },
+    {
+      text: monthText,
+      value: 'months',
+    },
+  ]
+}
+
+export const chartTypeFunc = (
+  localization: UI_I_Localization
+): UI_I_OptionItem[] => [
+  {
+    text: localization.inventoryMonitor.lineGraph,
+    value: 'line_graph',
+  },
+  {
+    text: localization.inventoryMonitor.stackedGraph,
+    value: 'stacked_graph',
+  },
+]
+
+const getCorrectRuForm = (value: number, type: string): string => {
+  const forms: UI_I_ArbitraryObject<string[]> = {
+    hour: ['Час', 'Часа', 'Часов'],
+    day: ['День', 'Дня', 'Дней'],
+    week: ['Неделя', 'Недели', 'Недель'],
+    month: ['Месяц', 'Месяца', 'Месяцев'],
+  }
+
+  let text: string
+
+  if (!value) {
+    return getCorrectRuForm[type]
+  }
+
+  if (value % 10 === 1 && value % 100 !== 11) {
+    text = forms[type][0]
+  } else if (
+    [2, 3, 4].includes(value % 10) &&
+    ![12, 13, 14].includes(value % 100)
+  ) {
+    text = forms[type][1]
+  } else {
+    text = forms[type][2]
+  }
+  getCorrectRuForm[type] = text
+  return text
+}

package/components/common/pages/tasks/Tasks.vue

@@ -74,11 +74,20 @@ onUnmounted(() => {
 })
 </script>
 
+<style>
+:root {
+  --main-bg-color: #fafafa;
+}
+:root.dark-theme {
+  --main-bg-color: #213444;
+}
+</style>
 <style lang="scss" scoped>
 .tasks {
   display: flex; // TODO надо удалить потом (clr style)
   flex-direction: column; // TODO надо удалить потом (clr style)
   height: inherit;
+  background-color: var(--main-bg-color);
   padding: 10px 16px 30px;
   &__headline {
     font-family: Inter, sans-serif;

package/components/common/pages/tasks/table/Table.vue

@@ -228,7 +228,6 @@ const onSelectNodeOfTree = (
   }
   .chip-icon {
     min-width: 14px;
-    margin-right: 6px;
   }
   .icon {
     margin-right: 4px;

package/components/common/pages/tasks/table/errorInfo/ErrorInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="error-info">
     <ui-icon
-      :id="`resent-task-error-info-icon-${props.id}`"
+      :id="`task-error-info-icon-${props.id}`"
       name="info"
       width="16px"
       height="16px"
@@ -13,7 +13,7 @@
       width="232px"
       top
       left
-      :elem-id="`resent-task-error-info-icon-${props.id}`"
+      :elem-id="`task-error-info-icon-${props.id}`"
     >
       <div class="common-widget-info">
         <div class="headline justify-between flex-align-center">
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/node_modules/bfg-common/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const props = defineProps<{
   id: string
@@ -58,13 +58,13 @@ const isShowInfo = ref<boolean>(false)
   margin-left: 8px;
 
   .info-icon {
-    color: #9da6ad;
+    color: var(--form-icon-color);
 
     &:hover {
-      color: #4d5d69;
+      color: var(--close-icon);
     }
     &.show {
-      color: #008fd6;
+      color: var(--switch-bg-checked-reverse);
     }
   }
 
@@ -79,6 +79,10 @@ const isShowInfo = ref<boolean>(false)
       margin-left: 8px;
     }
 
+    .hide-icon {
+      color: var(--alert-icon);
+    }
+
     .common-widget-info-description {
       font-size: 13px;
       line-height: 15.73px;

package/components/common/pages/tasks/table/expandDetails/ExpandDetails.vue

@@ -18,6 +18,7 @@
         <ui-chip
           :test-id="normalizedTaskDetails[2].data.testId"
           :color="normalizedTaskDetails[2].data.chipColor"
+          size="sm"
           rounded
         >
           <ui-icon
@@ -126,15 +127,18 @@ const onSelectNodeOfTree = (data: any): void => {
   line-height: 14.52px;
 }
 .expand-details {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  column-gap: 24px;
+  row-gap: 8px;
   &__row {
-    display: grid;
-    grid-template-columns: 110px 1fr;
-    column-gap: 12px;
-    margin-bottom: 8px;
+    display: contents;
+    height: 18px;
   }
   &__label {
     @extend %properties;
     color: #9da6ad;
+    text-transform: capitalize;
   }
   &__value {
     @extend %properties;
@@ -158,10 +162,6 @@ const onSelectNodeOfTree = (data: any): void => {
     @include flex($align: center);
     .ui-chip {
       width: max-content;
-      :deep(.ui-chip__label) {
-        // TODO надо удалить потом (clr style)
-        grid-gap: 4px;
-      }
     }
   }
 }

package/components/common/vm/actions/add/Add.vue

@@ -94,6 +94,7 @@
             :datastore="props.datastore"
             :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
             :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
             @change-boot-order="onChangeBootOrder"
             @send-data="onChangeCustomizeHardware"
             @get-storage="emits('get-storage', $event)"
@@ -199,6 +200,7 @@ const props = defineProps<{
     [UI_T_SelectedNavItem, null | number] | null
   >
   passthroughDevices: UI_I_PciDevice[]
+  mediatedDevices: any[]
   vmNameInWizard: string
   capabilities?: UI_I_Capabilities
   dataCenter?: UI_I_TreeNode // для сферы

package/components/common/vm/actions/clone/Clone.vue

@@ -71,6 +71,7 @@
             :error-validation-fields="props.errorValidationFields"
             :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
             :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
             :project="props.project"
@@ -152,6 +153,7 @@ const props = defineProps<{
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   validateSendDataFunc: any
   passthroughDevices: UI_I_ConfigurePciDevicesTable | null
+  mediatedDevices: any[]
   vmNameInWizard: string
   capabilities?: UI_I_Capabilities
   schedulerTask?: any // TODO  надо interface переместить глобално

package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue

@@ -35,6 +35,7 @@
     :is-clone="props.isClone"
     :state="props.state"
     :passthrough-devices="props.passthroughDevices"
+    :mediated-devices="props.mediatedDevices"
     :project="props.project"
     :nav-items="navItems"
     :errors="errors"
@@ -88,6 +89,7 @@
     :is-clone="props.isClone"
     :state="props.state"
     :passthrough-devices="props.passthroughDevices"
+    :mediated-devices="props.mediatedDevices"
     :project="props.project"
     :nav-items="navItems"
     :errors="errors"
@@ -173,6 +175,7 @@ const props = defineProps<{
   isClone?: boolean
   state?: string | number
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   project?: UI_T_Project
 }>()
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareNew.vue

@@ -42,6 +42,7 @@
         :datastore="props.datastore"
         :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
         :passthrough-devices="props.passthroughDevices"
+        :mediated-devices="props.mediatedDevices"
         :project="props.project"
         :guest-machine-type="guestMachineType"
         @send-data="emits('send-data-virtual-hardware-method', $event)"
@@ -158,6 +159,7 @@ const props = defineProps<{
   cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
   usbController?: string
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   vmCpuHelpTextSecond?: string
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
 }>()

package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareOld.vue

@@ -35,6 +35,7 @@
         :datastore="props.datastore"
         :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
         :passthrough-devices="props.passthroughDevices"
+        :mediated-devices="props.mediatedDevices"
         :project="props.project"
         :guest-machine-type="guestMachineType"
         @send-data="emits('send-data-virtual-hardware-method', $event)"
@@ -134,6 +135,7 @@ const props = defineProps<{
   cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
   usbController?: string
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   vmCpuHelpTextSecond?: string
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
 }>()

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -37,6 +37,7 @@
     :usb-controller="usbController"
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
+    :mediated-devices="mediatedDevices"
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
@@ -103,6 +104,7 @@
     :usb-controller="usbController"
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
+    :mediated-devices="mediatedDevices"
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
@@ -195,6 +197,7 @@ const props = defineProps<{
   usbController?: string
   pciDevices?: UI_I_SendDataNewPciDevice[]
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   project: UI_T_Project
   guestMachineType?: UI_I_OptionItem | null
 }>()
@@ -216,7 +219,12 @@ const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const dropdownItems = computed<UI_I_DropdownTreeItem[]>(() =>
-  dropdownItemsFunc(localization.value, props.state, props.passthroughDevices)
+  dropdownItemsFunc(
+    localization.value,
+    props.state,
+    props.passthroughDevices,
+    props.mediatedDevices
+  )
 )
 
 const hardDisksIndex = ref<number[]>([0])

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue

@@ -139,7 +139,7 @@
           :state="props.state"
           @send-data="emits('send-data-new-usb-controller-method', $event)"
         />
-        <template v-if="props.passthroughDevices">
+        <template v-if="props.passthroughDevices || props.mediatedDevices">
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device
             v-for="(item, key) in props.pciDevices"
             :key="props.pciDevicesIndex[key]"
@@ -147,6 +147,7 @@
             :pci-device="item"
             :error-validation-fields="props.errorValidationFields"
             :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
             :type="props.pciDevicesType[key]"
             :is-edit="props.isEdit"
             :state="props.state"
@@ -266,6 +267,7 @@ const props = defineProps<{
   usbController?: string
   guestMachineType?: UI_I_OptionItem | null
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   vmCpuHelpTextSecond?: string
 }>()
 const emits = defineEmits<{
@@ -337,7 +339,8 @@ const dropdownItems = computed<UI_I_Dropdown[]>(() =>
   dropdownItemsNewFunc(
     localization.value,
     props.state,
-    props.passthroughDevices
+    props.passthroughDevices,
+    props.mediatedDevices
   )
 )
 

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareOld.vue

@@ -99,7 +99,7 @@
           :state="props.state"
           @send-data="emits('send-data-new-usb-controller-method', $event)"
         />
-        <template v-if="props.passthroughDevices">
+        <template v-if="props.passthroughDevices || props.mediatedDevices">
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device
             v-for="(item, key) in props.pciDevices"
             :key="props.pciDevicesIndex[key]"
@@ -107,6 +107,7 @@
             :pci-device="item"
             :error-validation-fields="props.errorValidationFields"
             :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
             :type="props.pciDevicesType[key]"
             :is-edit="props.isEdit"
             :state="props.state"
@@ -220,6 +221,7 @@ const props = defineProps<{
   usbController?: string
   guestMachineType?: UI_I_OptionItem | null
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   vmCpuHelpTextSecond?: string
 }>()
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/config/dropdownItems.ts

@@ -6,7 +6,8 @@ import type { UI_I_PciDevice } from '~/lib/models/store/vm/interfaces'
 export const dropdownItemsFunc = (
   localization: UI_I_Localization,
   state: string | number | undefined,
-  passthroughDevices?: UI_I_PciDevice[]
+  passthroughDevices?: UI_I_PciDevice[],
+  mediatedDevices?: any[]
 ): UI_I_DropdownTreeItem[] => {
   const { $text } = useNuxtApp()
 
@@ -51,7 +52,7 @@ export const dropdownItemsFunc = (
         {
           text: 'PCI Device',
           value: 10,
-          disabled: state === 2 || !passthroughDevices?.length,
+          disabled: state === 2 || (!passthroughDevices?.length && !mediatedDevices?.length),
           testId: 'pci-device',
         },
         // { text: 'Watchdog Timer', value: 11 },
@@ -75,7 +76,8 @@ export const dropdownItemsFunc = (
 export const dropdownItemsNewFunc = (
   localization: UI_I_Localization,
   state: string | number | undefined,
-  passthroughDevices?: UI_I_PciDevice[]
+  passthroughDevices?: UI_I_PciDevice[],
+  mediatedDevices?: any
 ): UI_I_Dropdown[] => {
   const { $text } = useNuxtApp()
 
@@ -124,7 +126,7 @@ export const dropdownItemsNewFunc = (
         {
           text: 'PCI Device',
           value: 10,
-          disabled: state === 2 || !passthroughDevices?.length,
+          disabled: state === 2 || (!passthroughDevices?.length && !mediatedDevices?.length),
           testId: 'pci-device',
         },
         // { text: 'Watchdog Timer', value: 11 },