bfg-common 1.5.633 → 1.5.635

package/assets/scss/components/auth.scss

@@ -4,6 +4,7 @@
   @include flex($dir: column);
   height: calc(100vh - 44px);
   background-color: #fafafa;
+  overflow: auto;
   &__content {
     display: grid;
     grid-template-columns: 544px auto;

package/components/common/monitor/overview/filters/Filters.vue

@@ -1,169 +1,169 @@
-<template>
-  <common-monitor-overview-filters-new
-    v-if="isNewView"
-    v-model:selected-period="selectedPeriod"
-    v-model:selected-view="selectedView"
-    :disabled-period-options="disabledPeriodOptions"
-    :period-options="periodOptions"
-    :is-show-custom-interval-button="isShowCustomIntervalButton"
-    :chart-title-date="chartTitleDate"
-    :view-options="viewOptions"
-    :valid-date-end="props.validDateEnd"
-    :is-show-interval-modal="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :current-lang="props.currentLang"
-    :selected-node-name="props.selectedNodeName"
-    @submit-interval-modal="onSubmitIntervalModal"
-    @show-interval-modal="onShowIntervalModal"
-    @hide-interval-modal="onHideIntervalModal"
-  />
-  <common-monitor-overview-filters-old
-    v-else
-    v-model:selected-period="selectedPeriod"
-    v-model:selected-view="selectedView"
-    :disabled-period-options="disabledPeriodOptions"
-    :period-options="periodOptions"
-    :is-show-custom-interval-button="isShowCustomIntervalButton"
-    :chart-title-date="chartTitleDate"
-    :view-options="viewOptions"
-    :valid-date-end="props.validDateEnd"
-    :is-show-interval-modal="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :current-lang="props.currentLang"
-    :selected-node-name="props.selectedNodeName"
-    @submit-interval-modal="onSubmitIntervalModal"
-    @show-interval-modal="onShowIntervalModal"
-    @hide-interval-modal="onHideIntervalModal"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
-import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
-import {
-  periodFunc,
-  viewFunc,
-} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
-import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
-
-const { $formattedDatetime, $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const props = withDefaults(
-  defineProps<{
-    startDate: number
-    endDate: number
-    chartType: 'spline' | 'pie'
-    view: UI_T_OverviewViewType
-    selectedPeriods: number[]
-    currentLang: string
-    validDateEnd: number
-    selectedNodeName: string
-    timeFormat?: string
-    project?: UI_T_Project
-  }>(),
-  {
-    timeFormat: '',
-    project: undefined,
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
-  (event: 'update-custom-date', value: number[]): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedPeriod = ref<string>('')
-const periodOptions = computed<UI_I_OptionItem[]>(() =>
-  periodFunc(localization.value)
-)
-watch(
-  () => periodOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedPeriod.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const isShowCustomIntervalButton = computed<boolean>(
-  () => selectedPeriod.value === 'custom_interval'
-)
-
-const isShowIntervalModal = ref<boolean>(false)
-const onShowIntervalModal = (): void => {
-  isShowIntervalModal.value = true
-}
-const onHideIntervalModal = (): void => {
-  isShowIntervalModal.value = false
-}
-const onSubmitIntervalModal = (customDates: number[]): void => {
-  customDatesData.value = customDates
-  sendUpdatedFilters()
-  onHideIntervalModal()
-  emits('update-custom-date', customDates)
-}
-
-const chartTitleDate = computed<string>(() => {
-  const startValue = props.startDate
-  const endValue = props.endDate
-  if (!startValue && !endValue) return ''
-
-  const start = $formattedDatetime(startValue, {
-    hasSeconds: true,
-    timeFormat: props.timeFormat,
-  })
-
-  const end = $formattedDatetime(endValue, {
-    hasSeconds: true,
-    timeFormat: props.timeFormat,
-  })
-
-  return `${start} - ${end}`
-})
-
-// const disabledPeriodOptions = computed<boolean>(
-//   () => props.chartType === 'pie' || !chartTitleDate.value
-// )
-
-const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
-
-const selectedView = ref<string>('')
-const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.view, props.project)
-)
-watch(
-  () => viewOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedView.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const customDatesData = ref<number[]>([])
-const sendUpdatedFilters = (): void => {
-  const currentPeriod =
-    selectedPeriod.value === 'custom_interval'
-      ? customDatesData.value
-      : getValidDateByOptionFunc(selectedPeriod.value)
-  const filters: UI_I_MonitorGraphPayload = {
-    period: currentPeriod,
-    view: selectedView.value,
-    periodName: selectedPeriod.value,
-  }
-
-  emits('update-filters', filters)
-}
-watch(
-  () => [selectedPeriod.value, selectedView.value],
-  () => {
-    sendUpdatedFilters()
-  }
-)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-monitor-overview-filters-new
+    v-if="isNewView"
+    v-model:selected-period="selectedPeriod"
+    v-model:selected-view="selectedView"
+    :disabled-period-options="disabledPeriodOptions"
+    :period-options="periodOptions"
+    :is-show-custom-interval-button="isShowCustomIntervalButton"
+    :chart-title-date="chartTitleDate"
+    :view-options="viewOptions"
+    :valid-date-end="props.validDateEnd"
+    :is-show-interval-modal="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :current-lang="props.currentLang"
+    :selected-node-name="props.selectedNodeName"
+    @submit-interval-modal="onSubmitIntervalModal"
+    @show-interval-modal="onShowIntervalModal"
+    @hide-interval-modal="onHideIntervalModal"
+  />
+  <common-monitor-overview-filters-old
+    v-else
+    v-model:selected-period="selectedPeriod"
+    v-model:selected-view="selectedView"
+    :disabled-period-options="disabledPeriodOptions"
+    :period-options="periodOptions"
+    :is-show-custom-interval-button="isShowCustomIntervalButton"
+    :chart-title-date="chartTitleDate"
+    :view-options="viewOptions"
+    :valid-date-end="props.validDateEnd"
+    :is-show-interval-modal="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :current-lang="props.currentLang"
+    :selected-node-name="props.selectedNodeName"
+    @submit-interval-modal="onSubmitIntervalModal"
+    @show-interval-modal="onShowIntervalModal"
+    @hide-interval-modal="onHideIntervalModal"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
+import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import {
+  periodFunc,
+  viewFunc,
+} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
+import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
+
+const { $formattedDatetime, $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const props = withDefaults(
+  defineProps<{
+    startDate: number
+    endDate: number
+    chartType: 'spline' | 'pie'
+    view: UI_T_OverviewViewType
+    selectedPeriods: number[]
+    currentLang: string
+    validDateEnd: number
+    selectedNodeName: string
+    timeFormat?: string
+    project?: UI_T_Project
+  }>(),
+  {
+    timeFormat: '',
+    project: undefined,
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
+  (event: 'update-custom-date', value: number[]): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedPeriod = ref<string>('')
+const periodOptions = computed<UI_I_OptionItem[]>(() =>
+  periodFunc(localization.value)
+)
+watch(
+  () => periodOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedPeriod.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const isShowCustomIntervalButton = computed<boolean>(
+  () => selectedPeriod.value === 'custom_interval'
+)
+
+const isShowIntervalModal = ref<boolean>(false)
+const onShowIntervalModal = (): void => {
+  isShowIntervalModal.value = true
+}
+const onHideIntervalModal = (): void => {
+  isShowIntervalModal.value = false
+}
+const onSubmitIntervalModal = (customDates: number[]): void => {
+  customDatesData.value = customDates
+  sendUpdatedFilters()
+  onHideIntervalModal()
+  emits('update-custom-date', customDates)
+}
+
+const chartTitleDate = computed<string>(() => {
+  const startValue = props.startDate
+  const endValue = props.endDate
+  if (!startValue && !endValue) return ''
+
+  const start = $formattedDatetime(startValue, {
+    hasSeconds: true,
+    timeFormat: props.timeFormat,
+  })
+
+  const end = $formattedDatetime(endValue, {
+    hasSeconds: true,
+    timeFormat: props.timeFormat,
+  })
+
+  return `${start} - ${end}`
+})
+
+// const disabledPeriodOptions = computed<boolean>(
+//   () => props.chartType === 'pie' || !chartTitleDate.value
+// )
+
+const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
+
+const selectedView = ref<string>('')
+const viewOptions = computed<UI_I_OptionItem[]>(() =>
+  viewFunc(localization.value, props.view, props.project)
+)
+watch(
+  () => viewOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedView.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const customDatesData = ref<number[]>([])
+const sendUpdatedFilters = (): void => {
+  const currentPeriod =
+    selectedPeriod.value === 'custom_interval'
+      ? customDatesData.value
+      : getValidDateByOptionFunc(selectedPeriod.value)
+  const filters: UI_I_MonitorGraphPayload = {
+    period: currentPeriod,
+    view: selectedView.value,
+    periodName: selectedPeriod.value,
+  }
+
+  emits('update-filters', filters)
+}
+watch(
+  () => [selectedPeriod.value, selectedView.value],
+  () => {
+    sendUpdatedFilters()
+  }
+)
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/pages/home/widgets/warnings/table/lib/models/enums.ts

@@ -3,6 +3,7 @@ export enum UI_E_TabsByTypeEnum { // TODO если есть другой так
   'datacenter' = 'h',
   'folder' = 'h',
   'cluster' = 'h',
+  'zonedir' = 'h',
   // для прокуратор
   'host' = 'h',
   'vm' = 'v',

package/components/common/split/horizontal/{HorizontalNew.vue → New.vue}

@@ -337,6 +337,7 @@ onUnmounted(() => {
     background-color: var(--new-gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/split/horizontal/{HorizontalOld.vue → Old.vue}

@@ -289,6 +289,7 @@ onUnmounted(() => {
     background-color: var(--gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/split/vertical/{VerticalNew.vue → New.vue}

@@ -76,6 +76,7 @@ const props = defineProps<{
     background-color: var(--gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/split/vertical/{VerticalOld.vue → Old.vue}

@@ -65,6 +65,7 @@ const props = defineProps<{
     background-color: var(--gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

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

@@ -5,6 +5,7 @@
     :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)"
@@ -74,7 +75,7 @@
               test-id="computed-resource-alert"
               type="error"
               size="md"
-              class="subtitle-block__alert"
+              class="subtitle-block__alert mb-4"
             />
             <ui-wizard-subtitle
               :sub-title="
@@ -131,6 +132,7 @@ import type {
   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'
@@ -208,8 +210,19 @@ const currentSubtitleSelectNameBlock = ref<string>(
     ? localization.value.vmWizard.specifyUniqueNameAndTargetLocationForVm
     : localization.value.common.specifyUniqueNameForVm
 )
+
+const initialCompare = compare(vmForm)
+const hasChanges = computed<boolean>(() => initialCompare.getDiff(vmForm.value))
 </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;
@@ -217,6 +230,9 @@ const currentSubtitleSelectNameBlock = ref<string>(
   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: 40px;
 

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

@@ -1,313 +1,313 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model="vmForm"
-    v-model:location="location"
-    :project="props.project"
-    :ready-complete-table-info="props.readyCompleteTableInfo"
-    :name-request-url="props.nameRequestUrl"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :dynamic-steps="dynamicSteps"
-    :name-form-submit="nameFormSubmit"
-    :name-test-ids="nameTestIds"
-    :allowed-location-kinds="allowedLocationKinds"
-    :location-description="locationDescription"
-    :is-sphere="isSphere"
-    :compute-resource-tree-local="computeResourceTreeLocal"
-    :compatibility-text="compatibilityText"
-    :is-loading-compute-tree="isLoadingComputeTree"
-    :compute-resource-alert="computeResourceAlert"
-    :location-nodes="props.locationNodes"
-    @finish="emits('finish')"
-    @hide="emits('hide')"
-    @change-steps="onChangeSteps"
-    @change-name="onChangeName(...$event)"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type { UI_I_ValidationReturn } 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 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'
-import {
-  dynamicSteps,
-  stepsFunc,
-  stepsSchemeInitial,
-} from '~/components/common/vm/actions/register/lib/config/steps'
-import { allowedLocationKinds } from '~/components/common/vm/actions/register/lib/config'
-
-const vmForm = defineModel<any>({ required: true })
-
-const props = withDefaults(
-  defineProps<{
-    project: UI_T_Project
-    readyCompleteTableInfo: UI_I_TableInfoItem[]
-    nameRequestUrl: string
-    isLoadingComputeTree?: boolean // для сферы
-    computeResourceAlert?: string[] // для сферы
-    dataCenter?: UI_I_TreeNode | null // для сферы
-    computeResourceTree?: UI_I_TreeNode[] // для сферы
-    locationNodes?: UI_I_TreeNode[] // для сферы
-  }>(),
-  {
-    isLoadingComputeTree: false,
-    computeResourceAlert: () => [],
-    dataCenter: null,
-    computeResourceTree: undefined,
-    locationNodes: () => [],
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'finish'): void
-  (event: 'hide'): void
-  (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void // для сферы
-  (
-    event: 'get-compute-resource-tree',
-    value: { id: string | number; cb: () => void }
-  ): void // для сферы
-}>()
-
-const { $store, $recursion }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const isSphere = computed<boolean>(() => props.project === 'sphere')
-
-const location = ref<UI_I_TreeNode | null>(props.dataCenter) // для сферы
-
-const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial
-)
-if (isSphere.value) {
-  wizard.changeScheme(1)
-  wizard.selectStepHard(1)
-}
-
-const locationDescription = computed<string>(
-  () => localization.value.common.selectLocationVirtualMachine
-)
-
-const nameTestIds: UI_I_NameTestIds = {
-  name: 'virtual-machine-name',
-  helpIcon: 'show-vm-name-help-icon',
-}
-
-const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
-const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
-  wizard.changeSteps(value, validationFunc)
-}
-const validationFunc = async (
-  value: UI_I_WizardStep[],
-  currentStep: UI_I_WizardStep,
-  nextStep: UI_I_WizardStep
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-  let stepShouldStop = {
-    ifOnCurrentStep: false,
-    ifFromAnyStep: false,
-    stoppageStepId: -1,
-  }
-
-  wizard.setLoader(true)
-  if (
-    wizard.isValidateForStep(
-      isSphere.value ? dynamicSteps.selectNameFolder : dynamicSteps.selectName,
-      currentStep.id,
-      nextStep.id
-    )
-  ) {
-    const nameValidation = await onCheckName(value)
-
-    value = nameValidation.newValue
-    stepHasError = stepHasError || nameValidation.stepHasError
-  } else if (
-    isSphere.value &&
-    wizard.isValidateForStep(
-      dynamicSteps.selectComputeResource,
-      currentStep.id,
-      nextStep.id
-    )
-  ) {
-    const computeResourceValidation = await checkComputeResource(value)
-
-    value = computeResourceValidation.newValue
-    stepHasError = stepHasError || computeResourceValidation.stepHasError
-  }
-  wizard.setLoader(false)
-
-  return {
-    newValue: value,
-    stepHasError,
-    stepShouldStop,
-  }
-}
-
-const nameFormSubmit = ref<null | Function>(null)
-const onCheckName = async (
-  value: UI_I_WizardStep[]
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-
-  return new Promise((resolve) => {
-    const step = isSphere.value
-      ? dynamicSteps.selectNameFolder
-      : dynamicSteps.selectName
-    nameFormSubmit.value = (isValid: boolean) => {
-      if (!isValid) {
-        stepHasError = wizard.setValidation(step, 'name', {
-          fieldMessage: 'aaa',
-          alertMessage: 'aaa',
-        })
-      } else if (wizard.hasMessage(step, 'name')) {
-        value = wizard.removeValidation(step, 'name', value)
-      }
-
-      resolve({
-        stepHasError,
-        newValue: value,
-      })
-      nameFormSubmit.value = null
-    }
-  })
-}
-const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
-  const { computeResource } = vmForm.value
-
-  if (!computeResource)
-    return [
-      'none',
-      localization.value.vmWizard.noDestinationComputeResourceSelected,
-    ]
-
-  let res: [UI_T_CompatibilityStatus, string] = [
-    'success',
-    localization.value.common.compatibilityChecksSucceeded,
-  ]
-
-  if (!['cluster', 'host', 'resource_pool'].includes(computeResource?.type)) {
-    res = [
-      'error',
-      localization.value.common.selectValidClusterOrHostDestination,
-    ]
-  }
-  if (computeResource?.type === 'cluster') {
-    const hasHost = !!computeResource.nodes.length
-    if (!hasHost) {
-      res = ['error', localization.value.common.clusterNotContainAnyHosts]
-    }
-  }
-
-  if (computeResource?.type === 'host') {
-    if (computeResource.state === 'Error') {
-      // TODO check Maintenance Mode
-      res = [
-        'error',
-        localization.value.common.selectedHostDisconnectedMaintenanceMode,
-      ]
-    }
-  }
-
-  return res
-})
-const computeResourceAlert = ref<string[]>([])
-const checkComputeResource = (
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  const { computeResource } = vmForm.value
-
-  if (
-    !computeResource ||
-    // compatibilityText.value[0] !== 1 ||
-    computeResource.type === 'datacenter' ||
-    computeResource.type === 'folder' ||
-    (computeResource.type === 'cluster' && !computeResource.nodes.length)
-  ) {
-    computeResourceAlert.value = [
-      localization.value.common.specifyValidClusterOrHostDestination,
-    ]
-    stepHasError = wizard.setValidation(
-      dynamicSteps.selectComputeResource,
-      'computeResource',
-      {
-        fieldMessage: 'aaa',
-        alertMessage: 'aaa',
-      }
-    )
-  } else {
-    computeResourceAlert.value = []
-    if (
-      wizard.hasMessage(dynamicSteps.selectComputeResource, 'computeResource')
-    ) {
-      value = wizard.removeValidation(
-        dynamicSteps.selectComputeResource,
-        'computeResource',
-        value
-      )
-    }
-  }
-
-  return {
-    stepHasError,
-    newValue: value,
-  }
-}
-
-const isLoadingComputeTree = ref<boolean>(false)
-const onChangeName = (name: string, node: UI_I_TreeNode | null): void => {
-  vmForm.value.name = name
-  if (isSphere.value) {
-    vmForm.value.locationPath = node.id
-    vmForm.value.dataCenter = $recursion.findParentByValue(
-      node,
-      'datacenter',
-      'type',
-      'parent'
-    )
-    isLoadingComputeTree.value = true
-    emits('get-compute-resource-tree', {
-      id: node.id,
-      cb: () => {
-        isLoadingComputeTree.value = false
-      },
-    })
-  }
-}
-
-watch(
-  () => vmForm.value.computeResource,
-  (newValue, oldValue) => {
-    if (newValue && newValue.id !== oldValue?.id) {
-      onSelectComputeResourceTree(newValue)
-    }
-  },
-  { deep: true }
-)
-const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
-  emits('select-compute-resource-tree', node)
-}
-
-const computeResourceTreeLocal = computed<UI_I_TreeNode[]>(() => {
-  // для сферы
-  return props.computeResourceTree || []
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    v-model="vmForm"
+    v-model:location="location"
+    :project="props.project"
+    :ready-complete-table-info="props.readyCompleteTableInfo"
+    :name-request-url="props.nameRequestUrl"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :dynamic-steps="dynamicSteps"
+    :name-form-submit="nameFormSubmit"
+    :name-test-ids="nameTestIds"
+    :allowed-location-kinds="allowedLocationKinds"
+    :location-description="locationDescription"
+    :is-sphere="isSphere"
+    :compute-resource-tree-local="computeResourceTreeLocal"
+    :compatibility-text="compatibilityText"
+    :is-loading-compute-tree="isLoadingComputeTree"
+    :compute-resource-alert="computeResourceAlert"
+    :location-nodes="props.locationNodes"
+    @finish="emits('finish')"
+    @hide="emits('hide')"
+    @change-steps="onChangeSteps"
+    @change-name="onChangeName(...$event)"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type { UI_I_ValidationReturn } 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 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'
+import {
+  dynamicSteps,
+  stepsFunc,
+  stepsSchemeInitial,
+} from '~/components/common/vm/actions/register/lib/config/steps'
+import { allowedLocationKinds } from '~/components/common/vm/actions/register/lib/config'
+
+const vmForm = defineModel<any>({ required: true })
+
+const props = withDefaults(
+  defineProps<{
+    project: UI_T_Project
+    readyCompleteTableInfo: UI_I_TableInfoItem[]
+    nameRequestUrl: string
+    isLoadingComputeTree?: boolean // для сферы
+    computeResourceAlert?: string[] // для сферы
+    dataCenter?: UI_I_TreeNode | null // для сферы
+    computeResourceTree?: UI_I_TreeNode[] // для сферы
+    locationNodes?: UI_I_TreeNode[] // для сферы
+  }>(),
+  {
+    isLoadingComputeTree: false,
+    computeResourceAlert: () => [],
+    dataCenter: null,
+    computeResourceTree: undefined,
+    locationNodes: () => [],
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'finish'): void
+  (event: 'hide'): void
+  (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void // для сферы
+  (
+    event: 'get-compute-resource-tree',
+    value: { id: string | number; cb: () => void }
+  ): void // для сферы
+}>()
+
+const { $store, $recursion }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const isSphere = computed<boolean>(() => props.project === 'sphere')
+
+const location = ref<UI_I_TreeNode | null>(props.dataCenter) // для сферы
+
+const wizard: Wizard = new Wizard(
+  stepsFunc(localization.value, props.project),
+  stepsSchemeInitial
+)
+if (isSphere.value) {
+  wizard.changeScheme(1)
+  // wizard.selectStepHard(1)
+}
+
+const locationDescription = computed<string>(
+  () => localization.value.common.selectLocationVirtualMachine
+)
+
+const nameTestIds: UI_I_NameTestIds = {
+  name: 'virtual-machine-name',
+  helpIcon: 'show-vm-name-help-icon',
+}
+
+const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
+const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
+  wizard.changeSteps(value, validationFunc)
+}
+const validationFunc = async (
+  value: UI_I_WizardStep[],
+  currentStep: UI_I_WizardStep,
+  nextStep: UI_I_WizardStep
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+  let stepShouldStop = {
+    ifOnCurrentStep: false,
+    ifFromAnyStep: false,
+    stoppageStepId: -1,
+  }
+
+  wizard.setLoader(true)
+  if (
+    wizard.isValidateForStep(
+      isSphere.value ? dynamicSteps.selectNameFolder : dynamicSteps.selectName,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const nameValidation = await onCheckName(value)
+
+    value = nameValidation.newValue
+    stepHasError = stepHasError || nameValidation.stepHasError
+  } else if (
+    isSphere.value &&
+    wizard.isValidateForStep(
+      dynamicSteps.selectComputeResource,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const computeResourceValidation = await checkComputeResource(value)
+
+    value = computeResourceValidation.newValue
+    stepHasError = stepHasError || computeResourceValidation.stepHasError
+  }
+  wizard.setLoader(false)
+
+  return {
+    newValue: value,
+    stepHasError,
+    stepShouldStop,
+  }
+}
+
+const nameFormSubmit = ref<null | Function>(null)
+const onCheckName = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  return new Promise((resolve) => {
+    const step = isSphere.value
+      ? dynamicSteps.selectNameFolder
+      : dynamicSteps.selectName
+    nameFormSubmit.value = (isValid: boolean) => {
+      if (!isValid) {
+        stepHasError = wizard.setValidation(step, 'name', {
+          fieldMessage: 'aaa',
+          alertMessage: 'aaa',
+        })
+      } else if (wizard.hasMessage(step, 'name')) {
+        value = wizard.removeValidation(step, 'name', value)
+      }
+
+      resolve({
+        stepHasError,
+        newValue: value,
+      })
+      nameFormSubmit.value = null
+    }
+  })
+}
+const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
+  const { computeResource } = vmForm.value
+
+  if (!computeResource)
+    return [
+      'none',
+      localization.value.vmWizard.noDestinationComputeResourceSelected,
+    ]
+
+  let res: [UI_T_CompatibilityStatus, string] = [
+    'success',
+    localization.value.common.compatibilityChecksSucceeded,
+  ]
+
+  if (!['cluster', 'host', 'resource_pool'].includes(computeResource?.type)) {
+    res = [
+      'error',
+      localization.value.common.selectValidClusterOrHostDestination,
+    ]
+  }
+  if (computeResource?.type === 'cluster') {
+    const hasHost = !!computeResource.nodes.length
+    if (!hasHost) {
+      res = ['error', localization.value.common.clusterNotContainAnyHosts]
+    }
+  }
+
+  if (computeResource?.type === 'host') {
+    if (computeResource.state === 'Error') {
+      // TODO check Maintenance Mode
+      res = [
+        'error',
+        localization.value.common.selectedHostDisconnectedMaintenanceMode,
+      ]
+    }
+  }
+
+  return res
+})
+const computeResourceAlert = ref<string[]>([])
+const checkComputeResource = (
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  const { computeResource } = vmForm.value
+
+  if (
+    !computeResource ||
+    // compatibilityText.value[0] !== 1 ||
+    computeResource.type === 'datacenter' ||
+    computeResource.type === 'folder' ||
+    (computeResource.type === 'cluster' && !computeResource.nodes.length)
+  ) {
+    computeResourceAlert.value = [
+      localization.value.common.specifyValidClusterOrHostDestination,
+    ]
+    stepHasError = wizard.setValidation(
+      dynamicSteps.selectComputeResource,
+      'computeResource',
+      {
+        fieldMessage: 'aaa',
+        alertMessage: 'aaa',
+      }
+    )
+  } else {
+    computeResourceAlert.value = []
+    if (
+      wizard.hasMessage(dynamicSteps.selectComputeResource, 'computeResource')
+    ) {
+      value = wizard.removeValidation(
+        dynamicSteps.selectComputeResource,
+        'computeResource',
+        value
+      )
+    }
+  }
+
+  return {
+    stepHasError,
+    newValue: value,
+  }
+}
+
+const isLoadingComputeTree = ref<boolean>(false)
+const onChangeName = (name: string, node: UI_I_TreeNode | null): void => {
+  vmForm.value.name = name
+  if (isSphere.value) {
+    vmForm.value.locationPath = node.id
+    vmForm.value.dataCenter = $recursion.findParentByValue(
+      node,
+      'datacenter',
+      'type',
+      'parent'
+    )
+    isLoadingComputeTree.value = true
+    emits('get-compute-resource-tree', {
+      id: node.id,
+      cb: () => {
+        isLoadingComputeTree.value = false
+      },
+    })
+  }
+}
+
+watch(
+  () => vmForm.value.computeResource,
+  (newValue, oldValue) => {
+    if (newValue && newValue.id !== oldValue?.id) {
+      onSelectComputeResourceTree(newValue)
+    }
+  },
+  { deep: true }
+)
+const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
+  emits('select-compute-resource-tree', node)
+}
+
+const computeResourceTreeLocal = computed<UI_I_TreeNode[]>(() => {
+  // для сферы
+  return props.computeResourceTree || []
+})
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/register/lib/config/steps.ts

@@ -1,86 +1,94 @@
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const dynamicSteps = {
-  selectName: 0,
-  selectNameFolder: 1,
-  selectComputeResource: 2,
-  readyComplete: 3,
-}
-
-export const stepsFunc = (
-  localization: UI_I_Localization
-): UI_I_WizardStep[] => {
-  return [
-    // Procurator
-    {
-      id: dynamicSteps.selectName,
-      stepName: '',
-      title: localization.common.selectName,
-      subTitle: localization.common.specifyUniqueName,
-      status: UI_E_WIZARD_STATUS.SELECTED,
-      isValid: true,
-      testId: 'vm-select-name',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    // Sphere
-    {
-      id: dynamicSteps.selectNameFolder,
-      stepName: '',
-      title: localization.vmWizard.selectNameFolder,
-      subTitle: localization.common.specifyUniqueNameTargetLocation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-select-name-folder',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    // Sphere
-    {
-      id: dynamicSteps.selectComputeResource,
-      stepName: '',
-      title: localization.vmWizard.selectComputeResource,
-      subTitle: localization.common.selectDestinationComputeResourceOperation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-select-compute-resource',
-      fields: {
-        computeResource: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.readyComplete,
-      stepName: '',
-      title: localization.vmWizard.readyComplete,
-      subTitle: localization.vmWizard.lastCreateSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-ready-complete',
-      fields: {},
-    },
-  ]
-}
-
-export const stepsSchemeInitial = [
-  // 0 Procurator
-  [dynamicSteps.selectName, dynamicSteps.readyComplete],
-  // 1 Sphere
-  [
-    dynamicSteps.selectNameFolder,
-    dynamicSteps.selectComputeResource,
-    dynamicSteps.readyComplete,
-  ],
-]
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+export const dynamicSteps = {
+  selectName: 0,
+  selectNameFolder: 1,
+  selectComputeResource: 2,
+  readyComplete: 3,
+}
+
+export const stepsFunc = (
+  localization: UI_I_Localization,
+  project: UI_T_Project
+): UI_I_WizardStep[] => {
+  return [
+    // Procurator
+    {
+      id: dynamicSteps.selectName,
+      stepName: '',
+      title: localization.common.selectName,
+      subTitle: localization.common.specifyUniqueName,
+      status:
+        project === 'procurator'
+          ? UI_E_WIZARD_STATUS.SELECTED
+          : UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-name',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectNameFolder,
+      stepName: '',
+      title: localization.vmWizard.selectNameFolder,
+      subTitle: localization.common.specifyUniqueNameTargetLocation,
+      status:
+        project === 'procurator'
+          ? UI_E_WIZARD_STATUS.INACTIVE
+          : UI_E_WIZARD_STATUS.SELECTED,
+      isValid: true,
+      testId: 'vm-select-name-folder',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectComputeResource,
+      stepName: '',
+      title: localization.vmWizard.selectComputeResource,
+      subTitle: localization.common.selectDestinationComputeResourceOperation,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-compute-resource',
+      fields: {
+        computeResource: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.readyComplete,
+      stepName: '',
+      title: localization.vmWizard.readyComplete,
+      subTitle: localization.vmWizard.lastCreateSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-ready-complete',
+      fields: {},
+    },
+  ]
+}
+
+export const stepsSchemeInitial = [
+  // 0 Procurator
+  [dynamicSteps.selectName, dynamicSteps.readyComplete],
+  // 1 Sphere
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.readyComplete,
+  ],
+]

package/lib/models/store/tasks/interfaces.ts

@@ -75,6 +75,7 @@ export interface UI_I_RecentTaskItem<T, E = any> {
   statusText: string
   statusDetails: UI_T_TaskStatusDetails
   target: string
+  targetName: string
   targetType: T
   taskName: string
   id: string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.633",
+  "version": "1.5.635",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.0.531",
+    "bfg-uikit": "1.0.533",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/store/tasks/mappers/recentTasks.ts

@@ -45,8 +45,8 @@ export const recentTasks = (
           execution = '--'
           queuedFor = 0
           startTime = Date.now() / 1000 + ''
-          // Обрабатываем данные когда задачка в работе
-        } else if (task.status === 1) {
+          // Обрабатываем данные когда задачка в работе или когда в статусе retry
+        } else if (task.status === 1 || task.status === 5) {
           completion = '--'
           execution = '--'
         }
@@ -86,6 +86,9 @@ export const recentTasks = (
             break
         }
 
+        const targetName = task.extra.target_name || '--'
+        const targetType = task.extra.target_type || task.target_type
+
         return {
           args,
           completion,
@@ -103,7 +106,9 @@ export const recentTasks = (
           status: task.status,
           statusDetails: operations,
           target: task.target,
-          targetType: task.target_type,
+          targetName,
+          targetType,
+          // targetType: task.target_type,
           taskName: task.task_name,
           id: task.id,
           zone: task.zone,