bfg-common 1.5.521 → 1.5.523

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

@@ -63,7 +63,7 @@
             :id="`vm-wizard-hard-disk-${props.index}`"
             v-model.number="size"
             :test-id="`vm-wizard-hard-disk-${props.index}`"
-            :disabled="props.isDisabledSize || props.isRunning"
+            :disabled="props.isDisabledSize"
             :class="[
               'spinfree edit-setting-input input-text-color',
               { 'has-error': props.hardDiskTypeErrorLocalText },
@@ -79,7 +79,7 @@
             :id="`hard-disk-type-select-${props.index}`"
             v-model="hardDiskType"
             :items="props.hardDiskTypeOptions"
-            :disabled="props.type === 'exist' || props.isRunning"
+            :disabled="props.isDisabledSize"
             :test-id="`hard-disk-type-select-${props.index}`"
             width="auto"
             class="unit"
@@ -95,7 +95,7 @@
         :index="props.index"
       />
       <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location
-        v-if="props.isNewType"
+        v-if="props.isNewHardDisk"
         :location="props.location"
         :index="props.index"
         :error-validation-fields="props.errorValidationFields"
@@ -114,14 +114,14 @@
         v-model:disk-provisioning="diskProvisioning"
         :index="props.index"
         :error-validation-fields="props.errorValidationFields"
-        :disabled="(props.isEdit && !props.isNewType) || props.isRunning"
+        :disabled="props.isDisabledProvisioning"
         @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"
+        :disabled="props.isDisabledSharing"
         @remove-error-by-title="emits('remove-error-by-title', $event)"
       />
       <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-limit-iops
@@ -129,7 +129,7 @@
         v-model:limit-iops-type="limitIopsType"
         :index="props.index"
         :error-validation-fields="props.errorValidationFields"
-        :disabled="props.isRunning && !props.isNewType"
+        :disabled="props.isDisabledLimitIops"
         @valid="limitIopsInvalid = $event"
         @remove-error-by-title="emits('remove-error-by-title', $event)"
       />
@@ -137,21 +137,21 @@
         v-model:disk-mode="diskMode"
         :index="props.index"
         :error-validation-fields="props.errorValidationFields"
-        :disabled="props.isRunning && !props.isNewType"
+        :disabled="props.isDisabledMode"
         @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"
+        :disabled="props.isDisabledCache"
         @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"
+        :disabled="props.isDisabledBus"
         :help-text="localization.common.busVirtioHelpDesc"
         :test-id="`vm-wizard-disk-bus-field-${props.index}`"
         :guest-machine-type="props.guestMachineType"
@@ -201,6 +201,12 @@ const props = withDefaults(
     errorText: string
     hardDiskTypeErrorLocalText: string
     isDisabledSize: boolean
+    isDisabledProvisioning: boolean
+    isDisabledSharing: boolean
+    isDisabledLimitIops: boolean
+    isDisabledMode: boolean
+    isDisabledCache: boolean
+    isDisabledBus: boolean
     hardDiskTypeOptions: UI_I_OptionItem[]
     maxHardDisk: number
     location: UI_I_DatastoreTableItem | null
@@ -215,12 +221,10 @@ const props = withDefaults(
     type: UI_T_HardDiskType
     hardDisk: UI_I_SendDataNewHardDisk
     guestMachineType?: UI_I_OptionItem | null
-    isNewType?: boolean
     computeResource?: UI_I_TreeNode | null
   }>(),
   {
     guestMachineType: undefined,
-    isNewType: undefined,
     computeResource: undefined,
   }
 )

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

@@ -71,10 +71,7 @@
                     'spinfree edit-setting-input input-text-color',
                     { 'has-error': props.hardDiskTypeErrorLocalText },
                   ]"
-                  :disabled="
-                    props.isDisabledSize ||
-                    (props.isRunning && diskProvisioning === 'thick')
-                  "
+                  :disabled="props.isDisabledSize"
                   type="number"
                   @blur="emits('validate-size')"
                   @click.stop
@@ -89,7 +86,7 @@
                 :id="`hard-disk-type-select-${props.index}`"
                 v-model="hardDiskType"
                 :data-id="`hard-disk-type-select-${props.index}`"
-                :disabled="props.type === 'exist' || props.isRunning"
+                :disabled="props.isDisabledSize"
                 class="input-text-color"
                 @change="emits('validate-size')"
                 @click.stop
@@ -112,7 +109,7 @@
           :index="props.index"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location
-          v-if="props.isNewType"
+          v-if="props.isNewHardDisk"
           :location="props.location"
           :index="props.index"
           :error-validation-fields="props.errorValidationFields"
@@ -131,14 +128,14 @@
           v-model:disk-provisioning="diskProvisioning"
           :index="props.index"
           :error-validation-fields="props.errorValidationFields"
-          :disabled="(props.isEdit && !props.isNewType) || props.isRunning"
+          :disabled="props.isDisabledProvisioning"
           @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"
+          :disabled="props.isDisabledSharing"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-limit-iops
@@ -146,7 +143,7 @@
           v-model:limit-iops-type="limitIopsType"
           :index="props.index"
           :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isRunning && !props.isNewType"
+          :disabled="props.isDisabledLimitIops"
           @valid="limitIopsInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -154,21 +151,21 @@
           v-model:disk-mode="diskMode"
           :index="props.index"
           :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isRunning && !props.isNewType"
+          :disabled="props.isDisabledMode"
           @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"
+          :disabled="props.isDisabledCache"
           @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"
+          :disabled="props.isDisabledBus"
           :help-text="localization.common.busVirtioHelpDesc"
           :test-id="`vm-wizard-disk-bus-field-${props.index}`"
           :guest-machine-type="props.guestMachineType"
@@ -219,6 +216,12 @@ const props = withDefaults(
     errorText: string
     hardDiskTypeErrorLocalText: string
     isDisabledSize: boolean
+    isDisabledProvisioning: boolean
+    isDisabledSharing: boolean
+    isDisabledLimitIops: boolean
+    isDisabledMode: boolean
+    isDisabledCache: boolean
+    isDisabledBus: boolean
     hardDiskTypeOptions: UI_I_OptionItem[]
     maxHardDisk: number
     location: UI_I_DatastoreTableItem | null
@@ -233,12 +236,10 @@ const props = withDefaults(
     type: UI_T_HardDiskType
     hardDisk: UI_I_SendDataNewHardDisk
     guestMachineType?: UI_I_OptionItem | null
-    isNewType?: boolean
     computeResource?: UI_I_TreeNode | null
   }>(),
   {
     guestMachineType: undefined,
-    isNewType: undefined,
     computeResource: undefined,
   }
 )

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/location/Location.vue

@@ -1,154 +1,154 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-new
-    v-if="isNewView"
-    v-model:selected-location="selectedLocation"
-    :index="props.index"
-    :datastore="props.datastore"
-    :is-datastore-loading="props.isDatastoreLoading"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    :api-error="apiError"
-    :location-options="locationOptions"
-    :storage-modal-is-show="storageModalIsShow"
-    :storage-submit="storageSubmit"
-    @change-location="onChangeLocation"
-    @change-storage="onChangeStorage"
-    @hide-storage-modal="onHideStorageModal"
-    @submit-storage-modal="onSubmitStorageModal"
-    @remove-validation-error="onRemoveValidationError"
-  />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-old
-    v-else
-    v-model:selected-location="selectedLocation"
-    :index="props.index"
-    :datastore="props.datastore"
-    :is-datastore-loading="props.isDatastoreLoading"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    :api-error="apiError"
-    :location-options="locationOptions"
-    :storage-modal-is-show="storageModalIsShow"
-    :storage-submit="storageSubmit"
-    @change-location="onChangeLocation"
-    @change-storage="onChangeStorage"
-    @hide-storage-modal="onHideStorageModal"
-    @submit-storage-modal="onSubmitStorageModal"
-    @remove-validation-error="onRemoveValidationError"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_HTMLSelectElement,
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/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 props = defineProps<{
-  location: UI_I_DatastoreTableItem | null
-  index: number
-  errorValidationFields: UI_I_ErrorValidationField[]
-  datastore: UI_I_DatastoreTableItem[]
-  isDatastoreLoading: boolean
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-}>()
-const emits = defineEmits<{
-  (event: 'change', value: UI_I_DatastoreTableItem): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedLocation = ref<string>(props.location?.id || '')
-
-const storages = ref<UI_I_DatastoreTableItem[]>([])
-const addStorage = (storage: UI_I_DatastoreTableItem): void => {
-  const hasStorage = storages.value.some((item) => item.id === storage.id)
-  if (hasStorage) {
-    return
-  }
-
-  storages.value.push(storage)
-}
-const locationOptions = ref<UI_I_OptionItem[]>([])
-
-watch(
-  () => props.location,
-  (newValue) => {
-    if (locationOptions.value.length || !newValue) {
-      return
-    }
-
-    locationOptions.value = [
-      {
-        text: localization.value.common.storeWithVirtualMachine,
-        value: newValue.id,
-      },
-      { text: `${localization.value.common.browse}...`, value: -1 },
-    ]
-    selectedLocation.value = newValue.id
-    storages.value.push(newValue)
-    addStorage(newValue)
-  },
-  { immediate: true }
-)
-
-const storageSubmit = ref<null | Function>(null)
-const onSubmitStorageModal = (): void => {
-  storageSubmit.value = (_isValid: boolean): void => {
-    storageSubmit.value = null
-  }
-}
-const storageModalIsShow = ref<boolean>(false)
-const onHideStorageModal = (): void => {
-  storageModalIsShow.value = false
-  if (selectedLocation.value === -1)
-    selectedLocation.value = locationOptions.value[0].value
-}
-const onChangeStorage = (storage: UI_I_DatastoreTableItem): void => {
-  locationOptions.value = [
-    locationOptions.value[0],
-    { text: storage.name, value: storage.id },
-    // @ts-ignore
-    locationOptions.value.at(-1),
-  ]
-
-  selectedLocation.value = storage.id
-  emits('change', storage)
-  addStorage(storage)
-  onHideStorageModal()
-}
-const onChangeLocation = (event: UI_I_HTMLSelectElement): void => {
-  const value = +event.target.value
-  if (value === -1) {
-    storageModalIsShow.value = true
-    return
-  }
-
-  selectedLocation.value = event.target.value
-  const storage = storages.value.find((item) => item.id === event.target.value)
-  storage && emits('change', storage)
-}
-
-const typeError = computed<string>(
-  () => `disk_devices[${props.index}].location`
-)
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === typeError.value
-    )?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError.value)
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-new
+    v-if="isNewView"
+    v-model:selected-location="selectedLocation"
+    :index="props.index"
+    :datastore="props.datastore"
+    :is-datastore-loading="props.isDatastoreLoading"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :api-error="apiError"
+    :location-options="locationOptions"
+    :storage-modal-is-show="storageModalIsShow"
+    :storage-submit="storageSubmit"
+    @change-location="onChangeLocation"
+    @change-storage="onChangeStorage"
+    @hide-storage-modal="onHideStorageModal"
+    @submit-storage-modal="onSubmitStorageModal"
+    @remove-validation-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-old
+    v-else
+    v-model:selected-location="selectedLocation"
+    :index="props.index"
+    :datastore="props.datastore"
+    :is-datastore-loading="props.isDatastoreLoading"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :api-error="apiError"
+    :location-options="locationOptions"
+    :storage-modal-is-show="storageModalIsShow"
+    :storage-submit="storageSubmit"
+    @change-location="onChangeLocation"
+    @change-storage="onChangeStorage"
+    @hide-storage-modal="onHideStorageModal"
+    @submit-storage-modal="onSubmitStorageModal"
+    @remove-validation-error="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_HTMLSelectElement,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/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 props = defineProps<{
+  location: UI_I_DatastoreTableItem | null
+  index: number
+  errorValidationFields: UI_I_ErrorValidationField[]
+  datastore: UI_I_DatastoreTableItem[]
+  isDatastoreLoading: boolean
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+}>()
+const emits = defineEmits<{
+  (event: 'change', value: UI_I_DatastoreTableItem): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedLocation = ref<string>(props.location?.id || '')
+
+const storages = ref<UI_I_DatastoreTableItem[]>([])
+const addStorage = (storage: UI_I_DatastoreTableItem): void => {
+  const hasStorage = storages.value.some((item) => item.id === storage.id)
+  if (hasStorage) {
+    return
+  }
+
+  storages.value.push(storage)
+}
+const locationOptions = ref<UI_I_OptionItem[]>([])
+
+watch(
+  () => props.location,
+  (newValue) => {
+    if (locationOptions.value.length || !newValue) {
+      return
+    }
+
+    locationOptions.value = [
+      {
+        text: localization.value.common.storeWithVirtualMachine,
+        value: newValue.id,
+      },
+      { text: `${localization.value.common.browse}...`, value: -1 },
+    ]
+    selectedLocation.value = newValue.id
+    storages.value.push(newValue)
+    addStorage(newValue)
+  },
+  { immediate: true }
+)
+
+const storageSubmit = ref<null | Function>(null)
+const onSubmitStorageModal = (): void => {
+  storageSubmit.value = (_isValid: boolean): void => {
+    storageSubmit.value = null
+  }
+}
+const storageModalIsShow = ref<boolean>(false)
+const onHideStorageModal = (): void => {
+  storageModalIsShow.value = false
+  if (selectedLocation.value === -1)
+    selectedLocation.value = locationOptions.value[0].value
+}
+const onChangeStorage = (storage: UI_I_DatastoreTableItem): void => {
+  locationOptions.value = [
+    locationOptions.value[0],
+    { text: storage.name, value: storage.id },
+    // @ts-ignore
+    locationOptions.value.at(-1),
+  ]
+
+  selectedLocation.value = storage.id
+  emits('change', storage)
+  addStorage(storage)
+  onHideStorageModal()
+}
+const onChangeLocation = (event: UI_I_HTMLSelectElement): void => {
+  const value = +event.target.value
+  if (value === -1) {
+    storageModalIsShow.value = true
+    return
+  }
+
+  selectedLocation.value = event.target.value
+  const storage = storages.value.find((item) => item.id === event.target.value)
+  storage && emits('change', storage)
+}
+
+const typeError = computed<string>(
+  () => `disk_devices[${props.index}].location`
+)
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === typeError.value
+    )?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError.value)
+}
+</script>
+
+<style scoped lang="scss"></style>