bfg-common 1.5.490 → 1.5.492

package/components/common/backup/storage/actions/add/Add.vue

@@ -1,248 +1,251 @@
-<template>
-  <common-backup-storage-actions-add-new
-    v-if="isNewView"
-    v-model="form"
-    :project="props.project"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :alert-messages="alertMessages"
-    :title="title"
-    :hosts="props.hosts"
-    :datastore="props.datastore"
-    :is-datastore-loading="props.isDatastoreLoading"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    @change-steps="onChangeSteps"
-    @change-storage="onChangeStorage"
-    @submit="onCreate"
-    @hide="onHideModal"
-  />
-  <common-backup-storage-actions-add-old
-    v-else
-    v-model="form"
-    :project="props.project"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :alert-messages="alertMessages"
-    :title="title"
-    :hosts="props.hosts"
-    :datastore="props.datastore"
-    :is-datastore-loading="props.isDatastoreLoading"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    @change-steps="onChangeSteps"
-    @change-storage="onChangeStorage"
-    @submit="onCreate"
-    @hide="onHideModal"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_ValidationReturn,
-  UI_I_WizardStep,
-} 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_T_Project } from '~/lib/models/types'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_DatastoreTypeCode } from '~/components/common/backup/storage/actions/add/lib/models/types'
-// TODO use from uikit
-import {
-  stepsFunc,
-  stepsSchemeInitial,
-} from '~/components/common/backup/storage/actions/add/lib/config/steps'
-import { datastoreDefaultFormFunc } from '~/components/common/backup/storage/actions/add/lib/config/createDatastore'
-import {
-  dynamicSteps,
-  getStepScheme,
-} from '~/components/common/backup/storage/actions/add/lib/config/steps'
-import * as validation from '~/components/common/backup/storage/actions/add/lib/validations'
-
-const props = withDefaults(
-  defineProps<{
-    project: UI_T_Project
-    datastore: UI_I_DatastoreTableItem[]
-    isDatastoreLoading: boolean
-    getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-    hosts?: any[]
-  }>(),
-  { hosts: [] }
-)
-const emits = defineEmits<{
-  (event: 'create', value: UI_I_CreateDatastoreForm): void
-  (event: 'hide'): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const title = ref(localization.value.common.newBackupStorage)
-
-const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial
-)
-
-const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
-const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
-
-const form = ref<UI_I_CreateDatastoreForm>(
-  useDeepCopy(datastoreDefaultFormFunc())
-)
-
-const validationFunc = async (
-  value: UI_I_WizardStep[],
-  currentStep: UI_I_WizardStep,
-  nextStep: UI_I_WizardStep
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-
-  if (
-    wizard.isValidateForStep(dynamicSteps.name, currentStep.id, nextStep.id)
-  ) {
-    const nameValidation = await validation.checkDatastoreNameAsync(
-      localization.value,
-      value,
-      form.value,
-      dynamicSteps.name,
-      'name',
-      wizard,
-      props.project
-    )
-
-    value = nameValidation.newValue
-
-    stepHasError = nameValidation.stepHasError
-  }
-
-  if (
-    wizard.isValidateForStep(
-      dynamicSteps.nameAndConfigure,
-      currentStep.id,
-      nextStep.id
-    )
-  ) {
-    const nameValidation = await validation.checkDatastoreNameAsync(
-      localization.value,
-      value,
-      form.value,
-      dynamicSteps.nameAndConfigure,
-      'name',
-      wizard,
-      props.project
-    )
-    value = nameValidation.newValue
-
-    const folderValidation = validation.checkFolderSync(
-      localization.value,
-      form.value.folder,
-      wizard,
-      value
-    )
-    value = folderValidation.newValue
-
-    const serverValidation = validation.checkServerSync(
-      localization.value,
-      form.value.server,
-      wizard,
-      value
-    )
-    value = serverValidation.newValue
-
-    // PC-2542
-    // const usernameValidation = validation.checkUsernameSync(
-    //   localization.value,
-    //   form.value.user,
-    //   wizard,
-    //   value
-    // )
-    // value = usernameValidation.newValue
-
-    // const passwordValidation = validation.checkPasswordSync(
-    //   localization.value,
-    //   form.value.password,
-    //   wizard,
-    //   value
-    // )
-    // value = passwordValidation.newValue
-
-    stepHasError =
-      nameValidation.stepHasError ||
-      folderValidation.stepHasError ||
-      serverValidation.stepHasError
-  }
-
-  if (
-    wizard.isValidateForStep(
-      dynamicSteps.hostAccessibility,
-      currentStep.id,
-      nextStep.id
-    )
-  ) {
-    const hostsValidation = await validation.checkHostsAccessibilitySync(
-      localization.value,
-      form.value.hosts,
-      wizard,
-      value
-    )
-
-    value = hostsValidation.newValue
-
-    stepHasError = hostsValidation.stepHasError
-  }
-
-  if (
-    wizard.isValidateForStep(dynamicSteps.storage, currentStep.id, nextStep.id)
-  ) {
-    const storageValidation = await validation.checkStorageSync(
-      localization.value,
-      form.value.storm_id,
-      wizard,
-      value
-    )
-
-    value = storageValidation.newValue
-
-    stepHasError = storageValidation.stepHasError
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
-
-const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
-  wizard.changeSteps(value, validationFunc)
-
-// Choosing Scheme
-watch(
-  () => form.value.type_code,
-  (newValue: UI_T_DatastoreTypeCode) => {
-    const step = getStepScheme(props.project, newValue)
-    if (step !== undefined) {
-      wizard.changeScheme(step)
-    }
-  },
-  { immediate: true }
-)
-
-const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
-  if (!storage) return
-
-  form.value.storm_id = storage.id
-}
-
-const onCreate = async (): Promise<void> => {
-  emits('create', form.value)
-}
-
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-backup-storage-actions-add-new
+    v-if="isNewView"
+    v-model="form"
+    :project="props.project"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :alert-messages="alertMessages"
+    :title="title"
+    :hosts="props.hosts"
+    :datastore="props.datastore"
+    :is-datastore-loading="props.isDatastoreLoading"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    @change-steps="onChangeSteps"
+    @change-storage="onChangeStorage"
+    @submit="onCreate"
+    @hide="onHideModal"
+  />
+  <common-backup-storage-actions-add-old
+    v-else
+    v-model="form"
+    :project="props.project"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :alert-messages="alertMessages"
+    :title="title"
+    :hosts="props.hosts"
+    :datastore="props.datastore"
+    :is-datastore-loading="props.isDatastoreLoading"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    @change-steps="onChangeSteps"
+    @change-storage="onChangeStorage"
+    @submit="onCreate"
+    @hide="onHideModal"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} 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_T_Project } from '~/lib/models/types'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_DatastoreTypeCode } from '~/components/common/backup/storage/actions/add/lib/models/types'
+// TODO use from uikit
+import {
+  stepsFunc,
+  stepsSchemeInitial,
+} from '~/components/common/backup/storage/actions/add/lib/config/steps'
+import { datastoreDefaultFormFunc } from '~/components/common/backup/storage/actions/add/lib/config/createDatastore'
+import {
+  dynamicSteps,
+  getStepScheme,
+} from '~/components/common/backup/storage/actions/add/lib/config/steps'
+import * as validation from '~/components/common/backup/storage/actions/add/lib/validations'
+
+const props = withDefaults(
+  defineProps<{
+    project: UI_T_Project
+    datastore: UI_I_DatastoreTableItem[]
+    isDatastoreLoading: boolean
+    getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+    hosts?: any[]
+    datacenterId?: string
+  }>(),
+  { hosts: [], datacenterId: '' }
+)
+const emits = defineEmits<{
+  (event: 'create', value: UI_I_CreateDatastoreForm): void
+  (event: 'hide'): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const title = ref(localization.value.common.newBackupStorage)
+
+const wizard: Wizard = new Wizard(
+  stepsFunc(localization.value),
+  stepsSchemeInitial
+)
+
+const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
+const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
+
+const form = ref<UI_I_CreateDatastoreForm>(
+  useDeepCopy(datastoreDefaultFormFunc())
+)
+
+const validationFunc = async (
+  value: UI_I_WizardStep[],
+  currentStep: UI_I_WizardStep,
+  nextStep: UI_I_WizardStep
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  if (
+    wizard.isValidateForStep(dynamicSteps.name, currentStep.id, nextStep.id)
+  ) {
+    const nameValidation = await validation.checkDatastoreNameAsync(
+      localization.value,
+      value,
+      form.value,
+      dynamicSteps.name,
+      'name',
+      wizard,
+      props.project,
+      props.datacenterId
+    )
+
+    value = nameValidation.newValue
+
+    stepHasError = nameValidation.stepHasError
+  }
+
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.nameAndConfigure,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const nameValidation = await validation.checkDatastoreNameAsync(
+      localization.value,
+      value,
+      form.value,
+      dynamicSteps.nameAndConfigure,
+      'name',
+      wizard,
+      props.project,
+      props.datacenterId
+    )
+    value = nameValidation.newValue
+
+    const folderValidation = validation.checkFolderSync(
+      localization.value,
+      form.value.folder,
+      wizard,
+      value
+    )
+    value = folderValidation.newValue
+
+    const serverValidation = validation.checkServerSync(
+      localization.value,
+      form.value.server,
+      wizard,
+      value
+    )
+    value = serverValidation.newValue
+
+    // PC-2542
+    // const usernameValidation = validation.checkUsernameSync(
+    //   localization.value,
+    //   form.value.user,
+    //   wizard,
+    //   value
+    // )
+    // value = usernameValidation.newValue
+
+    // const passwordValidation = validation.checkPasswordSync(
+    //   localization.value,
+    //   form.value.password,
+    //   wizard,
+    //   value
+    // )
+    // value = passwordValidation.newValue
+
+    stepHasError =
+      nameValidation.stepHasError ||
+      folderValidation.stepHasError ||
+      serverValidation.stepHasError
+  }
+
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.hostAccessibility,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const hostsValidation = await validation.checkHostsAccessibilitySync(
+      localization.value,
+      form.value.hosts,
+      wizard,
+      value
+    )
+
+    value = hostsValidation.newValue
+
+    stepHasError = hostsValidation.stepHasError
+  }
+
+  if (
+    wizard.isValidateForStep(dynamicSteps.storage, currentStep.id, nextStep.id)
+  ) {
+    const storageValidation = await validation.checkStorageSync(
+      localization.value,
+      form.value.storm_id,
+      wizard,
+      value
+    )
+
+    value = storageValidation.newValue
+
+    stepHasError = storageValidation.stepHasError
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
+  wizard.changeSteps(value, validationFunc)
+
+// Choosing Scheme
+watch(
+  () => form.value.type_code,
+  (newValue: UI_T_DatastoreTypeCode) => {
+    const step = getStepScheme(props.project, newValue)
+    if (step !== undefined) {
+      wizard.changeScheme(step)
+    }
+  },
+  { immediate: true }
+)
+
+const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
+  if (!storage) return
+
+  form.value.storm_id = storage.id
+}
+
+const onCreate = async (): Promise<void> => {
+  emits('create', form.value)
+}
+
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/backup/storage/actions/add/lib/utils.ts

@@ -1,30 +1,62 @@
-import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import { UI_E_Kind } from '~/lib/models/enums'
-
-export const checkValidityName = async (
-  name: string,
-  wizard: Wizard,
-  project: UI_T_Project,
-  sendMessage: (message: string) => void
-): Promise<void> => {
-
-  wizard.setLoader(true)
-  const url =
-    project === 'procurator'
-      ? `/ui/ds/validate?name=${encodeURIComponent(name)}`
-      : `/ui/object/validate_name?name=${encodeURIComponent(name)}&kind=${UI_E_Kind.STORAGE_VALIDATION_NAME}`
-  // @ts-ignore
-  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
-    method: 'GET',
-  })
-  wizard.setLoader(false)
-
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-    sendMessage(existError)
-    return
-  }
-  sendMessage('')
-}
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import { UI_E_Kind } from '~/lib/models/enums'
+
+export const checkValidityName = async ({
+  name,
+  wizard,
+  project,
+  sendMessage,
+  datacenterId,
+}: {
+  name: string
+  wizard: Wizard
+  project: UI_T_Project
+  sendMessage: (message: string) => void
+  datacenterId?: string
+}): Promise<void> => {
+  wizard.setLoader(true)
+
+  try {
+    const url = buildValidationUrl(name, project, datacenterId)
+
+    const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+      method: 'GET',
+    })
+
+    if (
+      error?.value?.data?.error_code !== 0
+    ) {
+      const existError =
+        error.value.data?.error_message ?? String(error.value.data)
+      sendMessage(existError)
+      return
+    }
+
+    sendMessage('')
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : 'Unknown error'
+    sendMessage(msg)
+  } finally {
+    wizard.setLoader(false)
+  }
+}
+
+const buildValidationUrl = (
+  name: string,
+  project: UI_T_Project,
+  datacenterId?: string
+): string => {
+  if (project === 'procurator') {
+    const params = new URLSearchParams({ name })
+    return `/ui/ds/validate?${params.toString()}`
+  }
+
+  const params = new URLSearchParams()
+  params.set('name', name)
+  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
+  if (datacenterId) params.set('datacenter', datacenterId)
+
+  return `/ui/object/validate_name?${params.toString()}`
+}

package/components/common/backup/storage/actions/add/lib/validations.ts

@@ -14,15 +14,22 @@ const checkName = async (
   form: UI_I_CreateDatastoreForm,
   localization: UI_I_Localization,
   wizard: Wizard,
-  project: UI_T_Project
+  project: UI_T_Project,
+  datacenterId?: string
 ): Promise<UI_I_AsyncCheckReturn> => {
   if (form.name) {
     return new Promise((resolve, _reject) =>
-      checkValidityName(form.name, wizard, project, (message: string) => {
-        resolve({
-          isValid: message === '',
-          message: message === '' ? '' : message,
-        })
+      checkValidityName({
+        name: form.name,
+        wizard,
+        project,
+        datacenterId,
+        sendMessage: (message: string) => {
+          resolve({
+            isValid: message === '',
+            message: message === '' ? '' : message,
+          })
+        },
       })
     )
   } else {
@@ -39,14 +46,15 @@ export const checkDatastoreNameAsync = async (
   stepId: number,
   fieldName: string,
   wizard: Wizard,
-  project: UI_T_Project
+  project: UI_T_Project,
+  datacenterId?: string
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkName(form, localization, wizard, project)
+  } = await checkName(form, localization, wizard, project, datacenterId)
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {

package/components/common/vm/actions/add/Add.vue

@@ -297,7 +297,7 @@ const selectedCreateType = ref<string>('0')
 if (props.isVmt) selectedCreateType.value = '-1'
 
 const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value, props.isVmt),
+  stepsFunc(localization.value, props.isVmt, isSphere.value),
   stepsSchemeInitial
 )
 watch(
@@ -311,7 +311,7 @@ watch(
         wizard.changeScheme(isSphere.value ? 6 : 2)
         break
       case '-1':
-        wizard.changeScheme(10)
+        wizard.changeScheme(isSphere.value ? 11 : 10)
         break
     }
   },

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

@@ -71,7 +71,7 @@
               selectedStep.id === dynamicSteps.selectNameFolder
             "
             :name-form-submit="props.nameFormSubmit"
-            :project="props.project"
+            :has-location="props.project === 'sphere'"
             :is-vmt="props.isVmt"
             :data-center="props.dataCenter"
             :validate-empty-name="props.validateEmptyName"