bfg-common 1.5.679 → 1.5.683

package/components/common/wizards/common/steps/name/lib/models/interfaces.ts

@@ -1,4 +1,4 @@
-export interface UI_I_NameTestIds {
-  name: string
-  helpIcon: string
-}
+export interface UI_I_NameTestIds {
+  name: string
+  helpIcon: string
+}

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

@@ -1,40 +1,40 @@
-<template>
-  <div class="tree-view">
-    <ui-tree
-      :nodes="props.nodes"
-      :expand-all="false"
-      :is-loading="props.loading"
-      @toggle-node="onShowNodes"
-      @select-node="emits('select-node', $event)"
-    >
-      <template #content="{ node }">
-        <div class="flex-align-center">
-          <span :class="['node-icon', node.iconClassName]"></span>
-          <span class="node-name">{{ node.name }}</span>
-        </div>
-      </template>
-    </ui-tree>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-nodes', value: {
-    node: UI_I_TreeNode
-    cb: () => void
-  }): void
-}>()
-
-const onShowNodes = (node: UI_I_TreeNode) => {
-  emits('show-nodes', { node, cb: (): void => {} })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="tree-view">
+    <ui-tree
+      :nodes="props.nodes"
+      :expand-all="false"
+      :is-loading="props.loading"
+      @toggle-node="onShowNodes"
+      @select-node="emits('select-node', $event)"
+    >
+      <template #content="{ node }">
+        <div class="flex-align-center">
+          <span :class="['node-icon', node.iconClassName]"></span>
+          <span class="node-name">{{ node.name }}</span>
+        </div>
+      </template>
+    </ui-tree>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-nodes', value: {
+    node: UI_I_TreeNode
+    cb: () => void
+  }): void
+}>()
+
+const onShowNodes = (node: UI_I_TreeNode) => {
+  emits('show-nodes', { node, cb: (): void => {} })
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -1,228 +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
-    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>
+<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>

package/components/common/wizards/datastore/add/lib/config/createDatastore.ts

@@ -6,6 +6,7 @@ export const datastoreDefaultFormFunc = (
   return {
     name: 'Datastore',
     dev_names: [],
+    level: 'linear',
     hosts: hostId ? [hostId] : [],
     type_code: 2,
     version: 4.1,

package/components/common/wizards/datastore/add/lib/models/interfaces.ts

@@ -7,6 +7,7 @@ import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/
 export interface UI_I_CreateDatastoreForm {
   name: string
   dev_names: UI_I_CreateStorageLunDiskItem[]
+  level: 'linear' | 'raid0' | 'raid1' | 'raid5' | 'raid6' | 'raid10'
   version: UI_T_NfsType
   type_code: UI_T_DatastoreTypeCode
   readonly: boolean