bfg-common 1.0.16 → 1.0.18

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

@@ -1,178 +1,183 @@
-<template>
-  <div class="wizard-content__container">
-    <div class="wizard-content">
-      <form action="">
-        <div class="horizontal-flex-container">
-          <span class="flex-property-label-group large">
-            {{ localization.promiscuousMode }}
-          </span>
-
-          <div class="flex-property-value-group overridable-dropdown">
-            <div class="horizontal-flex-container no-margin">
-              <div class="flex-property-value-group">
-                <div class="horizontal-flex-container">
-                  <div
-                    v-if="!props.isSwitch"
-                    class="flex-property-label-group small checkbox-inline"
-                  >
-                    <input
-                      id="promiscuous-mode"
-                      v-model="fieldsValues.promiscuousMode.checked"
-                      type="checkbox"
-                    />
-                    <label for="promiscuous-mode" class="normal-weight">
-                      {{ localization.override }}
-                    </label>
-                  </div>
-                  <div class="flex-property-value-group">
-                    <div class="select">
-                      <select
-                        id="promiscuous-mode-select"
-                        v-model="fieldsValues.promiscuousMode.selected"
-                        :disabled="!fieldsValues.promiscuousMode.checked"
-                        name="selectName"
-                      >
-                        <option value="no" :label="localization.reject">
-                          {{ localization.reject }}
-                        </option>
-                        <option value="yes" :label="localization.accept">
-                          {{ localization.accept }}
-                        </option>
-                      </select>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="horizontal-flex-container">
-          <span class="flex-property-label-group large">
-            {{ localization.macAddressChanges }}
-          </span>
-
-          <div class="flex-property-value-group overridable-dropdown">
-            <div class="horizontal-flex-container no-margin">
-              <div class="flex-property-value-group">
-                <div class="horizontal-flex-container">
-                  <div
-                    v-if="!props.isSwitch"
-                    class="flex-property-label-group small checkbox-inline"
-                  >
-                    <input
-                      id="mac-address-changes"
-                      v-model="fieldsValues.macAddressChanges.checked"
-                      type="checkbox"
-                    />
-                    <label for="mac-address-changes" class="normal-weight">
-                      {{ localization.override }}
-                    </label>
-                  </div>
-                  <div class="flex-property-value-group">
-                    <div class="select">
-                      <select
-                        id="mac-address-select"
-                        v-model="fieldsValues.macAddressChanges.selected"
-                        :disabled="!fieldsValues.macAddressChanges.checked"
-                        name="selectName"
-                      >
-                        <option value="no" :label="localization.reject">
-                          {{ localization.reject }}
-                        </option>
-                        <option value="yes" :label="localization.accept">
-                          {{ localization.accept }}
-                        </option>
-                      </select>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="horizontal-flex-container">
-          <span class="flex-property-label-group large">
-            {{ localization.forgedTransmits }}
-          </span>
-
-          <div class="flex-property-value-group overridable-dropdown">
-            <div class="horizontal-flex-container no-margin">
-              <div class="flex-property-value-group">
-                <div class="horizontal-flex-container">
-                  <div
-                    v-if="!props.isSwitch"
-                    class="flex-property-label-group small checkbox-inline"
-                  >
-                    <input
-                      id="forged-transmits"
-                      v-model="fieldsValues.forgedTransmits.checked"
-                      type="checkbox"
-                    />
-                    <label for="forged-transmits" class="normal-weight">
-                      {{ localization.override }}
-                    </label>
-                  </div>
-                  <div class="flex-property-value-group">
-                    <div class="select">
-                      <select
-                        id="forged-transmits"
-                        v-model="fieldsValues.forgedTransmits.selected"
-                        :disabled="!fieldsValues.forgedTransmits.checked"
-                        name="selectName"
-                      >
-                        <option value="no" :label="localization.reject">
-                          {{ localization.reject }}
-                        </option>
-                        <option value="yes" :label="localization.accept">
-                          {{ localization.accept }}
-                        </option>
-                      </select>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_Localization } from '~/models/interfaces'
-import {
-  UI_I_ModalsInitialData,
-  UI_I_SecurityFields,
-} from '~/components/common/diagramMain/models/interfaces'
-import { securityFieldsInitialFunc } from '~/components/common/diagramMain/modals/config'
-
-// Props from up
-const props = defineProps<{
-  isSwitch?: boolean
-  initialData?: UI_I_ModalsInitialData
-}>()
-
-// UI_I_Localization
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const fieldsValues = ref<UI_I_SecurityFields>(
-  securityFieldsInitialFunc(props.isSwitch, props.initialData)
-)
-
-const emits = defineEmits<{
-  (event: 'change-edit-security-data', securityData: UI_I_SecurityFields): void
-}>()
-
-onMounted(() => {
-  emits('change-edit-security-data', fieldsValues.value)
-})
-
-watch(
-  fieldsValues,
-  (newFieldsValues: UI_I_SecurityFields) => {
-    emits('change-edit-security-data', newFieldsValues)
-  },
-  { deep: true }
-)
-</script>
+<template>
+  <div class="wizard-content__container">
+    <div class="wizard-content">
+      <form action="">
+        <div class="horizontal-flex-container">
+          <span class="flex-property-label-group large">
+            {{ localization.promiscuousMode }}
+          </span>
+
+          <div class="flex-property-value-group overridable-dropdown">
+            <div class="horizontal-flex-container no-margin">
+              <div class="flex-property-value-group">
+                <div class="horizontal-flex-container">
+                  <div
+                    v-if="!props.isSwitch"
+                    class="flex-property-label-group small checkbox-inline"
+                  >
+                    <input
+                      id="promiscuous-mode"
+                      v-model="fieldsValues.promiscuousMode.checked"
+                      type="checkbox"
+                    />
+                    <label for="promiscuous-mode" class="normal-weight">
+                      {{ localization.override }}
+                    </label>
+                  </div>
+                  <div class="flex-property-value-group">
+                    <div class="select">
+                      <select
+                        id="promiscuous-mode-select"
+                        v-model="fieldsValues.promiscuousMode.selected"
+                        :disabled="!fieldsValues.promiscuousMode.checked"
+                        name="selectName"
+                      >
+                        <option value="no" :label="localization.reject">
+                          {{ localization.reject }}
+                        </option>
+                        <option value="yes" :label="localization.accept">
+                          {{ localization.accept }}
+                        </option>
+                      </select>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="horizontal-flex-container">
+          <span class="flex-property-label-group large">
+            {{ localization.macAddressChanges }}
+          </span>
+
+          <div class="flex-property-value-group overridable-dropdown">
+            <div class="horizontal-flex-container no-margin">
+              <div class="flex-property-value-group">
+                <div class="horizontal-flex-container">
+                  <div
+                    v-if="!props.isSwitch"
+                    class="flex-property-label-group small checkbox-inline"
+                  >
+                    <input
+                      id="mac-address-changes"
+                      v-model="fieldsValues.macAddressChanges.checked"
+                      type="checkbox"
+                    />
+                    <label for="mac-address-changes" class="normal-weight">
+                      {{ localization.override }}
+                    </label>
+                  </div>
+                  <div class="flex-property-value-group">
+                    <div class="select">
+                      <select
+                        id="mac-address-select"
+                        v-model="fieldsValues.macAddressChanges.selected"
+                        :disabled="!fieldsValues.macAddressChanges.checked"
+                        name="selectName"
+                      >
+                        <option value="no" :label="localization.reject">
+                          {{ localization.reject }}
+                        </option>
+                        <option value="yes" :label="localization.accept">
+                          {{ localization.accept }}
+                        </option>
+                      </select>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="horizontal-flex-container">
+          <span class="flex-property-label-group large">
+            {{ localization.forgedTransmits }}
+          </span>
+
+          <div class="flex-property-value-group overridable-dropdown">
+            <div class="horizontal-flex-container no-margin">
+              <div class="flex-property-value-group">
+                <div class="horizontal-flex-container">
+                  <div
+                    v-if="!props.isSwitch"
+                    class="flex-property-label-group small checkbox-inline"
+                  >
+                    <input
+                      id="forged-transmits"
+                      v-model="fieldsValues.forgedTransmits.checked"
+                      type="checkbox"
+                    />
+                    <label for="forged-transmits" class="normal-weight">
+                      {{ localization.override }}
+                    </label>
+                  </div>
+                  <div class="flex-property-value-group">
+                    <div class="select">
+                      <select
+                        id="forged-transmits"
+                        v-model="fieldsValues.forgedTransmits.selected"
+                        :disabled="!fieldsValues.forgedTransmits.checked"
+                        name="selectName"
+                      >
+                        <option value="no" :label="localization.reject">
+                          {{ localization.reject }}
+                        </option>
+                        <option value="yes" :label="localization.accept">
+                          {{ localization.accept }}
+                        </option>
+                      </select>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_Localization } from '~/models/interfaces'
+import {
+  UI_I_ModalsInitialData,
+  UI_I_SecurityFields,
+} from '~/components/common/diagramMain/models/interfaces'
+import { securityFieldsInitialFunc } from '~/components/common/diagramMain/modals/config'
+
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    isSwitch: boolean
+    initialData?: UI_I_ModalsInitialData
+  }>(),
+  {
+    isSwitch: false,
+  }
+)
+
+// UI_I_Localization
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const fieldsValues = ref<UI_I_SecurityFields>(
+  securityFieldsInitialFunc(props.isSwitch, props.initialData)
+)
+
+const emits = defineEmits<{
+  (event: 'change-edit-security-data', securityData: UI_I_SecurityFields): void
+}>()
+
+onMounted(() => {
+  emits('change-edit-security-data', fieldsValues.value)
+})
+
+watch(
+  fieldsValues,
+  (newFieldsValues: UI_I_SecurityFields) => {
+    emits('change-edit-security-data', newFieldsValues)
+  },
+  { deep: true }
+)
+</script>

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,
   }
 )