bfg-common 1.3.227 → 1.3.229

package/components/common/weekSelect/WeekSelect.vue

@@ -1,112 +1,112 @@
-<template>
-  <div class="flex-align-center">
-    <common-select-input
-      v-model="selectedOption"
-      :data="options"
-      class="mr-1"
-    />
-
-    <div class="btn-group">
-      <button
-        v-for="item in tabs"
-        :key="item"
-        :class="['btn btn-sm btn-secondary', { 'btn-primary': item.isActive }]"
-        :disabled="!isCustom"
-        @click="onSelectDay(item.value)"
-      >
-        {{ item.text }}
-      </button>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import type { UI_I_TabItem } from '~/components/common/weekSelect/lib/models/interfaces'
-import { optionsFunc } from '~/components/common/weekSelect/lib/config/options'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const model = defineModel<number[]>()
-
-const selectedOption = ref<number>(0)
-if (model.value.length === 2 && model.value.includes(6) && model.value.includes(0)) {
-  selectedOption.value = 1
-} else if (model.value.length < 7) {
-  selectedOption.value = 2
-}
-
-const options = ref<UI_I_SelectInputItem[]>(optionsFunc(localization.value))
-
-const isCustom = computed<boolean>(() => selectedOption.value === 2)
-const onSelectDay = (value: number): void => {
-  const index = model.value?.indexOf(value)
-  if (index === -1) {
-    model.value.push(value)
-    model.value.sort((a: number, b: number) => a - b)
-  }
-  else if (model.value.length > 1) {
-    model.value = model.value?.filter((_: number, key: number) => key !== index)
-  }
-}
-
-const tabs = computed<UI_I_TabItem[]>(() => {
-  return [
-    { text: localization.value.weekM, value: 1, isActive: checkIsActiveDay(1) },
-    { text: localization.value.weekT, value: 2, isActive: checkIsActiveDay(2) },
-    { text: localization.value.weekW, value: 3, isActive: checkIsActiveDay(3) },
-    {
-      text: localization.value.weekTh,
-      value: 4,
-      isActive: checkIsActiveDay(4),
-    },
-    { text: localization.value.weekF, value: 5, isActive: checkIsActiveDay(5) },
-    { text: localization.value.weekS, value: 6, isActive: checkIsActiveDay(6) },
-    {
-      text: localization.value.weekSu,
-      value: 0,
-      isActive: checkIsActiveDay(0),
-    },
-  ]
-})
-const checkIsActiveDay = (value: number): boolean => {
-  let result = false
-  switch (selectedOption.value) {
-    case 0:
-      result = true
-      break
-    case 1:
-      if (value === 6 || value === 0) result = true
-      break
-    default:
-      result = !!model.value?.includes(value)
-      break
-  }
-
-  return result
-}
-watch(
-  tabs,
-  (newValue: UI_I_TabItem[]) => {
-    if (selectedOption.value === 2) return
-
-    model.value = newValue.filter((tab) => tab.isActive).map((tab) => tab.value)
-  },
-  { immediate: true }
-)
-</script>
-
-<style lang="scss" scoped>
-:deep(.select::after) {
-  top: 2px;
-  right: -16px;
-}
-.btn-group {
-  button {
-    width: 24px;
-    min-width: 24px;
-    padding: 0;
-  }
-}
-</style>
+<template>
+  <div class="flex-align-center">
+    <common-select-input
+      v-model="selectedOption"
+      :data="options"
+      class="mr-1"
+    />
+
+    <div class="btn-group">
+      <button
+        v-for="item in tabs"
+        :key="item"
+        :class="['btn btn-sm btn-secondary', { 'btn-primary': item.isActive }]"
+        :disabled="!isCustom"
+        @click="onSelectDay(item.value)"
+      >
+        {{ item.text }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import type { UI_I_TabItem } from '~/components/common/weekSelect/lib/models/interfaces'
+import { optionsFunc } from '~/components/common/weekSelect/lib/config/options'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const model = defineModel<number[]>()
+
+const selectedOption = ref<number>(0)
+if (model.value.length === 2 && model.value.includes(6) && model.value.includes(0)) {
+  selectedOption.value = 1
+} else if (model.value.length < 7) {
+  selectedOption.value = 2
+}
+
+const options = ref<UI_I_SelectInputItem[]>(optionsFunc(localization.value))
+
+const isCustom = computed<boolean>(() => selectedOption.value === 2)
+const onSelectDay = (value: number): void => {
+  const index = model.value?.indexOf(value)
+  if (index === -1) {
+    model.value.push(value)
+    model.value.sort((a: number, b: number) => a - b)
+  }
+  else if (model.value.length > 1) {
+    model.value = model.value?.filter((_: number, key: number) => key !== index)
+  }
+}
+
+const tabs = computed<UI_I_TabItem[]>(() => {
+  return [
+    { text: localization.value.weekM, value: 1, isActive: checkIsActiveDay(1) },
+    { text: localization.value.weekT, value: 2, isActive: checkIsActiveDay(2) },
+    { text: localization.value.weekW, value: 3, isActive: checkIsActiveDay(3) },
+    {
+      text: localization.value.weekTh,
+      value: 4,
+      isActive: checkIsActiveDay(4),
+    },
+    { text: localization.value.weekF, value: 5, isActive: checkIsActiveDay(5) },
+    { text: localization.value.weekS, value: 6, isActive: checkIsActiveDay(6) },
+    {
+      text: localization.value.weekSu,
+      value: 0,
+      isActive: checkIsActiveDay(0),
+    },
+  ]
+})
+const checkIsActiveDay = (value: number): boolean => {
+  let result = false
+  switch (selectedOption.value) {
+    case 0:
+      result = true
+      break
+    case 1:
+      if (value === 6 || value === 0) result = true
+      break
+    default:
+      result = !!model.value?.includes(value)
+      break
+  }
+
+  return result
+}
+watch(
+  tabs,
+  (newValue: UI_I_TabItem[]) => {
+    if (selectedOption.value === 2) return
+
+    model.value = newValue.filter((tab) => tab.isActive).map((tab) => tab.value)
+  },
+  { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+:deep(.select::after) {
+  top: 2px;
+  right: -16px;
+}
+.btn-group {
+  button {
+    width: 24px;
+    min-width: 24px;
+    padding: 0;
+  }
+}
+</style>

package/components/common/weekSelect/lib/config/options.ts

@@ -1,10 +1,10 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-
-export const optionsFunc = (
-  localization: UI_I_Localization
-): UI_I_SelectInputItem[] => [
-  { label: localization.daily, value: 0 },
-  { label: localization.weekly, value: 1 },
-  { label: localization.custom, value: 2 },
-]
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+
+export const optionsFunc = (
+  localization: UI_I_Localization
+): UI_I_SelectInputItem[] => [
+  { label: localization.daily, value: 0 },
+  { label: localization.weekly, value: 1 },
+  { label: localization.custom, value: 2 },
+]

package/components/common/wizards/network/add/lib/config/sendData.ts

@@ -13,58 +13,54 @@ import {
 import { makeSwitchSendData } from '~/components/common/diagramMain/lib/utils/utils'
 
 export const addNetworkingSecondOrThirdSchemeDataFunc = (
-    connectionSettings: UI_I_ConnectionSettings,
-    targetDevice: UI_I_TargetDevice,
-    vlan: number,
-    isSecondScheme: boolean = false,
-    adapterStatus?: UI_I_AdapterStatus
+  connectionSettings: UI_I_ConnectionSettings,
+  targetDevice: UI_I_TargetDevice,
+  vlan: number,
+  isSecondScheme: boolean = false,
+  adapterStatus?: UI_I_AdapterStatus
 ): UI_I_AddNetworkingSecondOrThirdSchemeDataSend =>
-    isSecondScheme
-        ? {
-          vlan,
-          name: connectionSettings.networkLabel,
-          switch: targetDevice.standardSwitch,
-        }
-        : {
-          vlan,
-          name: connectionSettings.networkLabel,
-          new_switch: {
-            mtu: targetDevice.selected === '3' ? targetDevice.mtu : undefined,
-            nics: {
-              active: adapterStatus?.active || [],
-              standby: adapterStatus?.standby || [],
-              unused: adapterStatus?.unused || [],
-            },
+  isSecondScheme
+    ? {
+        vlan,
+        name: connectionSettings.networkLabel,
+        switch: targetDevice.standardSwitch,
+      }
+    : {
+        vlan,
+        name: connectionSettings.networkLabel,
+        new_switch: {
+          mtu: targetDevice.selected === '3' ? targetDevice.mtu : undefined,
+          nics: {
+            active: adapterStatus?.active || [],
+            standby: adapterStatus?.standby || [],
+            unused: adapterStatus?.unused || [],
           },
-        }
+        },
+      }
 
 export const addNetworkingZeroOrFirstSchemeDataFunc = (
-    targetDevice: UI_I_TargetDevice,
-    vlan: number,
-    portProperties: UI_I_PortProperties,
-    ipFourSettings: UI_I_IpFourSettings,
-    isFirstScheme?: boolean,
-    adapterStatus?: UI_I_AdapterStatus
+  targetDevice: UI_I_TargetDevice,
+  vlan: number,
+  portProperties: UI_I_PortProperties,
+  ipFourSettings: UI_I_IpFourSettings,
+  isFirstScheme?: boolean,
+  adapterStatus?: UI_I_AdapterStatus
 ): UI_I_AddNetworkingZeroOrFirstSchemeDataSend => {
+  const { $binary } = useNuxtApp()
   const sendData: UI_I_AddNetworkingZeroOrFirstSchemeDataSend = {
-    switch: targetDevice.selected === '1' ? targetDevice.standardSwitch : '',
-    new_network: {
-      vlan: Number(vlan),
-    },
-    network_name: portProperties.networkLabel,
     tcp_stack: portProperties.tcp,
     mtu: portProperties.mtu.size,
     services: {
       Management: portProperties.services.management,
-      VMotion: portProperties.services.vMotion,
+      // VMotion: portProperties.services.vMotion,
       Provisioning: portProperties.services.provisioning,
       VSAN: portProperties.services.vSAN,
-      FaultToleranceLogging: portProperties.services.faultToleranceLogging,
-      VSphereReplication: portProperties.services.replication,
-      VSphereReplicationNFC: portProperties.services.replicationNFC,
-      VSphereBackupNFC: portProperties.services.backupNFC,
-      NVMeOverTCP: portProperties.services.nVMeOverTCP,
-      NVMeOverRDMA: portProperties.services.nVMeOverRDMA,
+      // FaultToleranceLogging: portProperties.services.faultToleranceLogging,
+      // VSphereReplication: portProperties.services.replication,
+      // VSphereReplicationNFC: portProperties.services.replicationNFC,
+      // VSphereBackupNFC: portProperties.services.backupNFC,
+      // NVMeOverTCP: portProperties.services.nVMeOverTCP,
+      // NVMeOverRDMA: portProperties.services.nVMeOverRDMA,
     },
     ipv4_settings: {
       auto: ipFourSettings.ipSettings === '0',
@@ -72,13 +68,18 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
       mask: ipFourSettings.static.subnetMask,
       gateway_override: ipFourSettings.static.defaultGateway.override,
       gateway: ipFourSettings.static.defaultGateway.override
-          ? ipFourSettings.static.defaultGateway.value
-          : '',
+        ? ipFourSettings.static.defaultGateway.value
+        : '',
+    },
+    new_network: {
+      vlan: Number(vlan),
+      switch: targetDevice.selected === '1' ? targetDevice.standardSwitch : '',
+      name: portProperties.networkLabel,
     },
   }
 
   if (isFirstScheme) {
-    sendData.new_switch = {
+    sendData.new_network.new_switch = {
       mtu: targetDevice.selected === '3' ? targetDevice.mtu : undefined,
       nics: {
         active: adapterStatus?.active || [],
@@ -91,44 +92,44 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
   const isAutoIp: boolean = ipFourSettings.ipSettings === '0'
 
   sendData.ipv4_settings = isAutoIp
-      ? { auto: true }
-      : {
+    ? { auto: true }
+    : {
         auto: false,
-        ipv4: ipFourSettings.static.ipFourAddress,
-        mask: ipFourSettings.static.subnetMask,
+        ipv4: $binary.stringToByteIP(ipFourSettings.static.ipFourAddress),
+        mask: $binary.stringToByteIP(ipFourSettings.static.subnetMask),
         gateway_override: ipFourSettings.static.defaultGateway.override,
         gateway: ipFourSettings.static.defaultGateway.override
-            ? ipFourSettings.static.defaultGateway.value
-            : '',
+          ? $binary.stringToByteIP(ipFourSettings.static.defaultGateway.value)
+          : 0,
       }
 
   return sendData
 }
 
 export const addNetworkingFourthOrFifthSchemeDataFunc = (
-    switchId: string,
-    isFourthScheme: boolean = false,
-    adapterStatus: UI_I_AdapterStatus,
-    switchData: UI_I_DiagramData[] | null,
-    mtu?: number
+  switchId: string,
+  isFourthScheme: boolean = false,
+  adapterStatus: UI_I_AdapterStatus,
+  switchData: UI_I_DiagramData[] | null,
+  mtu?: number
 ): any => {
   let data: UI_I_DiagramData | null = null
   if (switchData) {
     data = switchData.find(
-        (d: UI_I_DiagramData) => d.diagramName === switchId
+      (d: UI_I_DiagramData) => d.diagramName === switchId
     ) as UI_I_DiagramData
   }
 
   return isFourthScheme
-      ? makeSwitchSendData(data as UI_I_DiagramData, adapterStatus)
-      : // {
-        //     id: switchId,
-        //     nics: {
-        //       active: adapterStatus?.active || [],
-        //       standby: adapterStatus?.standby || [],
-        //       unused: adapterStatus?.unused || [],
-        //     },
-        //   }
+    ? makeSwitchSendData(data as UI_I_DiagramData, adapterStatus)
+    : // {
+      //     id: switchId,
+      //     nics: {
+      //       active: adapterStatus?.active || [],
+      //       standby: adapterStatus?.standby || [],
+      //       unused: adapterStatus?.unused || [],
+      //     },
+      //   }
       {
         mtu: mtu,
         nics: {

package/components/common/wizards/network/add/lib/models/interfaces.ts

@@ -94,19 +94,6 @@ export interface UI_I_PortPropertiesEnabledService {
 }
 
 export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
-  switch?: string
-  new_switch?: {
-    mtu: number | undefined
-    nics: {
-      active: string[]
-      standby: string[]
-      unused: string[]
-    }
-  }
-  network_name: string
-  new_network?: {
-    vlan: number
-  }
   tcp_stack: string
   mtu: number
   services: {
@@ -114,19 +101,32 @@ export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
     VMotion?: boolean
     Provisioning: boolean
     VSAN: boolean
-    FaultToleranceLogging: boolean
-    VSphereReplication: boolean
-    VSphereReplicationNFC: boolean
-    VSphereBackupNFC: boolean
-    NVMeOverTCP: boolean
-    NVMeOverRDMA: boolean
+    FaultToleranceLogging?: boolean
+    VSphereReplication?: boolean
+    VSphereReplicationNFC?: boolean
+    VSphereBackupNFC?: boolean
+    NVMeOverTCP?: boolean
+    NVMeOverRDMA?: boolean
   }
   ipv4_settings: {
     auto: boolean
-    ipv4?: string
-    mask?: string
+    ipv4?: number | string
+    mask?: number | string
     gateway_override?: boolean
-    gateway?: string
+    gateway?: number | string
+  }
+  new_network: {
+    vlan: number
+    name: string
+    switch?: string
+    new_switch?: {
+      mtu: number | undefined
+      nics: {
+        active: string[]
+        standby: string[]
+        unused: string[]
+      }
+    }
   }
 }
 
@@ -192,30 +192,30 @@ export interface UI_I_ReadyCompleteFirstColumn {
 export interface UI_I_AddNetworkingEmits {
   (event: 'hide'): void
   (
-      event: 'add-networking-data-validate',
-      networkData:
-          | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-          | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-          | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
-      type: string,
-      setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
+    event: 'add-networking-data-validate',
+    networkData:
+      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+    type: string,
+    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
   ): void
   (
-      event: 'send-add-networking-data',
-      schemeData:
-          | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-          | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-          | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
-      type: string,
-      hideSendNetworkDataLoader: () => void,
-      onHideAddNetworkingModal: () => void
+    event: 'send-add-networking-data',
+    schemeData:
+      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+    type: string,
+    hideSendNetworkDataLoader: () => void,
+    onHideAddNetworkingModal: () => void
   ): void
   (event: 'get-existing-standard-switches', cb: () => void): void
   (event: 'get-free-adapters', cb: () => void): void
   (
-      event: 'check-network-label',
-      networkLabel: string,
-      cb: (error_message: string) => void
+    event: 'check-network-label',
+    networkLabel: string,
+    cb: (error_message: string) => void
   ): void
   (event: 'get-tcp-stacks'): void
 }

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION
-
-  const regexHasDot = /\./
-  const regexHasDotAndB = /\..*b/
-  const regexHasDotAndD = /\..*d/
-
-  const isBeta = regexHasDotAndB.test(version)
-  const isDev =
-    regexHasDotAndD.test(version) ||
-    (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    isBeta,
-    isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION
+
+  const regexHasDot = /\./
+  const regexHasDotAndB = /\..*b/
+  const regexHasDotAndD = /\..*d/
+
+  const isBeta = regexHasDotAndB.test(version)
+  const isDev =
+    regexHasDotAndD.test(version) ||
+    (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    isBeta,
+    isDev,
+  }
+}

package/composables/useEnvLanguage.ts

@@ -1,20 +1,20 @@
-export function useEnvLanguage(): string {
-  const { $store }: any = useNuxtApp()
-
-  let localizationCode = 'en_US'
-  const langFromLocalStorage =
-    useLocalStorage('lang') || $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
-  if (langFromLocalStorage) {
-    if (
-      langFromLocalStorage === 'en_US' ||
-      langFromLocalStorage === 'ru_RU' ||
-      langFromLocalStorage === 'hy_AM'
-    ) {
-      localizationCode = langFromLocalStorage
-    }
-  }
-
-  localizationCode = localizationCode.slice(0, 2).toUpperCase()
-
-  return localizationCode
-}
+export function useEnvLanguage(): string {
+  const { $store }: any = useNuxtApp()
+
+  let localizationCode = 'en_US'
+  const langFromLocalStorage =
+    useLocalStorage('lang') || $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+  if (langFromLocalStorage) {
+    if (
+      langFromLocalStorage === 'en_US' ||
+      langFromLocalStorage === 'ru_RU' ||
+      langFromLocalStorage === 'hy_AM'
+    ) {
+      localizationCode = langFromLocalStorage
+    }
+  }
+
+  localizationCode = localizationCode.slice(0, 2).toUpperCase()
+
+  return localizationCode
+}