bfg-common 1.3.216 → 1.3.218

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,
-      },
-    ],
-  },
-]
+]

package/components/common/pages/Tasks.vue

@@ -1,120 +1,120 @@
-<template>
-  <div class="tasks">
-    <common-headline
-      :headline="localization.taskConsole"
-      class="tasks__headline"
-    />
-
-    <div class="btn-group">
-      <button
-        id="task-previous-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === 1"
-        @click="onClickButton('previous')"
-      >
-        {{ localization.previous }}
-      </button>
-
-      <button
-        id="task-next-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === tasksList?.total_pages"
-        @click="onClickButton('next')"
-      >
-        {{ localization.next }}
-      </button>
-    </div>
-
-    <templates-tasks-table-view
-      :data-table="tasksList?.items || []"
-      :total-items="tasksList?.total_items || 0"
-      :total-pages="tasksList?.total_pages || 1"
-      :pagination="pagination"
-      :loading="isLoading"
-      @pagination="onUpdatePagination"
-      @sort="onSortTable"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type {
-  UI_I_Pagination,
-  UI_I_DataTableQuery,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
-
-definePageMeta({
-  middleware: ['auth'],
-})
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const sort = ref<string | null>(null)
-
-const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
-
-const onClickButton = (status: string): void => {
-  if (status === 'next') {
-    pagination.value.page += 1
-    return
-  }
-
-  pagination.value.page -= 1
-}
-
-const getTasks = async (): Promise<void> => {
-  pauseGlobalRefresh()
-
-  const payload: UI_I_DataTableQuery = {
-    ...pagination.value,
-    sortBy: sort.value || '',
-  }
-  await $store.dispatch('tasks/A_GET_TASKS', payload)
-}
-
-const onUpdatePagination = (event: UI_I_Pagination): void => {
-  pagination.value = event
-  getTasks()
-}
-
-const onSortTable = (event: string): void => {
-  sort.value = event
-  getTasks()
-}
-
-const isLoading = computed<boolean>(() =>
-  $store.getters['tasks/getLoading']('tasks')
-)
-const pauseGlobalRefresh = (): void => {
-  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
-  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
-}
-onUnmounted(() => {
-  pauseGlobalRefresh()
-})
-</script>
-
-<style lang="scss">
-@import '~/node_modules/bfg-common/assets/scss/common/mixins';
-.tasks {
-  @include flex($dir: column);
-  height: 100%;
-  padding-left: 10px;
-  &__headline {
-    padding-left: 10px;
-    margin-bottom: 0.6rem;
-  }
-  .btn {
-    text-transform: uppercase;
-  }
-}
-</style>
+<template>
+  <div class="tasks">
+    <common-headline
+      :headline="localization.taskConsole"
+      class="tasks__headline"
+    />
+
+    <div class="btn-group">
+      <button
+        id="task-previous-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === 1"
+        @click="onClickButton('previous')"
+      >
+        {{ localization.previous }}
+      </button>
+
+      <button
+        id="task-next-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === tasksList?.total_pages"
+        @click="onClickButton('next')"
+      >
+        {{ localization.next }}
+      </button>
+    </div>
+
+    <templates-tasks-table-view
+      :data-table="tasksList?.items || []"
+      :total-items="tasksList?.total_items || 0"
+      :total-pages="tasksList?.total_pages || 1"
+      :pagination="pagination"
+      :loading="isLoading"
+      @pagination="onUpdatePagination"
+      @sort="onSortTable"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type {
+  UI_I_Pagination,
+  UI_I_DataTableQuery,
+} from '~/lib/models/table/interfaces'
+import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
+
+definePageMeta({
+  middleware: ['auth'],
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+const sort = ref<string | null>(null)
+
+const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
+
+const onClickButton = (status: string): void => {
+  if (status === 'next') {
+    pagination.value.page += 1
+    return
+  }
+
+  pagination.value.page -= 1
+}
+
+const getTasks = async (): Promise<void> => {
+  pauseGlobalRefresh()
+
+  const payload: UI_I_DataTableQuery = {
+    ...pagination.value,
+    sortBy: sort.value || '',
+  }
+  await $store.dispatch('tasks/A_GET_TASKS', payload)
+}
+
+const onUpdatePagination = (event: UI_I_Pagination): void => {
+  pagination.value = event
+  getTasks()
+}
+
+const onSortTable = (event: string): void => {
+  sort.value = event
+  getTasks()
+}
+
+const isLoading = computed<boolean>(() =>
+  $store.getters['tasks/getLoading']('tasks')
+)
+const pauseGlobalRefresh = (): void => {
+  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
+  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
+}
+onUnmounted(() => {
+  pauseGlobalRefresh()
+})
+</script>
+
+<style lang="scss">
+@import '~/node_modules/bfg-common/assets/scss/common/mixins';
+.tasks {
+  @include flex($dir: column);
+  height: 100%;
+  padding-left: 10px;
+  &__headline {
+    padding-left: 10px;
+    margin-bottom: 0.6rem;
+  }
+  .btn {
+    text-transform: uppercase;
+  }
+}
+</style>