bfg-common 1.3.216 → 1.3.217

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

@@ -30,7 +30,7 @@
                       {{ localization.override }}
                     </label>
                   </div>
-                  <div v-if="!props.isSwitch" class="flex-property-value-group">
+                  <div class="flex-property-value-group">
                     <div class="select">
                       <select
                         id="traffic-shaping-select"
@@ -47,23 +47,6 @@
                       </select>
                     </div>
                   </div>
-                  <div v-else class="flex-property-value-group">
-                    <div class="select">
-                      <select
-                        id="traffic-shaping-select"
-                        v-model.number="fieldsValues.status.selected"
-                        :disabled="!fieldsValues.status.checked"
-                        name="selectName"
-                      >
-                        <option :label="localization.enabled" value="1">
-                          {{ localization.enabled }}
-                        </option>
-                        <option :label="localization.disabled" value="0">
-                          {{ localization.disabled }}
-                        </option>
-                      </select>
-                    </div>
-                  </div>
                 </div>
               </div>
             </div>
@@ -93,10 +76,7 @@
                       {{ localization.override }}
                     </label>
                   </div>
-                  <div
-                    v-if="!props.isSwitch"
-                    class="property-value-group tooltip-field-container"
-                  >
+                  <div class="property-value-group tooltip-field-container">
                     <atoms-tooltip-error
                       :has-error="!!props.errorMessages.average"
                     >
@@ -127,40 +107,6 @@
                       </template>
                     </atoms-tooltip-error>
                   </div>
-                  <div
-                    v-else
-                    class="property-value-group tooltip-field-container"
-                  >
-                    <atoms-tooltip-error
-                      :has-error="!!props.errorMessages.average"
-                    >
-                      <template #elem>
-                        <input
-                          id="average"
-                          v-model="fieldsValues.average"
-                          type="number"
-                          :disabled="
-                            !fieldsValues.status.checked ||
-                            fieldsValues.status.selected === 0
-                          "
-                          name="average"
-                          :class="[
-                            'tooltip-field',
-                            {
-                              'danger-not-valid':
-                                fieldsValues.status.checked &&
-                                fieldsValues.status.selected !== 0 &&
-                                props.errorMessages.average,
-                            },
-                          ]"
-                          @click.stop
-                        />
-                      </template>
-                      <template #content>
-                        {{ props.errorMessages.average }}
-                      </template>
-                    </atoms-tooltip-error>
-                  </div>
                 </div>
               </div>
             </div>
@@ -190,10 +136,7 @@
                       {{ localization.override }}
                     </label>
                   </div>
-                  <div
-                    v-if="!props.isSwitch"
-                    class="property-value-group tooltip-field-container"
-                  >
+                  <div class="property-value-group tooltip-field-container">
                     <atoms-tooltip-error
                       :has-error="!!props.errorMessages.peak"
                     >
@@ -224,40 +167,6 @@
                       </template>
                     </atoms-tooltip-error>
                   </div>
-                  <div
-                    v-else
-                    class="property-value-group tooltip-field-container"
-                  >
-                    <atoms-tooltip-error
-                      :has-error="!!props.errorMessages.peak"
-                    >
-                      <template #elem>
-                        <input
-                          id="peak"
-                          v-model="fieldsValues.peak"
-                          type="number"
-                          :disabled="
-                            !fieldsValues.status.checked ||
-                            fieldsValues.status.selected === 0
-                          "
-                          name="peak"
-                          :class="[
-                            'tooltip-field',
-                            {
-                              'danger-not-valid':
-                                fieldsValues.status.checked &&
-                                fieldsValues.status.selected !== 0 &&
-                                props.errorMessages.peak,
-                            },
-                          ]"
-                          @click.stop
-                        />
-                      </template>
-                      <template #content>
-                        {{ props.errorMessages.peak }}
-                      </template>
-                    </atoms-tooltip-error>
-                  </div>
                 </div>
               </div>
             </div>
@@ -287,10 +196,7 @@
                       {{ localization.override }}
                     </label>
                   </div>
-                  <div
-                    v-if="!props.isSwitch"
-                    class="property-value-group tooltip-field-container"
-                  >
+                  <div class="property-value-group tooltip-field-container">
                     <atoms-tooltip-error
                       :has-error="!!props.errorMessages.burstSize"
                     >
@@ -321,40 +227,6 @@
                       </template>
                     </atoms-tooltip-error>
                   </div>
-                  <div
-                    v-else
-                    class="property-value-group tooltip-field-container"
-                  >
-                    <atoms-tooltip-error
-                      :has-error="!!props.errorMessages.burstSize"
-                    >
-                      <template #elem>
-                        <input
-                          id="burst-size"
-                          v-model="fieldsValues.burstSize"
-                          type="number"
-                          :disabled="
-                            !fieldsValues.status.checked ||
-                            fieldsValues.status.selected === 0
-                          "
-                          name="burst-size"
-                          :class="[
-                            'tooltip-field',
-                            {
-                              'danger-not-valid':
-                                fieldsValues.status.checked &&
-                                fieldsValues.status.selected !== 0 &&
-                                props.errorMessages.burstSize,
-                            },
-                          ]"
-                          @click.stop
-                        />
-                      </template>
-                      <template #content>
-                        {{ props.errorMessages.burstSize }}
-                      </template>
-                    </atoms-tooltip-error>
-                  </div>
                 </div>
               </div>
             </div>

package/components/common/diagramMain/modals/lib/config/index.ts

@@ -16,7 +16,6 @@ export const {
 } = portModalConfig
 export const {
   teamingAndFailoverTemplateMakerFunc,
-  teamingAndFailoverNetworkTemplateMakerFunc,
   networkViewSettingsModalTabsFunc,
   networkEditSettingsTabsFunc,
   networkViewSettingsFunc,
@@ -35,7 +34,6 @@ export const {
   securityFieldsInitialFunc,
   securityNetworkFieldsInitialFunc,
   teamingFailoverFieldsInitialFunc,
-  teamingFailoverNetworkFieldsInitialFunc,
   ipvFourSettingsFields,
 } = initialConfig
 export const {

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

@@ -72,68 +72,6 @@ export const teamingFailoverFieldsInitialFunc = (
   return teaming
 }
 
-export const teamingFailoverNetworkFieldsInitialFunc = (
-  isSwitch: boolean,
-  initialData?: UI_I_ModalsInitialData
-): UI_I_TeamingFailoverFields => {
-  const teaming = {
-    loadBalancing: {
-      checked: isSwitch,
-      selected: 'balance-tcp',
-    },
-    networkFailureDetection: {
-      checked: isSwitch,
-      selected: 'carier',
-    },
-    notifySwitches: {
-      checked: isSwitch,
-      selected: 'yes',
-    },
-    failback: {
-      checked: isSwitch,
-      selected: 'yes',
-    },
-    failoverOrder: {
-      checked: isSwitch,
-    },
-  }
-
-  initialData &&
-    initialData.nicTeamingPolicy?.forEach(
-      (sec: UI_I_NetworkSummaryPortletListItem) => {
-        switch (sec.id) {
-          case 'mode':
-            teaming.loadBalancing = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-          case 'link_detect':
-            teaming.networkFailureDetection = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-          case 'notify_switches':
-            teaming.notifySwitches = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-          case 'failback':
-            teaming.failback = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-        }
-      }
-    )
-
-  teaming.failoverOrder.checked = initialData?.nics_override || false
-
-  return teaming
-}
 
 export const securityFieldsInitialFunc = (
   isSwitch: boolean,

package/components/common/diagramMain/modals/lib/config/networkModal.ts

@@ -5,6 +5,11 @@ import {
   UI_I_OverrideValue,
   UI_I_TeamingAndFailoverTemplate,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import {
+  UI_E_IYNOption,
+  UI_E_IBSTLoadBalancingMode,
+  UI_E_ICBLinkDetectionMode,
+} from '~/components/common/diagramMain/lib/models/enums'
 
 export const networkViewSettingsModalTabsFunc = (
   localization: UI_I_Localization
@@ -35,106 +40,30 @@ export const networkViewSettingsFunc = (
   localization: UI_I_Localization,
   initialData: UI_I_ModalsInitialData
 ) => {
-  const linkDetect: UI_I_OverrideValue = findInitialValue(
-    initialData.nicTeamingPolicy,
-    'link_detect'
-  )
-
-  const failback: UI_I_OverrideValue = findInitialValue(
-    initialData.nicTeamingPolicy,
-    'failback'
-  )
-
-  const loadBalancing: UI_I_OverrideValue = findInitialValue(
-    initialData.nicTeamingPolicy,
-    'mode'
-  )
-
-  const notifySwitches: UI_I_OverrideValue = findInitialValue(
-    initialData.nicTeamingPolicy,
-    'notify_switches'
-  )
-
-  const promiscuousMode: UI_I_OverrideValue = findInitialValue(
-    initialData.securityPolicy,
-    'promiscuous_mode'
-  )
-
-  const macAddressChanges: UI_I_OverrideValue = findInitialValue(
-    initialData.securityPolicy,
-    'mac_change'
-  )
-
-  const forgedTransmits: UI_I_OverrideValue = findInitialValue(
-    initialData.securityPolicy,
-    'forged_transmits'
-  )
-
-  const promiscuousModeValue: string =
-    promiscuousMode && promiscuousMode.value
-      ? promiscuousMode.value === 'yes'
-        ? localization.accept
-        : localization.reject
-      : '--'
+  const loadBalancing =
+    (
+      initialData.nicTeamingPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_IBSTLoadBalancingMode>[]
+    )?.find(
+      (
+        teaming: UI_I_NetworkSummaryPortletListItem<UI_E_IBSTLoadBalancingMode>
+      ) => teaming.id === 'mode'
+    )?.value || UI_E_IBSTLoadBalancingMode.BACKUP
 
-  const macAddressChangesValue: string =
-    macAddressChanges && macAddressChanges.value
-      ? macAddressChanges.value === 'yes'
-        ? localization.accept
-        : localization.reject
-      : '--'
+  let loadBalancingValue: string
 
-  const forgedTransmitsValue: string =
-    forgedTransmits && forgedTransmits.value
-      ? forgedTransmits.value === 'yes'
-        ? localization.accept
-        : localization.reject
-      : '--'
-
-  const averageBandwidthValue: string = initialData.shapingPolicy?.[0]
-    .initialValue.value
-    ? `${initialData.average_bw} ${localization.kbitS}`
-    : '--'
-
-  const peakBandwidthValue: string = initialData.shapingPolicy?.[0].initialValue
-    .value
-    ? `${initialData.peak_bw} ${localization.kbitS}`
-    : '--'
-
-  const burstSizeValue: string = initialData.shapingPolicy?.[0].initialValue
-    .value
-    ? `${initialData.burst_size} ${localization.kb}`
-    : '--'
-
-  const loadBalancingValue: string = loadBalancing
-    ? (loadBalancing.value === 'balance-tcp' &&
-        localization.routeBasedIpHash) ||
-      (loadBalancing.value === 'balance-slb' &&
-        localization.routeBasedSourceMacHash) ||
-      (loadBalancing.value === 'active-backup' &&
-        localization.useExplicitFailoverOrder) ||
-      '--'
-    : '--'
-
-  const networkFailureDetectionValue: string =
-    (linkDetect &&
-      linkDetect.value &&
-      localization[linkDetect.value.toString()]) ||
-    '--'
-
-  const notifySwitchesValue: string =
-    notifySwitches && notifySwitches.value
-      ? notifySwitches.value === 'yes'
-        ? localization.yes
-        : localization.no
-      : '--'
-
-  const failbackValue: string =
-    failback && failback.value
-      ? failback.value === 'yes'
-        ? localization.yes
-        : localization.no
-      : '--'
+  switch (loadBalancing) {
+    case UI_E_IBSTLoadBalancingMode.BACKUP:
+      loadBalancingValue = localization.useExplicitFailoverOrder
+      break
+    case UI_E_IBSTLoadBalancingMode.SLB:
+      loadBalancingValue = localization.routeBasedSourceMacHash
+      break
+    case UI_E_IBSTLoadBalancingMode.TCP:
+      loadBalancingValue = localization.routeBasedIpHash
+      break
+    default:
+      loadBalancingValue = '--'
+  }
 
   return [
     {
@@ -159,15 +88,39 @@ export const networkViewSettingsFunc = (
       rows: [
         {
           name: localization.promiscuousMode,
-          value: promiscuousModeValue,
+          value:
+            (
+              initialData.securityPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>[]
+            )?.find(
+              (sec: UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>) =>
+                sec.id === 'promiscuous_mode'
+            )?.initialValue?.value === UI_E_IYNOption.YES
+              ? localization.accept
+              : localization.reject,
         },
         {
           name: localization.macAddressChanges,
-          value: macAddressChangesValue,
+          value:
+            (
+              initialData.securityPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>[]
+            )?.find(
+              (sec: UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>) =>
+                sec.id === 'mac_change'
+            )?.initialValue?.value === UI_E_IYNOption.YES
+              ? localization.accept
+              : localization.reject,
         },
         {
           name: localization.forgedTransmits,
-          value: forgedTransmitsValue,
+          value:
+            (
+              initialData.securityPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>[]
+            )?.find(
+              (sec: UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>) =>
+                sec.id === 'forged_transmits'
+            )?.initialValue?.value === UI_E_IYNOption.YES
+              ? localization.accept
+              : localization.reject,
         },
       ],
     },
@@ -178,15 +131,21 @@ export const networkViewSettingsFunc = (
       rows: [
         {
           name: localization.averageBandwidth,
-          value: averageBandwidthValue,
+          value: initialData.shapingPolicy?.[0].initialValue.value
+            ? `${initialData.average_bw} ${localization.kbitS}`
+            : '--',
         },
         {
           name: localization.peakBandwidth,
-          value: peakBandwidthValue,
+          value: initialData.shapingPolicy?.[0].initialValue.value
+            ? `${initialData.peak_bw} ${localization.kbitS}`
+            : '--',
         },
         {
           name: localization.burstSize,
-          value: burstSizeValue,
+          value: initialData.shapingPolicy?.[0].initialValue.value
+            ? `${initialData.burst_size} ${localization.kb}`
+            : '--',
         },
       ],
     },
@@ -201,15 +160,40 @@ export const networkViewSettingsFunc = (
         },
         {
           name: localization.networkFailureDetection,
-          value: networkFailureDetectionValue,
+          value:
+            (
+              initialData.nicTeamingPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_ICBLinkDetectionMode>[]
+            )?.find(
+              (
+                teaming: UI_I_NetworkSummaryPortletListItem<UI_E_ICBLinkDetectionMode>
+              ) => teaming.id === 'link_detect'
+            )?.value === 1
+              ? localization.linkStatusOnly
+              : localization.beaconProbing,
         },
         {
           name: localization.notifySwitches,
-          value: notifySwitchesValue,
+          value:
+            (
+              initialData.nicTeamingPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>[]
+            )?.find(
+              (teaming: UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>) =>
+                teaming.id === 'notify_switches'
+            )?.value === UI_E_IYNOption.YES
+              ? localization.yes
+              : localization.no,
         },
         {
           name: localization.failback,
-          value: failbackValue,
+          value:
+            (
+              initialData.nicTeamingPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>[]
+            )?.find(
+              (teaming: UI_I_NetworkSummaryPortletListItem<UI_E_IYNOption>) =>
+                teaming.id === 'failback'
+            )?.value === UI_E_IYNOption.YES
+              ? localization.yes
+              : localization.no,
         },
         {
           name: localization.activeAdapters,
@@ -342,61 +326,4 @@ export const teamingAndFailoverTemplateMakerFunc = (
       },
     ],
   },
-]
-
-export const teamingAndFailoverNetworkTemplateMakerFunc = (
-  localization: UI_I_Localization
-): UI_I_TeamingAndFailoverTemplate[] => [
-  {
-    key: 'loadBalancing',
-    options: [
-      {
-        value: 'balance-tcp',
-        text: localization.routeBasedIpHash,
-      },
-      {
-        value: 'balance-slb',
-        text: localization.routeBasedSourceMacHash,
-      },
-      {
-        value: 'active-backup',
-        text: localization.useExplicitFailoverOrder,
-      },
-    ],
-  },
-  {
-    key: 'networkFailureDetection',
-    options: [
-      {
-        value: 'carier',
-        text: localization.linkStatusOnly,
-      },
-    ],
-  },
-  {
-    key: 'notifySwitches',
-    options: [
-      {
-        value: 'no',
-        text: localization.no,
-      },
-      {
-        value: 'yes',
-        text: localization.yes,
-      },
-    ],
-  },
-  {
-    key: 'failback',
-    options: [
-      {
-        value: 'no',
-        text: localization.no,
-      },
-      {
-        value: 'yes',
-        text: localization.yes,
-      },
-    ],
-  },
-]
+]