bfg-common 1.4.718 → 1.4.719

package/assets/localization/local_be.json

@@ -2463,7 +2463,8 @@
     "fieldNotContainSpecialCharacters": "Поле не павінна ўтрымліваць спецыяльныя сімвалы"
   },
   "contextMenu": {
-    "actionsMenuPower": "Магутнасць"
+    "actionsMenuPower": "Магутнасць",
+    "browseFiles": "Агляд файлаў"
   },
   "networks": {
     "active_ports": "Актыўныя Парты",
@@ -2701,6 +2702,7 @@
     "timeToShouldBeLaterTimeFrom": "Ўказаны дыяпазон часу недапушчальны. Дата \" да \"павінна быць пазней даты\"ад\".",
     "timeRangeShouldNotBeSmallerThanHour": "Ўказаны дыяпазон часу недапушчальны. Ён не павінен быць менш 1 гадзіны.",
     "timeRangeShouldNotBeMoreThanMonth": "Указаны дыяпазон часу несапраўдны. Яно не павінна быць больш за 1 месяца.",
+    "timeRangeShouldNotBeMoreThanValidTo": "Указаны дыяпазон часу несапраўдны. Яно не павінна перавышаць {0}.",
     "overview": "Агляд",
     "spaceUtilization": "Выкарыстанне прасторы",
     "changeCustomInterval": "Зменіце карыстацкі інтэрвал",

package/assets/localization/local_en.json

@@ -2467,7 +2467,8 @@
     "fieldNotContainSpecialCharacters": "The field must not contain special characters"
   },
   "contextMenu": {
-    "actionsMenuPower": "Power"
+    "actionsMenuPower": "Power",
+    "browseFiles": "Browse Files"
   },
   "networks": {
     "active_ports": "Active ports",
@@ -2705,6 +2706,7 @@
     "timeToShouldBeLaterTimeFrom": "The specified time range is not valid. The \"to\" date should be later than the \"from\" date.",
     "timeRangeShouldNotBeSmallerThanHour": "The specified time range is not valid. It should not be smaller than 1 hour.",
     "timeRangeShouldNotBeMoreThanMonth": "The specified time range is not valid. It should not be more than 1 month.",
+    "timeRangeShouldNotBeMoreThanValidTo": "The specified time range is not valid. It should not be more than {0}.",
     "overview": "Overview",
     "spaceUtilization": "Space Utilization",
     "changeCustomInterval": "Change custom interval",

package/assets/localization/local_hy.json

@@ -2467,7 +2467,8 @@
     "fieldNotContainSpecialCharacters": "Դաշտը չպետք է պարունակի հատուկ նիշեր"
   },
   "contextMenu": {
-    "actionsMenuPower": "Հզորությունը"
+    "actionsMenuPower": "Հզորությունը",
+    "browseFiles": "Թերթել ֆայլերը"
   },
   "networks": {
     "active_ports": "Ակտիվ պորտեր",
@@ -2705,6 +2706,7 @@
     "timeToShouldBeLaterTimeFrom": "Նշված ժամանակային միջակայքն անընդունելի է: \"Նախքան\" ամսաթիվը պետք է լինի ավելի ուշ, քան \"from\"ամսաթիվը:",
     "timeRangeShouldNotBeSmallerThanHour": "The specified time range is not valid. It should not be smaller than 1 hour.",
     "timeRangeShouldNotBeMoreThanMonth": "Նշված ժամանակային միջակայքը վավեր չէ: Այն չպետք է լինի 1 ամսից ավելի։",
+    "timeRangeShouldNotBeMoreThanValidTo": "Նշված ժամանակային միջակայքը վավեր չէ: Այն չպետք է լինի {0}-ից ավելի:",
     "overview": "Ակնարկ",
     "spaceUtilization": "Օգտագործելով տարածություն",
     "changeCustomInterval": "Փոխեք օգտագործողի միջակայքը",

package/assets/localization/local_kk.json

@@ -2466,7 +2466,8 @@
     "fieldNotContainSpecialCharacters": "Өрісте арнайы таңбалар болмауы керек"
   },
   "contextMenu": {
-    "actionsMenuPower": "Магутнасттар"
+    "actionsMenuPower": "Магутнасттар",
+    "browseFiles": "Файлдарды шолыңыз"
   },
   "networks": {
     "active_ports": "Белсенді порттар",
@@ -2704,6 +2705,7 @@
     "timeToShouldBeLaterTimeFrom": "The specified time range is not valid. The \"to\" date should be later than the \"from\" date.",
     "timeRangeShouldNotBeSmallerThanHour": "The specified time range is not valid. It should not be smaller than 1 hour.",
     "timeRangeShouldNotBeMoreThanMonth": "Көрсетілген уақыт аралығы жарамсыз. 1 айдан аспауы керек.",
+    "timeRangeShouldNotBeMoreThanValidTo": "Көрсетілген уақыт аралығы жарамсыз. Ол {0} аспауы керек.",
     "overview": "Шолу",
     "spaceUtilization": "Кеңістікті пайдалану",
     "changeCustomInterval": "Пайдаланушы аралығын өзгертіңіз",

package/assets/localization/local_ru.json

@@ -2468,7 +2468,8 @@
     "fieldNotContainSpecialCharacters": "Поле не должно содержать специальных символов"
   },
   "contextMenu": {
-    "actionsMenuPower": "Питание"
+    "actionsMenuPower": "Питание",
+    "browseFiles": "Просмотреть файлы"
   },
   "networks": {
     "active_ports": "Активные порты",
@@ -2706,6 +2707,7 @@
     "timeToShouldBeLaterTimeFrom": "Указанный диапазон времени недопустим. Дата \"до\" должна быть позже даты \"от\".",
     "timeRangeShouldNotBeSmallerThanHour": "Указанный диапазон времени недопустим. Он не должен быть меньше 1 часа.",
     "timeRangeShouldNotBeMoreThanMonth": "Указанный диапазон времени недействителен. Он не должен быть больше 1 месяца.",
+    "timeRangeShouldNotBeMoreThanValidTo": "Указанный временной диапазон недействителен. Он не должен быть больше {0}.",
     "overview": "Обзор",
     "spaceUtilization": "Использование пространства",
     "changeCustomInterval": "Измените пользовательский интервал",

package/assets/localization/local_zh.json

@@ -2465,7 +2465,8 @@
     "fieldNotContainSpecialCharacters": "该字段不能包含特殊字符"
   },
   "contextMenu": {
-    "actionsMenuPower": "力量"
+    "actionsMenuPower": "力量",
+    "browseFiles": "浏览文件"
   },
   "networks": {
     "active_ports": "活动端口",
@@ -2703,6 +2704,7 @@
     "timeToShouldBeLaterTimeFrom": "指定的时间范围无效。 “结束”日期应晚于“开始”日期。",
     "timeRangeShouldNotBeSmallerThanHour": "指定的时间范围无效。 不应小于1小时。",
     "timeRangeShouldNotBeMoreThanMonth": "指定的时间范围无效。它不应超过 1 个月。",
+    "timeRangeShouldNotBeMoreThanValidTo": "指定的时间范围无效。它不应超过 {0}。",
     "overview": "概述",
     "spaceUtilization": "空间利用",
     "changeCustomInterval": "更改自定义间隔",

package/assets/scss/common/icons/icons-1.scss

@@ -113,6 +113,9 @@
 .vsphere-icon-clock-line {
   background-position: 0 43.0379746835%;
 }
+.storage-ui-icon-browse-file {
+  background-position: 0 30.3797468354%;
+}
 
 /* _____BACKGROUND IMAGE_____ */
 .host-ui-icon-certificate,
@@ -152,6 +155,7 @@
 .icon-content-libraries,
 .network-lib-ui-icon-statusGreen,
 .vsphere-icon-clock-line,
+.storage-ui-icon-browse-file,
 .network-lib-ui-icon-statusRed {
   background-image: url('@/assets/img/icons/icons-sprite-light-1.svg');
 
@@ -194,6 +198,7 @@
 .active .icon-content-libraries,
 .active .network-lib-ui-icon-statusGreen,
 .active .vsphere-icon-clock-line,
+.active .storage-ui-icon-browse-file,
 .active .network-lib-ui-icon-statusRed {
   background-image: url('@/assets/img/icons/icons-sprite-dark-1.svg');
   html.dark-theme & {
@@ -245,6 +250,7 @@
 .icon-content-libraries,
 .network-lib-ui-icon-statusGreen,
 .vsphere-icon-clock-line,
+.storage-ui-icon-browse-file,
 .network-lib-ui-icon-statusRed,
 .icon-Host_Policy-32x {
   display: inline-block;

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

@@ -1,232 +1,235 @@
-<template>
-  <div class="horizontal-flex-container overview-chart-title-bar">
-    <div class="horizontal-flex-container">
-      <label for="periodSelect" class="label-select"
-        >{{ localization.inventoryMonitor.period }}:</label
-      >
-      <div v-if="!disabledPeriodOptions" class="select">
-        <select
-          id="periodSelect"
-          v-model="selectedPeriod"
-          data-id="period-select"
-        >
-          <option
-            v-for="(item, index) in periodOptions"
-            :key="index"
-            :value="item.value"
-          >
-            {{ item.text }}
-          </option>
-        </select>
-      </div>
-      <span v-else class="single-option">{{ periodOptions[0].text }}</span>
-    </div>
-    <div v-show="isShowCustomIntervalButton">
-      <a
-        id="show-interval-modal-button"
-        data-id="show-interval-modal-button"
-        @click="onShowIntervalModal"
-        >{{ localization.inventoryMonitor.changeCustomInterval }}</a
-      >
-    </div>
-    <div v-if="!disabledPeriodOptions" class="chart-title">
-      {{ chartTitleDate }}
-    </div>
-    <div class="view-select-label horizontal-flex-container">
-      <label for="viewSelect" class="label-select"
-        >{{ localization.common.view }}:</label
-      >
-      <div class="select">
-        <select id="viewSelect" v-model="selectedView" data-id="view-select">
-          <option
-            v-for="(item, index) in viewOptions"
-            :key="index"
-            :value="item.value"
-          >
-            {{ item.text }}
-          </option>
-        </select>
-      </div>
-    </div>
-  </div>
-
-  <common-monitor-overview-filters-custom-interval-modal
-    v-show="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :format-date="props.formatDate"
-    :current-lang="props.currentLang"
-    @hide="onHideIntervalModal"
-    @submit="onSubmitIntervalModal"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
-import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
-import {
-  periodFunc,
-  viewFunc,
-} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
-import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $formattedDatetime } = useNuxtApp()
-
-const props = defineProps<{
-  startDate: number
-  endDate: number
-  chartType: 'spline' | 'pie'
-  view: UI_T_OverviewViewType
-  selectedPeriods: number[]
-  formatDate: string
-  currentLang: string
-  formatTime?: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
-  (event: 'update-custom-date', value: number[]): void
-}>()
-
-const selectedPeriod = ref<string>('')
-const periodOptions = computed<UI_I_OptionItem[]>(() =>
-  periodFunc(localization.value)
-)
-watch(
-  () => periodOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedPeriod.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const isShowCustomIntervalButton = computed<boolean>(
-  () => selectedPeriod.value === 'custom_interval'
-)
-
-const isShowIntervalModal = ref<boolean>(false)
-const onShowIntervalModal = (): void => {
-  isShowIntervalModal.value = true
-}
-const onHideIntervalModal = (): void => {
-  isShowIntervalModal.value = false
-}
-const onSubmitIntervalModal = (customDates: number[]): void => {
-  customDatesData.value = customDates
-  sendUpdatedFilters()
-  onHideIntervalModal()
-  emits('update-custom-date', customDates)
-}
-
-const chartTitleDate = computed<string>(() => {
-  const startValue = props.startDate
-  const endValue = props.endDate
-  if (!startValue && !endValue) return ''
-
-  const start = $formattedDatetime(
-    startValue,
-    props.formatDate,
-    true,
-    '',
-    props.formatTime
-  )
-  const end = $formattedDatetime(
-    endValue,
-    props.formatDate,
-    true,
-    '',
-    props.formatTime
-  )
-  return `${start} - ${end}`
-})
-
-// const disabledPeriodOptions = computed<boolean>(
-//   () => props.chartType === 'pie' || !chartTitleDate.value
-// )
-
-const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
-
-const selectedView = ref<string>('')
-const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.view)
-)
-watch(
-  () => viewOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedView.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const customDatesData = ref<number[]>([])
-const sendUpdatedFilters = (): void => {
-  const currentPeriod =
-    selectedPeriod.value === 'custom_interval'
-      ? customDatesData.value
-      : getValidDateByOptionFunc(selectedPeriod.value)
-  const filters: UI_I_MonitorGraphPayload = {
-    period: currentPeriod,
-    view: selectedView.value,
-    periodName: selectedPeriod.value,
-  }
-
-  emits('update-filters', filters)
-}
-watch(
-  () => [selectedPeriod.value, selectedView.value],
-  () => {
-    sendUpdatedFilters()
-  },
-  { immediate: true }
-)
-</script>
-
-<style scoped lang="scss">
-.horizontal-flex-container {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  line-height: 20px;
-  flex-shrink: 0;
-  padding-top: 5px;
-
-  .select {
-    position: relative;
-
-    select {
-      height: 20px;
-      margin: 5px;
-      color: var(--global-font-color);
-    }
-  }
-  .single-option {
-    margin-left: 5px;
-  }
-
-  .chart-title {
-    color: var(--global-font-color);
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin: 6px;
-    font-weight: 700;
-    text-transform: uppercase;
-  }
-
-  #show-interval-modal-button {
-    cursor: pointer;
-    color: var(--dropdown-item-color);
-  }
-
-  .view-select-label {
-    margin-left: auto;
-    padding-right: 7px;
-    padding-left: 7px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    align-items: center;
-  }
-}
-</style>
+<template>
+  <div class="horizontal-flex-container overview-chart-title-bar">
+    <div class="horizontal-flex-container">
+      <label for="periodSelect" class="label-select"
+        >{{ localization.inventoryMonitor.period }}:</label
+      >
+      <div v-if="!disabledPeriodOptions" class="select">
+        <select
+          id="periodSelect"
+          v-model="selectedPeriod"
+          data-id="period-select"
+        >
+          <option
+            v-for="(item, index) in periodOptions"
+            :key="index"
+            :value="item.value"
+          >
+            {{ item.text }}
+          </option>
+        </select>
+      </div>
+      <span v-else class="single-option">{{ periodOptions[0].text }}</span>
+    </div>
+    <div v-show="isShowCustomIntervalButton">
+      <a
+        id="show-interval-modal-button"
+        data-id="show-interval-modal-button"
+        @click="onShowIntervalModal"
+        >{{ localization.inventoryMonitor.changeCustomInterval }}</a
+      >
+    </div>
+    <div v-if="!disabledPeriodOptions" class="chart-title">
+      {{ chartTitleDate }}
+    </div>
+    <div class="view-select-label horizontal-flex-container">
+      <label for="viewSelect" class="label-select"
+        >{{ localization.common.view }}:</label
+      >
+      <div class="select">
+        <select id="viewSelect" v-model="selectedView" data-id="view-select">
+          <option
+            v-for="(item, index) in viewOptions"
+            :key="index"
+            :value="item.value"
+          >
+            {{ item.text }}
+          </option>
+        </select>
+      </div>
+    </div>
+  </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"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
+import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import {
+  periodFunc,
+  viewFunc,
+} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
+import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $formattedDatetime } = useNuxtApp()
+
+const props = defineProps<{
+  startDate: number
+  endDate: number
+  chartType: 'spline' | 'pie'
+  view: UI_T_OverviewViewType
+  selectedPeriods: number[]
+  formatDate: string
+  currentLang: string
+  validDateEnd: number
+  formatTime?: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
+  (event: 'update-custom-date', value: number[]): void
+}>()
+
+const selectedPeriod = ref<string>('')
+const periodOptions = computed<UI_I_OptionItem[]>(() =>
+  periodFunc(localization.value)
+)
+watch(
+  () => periodOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedPeriod.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const isShowCustomIntervalButton = computed<boolean>(
+  () => selectedPeriod.value === 'custom_interval'
+)
+
+const isShowIntervalModal = ref<boolean>(false)
+const onShowIntervalModal = (): void => {
+  isShowIntervalModal.value = true
+}
+const onHideIntervalModal = (): void => {
+  isShowIntervalModal.value = false
+}
+const onSubmitIntervalModal = (customDates: number[]): void => {
+  customDatesData.value = customDates
+  sendUpdatedFilters()
+  onHideIntervalModal()
+  emits('update-custom-date', customDates)
+}
+
+const chartTitleDate = computed<string>(() => {
+  const startValue = props.startDate
+  const endValue = props.endDate
+  if (!startValue && !endValue) return ''
+
+  const start = $formattedDatetime(
+    startValue,
+    props.formatDate,
+    true,
+    '',
+    props.formatTime
+  )
+  const end = $formattedDatetime(
+    endValue,
+    props.formatDate,
+    true,
+    '',
+    props.formatTime
+  )
+  return `${start} - ${end}`
+})
+
+// const disabledPeriodOptions = computed<boolean>(
+//   () => props.chartType === 'pie' || !chartTitleDate.value
+// )
+
+const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
+
+const selectedView = ref<string>('')
+const viewOptions = computed<UI_I_OptionItem[]>(() =>
+  viewFunc(localization.value, props.view)
+)
+watch(
+  () => viewOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedView.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const customDatesData = ref<number[]>([])
+const sendUpdatedFilters = (): void => {
+  const currentPeriod =
+    selectedPeriod.value === 'custom_interval'
+      ? customDatesData.value
+      : getValidDateByOptionFunc(selectedPeriod.value)
+  const filters: UI_I_MonitorGraphPayload = {
+    period: currentPeriod,
+    view: selectedView.value,
+    periodName: selectedPeriod.value,
+  }
+
+  emits('update-filters', filters)
+}
+watch(
+  () => [selectedPeriod.value, selectedView.value],
+  () => {
+    sendUpdatedFilters()
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss">
+.horizontal-flex-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  line-height: 20px;
+  flex-shrink: 0;
+  padding-top: 5px;
+
+  .select {
+    position: relative;
+
+    select {
+      height: 20px;
+      margin: 5px;
+      color: var(--global-font-color);
+    }
+  }
+  .single-option {
+    margin-left: 5px;
+  }
+
+  .chart-title {
+    color: var(--global-font-color);
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    margin: 6px;
+    font-weight: 700;
+    text-transform: uppercase;
+  }
+
+  #show-interval-modal-button {
+    cursor: pointer;
+    color: var(--dropdown-item-color);
+  }
+
+  .view-select-label {
+    margin-left: auto;
+    padding-right: 7px;
+    padding-left: 7px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    align-items: center;
+  }
+}
+</style>

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

@@ -1,240 +1,242 @@
-<template>
-  <atoms-modal
-    width="580px"
-    class="add-permission"
-    :show="true"
-    :title="titleIntervalModal"
-    :second-title="selectedItem"
-    test-id="overview-custom-interval-modal"
-    @hide="onHide"
-    @submit="onSubmit"
-  >
-    <template #modalBody>
-      <atoms-alert
-        v-show="alertShow"
-        status="alert-danger"
-        :items="alertItems"
-        test-id="overview-alert"
-        @remove="alertShow = false"
-      />
-
-      <table>
-        <tbody>
-          <tr>
-            <td class="text-right">
-              <label class="custom-time-label">
-                <span class="custom-time-label-text text-capitalize">
-                  {{ localization.common.from }}:
-                </span>
-              </label>
-            </td>
-            <td>
-              <div class="flex-align-center input-row-container">
-                <input
-                  id="current-date-from"
-                  v-model.lazy="currentDateFrom"
-                  data-id="current-date-from-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input first-from"
-                />
-                <div class="section-datepicker">
-                  <atoms-datepicker
-                    v-model="dateFrom"
-                    :lang="props.currentLang"
-                    class="chart-option-setting-row custom-time-input"
-                    test-id="overview-first-date-datepicker"
-                    @update="onUpdateDateFrom"
-                  />
-                </div>
-                <input
-                  id="current-time-from"
-                  v-model="currentTimeFrom"
-                  data-id="current-time-from-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input"
-                />
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="text-right">
-              <label class="custom-time-label">
-                <span class="custom-time-label-text text-capitalize">
-                  {{ localization.common.to }}:
-                </span>
-              </label>
-            </td>
-            <td>
-              <div class="flex-align-center input-row-container">
-                <input
-                  id="current-date-to"
-                  v-model.lazy="currentDateTo"
-                  data-id="current-date-to-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input first-from"
-                />
-                <div class="section-datepicker">
-                  <atoms-datepicker
-                    v-model="dateTo"
-                    :lang="props.currentLang"
-                    class="chart-option-setting-row custom-time-input"
-                    test-id="overview-first-date-to-datepicker"
-                    @update="onUpdateDateTo"
-                  />
-                </div>
-                <input
-                  id="current-time-to"
-                  v-model="currentTimeTo"
-                  data-id="current-time-to-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input"
-                />
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td></td>
-            <td class="text-format-date">
-              (date and time are in ISO 8601 format)
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </template>
-  </atoms-modal>
-</template>
-
-<script setup lang="ts">
-import { format } from 'date-fns'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
-
-const props = defineProps<{
-  formatDate: string
-  selectedPeriods: number[]
-  currentLang: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'submit', value: number[]): void
-}>()
-
-const { $formattedDate, $formattedTime, $isDate, $getUnixByDate } = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const titleIntervalModal = ref<string>(
-  `${localization.value.common.timeRange}:`
-)
-
-const selectedItem = ref<string>('')
-
-const onHide = (): void => {
-  getCurrentTime()
-  emits('hide')
-}
-
-const yesterday = new Date().setDate(new Date().getDate() - 1)
-const dateFrom = ref<number>(yesterday)
-const dateTo = ref<number>(new Date().getTime())
-
-const currentDateFrom = ref<string>('')
-const currentDateTo = ref<string>('')
-const currentTimeFrom = ref<string>('')
-const currentTimeTo = ref<string>('')
-
-const getCurrentTime = (): void => {
-  if (!props.selectedPeriods.length) {
-    currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
-    currentDateTo.value = $formattedDate(new Date(), props.formatDate)
-
-    const currentTime = format(new Date(), 'H:mm:ss')
-    currentTimeFrom.value = currentTime
-    currentTimeTo.value = currentTime
-
-    return
-  }
-
-  currentDateFrom.value = $formattedDate(
-    props.selectedPeriods[0],
-    props.formatDate
-  )
-  currentDateTo.value = $formattedDate(
-    props.selectedPeriods[1],
-    props.formatDate
-  )
-  currentTimeFrom.value = $formattedTime(props.selectedPeriods[0], '', true)
-  currentTimeTo.value = $formattedTime(props.selectedPeriods[1], '', true)
-}
-
-const onUpdateDateFrom = (val: number): void => {
-  if (!val) return
-
-  currentDateFrom.value = $formattedDate(new Date(val), props.formatDate)
-}
-watch(currentDateFrom, (newValue) => {
-  if (!newValue) return
-
-  if ($isDate(newValue)) dateFrom.value = $getUnixByDate(newValue)
-})
-
-const onUpdateDateTo = (val: number): void => {
-  if (!val) return
-
-  currentDateTo.value = $formattedDate(new Date(val), props.formatDate)
-}
-watch(currentDateTo, (newValue) => {
-  if (!newValue) return
-
-  if ($isDate(newValue)) dateTo.value = $getUnixByDate(newValue)
-})
-
-const alertShow = ref<boolean>(false)
-const alertItems = ref<string[]>([])
-
-const onSubmit = (): void => {
-  alertItems.value = []
-  alertShow.value = false
-
-  if (!dateFrom.value || !dateTo.value) return
-
-  const result = checkDateFunc(
-    localization.value,
-    currentDateFrom.value,
-    currentDateTo.value,
-    currentTimeFrom.value,
-    currentTimeTo.value
-  )
-
-  if (typeof result === 'string') {
-    alertShow.value = true
-    alertItems.value.push(result)
-    return
-  }
-
-  emits('submit', [result[0], result[1]])
-  onHide()
-}
-
-onMounted(() => {
-  selectedItem.value = location.hostname
-  getCurrentTime()
-  onSubmit()
-})
-</script>
-
-<style scoped lang="scss">
-.input-row-container {
-  padding-left: 5px;
-
-  .custom-time-input {
-    max-width: 120px;
-    margin-right: 15px;
-  }
-}
-.text-format-date {
-  display: inline-block;
-  margin-top: 5px;
-}
-</style>
+<template>
+  <atoms-modal
+    width="580px"
+    class="add-permission"
+    :show="true"
+    :title="titleIntervalModal"
+    :second-title="selectedItem"
+    test-id="overview-custom-interval-modal"
+    @hide="onHide"
+    @submit="onSubmit"
+  >
+    <template #modalBody>
+      <atoms-alert
+        v-show="alertShow"
+        status="alert-danger"
+        :items="alertItems"
+        test-id="overview-alert"
+        @remove="alertShow = false"
+      />
+
+      <table>
+        <tbody>
+          <tr>
+            <td class="text-right">
+              <label class="custom-time-label">
+                <span class="custom-time-label-text text-capitalize">
+                  {{ localization.common.from }}:
+                </span>
+              </label>
+            </td>
+            <td>
+              <div class="flex-align-center input-row-container">
+                <input
+                  id="current-date-from"
+                  v-model.lazy="currentDateFrom"
+                  data-id="current-date-from-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input first-from"
+                />
+                <div class="section-datepicker">
+                  <atoms-datepicker
+                    v-model="dateFrom"
+                    :lang="props.currentLang"
+                    class="chart-option-setting-row custom-time-input"
+                    test-id="overview-first-date-datepicker"
+                    @update="onUpdateDateFrom"
+                  />
+                </div>
+                <input
+                  id="current-time-from"
+                  v-model="currentTimeFrom"
+                  data-id="current-time-from-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input"
+                />
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="text-right">
+              <label class="custom-time-label">
+                <span class="custom-time-label-text text-capitalize">
+                  {{ localization.common.to }}:
+                </span>
+              </label>
+            </td>
+            <td>
+              <div class="flex-align-center input-row-container">
+                <input
+                  id="current-date-to"
+                  v-model.lazy="currentDateTo"
+                  data-id="current-date-to-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input first-from"
+                />
+                <div class="section-datepicker">
+                  <atoms-datepicker
+                    v-model="dateTo"
+                    :lang="props.currentLang"
+                    class="chart-option-setting-row custom-time-input"
+                    test-id="overview-first-date-to-datepicker"
+                    @update="onUpdateDateTo"
+                  />
+                </div>
+                <input
+                  id="current-time-to"
+                  v-model="currentTimeTo"
+                  data-id="current-time-to-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input"
+                />
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td class="text-format-date">
+              (date and time are in ISO 8601 format)
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </template>
+  </atoms-modal>
+</template>
+
+<script setup lang="ts">
+import { format } from 'date-fns'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
+
+const props = defineProps<{
+  formatDate: string
+  selectedPeriods: number[]
+  currentLang: string
+  validDateEnd: number
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'submit', value: number[]): void
+}>()
+
+const { $formattedDate, $formattedTime, $isDate, $getUnixByDate } = useNuxtApp()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const titleIntervalModal = ref<string>(
+  `${localization.value.common.timeRange}:`
+)
+
+const selectedItem = ref<string>('')
+
+const onHide = (): void => {
+  getCurrentTime()
+  emits('hide')
+}
+
+const yesterday = new Date().setDate(new Date().getDate() - 1)
+const dateFrom = ref<number>(yesterday)
+const dateTo = ref<number>(new Date().getTime())
+
+const currentDateFrom = ref<string>('')
+const currentDateTo = ref<string>('')
+const currentTimeFrom = ref<string>('')
+const currentTimeTo = ref<string>('')
+
+const getCurrentTime = (): void => {
+  if (!props.selectedPeriods.length) {
+    currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
+    currentDateTo.value = $formattedDate(props.validDateEnd, props.formatDate)
+
+    currentTimeFrom.value = format(new Date(), 'H:mm:ss')
+    currentTimeTo.value = format(props.validDateEnd, 'H:mm:ss')
+
+    return
+  }
+
+  currentDateFrom.value = $formattedDate(
+    props.selectedPeriods[0],
+    props.formatDate
+  )
+  currentDateTo.value = $formattedDate(
+    props.selectedPeriods[1],
+    props.formatDate
+  )
+  currentTimeFrom.value = $formattedTime(props.selectedPeriods[0], '', true)
+  currentTimeTo.value = $formattedTime(props.selectedPeriods[1], '', true)
+}
+
+const onUpdateDateFrom = (val: number): void => {
+  if (!val) return
+
+  currentDateFrom.value = $formattedDate(new Date(val), props.formatDate)
+}
+watch(currentDateFrom, (newValue) => {
+  if (!newValue) return
+
+  if ($isDate(newValue)) dateFrom.value = $getUnixByDate(newValue)
+})
+
+const onUpdateDateTo = (val: number): void => {
+  if (!val) return
+
+  currentDateTo.value = $formattedDate(new Date(val), props.formatDate)
+}
+watch(currentDateTo, (newValue) => {
+  if (!newValue) return
+
+  if ($isDate(newValue)) dateTo.value = $getUnixByDate(newValue)
+})
+
+const alertShow = ref<boolean>(false)
+const alertItems = ref<string[]>([])
+
+const onSubmit = (): void => {
+  alertItems.value = []
+  alertShow.value = false
+
+  if (!dateFrom.value || !dateTo.value) return
+
+  const result = checkDateFunc(
+    localization.value,
+    currentDateFrom.value,
+    currentDateTo.value,
+    currentTimeFrom.value,
+    currentTimeTo.value,
+    props.validDateEnd,
+    props.formatDate
+  )
+
+  if (typeof result === 'string') {
+    alertShow.value = true
+    alertItems.value.push(result)
+    return
+  }
+
+  emits('submit', [result[0], result[1]])
+  onHide()
+}
+
+onMounted(() => {
+  selectedItem.value = location.hostname
+  getCurrentTime()
+  onSubmit()
+})
+</script>
+
+<style scoped lang="scss">
+.input-row-container {
+  padding-left: 5px;
+
+  .custom-time-input {
+    max-width: 120px;
+    margin-right: 15px;
+  }
+}
+.text-format-date {
+  display: inline-block;
+  margin-top: 5px;
+}
+</style>

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

@@ -1,52 +1,62 @@
-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())
-  )
-}
-
-export const checkDateFunc = (
-  localization: UI_I_Localization,
-  dateFrom: string,
-  dateTo: string,
-  timeFrom: string,
-  timeTo: string
-): string | number[] => {
-  const { $isDate, $getUnixByDate } = useNuxtApp()
-
-  let result = ''
-  const startDate = dateFrom + ' ' + timeFrom
-  const unixStartDate = $getUnixByDate(startDate)
-  const endDate = dateTo + ' ' + timeTo
-  const unixEndDate = $getUnixByDate(endDate)
-
-  if (
-    !$isDate(unixStartDate) ||
-    !$isDate(unixEndDate) ||
-    !timeFrom ||
-    !timeTo
-  ) {
-    result = localization.inventoryMonitor.invalidTimeEntry
-    return result
-  }
-
-  if (unixEndDate > new Date().getTime())
-    result = localization.inventoryMonitor.oneOfSelectedDatesIsInTheFuture
-  else if (unixEndDate === unixStartDate)
-    result = localization.inventoryMonitor.timeToShouldBeLaterTimeFrom
-  else if (unixEndDate - unixStartDate <= 3600000)
-    result = localization.inventoryMonitor.timeRangeShouldNotBeSmallerThanHour
-  else if (isMoreThanOneMonth(unixStartDate, unixEndDate))
-    result = localization.inventoryMonitor.timeRangeShouldNotBeMoreThanMonth
-  else return [unixStartDate, unixEndDate]
-
-  return result
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const isMoreThanOneMonth = (startDate: number, endDate: number): boolean => {
+  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 = (
+  localization: UI_I_Localization,
+  dateFrom: string,
+  dateTo: string,
+  timeFrom: string,
+  timeTo: string,
+  unixValidEnd: number,
+  formatDate: string
+): string | number[] => {
+  const { $isDate, $getUnixByDate } = useNuxtApp()
+
+  let result = ''
+  const startDate = dateFrom + ' ' + timeFrom
+  const unixStartDate = $getUnixByDate(startDate)
+  const endDate = dateTo + ' ' + timeTo
+  const unixEndDate = $getUnixByDate(endDate)
+
+  if (
+    !$isDate(unixStartDate) ||
+    !$isDate(unixEndDate) ||
+    !timeFrom ||
+    !timeTo
+  ) {
+    result = localization.inventoryMonitor.invalidTimeEntry
+    return result
+  }
+
+  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
+  else if (isMoreThanOneMonth(unixStartDate, unixEndDate))
+    result = localization.inventoryMonitor.timeRangeShouldNotBeMoreThanMonth
+  else return [unixStartDate, unixEndDate]
+
+  return result
+}

package/components/common/pages/tasks/table/lib/config/config.ts

@@ -175,6 +175,7 @@ export const options: UI_I_DataTableOptions = {
   showColumnManager: true,
   withActions: true,
   inBlock: true,
+  showExport: true
 }
 
 export const getBodyDataFunc = (

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.718",
+  "version": "1.4.719",
   "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.15",
-    "bfg-uikit": "1.0.300",
+    "bfg-uikit": "1.0.301",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }