bfg-common 1.2.189 → 1.2.190

package/components/common/diagramMain/modals/config/vmKernelAdapter.ts

@@ -7,7 +7,7 @@ import {
   UI_I_BodyItems,
   UI_I_ReadyCompleteFields,
   UI_I_TableHead,
-} from '~/components/common/wizards/network/add/models/interfaces'
+} from '~/components/common/addNetworking/models/interfaces'
 
 export const vmKernelAdapterViewSettingsFunc = (
   localization: UI_I_Localization
@@ -69,7 +69,7 @@ export const vmKernelAdapterTableBodyMapperFunc = (
   {
     editable: false,
     text: vmkernelAdapterData.name,
-    id: vmkernelAdapterData.name,
+    id: vmkernelAdapterData.id,
   },
   {
     editable: false,

package/components/common/diagramMain/modals/editSettings/tabs/NetworkProperties.vue

@@ -90,7 +90,7 @@ import {
 } from '~/components/common/diagramMain/models/interfaces'
 import { UI_T_PropertiesFieldName } from '~/components/common/diagramMain/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/utils'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/config'
+import { vlanIdSelectData } from '~/components/common/addNetworking/config'
 
 // Props from up
 const props = withDefaults(

package/components/common/diagramMain/modals/editSettings/tabs/port/IpvFourSettings.vue

@@ -176,7 +176,7 @@ import {
   UI_I_IpvFourSettingsFields,
   UI_I_ModalsInitialData,
 } from '~/components/common/diagramMain/models/interfaces'
-import { UI_T_IpFourSettingsFieldName } from '~/components/common/wizards/network/add/models/types'
+import { UI_T_IpFourSettingsFieldName } from '~/components/common/addNetworking/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/utils'
 
 const props = withDefaults(

package/components/common/diagramMain/modals/steps/ConnectionSettings.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="wizard-content-container add-networking-step">
+    <common-diagram-main-modals-steps-header
+      :title="props.title"
+      :text="props.text"
+    />
+    <div class="wizard-content wizard-content-port">
+      <atoms-alert
+        v-if="isShowErrorMessage"
+        status="alert-danger"
+        :items="props.errorMessages"
+        @remove="onHideErrorMessageAlert"
+      />
+      <form id-connection-settings-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="!!fieldsErrorMessages.networkLabel"
+                >
+                  <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': fieldsErrorMessages.networkLabel,
+                        },
+                      ]"
+                      @click.stop
+                    />
+                  </template>
+                  <template #content>
+                    {{ fieldsErrorMessages.networkLabel }}
+                  </template>
+                </atoms-tooltip-error>
+              </fieldset>
+            </div>
+          </div>
+        </div>
+
+        <div class="horizontal-flex-container port-properties-padding">
+          <label class="property-label-group" for="">
+            {{ 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"
+                    @click.stop
+                  />
+                  <div
+                    v-show="fieldsErrorMessages.vlanId"
+                    class="flex-align-center"
+                  >
+                    <div class="tooltip">
+                      <atoms-the-icon
+                        width="24px"
+                        height="24px"
+                        class="is-error tooltip-trigger"
+                        name="info"
+                      />
+                      <div class="tooltip-top-left tooltip-content error">
+                        {{ fieldsErrorMessages.vlanId }}
+                      </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,
+  UI_I_ConnectionSettingsFieldsErrorMessages,
+} from '~/components/common/addNetworking/models/interfaces'
+import { UI_T_ConnectionSettingsFieldName } from '~/components/common/addNetworking/models/types'
+import {
+  connectionSettingsFieldsErrorMessages,
+  vlanIdSelectData,
+} from '~/components/common/addNetworking/config'
+
+// Props from up
+const props = defineProps<{
+  title: string
+  text: string
+  stepId: number
+  connectionSettings: UI_I_ConnectionSettings
+  isShowErrorMessageAlert: boolean
+  errorMessages: string[]
+}>()
+
+// UI_I_Localization
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+// Define emits for changing data and validation messages
+const emits = defineEmits<{
+  (
+    event: 'change-connection-settings',
+    connectionSettings: UI_I_ConnectionSettings
+  ): void
+  (
+    event: 'change-error-messages',
+    errorMessages: string[],
+    stepIndex: number
+  ): void
+  (event: 'hide-error-message-alert'): void
+}>()
+
+// Component binding data
+const fields = ref<UI_I_ConnectionSettings>({ ...props.connectionSettings })
+
+// Validation error check for this step
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && !!props.errorMessages.length
+)
+
+// Validation
+const fieldsErrorMessages = ref<UI_I_ConnectionSettingsFieldsErrorMessages>(
+  connectionSettingsFieldsErrorMessages
+)
+
+const messageTexts = (
+  local: UI_I_Localization
+): UI_I_ArbitraryObject<string> => ({
+  networkLabel: local.vlanIdInvalidMessage,
+  vlanId: local.networkLabelInvalidMessage,
+})
+
+const isNumberInRange = (
+  value: number | string,
+  down: number,
+  up: number
+): boolean => isNaN(Number(value)) || Number(value) < down || Number(value) > up
+
+const setMessageOnChangedField = (
+  values: string | number,
+  name: UI_T_ConnectionSettingsFieldName,
+  text: string
+): void => {
+  if (name === 'networkLabel' && !values) {
+    fieldsErrorMessages.value[name] = text
+    return
+  }
+  if (
+    name === 'vlanId' &&
+    values !== 'None (0)' &&
+    values !== 'All (4095)' &&
+    (isNumberInRange(values, 0, 4095) || values === '')
+  ) {
+    fieldsErrorMessages.value[name] = text
+    return
+  }
+  fieldsErrorMessages.value[name] = ''
+}
+
+// Changing data and validate they
+watch(
+  fields,
+  (newFields: UI_I_ConnectionSettings) => {
+    setMessageOnChangedField(
+      newFields.vlanId,
+      'vlanId',
+      messageTexts(localization.value).vlanId
+    )
+    setMessageOnChangedField(
+      newFields.networkLabel,
+      'networkLabel',
+      messageTexts(localization.value).networkLabel
+    )
+    const fieldsErrorMessagesFiltered = Object.values(
+      fieldsErrorMessages.value
+    ).filter((v) => v !== '')
+    fieldsErrorMessagesFiltered.length === 0 &&
+      emits('hide-error-message-alert')
+    emits('change-error-messages', fieldsErrorMessagesFiltered, props.stepId)
+    emits('change-connection-settings', newFields)
+  },
+  { deep: true, immediate: true }
+)
+
+// Validation message show and hide
+const onHideErrorMessageAlert = (): void => {
+  emits('hide-error-message-alert')
+}
+onUnmounted(() => {
+  emits('hide-error-message-alert')
+})
+</script>
+
+<style scoped lang="scss">
+.wizard-content-container {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  flex: 1 1 100%;
+  box-sizing: border-box;
+  padding: 16px 15px 10px 10px;
+  overflow-y: auto;
+  color: #333;
+  order: 2;
+  width: 100%;
+}
+</style>

package/components/common/diagramMain/modals/steps/Header.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="wizard-content-header-area">
+    <div>
+      <div class="title">
+        {{ props.title }}
+      </div>
+      <div class="description">
+        {{ props.text }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Props from up
+
+const props = defineProps<{
+  title: string
+  text: string
+}>()
+</script>
+
+<style scoped lang="scss">
+.wizard-content-header-area {
+  flex-shrink: 0;
+  width: inherit;
+  height: auto;
+  background-color: transparent;
+  padding-bottom: 3px;
+  border-bottom: 1px solid #a6a6a6;
+}
+
+.wizard-content-header-area {
+  display: flex;
+  //padding-top: 12px;
+
+  .description {
+    color: #333333;
+    font-size: 13px;
+  }
+
+  .title {
+    font-weight: 700;
+    font-size: 13px;
+    margin: 0;
+    color: #333;
+  }
+
+  .description,
+  .select {
+    flex: 1 1 100%;
+    margin-right: 5px;
+  }
+
+  :deep(select) {
+    background-color: transparent;
+    border-color: var(--type-list-border-color);
+  }
+}
+</style>

package/components/common/diagramMain/modals/{migrateVmkernelAdapter/steps → steps}/SelectVmkernelAdapter.vue

@@ -1,23 +1,26 @@
 <template>
   <div class="wizard-content-container">
+    <common-diagram-main-modals-steps-header
+      :title="props.title"
+      :text="props.text"
+    />
     <div class="wizard-content wizard-content-port">
       <atoms-alert
-        v-if="props.alertMessages.length"
+        v-if="isShowErrorMessage"
         status="alert-danger"
-        :items="props.alertMessages"
-        @remove="onHideAlert"
+        :items="props.errorMessages"
+        @remove="onHideErrorMessageAlert"
       />
       <div class="table-top-margin-container">
         <atoms-table-simple-table
           :head-items="tableHeadItems"
           :body-items="tableBodyItems"
-          :selected-row-key="selectedRowKey"
           editable
           @select="onSelectRow"
         />
       </div>
       <common-diagram-main-modals-view-settings-info
-        :show="!!selectedRowData.length"
+        :show="selectedRowData.length"
         :modal-tabs="modalTabs"
         :view-settings-fields="viewSettingsFields"
         :with-collapse="false"
@@ -39,10 +42,11 @@ import {
   UI_I_ReadyCompleteFields,
   UI_I_SelectVmkernelAdapter,
   UI_I_TableHead,
-} from '~/components/common/wizards/network/add/models/interfaces'
+} from '~/components/common/addNetworking/models/interfaces'
 import {
   UI_I_ModalTabs,
   UI_I_SelectedVmkernelAdapterTableRaw,
+  UI_I_SelectVmKernelAdapterFieldsErrorMessages,
   UI_I_VmkernelAdapterTableData,
 } from '~/components/common/diagramMain/models/interfaces'
 import {
@@ -50,78 +54,136 @@ import {
   vmKernelAdapterViewSettingsTableHeadFunc,
   vmKernelAdapterTableBodyMapperFunc,
   vmKernelAdapterViewSettingsFunc,
+  selectVmKernelAdapterFieldsErrorMessages,
 } from '~/components/common/diagramMain/modals/config'
+import { UI_T_VmKernelAdapterFieldName } from '~/components/common/diagramMain/models/types'
 
+// Props from up
 const props = defineProps<{
+  title: string
+  text: string
+  stepId: number
   tableData: UI_I_VmkernelAdapterTableData[]
   vmkernelAdapter: UI_I_SelectVmkernelAdapter
-  alertMessages: string[]
+  isShowErrorMessageAlert: boolean
+  errorMessages: string[]
 }>()
 
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+// View settings modal tabs data
 const modalTabs = computed<UI_I_ModalTabs[]>(() =>
   vmKernelAdapterViewSettingsModalTabsFunc(localization.value)
 )
 
+// View settings modal data
 const viewSettingsFields = computed<UI_I_ReadyCompleteFields[]>(() =>
   vmKernelAdapterViewSettingsFunc(localization.value)
 )
 
+// Table head data
 const tableHeadItems = computed<UI_I_TableHead[]>(() =>
   vmKernelAdapterViewSettingsTableHeadFunc(localization.value)
 )
 
+// Table body data
 const tableBodyItems = computed<UI_I_BodyItems[][]>(() =>
   props.tableData.map(vmKernelAdapterTableBodyMapperFunc)
 )
 
+// Select the row
 const selectedRowData = ref<UI_I_SelectedVmkernelAdapterTableRaw[]>(
   tableBodyItems.value.find(
-    (item) => item[0].text === props.vmkernelAdapter.vm
+    (item) => item[0].id === props.vmkernelAdapter.vm
   ) || []
 )
 
-const selectedRowKey = ref<number>(
-  tableBodyItems.value.findIndex(
-    (item) => item[0].text === props.vmkernelAdapter.vm
-  )
-)
-
-const fields = ref<UI_I_SelectVmkernelAdapter>(
-  useDeepCopy(props.vmkernelAdapter)
-)
+// Component binding data
+const fields = ref<UI_I_SelectVmkernelAdapter>({ ...props.vmkernelAdapter })
 
+// Select row handler
 const onSelectRow = (index: number): void => {
   selectedRowData.value = tableBodyItems.value[index]
 
   const selectedVmkernelAdapter =
     selectedRowData.value &&
     selectedRowData.value[0] &&
-    selectedRowData.value[0].text
+    selectedRowData.value[0].id
 
   selectedVmkernelAdapter && (fields.value.vm = selectedVmkernelAdapter)
 }
 
+// Validation error check for this step
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && !!props.errorMessages.length
+)
+
+// Validation
 const emits = defineEmits<{
   (
     event: 'change-vmkernel-adapter',
     vmkernelAdapter: UI_I_SelectVmkernelAdapter
   ): void
-  (event: 'hide-alert', stepId: 0): void
+  (
+    event: 'change-error-messages',
+    errorMessages: string[],
+    stepIndex: number
+  ): void
+  (event: 'hide-error-message-alert'): void
 }>()
 
+const fieldsErrorMessages = ref<UI_I_SelectVmKernelAdapterFieldsErrorMessages>(
+  selectVmKernelAdapterFieldsErrorMessages
+)
+
+const messageTexts = (
+  local: UI_I_Localization
+): UI_I_ArbitraryObject<string> => ({
+  vm: local.noVmKernelNetworkAdapterSelectedForMigration,
+})
+
+const setMessageOnChangedField = (
+  values: string,
+  name: UI_T_VmKernelAdapterFieldName,
+  text: string
+): void => {
+  if (name === 'vm') {
+    if (values) {
+      fieldsErrorMessages.value[name] = ''
+    } else {
+      fieldsErrorMessages.value[name] = text
+    }
+  }
+}
+
 watch(
   fields,
   (newFields: UI_I_SelectVmkernelAdapter) => {
+    setMessageOnChangedField(
+      newFields.vm,
+      'vm',
+      messageTexts(localization.value).vm
+    )
+
+    const fieldsErrorMessagesFiltered = Object.values(
+      fieldsErrorMessages.value
+    ).filter((errorMessage: string) => errorMessage !== '')
+    fieldsErrorMessagesFiltered.length === 0 &&
+      emits('hide-error-message-alert')
+    emits('change-error-messages', fieldsErrorMessagesFiltered, props.stepId)
     emits('change-vmkernel-adapter', newFields)
   },
   { deep: true, immediate: true }
 )
 
-const onHideAlert = (): void => {
-  emits('hide-alert', 0)
+const onHideErrorMessageAlert = (): void => {
+  emits('hide-error-message-alert')
 }
+onUnmounted(() => {
+  selectedRowData.value = []
+  emits('hide-error-message-alert')
+})
 </script>
 
 <style scoped lang="scss">
@@ -131,7 +193,7 @@ const onHideAlert = (): void => {
   align-items: stretch;
   flex: 1 1 100%;
   box-sizing: border-box;
-  padding: 0px 15px 0px 10px;
+  padding: 16px 15px 10px 10px;
   overflow-y: auto;
   color: #333;
   order: 2;
@@ -142,8 +204,8 @@ const onHideAlert = (): void => {
 }
 
 :deep(.table-fixed-height) {
-  max-height: 143px;
-  min-height: 143px;
+  max-height: 160px;
+  min-height: 160px;
 }
 .no-item-info {
   span {

package/components/common/diagramMain/modals/{migrateVmkernelAdapter/steps → steps}/VmkernelAdapterReadyComplete.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="wizard-content-container">
+    <common-diagram-main-modals-steps-header
+      :title="props.title"
+      :text="props.text"
+    />
     <div class="ready-complete-container">
       <template
         v-for="viewSettingsField in viewSettingsFields"
@@ -15,21 +19,21 @@
 
 <script setup lang="ts">
 import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_MigrationVmkernelAdapterReadyComplete } from '~/components/common/diagramMain/models/interfaces'
-import { createMigrateVmkernelAdapterSchemeReadyCompleteFunc } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/config/steps'
+import { createMigrateVmkernelAdapterSchemeReadyCompleteFunc } from '~/components/common/diagramMain/modals/config'
 
 // Props from up
 const props = defineProps<{
-  data: UI_I_MigrationVmkernelAdapterReadyComplete
+  title: string
+  text: string
+  stepId: number
 }>()
 
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+// View settings fields data
 const viewSettingsFields = computed(() =>
-  createMigrateVmkernelAdapterSchemeReadyCompleteFunc(
-    localization.value,
-    props.data
-  )
+  createMigrateVmkernelAdapterSchemeReadyCompleteFunc(localization.value)
 )
 </script>
 

package/components/common/diagramMain/models/enums.ts

@@ -18,9 +18,10 @@ export const enum UI_E_PositionsY {
   SPACE_FROM_RECT_BOTTOM = 2.5,
 }
 
-export enum UI_E_MigrationValidationFields {
-  SELECT_ADAPTER_VM = 'vm',
-
-  CONNECTION_SETTINGS_NETWORK = 'name',
-  CONNECTION_SETTINGS_VLAN = 'vlan',
-}
+export const enum UI_E_StepStatus {
+  Disabled,
+  Selected,
+  Active,
+  Complete,
+  ActiveSelected
+}

package/components/common/diagramMain/models/interfaces.ts

@@ -1,4 +1,4 @@
-import { UI_E_NetworkType } from './enums'
+import { UI_E_NetworkType, UI_E_StepStatus } from './enums'
 import { UI_T_Adapters } from '~/components/common/diagramMain/models/types'
 
 export interface UI_I_Port {
@@ -117,6 +117,7 @@ export interface UI_I_NetworkInfo {
   shapingPolicy: UI_I_NetworkSummaryPortletListItem[]
 }
 
+
 export interface UI_I_NetworkFull extends UI_I_Network, UI_I_NetworkInfo {}
 
 export interface UI_I_SwitchInfo extends UI_I_NetworkInfo {
@@ -163,7 +164,7 @@ export interface UI_I_AdaptersWithPositions {
 }
 
 export interface UI_I_NetworksWithPositions
-  extends Omit<UI_I_Network, 'ports'> {
+    extends Omit<UI_I_Network, 'ports'> {
   ports: (UI_I_Port & { portPosition: number })[]
   portsCount: number
   portsHeight: number
@@ -208,6 +209,11 @@ export interface UI_I_ToggleDiagramAdaptersPayload {
   paths: string[]
 }
 
+export interface UI_I_PropertiesErrorFields {
+  networkLabel: string
+  vlanId: string
+}
+
 export interface UI_I_SecurityFields {
   promiscuousMode: {
     checked: boolean
@@ -245,7 +251,7 @@ export interface UI_I_TeamingFailoverFields {
   }
 }
 export interface UI_I_TeamingFailoverWithAdaptersFields
-  extends UI_I_TeamingFailoverFields {
+    extends UI_I_TeamingFailoverFields {
   adapters: UI_I_AdapterStatus
 }
 
@@ -297,6 +303,23 @@ export interface UI_I_AdapterStatus {
   unused: string[]
 }
 
+export interface UI_I_Step {
+  id: number
+  name: string
+  status: UI_E_StepStatus
+}
+
+export interface UI_I_PropertiesFieldsErrorMessages {
+  mtu: string
+}
+export interface UI_I_IpFourSettingsFieldsErrorMessages {
+  ipFourAddress: string
+  subnetMask: string
+  defaultGateway: string
+}
+export interface UI_I_SelectVmKernelAdapterFieldsErrorMessages {
+  vm: string
+}
 export interface UI_I_SwitchPropertiesFields {
   mtu: number
   num_ports: string
@@ -433,9 +456,9 @@ export interface UI_I_PropertiesFields {
 
 export interface UI_I_EditFieldsData {
   properties?:
-    | UI_I_PropertiesFields
-    | UI_I_SwitchPropertiesFields
-    | UI_I_PortPropertiesFields
+      | UI_I_PropertiesFields
+      | UI_I_SwitchPropertiesFields
+      | UI_I_PortPropertiesFields
   security?: UI_I_SecurityFields
   trafficShaping?: UI_I_TrafficShapingFields
   teamingFailover?: UI_I_TeamingFailoverWithAdaptersFields
@@ -540,25 +563,3 @@ export interface UI_I_NetworkEditSendData {
   nics: UI_I_AdapterStatus
   override_nics: string | number | boolean
 }
-
-export interface UI_I_MigrateVmkernelAdapterEmits {
-  (
-    event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void
-  ): void
-  (event: 'hide'): void
-}
-
-export interface UI_I_MigrationVmkernelAdapterReadyComplete {
-  vm: string
-  currentSettings: {
-    switch: string
-    network: string
-  }
-  newSettings: {
-    switch: string
-    network: string
-  }
-  vlanId: string
-}