bfg-common 1.5.774 → 1.5.775

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

@@ -1,227 +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
-}>()
-
-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/Old.vue

@@ -12,16 +12,6 @@
       @hide="onHideModal"
       @submit="onCreateDatastore"
     >
-      <template #description="{ selectedStep }">
-        <div class="add-datastore__wizard-description">
-          <h2>{{ selectedStep.subTitle }}</h2>
-
-          <common-wizards-datastore-add-steps-type-mode-tooltip
-            v-if="selectedStep.id === dynamicSteps.type"
-          />
-        </div>
-      </template>
-
       <template #modalBody="{ selectedStep }">
         <common-wizards-datastore-add-steps-type-mode
           v-if="selectedStep.id === dynamicSteps.type"
@@ -122,12 +112,6 @@ const onCreateDatastore = (): void => emits('submit')
     height: 100%;
     padding-left: 24px;
   }
-
-  .add-datastore__wizard-description {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-  }
 }
 
 .finish-block {

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

@@ -6,7 +6,6 @@ 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,7 +7,6 @@ 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

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceNew.vue

@@ -76,11 +76,6 @@
         @main-filter="emits('main-filter', $event)"
       />
     </div>
-
-    <common-wizards-datastore-add-steps-name-and-device-advanced-options
-      v-model="formModelLocal.level"
-      :dev-names-count="formModelLocal.dev_names.length"
-    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceOld.vue

@@ -90,11 +90,6 @@
         @main-filter="emits('main-filter', $event)"
       />
     </div>
-
-    <common-wizards-datastore-add-steps-name-and-device-advanced-options
-      v-model="formModelLocal.level"
-      :dev-names-count="formModelLocal.dev_names.length"
-    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/old/Old.vue

@@ -18,7 +18,8 @@
       hide-page-size
       @sorting="onSorting"
       @main-filter="emits('main-filter', $event)"
-    />
+    >
+    </atoms-table-data-grid>
   </div>
 </template>
 
@@ -91,7 +92,7 @@ watch(
   .data-table {
     height: inherit;
     :deep(.datagrid-outer-wrapper) {
-      max-height: 400px;
+      height: 400px;
     }
   }
 }

package/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails.ts

@@ -112,7 +112,7 @@ const sharedStormDetailsFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
-  const { name, dev_names, level } = data
+  const { name, dev_names } = data
 
   return [
     {
@@ -132,13 +132,6 @@ const sharedStormDetailsFunc = (
           items: [],
           testId: 'view-selected-lun-disks-in-complete',
         },
-        {
-          label: localization.common.advancedOptions,
-          value: level,
-          items: [],
-          testId: 'view-advanced-options-in-complete',
-          iconClassName: '',
-        },
       ],
       actions: [],
     },

package/components/common/wizards/datastore/add/steps/typeMode/TypeModeOld.vue

@@ -1,5 +1,31 @@
 <template>
   <section class="datastore-types">
+    <div class="header-row">
+      <span class="datastore-types__subtitle">
+        {{ localization.common.specifyDatastoreType }}
+      </span>
+      <div id="type-select-help-icon" class="signpost-container relative">
+        <atoms-the-icon
+          data-id="toggle-type-select-help-icon"
+          fill="#0072a3"
+          width="24px"
+          height="24px"
+          name="info-circle"
+          @click="isShowTypeHelp = !isShowTypeHelp"
+        />
+        <atoms-tooltip-signpost
+          v-if="isShowTypeHelp"
+          elem-id="type-select-help-icon"
+          test-id="select-datastore-type"
+          @hide="isShowTypeHelp = false"
+        >
+          <p class="help-desc">
+            {{ localization.common.datastoreTypeHelpDesc }}
+          </p>
+        </atoms-tooltip-signpost>
+      </div>
+    </div>
+
     <common-select-radio-group
       v-model="datastoreTypeModeLocal"
       :options="props.options"
@@ -9,6 +35,7 @@
 </template>
 
 <script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
 
 const datastoreTypeModeLocal = defineModel<number>({ required: true })
@@ -16,9 +43,29 @@ const props = defineProps<{
   options: UI_I_RadioOption[]
 }>()
 
+const localization = computed<UI_I_Localization>(() => useLocal())
+
 const onChangeType = (): void => {
   // model.value.name = 'Datastore' // default value is  'Datastore' every time
 }
+
+const isShowTypeHelp = ref<boolean>(false)
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.datastore-types {
+  .signpost-container {
+    display: flex;
+    cursor: pointer;
+
+    .help-desc-container {
+      max-width: 350px;
+    }
+  }
+  .header-row {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+}
+</style>