bfg-common 1.2.49 → 1.2.51

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

@@ -30,6 +30,7 @@
             v-show="stepPosition === 1"
             :storage-submit="storageSubmit"
             :datastore="props.datastore"
+            :storage="vmSettings.storage"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             @submit="onChangeStorageAndNext"
           />

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

@@ -238,12 +238,20 @@ const hardDisks = ref<UI_I_SendDataNewHardDisk[]>([
 watch(
   () => props.hardDisks,
   (newValue) => {
-    if (!props.isEdit && !props.isClone || !newValue) return
+    if ((!props.isEdit && !props.isClone) || !newValue) return
 
     const count = newValue?.length || 0
     hardDisksIndex.value = [...Array(count).keys()]
-    hardDisksType.value = Array(count).fill(props.isEdit ? 'edit' : 'new')
     hardDisks.value = newValue
+    if (props.isEdit) {
+      hardDisksType.value = Array(count).fill('edit')
+    } else if (props.isClone) {
+      hardDisksType.value = Array(count).fill('new')
+      hardDisks.value = newValue.map((hardDisk) => {
+        hardDisk.create = true
+        return hardDisk
+      })
+    }
   },
   { immediate: true }
 )
@@ -320,14 +328,18 @@ const networksIndex = ref<number[]>([0])
 watch(
   () => props.networks,
   (newValue) => {
-    if (!props.isEdit && !props.isClone || !newValue) return
+    if ((!props.isEdit && !props.isClone) || !newValue) return
 
     // networks.value = newValue
     // networksType.value = Array(newValue.length).fill('edit')
     const count = newValue?.length || 0
     networksIndex.value = [...Array(count).keys()]
-    networksType.value = Array(count).fill(props.isEdit ? 'edit' : 'new')
     networks.value = newValue
+    if (props.isEdit) {
+      networksType.value = Array(count).fill('edit')
+    } else if (props.isClone) {
+      networksType.value = Array(count).fill('new')
+    }
   },
   { immediate: true }
 )
@@ -372,14 +384,18 @@ const cdDvdDrivesType = ref<UI_T_CdDvdType[]>(['new'])
 watch(
   () => props.cdDvdDrives,
   (newValue) => {
-    if (!props.isEdit && !props.isClone || !newValue) return
+    if ((!props.isEdit && !props.isClone) || !newValue) return
 
     // cdDvdDrives.value = newValue
     // cdDvdDrivesType.value = Array(newValue.length).fill('edit')
     const count = newValue?.length || 0
     cdDvdDrivesIndex.value = [...Array(count).keys()]
-    cdDvdDrivesType.value = Array(count).fill(props.isEdit ? 'edit' : 'new')
     cdDvdDrives.value = newValue
+    if (props.isEdit) {
+      cdDvdDrivesType.value = Array(count).fill('edit')
+    } else if (props.isClone) {
+      cdDvdDrivesType.value = Array(count).fill('new')
+    }
   },
   { immediate: true }
 )
@@ -390,7 +406,7 @@ const addCdDvdDrive = (): void => {
   cdDvdDrives.value.push({
     ...useDeepCopy(defaultCdDvdDriver),
     attach: true,
-    boot_order: 0 // Убираем галочку
+    boot_order: 0, // Убираем галочку
   })
 }
 const onRemoveCdDvdDrive = (
@@ -442,12 +458,16 @@ const pciDevices = ref<UI_I_PciDevice[]>([])
 watch(
   () => props.pciDevices,
   (newValue) => {
-    if (!props.isEdit && !props.isClone) return
+    if ((!props.isEdit && !props.isClone) || !newValue) return
 
     const count = newValue?.length || 0
     pciDevicesIndex.value = [...Array(count).keys()]
-    pciDevicesType.value = Array(count).fill(props.isEdit ? 'edit' : 'new')
     pciDevices.value = newValue || []
+    if (props.isEdit) {
+      pciDevicesType.value = Array(count).fill('edit')
+    } else if (props.isClone) {
+      pciDevicesType.value = Array(count).fill('new')
+    }
   },
   { immediate: true }
 )

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

@@ -1,177 +1,194 @@
-<template>
-  <div class="select-storage">
-    <atoms-alert
-      v-show="errors.length"
-      status="alert-danger"
-      :items="errors"
-      @remove="onRemoveValidationErrors"
-    />
-    <div class="table-wrap">
-      <atoms-table-data-grid
-        v-model:selected-row="selectedRow"
-        v-model:column-keys="columnKeys"
-        v-model:page-size="pagination.pageSize"
-        v-model:page="pagination.page"
-        type="radio"
-        :head-items="headItems"
-        :body-items="bodyItems"
-        :total-items="bodyItems.length"
-        :total-pages="1"
-        server-off
-        hide-page-size
-        @sorting="sorting"
-        @change="changeStorage"
-      >
-        <template #icon="{ item }">
-          <span :class="['datagrid-cell-icon', item.data]" />
-          <span class="text-ellipsis">
-            {{ item.text }}
-          </span>
-        </template>
-      </atoms-table-data-grid>
-    </div>
-
-    <div v-if="!hideCompatibility" class="compatibility-wrap">
-      <p class="compatibility">
-        {{ localization.compatibility }}
-      </p>
-      <div class="compatibility-message flex-align-center">
-        <template v-if="selectedStorage">
-          <div class="icon-status-ok" />
-          <span>{{ localization.compatibilityChecksSucceeded }}</span>
-        </template>
-        <div v-else>
-          <br />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-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'
-
-const props = defineProps<{
-  storageSubmit: number
-  datastore: UI_I_DatastoreTableItem[]
-  hideCompatibility?: boolean
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-}>()
-const emits = defineEmits<{
-  (event: 'submit', value: UI_I_DatastoreTableItem): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const headItems = ref<UI_I_HeadItem[]>(table.headItems(localization.value))
-const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
-watch(localization, () => {
-  columnKeys.value = table.columnKeys(localization.value)
-})
-
-const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return table.bodyItems(props.datastore || [], localization.value)
-})
-
-const sort = ref<string | null>(null)
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-
-const sorting = (data: [string, boolean]): void => {
-  const [column, status] = data
-  const direction = status ? 'asc' : 'desc'
-  sort.value = `${column}.${direction}`
-
-  getStorage()
-}
-
-const getStorage = async (): Promise<void> => {
-  const payload: UI_I_TablePayload = {
-    pagination: pagination.value,
-    sortBy: sort.value,
-    type: 'datastore',
-    schema: 'full',
-  }
-
-  props.getDatastoreTableFunc(payload).then(() => {
-    selectedRow.value = null
-  })
-}
-getStorage()
-
-const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
-const selectedRow = ref<number | null>(null)
-const changeStorage = (index: number): void => {
-  if (!props.datastore) return
-  selectedStorage.value = props.datastore[index]
-}
-
-watch(
-  () => props.storageSubmit,
-  () => {
-    submit()
-  }
-)
-const submit = (): void => {
-  if (!selectedStorage.value) {
-    showValidationErrors([localization.value.selectValidDestinationStorage])
-    return
-  }
-
-  emits('submit', selectedStorage.value)
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (arr: string[]): void => {
-  errors.value = arr
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-</script>
-
-<style scoped lang="scss">
-.select-storage {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-
-  .table-wrap {
-    flex: 1;
-
-    .datagrid-cell-icon {
-      margin-right: 6px;
-    }
-
-    :deep(.relative) {
-      height: 100%;
-
-      .datagrid-outer-wrapper {
-        height: 100%;
-      }
-    }
-  }
-
-  .compatibility-wrap {
-    padding-top: 10px;
-
-    .compatibility-message {
-      border: 1px solid #000;
-      padding-top: 5px;
-      padding-left: 5px;
-      overflow: auto;
-    }
-  }
-}
-</style>
+<template>
+  <div class="select-storage">
+    <atoms-alert
+      v-show="errors.length"
+      status="alert-danger"
+      :items="errors"
+      @remove="onRemoveValidationErrors"
+    />
+    <div class="table-wrap">
+      <atoms-table-data-grid
+        v-model:selected-row="selectedRow"
+        v-model:column-keys="columnKeys"
+        v-model:page-size="pagination.pageSize"
+        v-model:page="pagination.page"
+        type="radio"
+        :head-items="headItems"
+        :body-items="bodyItems"
+        :total-items="bodyItems.length"
+        :total-pages="1"
+        server-off
+        hide-page-size
+        @sorting="sorting"
+        @change="changeStorage"
+      >
+        <template #icon="{ item }">
+          <span :class="['datagrid-cell-icon', item.data]" />
+          <span class="text-ellipsis">
+            {{ item.text }}
+          </span>
+        </template>
+      </atoms-table-data-grid>
+    </div>
+
+    <div v-if="!hideCompatibility" class="compatibility-wrap">
+      <p class="compatibility">
+        {{ localization.compatibility }}
+      </p>
+      <div class="compatibility-message flex-align-center">
+        <template v-if="selectedStorage">
+          <div class="icon-status-ok" />
+          <span>{{ localization.compatibilityChecksSucceeded }}</span>
+        </template>
+        <div v-else>
+          <br />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+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 { 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>
+}>()
+const emits = defineEmits<{
+  (event: 'submit', value: UI_I_DatastoreTableItem): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const headItems = ref<UI_I_HeadItem[]>(table.headItems(localization.value))
+const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
+watch(localization, () => {
+  columnKeys.value = table.columnKeys(localization.value)
+})
+
+const bodyItems = computed<UI_I_BodyItem[][]>(() => {
+  return table.bodyItems(props.datastore || [], localization.value)
+})
+
+const sort = ref<string | null>(null)
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+
+const sorting = (data: [string, boolean]): void => {
+  const [column, status] = data
+  const direction = status ? 'asc' : 'desc'
+  sort.value = `${column}.${direction}`
+
+  getStorage()
+}
+
+const getStorage = async (): Promise<void> => {
+  const payload: UI_I_TablePayload = {
+    pagination: pagination.value,
+    sortBy: sort.value,
+    type: 'datastore',
+    schema: 'full',
+  }
+
+  props.getDatastoreTableFunc(payload).then(() => {
+    selectedRow.value = null
+    setStorageFromProps()
+  })
+}
+getStorage()
+
+const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
+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,
+  () => {
+    submit()
+  }
+)
+const submit = (): void => {
+  if (!selectedStorage.value) {
+    showValidationErrors([localization.value.selectValidDestinationStorage])
+    return
+  }
+
+  emits('submit', selectedStorage.value)
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (arr: string[]): void => {
+  errors.value = arr
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+</script>
+
+<style scoped lang="scss">
+.select-storage {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+
+  .table-wrap {
+    flex: 1;
+
+    .datagrid-cell-icon {
+      margin-right: 6px;
+    }
+
+    :deep(.relative) {
+      height: 100%;
+
+      .datagrid-outer-wrapper {
+        height: 100%;
+      }
+    }
+  }
+
+  .compatibility-wrap {
+    padding-top: 10px;
+
+    .compatibility-message {
+      border: 1px solid #000;
+      padding-top: 5px;
+      padding-left: 5px;
+      overflow: auto;
+    }
+  }
+}
+</style>

package/package.json

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