bfg-common 1.5.490 → 1.5.492

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

@@ -29,7 +29,7 @@
               selectedStep.id === dynamicSteps.selectNameFolder
             "
             :name-form-submit="nameFormSubmit"
-            :project="props.project"
+            :has-location="props.project === 'sphere'"
             :data-center="props.dataCenter"
             @submit="onChangeName(...$event)"
             @check-name="emits('check-name', $event)"

package/components/common/vm/actions/clone/toTemplate/ToTemplate.vue

@@ -27,7 +27,7 @@
             v-show="selectedStep.id === dynamicSteps.selectName"
             :show="selectedStep.id === dynamicSteps.selectName"
             :name-form-submit="nameFormSubmit"
-            :project="props.project"
+            :has-location="props.project === 'sphere'"
             @submit="onChangeName(...$event)"
             @check-name="emits('check-name', $event)"
           />

package/components/common/vm/actions/common/select/name/Name.vue

@@ -3,7 +3,7 @@
     v-if="isNewView"
     v-model:vm-name="vmName"
     v-model:is-show-help="isShowHelp"
-    :project="props.project"
+    :has-location="props.hasLocation"
     :errors="errors"
     :data-center="props.dataCenter"
     @remove-validation-errors="onRemoveValidationErrors"
@@ -13,7 +13,7 @@
     v-else
     v-model:vm-name="vmName"
     v-model:is-show-help="isShowHelp"
-    :project="props.project"
+    :has-location="props.hasLocation"
     :is-vmt="props.isVmt"
     :errors="errors"
     :data-center="props.dataCenter"
@@ -25,22 +25,22 @@
 <script setup lang="ts">
 // import { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 
 const props = withDefaults(
   defineProps<{
     nameFormSubmit: null | Function
     show: boolean
-    project: UI_T_Project
+    hasLocation?: boolean
     isVmt?: boolean
     validateEmptyName?: boolean
     dataCenter?: UI_I_TreeNode // для сферы
     existName?: string
   }>(),
   {
-    validateEmptyName: false,
+    hasLocation: false,
     isVmt: false,
+    validateEmptyName: false,
     dataCenter: undefined,
     existName: undefined,
   }
@@ -100,7 +100,7 @@ const submit = async (cb: Function): Promise<void> => {
     }
   }
 
-  if (props.project === 'sphere') {
+  if (props.hasLocation) {
     // const isDatacenterFolder = isParentDatacenter(selectedNode.value)
 
     if (

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

@@ -1,5 +1,5 @@
 <template>
-  <div :class="['select-name', { 'pb-6': props.project === 'sphere' }]">
+  <div :class="['select-name', { 'pb-6': props.hasLocation }]">
     <client-only>
       <Teleport to="#name-alert-wrapper">
         <ui-alert
@@ -41,7 +41,7 @@
       </div>
     </div>
 
-    <template v-if="props.project === 'sphere'">
+    <template v-if="props.hasLocation">
       <div class="location">
         <span class="location-label">{{ localization.common.location }}</span>
 
@@ -66,7 +66,6 @@
 <script setup lang="ts">
 // import { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 
 const vmName = defineModel<string>('vmName', { required: true })
@@ -74,7 +73,7 @@ const vmName = defineModel<string>('vmName', { required: true })
 
 const props = withDefaults(
   defineProps<{
-    project: UI_T_Project
+    hasLocation: boolean
     errors: string[]
     dataCenter?: UI_I_TreeNode // для сферы
   }>(),

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

@@ -40,7 +40,7 @@
       </div>
     </form>
 
-    <template v-if="props.project === 'sphere'">
+    <template v-if="props.hasLocation">
       <p class="new-vm-name-and-folder-instructions mt-1">
         {{ locationDescription }}
       </p>
@@ -57,7 +57,6 @@
 <script setup lang="ts">
 // import { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 
 const vmName = defineModel<string>('vmName', { required: true })
@@ -65,13 +64,13 @@ const isShowHelp = defineModel<boolean>('isShowHelp', { required: true })
 
 const props = withDefaults(
   defineProps<{
-    project: UI_T_Project
+    hasLocation: boolean
     errors: string[]
     isVmt: boolean
-    dataCenter?: UI_I_TreeNode // для сферы
+    dataCenter?: UI_I_TreeNode | null // для сферы
   }>(),
   {
-    dataCenter: undefined,
+    dataCenter: null,
   }
 )
 const emits = defineEmits<{

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

@@ -28,7 +28,7 @@
               selectedStep.id === dynamicSteps.selectNameFolder
             "
             :name-form-submit="nameFormSubmit"
-            :project="props.project"
+            :has-location="props.project === 'sphere'"
             :data-center="props.dataCenter"
             @submit="onChangeName(...$event)"
             @check-name="emits('check-name', $event)"

package/components/common/wizards/datastore/add/Add.vue

@@ -1,224 +1,228 @@
-<template>
-  <common-wizards-datastore-add-new
-    v-if="isNewView"
-    v-model="form"
-    :project="props.project"
-    :wizard="wizard"
-    :alert-messages="alertMessages"
-    :selected-scheme="selectedScheme"
-    :selected-node="props.selectedNode"
-    :title="title"
-    :nfs-hosts="props.nfsHosts"
-    :host-id="props.hostId"
-    @change-steps="onChangeSteps"
-    @hide="onHideModal"
-    @submit="onCreateDatastore"
-  />
-  <common-wizards-datastore-add-old
-    v-else
-    v-model="form"
-    :project="props.project"
-    :wizard="wizard"
-    :alert-messages="alertMessages"
-    :selected-scheme="selectedScheme"
-    :title="title"
-    :nfs-hosts="props.nfsHosts"
-    :host-id="props.hostId"
-    @change-steps="onChangeSteps"
-    @hide-alert="onHideAlert"
-    @hide="onHideModal"
-    @submit="onCreateDatastore"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_WizardStep,
-  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_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-import type { UI_I_CompatibleHosts } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/lib/models/interfaces'
-import {
-  stepsFunc,
-  stepsSchemeInitial,
-  getStepScheme,
-  dynamicSteps,
-} from '~/components/common/wizards/datastore/add/lib/config/steps'
-import { datastoreDefaultFormFunc } from '~/components/common/wizards/datastore/add/lib/config/createDatastore'
-import * as validation from '~/components/common/wizards/datastore/add/lib/validations'
-
-const props = withDefaults(
-  defineProps<{
-    project: UI_T_Project
-    selectedNode: UI_I_TreeNode
-    nfsHosts?: UI_I_CompatibleHosts
-    hostId?: string
-    isMainFilter?: boolean
-  }>(),
-  {
-    nfsHosts: undefined,
-    hostId: undefined,
-    isMainFilter: undefined,
-  }
-)
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'finish', value: UI_I_CreateDatastoreForm): void
-  (event: 'main-filter', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial
-)
-
-const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
-const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const title = computed<string>(() => localization.value.common.newDatastore)
-
-const form = ref<UI_I_CreateDatastoreForm>(
-  useDeepCopy(datastoreDefaultFormFunc(props.hostId))
-)
-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.nameAndDevice,
-      currentStep.id,
-      nextStep.id
-    )
-  ) {
-    const nameValidation = await validation.checkDatastoreNameAsync(
-      localization.value,
-      value,
-      form.value,
-      dynamicSteps.nameAndDevice,
-      'datastoreName',
-      wizard,
-      props.project
-    )
-
-    value = nameValidation.newValue
-
-    const lunDiskValidation = validation.checkSelectedLunDiskSync(
-      localization.value,
-      form.value,
-      wizard,
-      value,
-      props.project,
-      props.hostId
-    )
-
-    value = lunDiskValidation.newValue
-
-    stepHasError = nameValidation.stepHasError || lunDiskValidation.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.checkNfsFolderSync(
-      localization.value,
-      form.value.folder,
-      wizard,
-      value
-    )
-    value = folderValidation.newValue
-
-    const serverValidation = validation.checkNfsServerSync(
-      localization.value,
-      form.value.server,
-      wizard,
-      value
-    )
-    value = serverValidation.newValue
-
-    stepHasError =
-      nameValidation.stepHasError ||
-      folderValidation.stepHasError ||
-      serverValidation.stepHasError
-  }
-
-  if (
-    wizard.isValidateForStep(
-      dynamicSteps.hostAccessibility,
-      currentStep.id,
-      nextStep.id
-    )
-  ) {
-    const nameValidation = await validation.checkHostsAccessibilitySync(
-      localization.value,
-      form.value.hosts,
-      wizard,
-      value
-    )
-
-    value = nameValidation.newValue
-
-    stepHasError = nameValidation.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, props.hostId)
-    if (step !== undefined) {
-      wizard.changeScheme(step)
-    }
-  },
-  { immediate: true }
-)
-
-const onHideAlert = (stepId: number): void => {
-  wizard.hideAlertMessagesByStepId(stepId)
-}
-const onHideModal = (): void => {
-  emits('hide')
-}
-const onCreateDatastore = (): void => {
-  emits('finish', form.value)
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-wizards-datastore-add-new
+    v-if="isNewView"
+    v-model="form"
+    :project="props.project"
+    :wizard="wizard"
+    :alert-messages="alertMessages"
+    :selected-scheme="selectedScheme"
+    :selected-node="props.selectedNode"
+    :title="title"
+    :nfs-hosts="props.nfsHosts"
+    :host-id="props.hostId"
+    @change-steps="onChangeSteps"
+    @hide="onHideModal"
+    @submit="onCreateDatastore"
+  />
+  <common-wizards-datastore-add-old
+    v-else
+    v-model="form"
+    :project="props.project"
+    :wizard="wizard"
+    :alert-messages="alertMessages"
+    :selected-scheme="selectedScheme"
+    :title="title"
+    :nfs-hosts="props.nfsHosts"
+    :host-id="props.hostId"
+    @change-steps="onChangeSteps"
+    @hide-alert="onHideAlert"
+    @hide="onHideModal"
+    @submit="onCreateDatastore"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_WizardStep,
+  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_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+import type { UI_I_CompatibleHosts } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/lib/models/interfaces'
+import {
+  stepsFunc,
+  stepsSchemeInitial,
+  getStepScheme,
+  dynamicSteps,
+} from '~/components/common/wizards/datastore/add/lib/config/steps'
+import { datastoreDefaultFormFunc } from '~/components/common/wizards/datastore/add/lib/config/createDatastore'
+import * as validation from '~/components/common/wizards/datastore/add/lib/validations'
+
+const props = withDefaults(
+  defineProps<{
+    project: UI_T_Project
+    selectedNode: UI_I_TreeNode
+    nfsHosts?: UI_I_CompatibleHosts
+    hostId?: string
+    isMainFilter?: boolean
+    datacenterId?: string // For Sphere
+  }>(),
+  {
+    nfsHosts: undefined,
+    hostId: undefined,
+    isMainFilter: undefined,
+    datacenterId: '',
+  }
+)
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'finish', value: UI_I_CreateDatastoreForm): void
+  (event: 'main-filter', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const wizard: Wizard = new Wizard(
+  stepsFunc(localization.value),
+  stepsSchemeInitial
+)
+
+const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
+const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const title = computed<string>(() => localization.value.common.newDatastore)
+
+const form = ref<UI_I_CreateDatastoreForm>(
+  useDeepCopy(datastoreDefaultFormFunc(props.hostId))
+)
+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.nameAndDevice,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const nameValidation = await validation.checkDatastoreNameAsync(
+      localization.value,
+      value,
+      form.value,
+      dynamicSteps.nameAndDevice,
+      'datastoreName',
+      wizard,
+      props.project,
+      props.datacenterId
+    )
+
+    value = nameValidation.newValue
+
+    const lunDiskValidation = validation.checkSelectedLunDiskSync(
+      localization.value,
+      form.value,
+      wizard,
+      value,
+      props.project,
+      props.hostId
+    )
+
+    value = lunDiskValidation.newValue
+
+    stepHasError = nameValidation.stepHasError || lunDiskValidation.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.checkNfsFolderSync(
+      localization.value,
+      form.value.folder,
+      wizard,
+      value
+    )
+    value = folderValidation.newValue
+
+    const serverValidation = validation.checkNfsServerSync(
+      localization.value,
+      form.value.server,
+      wizard,
+      value
+    )
+    value = serverValidation.newValue
+
+    stepHasError =
+      nameValidation.stepHasError ||
+      folderValidation.stepHasError ||
+      serverValidation.stepHasError
+  }
+
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.hostAccessibility,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const nameValidation = await validation.checkHostsAccessibilitySync(
+      localization.value,
+      form.value.hosts,
+      wizard,
+      value
+    )
+
+    value = nameValidation.newValue
+
+    stepHasError = nameValidation.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, props.hostId)
+    if (step !== undefined) {
+      wizard.changeScheme(step)
+    }
+  },
+  { immediate: true }
+)
+
+const onHideAlert = (stepId: number): void => {
+  wizard.hideAlertMessagesByStepId(stepId)
+}
+const onHideModal = (): void => {
+  emits('hide')
+}
+const onCreateDatastore = (): void => {
+  emits('finish', form.value)
+}
+</script>
+
+<style scoped lang="scss"></style>