bfg-common 1.5.77 → 1.5.78

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

@@ -42,9 +42,10 @@ 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 { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 import * as validation from '~/components/common/wizards/datastore/add/lib/validations'
 
 const props = defineProps<{
@@ -84,22 +85,6 @@ const validationFunc = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    const nameValidation = await validation.checkDatastoreNameAsync(
-      localization.value,
-      value,
-      form.value,
-      1,
-      'datastoreName',
-      wizard,
-      props.project
-    )
-
-    value = nameValidation.newValue
-
-    stepHasError = nameValidation.stepHasError
-  }
-
   if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
     const nameValidation = await validation.checkDatastoreNameAsync(
       localization.value,
@@ -127,12 +112,18 @@ const validationFunc = async (
     stepHasError = nameValidation.stepHasError || lunDiskValidation.stepHasError
   }
 
-  if (wizard.isValidateForStep(4, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.nameAndConfigure,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const nameValidation = await validation.checkDatastoreNameAsync(
       localization.value,
       value,
       form.value,
-      4,
+      dynamicSteps.nameAndConfigure,
       'name',
       wizard,
       props.project

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

@@ -103,7 +103,9 @@
           <div ref="subTitleBlock3">
             <div class="subtitle-block">
               <ui-alert
-                v-if="props.alertMessages[dynamicSteps.hostAccessibility].length"
+                v-if="
+                  props.alertMessages[dynamicSteps.hostAccessibility].length
+                "
                 test-id="add-host-assign-license-error-alert"
                 type="error"
                 size="md"
@@ -127,25 +129,19 @@
       </ui-wizard-block>
 
       <ui-wizard-block
-        v-if="selectedStep.id === dynamicSteps.lockdownMode"
+        v-if="selectedStep.id === dynamicSteps.readyComplete"
         :sub-title-height="height4"
       >
         <template #subTitle>
           <div ref="subTitleBlock4">
             <div class="subtitle-block">
               <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
-              <ui-wizard-subtitle
-                :sub-title="localization.common.whenEnabledLockdown"
-              />
-              <ui-wizard-subtitle
-                :sub-title="localization.common.leaveLockdownDefault"
-              />
             </div>
           </div>
         </template>
         <template #content>
-          <common-wizards-datastore-add-ready-complete
-            v-show="selectedStep.id === 11"
+          <common-wizards-datastore-add-steps-ready-complete
+            v-if="selectedStep.id === dynamicSteps.readyComplete"
             :data-ready-view="dataReadyView"
           />
         </template>
@@ -167,7 +163,7 @@ import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datasto
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })

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

@@ -40,7 +40,6 @@
           @hide-alert="(e) => emits('hide-alert', e)"
         />
 
-
         <common-wizards-datastore-add-steps-host-accessibility
           v-if="selectedStep.id === dynamicSteps.hostAccessibility"
           v-model="formModelLocal.hosts"
@@ -49,6 +48,11 @@
           @hide-alert="(e) => emits('hide-alert', e)"
         />
 
+        <common-wizards-datastore-add-steps-ready-complete
+          v-if="selectedStep.id === dynamicSteps.readyComplete"
+          :data-ready-view="dataReadyView"
+        />
+
         <common-wizards-datastore-add-shared-storm
           v-if="datastoreType === 'shared-storm'"
           v-model="formModelLocal"
@@ -73,11 +77,6 @@
           :messages-fields="selectedStep.fields"
           :hosts="props.nfsHosts"
         />
-
-        <common-wizards-datastore-add-ready-complete
-          v-show="selectedStep.id === 11"
-          :data-ready-view="dataReadyView"
-        />
       </template>
     </atoms-wizard>
   </div>
@@ -92,7 +91,7 @@ import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datasto
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })

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

@@ -4,14 +4,11 @@ import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/inter
 import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
 import type { UI_I_ChangeStepsSchemes } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
-
 export const dynamicSteps = {
   type: 0,
   nameAndDevice: 1,
   nameAndConfigure: 2,
   hostAccessibility: 3,
-  lockdownMode: 4,
-  vmLocation: 5,
   readyComplete: 6,
 }
 export const stepsFunc = (
@@ -131,7 +128,7 @@ export const stepsFunc = (
   //   testId: 'select-kerberos-authentication',
   // },
   {
-    id: 11,
+    id: dynamicSteps.readyComplete,
     title: localization.common.readyComplete,
     subTitle: localization.common.readyCompleteDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
@@ -142,14 +139,18 @@ export const stepsFunc = (
 ]
 
 export const stepsSchemeInitial: number[][] = [
-  [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Procurator Scheme for "shared-storm" type
-  [dynamicSteps.type, dynamicSteps.nameAndConfigure, 11], // Procurator Scheme for "nfs" type
-  [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Sphere Scheme for "shared-storm" type
+  [dynamicSteps.type, dynamicSteps.nameAndDevice, dynamicSteps.readyComplete], // Procurator Scheme for "shared-storm" type
+  [
+    dynamicSteps.type,
+    dynamicSteps.nameAndConfigure,
+    dynamicSteps.readyComplete,
+  ], // Procurator Scheme for "nfs" type
+  [dynamicSteps.type, dynamicSteps.nameAndDevice, dynamicSteps.readyComplete], // Sphere Scheme for "shared-storm" type
   [
     dynamicSteps.type,
     dynamicSteps.nameAndConfigure,
     dynamicSteps.hostAccessibility,
-    11,
+    dynamicSteps.readyComplete,
   ], // Sphere Scheme for "nfs" type (not used from <host Context Menu>)
 ]
 

package/components/common/wizards/datastore/add/lib/validations.ts

@@ -8,7 +8,7 @@ import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
-
+import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 const checkName = async (
   form: UI_I_CreateDatastoreForm,
   localization: UI_I_Localization,
@@ -108,12 +108,20 @@ export const checkNfsFolderSync = (
   let stepHasError = false
 
   if (!name) {
-    stepHasError = wizard.setValidation(4, 'folder', {
-      fieldMessage: localization.common.specifyFolderName,
-      alertMessage: '',
-    })
-  } else if (wizard.hasMessage(4, 'folder')) {
-    value = wizard.removeValidation(4, 'folder', value)
+    stepHasError = wizard.setValidation(
+      dynamicSteps.nameAndConfigure,
+      'folder',
+      {
+        fieldMessage: localization.common.specifyFolderName,
+        alertMessage: '',
+      }
+    )
+  } else if (wizard.hasMessage(dynamicSteps.nameAndConfigure, 'folder')) {
+    value = wizard.removeValidation(
+      dynamicSteps.nameAndConfigure,
+      'folder',
+      value
+    )
   }
 
   return {
@@ -131,12 +139,20 @@ export const checkNfsServerSync = (
   let stepHasError = false
 
   if (!name) {
-    stepHasError = wizard.setValidation(4, 'server', {
-      fieldMessage: localization.common.specifyServerName,
-      alertMessage: '',
-    })
-  } else if (wizard.hasMessage(4, 'server')) {
-    value = wizard.removeValidation(4, 'server', value)
+    stepHasError = wizard.setValidation(
+      dynamicSteps.nameAndConfigure,
+      'server',
+      {
+        fieldMessage: localization.common.specifyServerName,
+        alertMessage: '',
+      }
+    )
+  } else if (wizard.hasMessage(dynamicSteps.nameAndConfigure, 'server')) {
+    value = wizard.removeValidation(
+      dynamicSteps.nameAndConfigure,
+      'server',
+      value
+    )
   }
 
   return {

package/components/common/wizards/datastore/add/steps/nameAndConfigure/NameAndConfigure.vue

@@ -1,185 +1,43 @@
 <template>
-  <div class="configuration">
-    <div>
-      <atoms-alert
-        v-show="props.alertMessages?.length"
-        test-id="configure-error-alert"
-        status="alert-danger"
-        :items="props.alertMessages"
-        @remove="onHideAlert"
-      />
-
-      <atoms-alert
-        v-show="alertInfo"
-        test-id="configure-information-alert"
-        status="alert-info"
-        :items="[localization.common.nameAndConfigurationAlertInfo]"
-        @remove="alertInfo = false"
-      />
-      <h6 class="nd-mt-0">{{ localization.common.nfsShareDetails }}</h6>
-
-      <div class="clr-form-control clr-row">
-        <label for="" class="clr-control-label clr-col-md-2">
-          {{ localization.common.name }}
-        </label>
-
-        <div
-          class="clr-control-container"
-          :class="nameErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center">
-            <input
-              id="configuration-name-input"
-              v-model="model.name"
-              data-id="configuration-name-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['name'])"
-              @input="initValidation(false, ['name'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-
-          <div class="clr-subtext" data-id="nfs-datastore-name-field-require">
-            {{ nameErrorText }}
-          </div>
-        </div>
-      </div>
-
-      <div class="clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">
-          {{ localization.common.folder }}
-        </label>
-
-        <div
-          class="clr-control-container"
-          :class="folderErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center">
-            <input
-              id="configuration-folder-input"
-              v-model="model.folder"
-              data-id="configuration-folder-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['folder'])"
-              @input="initValidation(false, ['folder'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-
-          <div
-            v-if="folderErrorText"
-            class="clr-subtext"
-            data-id="folder-name-field-require"
-          >
-            {{ folderErrorText }}
-          </div>
-          <div v-else class="clr-subtext">E.g: /vols/vol0/datastore-001</div>
-        </div>
-      </div>
-
-      <div class="nd-mt-0 clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">
-          {{ localization.common.server }}
-        </label>
-
-        <div
-          class="clr-control-container"
-          :class="serverErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center input-action-wrapper">
-            <input
-              id="configuration-server-input"
-              v-model="model.server"
-              data-id="configuration-server-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['server'])"
-              @input="initValidation(false, ['server'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-          <div
-            v-if="serverErrorText"
-            class="clr-subtext"
-            data-id="server-name-field-require"
-          >
-            {{ serverErrorText }}
-          </div>
-          <div v-else class="clr-subtext">
-            E.g: nas, nas.it.com or 192.168.0.1
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <common-wizards-datastore-add-steps-name-and-configure-new
+    v-if="isNewView"
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :messages-fields="props.messagesFields"
+  />
+
+  <common-wizards-datastore-add-steps-name-and-configure-old
+    v-else
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :alert-messages="props.alertMessages"
+    :messages-fields="props.messagesFields"
+    @hide-alert="(e) => emits('hide-alert', e)"
+  />
 </template>
 
 <script lang="ts" setup>
 import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Localization,
-  UI_I_ArbitraryObject,
-} from '~/lib/models/interfaces'
-import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_InitialValidationFields } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
+const formModel = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const props = defineProps<{
   project: UI_T_Project
   alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  messagesFields: UI_I_WizardStep['fields']
 }>()
-const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
 
-const initValidationFields = ref<UI_I_InitialValidationFields>({
-  name: false,
-  folder: false,
-  server: false,
-})
-const initValidation = (onlyBlur = false, types: string[]): void => {
-  onlyBlur && types.forEach((type) => (initValidationFields.value[type] = true))
-}
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-/* Validation error text for Name input field */
-const nameErrorText = computed<string>(() => {
-  if (props.messagesFields?.name?.field && !model.value.name) {
-    return props.messagesFields.name.field
-  }
-
-  if (!initValidationFields.value.name) return ''
-  return !model.value.name ? localization.value.common.specifyDatastoreName : ''
-})
-
-/* Validation error text for Folder input field */
-const folderErrorText = computed<string>(() => {
-  if (props.messagesFields.folder?.field && !model.value.folder) {
-    return props.messagesFields.folder.field
-  }
-
-  if (!initValidationFields.value.folder) return ''
-  return !model.value.folder ? localization.value.common.specifyFolderName : ''
-})
-
-/* Validation error text for Server input field */
-const serverErrorText = computed<string>(() => {
-  if (props.messagesFields.server?.field && !model.value.server) {
-    return props.messagesFields.server.field
-  }
-
-  if (!initValidationFields.value.server) return ''
-  return !model.value.server ? localization.value.common.specifyServerName : ''
-})
-const onHideAlert = (): void => {
-  emits('hide-alert', 5)
-}
-const alertInfo = ref<boolean>(props.project === 'procurator')
+const isShowAlertInfo = ref<boolean>(props.project === 'procurator')
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastore/add/steps/nameAndConfigure/NameAndConfigureNew.vue

@@ -1,30 +1,123 @@
 <template>
-  <div class="name-and-configure">
-    {{ props }}
-    {{ model }}
+  <div class="basics-step">
+    <div class="basics-step-row">
+      <div class="basics-step-row-title">
+        <span class="basics-step-row-title-text">
+          {{ localization.common.name }}
+        </span>
+      </div>
+      <div class="basics-step-row-content">
+        <ui-input
+          id="name"
+          v-model="formModelLocal.name"
+          test-id="new-host-name-field"
+          :placeholder="localization.common.hostNameOrIPAddress"
+          is-focused
+          :error="errorText"
+          @input="onRemoveValidationErrors"
+        />
+      </div>
+    </div>
+
+    <div class="basics-step-line"></div>
+
+    {{ isShowAlertInfo }}
   </div>
 </template>
 
-<script lang="ts" setup>
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  // UI_I_Localization,
-  UI_I_ArbitraryObject,
-} from '~/lib/models/interfaces'
-import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
+const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
+const isShowAlertInfo = defineModel<boolean>('alertInfo', { required: true })
+
 const props = defineProps<{
-  project: UI_T_Project
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  messagesFields: UI_I_WizardStep['fields']
+}>()
+const emits = defineEmits<{
+  (event: 'remove-errors'): void
 }>()
-const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
-// const emits = defineEmits<{
-//   (event: 'hide-alert', value: number): void
-// }>()
 
-// const localization = computed<UI_I_Localization>(() => useLocal())
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onRemoveValidationErrors = (): void => {
+  emits('remove-errors')
+}
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped lang="scss">
+.basics-step {
+  padding: 16px 0 16px;
+
+  &-row {
+    min-height: 36px;
+    width: 100%;
+    display: flex;
+    column-gap: 16px;
+    align-items: center;
+
+    &-title {
+      padding-top: 8px;
+      max-width: 240px;
+      width: 100%;
+      display: flex;
+      align-items: center;
+      column-gap: 8px;
+      font-weight: 400;
+      font-size: 13px;
+      line-height: 20px;
+      letter-spacing: 0;
+      vertical-align: middle;
+      align-self: flex-start;
+      color: var(--wizard-content-title);
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+
+      &-text {
+        display: block;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+    }
+
+    &-content {
+      max-width: 480px;
+      width: 100%;
+      font-weight: 400;
+      font-size: 13px;
+      line-height: 20px;
+      letter-spacing: 0;
+      vertical-align: middle;
+      color: var(--wizard-content-value);
+
+      &-text {
+        display: flex;
+        column-gap: 8px;
+        align-items: center;
+
+        &-icon {
+          width: 20px;
+          min-width: 20px;
+          height: 20px;
+          min-height: 20px;
+        }
+      }
+
+      &-switch-container {
+        width: fit-content;
+      }
+    }
+  }
+
+  &-line {
+    height: 0;
+    width: 100%;
+    border-bottom: 1px solid var(--wizard-content-line);
+    margin: 16px 0;
+  }
+}
+</style>

package/components/common/wizards/datastore/add/steps/nameAndConfigure/NameAndConfigureOld.vue

@@ -1,115 +1,110 @@
 <template>
   <div class="configuration">
-    <div>
-      <atoms-alert
-        v-show="props.alertMessages?.length"
-        test-id="configure-error-alert"
-        status="alert-danger"
-        :items="props.alertMessages"
-        @remove="onHideAlert"
-      />
-
-      <atoms-alert
-        v-show="alertInfo"
-        test-id="configure-information-alert"
-        status="alert-info"
-        :items="[localization.common.nameAndConfigurationAlertInfo]"
-        @remove="alertInfo = false"
-      />
-      <h6 class="nd-mt-0">{{ localization.common.nfsShareDetails }}</h6>
-
-      <div class="clr-form-control clr-row">
-        <label for="" class="clr-control-label clr-col-md-2">
-          {{ localization.common.name }}
-        </label>
+    <atoms-alert
+      v-show="props.alertMessages?.length"
+      test-id="configure-error-alert"
+      status="alert-danger"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
+    />
+
+    <atoms-alert
+      v-show="isShowAlertInfo"
+      test-id="configure-information-alert"
+      status="alert-info"
+      :items="[localization.common.nameAndConfigurationAlertInfo]"
+      @remove="isShowAlertInfo = false"
+    />
+    <h6 class="nd-mt-0">{{ localization.common.nfsShareDetails }}</h6>
+
+    <div class="clr-form-control clr-row">
+      <label for="" class="clr-control-label clr-col-md-2">
+        {{ localization.common.name }}
+      </label>
+
+      <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
+        <div class="flex-align-center">
+          <input
+            id="configuration-name-input"
+            v-model="formModelLocal.name"
+            data-id="configuration-name-input"
+            type="text"
+            class="clr-input"
+            @blur="initValidation(true, ['name'])"
+            @input="initValidation(false, ['name'])"
+          />
+          <atoms-the-icon class="error-icon" name="info-circle" />
+        </div>
 
-        <div
-          class="clr-control-container"
-          :class="nameErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center">
-            <input
-              id="configuration-name-input"
-              v-model="model.name"
-              data-id="configuration-name-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['name'])"
-              @input="initValidation(false, ['name'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-
-          <div class="clr-subtext" data-id="nfs-datastore-name-field-require">
-            {{ nameErrorText }}
-          </div>
+        <div class="clr-subtext" data-id="nfs-datastore-name-field-require">
+          {{ nameErrorText }}
         </div>
       </div>
+    </div>
 
-      <div class="clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">
-          {{ localization.common.folder }}
-        </label>
+    <div class="clr-form-control clr-row">
+      <label class="clr-control-label clr-col-md-2">
+        {{ localization.common.folder }}
+      </label>
+
+      <div
+        class="clr-control-container"
+        :class="folderErrorText && 'clr-error'"
+      >
+        <div class="flex-align-center">
+          <input
+            id="configuration-folder-input"
+            v-model="formModelLocal.folder"
+            data-id="configuration-folder-input"
+            type="text"
+            class="clr-input"
+            @blur="initValidation(true, ['folder'])"
+            @input="initValidation(false, ['folder'])"
+          />
+          <atoms-the-icon class="error-icon" name="info-circle" />
+        </div>
 
         <div
-          class="clr-control-container"
-          :class="folderErrorText && 'clr-error'"
+          v-if="folderErrorText"
+          class="clr-subtext"
+          data-id="folder-name-field-require"
         >
-          <div class="flex-align-center">
-            <input
-              id="configuration-folder-input"
-              v-model="model.folder"
-              data-id="configuration-folder-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['folder'])"
-              @input="initValidation(false, ['folder'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-
-          <div
-            v-if="folderErrorText"
-            class="clr-subtext"
-            data-id="folder-name-field-require"
-          >
-            {{ folderErrorText }}
-          </div>
-          <div v-else class="clr-subtext">E.g: /vols/vol0/datastore-001</div>
+          {{ folderErrorText }}
         </div>
+        <div v-else class="clr-subtext">E.g: /vols/vol0/datastore-001</div>
       </div>
+    </div>
 
-      <div class="nd-mt-0 clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">
-          {{ localization.common.server }}
-        </label>
-
+    <div class="nd-mt-0 clr-form-control clr-row">
+      <label class="clr-control-label clr-col-md-2">
+        {{ localization.common.server }}
+      </label>
+
+      <div
+        class="clr-control-container"
+        :class="serverErrorText && 'clr-error'"
+      >
+        <div class="flex-align-center input-action-wrapper">
+          <input
+            id="configuration-server-input"
+            v-model="formModelLocal.server"
+            data-id="configuration-server-input"
+            type="text"
+            class="clr-input"
+            @blur="initValidation(true, ['server'])"
+            @input="initValidation(false, ['server'])"
+          />
+          <atoms-the-icon class="error-icon" name="info-circle" />
+        </div>
         <div
-          class="clr-control-container"
-          :class="serverErrorText && 'clr-error'"
+          v-if="serverErrorText"
+          class="clr-subtext"
+          data-id="server-name-field-require"
         >
-          <div class="flex-align-center input-action-wrapper">
-            <input
-              id="configuration-server-input"
-              v-model="model.server"
-              data-id="configuration-server-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['server'])"
-              @input="initValidation(false, ['server'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-          <div
-            v-if="serverErrorText"
-            class="clr-subtext"
-            data-id="server-name-field-require"
-          >
-            {{ serverErrorText }}
-          </div>
-          <div v-else class="clr-subtext">
-            E.g: nas, nas.it.com or 192.168.0.1
-          </div>
+          {{ serverErrorText }}
+        </div>
+        <div v-else class="clr-subtext">
+          E.g: nas, nas.it.com or 192.168.0.1
         </div>
       </div>
     </div>
@@ -117,21 +112,19 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Localization,
-  UI_I_ArbitraryObject,
-} from '~/lib/models/interfaces'
-import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
+
+const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
+const isShowAlertInfo = defineModel<boolean>('alertInfo', { required: true })
 
 const props = defineProps<{
-  project: UI_T_Project
   alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  messagesFields: UI_I_WizardStep['fields']
 }>()
-const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
 }>()
@@ -149,37 +142,41 @@ const initValidation = (onlyBlur = false, types: string[]): void => {
 
 /* Validation error text for Name input field */
 const nameErrorText = computed<string>(() => {
-  if (props.messagesFields?.name?.field && !model.value.name) {
+  if (props.messagesFields?.name?.field && !formModelLocal.value.name) {
     return props.messagesFields.name.field
   }
 
   if (!initValidationFields.value.name) return ''
-  return !model.value.name ? localization.value.common.specifyDatastoreName : ''
+  return !formModelLocal.value.name
+    ? localization.value.common.specifyDatastoreName
+    : ''
 })
 
 /* Validation error text for Folder input field */
 const folderErrorText = computed<string>(() => {
-  if (props.messagesFields.folder?.field && !model.value.folder) {
+  if (props.messagesFields.folder?.field && !formModelLocal.value.folder) {
     return props.messagesFields.folder.field
   }
 
   if (!initValidationFields.value.folder) return ''
-  return !model.value.folder ? localization.value.common.specifyFolderName : ''
+  return !formModelLocal.value.folder
+    ? localization.value.common.specifyFolderName
+    : ''
 })
 
 /* Validation error text for Server input field */
 const serverErrorText = computed<string>(() => {
-  if (props.messagesFields.server?.field && !model.value.server) {
+  if (props.messagesFields.server?.field && !formModelLocal.value.server) {
     return props.messagesFields.server.field
   }
 
   if (!initValidationFields.value.server) return ''
-  return !model.value.server ? localization.value.common.specifyServerName : ''
+  return !formModelLocal.value.server
+    ? localization.value.common.specifyServerName
+    : ''
 })
-const onHideAlert = (): void => {
-  emits('hide-alert', 5)
-}
-const alertInfo = ref<boolean>(props.project === 'procurator')
+const onHideAlert = (): void =>
+  emits('hide-alert', dynamicSteps.nameAndConfigure)
 </script>
 
 <style lang="scss" scoped>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.77",
+  "version": "1.5.78",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/components/common/wizards/datastore/add/readyComplete/ReadyComplete.vue

@@ -1,92 +0,0 @@
-<template>
-  <div class="ready-complete">
-    <common-details-list :items="properties" class="ready-complete__list list">
-      <template #default="{ item }">
-        <common-details-item
-          :has-children="true"
-          open-by-default
-          :test-id="item.testId"
-        >
-          <template #stackBlockKey>
-            <span class="list__labels">
-              {{ item.label }}
-            </span>
-          </template>
-
-          <template #stackChildren>
-            <template
-              v-for="(item2, key2) in item.items"
-              :key="`${item2}_${key2}`"
-            >
-              <common-details-item
-                :has-children="false"
-                :test-id="item2.testId"
-                class="list__default-style"
-              >
-                <template #stackBlockKey>
-                  <div>
-                    {{ item2.label }}
-                  </div>
-                </template>
-                <template #stackBlockContent>
-                  <div v-if="item2.data">
-                    <div
-                      v-for="item3 in item2.data"
-                      :key="item3"
-                      class="flex-align-center"
-                    >
-                      <div class="vsphere-icon-host"></div>
-                      <span>{{ item3 }}</span>
-                    </div>
-                  </div>
-                  <span v-else>
-                    {{ item2.value }}
-                  </span>
-                </template>
-              </common-details-item>
-            </template>
-          </template>
-        </common-details-item>
-      </template>
-    </common-details-list>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  dataReadyView: UI_I_DetailsItem[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const properties = computed<UI_I_DetailsItem[]>(() => props.dataReadyView)
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-.ready-complete {
-  &__list {
-    @include flex($dir: column);
-    padding: 12px 0;
-    row-gap: 15px;
-  }
-}
-.list {
-  &__labels {
-    @include text($fs: 13px, $fw: 700);
-  }
-  :deep(.list__default-style) {
-    .stack-block {
-      &__label {
-        align-items: flex-start;
-      }
-      &-content {
-        white-space: pre-line;
-      }
-    }
-  }
-}
-</style>

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

@@ -1,142 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-const constructLunDiskItems = (
-  disks: UI_I_CreateStorageLunDiskItem[]
-): string => {
-  const { $binary } = useNuxtApp() as any
-
-  let result = ''
-  disks.forEach((disk: UI_I_CreateStorageLunDiskItem) => {
-    const capacity = $binary.round(disk.capacity_mb)
-    result += `${disk.name} - ${capacity} \n`
-  })
-  return result
-}
-
-const nfsDetailsFunc = (
-  localization: UI_I_Localization,
-  data: UI_I_CreateDatastoreForm,
-  project: UI_T_Project,
-  nfsHosts: UI_I_CreateDatastoreHosts
-): UI_I_DetailsItem[] => {
-  const { name, server, folder, nfsVersion, hosts } = data
-  // const accessMode = readonly ? 'Read-only' : 'Read-write'
-
-  const details: UI_I_DetailsItem[] = [
-    {
-      label: localization.common.nfsVersion,
-      value: '',
-      items: [
-        {
-          label: localization.common.version,
-          value: nfsVersion.toUpperCase(),
-          items: [],
-          testId: 'view-selected-nfs-version-in-complete',
-        },
-      ],
-      actions: [],
-      testId: 'view-selected-nfs-version',
-    },
-    {
-      label: localization.common.nameAndConfiguration,
-      value: '',
-      items: [
-        {
-          label: localization.common.datastoreName,
-          value: name,
-          items: [],
-          testId: 'view-storage-name-in-complete',
-        },
-        {
-          label: localization.common.server,
-          value: server,
-          items: [],
-          testId: 'view-server-name-in-complete',
-        },
-        {
-          label: localization.common.folder,
-          value: folder,
-          items: [],
-          testId: 'view-folder-name-in-complete',
-        },
-        // {
-        //   label: localization.accessMode,
-        //   value: accessMode,
-        //   items: [],
-        // },
-      ],
-      actions: [],
-      testId: 'view-selected-name-configuration',
-    },
-  ]
-
-  if (project === 'sphere') {
-    const hostsNames = nfsHosts
-      ? nfsHosts.items
-          .filter((host) => data.hosts.includes(host.id))
-          .map((host) => host.host)
-      : []
-    details.push({
-      label: localization.common.hostsAccessibility,
-      value: '',
-      items: [
-        {
-          label: localization.common.hosts,
-          value: '',
-          data: hostsNames,
-          items: [],
-          testId: 'view-hosts-name-in-complete',
-        },
-      ],
-      actions: [],
-    })
-  }
-
-  return details
-}
-const sharedStormDetailsFunc = (
-  localization: UI_I_Localization,
-  data: UI_I_CreateDatastoreForm
-): UI_I_DetailsItem[] => {
-  const { name, lunDisk } = data
-
-  return [
-    {
-      label: localization.common.nameAndDeviceSelection,
-      value: '',
-      items: [
-        {
-          label: localization.common.datastoreName,
-          value: name,
-          items: [],
-          testId: 'view-storage-name-in-complete',
-        },
-        {
-          label: localization.common.diskLun,
-          value: constructLunDiskItems(lunDisk),
-          items: [],
-          testId: 'view-selected-lun-disks-in-complete',
-        },
-      ],
-      actions: [],
-    },
-  ]
-}
-
-export const constructDataReadyViewFunc = (
-  localization: UI_I_Localization,
-  data: UI_I_CreateDatastoreForm,
-  project: UI_T_Project,
-  nfsHosts: UI_I_CreateDatastoreHosts
-): UI_I_DetailsItem[] => {
-  const details = {
-    2: sharedStormDetailsFunc,
-    4: nfsDetailsFunc,
-  }
-
-  return details[data.type_code as 2 | 4](localization, data, project, nfsHosts)
-}