bfg-common 1.6.95 → 1.6.97

package/components/common/vm/actions/common/select/options/New.vue

@@ -8,6 +8,7 @@
     ]"
   >
     <div
+      v-if="!props.isNewVmFromTemplate"
       :class="[
         'checkbox-container',
         { checked: isCustomizeOs },
@@ -16,12 +17,13 @@
       @click.stop.prevent="onToggleCustomizeOs"
     >
       <ui-checkbox
-        v-model="isCustomizeOs"
+        v-model="modelValue"
         :label-text="localization.vmWizard.customizeOS"
         :title="localization.vmWizard.customizeOS"
         :disabled="props.isNewVmFromTemplate"
         test-id="customize-os"
         size="md"
+        value="customize-os"
       />
       <p
         :class="[
@@ -42,12 +44,13 @@
       @click.stop.prevent="onToggleCustomizeHardware"
     >
       <ui-checkbox
-        v-model="isCustomizeHardware"
+        v-model="modelValue"
         :label-text="localization.common.customizeHardware"
         :title="localization.common.customizeHardware"
         :disabled="props.isNewVmFromTemplate"
         test-id="customize-hardware"
         size="md"
+        value="customize-hardware"
       />
       <p
         :class="[
@@ -59,55 +62,57 @@
       </p>
     </div>
     <div
-      :class="[
-        'checkbox-container',
-        { checked: isPowerOn },
-        { disabled: props.isNewVmFromTemplate },
-      ]"
+      :class="['checkbox-container', { checked: isPowerOn }]"
       @click.stop.prevent="onTogglePowerOn"
     >
-      <!--      :disabled="props.isNewVmFromTemplate"-->
       <ui-checkbox
-        v-model="isPowerOn"
+        v-model="modelValue"
         :label-text="localization.vmWizard.autoPowerOn"
-        :title="localization.vmWizard.autoPowerOn"
-        :disabled="props.isNewVmFromTemplate"
         test-id="power-on"
         size="md"
+        value="power-on"
       />
-      <!--      { disabled: props.isNewVmFromTemplate },-->
-      <p
-        :class="[
-          'checkbox-block-description mt-2 ml-7',
-          { disabled: props.isNewVmFromTemplate },
-        ]"
-      >
+      <p class="checkbox-block-description mt-2 ml-7">
         {{ localization.vmWizard.powerVMAfterCreation }}
       </p>
     </div>
-    <!--    Пока что нужно скрыть-->
+
+<!--    SC-2112-->
 <!--    <div-->
-<!--      v-if="props.isNewVmFromTemplate"-->
-<!--      :class="['checkbox-container', { checked: isLinkedClone }]"-->
-<!--      @click.stop.prevent="onToggleLinkedClone"-->
+<!--      v-if="props.isNewVmFromTemplate && props.project === 'sphere'"-->
+<!--      class="checkbox-container"-->
 <!--    >-->
-<!--      <ui-checkbox-->
-<!--        v-model="isLinkedClone"-->
-<!--        :label-text="localization.vmWizard.createLinkedClone"-->
-<!--        :title="localization.vmWizard.createLinkedClone"-->
-<!--        test-id="create-linked-clone"-->
-<!--        size="md"-->
-<!--      />-->
-
 <!--      <ui-input-->
-<!--        v-if="props.project !== 'sphere'"-->
-<!--        v-model="cloneCount"-->
-<!--        :disabled="!isLinkedClone"-->
-<!--        test-id="clone-count"-->
+<!--        v-model="maxParallel"-->
+<!--        :placeholder="localization.vmWizard.maxParallel"-->
+<!--        test-id="max-parallel"-->
 <!--        type="number"-->
 <!--        class="ml-1 mt-2"-->
 <!--      />-->
 <!--    </div>-->
+    <!--    Пока что нужно скрыть-->
+    <!--    <div-->
+    <!--      v-if="props.isNewVmFromTemplate"-->
+    <!--      :class="['checkbox-container', { checked: isLinkedClone }]"-->
+    <!--      @click.stop.prevent="onToggleLinkedClone"-->
+    <!--    >-->
+    <!--      <ui-checkbox-->
+    <!--        v-model="isLinkedClone"-->
+    <!--        :label-text="localization.vmWizard.createLinkedClone"-->
+    <!--        :title="localization.vmWizard.createLinkedClone"-->
+    <!--        test-id="create-linked-clone"-->
+    <!--        size="md"-->
+    <!--      />-->
+
+    <!--      <ui-input-->
+    <!--        v-if="props.project !== 'sphere'"-->
+    <!--        v-model="cloneCount"-->
+    <!--        :disabled="!isLinkedClone"-->
+    <!--        test-id="clone-count"-->
+    <!--        type="number"-->
+    <!--        class="ml-1 mt-2"-->
+    <!--      />-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -117,7 +122,8 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 
 const modelValue = defineModel<string[]>({ required: true })
-const cloneCount = defineModel<number>('cloneCount')
+const maxParallel = defineModel<number>('maxParallel')
+// const cloneCount = defineModel<number>('cloneCount')
 
 const props = withDefaults(
   defineProps<{
@@ -135,16 +141,19 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const mainContainer = ref<HTMLElement | null>(null)
 const { width: mainContainerWidth } = useElementSize(mainContainer)
 
-const isCustomizeOs = ref<boolean>(false)
-const isCustomizeHardware = ref<boolean>(false)
-const isPowerOn = ref<boolean>(false)
-const isLinkedClone = ref<boolean>(false)
+const isCustomizeOs = computed<boolean>(() =>
+  modelValue.value.includes('customize-os')
+)
+const isCustomizeHardware = computed<boolean>(() =>
+  modelValue.value.includes('customize-hardware')
+)
+const isPowerOn = computed<boolean>(() => modelValue.value.includes('power-on'))
+// const isLinkedClone = ref<boolean>(false)
 
 const onToggleCustomizeOs = (): void => {
   if (props.isNewVmFromTemplate) return
 
-  isCustomizeOs.value = !isCustomizeOs.value
-  if (isCustomizeOs.value) {
+  if (!isCustomizeOs.value) {
     !modelValue.value.includes('customize-os') &&
       modelValue.value.push('customize-os')
   } else {
@@ -157,8 +166,7 @@ const onToggleCustomizeOs = (): void => {
 const onToggleCustomizeHardware = (): void => {
   if (props.isNewVmFromTemplate) return
 
-  isCustomizeHardware.value = !isCustomizeHardware.value
-  if (isCustomizeHardware.value) {
+  if (!isCustomizeHardware.value) {
     !modelValue.value.includes('customize-hardware') &&
       modelValue.value.push('customize-hardware')
   } else {
@@ -169,10 +177,9 @@ const onToggleCustomizeHardware = (): void => {
 }
 
 const onTogglePowerOn = (): void => {
-  if (props.isNewVmFromTemplate) return
+  // if (props.isNewVmFromTemplate) return
 
-  isPowerOn.value = !isPowerOn.value
-  if (isPowerOn.value) {
+  if (!isPowerOn.value) {
     !modelValue.value.includes('power-on') && modelValue.value.push('power-on')
   } else {
     modelValue.value = modelValue.value.filter((item) => item !== 'power-on')
@@ -212,13 +219,14 @@ watch(
 
 <style scoped lang="scss">
 .select-options {
-  grid-template-columns: 1fr 1fr;
+  //grid-template-columns: 1fr 1fr;
+  grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
   grid-template-rows: max-content;
   overflow-y: auto;
   padding-bottom: 16px;
 
   &.is-sm-size {
-    grid-template-columns: 1fr;
+    grid-template-columns: 1fr !important;
   }
 
   &.three-items {

package/components/common/vm/actions/common/select/options/Old.vue

@@ -39,31 +39,48 @@
         localization.common.powerOnVirtualMachineAfterCreation
       }}</label>
     </div>
-<!--    Пока что нужно скрыть-->
-<!--    <div v-if="props.isNewVmFromTemplate" class="checkbox">-->
-<!--      &lt;!&ndash;      :disabled="props.isNewVmFromTemplate"&ndash;&gt;-->
-<!--      <input-->
-<!--        id="create-linked-clone"-->
-<!--        v-model="modelValue"-->
-<!--        data-id="create-linked-clone"-->
-<!--        type="checkbox"-->
-<!--        value="create-linked-clone"-->
-<!--      />-->
-<!--      <label for="create-linked-clone">{{-->
-<!--        localization.vmWizard.createLinkedClone-->
-<!--      }}</label>-->
 
-<!--      <input-->
-<!--        v-if="props.project !== 'sphere'"-->
-<!--        v-model="cloneCount"-->
-<!--        :disabled="!isLinkedClone"-->
-<!--        data-id="clone-count"-->
-<!--        type="number"-->
-<!--        class="ml-1"-->
-<!--        :min="0"-->
-<!--        :max="1000"-->
-<!--      />-->
-<!--    </div>-->
+    <!--    SC-2112-->
+    <!--    <div-->
+    <!--      v-if="props.isNewVmFromTemplate && props.project === 'sphere'"-->
+    <!--      class="checkbox"-->
+    <!--    >-->
+    <!--      <label for="max-parallel">{{ localization.vmWizard.maxParallel }}</label>-->
+    <!--      <input-->
+    <!--        id="max-parallel"-->
+    <!--        v-model="maxParallel"-->
+    <!--        data-id="max-parallel"-->
+    <!--        type="number"-->
+    <!--        class="ml-1"-->
+    <!--        :min="1"-->
+    <!--        :max="100"-->
+    <!--      />-->
+    <!--    </div>-->
+    <!--    Пока что нужно скрыть-->
+    <!--    <div v-if="props.isNewVmFromTemplate" class="checkbox">-->
+    <!--      &lt;!&ndash;      :disabled="props.isNewVmFromTemplate"&ndash;&gt;-->
+    <!--      <input-->
+    <!--        id="create-linked-clone"-->
+    <!--        v-model="modelValue"-->
+    <!--        data-id="create-linked-clone"-->
+    <!--        type="checkbox"-->
+    <!--        value="create-linked-clone"-->
+    <!--      />-->
+    <!--      <label for="create-linked-clone">{{-->
+    <!--        localization.vmWizard.createLinkedClone-->
+    <!--      }}</label>-->
+
+    <!--      <input-->
+    <!--        v-if="props.project !== 'sphere'"-->
+    <!--        v-model="cloneCount"-->
+    <!--        :disabled="!isLinkedClone"-->
+    <!--        data-id="clone-count"-->
+    <!--        type="number"-->
+    <!--        class="ml-1"-->
+    <!--        :min="0"-->
+    <!--        :max="1000"-->
+    <!--      />-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -72,6 +89,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 
 const modelValue = defineModel<string[]>()
+const maxParallel = defineModel<number>('maxParallel')
 // const cloneCount = defineModel<number>('cloneCount')
 
 const props = withDefaults(

package/components/common/vm/actions/common/select/options/Options.vue

@@ -2,6 +2,7 @@
   <component
     v-model="selectedOptions"
     v-model:clone-count="cloneCount"
+    v-model:max-parallel="maxParallel"
     :is="currentComponent"
     :project="props.project"
     :is-new-vm-from-template="props.isNewVmFromTemplate"
@@ -15,16 +16,19 @@ const props = withDefaults(
   defineProps<{
     project?: UI_T_Project
     isNewVmFromTemplate?: boolean // TODO change
+    selectedCloneOptionsKeys?: string[]
   }>(),
   {
     project: undefined,
     isNewVmFromTemplate: undefined,
+    selectedCloneOptionsKeys: () => [],
   }
 )
 
 const emits = defineEmits<{
   (event: 'change', value: string[]): void
   (event: 'change-count', value: number): void
+  (event: 'change-max-parallel', value: number): void
 }>()
 
 const { $store }: any = useNuxtApp()
@@ -37,9 +41,36 @@ const currentComponent = computed(() =>
 )
 
 const selectedOptions = ref<string[]>([])
-watch(selectedOptions, (newValue) => {
-  emits('change', newValue)
+watch(
+  selectedOptions,
+  (newValue) => {
+    emits('change', newValue)
+  },
+  { deep: true }
+)
+watch(
+  () => props.selectedCloneOptionsKeys,
+  (newValue) => {
+    if (newValue.length) {
+      selectedOptions.value = newValue
+    }
+  },
+  { immediate: true, deep: true }
+)
+const maxParallel = ref<number>(1) // For Deploy
+watch(maxParallel, (newValue) => {
+  if (newValue < 1) {
+    cloneCount.value = 1
+    return
+  }
+  if (newValue > 100) {
+    cloneCount.value = 100
+    return
+  }
+
+  emits('change-max-parallel', newValue)
 })
+
 const cloneCount = ref<number>(0) // For Deploy
 watch(cloneCount, (newValue) => {
   if (newValue < 0) {

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

@@ -63,7 +63,6 @@ const props = withDefaults(
     datastore: UI_I_DatastoreTableItem[]
     isDatastoreLoading: boolean
     errors: string[]
-    selectedStorage: UI_I_DatastoreTableItem | null
     compatibility: [UI_T_CompatibilityStatus, string]
     hideCompatibility?: boolean
   }>(),

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

@@ -6,7 +6,6 @@
     :datastore="props.datastore"
     :is-datastore-loading="props.isDatastoreLoading"
     :errors="errors"
-    :selected-storage="selectedStorage"
     :hide-compatibility="props.hideCompatibility"
     :hide-alert="props.hideAlert"
     :is-in-wizard="props.isInWizard"
@@ -100,8 +99,8 @@ const setStorageFromProps = (): void => {
 }
 watch(
   () => props.storage,
-  () => {
-    setStorageFromProps()
+  (newValue, oldValue) => {
+    if (newValue?.id !== oldValue?.id) setStorageFromProps()
   },
   { immediate: true }
 )

package/components/common/vm/actions/common/select/storage/new/New.vue

@@ -89,7 +89,6 @@ const props = withDefaults(
     datastore: UI_I_DatastoreTableItem[]
     isDatastoreLoading: boolean
     errors: string[]
-    selectedStorage: UI_I_DatastoreTableItem | null
     compatibility: [UI_T_CompatibilityStatus, string]
     hideCompatibility?: boolean
     hideAlert?: boolean
@@ -146,15 +145,19 @@ watch(
   // { deep: true }
 )
 
-watch(selectedRow, (newValue) => {
-  if (newValue && props.datastore.length) {
-    data.value.body = tableBodyFunc(
-      props.datastore,
-      localization.value,
-      newValue
-    )
-  }
-})
+watch(
+  selectedRow,
+  (newValue) => {
+    if (newValue && props.datastore.length) {
+      data.value.body = tableBodyFunc(
+        props.datastore,
+        localization.value,
+        newValue
+      )
+    }
+  },
+  { once: true }
+)
 
 const onSelectRow = (selectedData: UI_I_DataTable): void => {
   const selectedId = selectedData[0]?.data[0]?.data.id

package/components/common/vm/actions/common/select/storage/new/lib/config/table.ts

@@ -9,9 +9,7 @@ import type { UI_I_StatusData } from '~/components/common/vm/actions/common/sele
 import { datastoreLocalizationByState } from '~/components/common/lib/config/states'
 import { getStatus } from '~/components/common/vm/actions/common/select/storage/new/lib/utils/utils'
 
-export const tableDataFunc = (
-  localization: UI_I_Localization
-): UI_I_DataTable => ({
+export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable => ({
   id: 'select-storage',
   header: [
     {
@@ -31,7 +29,7 @@ export const tableDataFunc = (
       text: localization.inventorySummary.state,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '160px',
       show: true,
       filter: true,
@@ -42,7 +40,7 @@ export const tableDataFunc = (
       text: localization.common.capacity,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '150px',
       show: true,
       filter: true,
@@ -53,7 +51,7 @@ export const tableDataFunc = (
       text: localization.common.provisioned,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '150px',
       show: true,
       filter: true,
@@ -64,7 +62,7 @@ export const tableDataFunc = (
       text: localization.common.free,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '150px',
       show: true,
       filter: true,
@@ -75,7 +73,7 @@ export const tableDataFunc = (
       text: localization.common.used,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '150px',
       show: true,
       filter: true,
@@ -86,7 +84,7 @@ export const tableDataFunc = (
       text: localization.common.type,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '120px',
       show: true,
       filter: true,
@@ -97,7 +95,7 @@ export const tableDataFunc = (
       text: localization.common.thinProvisioning,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '160px',
       show: true,
       filter: true,
@@ -108,7 +106,7 @@ export const tableDataFunc = (
       text: localization.common.access,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '120px',
       show: true,
       filter: true,
@@ -119,7 +117,7 @@ export const tableDataFunc = (
       text: localization.common.hardwareAcceleration,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '200px',
       show: true,
       filter: true,
@@ -130,7 +128,7 @@ export const tableDataFunc = (
       text: localization.common.driverType,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '150px',
       show: true,
       filter: true,
@@ -141,7 +139,7 @@ export const tableDataFunc = (
       text: localization.common.device,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '150px',
       show: true,
       filter: true,
@@ -152,7 +150,7 @@ export const tableDataFunc = (
       text: localization.common.storageIoControl,
       isSortable: false,
       sort: 'asc',
-      sortColumn: true,
+      sortColumn: false,
       width: '180px',
       show: true,
       filter: true,

package/components/common/vm/actions/confirm/Confirm.vue

@@ -4,6 +4,7 @@
     :sub-title="props.subTitle"
     :description="props.description"
     :modal-texts="props.modalTexts"
+    :loading="props.isLoading"
     @hide-modal="emits('hide')"
     @confirm="emits('confirm')"
   >
@@ -22,9 +23,11 @@ const props = withDefaults(
     subTitle: string
     description: string
     modalTexts?: UI_I_ModalTexts
+    isLoading?: boolean
   }>(),
   {
     modalTexts: undefined,
+    isLoading: false
   }
 )
 

package/components/common/vm/actions/consolidate/New.vue

@@ -1,6 +1,6 @@
 <template>
   <common-modals-confirmation
-    :headline="localization.common.consolidateConfirmation"
+    :headline="localization.snapshots.consolidateSnapshots"
     :description="localization.common.consolidateConfirmationDesc"
     :modal-texts="modalTexts"
     @hide-modal="emits('hide-modal')"

package/components/common/vm/actions/consolidate/Old.vue

@@ -1,7 +1,7 @@
 <template>
   <common-modals-confirmation
-    :headline="localization.common.consolidate"
-    :description="localization.common.consolidateConfirmationDescOld"
+    :headline="localization.snapshots.consolidateSnapshots"
+    :description="localization.common.consolidateConfirmationDesc"
     @hide-modal="emits('hide-modal')"
     @confirm="emits('confirm')"
   />

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

@@ -90,7 +90,7 @@ const props = withDefaults(
     mediatedDevices: undefined,
     capabilities: undefined,
     isVmt: undefined,
-    nums: null
+    nums: null,
   }
 )
 
@@ -148,7 +148,26 @@ const checkCustomizeHardware = async (): Promise<boolean> => {
   })
 }
 
+let modelJson = ''
+// Нужен для того чтоби со второго раза сработал, так как в первый раз попадает в watch когда получаем данные от радителя
+// а второй раз правки от дочерных и сохраняем его
+let helper = 1
+watch(
+  model,
+  (newValue) => {
+    if (newValue !== null && !modelJson && helper === 0) {
+      modelJson = JSON.stringify(newValue)
+    }
+    helper--
+  },
+  { deep: true }
+)
 const validateSendData = async (): Promise<void> => {
+  if (modelJson === JSON.stringify(model.value)) {
+    emits('hide')
+    return
+  }
+
   const isValid = await checkCustomizeHardware()
   if (!isValid) {
     return