bfg-common 1.2.186 → 1.2.187

package/components/common/{addNetworking → wizards/network/add}/config/index.ts

@@ -1,15 +1,12 @@
-import * as addNetworkingStepsConfig from './addNetworkingSteps'
+import * as addNetworkingStepsConfig from './steps'
 import * as initialData from './initialData'
-import * as temporaryData from './temporaryData'
-import * as validationData from './validation'
 import * as portProperties from './portPropertiesStep'
 import * as selectSwitches from './selectSwitch'
 import * as sendData from './sendData'
 
 export const {
   stepsFunc,
-  stepsSchemeFunc,
-  secondTitleFunc,
+  stepsSchemeInitial,
   createSecondSchemeReadyCompleteFunc,
   createZeroSchemeReadyCompleteFunc,
   createFirstSchemeReadyCompleteFunc,
@@ -22,18 +19,7 @@ export const {
   portPropertiesInitial,
   ipFourSettingsInitial,
   connectionSettingsInitial,
-  errorMessagesInitialFunc,
-  isNetworkInvalidInitial,
-  isValidNetwork,
-  isInvalidNetwork,
 } = initialData
-export const { temporarySwitches, temporaryNetworks } = temporaryData
-export const {
-  connectionSettingsFieldsErrorMessages,
-  ipFourSettingsFieldsErrorMessages,
-  portPropertiesFieldsErrorMessages,
-  targetDeviceFieldsErrorMessages,
-} = validationData
 export const { portPropertiesEnabledServicesFunc } = portProperties
 export const {
   selectStandardSwitchTableHeadFunc,

package/components/common/{addNetworking → wizards/network/add}/config/initialData.ts

@@ -1,11 +1,12 @@
 import {
   UI_I_ConnectionSettings,
-  UI_I_IpFourSettings, UI_I_NetworkValidation,
+  UI_I_IpFourSettings,
+  UI_I_NetworkValidation,
   UI_I_PortProperties,
   UI_I_Services,
   UI_I_TargetDevice,
   UI_I_VlanIdData,
-} from '~/components/common/addNetworking/models/interfaces'
+} from '~/components/common/wizards/network/add/models/interfaces'
 
 export const servicesInitial: UI_I_Services = {
   vMotion: false,
@@ -56,23 +57,7 @@ export const connectionSettingsInitial: UI_I_ConnectionSettings = {
   vlanId: 'None (0)',
 }
 
-export const errorMessagesInitialFunc = (qty: number): string[][] =>
-  new Array(qty).fill([])
-
 export const vlanIdSelectData: UI_I_VlanIdData[] = [
   { text: 'None (0)', value: 'None (0)' },
   { text: 'All (4095)', value: 'All (4095)' },
-]
-
-export const isNetworkInvalidInitial: UI_I_NetworkValidation = {
-  valid: false,
-  checked: false,
-}
-export const isValidNetwork: UI_I_NetworkValidation = {
-  valid: true,
-  checked: true,
-}
-export const isInvalidNetwork: UI_I_NetworkValidation = {
-  valid: false,
-  checked: true,
-}
+]

package/components/common/{addNetworking → wizards/network/add}/config/portPropertiesStep.ts

@@ -1,5 +1,5 @@
 import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_PortPropertiesEnabledService } from '~/components/common/addNetworking/models/interfaces'
+import { UI_I_PortPropertiesEnabledService } from '~/components/common/wizards/network/add/models/interfaces'
 
 export const portPropertiesEnabledServicesFunc = (
   localization: UI_I_Localization,

package/components/common/{addNetworking → wizards/network/add}/config/selectSwitch.ts

@@ -1,5 +1,5 @@
 import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_TableHead } from '~/components/common/addNetworking/models/interfaces'
+import { UI_I_TableHead } from '~/components/common/wizards/network/add/models/interfaces'
 
 export const selectNetworkTableHeadFunc = (
   localization: UI_I_Localization

package/components/common/{addNetworking → wizards/network/add}/config/sendData.ts

@@ -5,7 +5,7 @@ import {
   UI_I_PortProperties,
   UI_I_TargetDevice,
   UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
-} from '~/components/common/addNetworking/models/interfaces'
+} from '~/components/common/wizards/network/add/models/interfaces'
 import { UI_I_AdapterStatus } from '~/components/common/diagramMain/models/interfaces'
 
 export const addNetworkingSecondOrThirdSchemeDataFunc = (

package/components/common/{addNetworking/config/addNetworkingSteps.ts → wizards/network/add/config/steps.ts}

@@ -5,96 +5,143 @@ import {
   UI_I_PortProperties,
   UI_I_ReadyCompleteData,
   UI_I_ReadyCompleteFirstColumn,
-  UI_I_Step,
   UI_I_TargetDevice,
-} from '~/components/common/addNetworking/models/interfaces'
+} from '~/components/common/wizards/network/add/models/interfaces'
+import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/models/enums'
+import { UI_I_WizardStep } from '~/components/atoms/wizard/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/models/enums'
 
-export const stepsFunc = (localization: UI_I_Localization): UI_I_Step[] => [
+export const stepsFunc = (
+  localization: UI_I_Localization
+): UI_I_WizardStep[] => [
   {
     id: 0,
-    name: localization.selectConnectionType,
-    status: 0,
+    title: localization.selectConnectionType,
+    subTitle: localization.selectConnectionTypeToCreate,
+    status: UI_E_WIZARD_STATUS.SELECTED,
+    fields: {},
+    isValid: true,
   },
   {
     id: 1,
-    name: localization.selectTargetDevice,
-    status: 0,
+    title: localization.selectTargetDevice,
+    subTitle: localization.selectTargetDeviceForNewConnection,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      [UI_E_ValidationFields.TARGET_DEVICE_STANDARD_SWITCH]: {
+        alert: '',
+        field: '',
+      },
+      [UI_E_ValidationFields.TARGET_DEVICE_NETWORK]: {
+        alert: '',
+        field: '',
+      },
+      [UI_E_ValidationFields.TARGET_DEVICE_SWITCH]: {
+        alert: '',
+        field: '',
+      },
+      [UI_E_ValidationFields.TARGET_DEVICE_MTU]: {
+        alert: '',
+        field: '',
+      },
+    },
+    isValid: true,
   },
   {
     id: 2,
-    name: localization.createStandardSwitch,
-    status: 0,
+    title: localization.createStandardSwitch,
+    subTitle: localization.assignFreePhysicalNetworkAdaptersToTheNewSwitch,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
   },
   {
     id: 3,
-    name: localization.portProperties,
-    status: 0,
+    title: localization.portProperties,
+    subTitle: localization.specifyVMkernelPortSettings,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      [UI_E_ValidationFields.PORT_PROPERTIES_NETWORK]: {
+        field: '',
+        alert: '',
+      },
+      [UI_E_ValidationFields.PORT_PROPERTIES_VLAN]: {
+        field: '',
+        alert: '',
+      },
+      [UI_E_ValidationFields.PORT_PROPERTIES_MTU]: {
+        field: '',
+        alert: '',
+      },
+    },
+    isValid: true,
   },
   {
     id: 4,
-    name: localization.ipV4Settings,
-    status: 0,
+    title: localization.ipV4Settings,
+    subTitle: localization.specifyVMkernelIPv4Settings,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      [UI_E_ValidationFields.IPV_SETTINGS_IPV]: {
+        field: '',
+        alert: '',
+      },
+      [UI_E_ValidationFields.IPV_SETTINGS_MASK]: {
+        field: '',
+        alert: '',
+      },
+      [UI_E_ValidationFields.IPV_SETTINGS_GATEWAY]: {
+        field: '',
+        alert: '',
+      },
+    },
+    isValid: true,
   },
   {
     id: 5,
-    name: localization.connectionSettings,
-    status: 0,
+    title: localization.connectionSettings,
+    subTitle:
+      localization.useNetworkLabelsToIdentifyMigrationCompatibleTwoHosts,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      [UI_E_ValidationFields.CONNECTION_SETTINGS_NETWORK]: {
+        field: '',
+        alert: '',
+      },
+      [UI_E_ValidationFields.CONNECTION_SETTINGS_VLAN]: {
+        field: '',
+        alert: '',
+      },
+    },
+    isValid: true,
   },
   {
     id: 6,
-    name: localization.addPhysicalNetworkAdapter,
-    status: 0,
+    title: localization.addPhysicalNetworkAdapter,
+    subTitle: localization.assignPhysicalNetworkAdaptersToTheSwitch,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
   },
   {
     id: 7,
-    name: localization.readyComplete,
-    status: 0,
+    title: localization.readyComplete,
+    subTitle: localization.reviewYourSettingsSelectionsWizard,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
   },
 ]
 
-export const stepsSchemeFunc = (step: UI_I_Step[]): UI_I_Step[][] => [
-  [step[0], step[1], step[3], step[4], step[7]], // Validation done, except for ipv4 (backend problems)
-  [step[0], step[1], step[2], step[3], step[4], step[7]], // Validation done, except for ipv4 (backend problems)
-  [step[0], step[1], step[5], step[7]], // Validation done,
-  [step[0], step[1], step[2], step[5], step[7]], // Disabled
-  [step[0], step[1], step[6], step[7]], // Disabled
-  [step[0], step[1], step[2], step[7]], // Disabled
+export const stepsSchemeInitial: number[][] = [
+  [0, 1, 3, 4, 7], // Validation done, except for ipv4 (backend problems)
+  [0, 1, 2, 3, 4, 7], // Validation done, except for ipv4 (backend problems)
+  [0, 1, 5, 7], // Validation done,
+  [0, 1, 2, 5, 7], // Disabled
+  [0, 1, 6, 7], // Disabled
+  [0, 1, 2, 7], // Disabled
 ]
 
-export const secondTitleFunc = (
-  selectedStep: number,
-  localization: UI_I_Localization
-): string => {
-  let text = ''
-  switch (selectedStep) {
-    case 0:
-      text = localization.selectConnectionType
-      break
-    case 1:
-      text = localization.selectTargetDevice
-      break
-    case 2:
-      text = localization.createStandardSwitch
-      break
-    case 3:
-      text = localization.portProperties
-      break
-    case 4:
-      text = localization.ipV4Settings
-      break
-    case 5:
-      text = localization.connectionSettings
-      break
-    case 6:
-      text = localization.addPhysicalNetworkAdapter
-      break
-    case 7:
-      text = localization.readyComplete
-      break
-  }
-  return text
-}
-
 export const createSecondSchemeReadyCompleteFunc = (
   connectionSettingsValues: UI_I_ConnectionSettings,
   targetDeviceValues: UI_I_TargetDevice,

package/components/common/{addNetworking → wizards/network/add}/modals/SelectNetwork.vue

@@ -47,8 +47,8 @@ import {
   UI_I_BodyItems,
   UI_I_Network,
   UI_I_SelectedNetwork,
-} from '~/components/common/addNetworking/models/interfaces'
-import { selectStandardSwitchTableHeadFunc } from '~/components/common/addNetworking/config'
+} from '~/components/common/wizards/network/add/models/interfaces'
+import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/config'
 
 interface I_SelectNetworkModalProps {
   show: boolean

package/components/common/{addNetworking → wizards/network/add}/modals/SelectStandardSwitch.vue

@@ -36,10 +36,10 @@ import { UI_I_Localization } from '~/models/interfaces'
 import {
     UI_I_Switch,
     UI_I_SelectedSwitch, UI_I_BodyItems,
-} from '~/components/common/addNetworking/models/interfaces'
+} from '~/components/common/wizards/network/add/models/interfaces'
 import {
   selectStandardSwitchTableHeadFunc
-} from '~/components/common/addNetworking/config'
+} from '~/components/common/wizards/network/add/config'
 
 interface I_SelectSwitchModalProps {
   show: boolean

package/components/common/{addNetworking → wizards/network/add}/modals/SelectSwitch.vue

@@ -37,8 +37,8 @@ import {
   UI_I_Switch,
   UI_I_SelectedSwitch,
   UI_I_BodyItems,
-} from '~/components/common/addNetworking/models/interfaces'
-import { selectSwitchTableHeadFunc } from '~/components/common/addNetworking/config'
+} from '~/components/common/wizards/network/add/models/interfaces'
+import { selectSwitchTableHeadFunc } from '~/components/common/wizards/network/add/config'
 
 interface I_SelectSwitchModalProps {
   show: boolean

package/components/common/wizards/network/add/models/enums.ts

@@ -0,0 +1,17 @@
+export enum UI_E_ValidationFields {
+  TARGET_DEVICE_STANDARD_SWITCH = 'switch',
+  TARGET_DEVICE_NETWORK = 'network',
+  TARGET_DEVICE_SWITCH = 'switch2',
+  TARGET_DEVICE_MTU = 'new_switch.mtu',
+
+  PORT_PROPERTIES_NETWORK = 'network_name',
+  PORT_PROPERTIES_VLAN = 'new_network.vlan',
+  PORT_PROPERTIES_MTU = 'mtu',
+
+  IPV_SETTINGS_IPV = 'tcp_config.ipv4',
+  IPV_SETTINGS_MASK = 'tcp_config.net_mask',
+  IPV_SETTINGS_GATEWAY = 'tcp_config.gateway',
+
+  CONNECTION_SETTINGS_NETWORK = 'name',
+  CONNECTION_SETTINGS_VLAN = 'vlan',
+}

package/components/common/{addNetworking → wizards/network/add}/models/interfaces.ts

@@ -1,5 +1,5 @@
-import { UI_E_StepStatus } from '~/components/common/addNetworking/models/enums'
-import { UI_T_TCP } from '~/components/common/addNetworking/models/types'
+import { UI_I_ArbitraryObject } from '~/models/interfaces'
+import { UI_T_TCP } from '~/components/common/wizards/network/add/models/types'
 
 export interface UI_I_Services {
   vMotion?: boolean
@@ -51,12 +51,6 @@ export interface UI_I_SelectVmkernelAdapter {
   vm: string
 }
 
-export interface UI_I_Step {
-  id: number
-  name: string
-  status: UI_E_StepStatus
-}
-
 export interface UI_I_Network {
   name: string
   id: string
@@ -90,30 +84,6 @@ export interface UI_I_ReadyCompleteFields {
   }[]
 }
 
-export interface UI_I_ConnectionSettingsFieldsErrorMessages {
-  networkLabel: string
-  vlanId: string
-}
-
-export interface UI_I_IpFourSettingsFieldsErrorMessages {
-  ipFourAddress: string
-  subnetMask: string
-  defaultGateway: string
-}
-
-export interface UI_I_PortPropertiesFieldsErrorMessages {
-  networkLabel: string
-  vlanId: string
-  mtu: string
-}
-
-export interface UI_I_TargetDeviceFieldsErrorMessages {
-  network: string
-  switch: string
-  standardSwitch: string
-  mtu: string
-}
-
 export interface UI_I_PortPropertiesEnabledService {
   label: string
   modelValue: string
@@ -156,11 +126,6 @@ export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
   }
 }
 
-export interface UI_I_NetworkLabelCheckExisting {
-  valid: boolean
-  checked: boolean
-}
-
 export interface UI_I_TableHead {
   text: string
 }
@@ -206,3 +171,31 @@ export interface UI_I_ReadyCompleteFirstColumn {
   name: string
   value: string | undefined
 }
+
+export interface UI_I_AddNetworkingEmits {
+  (event: 'hide'): void
+  (
+    event: 'add-networking-data-validate',
+    networkData:
+      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+    type: string,
+    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
+  ): void
+  (
+    event: 'send-add-networking-data',
+    schemeData:
+      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+    type: string,
+    hideSendNetworkDataLoader: () => void,
+    onHideAddNetworkingModal: () => void
+  ): void
+  (event: 'get-existing-standard-switches', cb: () => void): void
+  (event: 'get-free-adapters', cb: () => void): void
+  (
+    event: 'check-network-label',
+    networkLabel: string,
+    cb: (error_message: string) => void
+  ): void
+}

package/components/common/wizards/network/add/models/types.ts

@@ -0,0 +1,2 @@
+export type UI_T_TCP = 'default' | '1' | '2'
+export type UI_T_Project = 'procurator' | 'sphere'

package/components/common/wizards/network/add/steps/ConnectionSettings.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="wizard-content-container add-networking-step">
+    <div class="wizard-content wizard-content-port">
+      <atoms-alert
+        v-if="props.alertMessages.length"
+        status="alert-danger"
+        :items="props.alertMessages"
+        @remove="onHideAlert"
+      />
+      <form>
+        <div class="horizontal-flex-container">
+          <label class="property-label-group" for="network-label">
+            {{ localization.networkLabel }}
+          </label>
+          <div class="margin-left-property-value-group">
+            <div class="property-value-group">
+              <fieldset>
+                <atoms-tooltip-error
+                  :has-error="!!props.messagesFields.name.field"
+                >
+                  <template #elem>
+                    <input
+                      id="network-label"
+                      v-model="fields.networkLabel"
+                      name="network-label"
+                      type="text"
+                      :class="[
+                        'tooltip-field port-properties-network-label',
+                        {
+                          'danger-not-valid': props.messagesFields.name.field,
+                        },
+                      ]"
+                      @click.stop
+                    />
+                  </template>
+                  <template #content>
+                    {{ props.messagesFields.name.field }}
+                  </template>
+                </atoms-tooltip-error>
+              </fieldset>
+            </div>
+          </div>
+        </div>
+
+        <div class="horizontal-flex-container port-properties-padding">
+          <label class="property-label-group">
+            {{ localization.vlanId }}
+          </label>
+          <div class="margin-left-property-value-group">
+            <div class="property-value-group">
+              <fieldset>
+                <div class="flex-align-center">
+                  <atoms-combobox
+                    v-model.trim="fields.vlanId"
+                    :items="vlanIdSelectData"
+                    :class="{
+                      'danger-not-valid': props.messagesFields.vlan.field,
+                    }"
+                    @click.stop
+                  />
+                  <div
+                    v-show="props.messagesFields.vlan.field"
+                    class="flex-align-center"
+                  >
+                    <div class="tooltip flex align-middle">
+                      <atoms-the-icon
+                        width="24px"
+                        height="24px"
+                        class="is-error tooltip-trigger"
+                        name="info"
+                      />
+                      <div class="tooltip-top-left tooltip-content error">
+                        {{ props.messagesFields.vlan.field }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </fieldset>
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_ArbitraryObject, UI_I_Localization } from '~/models/interfaces'
+import { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/models/interfaces'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/config'
+import { UI_I_ErrorFields } from '~/components/atoms/wizard/models/interfaces'
+import type Wizard from '~/components/atoms/wizard/utils/utils'
+import {
+  validateNetworkConnectionSettingsLocal,
+  validateVlanIdConnectionSettingsLocal,
+} from '~/components/common/wizards/network/add/validations/validations'
+
+const props = defineProps<{
+  connectionSettings: UI_I_ConnectionSettings
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  wizard: Wizard
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const emits = defineEmits<{
+  (
+    event: 'change-connection-settings',
+    connectionSettings: UI_I_ConnectionSettings
+  ): void
+  (event: 'hide-alert', stepId: 5): void
+}>()
+
+const fields = ref<UI_I_ConnectionSettings>(
+  useDeepCopy(props.connectionSettings)
+)
+
+let oldFields = useDeepCopy(fields.value)
+
+watch(
+  fields,
+  (newFields: UI_I_ConnectionSettings) => {
+    oldFields.vlanId !== newFields.vlanId &&
+      validateVlanIdConnectionSettingsLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields.networkLabel !== newFields.networkLabel &&
+      validateNetworkConnectionSettingsLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields = useDeepCopy(fields.value)
+
+    emits('change-connection-settings', newFields)
+  },
+  { deep: true, immediate: true }
+)
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 5)
+}
+</script>

package/components/common/{addNetworking → wizards/network/add}/steps/CreateStandardSwitch.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="wizard-content-container add-networking-step">
-    <common-add-networking-steps-header
-      :title="props.title"
-      :text="props.text"
-    />
     <div class="wizard-content">
       <common-adapter-manager
         test-id="adapter-manager"
@@ -45,9 +41,6 @@ import {
 
 // Props from up
 const props = defineProps<{
-  title: string
-  text: string
-  stepId: number
   addedAdapters: string[]
   freeAdapters: UI_I_Adapter[]
   adapterStatus: UI_I_AdapterStatus