bfg-common 1.4.731 → 1.4.732

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

@@ -1,93 +1,95 @@
-<template>
-  <div class="timespan-objects-section-direction">
-    <common-monitor-advanced-tools-chart-options-modal-counters-timespan-form
-      :language="props.language"
-      :selected-chart-type="props.selectedChartType"
-      :selected-timespan-type="props.selectedTimespanType"
-      :units-count="props.unitsCount"
-      :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"
-      @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-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)"
-      @update-custom-time-to="emits('update-custom-time-to', $event)"
-    />
-    <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
-      :type="props.type"
-      :chart="props.chart"
-      :total-cores="props.totalCores"
-      :host-id="props.hostId"
-      :selected-metrics-keys="props.selectedMetricsKeys"
-      :total-metric-items="props.totalMetricItems"
-      :selected-objects="props.selectedObjects"
-      :loading="props.objectsLoading"
-      :current-items="props.objectsData"
-      @select-objects="emits('select-objects', $event)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
-import type {
-  UI_T_ChartHost,
-  UI_T_ChartVm,
-} from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
-import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
-
-const props = defineProps<{
-  type: UI_T_AdvancedType
-  chart: UI_T_ChartHost | UI_T_ChartVm
-  language: string
-  selectedChartType: string
-  selectedTimespanType: string
-  unitsCount: number
-  periodType: string
-  selectedCustomTime: string
-  customDateFrom: string
-  customDateTo: string
-  customTimeFrom: string
-  customTimeTo: string
-  totalCores: number
-  hostId: string
-  selectedMetricsKeys: number[]
-  totalMetricItems: number
-  selectedObjects: string
-  objectsLoading: boolean
-  objectsData: UI_I_ObjectItem[]
-}>()
-
-const emits = defineEmits<{
-  (event: 'update-chart-type', value: string): void
-  (event: 'update-custom-time', value: string): void
-  (event: 'update-timespan-type', value: string): void
-  (event: 'update-unit-count', value: number): 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
-  (event: 'update-custom-time-to', value: string): void
-  (event: 'select-objects', value: string): void
-}>()
-</script>
-
-<style scoped lang="scss">
-.timespan-objects-section-direction {
-  display: flex;
-  flex-direction: row;
-}
-@media (max-width: 1024px) {
-  .timespan-objects-section-direction {
-    flex-direction: column;
-  }
-}
-</style>
+<template>
+  <div class="timespan-objects-section-direction">
+    <common-chart-options-modal-counters-timespan-form
+      :language="props.language"
+      :selected-chart-type="props.selectedChartType"
+      :selected-timespan-type="props.selectedTimespanType"
+      :units-count="props.unitsCount"
+      :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-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)"
+      @update-custom-time-to="emits('update-custom-time-to', $event)"
+    />
+    <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
+      :type="props.type"
+      :chart="props.chart"
+      :total-cores="props.totalCores"
+      :host-id="props.hostId"
+      :selected-metrics-keys="props.selectedMetricsKeys"
+      :total-metric-items="props.totalMetricItems"
+      :selected-objects="props.selectedObjects"
+      :loading="props.objectsLoading"
+      :current-items="props.objectsData"
+      @select-objects="emits('select-objects', $event)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
+import type {
+  UI_T_ChartHost,
+  UI_T_ChartVm,
+} from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
+
+const props = defineProps<{
+  type: UI_T_AdvancedType
+  chart: UI_T_ChartHost | UI_T_ChartVm
+  language: string
+  selectedChartType: string
+  selectedTimespanType: string
+  unitsCount: number
+  periodType: string
+  selectedCustomTime: string
+  customDateFrom: string
+  customDateTo: string
+  customTimeFrom: string
+  customTimeTo: string
+  totalCores: number
+  hostId: string
+  selectedMetricsKeys: number[]
+  totalMetricItems: number
+  selectedObjects: string
+  objectsLoading: boolean
+  objectsData: UI_I_ObjectItem[]
+  validDateEnd: number
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
+  (event: 'update-custom-time', value: string): void
+  (event: 'update-timespan-type', value: string): void
+  (event: 'update-unit-count', value: number): 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
+  (event: 'update-custom-time-to', value: string): void
+  (event: 'select-objects', value: string): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.timespan-objects-section-direction {
+  display: flex;
+  flex-direction: row;
+}
+@media (max-width: 1024px) {
+  .timespan-objects-section-direction {
+    flex-direction: column;
+  }
+}
+</style>

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)
 }