bfg-common 1.1.59 → 1.1.60

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

@@ -1,6 +1,11 @@
 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
 
@@ -9,6 +14,39 @@ export const getValidDateByOptionFunc = (type: string): number[] => {
   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()
+
+    console.log(startTime, timeType, 777888)
+  }
 
   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>

package/components/common/recursionTree/RecursionTree.vue

@@ -1,201 +1,201 @@
-<template>
-  <div class="recursion-tree">
-    <div v-for="node in nodes" :key="`${node.type}_${node.id}`">
-      <div
-        :id="`tree-node-${node.type}-${node.id}`"
-        class="clr-tree-node"
-        @click="selectNode(node)"
-      >
-        <button
-          v-if="node.hasNodes"
-          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
-          class="clr-treenode-caret"
-          @click.stop="getNodes({ node })"
-        >
-          <i
-            v-if="loading[`${node.id}_${node.type}`]"
-            class="fa clr-tree-node-caret-icon spinner spinner-sm"
-          />
-          <atoms-the-icon
-            v-else
-            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
-            name="angle"
-          />
-        </button>
-        <div
-          :class="[
-            'tree-node-text-drag',
-            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
-          ]"
-          @contextmenu="showContextMenuAndSelectNode($event, node)"
-        >
-          <div
-            :class="[
-              'clr-treenode-link tree-node-text',
-              { active: node.isActive },
-            ]"
-          >
-            <span :class="node.iconClassName" />
-            {{ node.name }}
-          </div>
-        </div>
-      </div>
-
-      <common-recursion-tree
-        v-if="node.nodesShow && node.nodes.length"
-        :nodes="node.nodes"
-        :style="{ 'padding-left': node.nodesShow ? '20px' : '' }"
-        @get-nodes="getNodes($event)"
-        @select-node="selectNode($event)"
-        @contextmenu.prevent
-        @show-context-menu="showContextMenu"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
-
-const { $store } = useNuxtApp()
-
-interface UI_I_Loading {
-  [key: string]: boolean
-}
-
-const props = defineProps<{
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'get-nodes', value: any): void
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-context-menu', value: any): void
-}>()
-
-const loading = ref<UI_I_Loading>({})
-watch(props.nodes, (nodes) => {
-  nodes.forEach((node) => {
-    loading.value[`${node.id}_${node.type}`] = false
-  })
-})
-
-const hasDarkMode = computed<boolean>(
-  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
-)
-
-const getNodes = (data: any): void => {
-  const node: UI_I_TreeNode = data.node
-  const cb: Function | undefined = data.cb
-
-  loading.value[`${node.id}_${node.type}`] = true
-  const collBack = () => {
-    loading.value[`${node.id}_${node.type}`] = false
-  }
-  emits('get-nodes', {
-    node,
-    cb: cb || collBack,
-  })
-}
-const selectNode = (node: UI_I_TreeNode): void => {
-  emits('select-node', node)
-}
-const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
-  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
-  if (event.node && event.event) {
-    emits('show-context-menu', { ...event })
-    return
-  }
-  emits('show-context-menu', { event, node })
-}
-const showContextMenuAndSelectNode = (
-  event: any,
-  node: UI_I_TreeNode
-): void => {
-  selectNode(node)
-
-  showContextMenu(event, node)
-}
-</script>
-
-<style scoped lang="scss">
-.recursion-tree {
-  .clr-tree-node {
-    width: 100%;
-    overflow: hidden;
-    display: flex;
-    flex: 1 1 0;
-    align-items: center;
-    margin-bottom: 1px;
-
-    .clr-treenode-caret {
-      outline: none;
-
-      .clr-tree-node-caret-icon {
-        position: static;
-        transform: rotate(90deg);
-        width: 11px;
-        height: 11px;
-        fill: var(--tree-node-caret-icon);
-
-        &.down {
-          transform: rotate(180deg);
-        }
-      }
-    }
-    .tree-node-text-drag {
-      width: 100%;
-      overflow: hidden;
-      display: flex;
-      cursor: grab;
-
-      &.no-child {
-        margin-left: 30px;
-      }
-      .tree-node-text {
-        width: 100%;
-        box-sizing: border-box;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        padding: 0;
-        border-radius: 0;
-        border-bottom: 1px solid transparent;
-
-        &.active {
-          background: var(--vertical-nav-active-bg-color);
-          color: var(--vertical-nav-active-item-color);
-          border-bottom: 1px solid transparent;
-        }
-        &:hover {
-          border-color: var(--vertical-nav-hover-border-color);
-          &:not(.active) {
-            background: var(--vertical-nav-hover-bg-color);
-          }
-        }
-        span {
-          display: inline-block;
-          vertical-align: text-bottom;
-          margin: 1px 4px 0;
-        }
-      }
-    }
-  }
-}
-</style>
-
-<style>
-:root {
-  --vertical-nav-active-item-color: #fff;
-  --vertical-nav-active-bg-color: #29414e;
-  --vertical-nav-hover-bg-color: #e8e8e8;
-  --vertical-nav-hover-border-color: #666;
-  --tree-node-caret-icon: #666;
-}
-:root.dark-theme {
-  --vertical-nav-active-item-color: #000;
-  --vertical-nav-active-bg-color: #d8e3e9;
-  --vertical-nav-hover-bg-color: #324f61;
-  --vertical-nav-hover-border-color: #fff;
-  --tree-node-caret-icon: #acbac3;
-}
-</style>
+<template>
+  <div class="recursion-tree">
+    <div v-for="node in nodes" :key="`${node.type}_${node.id}`">
+      <div
+        :id="`tree-node-${node.type}-${node.id}`"
+        class="clr-tree-node"
+        @click="selectNode(node)"
+      >
+        <button
+          v-if="node.hasNodes"
+          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
+          class="clr-treenode-caret"
+          @click.stop="getNodes({ node })"
+        >
+          <i
+            v-if="loading[`${node.id}_${node.type}`]"
+            class="fa clr-tree-node-caret-icon spinner spinner-sm"
+          />
+          <atoms-the-icon
+            v-else
+            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
+            name="angle"
+          />
+        </button>
+        <div
+          :class="[
+            'tree-node-text-drag',
+            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
+          ]"
+          @contextmenu="showContextMenuAndSelectNode($event, node)"
+        >
+          <div
+            :class="[
+              'clr-treenode-link tree-node-text',
+              { active: node.isActive },
+            ]"
+          >
+            <span :class="node.iconClassName" />
+            {{ node.name }}
+          </div>
+        </div>
+      </div>
+
+      <common-recursion-tree
+        v-if="node.nodesShow && node.nodes.length"
+        :nodes="node.nodes"
+        :style="{ 'padding-left': node.nodesShow ? '20px' : '' }"
+        @get-nodes="getNodes($event)"
+        @select-node="selectNode($event)"
+        @contextmenu.prevent
+        @show-context-menu="showContextMenu"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
+
+const { $store } = useNuxtApp()
+
+interface UI_I_Loading {
+  [key: string]: boolean
+}
+
+const props = defineProps<{
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'get-nodes', value: any): void
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-context-menu', value: any): void
+}>()
+
+const loading = ref<UI_I_Loading>({})
+watch(props.nodes, (nodes) => {
+  nodes.forEach((node) => {
+    loading.value[`${node.id}_${node.type}`] = false
+  })
+})
+
+const hasDarkMode = computed<boolean>(
+  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
+)
+
+const getNodes = (data: any): void => {
+  const node: UI_I_TreeNode = data.node
+  const cb: Function | undefined = data.cb
+
+  loading.value[`${node.id}_${node.type}`] = true
+  const collBack = () => {
+    loading.value[`${node.id}_${node.type}`] = false
+  }
+  emits('get-nodes', {
+    node,
+    cb: cb || collBack,
+  })
+}
+const selectNode = (node: UI_I_TreeNode): void => {
+  emits('select-node', node)
+}
+const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
+  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
+  if (event.node && event.event) {
+    emits('show-context-menu', { ...event })
+    return
+  }
+  emits('show-context-menu', { event, node })
+}
+const showContextMenuAndSelectNode = (
+  event: any,
+  node: UI_I_TreeNode
+): void => {
+  selectNode(node)
+
+  showContextMenu(event, node)
+}
+</script>
+
+<style scoped lang="scss">
+.recursion-tree {
+  .clr-tree-node {
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex: 1 1 0;
+    align-items: center;
+    margin-bottom: 1px;
+
+    .clr-treenode-caret {
+      outline: none;
+
+      .clr-tree-node-caret-icon {
+        position: static;
+        transform: rotate(90deg);
+        width: 11px;
+        height: 11px;
+        fill: var(--tree-node-caret-icon);
+
+        &.down {
+          transform: rotate(180deg);
+        }
+      }
+    }
+    .tree-node-text-drag {
+      width: 100%;
+      overflow: hidden;
+      display: flex;
+      cursor: grab;
+
+      &.no-child {
+        margin-left: 30px;
+      }
+      .tree-node-text {
+        width: 100%;
+        box-sizing: border-box;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        padding: 0;
+        border-radius: 0;
+        border-bottom: 1px solid transparent;
+
+        &.active {
+          background: var(--vertical-nav-active-bg-color);
+          color: var(--vertical-nav-active-item-color);
+          border-bottom: 1px solid transparent;
+        }
+        &:hover {
+          border-color: var(--vertical-nav-hover-border-color);
+          &:not(.active) {
+            background: var(--vertical-nav-hover-bg-color);
+          }
+        }
+        span {
+          display: inline-block;
+          vertical-align: text-bottom;
+          margin: 1px 4px 0;
+        }
+      }
+    }
+  }
+}
+</style>
+
+<style>
+:root {
+  --vertical-nav-active-item-color: #fff;
+  --vertical-nav-active-bg-color: #29414e;
+  --vertical-nav-hover-bg-color: #e8e8e8;
+  --vertical-nav-hover-border-color: #666;
+  --tree-node-caret-icon: #666;
+}
+:root.dark-theme {
+  --vertical-nav-active-item-color: #000;
+  --vertical-nav-active-bg-color: #d8e3e9;
+  --vertical-nav-hover-bg-color: #324f61;
+  --vertical-nav-hover-border-color: #fff;
+  --tree-node-caret-icon: #acbac3;
+}
+</style>