bfg-common 1.0.15 → 1.0.17

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

@@ -10,28 +10,28 @@ import {
 } from '~/components/common/diagramMain/models/interfaces'
 
 export const teamingFailoverFieldsInitialFunc = (
-  isSwitch: boolean | undefined,
-  initialData: UI_I_ModalsInitialData | undefined
+  isSwitch: boolean,
+  initialData?: UI_I_ModalsInitialData
 ): UI_I_TeamingFailoverFields => {
   const teaming = {
     loadBalancing: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: 'balance-tcp',
     },
     networkFailureDetection: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: 'carier',
     },
     notifySwitches: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: 'yes',
     },
     failback: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: 'yes',
     },
     failoverOrder: {
-      checked: isSwitch || false,
+      checked: isSwitch,
     },
   }
 
@@ -41,34 +41,26 @@ export const teamingFailoverFieldsInitialFunc = (
         switch (sec.id) {
           case 'mode':
             teaming.loadBalancing = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
           case 'link_detect':
             teaming.networkFailureDetection = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
           case 'notify_switches':
             teaming.notifySwitches = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
           case 'failback':
             teaming.failback = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
         }
@@ -81,20 +73,20 @@ export const teamingFailoverFieldsInitialFunc = (
 }
 
 export const securityFieldsInitialFunc = (
-  isSwitch: boolean | undefined,
-  initialData: UI_I_ModalsInitialData | undefined
+  isSwitch: boolean,
+  initialData?: UI_I_ModalsInitialData
 ): UI_I_SecurityFields => {
   const security: UI_I_SecurityFields = {
     promiscuousMode: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: '0',
     },
     macAddressChanges: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: '0',
     },
     forgedTransmits: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: '0',
     },
   }
@@ -105,26 +97,20 @@ export const securityFieldsInitialFunc = (
         switch (sec.id) {
           case 'promiscuous_mode':
             security.promiscuousMode = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
           case 'mac_change':
             security.macAddressChanges = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
           case 'forged_transmits':
             security.forgedTransmits = {
-              checked:
-                isSwitch || (sec.initialValue as UI_I_OverrideValue).override,
-              selected: (sec.initialValue as UI_I_OverrideValue)
-                .value as string,
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as string,
             }
             return true
         }
@@ -134,8 +120,8 @@ export const securityFieldsInitialFunc = (
   return security
 }
 export const trafficShapingFieldsInitialFunc = (
-  isSwitch: boolean | undefined,
-  initialData: UI_I_ModalsInitialData | undefined,
+  isSwitch: boolean,
+  initialData: UI_I_ModalsInitialData,
   speeds: UI_I_TrafficShapingSpeeds
 ): UI_I_TrafficShapingFields => {
   const trafficShapingInitialValue = initialData?.shapingPolicy?.find(
@@ -144,7 +130,7 @@ export const trafficShapingFieldsInitialFunc = (
 
   let trafficShaping: UI_I_TrafficShapingFields = {
     status: {
-      checked: isSwitch || false,
+      checked: isSwitch,
       selected: '1',
     },
     average: 100000,
@@ -158,8 +144,8 @@ export const trafficShapingFieldsInitialFunc = (
         switch (sec.id) {
           case 'shaping_enabled':
             trafficShaping.status = {
-              checked: isSwitch || trafficShapingInitialValue.override,
-              selected: trafficShapingInitialValue.value ? '1' : '0',
+              checked: isSwitch || trafficShapingInitialValue?.override,
+              selected: trafficShapingInitialValue?.value ? '1' : '0',
             }
             return true
         }

package/components/common/diagramMain/modals/editSettings/EditSettings.vue

@@ -186,12 +186,12 @@ const isFailoverOrderOverride = computed<string | number | boolean | undefined>(
 
 const adapterStatus = ref<UI_I_AdapterStatus>({
   active: [],
-  standBy: [],
+  standby: [],
   unused: [],
 })
 const adapterStatusInitial = ref<UI_I_AdapterStatus>({
   active: [],
-  standBy: [],
+  standby: [],
   unused: [],
 })
 
@@ -308,7 +308,8 @@ const checkNetworkLabelCallback = (
 }
 
 const networkLabel = computed<string>(
-  () => networkEditData.value.properties?.networkLabel
+  () =>
+    (networkEditData.value.properties as UI_I_PropertiesFields)?.networkLabel
 )
 const onSendData = () => {
   if (isNetwork.value) {
@@ -440,11 +441,11 @@ watch(
 
 onMounted(() => {
   const active = useDeepCopy(props.initialData.activeAdapters) || []
-  const standBy = useDeepCopy(props.initialData.standbyAdapters) || []
+  const standby = useDeepCopy(props.initialData.standbyAdapters) || []
   const unused = useDeepCopy(props.initialData.unusedAdapters) || []
   const adapterStatusInit = {
     active,
-    standBy,
+    standby,
     unused,
   }
   adapterStatus.value = adapterStatusInit

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

@@ -148,10 +148,15 @@ import {
 import { securityFieldsInitialFunc } from '~/components/common/diagramMain/modals/config'
 
 // Props from up
-const props = defineProps<{
-  isSwitch?: boolean
-  initialData?: UI_I_ModalsInitialData
-}>()
+const props = withDefaults(
+  defineProps<{
+    isSwitch: boolean
+    initialData?: UI_I_ModalsInitialData
+  }>(),
+  {
+    isSwitch: false,
+  }
+)
 
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())

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

@@ -111,10 +111,11 @@ const props = withDefaults(
     initialData?: UI_I_ModalsInitialData
     adapters: UI_I_SwitchAdapters
     adapterStatus: UI_I_AdapterStatus
-    isSwitch?: boolean
+    isSwitch: boolean
   }>(),
   {
     initialData: () => ({}),
+    isSwitch: false,
   }
 )
 

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

@@ -255,10 +255,11 @@ const props = withDefaults(
     initialData?: UI_I_ModalsInitialData
     errorMessages: UI_I_EditSettingsErrorMessage
     hasErrorMessages?: boolean
-    isSwitch?: boolean
+    isSwitch: boolean
   }>(),
   {
     initialData: () => ({}),
+    isSwitch: false,
   }
 )
 
@@ -279,9 +280,9 @@ const isShowErrorMessage = computed<boolean>(
 
 const fieldsValues = ref<UI_I_TrafficShapingFields>(
   trafficShapingFieldsInitialFunc(props.isSwitch, props.initialData, {
-    average_bw: props.initialData?.average_bw,
-    peak_bw: props.initialData?.peak_bw,
-    burst_size: props.initialData?.burst_size,
+    average_bw: props.initialData?.average_bw || 0,
+    peak_bw: props.initialData?.peak_bw || 0,
+    burst_size: props.initialData?.burst_size || 0,
   })
 )