bfg-common 1.4.734 → 1.4.736

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="timespan-objects-section-direction">
-    <common-monitor-advanced-tools-chart-options-modal-counters-timespan-form
+    <common-chart-options-modal-counters-timespan-form
       :language="props.language"
       :selected-chart-type="props.selectedChartType"
       :selected-timespan-type="props.selectedTimespanType"
@@ -11,6 +11,7 @@
       :custom-date-to="props.customDateTo"
       :custom-time-from="props.customTimeFrom"
       :custom-time-to="props.customTimeTo"
+      :valid-date-end="props.validDateEnd"
       @update-chart-type="emits('update-chart-type', $event)"
       @update-custom-time="emits('update-custom-time', $event)"
       @update-timespan-type="emits('update-timespan-type', $event)"
@@ -64,6 +65,7 @@ const props = defineProps<{
   selectedObjects: string
   objectsLoading: boolean
   objectsData: UI_I_ObjectItem[]
+  validDateEnd: number
 }>()
 
 const emits = defineEmits<{

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

@@ -51,10 +51,12 @@
   </div>
 
   <common-monitor-overview-filters-custom-interval-modal
+    v-if="props.validDateEnd"
     v-show="isShowIntervalModal"
     :selected-periods="props.selectedPeriods"
     :format-date="props.formatDate"
     :current-lang="props.currentLang"
+    :valid-date-end="props.validDateEnd"
     @hide="onHideIntervalModal"
     @submit="onSubmitIntervalModal"
   />
@@ -82,6 +84,7 @@ const props = defineProps<{
   selectedPeriods: number[]
   formatDate: string
   currentLang: string
+  validDateEnd: number
   formatTime?: string
 }>()
 

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

@@ -113,6 +113,7 @@ const props = defineProps<{
   formatDate: string
   selectedPeriods: number[]
   currentLang: string
+  validDateEnd: number
 }>()
 
 const emits = defineEmits<{
@@ -147,11 +148,10 @@ const currentTimeTo = ref<string>('')
 const getCurrentTime = (): void => {
   if (!props.selectedPeriods.length) {
     currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
-    currentDateTo.value = $formattedDate(new Date(), props.formatDate)
+    currentDateTo.value = $formattedDate(props.validDateEnd, props.formatDate)
 
-    const currentTime = format(new Date(), 'H:mm:ss')
-    currentTimeFrom.value = currentTime
-    currentTimeTo.value = currentTime
+    currentTimeFrom.value = format(new Date(), 'H:mm:ss')
+    currentTimeTo.value = format(props.validDateEnd, 'H:mm:ss')
 
     return
   }
@@ -204,7 +204,9 @@ const onSubmit = (): void => {
     currentDateFrom.value,
     currentDateTo.value,
     currentTimeFrom.value,
-    currentTimeTo.value
+    currentTimeTo.value,
+    props.validDateEnd,
+    props.formatDate
   )
 
   if (typeof result === 'string') {
@@ -217,6 +219,14 @@ const onSubmit = (): void => {
   onHide()
 }
 
+watch(
+  () => [props.selectedPeriods, props.currentLang],
+  (): void => {
+    getCurrentTime()
+  },
+  { deep: true }
+)
+
 onMounted(() => {
   selectedItem.value = location.hostname
   getCurrentTime()

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

@@ -1,16 +1,13 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const isMoreThanOneMonth = (startDate: number, endDate: number): boolean => {
-  const start = new Date(startDate)
-  const end = new Date(endDate)
-  const yearDiff = end.getFullYear() - start.getFullYear()
-  const monthDiff = end.getMonth() - start.getMonth()
-
-  return (
-    yearDiff > 0 ||
-    (yearDiff === 0 && monthDiff > 1) ||
-    (yearDiff === 0 && monthDiff === 1 && end.getDate() >= start.getDate())
-  )
+  const date1 = new Date(startDate)
+  const date2 = new Date(endDate)
+
+  const nextMonth = new Date(date1)
+  nextMonth.setMonth(date1.getMonth() + 1)
+
+  return nextMonth < date2
 }
 
 export const checkDateFunc = (
@@ -18,7 +15,9 @@ export const checkDateFunc = (
   dateFrom: string,
   dateTo: string,
   timeFrom: string,
-  timeTo: string
+  timeTo: string,
+  unixValidEnd: number,
+  formatDate: string
 ): string | number[] => {
   const { $isDate, $getUnixByDate } = useNuxtApp()
 
@@ -38,9 +37,20 @@ export const checkDateFunc = (
     return result
   }
 
-  if (unixEndDate > new Date().getTime())
-    result = localization.inventoryMonitor.oneOfSelectedDatesIsInTheFuture
-  else if (unixEndDate === unixStartDate)
+  if (unixEndDate > unixValidEnd) {
+    const { $formattedDatetime } = useNuxtApp()
+
+    const currentShowValidEnd = $formattedDatetime(
+      new Date(unixValidEnd),
+      formatDate,
+      true
+    )
+    result =
+      localization.inventoryMonitor.timeRangeShouldNotBeMoreThanValidTo.replace(
+        '{0}',
+        currentShowValidEnd
+      )
+  } else if (unixEndDate === unixStartDate)
     result = localization.inventoryMonitor.timeToShouldBeLaterTimeFrom
   else if (unixEndDate - unixStartDate <= 3600000)
     result = localization.inventoryMonitor.timeRangeShouldNotBeSmallerThanHour

package/components/common/pages/hardwareHealth/HardwareHealth.vue

@@ -51,6 +51,8 @@
         :is-dark-mode="props.isDarkMode"
         :get-date-format="props.getDateFormat"
         :main-selected-row="selectedRow"
+        :valid-date-end="props.validDateEnd"
+        :format-date="props.formatDate"
         @update-tools="onUpdateHistoryTestimonyTools"
       />
 
@@ -76,12 +78,13 @@ import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/model
 import type { UI_I_StorageSensorsAlert } from '~/components/common/pages/hardwareHealth/lib/models/interfaces'
 import type { UI_T_HardwareHealthTabMode } from '~/components/common/pages/hardwareHealth/lib/models/types'
 import { hardwareHealthTabsFunc } from '~/components/common/pages/hardwareHealth/lib/config/tabsPannel'
-import type {
-  UI_I_HardwareHealthHistoryTestimonyTools
-} from "~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces";
+import type { UI_I_HardwareHealthHistoryTestimonyTools } from '~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces'
 
 const emits = defineEmits<{
-  (event: 'update-history-testimony-tools', value: UI_I_HardwareHealthHistoryTestimonyTools): void
+  (
+    event: 'update-history-testimony-tools',
+    value: UI_I_HardwareHealthHistoryTestimonyTools
+  ): void
 }>()
 const props = defineProps<{
   data: UI_I_HardwareHealthSensors[]
@@ -94,6 +97,8 @@ const props = defineProps<{
   formattedDatetime: any
   getDateFormat: any
   language: string
+  validDateEnd: number
+  formatDate: string
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -168,7 +173,9 @@ watch(activeTab, () => {
   uniqueKey.value++
 })
 
-const onUpdateHistoryTestimonyTools = (tools: UI_I_HardwareHealthHistoryTestimonyTools): void => {
+const onUpdateHistoryTestimonyTools = (
+  tools: UI_I_HardwareHealthHistoryTestimonyTools
+): void => {
   emits('update-history-testimony-tools', tools)
 }
 

package/components/common/pages/hardwareHealth/historyTestimony/Graph.vue

@@ -6,6 +6,7 @@
     :is-show-chart-modal="isShowChartModal"
     :chart-title="props.powerData?.groupName || ''"
     :selected-metric="selectedMetric"
+    :selected-chart-type="selectedChartType"
     :selected-power-counters-keys="selectedPowerCountersKeys"
     :power-selected-rows-local="powerSelectedRowsLocal"
     :selected-temperature-counters-keys="selectedTemperatureCountersKeys"
@@ -19,7 +20,10 @@
     :custom-time-from="customTimeFrom"
     :custom-time-to="customTimeTo"
     :start-date="props.powerData?.pointStart || 0"
+    :end-date="props.powerData?.pointEnd || 0"
     :timespan-period-type="timespanPeriodType"
+    :valid-date-end="props.validDateEnd"
+    :format-date="props.formatDate"
     @power-selected-rows-local="powerSelectedRowsLocal = $event"
     @temperature-selected-rows-local="temperatureSelectedRowsLocal = $event"
     @show-chart-modal="isShowChartModal = true"
@@ -27,7 +31,7 @@
     @update-tools="onUpdateTools"
     @delete-option="onDeleteOption"
     @submit-options="onSubmitOptions"
-    @update-timespan-period-type="timespanPeriodType = $event"
+    @update-period-type="timespanPeriodType = $event"
   />
   <div
     ref="historyTestimonyGraph"
@@ -85,7 +89,7 @@ import type { UI_T_Chart } from '~/components/common/pages/hardwareHealth/histor
 import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
 import type {
   UI_I_HardwareHealthHistoryTestimonyTools,
-  UI_I_HardwareHealthSensorsGraph
+  UI_I_HardwareHealthSensorsGraph,
 } from '~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces'
 import type { UI_I_SensorsGraphPayload } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/lib/models/interfaces'
 import { containerMediumSize } from '~/components/common/pages/hardwareHealth/historyTestimony/lib/config/containerSizes'
@@ -104,6 +108,8 @@ const props = defineProps<{
   isDarkMode: boolean
   getDateFormat: any
   mainSelectedRow: number[]
+  validDateEnd: number
+  formatDate: string
 }>()
 const selectedView = defineModel<string>('selectedView')
 
@@ -146,6 +152,7 @@ const customDateFrom = ref<string>('')
 const customDateTo = ref<string>('')
 const customTimeFrom = ref<string>('')
 const customTimeTo = ref<string>('')
+const selectedChartType = ref<string>('spline')
 
 const selectedRowPower = ref<number[]>([])
 const selectedRowTemperature = ref<number[]>([])
@@ -364,6 +371,11 @@ const tools: UI_I_HardwareHealthHistoryTestimonyTools = {
 
 const onSubmitOptions = (data: UI_I_OptionsForm): void => {
   selectedTimespanType.value = data.periodName
+  customDateFrom.value = data.dateFrom
+  customDateTo.value = data.dateTo
+  customTimeFrom.value = data.timeFrom
+  customTimeTo.value = data.timeTo
+  selectedChartType.value = data.chartType
   updateSelectedCountersKeys(data.metric)
   if (data.metric === 'power')
     $store.dispatch(

package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue

@@ -65,6 +65,7 @@
     v-if="props.isShowChartModal"
     :selected-chart-option-name="props.selectedChartOptionName"
     :selected-metric="props.selectedMetric"
+    :selected-chart-type="props.selectedChartType"
     :power-selected-rows-local="props.powerSelectedRowsLocal"
     :temperature-selected-rows-local="props.temperatureSelectedRowsLocal"
     :selected-power-counters-keys="props.selectedPowerCountersKeys"
@@ -79,10 +80,12 @@
     :custom-time-from="props.customTimeFrom"
     :custom-time-to="props.customTimeTo"
     :timespan-period-type="props.timespanPeriodType"
+    :valid-date-end="props.validDateEnd"
+    :format-date="props.formatDate"
     @save-option-name="onSaveOptionName"
     @delete-option="emits('delete-option')"
     @power-selected-rows-local="emits('power-selected-rows-local', $event)"
-    @update-timespan-period-type="emits('update-timespan-period-type', $event)"
+    @update-period-type="emits('update-period-type', $event)"
     @temperature-selected-rows-local="
       emits('temperature-selected-rows-local', $event)
     "
@@ -111,6 +114,7 @@ const props = defineProps<{
   isShowChartModal: boolean
   chartTitle: string
   selectedMetric: UI_T_Chart
+  selectedChartType: string
   selectedPowerCountersKeys: number[]
   powerSelectedRowsLocal: UI_I_HardwareHealthSensorsGraph[]
   selectedTemperatureCountersKeys: number[]
@@ -125,7 +129,10 @@ const props = defineProps<{
   customTimeTo: string
   selectedTimespanType: string
   startDate: number
+  endDate: number
   timespanPeriodType: string
+  validDateEnd: number
+  formatDate: string
 }>()
 const selectedView = defineModel<string>('selectedView')
 
@@ -147,7 +154,7 @@ const emits = defineEmits<{
   (event: 'update-chart-type', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
-  (event: 'update-timespan-period-type', value: string): void
+  (event: 'update-period-type', value: string): void
   (event: 'update-custom-time', value: string): void
   (event: 'delete-option'): void
   (event: 'update-custom-date-from', value: string): void
@@ -233,7 +240,9 @@ const onUpdateTools = (): void => {
       props.customDateFrom,
       props.customDateTo,
       props.customTimeFrom,
-      props.customTimeTo
+      props.customTimeTo,
+      props.validDateEnd,
+      props.formatDate
     )
     if (Array.isArray(checkDateResult)) {
       period[0] = Math.round(checkDateResult[0] / 1000)
@@ -257,7 +266,7 @@ const chartTitleDate = computed<string>(() => {
   if (!props.startDate) return ''
 
   const start = $formattedDatetime(props.startDate, '', true)
-  const end = $formattedDatetime(new Date(), '', true)
+  const end = $formattedDatetime(props.endDate, '', true)
   return `${start} - ${end}`
 })
 

package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -42,19 +42,20 @@
               :selected-chart-type="localSelectedChartType"
               :selected-timespan-type="localSelectedTimespanType"
               :units-count="localUnitsCount"
-              :timespan-period-type="localTimespanPeriodType"
+              :period-type="localTimespanPeriodType"
               :selected-custom-time="localCustomTime"
               :custom-date-from="props.customDateFrom"
               :custom-date-to="props.customDateTo"
               :custom-time-from="props.customTimeFrom"
               :custom-time-to="props.customTimeTo"
+              :valid-date-end="props.validDateEnd"
               @select-power-row="onSelectPowerRow"
               @select-temperature-row="onSelectTemperatureRow"
               @update-chart-type="selectedChartTypeLocal = $event"
               @update-custom-time="localCustomTime = $event"
               @update-timespan-type="timespanType = $event"
               @update-unit-count="unitCount = $event"
-              @update-timespan-period-type="localTimespanPeriodType = $event"
+              @update-period-type="localTimespanPeriodType = $event"
               @update-custom-date-from="onUpdateCustomDateFrom"
               @update-custom-date-to="onUpdateCustomDateTo"
               @update-custom-time-from="onUpdateCustomTimeFrom"
@@ -81,6 +82,7 @@ import { getCurrentOptionsStorageFunc } from '~/components/common/pages/hardware
 const props = defineProps<{
   selectedChartOptionName: string
   selectedMetric: UI_T_Chart
+  selectedChartType: string
   selectedPowerCountersKeys: number[]
   powerSelectedRowsLocal: UI_I_HardwareHealthSensorsGraph[]
   selectedTemperatureCountersKeys: number[]
@@ -95,6 +97,8 @@ const props = defineProps<{
   customTimeFrom: string
   customTimeTo: string
   timespanPeriodType: string
+  validDateEnd: number
+  formatDate: string
 }>()
 
 const emits = defineEmits<{
@@ -111,7 +115,7 @@ const emits = defineEmits<{
   (event: 'update-chart-type', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
-  (event: 'update-timespan-period-type', value: string): void
+  (event: 'update-period-type', value: string): void
   (event: 'update-custom-time', value: string): void
   (event: 'delete-option'): void
   (event: 'save-option-name'): void
@@ -169,6 +173,13 @@ watch(
 )
 
 const localSelectedChartType = ref<string>('')
+watch(
+  () => props.selectedChartType,
+  (newValue) => {
+    localSelectedChartType.value = newValue
+  },
+  { immediate: true }
+)
 
 const localSelectedTimespanType = ref<string>('')
 watch(
@@ -243,7 +254,9 @@ const checkValidations = (): boolean => {
     localCustomDateFrom.value,
     localCustomDateTo.value,
     localCustomTimeFrom.value,
-    localCustomTimeTo.value
+    localCustomTimeTo.value,
+    props.validDateEnd,
+    props.formatDate
   )
 
   if (isDisabledSubmit.value) {
@@ -310,7 +323,9 @@ const onSubmit = (): void => {
       localCustomDateFrom.value,
       localCustomDateTo.value,
       localCustomTimeFrom.value,
-      localCustomTimeTo.value
+      localCustomTimeTo.value,
+      props.validDateEnd,
+      props.formatDate
     )
     if (Array.isArray(checkDateResult)) {
       validPeriod[0] = checkDateResult[0]
@@ -334,7 +349,7 @@ const onSubmit = (): void => {
     period: validPeriod,
   }
 
-  emits('update-timespan-period-type', savedObject.periodType)
+  emits('update-period-type', savedObject.periodType)
   emits('submit-options', savedObject)
   onHide()
 }

package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/Counters.vue

@@ -15,19 +15,18 @@
       :selected-chart-type="props.selectedChartType"
       :selected-timespan-type="props.selectedTimespanType"
       :units-count="props.unitsCount"
-      :timespan-period-type="props.timespanPeriodType"
+      :period-type="props.periodType"
       :selected-custom-time="props.selectedCustomTime"
       :custom-date-from="props.customDateFrom"
       :custom-date-to="props.customDateTo"
       :custom-time-from="props.customTimeFrom"
       :custom-time-to="props.customTimeTo"
+      :valid-date-end="props.validDateEnd"
       @update-chart-type="emits('update-chart-type', $event)"
       @update-custom-time="emits('update-custom-time', $event)"
       @update-timespan-type="emits('update-timespan-type', $event)"
       @update-unit-count="emits('update-unit-count', $event)"
-      @update-timespan-period-type="
-        emits('update-timespan-period-type', $event)
-      "
+      @update-period-type="emits('update-period-type', $event)"
       @update-custom-date-from="emits('update-custom-date-from', $event)"
       @update-custom-date-to="emits('update-custom-date-to', $event)"
       @update-custom-time-from="emits('update-custom-time-from', $event)"
@@ -50,12 +49,13 @@ const props = defineProps<{
   selectedChartType: string
   selectedTimespanType: string
   unitsCount: number
-  timespanPeriodType: string
+  periodType: string
   selectedCustomTime: string
   customDateFrom: string
   customDateTo: string
   customTimeFrom: string
   customTimeTo: string
+  validDateEnd: number
 }>()
 
 const emits = defineEmits<{
@@ -68,7 +68,7 @@ const emits = defineEmits<{
   (event: 'update-custom-time', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
-  (event: 'update-timespan-period-type', value: string): void
+  (event: 'update-period-type', value: string): void
   (event: 'update-custom-date-from', value: string): void
   (event: 'update-custom-date-to', value: string): void
   (event: 'update-custom-time-from', value: string): void

package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/timespan/Timespan.vue

@@ -1,23 +1,22 @@
 <template>
   <div class="timespan-objects-section-direction">
-    <common-pages-hardware-health-history-testimony-tools-chart-options-modal-counters-timespan-form
+    <common-chart-options-modal-counters-timespan-form
       :language="props.language"
       :selected-chart-type="props.selectedChartType"
       :selected-timespan-type="props.selectedTimespanType"
       :units-count="props.unitsCount"
-      :timespan-period-type="props.timespanPeriodType"
+      :period-type="props.periodType"
       :selected-custom-time="props.selectedCustomTime"
       :custom-date-from="props.customDateFrom"
       :custom-date-to="props.customDateTo"
       :custom-time-from="props.customTimeFrom"
       :custom-time-to="props.customTimeTo"
+      :valid-date-end="props.validDateEnd"
       @update-chart-type="emits('update-chart-type', $event)"
       @update-custom-time="emits('update-custom-time', $event)"
       @update-timespan-type="emits('update-timespan-type', $event)"
       @update-unit-count="emits('update-unit-count', $event)"
-      @update-timespan-period-type="
-        emits('update-timespan-period-type', $event)
-      "
+      @update-period-type="emits('update-period-type', $event)"
       @update-custom-date-from="emits('update-custom-date-from', $event)"
       @update-custom-date-to="emits('update-custom-date-to', $event)"
       @update-custom-time-from="emits('update-custom-time-from', $event)"
@@ -32,12 +31,13 @@ const props = defineProps<{
   selectedChartType: string
   selectedTimespanType: string
   unitsCount: number
-  timespanPeriodType: string
+  periodType: string
   selectedCustomTime: string
   customDateFrom: string
   customDateTo: string
   customTimeFrom: string
   customTimeTo: string
+  validDateEnd: number
 }>()
 
 const emits = defineEmits<{
@@ -45,7 +45,7 @@ const emits = defineEmits<{
   (event: 'update-custom-time', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
-  (event: 'update-timespan-period-type', value: string): void
+  (event: 'update-period-type', value: string): void
   (event: 'update-custom-date-from', value: string): void
   (event: 'update-custom-date-to', value: string): void
   (event: 'update-custom-time-from', value: string): void

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.734",
+  "version": "1.4.736",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.17",
-    "bfg-uikit": "1.0.312",
+    "bfg-uikit": "1.0.313",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/lib/config/dateForm.ts

@@ -1,114 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
-
-export const timespanFunc = (
-  localization: UI_I_Localization
-): UI_I_OptionItem[] => [
-  {
-    text: localization.inventoryMonitor.realTime,
-    value: 'real_time',
-  },
-  {
-    text: localization.inventoryMonitor.lastDay,
-    value: 'last_day',
-  },
-  {
-    text: localization.inventoryMonitor.lastWeek,
-    value: 'last_week',
-  },
-  {
-    text: localization.inventoryMonitor.lastMonth,
-    value: 'last_month',
-  },
-  // {
-  //   text: localization.inventoryMonitor.lastYear,
-  //   value: 'last_year',
-  // },
-  {
-    text: localization.inventoryMonitor.customInterval,
-    value: 'custom_interval',
-  },
-]
-
-export const customTimeFunc = (
-  localization: UI_I_Localization,
-  value: number,
-  lang: string
-): UI_I_OptionItem[] => {
-  const isLangRu = lang === 'ru_RU'
-
-  const hourText = isLangRu
-    ? getCorrectRuForm(value, 'hour')
-    : localization.common.hours2
-  const dayText = isLangRu
-    ? getCorrectRuForm(value, 'day')
-    : localization.common.days2
-  const weekText = isLangRu
-    ? getCorrectRuForm(value, 'week')
-    : localization.common.weeks2
-  const monthText = isLangRu
-    ? getCorrectRuForm(value, 'month')
-    : localization.common.months2
-
-  return [
-    {
-      text: hourText,
-      value: 'hours',
-    },
-    {
-      text: dayText,
-      value: 'days',
-    },
-    {
-      text: weekText,
-      value: 'weeks',
-    },
-    {
-      text: monthText,
-      value: 'months',
-    },
-  ]
-}
-
-export const chartTypeFunc = (
-  localization: UI_I_Localization
-): UI_I_OptionItem[] => [
-  {
-    text: localization.inventoryMonitor.lineGraph,
-    value: 'line_graph',
-  },
-  {
-    text: localization.inventoryMonitor.stackedGraph,
-    value: 'stacked_graph',
-  },
-]
-
-const getCorrectRuForm = (value: number, type: string): string => {
-  // TODO поправить используя correctRuUnit из плагина date
-  const forms: UI_I_ArbitraryObject<string[]> = {
-    hour: ['Час', 'Часа', 'Часов'],
-    day: ['День', 'Дня', 'Дней'],
-    week: ['Неделя', 'Недели', 'Недель'],
-    month: ['Месяц', 'Месяца', 'Месяцев'],
-  }
-
-  let text: string
-
-  if (!value) {
-    return getCorrectRuForm[type]
-  }
-
-  if (value % 10 === 1 && value % 100 !== 11) {
-    text = forms[type][0]
-  } else if (
-    [2, 3, 4].includes(value % 10) &&
-    ![12, 13, 14].includes(value % 100)
-  ) {
-    text = forms[type][1]
-  } else {
-    text = forms[type][2]
-  }
-  getCorrectRuForm[type] = text
-  return text
-}