bfg-common 1.3.202 → 1.3.204

package/components/common/diagramMain/DiagramMain.vue

@@ -203,8 +203,11 @@
         :is-dark-mode="props.isDarkMode"
         :selected-standard-switch-id="selectedStandardSwitchId"
         :selected-switch-id="selectedSwitchId"
+        :tcp-stacks="props.tcpStacks"
+        :tcp-stack-loading="props.tcpStackLoading"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
+        @get-tcp-stacks="onGetTcpStacks"
         @get-free-adapters="onGetFreeAdapters"
         @send-add-networking-data="onSendNetworkData"
         @add-networking-data-validate="onValidateBeforeSending"
@@ -252,6 +255,7 @@ import {
   UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
   UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
   UI_I_Switch,
+  UI_I_TCPStack,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import {
   adapterViewSettingsFunc,
@@ -294,6 +298,8 @@ const props = withDefaults(
     freeAdapters?: UI_I_Adapter[]
     networksList?: UI_I_Network[]
     isDarkMode: boolean
+    tcpStacks?: UI_I_TCPStack[]
+    tcpStackLoading?: boolean
   }>(),
   {
     diagramData: null,
@@ -307,6 +313,8 @@ const props = withDefaults(
     }),
     freeAdapters: () => [],
     networksList: () => [],
+    tcpStacks: () => [],
+    tcpStackLoading: false,
   }
 )
 
@@ -568,6 +576,9 @@ const onCheckNetworkLabel = (
 const onGetExistingStandardSwitches = (cb: () => void) => {
   emits('get-existing-standard-switches', cb)
 }
+const onGetTcpStacks = () => {
+  emits('get-tcp-stacks')
+}
 const onGetFreeAdapters = (cb: () => void) => {
   emits('get-free-adapters', cb)
 }
@@ -895,6 +906,7 @@ const emits = defineEmits<{
     hideModalCB: () => void,
     hideLoaderCB: () => void
   ): void
+  (event: 'get-tcp-stacks'): void
 }>()
 
 const onTogglePorts = (

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

@@ -66,6 +66,8 @@
         :project="props.project"
         :messages-fields="selectedStep.fields"
         :alert-messages="alertMessages[3]"
+        :tcp-stacks="props.tcpStacks"
+        @change-gateway-flag="onChangeGatewayFlag"
         @change-port-properties="onChangePortProperties"
         @hide-alert="onHideAlert"
       />
@@ -75,6 +77,10 @@
         :ip-four-settings="ipFourSettings"
         :messages-fields="selectedStep.fields"
         :alert-messages="alertMessages[4]"
+        :tcp-stacks="props.tcpStacks"
+        :tcp="portProperties.tcp"
+        :gateway-flag="gatewayFlag"
+        @change-gateway-flag="onChangeGatewayFlag"
         @change-ip-four-settings="onChangeIpFourSettings"
         @hide-alert="onHideAlert"
       />
@@ -114,6 +120,7 @@ import {
   UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
   UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
   UI_I_AddNetworkingEmits,
+  UI_I_TCPStack,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import {
   UI_I_Adapter,
@@ -162,6 +169,8 @@ const props = withDefaults(
     isDarkMode?: boolean
     selectedStandardSwitchId?: string
     selectedSwitchId?: string
+    tcpStacks?: UI_I_TCPStack[]
+    tcpStackLoading?: boolean
   }>(),
   {
     standardSwitchesInitial: () => [],
@@ -170,6 +179,8 @@ const props = withDefaults(
     isDarkMode: false,
     selectedStandardSwitchId: '',
     selectedSwitchId: '',
+    tcpStacks: () => [],
+    tcpStackLoading: false,
   }
 )
 
@@ -255,6 +266,11 @@ const portProperties = ref<UI_I_PortProperties>(
   useDeepCopy(portPropertiesInitial)
 )
 const onChangePortProperties = (newFields: UI_I_PortProperties): void => {
+  if (portProperties.value.tcp !== newFields.tcp) {
+    ipFourSettings.value.static.defaultGateway.value =
+      props.tcpStacks?.find((tcp: UI_I_TCPStack) => tcp.id === newFields.tcp)
+        .gateway || ''
+  }
   portProperties.value = newFields
 }
 
@@ -264,6 +280,11 @@ const onChangeIpFourSettings = (newFields: UI_I_IpFourSettings): void => {
   ipFourSettings.value = newFields
 }
 
+const gatewayFlag = ref<boolean>(false)
+const onChangeGatewayFlag = (newValue: boolean) => {
+  gatewayFlag.value = newValue
+}
+
 // Step's content data and changers (connectionSettings)
 const connectionSettings = ref<UI_I_ConnectionSettings>(
   connectionSettingsInitial
@@ -326,12 +347,26 @@ const onGetExistingStandardSwitches = (): void => {
   emits('get-existing-standard-switches', () => wizard.setLoader(false))
 }
 
+const onGetTcpStacks = (): void => {
+  emits('get-tcp-stacks')
+}
+
+watch(
+  () => props.tcpStackLoading,
+  (newValue: boolean) => {
+    wizard.setLoader(newValue)
+  }
+)
+
 watch(
   () => wizard.selectedStepId,
   (newSelectedStep: number) => {
     if (newSelectedStep === 1) {
       onGetExistingStandardSwitches()
     }
+    if (newSelectedStep === 3) {
+      onGetTcpStacks()
+    }
     if (newSelectedStep === 6 && flagSwitch !== targetDevice.value.switch) {
       const nics = props.standardSwitchesInitial.find(
         (sw) => sw.id === targetDevice.value.switch
@@ -701,6 +736,16 @@ const onSubmit = async (): Promise<void> => {
 onMounted(() => {
   hostname.value = location.hostname
 })
+
+watch(
+  props.tcpStacks,
+  (newValue: UI_I_TCPStack[]) => {
+    portProperties.value.tcp = newValue?.[0]?.id || ''
+    ipFourSettings.value.static.defaultGateway.value =
+      newValue?.[0]?.gateway || ''
+  },
+  { deep: true }
+)
 </script>
 
 <style scoped lang="scss">

package/components/common/wizards/network/add/lib/config/initialData.ts

@@ -36,7 +36,7 @@ export const portPropertiesInitial: UI_I_PortProperties = {
     option: '0',
     size: 1500,
   },
-  tcp: 'default',
+  tcp: '',
   services: { ...servicesInitial },
 }
 

package/components/common/wizards/network/add/lib/models/interfaces.ts

@@ -1,4 +1,8 @@
-import { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+import {
+  UI_I_ArbitraryObject,
+  UI_I_ListIndex,
+  UI_I_State,
+} from '~/lib/models/interfaces'
 import { UI_T_TCP } from '~/components/common/wizards/network/add/lib/models/types'
 
 export interface UI_I_Services {
@@ -198,4 +202,26 @@ export interface UI_I_AddNetworkingEmits {
     networkLabel: string,
     cb: (error_message: string) => void
   ): void
+  (event: 'get-tcp-stacks'): void
+}
+
+export interface UI_I_TCPStack {
+  id: string
+  state: UI_I_State
+  index: UI_I_ListIndex
+  dns: {
+    auto_from?: string
+    hostname: string
+    domain: string
+    preferred_dns: string
+    alternative_dns: string
+    search_domains: string[]
+  }
+  gateway: string // TODO ??? type
+  advanced: {
+    congestion_control: string
+    max_connections: number
+  }
+  routing_table: number
+  routes: string[]
 }

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

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

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

@@ -163,8 +163,14 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_ArbitraryObject, UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_IpFourSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import {
+  UI_I_IpFourSettings,
+  UI_I_TCPStack,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
 import { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
@@ -174,17 +180,26 @@ import {
   validateMaskIpFourSettingsLocal,
 } from '~/components/common/wizards/network/add/validations/validations'
 
-const props = defineProps<{
-  ipFourSettings: UI_I_IpFourSettings
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  wizard: Wizard
-}>()
+const props = withDefaults(
+  defineProps<{
+    ipFourSettings: UI_I_IpFourSettings
+    alertMessages: string[]
+    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+    wizard: Wizard
+    tcpStacks?: UI_I_TCPStack[]
+    tcp: string
+    gatewayFlag: boolean
+  }>(),
+  {
+    tcpStacks: () => [],
+  }
+)
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const emits = defineEmits<{
   (event: 'change-ip-four-settings', ipFourSettings: UI_I_IpFourSettings): void
+  (event: 'change-gateway-flag', value: boolean): void
   (event: 'hide-alert', stepId: 4): void
 }>()
 
@@ -195,7 +210,6 @@ let oldFields = useDeepCopy(fields.value)
 watch(
   fields,
   (newFields: UI_I_IpFourSettings) => {
-
     if (newFields.ipSettings === '1') {
       oldFields.static.ipFourAddress !== newFields.static.ipFourAddress &&
         validateAddressIpFourSettingsLocal(
@@ -211,9 +225,23 @@ watch(
           props.wizard
         )
 
-      newFields.static.defaultGateway &&
+      const isGatewayChanged =
+        newFields.static.defaultGateway &&
         oldFields.static.defaultGateway.value !==
-          newFields.static.defaultGateway.value &&
+          newFields.static.defaultGateway.value
+
+      emits('change-gateway-flag', true)
+
+      if (
+        oldFields.static.defaultGateway.override &&
+        !newFields.static.defaultGateway.override
+      ) {
+        fields.value.static.defaultGateway.value = props.tcpStacks.find(
+          (tcp: UI_I_TCPStack) => tcp.id === props.tcp
+        ).gateway
+      }
+
+      isGatewayChanged &&
         validateGatewayIpFourSettingsLocal(
           localization.value,
           newFields,
@@ -230,6 +258,28 @@ watch(
   { deep: true }
 )
 
+watch(
+  () => props.tcpStacks,
+  (newValue: UI_I_TCPStack[]) => {
+    if (fields.value.static.defaultGateway.value === '') {
+      fields.value.static.defaultGateway.value = newValue?.[0]?.gateway || ''
+    }
+  },
+  { deep: true, immediate: true }
+)
+
+watch(
+  () => props.tcp,
+  (newValue: string) => {
+    if (newValue && !props.gatewayFlag) {
+      fields.value.static.defaultGateway.value = props.tcpStacks.find(
+        (tcp: UI_I_TCPStack) => tcp.id === newValue
+      ).gateway
+    }
+  },
+  { immediate: true }
+)
+
 const onHideAlert = (): void => {
   emits('hide-alert', 4)
 }

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

@@ -133,8 +133,10 @@
             <div class="property-value-group">
               <div class="select">
                 <select id="tsp" v-model="fields.tcp">
-                  <option value="default">{{ localization.default }}</option>
-                  <option value="1">{{ localization.provisioning }}</option>
+                  <template v-for="tcp in props.tcpStacks" :key="tcp.id">
+                    <option :value="tcp.id">{{ localization[tcp.id] }}</option>
+                  </template>
+                  <!--                  <option value="1">{{ localization.provisioning }}</option>-->
                   <!--                  <option value="2">{{ localization.vMotion }}</option>-->
                 </select>
               </div>
@@ -200,14 +202,20 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_ArbitraryObject, UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
 import { UI_T_Project } from '~/lib/models/types'
 import {
   servicesInitial,
   vlanIdSelectData,
   portPropertiesEnabledServicesFunc,
 } from '~/components/common/wizards/network/add/lib/config'
-import { UI_I_PortProperties } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import {
+  UI_I_PortProperties,
+  UI_I_TCPStack,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
 import { UI_T_TCP } from '~/components/common/wizards/network/add/lib/models/types'
 import { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
@@ -225,9 +233,11 @@ const props = withDefaults(
     alertMessages: string[]
     messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
     wizard: Wizard
+    tcpStacks?: UI_I_TCPStack[]
   }>(),
   {
     mtuFromSwitch: 1500,
+    tcpStacks: () => [],
   }
 )
 
@@ -241,6 +251,7 @@ const portPropertiesEnabledServices = computed(() =>
 
 const emits = defineEmits<{
   (event: 'change-port-properties', portProperties: UI_I_PortProperties): void
+  (event: 'change-gateway-flag', value: boolean): void
   (event: 'hide-alert', stepId: 3): void
 }>()
 
@@ -273,7 +284,7 @@ const setEnabledServiceProvisioning = (
   currentFields: UI_I_PortProperties,
   newFields?: UI_I_PortProperties
 ): void => {
-  tcp === '1' &&
+  tcp === 'provisioning' &&
     (fields.value = {
       ...(newFields || currentFields),
       services: {
@@ -288,7 +299,7 @@ const setEnabledServiceVMotion = (
   currentFields: UI_I_PortProperties,
   newFields?: UI_I_PortProperties
 ): void => {
-  tcp === '2' &&
+  tcp === '' &&
     (fields.value = {
       ...(newFields || currentFields),
       services: {
@@ -304,7 +315,9 @@ let oldFields = useDeepCopy(fields.value)
 watch(
   fields,
   (newFields: UI_I_PortProperties) => {
-    if (newFields.tcp && newFields.tcp !== fields.value.tcp) {
+    if (newFields.tcp && newFields.tcp !== oldFields.tcp) {
+      emits('change-gateway-flag', false)
+      setEnabledServiceDefault(newFields.tcp, fields.value)
       setEnabledServiceProvisioning(newFields.tcp, fields.value, newFields)
       setEnabledServiceVMotion(newFields.tcp, fields.value, newFields)
     }
@@ -363,6 +376,16 @@ watch(
   }
 )
 
+watch(
+  () => props.tcpStacks,
+  (newValue: UI_I_TCPStack[]) => {
+    if (fields.value.tcp === '') {
+      fields.value.tcp = newValue?.[0]?.id || ''
+    }
+  },
+  { deep: true, immediate: true }
+)
+
 const onHideAlert = (): void => {
   emits('hide-alert', 3)
 }

package/lib/models/enums.ts

@@ -19,3 +19,10 @@ export enum E_NodeIconsByState {
   'network_Warning' = 'vsphere-icon-network-warning',
   'network_connected' = 'vsphere-icon-network',
 }
+
+export enum UI_E_State {
+  UNKNOWN = 0,
+  OK = 1,
+  WARNING = 2,
+  ERROR = 3,
+}

package/lib/models/interfaces.ts

@@ -1,4 +1,5 @@
 import type { UI_T_Status } from '~/components/atoms/alert/lib/models/types'
+import { UI_E_State } from '~/lib/models/enums'
 
 export interface UI_I_ItemView {
   value: number | string
@@ -24,3 +25,19 @@ export interface UI_I_NotifyBodyMessage {
   title: string
   desc: string
 }
+
+export interface UI_I_ListIndex {
+  idx: number
+  count: number
+}
+
+export interface UI_I_State {
+  state: UI_E_State
+  errors: string[]
+}
+
+export interface UI_I_ItemsWithTotalCounts<T> {
+  total_items: number
+  total_pages: number
+  items: T[]
+}

package/package.json

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