bfg-common 1.5.420 → 1.5.421

package/components/common/wizards/vm/migrate/select/network/Network.vue

@@ -1,103 +1,103 @@
-<template>
-  <div class="select-network">
-    <div class="select-network__text">
-      {{ selectNetworkHeadline }}
-    </div>
-
-    <common-wizards-vm-migrate-select-network-table-network
-      v-model="model"
-      :networks="dataNetwork"
-      :source-networks="sourceNetworks"
-    />
-
-    <common-wizards-vm-common-validation-compatibility
-      :loading="false"
-      status="Success"
-      text="compatibilityChecksSucceeded"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
-
-const model = defineModel<any>({ required: true })
-
-const props = defineProps<{
-  vmInfo: any | null
-  networks: any
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectNetworkHeadline = computed<string>(() => {
-  const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
-    localization.value.common
-
-  return model.value.isBasicNetworkMode
-    ? migrateNetworkingForAllAdapters
-    : migrateNetworkingForEachAdapters
-})
-
-const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => {
-  return props.networks?.items?.map((network) => {
-    return {
-      id: network.id,
-      name: network.name,
-      net_bridge: '',
-    }
-  })
-})
-
-const dataNetwork = computed(() => {
-  return (
-    props.vmInfo?.network_devices?.map((network) => {
-      const destinationNetwork =
-        sourceNetworks.value?.map((src) => {
-          return { text: src.name, value: src.name }
-        }) || []
-      return {
-        mac: network.mac,
-        network_adapter: network.model,
-        source_network: network.network,
-        value: destinationNetwork[0]?.value || '',
-        destination_network: [
-          ...destinationNetwork,
-          { text: `${localization.value.common.browse}...`, value: 'browser' },
-        ],
-      }
-    }) || []
-  )
-})
-watch(
-  dataNetwork,
-  (newValue) => {
-    model.value = {}
-    const newModel = {}
-    newValue.forEach((item: any) => {
-      newModel[item.mac] = item.value
-    })
-    model.value = newModel
-  },
-  { deep: true }
-)
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins';
-.select-network {
-  @include flex($dir: column);
-  height: inherit;
-  margin-top: 10px;
-  &__text {
-    font-size: 12px;
-  }
-  &__matcher-details {
-    margin-top: 10px;
-  }
-  .vm-migrate-advanced-view-button {
-    text-align: end;
-  }
-}
-</style>
+<template>
+  <div class="select-network">
+    <div class="select-network__text">
+      {{ selectNetworkHeadline }}
+    </div>
+
+    <common-wizards-vm-migrate-select-network-table-network
+      v-model="model"
+      :networks="dataNetwork"
+      :source-networks="sourceNetworks"
+    />
+
+    <common-wizards-vm-common-validation-compatibility
+      :loading="false"
+      status="Success"
+      text="compatibilityChecksSucceeded"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
+
+const model = defineModel<any>({ required: true })
+
+const props = defineProps<{
+  vmInfo: any | null
+  networks: any
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectNetworkHeadline = computed<string>(() => {
+  const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
+    localization.value.common
+
+  return model.value.isBasicNetworkMode
+    ? migrateNetworkingForAllAdapters
+    : migrateNetworkingForEachAdapters
+})
+
+const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => {
+  return props.networks?.items?.map((network) => {
+    return {
+      id: network.id,
+      name: network.name,
+      net_bridge: '',
+    }
+  })
+})
+
+const dataNetwork = computed(() => {
+  return (
+    props.vmInfo?.network_devices?.map((network) => {
+      const destinationNetwork =
+        sourceNetworks.value?.map((src) => {
+          return { text: src.name, value: src.name }
+        }) || []
+      return {
+        mac: network.mac,
+        network_adapter: network.model,
+        source_network: network.network,
+        value: destinationNetwork[0]?.value || '',
+        destination_network: [
+          ...destinationNetwork,
+          { text: `${localization.value.common.browse}...`, value: 'browser' },
+        ],
+      }
+    }) || []
+  )
+})
+watch(
+  dataNetwork,
+  (newValue) => {
+    model.value = {}
+    const newModel = {}
+    newValue.forEach((item: any) => {
+      newModel[item.mac] = item.value
+    })
+    model.value = newModel
+  },
+  { deep: true }
+)
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins';
+.select-network {
+  @include flex($dir: column);
+  height: inherit;
+  margin-top: 10px;
+  &__text {
+    font-size: 12px;
+  }
+  &__matcher-details {
+    margin-top: 10px;
+  }
+  .vm-migrate-advanced-view-button {
+    text-align: end;
+  }
+}
+</style>

package/components/common/wizards/vm/migrate/select/network/table/network/lib/config/advancedTable.ts

@@ -1,91 +1,91 @@
-import type {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import type { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
-import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/tableKeys'
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [
-      localization.common.sourceNetwork,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[0],
-    ],
-    [
-      localization.common.macAddress,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[1],
-    ],
-    [
-      localization.common.networkAdapter,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[2],
-    ],
-    [
-      localization.common.destinationNetwork,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[3],
-    ],
-  ]
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 3 ? 'select' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_MigrateSelectNetworkAdvancedItem[]
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-
-  data?.forEach(
-    (network: UI_I_MigrateSelectNetworkAdvancedItem, key: number) => {
-      const data = {
-        id: `${network.source_network}-select`,
-        sourceNetwork: network.source_network,
-        disabled: false,
-        value: network.destination_network[0]?.text || '',
-        option: network.destination_network,
-      }
-
-      bodyItems.push([
-        {
-          key: 'col0',
-          text: network[networkAdvancedTableItemKeys[0]],
-          id: key,
-        },
-        {
-          key: 'col1',
-          text: network[networkAdvancedTableItemKeys[1]],
-          id: key,
-        },
-        {
-          key: 'col2',
-          text: network[networkAdvancedTableItemKeys[2]],
-          id: key,
-        },
-        {
-          key: 'select',
-          text: network[networkAdvancedTableItemKeys[3]],
-          data,
-          id: key,
-        },
-      ])
-    }
-  )
-  return bodyItems
-}
+import type {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/tableKeys'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [
+      localization.common.sourceNetwork,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[0],
+    ],
+    [
+      localization.common.macAddress,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[1],
+    ],
+    [
+      localization.common.networkAdapter,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[2],
+    ],
+    [
+      localization.common.destinationNetwork,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[3],
+    ],
+  ]
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 3 ? 'select' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_MigrateSelectNetworkAdvancedItem[]
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+
+  data?.forEach(
+    (network: UI_I_MigrateSelectNetworkAdvancedItem, key: number) => {
+      const data = {
+        id: `${network.source_network}-select`,
+        sourceNetwork: network.source_network,
+        disabled: false,
+        value: network.destination_network[0]?.text || '',
+        option: network.destination_network,
+      }
+
+      bodyItems.push([
+        {
+          key: 'col0',
+          text: network[networkAdvancedTableItemKeys[0]],
+          id: key,
+        },
+        {
+          key: 'col1',
+          text: network[networkAdvancedTableItemKeys[1]],
+          id: key,
+        },
+        {
+          key: 'col2',
+          text: network[networkAdvancedTableItemKeys[2]],
+          id: key,
+        },
+        {
+          key: 'select',
+          text: network[networkAdvancedTableItemKeys[3]],
+          data,
+          id: key,
+        },
+      ])
+    }
+  )
+  return bodyItems
+}

package/components/common/wizards/vm/migrate/select/network/table/network/lib/config/basicTable.ts

@@ -3,8 +3,8 @@ import type {
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
 import type { UI_I_MigrateSelectNetworkBasicItem } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
 import { networkBasicsTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/tableKeys'
 
 const getItems = (

package/components/common/wizards/vm/migrate/select/targetServer/new/New.vue

@@ -16,8 +16,7 @@
         </label>
 
         <div
-          class="clr-control-container"
-          :class="addressErrorText && 'clr-error'"
+          :class="['clr-control-container', addressErrorText && 'clr-error']"
         >
           <div class="flex-align-center">
             <input
@@ -47,8 +46,7 @@
         </label>
 
         <div
-          class="clr-control-container"
-          :class="usernameErrorText && 'clr-error'"
+          :class="['clr-control-container', usernameErrorText && 'clr-error']"
         >
           <div class="flex-align-center">
             <input
@@ -76,8 +74,7 @@
         </label>
 
         <div
-          class="clr-control-container"
-          :class="passwordErrorText && 'clr-error'"
+          :class="['clr-control-container', passwordErrorText && 'clr-error']"
         >
           <div class="flex-align-center input-action-wrapper">
             <input
@@ -113,8 +110,8 @@
     </div>
 
     <button
-      class="btn btn-primary btn-sm mt-2"
       :disabled="disabledSignInButton"
+      class="btn btn-primary btn-sm mt-2"
       data-id="sign-in-button"
       @click="onConnectServer"
     >

package/components/common/wizards/vm/migrate/select/type/lib/config/typeOptions.ts

@@ -1,45 +1,45 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_VmMigrateTypeOption } from '~/components/common/wizards/vm/migrate/select/type/lib/models/interfaces'
-
-export const vmMigrateTypesFunc = (
-  localization: UI_I_Localization,
-  project: UI_T_Project
-): UI_I_VmMigrateTypeOption[] => {
-  const options: UI_I_VmMigrateTypeOption[] = [
-    {
-      label: localization.common.changeComputeResourceOnly,
-      value: 'resource',
-      disabled: false,
-      description: localization.common.changeComputeResourceOnlyDesc,
-      permissions: ['sphere'],
-      permission: 'VirtualMachines.MigrateHost',
-    },
-    {
-      label: localization.common.changeStorageOnly,
-      value: 'storage',
-      disabled: false,
-      description: localization.common.changeStorageOnlyDesc,
-      permissions: ['sphere', 'procurator'],
-      permission: 'VirtualMachines.MigrateDatastore',
-    },
-    // TODO 700
-    // {
-    //   label: localization.common.changeBothComputeResourceStorage,
-    //   value: 'resource-storage',
-    //   disabled: true,
-    //   description: localization.common.changeBothComputeResourceStorageDesc,
-    //   permissions: ['sphere'],
-    // },
-    // TODO 700
-    // {
-    //   label: localization.common.crossVCenterServerExport,
-    //   value: 'server',
-    //   disabled: true,
-    //   description: localization.common.crossVCenterServerExportDesc,
-    //   permissions: ['sphere'],
-    // },
-  ]
-
-  return options.filter((option) => option.permissions.includes(project))
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_VmMigrateTypeOption } from '~/components/common/wizards/vm/migrate/select/type/lib/models/interfaces'
+
+export const vmMigrateTypesFunc = (
+  localization: UI_I_Localization,
+  project: UI_T_Project
+): UI_I_VmMigrateTypeOption[] => {
+  const options: UI_I_VmMigrateTypeOption[] = [
+    {
+      label: localization.common.changeComputeResourceOnly,
+      value: 'resource',
+      disabled: false,
+      description: localization.common.changeComputeResourceOnlyDesc,
+      permissions: ['sphere'],
+      permission: 'VirtualMachines.MigrateHost',
+    },
+    {
+      label: localization.common.changeStorageOnly,
+      value: 'storage',
+      disabled: false,
+      description: localization.common.changeStorageOnlyDesc,
+      permissions: ['sphere', 'procurator'],
+      permission: 'VirtualMachines.MigrateDatastore',
+    },
+    // TODO 700
+    // {
+    //   label: localization.common.changeBothComputeResourceStorage,
+    //   value: 'resource-storage',
+    //   disabled: true,
+    //   description: localization.common.changeBothComputeResourceStorageDesc,
+    //   permissions: ['sphere'],
+    // },
+    // TODO 700
+    // {
+    //   label: localization.common.crossVCenterServerExport,
+    //   value: 'server',
+    //   disabled: true,
+    //   description: localization.common.crossVCenterServerExportDesc,
+    //   permissions: ['sphere'],
+    // },
+  ]
+
+  return options.filter((option) => option.permissions.includes(project))
+}

package/composables/productNameLocal.ts

@@ -1,30 +1,30 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
-
-export function productNameLocal(
-  localization: UI_I_Localization
-): UI_I_Localization {
-  const config = useRuntimeConfig()
-
-  const productName =
-    config.public.LOCALIZATION_CODE === 'ru'
-      ? config.public.PRODUCT_NAME_RU
-      : config.public.PRODUCT_NAME_EN
-
-  return replaceProductNameRecursion(localization, productName)
-}
-
-const replaceProductNameRecursion = (
-  localization: UI_I_Localization,
-  productName: any
-): UI_I_Localization => {
-  for (const key of Object.keys(localization)) {
-    let item = localization[key as UI_T_LanguageKey]
-
-    for (const key2 of Object.keys(item)) {
-      item[key2] = item[key2].replaceAll('{productName}', productName)
-    }
-  }
-
-  return localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
+
+export function productNameLocal(
+  localization: UI_I_Localization
+): UI_I_Localization {
+  const config = useRuntimeConfig()
+
+  const productName =
+    config.public.LOCALIZATION_CODE === 'ru'
+      ? config.public.PRODUCT_NAME_RU
+      : config.public.PRODUCT_NAME_EN
+
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    let item = localization[key as UI_T_LanguageKey]
+
+    for (const key2 of Object.keys(item)) {
+      item[key2] = item[key2].replaceAll('{productName}', productName)
+    }
+  }
+
+  return localization
+}

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 as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*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 as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*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/lib/models/enums.ts

@@ -1,4 +1,4 @@
-export enum E_NodeIconsByState {
+export enum UI_E_NodeIconsByState {
   'host_Normal' = 'vsphere-icon-host',
   'host_Error' = 'vsphere-icon-host-error',
   'host_Warning' = 'vsphere-icon-host-warning',

package/package.json

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