bfg-common 1.1.62 → 1.1.63

package/components/common/monitor/advanced/tools/config/advancedToolbar.ts

@@ -5,29 +5,41 @@ import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/t
 import { UI_I_OptionData } from '~/components/common/monitor/advanced/models/interfaces'
 
 export const periodFunc = (
-  localization: UI_I_Localization
-): UI_I_OptionItem[] => [
-  {
-    text: localization.realTime,
-    value: 'real_time',
-  },
-  {
-    text: localization.lastDay,
-    value: 'last_day',
-  },
-  {
-    text: localization.lastWeek,
-    value: 'last_week',
-  },
-  {
-    text: localization.lastMonth,
-    value: 'last_month',
-  },
-  // {
-  //   text: localization.lastYear,
-  //   value: 'last_year',
-  // },
-]
+  localization: UI_I_Localization,
+  selectedTimespanType: string
+): UI_I_OptionItem[] => {
+  const result = [
+    {
+      text: localization.realTime,
+      value: 'real_time',
+    },
+    {
+      text: localization.lastDay,
+      value: 'last_day',
+    },
+    {
+      text: localization.lastWeek,
+      value: 'last_week',
+    },
+    {
+      text: localization.lastMonth,
+      value: 'last_month',
+    },
+    // {
+    //   text: localization.lastYear,
+    //   value: 'last_year',
+    // },
+  ]
+
+  if (selectedTimespanType === 'custom_interval') {
+    result.push({
+      text: localization.customInterval,
+      value: 'custom_interval',
+    })
+  }
+
+  return result
+}
 
 export const viewFunc = (
   localization: UI_I_Localization,
@@ -43,29 +55,29 @@ export const viewFunc = (
     ],
     host: [
       { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
-      { text: localization.datastore, value: 'datastore' },
+      // { text: localization.datastore, value: 'datastore' },
       { text: localization.memory, value: 'memory' },
       { text: localization.disk, value: 'disk' },
       { text: localization.network, value: 'network' },
-      { text: localization.power, value: 'power' },
-      { text: localization.storageAdapters, value: 'storageAdapters' },
-      { text: localization.storagePath, value: 'storagePath' },
-      { text: localization.system, value: 'system' },
-      {
-        text: localization.procuratorReplication,
-        value: 'procuratorReplication',
-      },
+      // { text: localization.power, value: 'power' },
+      // { text: localization.storageAdapters, value: 'storageAdapters' },
+      // { text: localization.storagePath, value: 'storagePath' },
+      // { text: localization.system, value: 'system' },
+      // {
+      //   text: localization.procuratorReplication,
+      //   value: 'procuratorReplication',
+      // },
     ],
     vm: [
       { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
-      { text: localization.cpuUsageInMhz, value: 'cpuUsageInMhz' },
-      { text: localization.cpuReady, value: 'cpuReady' },
-      { text: localization.datastore, value: 'datastore' },
-      { text: localization.disk, value: 'disk' },
+      // { text: localization.cpuUsageInMhz, value: 'cpuUsageInMhz' },
+      // { text: localization.cpuReady, value: 'cpuReady' },
+      // { text: localization.datastore, value: 'datastore' },
       { text: localization.memory, value: 'memory' },
+      { text: localization.disk, value: 'disk' },
       { text: localization.network, value: 'network' },
-      { text: localization.power, value: 'power' },
-      { text: localization.virtualDisk, value: 'virtualDisk' },
+      // { text: localization.power, value: 'power' },
+      // { text: localization.virtualDisk, value: 'virtualDisk' },
     ],
   }
   const currentOptions = viewData[type]

package/components/common/monitor/advanced/tools/utils/countCores.ts

@@ -0,0 +1,7 @@
+import { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/models/interfaces'
+
+export const getCountCores = (data: I_SeriesLine | null): number => {
+  if (!data) return 0
+
+  return Math.max(...data.lines[0].data)
+}

package/components/common/monitor/config/getValidDateByOption.ts

@@ -1,14 +1,113 @@
 import { subDays, subHours, subMonths, subWeeks, subYears } from 'date-fns'
 
-export const getValidDateByOptionFunc = (type: string): number[] => {
+export const getValidDateByOptionFunc = (
+  type: string,
+  selectedOptions = null,
+  unitsCount: null | number = null,
+  timeType: null | string = ''
+): number[] => {
   const newDate = new Date()
   let startTime = 0
 
-  if (type === 'real_time') startTime = subHours(newDate, 1).getTime()
-  else if (type === 'last_day') startTime = subDays(newDate, 1).getTime()
-  else if (type === 'last_week') startTime = subWeeks(newDate, 1).getTime()
-  else if (type === 'last_month') startTime = subMonths(newDate, 1).getTime()
-  else if (type === 'last_year') startTime = subYears(newDate, 1).getTime()
+  switch (type) {
+    case 'real_time':
+      startTime = subHours(newDate, 1).getTime()
+      break
+    case 'last_day':
+      startTime = subDays(newDate, 1).getTime()
+      break
+    case 'last_week':
+      startTime = subWeeks(newDate, 1).getTime()
+      break
+    case 'last_month':
+      startTime = subMonths(newDate, 1).getTime()
+      break
+    case 'last_year':
+      startTime = subYears(newDate, 1).getTime()
+      break
+    case 'custom_interval':
+      if (selectedOptions) {
+        switch (selectedOptions.timespan.periodType) {
+          case 'last':
+            const currentUnits =
+              selectedOptions.timespan.unitsCount < 1
+                ? 1
+                : +selectedOptions.timespan.unitsCount
+
+            switch (selectedOptions.timespan.units) {
+              case 'hours':
+                startTime = subHours(newDate, currentUnits).getTime()
+                break
+              case 'days':
+                startTime = subDays(newDate, currentUnits).getTime()
+                break
+              case 'weeks':
+                startTime = subWeeks(newDate, currentUnits).getTime()
+                break
+              case 'months':
+                startTime = subMonths(newDate, currentUnits).getTime()
+                break
+            }
+        }
+      } else if (
+        !selectedOptions &&
+        typeof unitsCount === 'number' &&
+        typeof timeType === 'string'
+      ) {
+        switch (timeType) {
+          case 'hours':
+            startTime = subHours(newDate, unitsCount).getTime()
+            break
+          case 'days':
+            startTime = subDays(newDate, unitsCount).getTime()
+            break
+          case 'weeks':
+            startTime = subWeeks(newDate, unitsCount).getTime()
+            break
+          case 'months':
+            startTime = subMonths(newDate, unitsCount).getTime()
+            break
+        }
+      }
+      break
+  }
+
+  // if (type === 'real_time') startTime = subHours(newDate, 1).getTime()
+  // else if (type === 'last_day') startTime = subDays(newDate, 1).getTime()
+  // else if (type === 'last_week') startTime = subWeeks(newDate, 1).getTime()
+  // else if (type === 'last_month') startTime = subMonths(newDate, 1).getTime()
+  // else if (type === 'last_year') startTime = subYears(newDate, 1).getTime()
+  // else if (type === 'custom_interval' && selectedOptions) {
+  //   if (selectedOptions.timespan.periodType === 'last') {
+  //     const currentUnits =
+  //       selectedOptions.timespan.unitsCount < 1
+  //         ? 1
+  //         : +selectedOptions.timespan.unitsCount
+  //
+  //     if (selectedOptions.timespan.units === 'hours')
+  //       startTime = subHours(newDate, currentUnits).getTime()
+  //     else if (selectedOptions.timespan.units === 'days')
+  //       startTime = subDays(newDate, currentUnits).getTime()
+  //     else if (selectedOptions.timespan.units === 'weeks')
+  //       startTime = subWeeks(newDate, currentUnits).getTime()
+  //     else if (selectedOptions.timespan.units === 'months')
+  //       startTime = subMonths(newDate, currentUnits).getTime()
+  //   }
+  // } else if (
+  //   type === 'custom_interval' &&
+  //   !selectedOptions &&
+  //   typeof unitsCount === 'number' &&
+  //   typeof timeType === 'string'
+  // ) {
+  //   if (timeType === 'hours')
+  //     startTime = subHours(newDate, unitsCount).getTime()
+  //   else if (timeType === 'days')
+  //     startTime = subDays(newDate, unitsCount).getTime()
+  //   else if (timeType === 'weeks')
+  //     startTime = subWeeks(newDate, unitsCount).getTime()
+  //   else if (timeType === 'months')
+  //     startTime = subMonths(newDate, unitsCount).getTime()
+  // }
 
   return [startTime, newDate.getTime()]
 }

package/components/common/monitor/overview/filters/Filters.vue

@@ -87,8 +87,8 @@ const periodOptions = computed<UI_I_OptionItem[]>(() =>
 )
 watch(
   () => periodOptions.value,
-  (val: UI_I_OptionItem[]) => {
-    if (val) selectedPeriod.value = val[0].value
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedPeriod.value = newValue[0].value
   },
   { immediate: true }
 )
@@ -142,8 +142,8 @@ const viewOptions = computed<UI_I_OptionItem[]>(() =>
 )
 watch(
   () => viewOptions.value,
-  (val: UI_I_OptionItem[]) => {
-    if (val) selectedView.value = val[0].value
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedView.value = newValue[0].value
   },
   { immediate: true }
 )
@@ -163,8 +163,8 @@ const sendUpdatedFilters = (): void => {
 }
 watch(
   () => [selectedPeriod.value, selectedView.value],
-  (value: string[]) => {
-    value[0] !== 'custom_interval' && sendUpdatedFilters()
+  (newValue: string[]) => {
+    newValue[0] !== 'custom_interval' && sendUpdatedFilters()
   },
   { immediate: true }
 )

package/components/common/monitor/overview/filters/customIntervalModal/CustomIntervalModal.vue

@@ -149,26 +149,26 @@ watch(timeFormatUpdater, () => {
   getCurrentTime()
 })
 
-const onUpdateDateFrom = (val: number) => {
+const onUpdateDateFrom = (val: number): void => {
   if (!val) return
 
   currentDateFrom.value = $formattedDate(new Date(val), '')
 }
-watch(currentDateFrom, (val) => {
-  if (!val) return
+watch(currentDateFrom, (newValue) => {
+  if (!newValue) return
 
-  if ($isDate(val)) dateFrom.value = $getUnixByDate(val)
+  if ($isDate(newValue)) dateFrom.value = $getUnixByDate(newValue)
 })
 
-const onUpdateDateTo = (val: number) => {
+const onUpdateDateTo = (val: number): void => {
   if (!val) return
 
   currentDateTo.value = $formattedDate(new Date(val), '')
 }
-watch(currentDateTo, (val) => {
-  if (!val) return
+watch(currentDateTo, (newValue) => {
+  if (!newValue) return
 
-  if ($isDate(val)) dateTo.value = $getUnixByDate(val)
+  if ($isDate(newValue)) dateTo.value = $getUnixByDate(newValue)
 })
 
 const alertShow = ref<boolean>(false)

package/components/common/monitor/overview/filters/customIntervalModal/config/dateChecker.ts

@@ -13,7 +13,7 @@ export const checkDateFunc = (
   const startDate = dateFrom + ' ' + timeFrom
   const endDate = dateTo + ' ' + timeTo
 
-  if (!$isDate(startDate) || !$isDate(endDate))
+  if (!$isDate(startDate) || !$isDate(endDate) || !timeFrom || !timeTo)
     result = localization.invalidTimeEntry
   else {
     const endDateFormatted = $formattedDatetime(endDate, '', true)

package/components/common/perPage/PerPage.vue

@@ -1,51 +1,51 @@
-<template>
-  <div class="page-size">
-    {{ selectLabel }}
-
-    <div class="clr-select-wrapper">
-      <select
-        :id="`${props.testId}-page-size-select`"
-        :value="props.pageSize"
-        class="clr-page-size-select"
-        @change="change"
-      >
-        <option
-          v-for="(item, key) in props.options"
-          :key="key"
-          :value="item.value"
-        >
-          {{ item.text }}
-        </option>
-      </select>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    testId: string
-    pageSize: number
-    options: UI_I_OptionItem[]
-    label?: string
-  }>(),
-  {
-    label: 'itemsPerPage',
-  }
-)
-const emits = defineEmits<{
-  (event: 'change', num: number): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const selectLabel = computed<string>(() => localization.value[props.label])
-
-const change = (e: InputEvent): void => {
-  emits('change', +(e.target as HTMLInputElement).value)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <div class="page-size">
+    {{ selectLabel }}
+
+    <div class="clr-select-wrapper">
+      <select
+        :id="`${props.testId}-page-size-select`"
+        :value="props.pageSize"
+        class="clr-page-size-select"
+        @change="change"
+      >
+        <option
+          v-for="(item, key) in props.options"
+          :key="key"
+          :value="item.value"
+        >
+          {{ item.text }}
+        </option>
+      </select>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    testId: string
+    pageSize: number
+    options: UI_I_OptionItem[]
+    label?: string
+  }>(),
+  {
+    label: 'itemsPerPage',
+  }
+)
+const emits = defineEmits<{
+  (event: 'change', num: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const selectLabel = computed<string>(() => localization.value[props.label])
+
+const change = (e: InputEvent): void => {
+  emits('change', +(e.target as HTMLInputElement).value)
+}
+</script>
+
+<style scoped></style>