bfg-common 1.6.10 → 1.6.12

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

@@ -1,271 +1,271 @@
-<template>
-  <ui-wizard
-    :steps="props.wizard.steps"
-    :selected-scheme="props.selectedScheme"
-    :is-loading="props.wizard.wizardLoader.status"
-    :title="localization.common.registerVm"
-    :texts="texts"
-    :has-changes="hasChanges"
-    test-id="register-wizard"
-    show
-    @change-steps="emits('change-steps', $event)"
-    @hide="emits('hide')"
-    @submit="emits('finish')"
-  >
-    <template #content="{ selectedStep }">
-      <ui-wizard-block
-        v-if="
-          selectedStep.id === props.dynamicSteps.selectName ||
-          selectedStep.id === props.dynamicSteps.selectNameFolder
-        "
-        :sub-title-height="heightName"
-      >
-        <template #subTitle>
-          <div ref="subTitleBlockName">
-            <div class="subtitle-block">
-              <div
-                id="name-alert-wrapper"
-                :class="[{ 'mb-4': !isNameAlertWrapperEmpty }]"
-              ></div>
-              <ui-wizard-subtitle :sub-title="currentSubtitleSelectNameBlock" />
-            </div>
-          </div>
-        </template>
-        <template #content>
-          <common-wizards-common-steps-name
-            v-show="
-              selectedStep.id === props.dynamicSteps.selectName ||
-              selectedStep.id === props.dynamicSteps.selectNameFolder
-            "
-            v-model:name="vmForm.name"
-            v-model:location="location"
-            :show="
-              selectedStep.id === props.dynamicSteps.selectName ||
-              selectedStep.id === props.dynamicSteps.selectNameFolder
-            "
-            :name-form-submit="props.nameFormSubmit"
-            :name-request-url="props.nameRequestUrl"
-            :validation-description="
-              localization.common.enterValidLocationVirtualMachine
-            "
-            :name-exist-validation-description="
-              localization.registerVm.nameAlreadyExistsDescription
-            "
-            :test-ids="props.nameTestIds"
-            :has-location="props.isSphere"
-            :location-nodes="localLocationNodes"
-            :allowed-location-kinds="props.allowedLocationKinds"
-            :location-description="props.locationDescription"
-            @submit="emits('change-name', $event)"
-            @has-errors="isNameAlertWrapperEmpty = $event"
-          />
-        </template>
-      </ui-wizard-block>
-
-      <ui-wizard-block
-        v-if="
-          props.isSphere &&
-          selectedStep.id === props.dynamicSteps.selectComputeResource
-        "
-        :sub-title-height="heightComputeResource"
-      >
-        <template #subTitle>
-          <div ref="computeResource">
-            <div class="subtitle-block">
-              <ui-alert
-                v-if="props.computeResourceAlert.length"
-                :messages="props.computeResourceAlert"
-                test-id="computed-resource-alert"
-                type="error"
-                size="md"
-                class="subtitle-block__alert mb-4"
-              />
-              <ui-wizard-subtitle
-                :sub-title="
-                  localization.vmWizard
-                    .selectDestinationComputeResourceForThisOperation
-                "
-              />
-            </div>
-          </div>
-        </template>
-        <template #content>
-          <div class="mt-4 compute-resource-container">
-            <common-wizards-common-steps-compute-resource
-              v-show="
-                selectedStep.id === props.dynamicSteps.selectComputeResource
-              "
-              v-model="vmForm.computeResource"
-              :nodes="props.computeResourceTreeLocal"
-              :alert-messages="props.computeResourceAlert"
-              :is-loading="props.isLoadingComputeTree"
-              :compatibility-text="props.compatibilityText"
-            />
-          </div>
-        </template>
-      </ui-wizard-block>
-
-      <ui-wizard-block
-        v-if="selectedStep.id === props.dynamicSteps.readyComplete"
-        :sub-title-height="heightReadyComplete"
-      >
-        <template #subTitle>
-          <div ref="subTitleBlockReadyComplete">
-            <div class="subtitle-block">
-              <ui-wizard-subtitle
-                :sub-title="localization.registerVm.lastCreateSubtitle"
-              />
-            </div>
-          </div>
-        </template>
-        <template #content>
-          <div class="register-vm-ready-to-complete-container">
-            <common-ready-to-complete
-              v-if="selectedStep.id === props.dynamicSteps.readyComplete"
-              :data="props.readyCompleteTableInfo"
-            />
-          </div>
-        </template>
-      </ui-wizard-block>
-    </template>
-  </ui-wizard>
-</template>
-
-<script setup lang="ts">
-import { useElementSize } from '@vueuse/core'
-import type {
-  UI_I_WizardStep,
-  UI_I_WizardTexts,
-} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import { compare } from '~/node_modules/bfg-uikit/lib/utils/compare'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/name/lib/models/interfaces'
-import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
-
-const vmForm = defineModel<any>({ required: true })
-const location = defineModel<UI_I_TreeNode | null>('location')
-
-const props = withDefaults(
-  defineProps<{
-    project: UI_T_Project
-    readyCompleteTableInfo: UI_I_TableInfoItem[]
-    nameRequestUrl: string
-    wizard: Wizard
-    selectedScheme: number[]
-    dynamicSteps: any
-    nameFormSubmit: null | Function
-    nameTestIds: UI_I_NameTestIds
-    allowedLocationKinds: number[]
-    locationDescription: string
-    isSphere: boolean
-    computeResourceTreeLocal: UI_I_TreeNode | null
-    compatibilityText: [UI_T_CompatibilityStatus, string]
-    isLoadingComputeTree?: boolean // для сферы
-    computeResourceAlert?: string[] // для сферы
-    locationNodes?: UI_I_TreeNode[] // для сферы
-  }>(),
-  {
-    isLoadingComputeTree: false,
-    computeResourceAlert: () => [],
-    locationNodes: () => [],
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'finish'): void
-  (event: 'hide'): void
-  (event: 'change-steps', value: UI_I_WizardStep[]): void
-  (event: 'change-name', value: [string, UI_I_TreeNode | null]): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const texts = computed<UI_I_WizardTexts>(() => ({
-  cancel: localization.value.common.cancel,
-  back: localization.value.common.backCap,
-  processing: localization.value.common.processing,
-  next: localization.value.common.next,
-  finish: localization.value.registerVm.register,
-  incompleteTitle: localization.value.common.incompleteProcess,
-  incompleteMessage: localization.value.common.incompleteProcessMessage,
-  incompleteCancel: localization.value.common.cancel,
-  incompleteLeave: localization.value.common.leave,
-  step: localization.value.common.step,
-  of: localization.value.common.of2,
-}))
-
-const isNameAlertWrapperEmpty = ref<boolean>(false)
-
-const subTitleBlockName = ref<HTMLElement | null>(null)
-const { height: heightName } = useElementSize(subTitleBlockName)
-
-const computeResource = ref<HTMLElement | null>(null)
-const { height: heightComputeResource } = useElementSize(computeResource)
-
-const subTitleBlockReadyComplete = ref<HTMLElement | null>(null)
-const { height: heightReadyComplete } = useElementSize(
-  subTitleBlockReadyComplete
-)
-
-const currentSubtitleSelectNameBlock = ref<string>(
-  props.isSphere
-    ? localization.value.vmWizard.specifyUniqueNameAndTargetLocationForVm
-    : localization.value.common.specifyUniqueNameForVm
-)
-
-const initialCompare = compare(vmForm)
-const hasChanges = computed<boolean>(() => initialCompare.getDiff(vmForm.value))
-
-const localLocationNodes = computed<UI_I_TreeNode[]>(() => {
-  const copyData = useDeepCopy(props.locationNodes)
-  if (copyData[0] && !copyData[0]?.nodes.length) {
-    copyData[0].hasNodes = true
-  }
-
-  return copyData
-})
-</script>
-
-<style>
-:root {
-  --select-name-border-color: #e9ebed;
-}
-:root.dark-theme {
-  --select-name-border-color: #e9ebed1f;
-}
-</style>
-<style scoped lang="scss">
-.subtitle-block {
-  display: flex;
-  flex-direction: column;
-  border-bottom: 1px solid var(--wizard-line);
-  padding-bottom: 12px;
-}
-:deep(.select-name .tree-view-wrap) {
-  border-color: var(--select-name-border-color);
-}
-.compute-resource-container {
-  padding-bottom: 16px;
-
-  :deep(.tree-content) {
-    padding: 8px !important;
-  }
-  :deep(.compatibility-wrap) {
-    margin-top: 24px;
-  }
-}
-.register-vm-ready-to-complete-container {
-  padding-bottom: 16px;
-
-  :deep(.details-list__col-right) {
-    align-items: flex-start;
-  }
-  :deep(.details-item-value) {
-    white-space: normal;
-  }
-}
-</style>
+<template>
+  <ui-wizard
+    :steps="props.wizard.steps"
+    :selected-scheme="props.selectedScheme"
+    :is-loading="props.wizard.wizardLoader.status"
+    :title="localization.common.registerVm"
+    :texts="texts"
+    :has-changes="hasChanges"
+    test-id="register-wizard"
+    show
+    @change-steps="emits('change-steps', $event)"
+    @hide="emits('hide')"
+    @submit="emits('finish')"
+  >
+    <template #content="{ selectedStep }">
+      <ui-wizard-block
+        v-if="
+          selectedStep.id === props.dynamicSteps.selectName ||
+          selectedStep.id === props.dynamicSteps.selectNameFolder
+        "
+        :sub-title-height="heightName"
+      >
+        <template #subTitle>
+          <div ref="subTitleBlockName">
+            <div class="subtitle-block">
+              <div
+                id="name-alert-wrapper"
+                :class="[{ 'mb-4': !isNameAlertWrapperEmpty }]"
+              ></div>
+              <ui-wizard-subtitle :sub-title="currentSubtitleSelectNameBlock" />
+            </div>
+          </div>
+        </template>
+        <template #content>
+          <common-wizards-common-steps-name
+            v-show="
+              selectedStep.id === props.dynamicSteps.selectName ||
+              selectedStep.id === props.dynamicSteps.selectNameFolder
+            "
+            v-model:name="vmForm.name"
+            v-model:location="location"
+            :show="
+              selectedStep.id === props.dynamicSteps.selectName ||
+              selectedStep.id === props.dynamicSteps.selectNameFolder
+            "
+            :name-form-submit="props.nameFormSubmit"
+            :name-request-url="props.nameRequestUrl"
+            :validation-description="
+              localization.common.enterValidLocationVirtualMachine
+            "
+            :name-exist-validation-description="
+              localization.registerVm.nameAlreadyExistsDescription
+            "
+            :test-ids="props.nameTestIds"
+            :has-location="props.isSphere"
+            :location-nodes="localLocationNodes"
+            :allowed-location-kinds="props.allowedLocationKinds"
+            :location-description="props.locationDescription"
+            @submit="emits('change-name', $event)"
+            @has-errors="isNameAlertWrapperEmpty = $event"
+          />
+        </template>
+      </ui-wizard-block>
+
+      <ui-wizard-block
+        v-if="
+          props.isSphere &&
+          selectedStep.id === props.dynamicSteps.selectComputeResource
+        "
+        :sub-title-height="heightComputeResource"
+      >
+        <template #subTitle>
+          <div ref="computeResource">
+            <div class="subtitle-block">
+              <ui-alert
+                v-if="props.computeResourceAlert.length"
+                :messages="props.computeResourceAlert"
+                test-id="computed-resource-alert"
+                type="error"
+                size="md"
+                class="subtitle-block__alert mb-4"
+              />
+              <ui-wizard-subtitle
+                :sub-title="
+                  localization.vmWizard
+                    .selectDestinationComputeResourceForThisOperation
+                "
+              />
+            </div>
+          </div>
+        </template>
+        <template #content>
+          <div class="mt-4 compute-resource-container">
+            <common-wizards-common-steps-compute-resource
+              v-show="
+                selectedStep.id === props.dynamicSteps.selectComputeResource
+              "
+              v-model="vmForm.computeResource"
+              :nodes="props.computeResourceTreeLocal"
+              :alert-messages="props.computeResourceAlert"
+              :is-loading="props.isLoadingComputeTree"
+              :compatibility-text="props.compatibilityText"
+            />
+          </div>
+        </template>
+      </ui-wizard-block>
+
+      <ui-wizard-block
+        v-if="selectedStep.id === props.dynamicSteps.readyComplete"
+        :sub-title-height="heightReadyComplete"
+      >
+        <template #subTitle>
+          <div ref="subTitleBlockReadyComplete">
+            <div class="subtitle-block">
+              <ui-wizard-subtitle
+                :sub-title="localization.registerVm.lastCreateSubtitle"
+              />
+            </div>
+          </div>
+        </template>
+        <template #content>
+          <div class="register-vm-ready-to-complete-container">
+            <common-ready-to-complete
+              v-if="selectedStep.id === props.dynamicSteps.readyComplete"
+              :data="props.readyCompleteTableInfo"
+            />
+          </div>
+        </template>
+      </ui-wizard-block>
+    </template>
+  </ui-wizard>
+</template>
+
+<script setup lang="ts">
+import { useElementSize } from '@vueuse/core'
+import type {
+  UI_I_WizardStep,
+  UI_I_WizardTexts,
+} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import { compare } from '~/node_modules/bfg-uikit/lib/utils/compare'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/name/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
+
+const vmForm = defineModel<any>({ required: true })
+const location = defineModel<UI_I_TreeNode | null>('location')
+
+const props = withDefaults(
+  defineProps<{
+    project: UI_T_Project
+    readyCompleteTableInfo: UI_I_TableInfoItem[]
+    nameRequestUrl: string
+    wizard: Wizard
+    selectedScheme: number[]
+    dynamicSteps: any
+    nameFormSubmit: null | Function
+    nameTestIds: UI_I_NameTestIds
+    allowedLocationKinds: number[]
+    locationDescription: string
+    isSphere: boolean
+    computeResourceTreeLocal: UI_I_TreeNode | null
+    compatibilityText: [UI_T_CompatibilityStatus, string]
+    isLoadingComputeTree?: boolean // для сферы
+    computeResourceAlert?: string[] // для сферы
+    locationNodes?: UI_I_TreeNode[] // для сферы
+  }>(),
+  {
+    isLoadingComputeTree: false,
+    computeResourceAlert: () => [],
+    locationNodes: () => [],
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'finish'): void
+  (event: 'hide'): void
+  (event: 'change-steps', value: UI_I_WizardStep[]): void
+  (event: 'change-name', value: [string, UI_I_TreeNode | null]): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const texts = computed<UI_I_WizardTexts>(() => ({
+  cancel: localization.value.common.cancel,
+  back: localization.value.common.backCap,
+  processing: localization.value.common.processing,
+  next: localization.value.common.next,
+  finish: localization.value.registerVm.register,
+  incompleteTitle: localization.value.common.incompleteProcess,
+  incompleteMessage: localization.value.common.incompleteProcessMessage,
+  incompleteCancel: localization.value.common.cancel,
+  incompleteLeave: localization.value.common.leave,
+  step: localization.value.common.step,
+  of: localization.value.common.of2,
+}))
+
+const isNameAlertWrapperEmpty = ref<boolean>(false)
+
+const subTitleBlockName = ref<HTMLElement | null>(null)
+const { height: heightName } = useElementSize(subTitleBlockName)
+
+const computeResource = ref<HTMLElement | null>(null)
+const { height: heightComputeResource } = useElementSize(computeResource)
+
+const subTitleBlockReadyComplete = ref<HTMLElement | null>(null)
+const { height: heightReadyComplete } = useElementSize(
+  subTitleBlockReadyComplete
+)
+
+const currentSubtitleSelectNameBlock = ref<string>(
+  props.isSphere
+    ? localization.value.vmWizard.specifyUniqueNameAndTargetLocationForVm
+    : localization.value.common.specifyUniqueNameForVm
+)
+
+const initialCompare = compare(vmForm)
+const hasChanges = computed<boolean>(() => initialCompare.getDiff(vmForm.value))
+
+const localLocationNodes = computed<UI_I_TreeNode[]>(() => {
+  const copyData = useDeepCopy(props.locationNodes)
+  if (copyData[0] && !copyData[0]?.nodes.length) {
+    copyData[0].hasNodes = true
+  }
+
+  return copyData
+})
+</script>
+
+<style>
+:root {
+  --select-name-border-color: #e9ebed;
+}
+:root.dark-theme {
+  --select-name-border-color: #e9ebed1f;
+}
+</style>
+<style scoped lang="scss">
+.subtitle-block {
+  display: flex;
+  flex-direction: column;
+  border-bottom: 1px solid var(--wizard-line);
+  padding-bottom: 12px;
+}
+:deep(.select-name .tree-view-wrap) {
+  border-color: var(--select-name-border-color);
+}
+.compute-resource-container {
+  padding-bottom: 16px;
+
+  :deep(.tree-content) {
+    padding: 8px !important;
+  }
+  :deep(.compatibility-wrap) {
+    margin-top: 24px;
+  }
+}
+.register-vm-ready-to-complete-container {
+  padding-bottom: 16px;
+
+  :deep(.details-list__col-right) {
+    align-items: flex-start;
+  }
+  :deep(.details-item-value) {
+    white-space: normal;
+  }
+}
+</style>

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

@@ -11,12 +11,21 @@
     @hide="emits('hide')"
   >
     <template #content>
+      <ui-alert
+          v-if="props.errors.length"
+          :messages="props.errors.length && !isEmptyName ? props.errors : []"
+          test-id="vm-rename-error-alert"
+          type="error"
+          class="mb-2 mx-8"
+          size="md"
+          hide-close-button
+      />
       <div class="content">
         <form @submit.prevent="onRename">
           <ui-input
             id="name"
             v-model="nameLocal"
-            :error="props.errors[0]"
+            :error="props.isEmptyName ? localization.common.fieldRequired : ''"
             :label="localization.common.name"
             test-id="rename-vm-name-input"
             type="text"
@@ -37,6 +46,7 @@ const props = defineProps<{
   vmName: string
   isLoading: boolean
   errors: string[]
+  isEmptyName: boolean
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void

package/components/common/vm/actions/rename/Rename.vue

@@ -4,6 +4,7 @@
     :vm-name="props.vmName"
     :is-loading="isLoading"
     :errors="errors"
+    :is-empty-name="isEmptyName"
     @hide="onHide"
     @change-name="onChangeName"
     @remove-validation-errors="onRemoveValidationErrors"
@@ -64,6 +65,7 @@ const onChangeName = async (name: string): Promise<void> => {
   onHide()
 }
 
+const isEmptyName = ref<boolean>(false)
 const errors = ref<string[]>([])
 const showValidationErrors = (data: string[]): void => {
   errors.value = data
@@ -74,6 +76,8 @@ const onRemoveValidationErrors = (): void => {
 
 const onCheckName = async (name: string): Promise<boolean> => {
   let result = true
+  isEmptyName.value = false
+  errors.value = []
 
   const url = props.nameRequestUrl.replace('{name}', encodeURIComponent(name))
   const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
@@ -83,9 +87,11 @@ const onCheckName = async (name: string): Promise<boolean> => {
   const status = error.value?.statusCode || 200
   switch (status) {
     case 400: // Empty name
+    case 404: // 404 получаем в Сфере
       showValidationErrors([
         localization.value.common.emptyNameValidationDescription,
       ])
+      isEmptyName.value = true
       result = false
       break
     case 405: // Invalid kind

package/components/common/vm/snapshots/lib/models/types.ts

@@ -2,6 +2,7 @@ export type UI_T_SnapshotActionType =
   | 'take'
   | 'edit'
   | 'revert'
+  | 'revertLast'
   | 'delete'
   | 'delete_all'
   | 'group_take'

package/components/common/vm/snapshots/modals/confirm/New.vue

@@ -10,7 +10,7 @@
     @hide-modal="emits('hide')"
     @confirm="emits('submit')"
   >
-    <template v-if="props.type === 'revert'" #otherContent>
+    <template v-if="props.type === 'revert' || props.type === 'revertLast'" #otherContent>
       <div class="confirm-modal-checkbox-content mt-4 p-3">
         <ui-checkbox
           v-model="suspendOnRevert"
@@ -79,6 +79,7 @@ const descriptionText = computed<string>(() => {
       break
 
     case 'revert':
+    case 'revertLast':
       description =
         localization.value.snapshots.revertToSnapshotDescription.replace(
           '{0}',

package/components/common/vm/snapshots/modals/confirm/Old.vue

@@ -8,7 +8,7 @@
     @submit="onConfirm"
   >
     <template #modalBody>
-      <div v-if="props.type === 'revert'">
+      <div v-if="props.type === 'revert' || props.type === 'revertLast'">
         <p class="description-text" data-id="description-revert-content">
           {{ descriptionRevertContent }}
         </p>

package/components/common/vm/snapshots/modals/confirm/lib/models/enums.ts

@@ -2,6 +2,7 @@ export enum UI_E_TitleConfirmModal {
   'take' = '',
   'edit' = 'edit',
   'revert' = 'revert',
+  'revertLast' = 'revert',
   'delete' = 'delete',
   'delete_all' = 'deleteAll',
   'group_delete_all' = 'deleteAll',
@@ -12,6 +13,7 @@ export enum UI_E_TitleModal {
   'take' = '',
   'edit' = '',
   'revert' = 'revertToSnapshot',
+  'revertLast' = 'revertLatestSnapshot',
   'delete' = 'deleteSnapshot',
   'delete_all' = 'deleteAllSnapshots',
   'group_delete_all' = 'deleteAllSnapshots',