bfg-common 1.4.393 → 1.4.395

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

@@ -1,173 +1,78 @@
 <template>
-  <div class="hardware-hard-disk">
-    <atoms-stack-block
-      :has-children="true"
-      :is-roll-back="props.type === 'removed'"
-      :removable="isRemovable"
-      :test-id="`hard-disk-stack-block-${props.index}`"
-      @remove="onRemoveHardDisk"
-      @roll-back="onRollBackHardDisk"
-    >
-      <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>{{ label }}</span>
-          <atoms-the-icon
-            v-show="hardDiskInvalid"
-            width="24px"
-            height="24px"
-            class="is-error tooltip-trigger"
-            name="info"
-          />
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-align-center flex-space-between mr-1">
-          <template v-if="props.type === 'removed'">
-            <span>{{ localization.common.deviceWillRemoved }}</span>
-            <div class="flex-align-center" @click.stop>
-              <input
-                :id="`hard-disk-delete-files-from-datastore-${props.index}`"
-                v-model="deleteFilesFromDatastore"
-                :data-id="`hard-disk-delete-files-from-datastore-${props.index}`"
-                :disabled="props.disabled"
-                type="checkbox"
-                class="pointer"
-                @click.stop
-              />
-              <label
-                :for="`hard-disk-delete-files-from-datastore-${props.index}`"
-                :class="[
-                  'label-text-normal pointer',
-                  props.disabled && 'div-disabled',
-                ]"
-                >{{ localization.common.deleteFilesFromDatastore }}</label
-              >
-            </div>
-          </template>
-          <template v-else>
-            <atoms-tooltip-error
-              :has-error="!!hardDiskLocalAndApiErrorsTexts"
-              :selector="`#vm-wizard-hard-disk-${props.index}`"
-              @remove="
-                emits(
-                  'remove-error-by-title',
-                  `disk_devices[${props.index}].size`
-                )
-              "
-            >
-              <template #elem>
-                <input
-                  :id="`vm-wizard-hard-disk-${props.index}`"
-                  v-model.number="size"
-                  :data-id="`vm-wizard-hard-disk-${props.index}`"
-                  type="number"
-                  :class="[
-                    'spinfree edit-setting-input input-text-color',
-                    { 'has-error': hardDiskTypeErrorLocalText },
-                  ]"
-                  :disabled="isDisabledSize"
-                  @blur="onValidateSize"
-                  @click.stop
-                />
-              </template>
-              <template #content>
-                {{ hardDiskLocalAndApiErrorsTexts }}
-              </template>
-            </atoms-tooltip-error>
-            <div class="select ml-1">
-              <select
-                :id="`hard-disk-type-select-${props.index}`"
-                v-model="hardDiskType"
-                :data-id="`hard-disk-type-select-${props.index}`"
-                :disabled="props.type === 'exist'"
-                class="input-text-color"
-                @change="onValidateSize"
-                @click.stop
-              >
-                <option
-                  v-for="(item, key) in hardDiskTypeOptions"
-                  :key="key"
-                  :value="item.value"
-                >
-                  {{ item.text }}
-                </option>
-              </select>
-            </div>
-          </template>
-        </div>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-maximum-size
-          :free-mb="maxHardDisk"
-        />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location
-          v-if="props.type === 'new'"
-          :location="location"
-          :index="props.index"
-          :error-validation-fields="props.errorValidationFields"
-          :get-datastore-table-func="props.getDatastoreTableFunc"
-          :datastore="props.datastore"
-          @change="onChangeStorage"
-          @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') || 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="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"
-          @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:diskMode="diskMode"
-          :index="props.index"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="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') || 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="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>
-    </atoms-stack-block>
-  </div>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-new
+    v-if="isNewView"
+    v-model:delete-files-from-datastore="deleteFilesFromDatastore"
+    v-model:size="size"
+    v-model:hard-disk-type="hardDiskType"
+    v-model:disk-provisioning="diskProvisioning"
+    v-model:sharing="sharing"
+    v-model:limit-iops="limitIops"
+    v-model:limit-iops-type="limitIopsType"
+    v-model:limit-iops-invalid="limitIopsInvalid"
+    v-model:disk-mode="diskMode"
+    v-model:cache="cache"
+    v-model:bus="bus"
+    :is-removable="isRemovable"
+    :label="label"
+    :hard-disk-invalid="hardDiskInvalid"
+    :error-text="hardDiskLocalAndApiErrorsTexts"
+    :hard-disk-type-error-local-text="hardDiskTypeErrorLocalText"
+    :is-disabled-size="isDisabledSize"
+    :hard-disk-type-options="hardDiskTypeOptions"
+    :max-hard-disk="maxHardDisk"
+    :location="location"
+    :is-running="isRunning"
+    :is-edit="props.isEdit"
+    :datastore="props.datastore"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :error-validation-fields="props.errorValidationFields"
+    :index="props.index"
+    :type="props.type"
+    :hard-disk="props.hardDisk"
+    :guest-machine-type="props.guestMachineType"
+    @remove="emits('remove')"
+    @roll-back="emits('roll-back')"
+    @validate-size="onValidateSize"
+    @change-storage="onChangeStorage"
+    @remove-error-by-title="emits('remove-error-by-title', $event)"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-old
+    v-else
+    v-model:delete-files-from-datastore="deleteFilesFromDatastore"
+    v-model:size="size"
+    v-model:hard-disk-type="hardDiskType"
+    v-model:disk-provisioning="diskProvisioning"
+    v-model:sharing="sharing"
+    v-model:limit-iops="limitIops"
+    v-model:limit-iops-type="limitIopsType"
+    v-model:limit-iops-invalid="limitIopsInvalid"
+    v-model:disk-mode="diskMode"
+    v-model:cache="cache"
+    v-model:bus="bus"
+    :is-removable="isRemovable"
+    :label="label"
+    :hard-disk-invalid="hardDiskInvalid"
+    :error-text="hardDiskLocalAndApiErrorsTexts"
+    :hard-disk-type-error-local-text="hardDiskTypeErrorLocalText"
+    :is-disabled-size="isDisabledSize"
+    :hard-disk-type-options="hardDiskTypeOptions"
+    :max-hard-disk="maxHardDisk"
+    :location="location"
+    :is-running="isRunning"
+    :is-edit="props.isEdit"
+    :datastore="props.datastore"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :error-validation-fields="props.errorValidationFields"
+    :index="props.index"
+    :type="props.type"
+    :hard-disk="props.hardDisk"
+    :guest-machine-type="props.guestMachineType"
+    @remove="emits('remove')"
+    @roll-back="emits('roll-back')"
+    @validate-size="onValidateSize"
+    @change-storage="onChangeStorage"
+    @remove-error-by-title="emits('remove-error-by-title', $event)"
+  />
 </template>
 
 <script setup lang="ts">
@@ -203,6 +108,9 @@ const emits = defineEmits<{
   (event: 'remove-error-by-title', value: string): void
 }>()
 
+const { $store, $binary }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isRunning = computed<boolean>(() => {
@@ -227,8 +135,6 @@ const apiErrorLocal = computed<string>(() => {
   )
 })
 
-const { $binary } = useNuxtApp()
-
 const label = computed<string>(() => {
   if (props.type === 'edit' || props.type === 'removed')
     return `${localization.value.common.hardDisk} ${props.index + 1}`
@@ -301,13 +207,6 @@ const isDisabledSize = computed<boolean>(() => {
   return props.type === 'exist' || (props.type === 'edit' && readOnly.value)
 })
 
-const onRemoveHardDisk = (): void => {
-  emits('remove')
-}
-const onRollBackHardDisk = (): void => {
-  emits('roll-back')
-}
-
 const location = ref<UI_I_DatastoreTableItem | null>(props.storage || null)
 watch(
   () => props.storage,
@@ -449,14 +348,4 @@ watch(
 </script>
 
 <style scoped lang="scss">
-.hardware-cpu {
-  #hard-disk {
-    width: 100px;
-    -webkit-appearance: none;
-
-    &.has-error {
-      border: 1px solid #db2100;
-    }
-  }
-}
 </style>

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

@@ -0,0 +1,224 @@
+<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="sm"
+            @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"
+        @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.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>(
+  'delete-files-from-datastore',
+  { required: true }
+)
+const size = defineModel<number>('size', { required: true })
+const hardDiskType = defineModel<number>('hard-disk-type', { required: true })
+const diskProvisioning = defineModel<string>('disk-provisioning', {
+  required: true,
+})
+const sharing = defineModel<string>('sharing', { required: true })
+const limitIops = defineModel<number>('limit-iops', { required: true })
+const limitIopsType = defineModel<string>('limit-iops-type', { required: true })
+const limitIopsInvalid = defineModel<boolean>('limit-iops-invalid', {
+  required: true,
+})
+const diskMode = defineModel<string>('disk-mode', { 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
+  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;
+  background-color: #ffffff;
+}
+
+:deep(.unit .ui-main-select-toggle) {
+  width: 80px;
+}
+:deep(.ui-main.ui-main-sm .ui-main-input) {
+  height: 26px;
+}
+</style>