bfg-common 1.4.819 → 1.4.821

package/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types.ts

@@ -1,4 +1,7 @@
-export type UI_T_HardDiskType = 'new' | 'edit' | 'exist' | 'removed'
+// clone почти тоже самое что и new
+export type UI_T_HardDiskType = 'new' | 'edit' | 'clone' | 'exist' | 'removed'
+// clone почти тоже самое что и new
+export type UI_T_NetworkType = 'new' | 'edit' | 'clone'
+
 export type UI_T_PciDeviceType = 'new' | 'edit'
-export type UI_T_NetworkType = 'new' | 'edit'
 export type UI_T_CdDvdType = 'new' | 'edit' | 'removed'

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -31,6 +31,7 @@
     :type="props.type"
     :hard-disk="props.hardDisk"
     :guest-machine-type="props.guestMachineType"
+    :is-new-type="isNewType"
     @remove="emits('remove')"
     @roll-back="emits('roll-back')"
     @validate-size="onValidateSize"
@@ -69,6 +70,7 @@
     :type="props.type"
     :hard-disk="props.hardDisk"
     :guest-machine-type="props.guestMachineType"
+    :is-new-type="isNewType"
     @remove="emits('remove')"
     @roll-back="emits('roll-back')"
     @validate-size="onValidateSize"
@@ -127,6 +129,10 @@ const isRemovable = computed<boolean>(() => {
   )
 })
 
+const isNewType = computed<boolean>(
+  () => props.type === 'new' || props.type === 'clone'
+)
+
 const typeError = computed<string>(() => `disk_devices[${props.index}].size`)
 
 const apiErrorLocal = computed<string>(() => {
@@ -314,7 +320,8 @@ watch(
       diskProvisioning.value = newValue.provision_type || 'thick'
       return
     }
-    if (props.type !== 'edit') return
+    // if (props.type !== 'edit') return
+    if (props.type !== 'edit' && props.type !== 'clone') return
 
     diskProvisioning.value = newValue.provision_type || 'thick'
     sharing.value = newValue.sharing ? 'yes' : ''

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskNew.vue

@@ -1,230 +1,229 @@
-<template>
-  <ui-stack-block
-    :has-children="true"
-    :is-roll-back="props.type === 'removed'"
-    :removable="props.isRemovable"
-    :test-id="`hard-disk-stack-block-${props.index}`"
-    @remove="emits('remove')"
-    @roll-back="emits('roll-back')"
-  >
-    <template #stackBlockKey>
-      <div
-        :id="`vm-wizard-toggle-block-hard-disk-${props.index}`"
-        :data-id="`vm-wizard-toggle-block-hard-disk-${props.index}`"
-        class="vm-wizard-toggle-block-hard-disk flex-align-center"
-      >
-        <span class="title">{{ props.label }}</span>
-        <ui-icon
-          v-show="props.hardDiskInvalid"
-          width="18px"
-          height="18px"
-          name="error-outline"
-        />
-      </div>
-    </template>
-    <template #stackBlockContent>
-<!--      <div class="flex-align-center flex-space-between mr-1">-->
-      <div class="new-hard-disk-content flex-align-center">
-        <template v-if="props.type === 'removed'">
-          <span>{{ localization.common.deviceWillRemoved }}</span>
-          <div class="flex-align-center" @click.stop>
-            <ui-checkbox
-              v-model="deleteFilesFromDatastore"
-              :test-id="`hard-disk-delete-files-from-datastore-${props.index}`"
-              :disabled="props.disabled"
-              :label-text="localization.common.deleteFilesFromDatastore"
-            />
-          </div>
-        </template>
-        <template v-else>
-          <ui-input-with-tooltip
-            :id="`vm-wizard-hard-disk-${props.index}`"
-            v-model.number="size"
-            :test-id="`vm-wizard-hard-disk-${props.index}`"
-            :disabled="props.isDisabledSize"
-            :class="[
-              'spinfree edit-setting-input input-text-color',
-              { 'has-error': props.hardDiskTypeErrorLocalText },
-            ]"
-            :error-text="props.errorText"
-            input-style="rounded"
-            type="number"
-            size="md"
-            @blur="emits('validate-size')"
-            @click.stop
-          />
-
-          <ui-select
-            :id="`hard-disk-type-select-${props.index}`"
-            v-model="hardDiskType"
-            width="auto"
-            :items="props.hardDiskTypeOptions"
-            :disabled="props.type === 'exist'"
-            :test-id="`hard-disk-type-select-${props.index}`"
-            class="unit"
-            @change="emits('validate-size')"
-            @click.stop
-          />
-        </template>
-      </div>
-    </template>
-    <template #stackChildren>
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-maximum-size
-        :free-mb="props.maxHardDisk"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location
-        v-if="props.type === 'new'"
-        :location="props.location"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :get-datastore-table-func="props.getDatastoreTableFunc"
-        :datastore="props.datastore"
-        @change="emits('change-storage', $event)"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-file
-        v-else
-        :path="props.hardDisk?.source"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-provisioning
-        v-model:disk-provisioning="diskProvisioning"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :disabled="(props.isEdit && props.type !== 'new') || props.isRunning"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-sharing
-        v-model:sharing="sharing"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :disabled="props.isRunning && props.type !== 'new'"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-limit-iops
-        v-model:limit-iops="limitIops"
-        v-model:limit-iops-type="limitIopsType"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :disabled="props.isRunning && props.type !== 'new'"
-        @valid="limitIopsInvalid = $event"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-mode
-        v-model:disk-mode="diskMode"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :disabled="props.isRunning && props.type !== 'new'"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-cache
-        v-model:cache="cache"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :disabled="(props.isEdit && props.type !== 'new') || props.isRunning"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-      <common-vm-actions-common-customize-hardware-virtual-hardware-bus
-        v-model:bus="bus"
-        :index="props.index"
-        :error-validation-fields="props.errorValidationFields"
-        :disabled="!props.isNewHardDisk && props.isRunning"
-        :help-text="localization.common.busVirtioHelpDesc"
-        :test-id="`vm-wizard-disk-bus-field-${props.index}`"
-        component-type="disk_devices"
-        :guest-machine-type="props.guestMachineType"
-        @remove-error-by-title="emits('remove-error-by-title', $event)"
-      />
-    </template>
-  </ui-stack-block>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type {
-  UI_I_SendDataNewHardDisk,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
-import type { UI_T_HardDiskType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const deleteFilesFromDatastore = defineModel<boolean>(
-  'deleteFilesFromDatastore',
-  { required: true }
-)
-const size = defineModel<number>('size', { required: true })
-const hardDiskType = defineModel<number>('hardDiskType', { required: true })
-const diskProvisioning = defineModel<string>('diskProvisioning', {
-  required: true,
-})
-const sharing = defineModel<string>('sharing', { required: true })
-const limitIops = defineModel<number>('limitIops', { required: true })
-const limitIopsType = defineModel<string>('limitIopsType', { required: true })
-const limitIopsInvalid = defineModel<boolean>('limitIopsInvalid', {
-  required: true,
-})
-const diskMode = defineModel<string>('diskMode', { required: true })
-const cache = defineModel<string>('cache', { required: true })
-const bus = defineModel<string>('bus', { required: true })
-
-const props = defineProps<{
-  isRemovable: boolean
-  label: string
-  hardDiskInvalid: boolean
-  disabled: boolean
-  errorText: string
-  hardDiskTypeErrorLocalText: string
-  isDisabledSize: boolean
-  hardDiskTypeOptions: UI_I_OptionItem[]
-  maxHardDisk: number
-  location: UI_I_DatastoreTableItem | null
-  isRunning: boolean
-  isNewHardDisk: boolean
-  isEdit: boolean
-  datastore: UI_I_DatastoreTableItem[]
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-  index: number
-  type: UI_T_HardDiskType
-  hardDisk: UI_I_SendDataNewHardDisk
-  guestMachineType?: UI_I_OptionItem | null
-}>()
-const emits = defineEmits<{
-  (event: 'remove'): void
-  (event: 'roll-back'): void
-  (event: 'validate-size'): void
-  (event: 'change-storage', value: UI_I_DatastoreTableItem): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-.title {
-  margin-right: 10px;
-}
-
-.new-hard-disk-content {
-  gap: 8px;
-}
-
-:deep(.ui-main-select-toggle) {
-  display: flex;
-  justify-content: space-between;
-  width: 108px;
-}
-.light-theme {
-  :deep(.ui-main-select-toggle) {
-    background-color: #ffffff;
-  }
-}
-
-:deep(.unit .ui-main-select-toggle) {
-  width: 80px;
-}
-:deep(.ui-main.ui-main-sm .ui-main-input) {
-  height: 26px;
-}
-</style>
+<template>
+  <ui-stack-block
+    :has-children="true"
+    :is-roll-back="props.type === 'removed'"
+    :removable="props.isRemovable"
+    :test-id="`hard-disk-stack-block-${props.index}`"
+    @remove="emits('remove')"
+    @roll-back="emits('roll-back')"
+  >
+    <template #stackBlockKey>
+      <div
+        :id="`vm-wizard-toggle-block-hard-disk-${props.index}`"
+        :data-id="`vm-wizard-toggle-block-hard-disk-${props.index}`"
+        class="vm-wizard-toggle-block-hard-disk flex-align-center"
+      >
+        <span class="title">{{ props.label }}</span>
+        <ui-icon
+          v-show="props.hardDiskInvalid"
+          width="18px"
+          height="18px"
+          name="error-outline"
+        />
+      </div>
+    </template>
+    <template #stackBlockContent>
+      <!--      <div class="flex-align-center flex-space-between mr-1">-->
+      <div class="new-hard-disk-content flex-align-center">
+        <template v-if="props.type === 'removed'">
+          <span>{{ localization.common.deviceWillRemoved }}</span>
+          <div class="flex-align-center" @click.stop>
+            <ui-checkbox
+              v-model="deleteFilesFromDatastore"
+              :test-id="`hard-disk-delete-files-from-datastore-${props.index}`"
+              :disabled="props.disabled"
+              :label-text="localization.common.deleteFilesFromDatastore"
+            />
+          </div>
+        </template>
+        <template v-else>
+          <ui-input-with-tooltip
+            :id="`vm-wizard-hard-disk-${props.index}`"
+            v-model.number="size"
+            :test-id="`vm-wizard-hard-disk-${props.index}`"
+            :disabled="props.isDisabledSize"
+            :class="[
+              'spinfree edit-setting-input input-text-color',
+              { 'has-error': props.hardDiskTypeErrorLocalText },
+            ]"
+            :error-text="props.errorText"
+            input-style="rounded"
+            type="number"
+            size="md"
+            @blur="emits('validate-size')"
+            @click.stop
+          />
+
+          <ui-select
+            :id="`hard-disk-type-select-${props.index}`"
+            v-model="hardDiskType"
+            width="auto"
+            :items="props.hardDiskTypeOptions"
+            :disabled="props.type === 'exist'"
+            :test-id="`hard-disk-type-select-${props.index}`"
+            class="unit"
+            @change="emits('validate-size')"
+            @click.stop
+          />
+        </template>
+      </div>
+    </template>
+    <template #stackChildren>
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-maximum-size
+        :free-mb="props.maxHardDisk"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location
+        v-if="props.isNewType"
+        :location="props.location"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :get-datastore-table-func="props.getDatastoreTableFunc"
+        :datastore="props.datastore"
+        @change="emits('change-storage', $event)"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-file
+        v-else
+        :path="props.hardDisk?.source"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-provisioning
+        v-model:disk-provisioning="diskProvisioning"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :disabled="(props.isEdit && !props.isNewType) || props.isRunning"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-sharing
+        v-model:sharing="sharing"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :disabled="props.isRunning && !props.isNewType"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-limit-iops
+        v-model:limit-iops="limitIops"
+        v-model:limit-iops-type="limitIopsType"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :disabled="props.isRunning && !props.isNewType"
+        @valid="limitIopsInvalid = $event"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-mode
+        v-model:disk-mode="diskMode"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :disabled="props.isRunning && !props.isNewType"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-cache
+        v-model:cache="cache"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :disabled="(props.isEdit && !props.isNewType) || props.isRunning"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-bus
+        v-model:bus="bus"
+        :index="props.index"
+        :error-validation-fields="props.errorValidationFields"
+        :disabled="!props.isNewHardDisk && props.isRunning"
+        :help-text="localization.common.busVirtioHelpDesc"
+        :test-id="`vm-wizard-disk-bus-field-${props.index}`"
+        component-type="disk_devices"
+        :guest-machine-type="props.guestMachineType"
+        @remove-error-by-title="emits('remove-error-by-title', $event)"
+      />
+    </template>
+  </ui-stack-block>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_SendDataNewHardDisk } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
+import type { UI_T_HardDiskType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const deleteFilesFromDatastore = defineModel<boolean>(
+  'deleteFilesFromDatastore',
+  { required: true }
+)
+const size = defineModel<number>('size', { required: true })
+const hardDiskType = defineModel<number>('hardDiskType', { required: true })
+const diskProvisioning = defineModel<string>('diskProvisioning', {
+  required: true,
+})
+const sharing = defineModel<string>('sharing', { required: true })
+const limitIops = defineModel<number>('limitIops', { required: true })
+const limitIopsType = defineModel<string>('limitIopsType', { required: true })
+const limitIopsInvalid = defineModel<boolean>('limitIopsInvalid', {
+  required: true,
+})
+const diskMode = defineModel<string>('diskMode', { required: true })
+const cache = defineModel<string>('cache', { required: true })
+const bus = defineModel<string>('bus', { required: true })
+
+const props = defineProps<{
+  isRemovable: boolean
+  label: string
+  hardDiskInvalid: boolean
+  disabled: boolean
+  errorText: string
+  hardDiskTypeErrorLocalText: string
+  isDisabledSize: boolean
+  hardDiskTypeOptions: UI_I_OptionItem[]
+  maxHardDisk: number
+  location: UI_I_DatastoreTableItem | null
+  isRunning: boolean
+  isNewHardDisk: boolean
+  isEdit: boolean
+  datastore: UI_I_DatastoreTableItem[]
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  index: number
+  type: UI_T_HardDiskType
+  hardDisk: UI_I_SendDataNewHardDisk
+  guestMachineType?: UI_I_OptionItem | null
+  isNewType?: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'remove'): void
+  (event: 'roll-back'): void
+  (event: 'validate-size'): void
+  (event: 'change-storage', value: UI_I_DatastoreTableItem): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.title {
+  margin-right: 10px;
+}
+
+.new-hard-disk-content {
+  gap: 8px;
+}
+
+:deep(.ui-main-select-toggle) {
+  display: flex;
+  justify-content: space-between;
+  width: 108px;
+}
+.light-theme {
+  :deep(.ui-main-select-toggle) {
+    background-color: #ffffff;
+  }
+}
+
+:deep(.unit .ui-main-select-toggle) {
+  width: 80px;
+}
+:deep(.ui-main.ui-main-sm .ui-main-input) {
+  height: 26px;
+}
+</style>