bfg-common 1.3.418 → 1.3.420

package/components/atoms/wizard/lib/utils/utils.ts

@@ -450,6 +450,45 @@ export default class Wizard {
     return selectedStep !== undefined ? selectedStep.id : this.steps[0].id
   }
 
+  private async finalValidationFunc(
+    value: UI_I_WizardStep[],
+    currentStep: UI_I_WizardStep,
+    nextStep: UI_I_WizardStep,
+    finalValidationFunc: (
+      value: UI_I_WizardStep[],
+      currentStep: UI_I_WizardStep,
+      nextStep: UI_I_WizardStep
+    ) => Promise<UI_I_ValidationReturn>,
+    isOnlyFinalValidation = false
+  ) {
+    const finalValidation: UI_I_ValidationReturn = await finalValidationFunc(
+      value,
+      currentStep,
+      nextStep
+    )
+
+    if (
+      finalValidation.stepHasError ||
+      finalValidation.stepShouldStop?.ifFromAnyStep ||
+      finalValidation.stepShouldStop?.ifOnCurrentStep
+    ) {
+      finalValidation.stepShouldStop?.ifFromAnyStep &&
+        currentStep.id < finalValidation.stepShouldStop?.stoppageStepId &&
+        this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
+
+      finalValidation.stepShouldStop?.ifOnCurrentStep &&
+        this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
+
+      finalValidation.stepHasError && this.goToFirstInvalidStep()
+
+      return
+    } else {
+      currentStep.status = UI_E_WIZARD_STATUS.COMPLETED
+    }
+
+    this.changeStep(finalValidation.newValue)
+  }
+
   async changeSteps(
     value: UI_I_WizardStep[],
     validationFunc?: (
@@ -461,7 +500,8 @@ export default class Wizard {
       value: UI_I_WizardStep[],
       currentStep: UI_I_WizardStep,
       nextStep: UI_I_WizardStep
-    ) => Promise<UI_I_ValidationReturn>
+    ) => Promise<UI_I_ValidationReturn>,
+    isOnlyFinalValidation = false
   ): Promise<void> {
     const currentStep: UI_I_WizardStep | undefined = this.steps.find(
       (step: UI_I_WizardStep) => this.isSelected(step.status)
@@ -474,6 +514,24 @@ export default class Wizard {
     if (!currentStep || !nextStep) return
     if (currentStep.id > nextStep.id) return this.changeStep(value)
 
+    if (
+      isOnlyFinalValidation &&
+      (this.isLastStep() ||
+        nextStep.id ===
+          this.selectedScheme.value[this.selectedScheme.value.length - 1]) &&
+      finalValidationFunc
+    ) {
+      this.finalValidationFunc(
+        value,
+        currentStep,
+        nextStep,
+        finalValidationFunc,
+        isOnlyFinalValidation
+      )
+
+      return
+    }
+
     if (validationFunc) {
       const validation: UI_I_ValidationReturn = await validationFunc(
         value,
@@ -502,29 +560,13 @@ export default class Wizard {
             this.selectedScheme.value[this.selectedScheme.value.length - 1]) &&
         finalValidationFunc
       ) {
-        const finalValidation: UI_I_ValidationReturn =
-          await finalValidationFunc(value, currentStep, nextStep)
-
-        if (
-          finalValidation.stepHasError ||
-          finalValidation.stepShouldStop?.ifFromAnyStep ||
-          finalValidation.stepShouldStop?.ifOnCurrentStep
-        ) {
-          finalValidation.stepShouldStop?.ifFromAnyStep &&
-            currentStep.id < finalValidation.stepShouldStop?.stoppageStepId &&
-            this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
-
-          finalValidation.stepShouldStop?.ifOnCurrentStep &&
-            this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
-
-          finalValidation.stepHasError && this.goToFirstInvalidStep()
-
-          return
-        } else {
-          currentStep.status = UI_E_WIZARD_STATUS.COMPLETED
-        }
-
-        this.changeStep(finalValidation.newValue)
+        this.finalValidationFunc(
+          value,
+          currentStep,
+          nextStep,
+          finalValidationFunc,
+          isOnlyFinalValidation
+        )
 
         return
       } else {
@@ -658,10 +700,6 @@ export default class Wizard {
   }
 
   isLastStep(): boolean {
-    console.log(
-      this.selectedScheme.value[this.selectedScheme.value.length - 2],
-      this.selectedStepId
-    )
     return (
       this.selectedScheme.value[this.selectedScheme.value.length - 2] ===
       this.selectedStepId

package/components/common/wizards/datastore/add/nfs/Nfs.vue

@@ -1,14 +1,12 @@
 <template>
   <div class="nfs-container">
-    <span class="nfs-container__desc">{{ stepSubTitle }}</span>
-
     <common-wizards-datastore-add-nfs-version
-      v-show="props.stepPosition === 1"
+      v-show="props.stepId === 4"
       v-model:version="nfsVersion"
     />
 
     <common-wizards-datastore-add-nfs-configuration
-      v-show="props.stepPosition === 2"
+      v-show="props.stepId === 5"
       :mode="props.mode"
       :nfs-version="nfsVersion"
       :nfs-configuration-submit="nfsConfigurationSubmit"
@@ -39,11 +37,10 @@ import {
   UI_T_WizardDatastoreMode,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
-import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
 
 const props = defineProps<{
   mode: UI_T_WizardDatastoreMode
-  stepPosition: number
+  stepId: number
   datastoreType: UI_T_DatastoreType
   nfsConfigurationSubmit: number
   hostAccessibilitySubmit: number
@@ -59,16 +56,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const nfsVersion = ref<UI_T_NfsType>('nfs-3')
 
-const stepSubTitle = computed<string>(() => {
-  const { datastoreType, stepPosition } = props
-  return subTitleFunc(
-    localization.value,
-    datastoreType,
-    stepPosition,
-    nfsVersion.value
-  )
-})
-
 // const showHostAccessibility = computed<boolean>(() => {
 //   return (
 //     (props.stepPosition === 4 && nfsVersion.value === 'nfs-4.1') ||
@@ -76,7 +63,7 @@ const stepSubTitle = computed<string>(() => {
 //   )
 // })
 const showHostAccessibility = computed<boolean>(() => {
-  return props.mode === 'sphere' && props.stepPosition === 3
+  return props.mode === 'sphere' && props.stepId === 6
 })
 
 watch(nfsVersion, (newValue: UI_T_NfsType) => {

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

@@ -13,17 +13,15 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
-        {{ datastoreType }}
         <common-wizards-datastore-new-add-types
           v-if="selectedStep.id === 0"
           v-model:datastore-type="datastoreType"
           :project="props.project"
         />
 
-        <common-wizards-datastore-add-local
-          v-show="datastoreType === 'local' && !isShowCompleteBlock"
+        <common-wizards-datastore-new-add-local
+          v-show="selectedStep.id === 1"
           :mode="props.project"
-          :step-position="stepPosition"
           :datastore-type="datastoreType"
           :local-create-name-submit="localCreateNameSubmit"
           :datacenter-hosts="props.datacenterHosts"
@@ -34,9 +32,9 @@
         />
 
         <common-wizards-datastore-add-shared-storm
-          v-show="datastoreType === 'shared-storm' && !isShowCompleteBlock"
+          v-show="datastoreType === 'shared-storm'"
           :mode="props.project"
-          :step-position="stepPosition"
+          :step-id="selectedStep.id"
           :datastore-type="datastoreType"
           :device-selection-submit="deviceSelectionSubmit"
           :datacenter-hosts="props.datacenterHosts"
@@ -48,9 +46,9 @@
         />
 
         <common-wizards-datastore-add-nfs
-          v-show="datastoreType === 'nfs' && !isShowCompleteBlock"
+          v-show="datastoreType === 'nfs'"
           :mode="props.project"
-          :step-position="stepPosition"
+          :step-id="selectedStep.id"
           :datastore-type="datastoreType"
           :nfs-configuration-submit="nfsConfigurationSubmit"
           :host-accessibility-submit="hostAccessibilitySubmit"
@@ -61,7 +59,7 @@
         />
 
         <common-wizards-datastore-add-ready-complete
-          v-show="isShowCompleteBlock"
+          v-show="selectedStep.id === 11"
           :data-ready-view="dataReadyView"
         />
       </template>
@@ -175,14 +173,21 @@ const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
 
 // Choosing Scheme
 watch(
-  [datastoreType, props.project],
-  (newValues) => {
-    console.log(newValues, 'newValues')
-    const [type, project] = newValues
-    console.log(type)
-    console.log(project)
-
-    // wizard.changeScheme(4)
+  datastoreType,
+  (newValue: UI_T_DatastoreType) => {
+    if (props.project === 'procurator') {
+      if (newValue === 'local') {
+        wizard.changeScheme(0)
+      }
+
+      if (newValue === 'shared-storm') {
+        wizard.changeScheme(1)
+      }
+
+      if (newValue === 'nfs') {
+        wizard.changeScheme(2)
+      }
+    }
   },
   { deep: true, immediate: true }
 )
@@ -354,44 +359,44 @@ const saveChangesAndNextNfs = (event: any, next = true): void => {
   next && onNextStep(true)
 }
 
-const isShowCompleteBlock = computed<boolean>(() => {
-  // TODO refactoring
-  const localStep = datastoreType.value === 'local' && stepPosition.value === 2
-
-  const sharesStep =
-    datastoreType.value === 'shared-storm' &&
-    (props.project === 'procurator'
-      ? stepPosition.value === 3
-      : stepPosition.value === 2)
-
-  let nfsFirst
-  if (props.project === 'procurator') {
-    nfsFirst =
-      datastoreType.value === 'nfs' &&
-      nfsVersion.value === 'nfs-3' &&
-      stepPosition.value === 3
-  } else {
-    nfsFirst =
-      datastoreType.value === 'nfs' &&
-      nfsVersion.value === 'nfs-3' &&
-      stepPosition.value === 4
-  }
-
-  let nfsSecond
-  if (props.project === 'procurator') {
-    nfsSecond =
-      datastoreType.value === 'nfs' &&
-      nfsVersion.value === 'nfs-4.1' &&
-      stepPosition.value === 3
-  } else {
-    nfsSecond =
-      datastoreType.value === 'nfs' &&
-      nfsVersion.value === 'nfs-4.1' &&
-      stepPosition.value === 4
-  }
-
-  return localStep || sharesStep || nfsFirst || nfsSecond
-})
+// const isShowCompleteBlock = computed<boolean>(() => {
+//   // TODO refactoring
+//   const localStep = datastoreType.value === 'local' && stepPosition.value === 2
+//
+//   const sharesStep =
+//     datastoreType.value === 'shared-storm' &&
+//     (props.project === 'procurator'
+//       ? stepPosition.value === 3
+//       : stepPosition.value === 2)
+//
+//   let nfsFirst
+//   if (props.project === 'procurator') {
+//     nfsFirst =
+//       datastoreType.value === 'nfs' &&
+//       nfsVersion.value === 'nfs-3' &&
+//       stepPosition.value === 3
+//   } else {
+//     nfsFirst =
+//       datastoreType.value === 'nfs' &&
+//       nfsVersion.value === 'nfs-3' &&
+//       stepPosition.value === 4
+//   }
+//
+//   let nfsSecond
+//   if (props.project === 'procurator') {
+//     nfsSecond =
+//       datastoreType.value === 'nfs' &&
+//       nfsVersion.value === 'nfs-4.1' &&
+//       stepPosition.value === 3
+//   } else {
+//     nfsSecond =
+//       datastoreType.value === 'nfs' &&
+//       nfsVersion.value === 'nfs-4.1' &&
+//       stepPosition.value === 4
+//   }
+//
+//   return localStep || sharesStep || nfsFirst || nfsSecond
+// })
 
 const onAddDatastore = async (): Promise<void> => {
   loading.value = true

package/components/common/wizards/datastoreNew/add/lib/config/stepItems.ts

@@ -11,7 +11,7 @@ const stepFromSharedStorm = (
   mode: UI_T_WizardDatastoreMode
 ): UI_I_VerticalStepItem[] => {
   const steps = [
-    { text: localization.type, disabled: false, complete: false },
+    // { text: localization.type, disabled: false, complete: false },
     {
       text: localization.nameAndDeviceSelection,
       disabled: true,

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

@@ -8,7 +8,6 @@ export const stepsFunc = (
   {
     id: 0,
     title: localization.type,
-    subTitle: localization.selectConnectionTypeToCreate,
     status: UI_E_WIZARD_STATUS.SELECTED,
     fields: {},
     isValid: true,
@@ -18,7 +17,6 @@ export const stepsFunc = (
   {
     id: 1,
     title: localization.selectDatastoreName,
-    subTitle: localization.selectConnectionTypeToCreate,
     status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {
       datastoreName: {
@@ -29,6 +27,54 @@ export const stepsFunc = (
     isValid: true,
     testId: 'select-datastore-name',
   },
+  {
+    id: 2,
+    title: localization.nameAndDeviceSelection,
+    subTitle: localization.nameAndDeviceSelectionDesc,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
+    testId: 'select-name-and-device-selection',
+  },
+
+  {
+    id: 3,
+    title: localization.partitionConfiguration,
+    subTitle: localization.partitionConfigurationDesc,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
+    testId: 'select-partition-configuration',
+  },
+
+  {
+    id: 4,
+    title: localization.nfsVersion,
+    subTitle: localization.selectNfsVersion,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
+    testId: 'select-nfs-version',
+  },
+  {
+    id: 5,
+    title: localization.nameAndConfiguration,
+    subTitle: localization.nameAndConfigurationDesc,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
+    testId: 'select-name-and-configuration',
+  },
+
+  {
+    id: 6,
+    title: localization.hostsAccessibility,
+    subTitle: localization.hostsAccessibilityDesc,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
+    testId: 'select-hosts-accessibility',
+  },
 
   // {
   //   id: 1,
@@ -138,9 +184,9 @@ export const stepsFunc = (
   //   testId: 'add-physical-network-adapter',
   // },
   {
-    id: 7,
+    id: 11,
     title: localization.readyComplete,
-    subTitle: localization.reviewYourSettingsSelectionsWizard,
+    subTitle: localization.readyCompleteDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},
     isValid: true,
@@ -149,6 +195,8 @@ export const stepsFunc = (
 ]
 
 export const stepsSchemeInitial: number[][] = [
-  [0, 1, 7], // Procurator
-  [0, 2, 7], // Sphere
+  [0, 1, 11], // Procurator Scheme for "local" type
+  [0, 2, 3, 11], // Procurator Scheme for "shared-storm" type
+  [0, 4, 5, 11], // Procurator Scheme for "nfs" type
+  [0, 2, 11], // Sphere
 ]

package/components/common/wizards/datastoreNew/add/local/Local.vue

@@ -1,25 +1,22 @@
 <template>
   <div class="local-step">
-    <span
-      v-if="mode === 'sphere' && props.stepPosition === 1"
-      class="vmfs-container__desc"
-    >
+    <span v-if="mode === 'sphere'" class="vmfs-container__desc">
       {{ localization.nameAndDeviceSelectionDesc }}
     </span>
 
-    <common-wizards-datastore-add-local-create-name
-      v-show="mode === 'procurator' && props.stepPosition === 1"
+    <common-wizards-datastore-new-add-local-create-name
+      v-show="mode === 'procurator'"
       :local-create-name-submit="props.localCreateNameSubmit"
       @loading="(e) => emits('loading', e)"
       @submit="(e) => emits('submit', e)"
     />
 
-    <common-wizards-datastore-add-shared-storm-device-selection
-      v-show="mode === 'sphere' && props.stepPosition === 1"
+    <common-wizards-datastore-new-add-shared-storm-device-selection
+      v-show="mode === 'sphere'"
       v-model:lun-disk="selectedLunDisk"
       mode="sphere"
       :device-selection-submit="props.localCreateNameSubmit"
-      :step-position="props.stepPosition"
+      :step-position="1"
       :datastore-type="props.datastoreType"
       :datacenter-hosts="props.datacenterHosts"
       :is-main-filter="props.isMainFilter"
@@ -42,7 +39,6 @@ import {
 import { UI_I_Localization } from '~/lib/models/interfaces'
 
 const props = defineProps<{
-  stepPosition: number
   localCreateNameSubmit: number
   datastoreType: UI_T_DatastoreType
   mode: UI_T_WizardDatastoreMode

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

@@ -1,7 +1,5 @@
 <template>
   <div class="ready-complete">
-    <div class="ready-complete__desc">{{ localization.readyCompleteDesc }}</div>
-
     <common-details-list :items="properties" class="ready-complete__list list">
       <template #default="{ item }">
         <common-details-item :has-children="true" open-by-default>
@@ -27,7 +25,11 @@
                 </template>
                 <template #stackBlockContent>
                   <div v-if="item2.data">
-                    <div v-for="item3 in item2.data" :key="item3" class="flex-align-center">
+                    <div
+                      v-for="item3 in item2.data"
+                      :key="item3"
+                      class="flex-align-center"
+                    >
                       <div class="vsphere-icon-host"></div>
                       <span>{{ item3 }}</span>
                     </div>

package/components/common/wizards/datastoreNew/add/sharedStorm/SharedStorm.vue

@@ -1,12 +1,10 @@
 <template>
   <div class="vmfs-container">
-    <span class="vmfs-container__desc">{{ stepSubTitle }}</span>
-
     <common-wizards-datastore-add-shared-storm-device-selection
-      v-show="props.stepPosition === 1"
+      v-show="props.stepId === 2"
       v-model:lun-disk="selectedLunDisk"
       :device-selection-submit="props.deviceSelectionSubmit"
-      :step-position="props.stepPosition"
+      :step-position="1"
       :datastore-type="props.datastoreType"
       :mode="props.mode"
       :datacenter-hosts="props.datacenterHosts"
@@ -24,7 +22,7 @@
     <!-- TODO в shared-storm пока верси не будет  -->
 
     <common-wizards-datastore-add-shared-storm-partition-configuration
-      v-show="props.mode === 'procurator' && props.stepPosition === 2"
+      v-show="props.mode === 'procurator' && props.stepId === 3"
       :vmfs-version="vmfsVersion"
       :selected-lun-disk-size="lunDiskTotalCapacity"
     />
@@ -42,11 +40,10 @@ import {
   UI_I_SelectHostOptions,
   UI_I_CreateStorageLunDiskItem,
 } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
 
 const props = defineProps<{
   mode: UI_T_WizardDatastoreMode
-  stepPosition: number
+  stepId: number
   deviceSelectionSubmit: number
   datastoreType: UI_T_DatastoreType
   datacenterHosts?: UI_I_SelectHostOptions[]
@@ -71,11 +68,6 @@ const lunDiskTotalCapacity = computed<number>(() => {
     .map((disk) => disk.capacity_mb)
     .reduce((acc, cur) => acc + cur)
 })
-
-const stepSubTitle = computed<string>(() => {
-  const { datastoreType, stepPosition } = props
-  return subTitleFunc(localization.value, datastoreType, stepPosition)
-})
 </script>
 
 <style lang="scss" scoped>
@@ -86,6 +78,7 @@ const stepSubTitle = computed<string>(() => {
   overflow-x: hidden;
   height: 100%;
   &_desc {
+
   }
 }
 </style>

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

@@ -132,6 +132,7 @@ import {
 import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
+  UI_I_WizardStepNavigation,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
 import { getVlanId } from '~/components/common/wizards/network/add/lib/utils'
@@ -252,7 +253,8 @@ const onChangeTargetDevice = (newTargetDevice: UI_I_TargetDevice): void => {
   }
 
   const selectedSwitch = props.standardSwitchesInitial.find(
-    (sw) => newTargetDevice.standardSwitch === sw.name
+    (currentSwitch: UI_I_Switch) =>
+      newTargetDevice.standardSwitch === currentSwitch.name
   )
 
   if (newTargetDeviceSelected === '1' && selectedSwitch) {
@@ -365,7 +367,8 @@ watch(
     }
     if (newSelectedStep === 6 && flagSwitch !== targetDevice.value.switch) {
       const nics = props.standardSwitchesInitial.find(
-        (sw) => sw.id === targetDevice.value.switch
+        (currentSwitch: UI_I_Switch) =>
+          currentSwitch.id === targetDevice.value.switch
       ).nics
       adapterStatus.value = {
         active: nics.active || [],
@@ -465,6 +468,20 @@ const onHideNoActiveAdaptersModal = (): void => {
 const onConfirmNoActiveAdaptersModal = (): void => {
   onHideNoConnectedActiveAdaptersModal()
   onHideNoActiveAdaptersModal()
+  if (wizard.waitingStepId === 7) {
+    wizard.changeSteps(
+      wizard.selectedStepData(
+        wizard.stepsInSelectedSchemeWithStatus.value.find(
+          (step: UI_I_WizardStepNavigation) => step.id === 7
+        )
+      ),
+      validationFunc,
+      finalValidationFunc,
+      true
+    )
+    wizard.waitingStepId = -1
+    return
+  }
   wizard.selectStepHard(wizard.waitingStepId)
 }
 
@@ -597,7 +614,8 @@ const validationFunc = async (
       nextStep.id,
       props.freeAdapters,
       showNoActiveAdaptersModal,
-      showNoConnectedActiveAdaptersModal
+      showNoConnectedActiveAdaptersModal,
+      2
     )
 
     value = adapterValidation.newValue
@@ -676,21 +694,27 @@ const validationFunc = async (
       connectionSettingsValidation.stepHasError
   }
 
-  // if (wizard.isValidateForStep(6, currentStep.id, nextStep.id)) {
-  //     const connectionSettingsValidation = checkConnectionSettingsSync(
-  //         localization.value,
-  //         connectionSettings.value,
-  //         wizard,
-  //         value
-  //     )
-  //
-  //     value = connectionSettingsValidation.newValue
-  //
-  //     stepHasError =
-  //         stepHasError ||
-  //         labelValidation.stepHasError ||
-  //         connectionSettingsValidation.stepHasError
-  // }
+  if (wizard.isValidateForStep(6, currentStep.id, nextStep.id)) {
+    wizard.waitingStepId = nextStep.id
+
+    const adapterValidation = checkAdaptersSync(
+      localization.value,
+      adapterStatus.value,
+      value,
+      currentStep.id,
+      nextStep.id,
+      props.adapters.items,
+      showNoActiveAdaptersModal,
+      showNoConnectedActiveAdaptersModal,
+      6
+    )
+
+    value = adapterValidation.newValue
+
+    stepShouldStop = adapterValidation.stepShouldStop || stepShouldStop
+
+    stepHasError = stepHasError || adapterValidation.stepHasError
+  }
 
   return {
     newValue: value,

package/components/common/wizards/network/add/validations/createStandardSwitch.ts

@@ -16,17 +16,18 @@ export const checkAdaptersSync = (
   nextStepId: number,
   freeAdapters: UI_I_Adapter[],
   showNoActiveAdaptersModal: () => void,
-  showNoConnectedActiveAdaptersModal: () => void
+  showNoConnectedActiveAdaptersModal: () => void,
+  stoppageStepId: number
 ): UI_I_ValidationReturn => {
   const stepShouldStop = {
     ifOnCurrentStep: false,
     ifFromAnyStep: false,
-    stoppageStepId: 2,
+    stoppageStepId,
   }
 
   const isOnStoppageStep = currentStepId === stepShouldStop.stoppageStepId
 
-  if (isOnStoppageStep && data.active.length === 0) {
+  if (isOnStoppageStep && data.active?.length === 0) {
     stepShouldStop.ifOnCurrentStep = true
     showNoActiveAdaptersModal()
   }
@@ -38,14 +39,14 @@ export const checkAdaptersSync = (
       stepShouldStop,
     }
 
-  const activeAndConnectedAdapters = data.active.filter(
+  const activeAndConnectedAdapters = data.active?.filter(
     (adapterName: string) =>
       freeAdapters.find(
         (freeAdapter: UI_I_Adapter) => freeAdapter.name === adapterName
       )?.carrier
   )
 
-  if (isOnStoppageStep && activeAndConnectedAdapters.length === 0) {
+  if (isOnStoppageStep && activeAndConnectedAdapters?.length === 0) {
     stepShouldStop.ifOnCurrentStep = true
     showNoConnectedActiveAdaptersModal()
   }

package/package.json

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