bfg-common 1.3.153 → 1.3.155

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/Table.vue

@@ -137,7 +137,7 @@ watch(
   }
 
   :deep(.datagrid-table-wrapper) {
-    max-height: 88px;
+    max-height: 176px;
   }
 }
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="timespan-objects-section-direction flex horizontal">
+  <div class="timespan-objects-section-direction">
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-form
       :language="props.language"
       :selected-chart-type="props.selectedChartType"
@@ -80,4 +80,14 @@ const emits = defineEmits<{
 }>()
 </script>
 
-<style scoped lang="scss"></style>
+<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/advanced/tools/chartOptionsModal/counters/timespan/form/Form.vue

@@ -409,7 +409,7 @@ onMounted(() => {
 <style scoped lang="scss">
 .chart-option-timespan-split {
   overflow-x: auto;
-  flex-basis: 56%;
+  //flex-basis: 56%;
   padding: 5px;
 
   .timespan-objects-section-direction {

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

@@ -1,4 +1,17 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
+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,
@@ -31,6 +44,8 @@ export const checkDateFunc = (
     result = localization.timeToShouldBeLaterTimeFrom
   else if (unixEndDate - unixStartDate <= 3600000)
     result = localization.timeRangeShouldNotBeSmallerThanHour
+  else if (isMoreThanOneMonth(unixStartDate, unixEndDate))
+    result = localization.timeRangeShouldNotBeMoreThanMonth
   else return [unixStartDate, unixEndDate]
 
   return result

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>