bfg-common 1.3.216 → 1.3.218

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>
@@ -374,10 +246,7 @@ import {
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import { UI_T_TrafficShapingFieldName } from '~/components/common/diagramMain/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
-import {
-  trafficShapingFieldsInitialFunc,
-  trafficShapingNetworkFieldsInitialFunc,
-} from '~/components/common/diagramMain/modals/lib/config'
+import { trafficShapingFieldsInitialFunc } from '~/components/common/diagramMain/modals/lib/config'
 
 // Props from up
 const props = withDefaults(
@@ -410,9 +279,7 @@ const isShowErrorMessage = computed<boolean>(
 )
 
 const fieldsValues = ref<UI_I_TrafficShapingFields>(
-  props.isSwitch
-    ? trafficShapingFieldsInitialFunc(props.isSwitch, props.initialData)
-    : trafficShapingNetworkFieldsInitialFunc(props.isSwitch, props.initialData)
+  trafficShapingFieldsInitialFunc(props.isSwitch, props.initialData)
 )
 
 // Validation

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

@@ -16,7 +16,6 @@ export const {
 } = portModalConfig
 export const {
   teamingAndFailoverTemplateMakerFunc,
-  teamingAndFailoverNetworkTemplateMakerFunc,
   networkViewSettingsModalTabsFunc,
   networkEditSettingsTabsFunc,
   networkViewSettingsFunc,
@@ -31,11 +30,8 @@ export const { vCenterViewSettingsFunc, vCenterPopupFieldsFunc } =
   vCenterModalConfig
 export const {
   trafficShapingFieldsInitialFunc,
-  trafficShapingNetworkFieldsInitialFunc,
   securityFieldsInitialFunc,
-  securityNetworkFieldsInitialFunc,
   teamingFailoverFieldsInitialFunc,
-  teamingFailoverNetworkFieldsInitialFunc,
   ipvFourSettingsFields,
 } = initialConfig
 export const {

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

@@ -6,7 +6,6 @@ import {
   UI_I_ModalsInitialData,
   UI_I_NetworkSummaryPortletListItem,
   UI_I_OverrideValue,
-  UI_I_TrafficShapingSpeeds,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 export const teamingFailoverFieldsInitialFunc = (
@@ -72,69 +71,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,
   initialData?: UI_I_ModalsInitialData
@@ -183,53 +119,6 @@ export const securityFieldsInitialFunc = (
   return security
 }
 
-export const securityNetworkFieldsInitialFunc = (
-  isSwitch: boolean,
-  initialData?: UI_I_ModalsInitialData
-): UI_I_SecurityFields => {
-  const security: UI_I_SecurityFields = {
-    promiscuousMode: {
-      checked: isSwitch,
-      selected: '0',
-    },
-    macAddressChanges: {
-      checked: isSwitch,
-      selected: '0',
-    },
-    forgedTransmits: {
-      checked: isSwitch,
-      selected: '0',
-    },
-  }
-
-  initialData &&
-    initialData.securityPolicy?.forEach(
-      (sec: UI_I_NetworkSummaryPortletListItem) => {
-        switch (sec.id) {
-          case 'promiscuous_mode':
-            security.promiscuousMode = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-          case 'mac_change':
-            security.macAddressChanges = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-          case 'forged_transmits':
-            security.forgedTransmits = {
-              checked: isSwitch || sec.initialValue.override,
-              selected: sec.initialValue.value as string,
-            }
-            return true
-        }
-      }
-    )
-
-  return security
-}
 export const trafficShapingFieldsInitialFunc = (
   isSwitch: boolean,
   initialData: UI_I_ModalsInitialData
@@ -273,49 +162,6 @@ export const trafficShapingFieldsInitialFunc = (
   return trafficShaping
 }
 
-export const trafficShapingNetworkFieldsInitialFunc = (
-  isSwitch: boolean,
-  initialData: UI_I_ModalsInitialData
-): UI_I_TrafficShapingFields => {
-  const trafficShapingInitialValue = initialData?.shapingPolicy?.find(
-    (sec: UI_I_NetworkSummaryPortletListItem) => sec.id === 'shaping_enabled'
-  )?.initialValue as UI_I_OverrideValue
-
-  let trafficShaping: UI_I_TrafficShapingFields = {
-    status: {
-      checked: isSwitch,
-      selected: '1',
-    },
-    average: 100000,
-    peak: 100000,
-    burstSize: 102400,
-  }
-
-  initialData &&
-    initialData.shapingPolicy?.forEach(
-      (sec: UI_I_NetworkSummaryPortletListItem) => {
-        switch (sec.id) {
-          case 'shaping_enabled':
-            trafficShaping.status = {
-              checked: isSwitch || trafficShapingInitialValue?.override,
-              selected: trafficShapingInitialValue?.value ? '1' : '0',
-            }
-            return true
-        }
-      }
-    )
-
-  initialData &&
-    (trafficShaping = {
-      ...trafficShaping,
-      average: initialData?.average_bw || 0,
-      peak: initialData?.average_bw || 0,
-      burstSize: initialData?.average_bw || 0,
-    })
-
-  return trafficShaping
-}
-
 export const ipvFourSettingsFields: UI_I_IpvFourSettingsFields = {
   ipv4Settings: '1',
   ipv4Address: '10.10.101.16',