bfg-common 1.2.50 → 1.2.52

package/components/common/vm/actions/common/select/storage/Storage.vue

@@ -52,17 +52,18 @@
 import { UI_I_Pagination } from '~/models/interfaces'
 import { UI_I_TablePayload } from '~/models/store/interfaces'
 import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
-import * as table from '~/components/common/vm/actions/common/select/storage/config/config'
 import { UI_I_Localization } from '~/models/interfaces'
 import {
   UI_I_ColumnKey,
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/models/interfaces'
+import * as table from '~/components/common/vm/actions/common/select/storage/config/config'
 
 const props = defineProps<{
   storageSubmit: number
   datastore: UI_I_DatastoreTableItem[]
+  storage: UI_I_DatastoreTableItem
   hideCompatibility?: boolean
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
 }>()
@@ -106,6 +107,7 @@ const getStorage = async (): Promise<void> => {
 
   props.getDatastoreTableFunc(payload).then(() => {
     selectedRow.value = null
+    setStorageFromProps()
   })
 }
 getStorage()
@@ -115,7 +117,22 @@ const selectedRow = ref<number | null>(null)
 const changeStorage = (index: number): void => {
   if (!props.datastore) return
   selectedStorage.value = props.datastore[index]
+  selectedRow.value = index
+}
+
+const setStorageFromProps = (): void => {
+  if (!props.storage) return
+  props.datastore.forEach((item, index) => {
+    if (item.id === props.storage.id) changeStorage(index)
+  })
 }
+watch(
+  () => props.storage,
+  () => {
+    setStorageFromProps()
+  },
+  { immediate: true }
+)
 
 watch(
   () => props.storageSubmit,

package/components/common/vm/actions/common/select/storage/config/config.ts

@@ -1,154 +1,154 @@
-import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
-import type {
-  UI_I_ColumnKey,
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/models/interfaces'
-import type { UI_I_Localization } from '~/models/interfaces'
-import { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/common/select/storage/models/types'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/utils/constructDataTable'
-import {
-  datastoreIconByState,
-  datastoreLocalizationByState,
-} from '~/components/common/config/states'
-
-export const storageTableKeys: UI_T_StorageColumnKeys = [
-  'name',
-  'state',
-  'capacity_mb',
-  'provisioned_mb',
-  'free_mb',
-  'used_mb',
-  'type_text',
-  'thin_provisioning',
-  'access_mode',
-  'hardware_acceleration',
-  'drive_type',
-  'device',
-  'storage_io_control',
-]
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [localization.name, true, '96px', storageTableKeys[0]],
-    [localization.state, true, '138px', storageTableKeys[1]],
-    [localization.capacity, true, '110px', storageTableKeys[2]],
-    [localization.provisioned, true, '128px', storageTableKeys[3]],
-    [localization.free, true, '110px', storageTableKeys[4]],
-    [localization.used, true, '110px', storageTableKeys[5]],
-    [localization.type, true, '110px', storageTableKeys[6]],
-    [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
-    [localization.access, true, '110px', storageTableKeys[8]],
-    [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
-    [localization.driverType, true, '110px', storageTableKeys[10]],
-    [localization.device, true, '110px', storageTableKeys[11]],
-    [localization.storageIoControl, true, '110px', storageTableKeys[12]],
-  ]
-}
-
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
-  })
-  return result
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_DatastoreTableItem[],
-  localization: UI_I_Localization
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-  const { $binary } = useNuxtApp()
-
-  data.forEach((storage: UI_I_DatastoreTableItem, key: number) => {
-    const state =
-      localization[datastoreLocalizationByState[storage[storageTableKeys[1]]]]
-    bodyItems.push([
-      {
-        key: 'icon',
-        text: storage[storageTableKeys[0]].toString(),
-        data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
-        id: key,
-      },
-      {
-        key: 'col1',
-        text: state,
-        id: key,
-      },
-      {
-        key: 'col2',
-        text: $binary.round(storage.capacity[storageTableKeys[2]]),
-        id: key,
-      },
-      {
-        key: 'col3',
-        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
-        id: key,
-      },
-      {
-        key: 'col4',
-        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
-        id: key,
-      },
-      {
-        key: 'col5',
-        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
-        id: key,
-      },
-      {
-        key: 'col6',
-        text: storage[storageTableKeys[6]].toString(),
-        id: key,
-      },
-      {
-        key: 'col7',
-        text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
-        id: key,
-      },
-      {
-        key: 'col8',
-        text: storage[storageTableKeys[8]].toString(),
-        id: key,
-      },
-      {
-        key: 'col9',
-        text: storage[storageTableKeys[9]].toString(),
-        id: key,
-      },
-      {
-        key: 'col10',
-        text: storage[storageTableKeys[10]].toString(),
-        id: key,
-      },
-      {
-        key: 'col11',
-        text: storage[storageTableKeys[11]].toString(),
-        id: key,
-      },
-      {
-        key: 'col12',
-        text: storage[storageTableKeys[12]].toString(),
-        id: key,
-      },
-    ])
-  })
-  return bodyItems
-}
+import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/models/interfaces'
+import type { UI_I_Localization } from '~/models/interfaces'
+import { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/common/select/storage/models/types'
+import {
+  constructColumnKey,
+  constructHeadItem,
+} from '~/components/atoms/table/dataGrid/utils/constructDataTable'
+import {
+  datastoreIconByState,
+  datastoreLocalizationByState,
+} from '~/components/common/config/states'
+
+export const storageTableKeys: UI_T_StorageColumnKeys = [
+  'name',
+  'state',
+  'capacity_mb',
+  'provisioned_mb',
+  'free_mb',
+  'used_mb',
+  'type_text',
+  'thin_provisioning',
+  'access_mode',
+  'hardware_acceleration',
+  'drive_type',
+  'device',
+  'storage_io_control',
+]
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.name, true, '96px', storageTableKeys[0]],
+    [localization.state, true, '138px', storageTableKeys[1]],
+    [localization.capacity, true, '110px', storageTableKeys[2]],
+    [localization.provisioned, true, '128px', storageTableKeys[3]],
+    [localization.free, true, '110px', storageTableKeys[4]],
+    [localization.used, true, '110px', storageTableKeys[5]],
+    [localization.type, true, '110px', storageTableKeys[6]],
+    [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
+    [localization.access, true, '110px', storageTableKeys[8]],
+    [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
+    [localization.driverType, true, '110px', storageTableKeys[10]],
+    [localization.device, true, '110px', storageTableKeys[11]],
+    [localization.storageIoControl, true, '110px', storageTableKeys[12]],
+  ]
+}
+
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 0 ? 'icon' : `col${i}`
+    result.push(constructColumnKey(col, item[0], item[1]))
+  })
+  return result
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 0 ? 'icon' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_DatastoreTableItem[],
+  localization: UI_I_Localization
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+  const { $binary } = useNuxtApp()
+
+  data.forEach((storage: UI_I_DatastoreTableItem, key: number) => {
+    const state =
+      localization[datastoreLocalizationByState[storage[storageTableKeys[1]]]]
+    bodyItems.push([
+      {
+        key: 'icon',
+        text: storage[storageTableKeys[0]].toString(),
+        data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
+        id: key,
+      },
+      {
+        key: 'col1',
+        text: state,
+        id: key,
+      },
+      {
+        key: 'col2',
+        text: $binary.round(storage.capacity[storageTableKeys[2]]),
+        id: key,
+      },
+      {
+        key: 'col3',
+        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
+        id: key,
+      },
+      {
+        key: 'col4',
+        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
+        id: key,
+      },
+      {
+        key: 'col5',
+        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
+        id: key,
+      },
+      {
+        key: 'col6',
+        text: storage[storageTableKeys[6]].toString(),
+        id: key,
+      },
+      {
+        key: 'col7',
+        text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
+        id: key,
+      },
+      {
+        key: 'col8',
+        text: storage[storageTableKeys[8]].toString(),
+        id: key,
+      },
+      {
+        key: 'col9',
+        text: storage[storageTableKeys[9]].toString(),
+        id: key,
+      },
+      {
+        key: 'col10',
+        text: storage[storageTableKeys[10]].toString(),
+        id: key,
+      },
+      {
+        key: 'col11',
+        text: storage[storageTableKeys[11]].toString(),
+        id: key,
+      },
+      {
+        key: 'col12',
+        text: storage[storageTableKeys[12]].toString(),
+        id: key,
+      },
+    ])
+  })
+  return bodyItems
+}

package/components/common/wizards/datastore/add/nfs/Nfs.vue

@@ -1,94 +1,94 @@
-<template>
-  <div class="nfs-container">
-    <span class="nfs-container__desc">{{ stepSubTitle }}</span>
-
-    <common-wizards-datastore-add-nfs-version
-      v-show="props.stepPosition === 1"
-      v-model:version="nfsVersion"
-    />
-
-    <common-wizards-datastore-add-nfs-configuration
-      v-show="props.stepPosition === 2"
-      :mode="props.mode"
-      :nfs-version="nfsVersion"
-      :nfs-configuration-submit="nfsConfigurationSubmit"
-      @loading="(e) => emits('loading', e)"
-      @next="applyChangesAndNext"
-    />
-
-    <!--    <templates-home-datastore-actions-add-nfs-kerberos-authentication-->
-    <!--      v-show="nfsVersion === 'nfs-4.1' && props.stepPosition === 3"-->
-    <!--      :nfs-version="nfsVersion"-->
-    <!--    />--><!-- TODO Он будет когда будем делать групповое -->
-
-    <!--    <templates-home-datastore-actions-add-nfs-accessibility-->
-    <!--      v-if="showHostAccessibility"-->
-    <!--      :host-accessibility-submit="hostAccessibilitySubmit"-->
-    <!--      @next="applyChangesAndNext"-->
-    <!--    />-->
-    <!-- TODO Он будет когда будем делать групповое  -->
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_Localization } from '~/models/interfaces'
-import {
-  UI_T_DatastoreType,
-  UI_T_NfsType,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/models/types'
-import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/models/interfaces'
-import { subTitleFunc } from '~/components/common/wizards/datastore/add/config/stepItems'
-
-const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
-  stepPosition: number
-  datastoreType: UI_T_DatastoreType
-  nfsConfigurationSubmit: number
-  hostAccessibilitySubmit: number
-}>()
-const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
-  (event: 'change-nfs-version', value: UI_T_NfsType): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const nfsVersion = ref<UI_T_NfsType>('nfs-3')
-
-const stepSubTitle = computed<string>(() => {
-  const { datastoreType, stepPosition } = props
-  return subTitleFunc(
-    localization.value,
-    datastoreType,
-    stepPosition,
-    nfsVersion.value
-  )
-})
-
-// const showHostAccessibility = computed<boolean>(() => {
-//   return (
-//     (props.stepPosition === 4 && nfsVersion.value === 'nfs-4.1') ||
-//     (props.stepPosition === 3 && nfsVersion.value === 'nfs-3')
-//   )
-// })
-
-watch(nfsVersion, (val: UI_T_NfsType) => {
-  emits('change-nfs-version', val)
-})
-
-const applyChangesAndNext = (event: UI_I_ConfigurationSendDataNfs): void => {
-  emits('submit', event)
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-.nfs-container {
-  @include flex($dir: column);
-  height: 100%;
-  &__desc {
-  }
-}
-</style>
+<template>
+  <div class="nfs-container">
+    <span class="nfs-container__desc">{{ stepSubTitle }}</span>
+
+    <common-wizards-datastore-add-nfs-version
+      v-show="props.stepPosition === 1"
+      v-model:version="nfsVersion"
+    />
+
+    <common-wizards-datastore-add-nfs-configuration
+      v-show="props.stepPosition === 2"
+      :mode="props.mode"
+      :nfs-version="nfsVersion"
+      :nfs-configuration-submit="nfsConfigurationSubmit"
+      @loading="(e) => emits('loading', e)"
+      @next="applyChangesAndNext"
+    />
+
+    <!--    <templates-home-datastore-actions-add-nfs-kerberos-authentication-->
+    <!--      v-show="nfsVersion === 'nfs-4.1' && props.stepPosition === 3"-->
+    <!--      :nfs-version="nfsVersion"-->
+    <!--    />--><!-- TODO Он будет когда будем делать групповое -->
+
+    <!--    <templates-home-datastore-actions-add-nfs-accessibility-->
+    <!--      v-if="showHostAccessibility"-->
+    <!--      :host-accessibility-submit="hostAccessibilitySubmit"-->
+    <!--      @next="applyChangesAndNext"-->
+    <!--    />-->
+    <!-- TODO Он будет когда будем делать групповое  -->
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_Localization } from '~/models/interfaces'
+import {
+  UI_T_DatastoreType,
+  UI_T_NfsType,
+  UI_T_WizardDatastoreMode,
+} from '~/components/common/wizards/datastore/add/models/types'
+import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/models/interfaces'
+import { subTitleFunc } from '~/components/common/wizards/datastore/add/config/stepItems'
+
+const props = defineProps<{
+  mode: UI_T_WizardDatastoreMode
+  stepPosition: number
+  datastoreType: UI_T_DatastoreType
+  nfsConfigurationSubmit: number
+  hostAccessibilitySubmit: number
+}>()
+const emits = defineEmits<{
+  (event: 'loading', value: boolean): void
+  (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
+  (event: 'change-nfs-version', value: UI_T_NfsType): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const nfsVersion = ref<UI_T_NfsType>('nfs-3')
+
+const stepSubTitle = computed<string>(() => {
+  const { datastoreType, stepPosition } = props
+  return subTitleFunc(
+    localization.value,
+    datastoreType,
+    stepPosition,
+    nfsVersion.value
+  )
+})
+
+// const showHostAccessibility = computed<boolean>(() => {
+//   return (
+//     (props.stepPosition === 4 && nfsVersion.value === 'nfs-4.1') ||
+//     (props.stepPosition === 3 && nfsVersion.value === 'nfs-3')
+//   )
+// })
+
+watch(nfsVersion, (val: UI_T_NfsType) => {
+  emits('change-nfs-version', val)
+})
+
+const applyChangesAndNext = (event: UI_I_ConfigurationSendDataNfs): void => {
+  emits('submit', event)
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~/assets/scss/common/mixins.scss';
+.nfs-container {
+  @include flex($dir: column);
+  height: 100%;
+  &__desc {
+  }
+}
+</style>