bfg-common 1.5.780 → 1.5.781

package/components/common/vm/actions/clone/Clone.vue

@@ -657,16 +657,13 @@ const machineTypes = ref<UI_I_OptionItem[]>(capabilities.value.machineTypes)
 
 const compatibility = computed<UI_I_OptionItem[]>(() => capabilities.value.compatibility)
 const compatibilityInfo = computed<string>(() => {
-  let text = ''
   const selectedOption = compatibility.value.find(item => item.value === model.value.compatibility)
 
-  if (selectedOption) {
-    const version = selectedOption.value.split('-')[1]
+  if (!selectedOption) return ''
 
-    text = `${localization.value.common.compatibility}: ${selectedOption.text} (${localization.value.common.vmVersion} ${version})`
-  }
+  const version = selectedOption.value.split('-')[1]
 
-  return text
+  return `${localization.value.common.compatibility}: ${selectedOption.text} (${localization.value.common.vmVersion} ${version})`
 })
 
 // Для сферы

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

@@ -86,28 +86,28 @@
       </p>
     </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"-->
-    <!--      />-->
+<!--    <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>-->
+<!--      <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>
 
@@ -205,7 +205,6 @@ watch(
 :root {
   --select-option-target-vm-checkbox-description-disabled: #bdc3c7;
 }
-
 :root.dark-theme {
   --select-option-target-vm-checkbox-description-disabled: #bdc3c770;
 }
@@ -237,15 +236,12 @@ watch(
     &.disabled {
       cursor: not-allowed;
     }
-
     &:not(.disabled):hover {
       cursor: pointer;
     }
-
     &:not(.disabled):not(.checked):hover {
       box-shadow: inset 0 0 0 1px var(--select-border);
     }
-
     &.checked {
       background-color: var(--radio-btn-active-label-bg-color);
       box-shadow: inset 0 0 0 1.5px var(--radio-btn-active-label-border-color);

package/components/common/wizards/common/steps/name/Name.vue

@@ -7,7 +7,7 @@
     :errors="errors"
     :location-nodes="props.locationNodes"
     :test-ids="props.testIds"
-    :name-error="nameError"
+    :name-error-text="nameErrorText"
     :is-disabled-field="isDisabledField"
     @remove-validation-errors="onRemoveValidationErrors"
   />
@@ -76,11 +76,11 @@ watch(
 // submit,
 // })
 
-const nameError = ref<string>('')
+const nameErrorText = ref<string>('')
 const isDisabledField = ref<boolean>(false)
 
 const submit = async (cb: Function): Promise<void> => {
-  nameError.value = ''
+  nameErrorText.value = ''
   isDisabledField.value = true
 
   if (props.validateEmptyName && name.value === '') {
@@ -94,7 +94,7 @@ const submit = async (cb: Function): Promise<void> => {
   if (name.value !== '') {
     const isNameValid = await checkNameIsValid(name.value)
     if (!isNameValid) {
-      nameError.value = ' '
+      nameErrorText.value = ' '
       isDisabledField.value = false
       cb(false)
       return

package/components/common/wizards/common/steps/name/New.vue

@@ -53,8 +53,7 @@
                 :placeholder="`${localization.common.name} (${localization.common.optional})`"
                 type="text"
                 maxlength="54"
-                :error="props.nameError"
-                :error-without-text="!!props.nameError"
+                :error="props.nameErrorText"
                 :test-id="props.testIds.name"
                 :disabled="props.isDisabledField"
             />
@@ -75,9 +74,9 @@
           <ui-skeleton-item v-else width="144px" height="20px"/>
         </div>
 
-        <div v-if="location" class="selected-location flex-2">
+        <div v-if="location" :class="['selected-location flex-2', { disabled: props.isDisabledField }]">
           <span :class="['node-icon', location.iconClassName]" />
-          <span :class="['text', isShowAlert && 'error', { 'disabled': props.isDisabledField }]">
+          <span :class="['text', isShowAlert && 'error']">
             {{ location.name }}
           </span>
         </div>
@@ -106,7 +105,7 @@ const props = defineProps<{
   errors: string[]
   locationNodes: UI_I_TreeNode[]
   testIds: UI_I_NameTestIds
-  nameError: string
+  nameErrorText: string
   isDisabledField: boolean
 }>()
 const emits = defineEmits<{
@@ -219,6 +218,10 @@ onMounted(() => {
       align-items: flex-start;
       gap: 8px;
 
+      &.disabled {
+        opacity: 0.3;
+      }
+
       .node-icon {
         width: 20px;
         height: 20px;
@@ -234,10 +237,6 @@ onMounted(() => {
         overflow-wrap: anywhere;
         line-height: 20px;
 
-        &.disabled {
-          opacity: 0.3;
-        }
-
         &.error {
           color: #ea3223; // equal in dark and white modes
         }

package/package.json

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