bfg-common 1.4.561 → 1.4.563

package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue

@@ -38,7 +38,6 @@
     :project="props.project"
     :nav-items="navItems"
     :errors="errors"
-    :browse-loading="props.browseLoading"
     @change-boot-order="emits('change-boot-order', $event)"
     @send-data="emits('send-data', $event)"
     @next="emits('next')"
@@ -92,7 +91,6 @@
     :project="props.project"
     :nav-items="navItems"
     :errors="errors"
-    :browse-loading="props.browseLoading"
     @change-boot-order="emits('change-boot-order', $event)"
     @send-data="emits('send-data', $event)"
     @next="emits('next')"
@@ -159,7 +157,6 @@ const props = defineProps<{
   nodes: UI_I_FileTreeNode[]
   files: UI_I_FileTreeNode[]
   networksTable: UI_I_NetworkTableItem[]
-  browseLoading: boolean
   cpu?: API_UI_I_VmEditCpu
   memory?: API_UI_I_VmEditMemory
   vmCpuHelpTextSecond?: string

package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareNew.vue

@@ -43,7 +43,6 @@
         :passthrough-devices="props.passthroughDevices"
         :project="props.project"
         :guest-machine-type="guestMachineType"
-        :browse-loading="props.browseLoading"
         @send-data="emits('send-data-virtual-hardware-method', $event)"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -144,7 +143,6 @@ const props = defineProps<{
   networksForBootOptions: UI_I_SendDataNewNetwork[] | null
   hardDisksForBootOptions: UI_I_SendDataNewHardDisk[] | null
   cdDvdDrivesForBootOptions: UI_I_SendDataNewCdDvdDrive[] | null
-  browseLoading: boolean
   cpu?: API_UI_I_VmEditCpu
   state?: string | number
   isEdit?: boolean

package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareOld.vue

@@ -37,7 +37,6 @@
         :passthrough-devices="props.passthroughDevices"
         :project="props.project"
         :guest-machine-type="guestMachineType"
-        :browse-loading="props.browseLoading"
         @send-data="emits('send-data-virtual-hardware-method', $event)"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -121,7 +120,6 @@ const props = defineProps<{
   networksForBootOptions: UI_I_SendDataNewNetwork[] | null
   hardDisksForBootOptions: UI_I_SendDataNewHardDisk[] | null
   cdDvdDrivesForBootOptions: UI_I_SendDataNewCdDvdDrive[] | null
-  browseLoading: boolean
   cpu?: API_UI_I_VmEditCpu
   state?: string | number
   isEdit?: boolean

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

@@ -38,7 +38,6 @@
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
-    :browse-loading="props.browseLoading"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
     @remove-network="onRemoveNetwork"
@@ -105,7 +104,6 @@
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
-    :browse-loading="props.browseLoading"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
     @remove-network="onRemoveNetwork"
@@ -186,7 +184,6 @@ const props = defineProps<{
   networksTable: UI_I_NetworkTableItem[]
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
-  browseLoading: boolean
   state?: string | number
   cpu?: API_UI_I_VmEditCpu
   memory?: API_UI_I_VmEditMemory

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

@@ -185,7 +185,6 @@
         show
         :nodes="props.nodes"
         :files="props.files"
-        :browse-loading="props.browseLoading"
         @submit="emits('add-exist-hard-disk', $event)"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -256,7 +255,6 @@ const props = defineProps<{
   cdDvdDrivesIndex: number[]
   errorValidationFields: UI_I_ErrorValidationField<string>[]
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-  browseLoading: boolean
   cpu?: API_UI_I_VmEditCpu
   state?: string | number
   memory?: API_UI_I_VmEditMemory

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

@@ -137,7 +137,6 @@
         show
         :nodes="props.nodes"
         :files="props.files"
-        :browse-loading="props.browseLoading"
         @submit="emits('add-exist-hard-disk', $event)"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -210,7 +209,6 @@ const props = defineProps<{
   cdDvdDrivesIndex: number[]
   errorValidationFields: UI_I_ErrorValidationField<string>[]
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-  browseLoading: boolean
   cpu?: API_UI_I_VmEditCpu
   state?: string | number
   memory?: API_UI_I_VmEditMemory

package/components/common/vm/actions/common/customizeHardware/virtualHardware/browseView/BrowseView.vue

@@ -1,205 +1,215 @@
-<template>
-  <div>
-    <common-browse
-      v-model:selected-file="selectedFile"
-      v-model:selected-file-type="selectedFileType"
-      :show="props.show"
-      :nodes="props.nodes"
-      :files="files"
-      :info="selectedNodeInfo"
-      :file-types="props.fileTypes"
-      :browse-loading="props.browseLoading"
-      @get-nodes="onGetCurrentDirNodes"
-      @select-node="onSelectNode"
-      @submit="onSubmit"
-      @hide="emits('hide')"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_CurrentDirNodesArguments } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/browseView/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_FileInfo } from '~/components/common/browse/lib/models/interfaces'
-
-const props = defineProps<{
-  show: boolean
-  nodes: UI_I_FileTreeNode[]
-  files: UI_I_FileTreeNode[]
-  browseLoading: boolean
-  fileTypes?: UI_I_OptionItem[]
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'submit', value: UI_I_FileTreeNode | null): void
-  (event: 'get-storage', value: UI_I_TablePayload): void
-  (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
-  (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
-  (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
-}>()
-
-const { $recursion } = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedFileType = ref<string | null>(null)
-watch(
-  selectedFileType,
-  (newValue) => {
-    if (newValue === null || selectedFile.value === null) return
-
-    const isExist = files.value.includes(selectedFile.value)
-    if (!isExist) selectedFile.value = null
-  },
-  { immediate: true, deep: true }
-)
-watch(
-  () => props.fileTypes,
-  (newValue) => {
-    if (newValue?.length) selectedFileType.value = newValue[0].value
-  },
-  { immediate: true, deep: true }
-)
-
-const getStorage = (): void => {
-  const payload: UI_I_TablePayload = {
-    pagination: {
-      page: 1,
-      pageSize: 100,
-    },
-    sortBy: null,
-    type: 'datastore',
-    schema: 'full',
-  }
-
-  emits('get-storage', payload)
-}
-getStorage()
-
-const getFileNodes = (payload: UI_I_FolderOrFileTreePayload): void => {
-  emits('get-folders-or-files', payload)
-}
-
-const files = computed<UI_I_FileTreeNode[]>(() => {
-  if (!selectedNode.value) return []
-
-  const files: UI_I_FileTreeNode[] = props.files
-  if (selectedFileType.value === 'all' || selectedFileType.value === null)
-    return files
-
-  let type = 3
-  if (selectedFileType.value === 'iso') type = 2
-
-  return files.filter((file) => file.provisioned_type === type)
-})
-
-const getRootNodeById = (id: string): UI_I_FileTreeNode | null => {
-  let result = null
-  props.nodes.forEach((node) => {
-    const findNode =
-      node.id === id ? node : $recursion.find(node.nodes, id, 'id', 'nodes')
-
-    findNode && (result = node)
-  })
-
-  return result
-}
-const onGetCurrentDirNodes = async ({
-  node,
-  cb,
-  select = false,
-  type = 'folder',
-}: UI_I_CurrentDirNodesArguments): Promise<void> => {
-  if (!node) return
-
-  const isRootNode = props.nodes?.some((item) => item.id === node.id)
-
-  if (!select && (isRootNode || node.nodesShow)) {
-    emits('show-datastore-child', node)
-    cb && cb()
-    return
-  }
-
-  const rootNode = getRootNodeById(node.id)
-  if (!rootNode) return
-
-  const payload: UI_I_FolderOrFileTreePayload = {
-    type,
-    id: rootNode.id,
-    path: node.path,
-    merge: true,
-    show: !select,
-  }
-
-  await getFileNodes(payload)
-  cb && cb()
-}
-
-const selectedNode = ref<UI_I_FileTreeNode | null>(null)
-const selectedFile = ref<UI_I_FileTreeNode | null>(null)
-const selectedNodeInfo = computed<UI_I_FileInfo[] | null>(() => {
-  const node = selectedFile.value || selectedNode.value
-  if (!node) return null
-
-  const result = [
-    {
-      type: 'text',
-      title: localization.value.common.name,
-      value: node.name || '',
-    },
-    {
-      type: 'size',
-      title: localization.value.common.available,
-      value: node.size || 0,
-    },
-  ]
-
-  if (node.type !== 4) {
-    const modified = node.modified_time || 0
-    result.push({
-      type: 'date',
-      title: localization.value.common.modified,
-      value: +modified * 1000,
-    })
-  }
-
-  return result
-})
-const onSelectNode = (node: UI_I_FileTreeNode): void => {
-  selectedNode.value = node
-  selectedFile.value = null
-
-  onGetCurrentDirNodes({ node, select: true, type: 'file' })
-
-  emits('get-active-device-child', node)
-}
-const onSubmit = (): void => {
-  emits('submit', selectedFile.value)
-  emits('hide')
-}
-
-let helper = false
-watch(
-  () => props.nodes,
-  (newValue: UI_I_FileTreeNode[]) => {
-    if (helper || !newValue.length) return
-    newValue.forEach((node) => {
-      getFileNodes({
-        id: node.id,
-        path: `${node.id}:/`,
-        type: 'folder',
-        show: false,
-        merge: false,
-      })
-    })
-    helper = true
-  },
-  { immediate: true }
-)
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div>
+    <common-browse
+      v-model:selected-file="selectedFile"
+      v-model:selected-file-type="selectedFileType"
+      :show="props.show"
+      :nodes="props.nodes"
+      :files="files"
+      :info="selectedNodeInfo"
+      :file-types="props.fileTypes"
+      :browse-loading="props.browseLoading"
+      @get-nodes="onGetCurrentDirNodes"
+      @select-node="onSelectNode"
+      @submit="onSubmit"
+      @hide="emits('hide')"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_CurrentDirNodesArguments } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/browseView/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_FileInfo } from '~/components/common/browse/lib/models/interfaces'
+
+const props = defineProps<{
+  show: boolean
+  nodes: UI_I_FileTreeNode[]
+  files: UI_I_FileTreeNode[]
+  fileTypes?: UI_I_OptionItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'submit', value: UI_I_FileTreeNode | null): void
+  (event: 'get-storage', value: UI_I_TablePayload): void
+  (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
+  (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
+  (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
+}>()
+
+const { $recursion } = useNuxtApp()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedFileType = ref<string | null>(null)
+watch(
+  selectedFileType,
+  (newValue) => {
+    if (newValue === null || selectedFile.value === null) return
+
+    const isExist = files.value.includes(selectedFile.value)
+    if (!isExist) selectedFile.value = null
+  },
+  { immediate: true, deep: true }
+)
+watch(
+  () => props.fileTypes,
+  (newValue) => {
+    if (newValue?.length) selectedFileType.value = newValue[0].value
+  },
+  { immediate: true, deep: true }
+)
+
+const getStorage = (): void => {
+  const payload: UI_I_TablePayload = {
+    pagination: {
+      page: 1,
+      pageSize: 100,
+    },
+    sortBy: null,
+    type: 'datastore',
+    schema: 'full',
+  }
+
+  emits('get-storage', payload)
+}
+getStorage()
+
+const getFileNodes = (payload: UI_I_FolderOrFileTreePayload): void => {
+  emits('get-folders-or-files', payload)
+}
+
+const files = computed<UI_I_FileTreeNode[]>(() => {
+  if (!selectedNode.value) return []
+
+  const files: UI_I_FileTreeNode[] = props.files
+  if (selectedFileType.value === 'all' || selectedFileType.value === null)
+    return files
+
+  let type = 3
+  if (selectedFileType.value === 'iso') type = 2
+
+  return files.filter((file) => file.provisioned_type === type)
+})
+
+const getRootNodeById = (id: string): UI_I_FileTreeNode | null => {
+  let result = null
+  props.nodes.forEach((node) => {
+    const findNode =
+      node.id === id ? node : $recursion.find(node.nodes, id, 'id', 'nodes')
+
+    findNode && (result = node)
+  })
+
+  return result
+}
+const onGetCurrentDirNodes = async ({
+  node,
+  cb,
+  select = false,
+  type = 'folder',
+}: UI_I_CurrentDirNodesArguments): Promise<void> => {
+  if (!node) return
+
+  const isRootNode = props.nodes?.some((item) => item.id === node.id)
+
+  if (!select && (isRootNode || node.nodesShow)) {
+    emits('show-datastore-child', node)
+    cb && cb()
+    return
+  }
+
+  const rootNode = getRootNodeById(node.id)
+  if (!rootNode) return
+
+  const payload: UI_I_FolderOrFileTreePayload = {
+    type,
+    id: rootNode.id,
+    path: node.path,
+    merge: true,
+    show: !select,
+  }
+
+  await getFileNodes(payload)
+  cb && cb()
+}
+
+const selectedNode = ref<UI_I_FileTreeNode | null>(null)
+const selectedFile = ref<UI_I_FileTreeNode | null>(null)
+const selectedNodeInfo = computed<UI_I_FileInfo[] | null>(() => {
+  const node = selectedFile.value || selectedNode.value
+  if (!node) return null
+
+  const result = [
+    {
+      type: 'text',
+      title: localization.value.common.name,
+      value: node.name || '',
+    },
+    {
+      type: 'size',
+      title: localization.value.common.available,
+      value: node.size || 0,
+    },
+  ]
+
+  if (node.type !== 4) {
+    const modified = node.modified_time || 0
+    result.push({
+      type: 'date',
+      title: localization.value.common.modified,
+      value: +modified * 1000,
+    })
+  }
+
+  return result
+})
+const browseLoading = ref<boolean>(false)
+const onSelectNode = (node: UI_I_FileTreeNode): void => {
+  browseLoading.value = true
+
+  selectedNode.value = node
+  selectedFile.value = null
+
+  onGetCurrentDirNodes({ node, select: true, type: 'file' })
+
+  emits('get-active-device-child', node)
+}
+watch(
+  files,
+  () => {
+    browseLoading.value = false
+  },
+  { immediate: true }
+)
+
+const onSubmit = (): void => {
+  emits('submit', selectedFile.value)
+  emits('hide')
+}
+
+let helper = false
+watch(
+  () => props.nodes,
+  (newValue: UI_I_FileTreeNode[]) => {
+    if (helper || !newValue.length) return
+    newValue.forEach((node) => {
+      getFileNodes({
+        id: node.id,
+        path: `${node.id}:/`,
+        type: 'folder',
+        show: false,
+        merge: false,
+      })
+    })
+    helper = true
+  },
+  { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDriveNew.vue

@@ -68,9 +68,9 @@
   </ui-stack-block>
 
   <Teleport to="body">
-<!--    v-if="isShowFileModal"-->
     <common-vm-actions-common-customize-hardware-virtual-hardware-browse-view
-      :show="isShowFileModal"
+      v-if="isShowFileModal"
+      show
       :file-types="props.fileTypes"
       :nodes="props.nodes"
       :files="props.files"
@@ -87,9 +87,7 @@
 <script lang="ts" setup>
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type {
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDriveOld.vue

@@ -1,158 +1,165 @@
-<template>
-  <div class="hardware-cd-dvd-drive">
-    <atoms-stack-block
-      :has-children="true"
-      :is-roll-back="props.type === 'removed'"
-      :removable="props.isRemovable"
-      :test-id="`cd-dvd-drive-stack-block-${props.index}`"
-      @remove="emits('remove')"
-      @roll-back="emits('roll-back')"
-    >
-      <template #stackBlockKey>
-        <div
-          :id="`vm-wizard-toggle-block-cd-dvd-drive-${props.index}`"
-          :data-id="`vm-wizard-toggle-block-cd-dvd-drive-${props.index}`"
-          class="vm-wizard-toggle-block-cd-dvd-drive vm-wizard-toggle-block-hard-disk"
-        >
-          <span>{{ props.label }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-align-center flex-space-between">
-          <template v-if="props.type === 'removed'">
-            <span>{{ localization.common.deviceWillRemoved }}</span>
-            <div class="flex-align-center" @click.stop>
-              <input
-                :id="`cd-dvd-delete-files-from-datastore-${props.index}`"
-                v-model="deleteFilesFromDatastore"
-                :data-id="`cd-dvd-delete-files-from-datastore-${props.index}`"
-                :disabled="props.disabled"
-                type="checkbox"
-                class="pointer"
-                @click.stop
-              />
-              <label
-                :for="`cd-dvd-delete-files-from-datastore-${props.index}`"
-                :class="[
-                  'label-text-normal pointer',
-                  props.disabled && 'div-disabled',
-                ]"
-              >{{ localization.common.deleteFilesFromDatastore }}</label
-              >
-            </div>
-          </template>
-          <template v-else>
-            <div class="select">
-              <select
-                id="vm-wizard-cd-dvd-drive-field"
-                v-model="selectedCdDvdDrive"
-                :data-id="`vm-wizard-cd-dvd-drive-field-${props.index}`"
-                class="vm-wizard-cd-dvd-drive-field input-text-color"
-                @click.stop
-                @change="emits('change-cd-dvd-drive', $event)"
-              >
-                <option
-                  v-for="(item, key) in props.cdDvdDriveOptions"
-                  :key="key"
-                  :value="item.value"
-                >
-                  {{ item.text }}
-                </option>
-              </select>
-            </div>
-          </template>
-        </div>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-common-customize-hardware-virtual-hardware-cd-dvd-drive-media
-          v-if="selectedCdDvdDrive === 'datastoreIsoFile'"
-          v-model:cd-dvd-media="cdDvdMedia"
-          @browse="isShowFileModal = true"
-        />
-
-        <!--        :short-options="props.type === 'edit'" // поменял из-за задачки PNCWEB-384-->
-        <common-vm-actions-common-customize-hardware-virtual-hardware-bus
-          v-model:bus="bus"
-          :index="props.indexByHardDisks"
-          :validation-type="props.busValidationType"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isRunning"
-          :test-id="`vm-wizard-cd-dvd-bus-field-${props.index}`"
-          short-options
-          component-type="disk_devices"
-          :guest-machine-type="props.guestMachineType"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-      </template>
-    </atoms-stack-block>
-
-    <Teleport to="body">
-<!--      v-if="isShowFileModal"-->
-      <common-vm-actions-common-customize-hardware-virtual-hardware-browse-view
-        :show="isShowFileModal"
-        :file-types="props.fileTypes"
-        :nodes="props.nodes"
-        :files="props.files"
-        @submit="emits('select-file', $event)"
-        @get-storage="emits('get-storage', $event)"
-        @get-folders-or-files="emits('get-folders-or-files', $event)"
-        @get-active-device-child="emits('get-active-device-child', $event)"
-        @show-datastore-child="emits('show-datastore-child', $event)"
-        @hide="emits('hide-file-modal')"
-      />
-    </Teleport>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type {
-  UI_I_Localization,
-  UI_I_HTMLSelectElement,
-} from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
-import type { UI_T_CdDvdType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
-
-const deleteFilesFromDatastore = defineModel<boolean>('deleteFilesFromDatastore', {required: true})
-const selectedCdDvdDrive = defineModel<string>('selectedCdDvdDrive', {required: true})
-const cdDvdMedia = defineModel<string>('cdDvdMedia', {required: true})
-const isShowFileModal = defineModel<boolean>('isShowFileModal', {required: true})
-const bus = defineModel<string>('bus', {required: true})
-
-const props = defineProps<{
-  index: number
-  nodes: UI_I_FileTreeNode[]
-  files: UI_I_FileTreeNode[]
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-  type: UI_T_CdDvdType
-  isRemovable: boolean
-  label: string
-  disabled: boolean
-  cdDvdDriveOptions: UI_I_OptionItem[]
-  indexByHardDisks: number
-  busValidationType: string
-  fileTypes: UI_I_OptionItem[]
-  isRunning: boolean
-  guestMachineType?: UI_I_OptionItem | null
-}>()
-
-const emits = defineEmits<{
-  (event: 'remove'): void
-  (event: 'roll-back'): void
-  (event: 'remove-error-by-title', value: string): void
-  (event: 'get-storage', value: UI_I_TablePayload): void
-  (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
-  (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
-  (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
-  (event: 'change-cd-dvd-drive', value: UI_I_HTMLSelectElement): void
-  (event: 'select-file', value: UI_I_FileTreeNode): void
-  (event: 'hide-file-modal'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div class="hardware-cd-dvd-drive">
+    <atoms-stack-block
+      :has-children="true"
+      :is-roll-back="props.type === 'removed'"
+      :removable="props.isRemovable"
+      :test-id="`cd-dvd-drive-stack-block-${props.index}`"
+      @remove="emits('remove')"
+      @roll-back="emits('roll-back')"
+    >
+      <template #stackBlockKey>
+        <div
+          :id="`vm-wizard-toggle-block-cd-dvd-drive-${props.index}`"
+          :data-id="`vm-wizard-toggle-block-cd-dvd-drive-${props.index}`"
+          class="vm-wizard-toggle-block-cd-dvd-drive vm-wizard-toggle-block-hard-disk"
+        >
+          <span>{{ props.label }}</span>
+        </div>
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-align-center flex-space-between">
+          <template v-if="props.type === 'removed'">
+            <span>{{ localization.common.deviceWillRemoved }}</span>
+            <div class="flex-align-center" @click.stop>
+              <input
+                :id="`cd-dvd-delete-files-from-datastore-${props.index}`"
+                v-model="deleteFilesFromDatastore"
+                :data-id="`cd-dvd-delete-files-from-datastore-${props.index}`"
+                :disabled="props.disabled"
+                type="checkbox"
+                class="pointer"
+                @click.stop
+              />
+              <label
+                :for="`cd-dvd-delete-files-from-datastore-${props.index}`"
+                :class="[
+                  'label-text-normal pointer',
+                  props.disabled && 'div-disabled',
+                ]"
+                >{{ localization.common.deleteFilesFromDatastore }}</label
+              >
+            </div>
+          </template>
+          <template v-else>
+            <div class="select">
+              <select
+                id="vm-wizard-cd-dvd-drive-field"
+                v-model="selectedCdDvdDrive"
+                :data-id="`vm-wizard-cd-dvd-drive-field-${props.index}`"
+                class="vm-wizard-cd-dvd-drive-field input-text-color"
+                @click.stop
+                @change="emits('change-cd-dvd-drive', $event)"
+              >
+                <option
+                  v-for="(item, key) in props.cdDvdDriveOptions"
+                  :key="key"
+                  :value="item.value"
+                >
+                  {{ item.text }}
+                </option>
+              </select>
+            </div>
+          </template>
+        </div>
+      </template>
+      <template #stackChildren>
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cd-dvd-drive-media
+          v-if="selectedCdDvdDrive === 'datastoreIsoFile'"
+          v-model:cd-dvd-media="cdDvdMedia"
+          @browse="isShowFileModal = true"
+        />
+
+        <!--        :short-options="props.type === 'edit'" // поменял из-за задачки PNCWEB-384-->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-bus
+          v-model:bus="bus"
+          :index="props.indexByHardDisks"
+          :validation-type="props.busValidationType"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="props.isRunning"
+          :test-id="`vm-wizard-cd-dvd-bus-field-${props.index}`"
+          short-options
+          component-type="disk_devices"
+          :guest-machine-type="props.guestMachineType"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+      </template>
+    </atoms-stack-block>
+
+    <Teleport to="body">
+      <common-vm-actions-common-customize-hardware-virtual-hardware-browse-view
+        v-if="isShowFileModal"
+        show
+        :file-types="props.fileTypes"
+        :nodes="props.nodes"
+        :files="props.files"
+        @submit="emits('select-file', $event)"
+        @get-storage="emits('get-storage', $event)"
+        @get-folders-or-files="emits('get-folders-or-files', $event)"
+        @get-active-device-child="emits('get-active-device-child', $event)"
+        @show-datastore-child="emits('show-datastore-child', $event)"
+        @hide="emits('hide-file-modal')"
+      />
+    </Teleport>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type {
+  UI_I_Localization,
+  UI_I_HTMLSelectElement,
+} from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
+import type { UI_T_CdDvdType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
+
+const deleteFilesFromDatastore = defineModel<boolean>(
+  'deleteFilesFromDatastore',
+  { required: true }
+)
+const selectedCdDvdDrive = defineModel<string>('selectedCdDvdDrive', {
+  required: true,
+})
+const cdDvdMedia = defineModel<string>('cdDvdMedia', { required: true })
+const isShowFileModal = defineModel<boolean>('isShowFileModal', {
+  required: true,
+})
+const bus = defineModel<string>('bus', { required: true })
+
+const props = defineProps<{
+  index: number
+  nodes: UI_I_FileTreeNode[]
+  files: UI_I_FileTreeNode[]
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  type: UI_T_CdDvdType
+  isRemovable: boolean
+  label: string
+  disabled: boolean
+  cdDvdDriveOptions: UI_I_OptionItem[]
+  indexByHardDisks: number
+  busValidationType: string
+  fileTypes: UI_I_OptionItem[]
+  isRunning: boolean
+  guestMachineType?: UI_I_OptionItem | null
+}>()
+
+const emits = defineEmits<{
+  (event: 'remove'): void
+  (event: 'roll-back'): void
+  (event: 'remove-error-by-title', value: string): void
+  (event: 'get-storage', value: UI_I_TablePayload): void
+  (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
+  (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
+  (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
+  (event: 'change-cd-dvd-drive', value: UI_I_HTMLSelectElement): void
+  (event: 'select-file', value: UI_I_FileTreeNode): void
+  (event: 'hide-file-modal'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -19,7 +19,6 @@
     :vm-name-old="props.vmSettings?.name"
     :passthrough-devices="props.passthroughDevices"
     :get-datastore-table-func="props.getDatastoreTableFunc"
-    :browse-loading="props.browseLoading"
     @hide="emits('hide')"
     @validate="validateSendData"
     @update-vm="emits('update-vm')"
@@ -108,7 +107,6 @@ const props = defineProps<{
   vmId: string
   datastore: UI_I_DatastoreTableItem[]
   validateSendDataFunc: UI_T_EditVmFinishFunc
-  browseLoading: boolean
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
   state?: string | number
   passthroughDevices?: UI_I_PciDevice[]

package/components/common/vm/actions/editSettings/EditSettingsOld.vue

@@ -51,7 +51,6 @@
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
             is-edit
-            :browse-loading="props.browseLoading"
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
             @get-active-device-child="emits('get-active-device-child', $event)"
@@ -110,7 +109,6 @@ const props = defineProps<{
   virtualHardwareNetworks: UI_I_SendDataNewNetwork[] | null
   virtualHardwareHardDisks: UI_I_SendDataNewHardDisk[] | null
   virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  browseLoading: boolean
   state?: string | number
   vmNameOld?: string
   passthroughDevices?: UI_I_PciDevice[]

package/components/common/vm/actions/editSettings/new/New.vue

@@ -53,7 +53,6 @@
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
             is-edit
-            :browse-loading="props.browseLoading"
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
             @get-active-device-child="emits('get-active-device-child', $event)"
@@ -116,7 +115,6 @@ const props = defineProps<{
   virtualHardwareNetworks: UI_I_SendDataNewNetwork[] | null
   virtualHardwareHardDisks: UI_I_SendDataNewHardDisk[] | null
   virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  browseLoading: boolean
   state?: string | number
   vmNameOld?: string
   passthroughDevices?: UI_I_PciDevice[]

package/package.json

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