bfg-common 1.5.431 → 1.5.433

package/components/common/wizards/vm/migrate/lib/validations.ts

@@ -1,68 +1,68 @@
-import type {
-  UI_I_ValidationReturn,
-  UI_I_WizardStep,
-} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
-import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
-
-export const checkSelectedDatastoreSync = (
-  localization: UI_I_Localization,
-  name: string,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (!name) {
-    stepHasError = wizard.setValidation(dynamicSteps.selectStorage, 'name', {
-      fieldMessage: '',
-      alertMessage: localization.common.selectValidDestinationStorage,
-    })
-  } else if (wizard.hasMessage(dynamicSteps.selectStorage, 'name')) {
-    value = wizard.removeValidation(dynamicSteps.selectStorage, 'name', value)
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
-
-export const checkSelectedResourceSync = (
-  localization: UI_I_Localization,
-  resource: UI_I_ComputeResourceFormLocal,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  const hasSelectedData = Object.values(resource).some(
-    (value) => value !== null
-  )
-
-  if (!hasSelectedData) {
-    stepHasError = wizard.setValidation(
-      dynamicSteps.selectComputeResource,
-      'resource',
-      {
-        fieldMessage: '',
-        alertMessage: localization.common.selectValidDestinationComputeResource,
-      }
-    )
-  } else if (
-    wizard.hasMessage(dynamicSteps.selectComputeResource, 'resource')
-  ) {
-    value = wizard.removeValidation(
-      dynamicSteps.selectComputeResource,
-      'resource',
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} from '~/components/atoms/wizard/lib/models/interfaces'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
+import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
+
+export const checkSelectedDatastoreSync = (
+  localization: UI_I_Localization,
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(dynamicSteps.selectStorage, 'name', {
+      fieldMessage: '',
+      alertMessage: localization.common.selectValidDestinationStorage,
+    })
+  } else if (wizard.hasMessage(dynamicSteps.selectStorage, 'name')) {
+    value = wizard.removeValidation(dynamicSteps.selectStorage, 'name', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+export const checkSelectedResourceSync = (
+  localization: UI_I_Localization,
+  resource: UI_I_ComputeResourceFormLocal,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  const hasSelectedData = Object.values(resource).some(
+    (value) => value !== null
+  )
+
+  if (!hasSelectedData) {
+    stepHasError = wizard.setValidation(
+      dynamicSteps.selectComputeResource,
+      'resource',
+      {
+        fieldMessage: '',
+        alertMessage: localization.common.selectValidDestinationComputeResource,
+      }
+    )
+  } else if (
+    wizard.hasMessage(dynamicSteps.selectComputeResource, 'resource')
+  ) {
+    value = wizard.removeValidation(
+      dynamicSteps.selectComputeResource,
+      'resource',
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

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/targetServer/new/New.vue

@@ -121,11 +121,11 @@
 </template>
 
 <script lang="ts" setup>
-import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_AlertStatus } from '~/components/atoms/alert/lib/models/types'
 import type { UI_I_InitialValidationFields } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 
 const props = defineProps<{
   wizard: Wizard

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

@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'

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/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "bfg-common",
-  "private": false,
-  "version": "1.5.431",
-  "scripts": {
-    "build": "nuxt build",
-    "dev": "nuxt dev --port=3002",
-    "generate": "nuxt generate",
-    "preview": "nuxt preview",
-    "postinstall": "nuxt prepare",
-    "minify": "node minify.js",
-    "prepublishOnly": "node minify.js"
-  },
-  "devDependencies": {
-    "@novnc/novnc": "1.4.0",
-    "@vueuse/core": "10.1.2",
-    "@vueuse/nuxt": "10.1.2",
-    "eslint-config-prettier": "^8.5.0",
-    "nuxt": "3.11.2",
-    "prettier": "2.7.1",
-    "sass": "^1.54.9",
-    "sass-loader": "^10.3.1",
-    "terser": "^5.22.0",
-    "vite-plugin-eslint": "^1.8.1",
-    "xterm": "^5.1.0",
-    "xterm-addon-attach": "^0.8.0",
-    "xterm-addon-fit": "^0.7.0",
-    "xterm-addon-serialize": "^0.9.0",
-    "xterm-addon-unicode11": "^0.5.0",
-    "xterm-addon-web-links": "^0.8.0",
-    "eslint-plugin-myrules": "file:./eslint"
-  },
-  "dependencies": {
-    "@nuxtjs/eslint-config-typescript": "^12.0.0",
-    "@vueuse/components": "^10.1.2",
-    "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "1.0.26",
-    "bfg-uikit": "1.0.502",
-    "html2canvas": "^1.4.1",
-    "prettier-eslint": "^15.0.1"
-  }
-}
+{
+  "name": "bfg-common",
+  "private": false,
+  "version": "1.5.433",
+  "scripts": {
+    "build": "nuxt build",
+    "dev": "nuxt dev --port=3002",
+    "generate": "nuxt generate",
+    "preview": "nuxt preview",
+    "postinstall": "nuxt prepare",
+    "minify": "node minify.js",
+    "prepublishOnly": "node minify.js"
+  },
+  "devDependencies": {
+    "@novnc/novnc": "1.4.0",
+    "@vueuse/core": "10.1.2",
+    "@vueuse/nuxt": "10.1.2",
+    "eslint-config-prettier": "^8.5.0",
+    "nuxt": "3.11.2",
+    "prettier": "2.7.1",
+    "sass": "^1.54.9",
+    "sass-loader": "^10.3.1",
+    "terser": "^5.22.0",
+    "vite-plugin-eslint": "^1.8.1",
+    "xterm": "^5.1.0",
+    "xterm-addon-attach": "^0.8.0",
+    "xterm-addon-fit": "^0.7.0",
+    "xterm-addon-serialize": "^0.9.0",
+    "xterm-addon-unicode11": "^0.5.0",
+    "xterm-addon-web-links": "^0.8.0",
+    "eslint-plugin-myrules": "file:./eslint"
+  },
+  "dependencies": {
+    "@nuxtjs/eslint-config-typescript": "^12.0.0",
+    "@vueuse/components": "^10.1.2",
+    "date-fns": "^2.29.3",
+    "bfg-nuxt-3-graph": "1.0.26",
+    "bfg-uikit": "1.0.496",
+    "html2canvas": "^1.4.1",
+    "prettier-eslint": "^15.0.1"
+  }
+}