bfg-common 1.4.884 → 1.4.886

package/components/common/monitor/overview/OverviewNew.vue

@@ -1,142 +1,120 @@
-<template>
-  <div class="charts-view">
-    <!--    <div v-if="!props.allData.length" class="content-global-loading">-->
-    <!--      {{ localization.common.loading }}...-->
-    <!--    </div>-->
-    <!--    <template v-else>-->
-    <template v-for="(chartData, key) in props.allData" :key="chartData.title">
-      <div :class="['chart-container', `graph-${chartData.title}`]">
-        <div v-if="chartData.loader" class="graphic-loader-block">
-          <ui-skeleton-metric />
-        </div>
-        <common-graph
-          v-else-if="chartData.data"
-          :data="chartData.data"
-          :chart="props.charts[key]"
-          :update="props.updateHelper"
-        />
-        <div v-else class="graph-empty-block">
-          <div class="title">{{ chartData.title }}</div>
-          <div class="body-block">
-            {{ localization.common.emptyGraphText }}
-          </div>
-        </div>
-      </div>
-    </template>
-    <!--    </template>-->
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_GraphDataSettingItem } from '~/components/common/monitor/lib/models/interfaces'
-
-const props = defineProps<{
-  charts: (UI_I_GraphDataSettingItem | null)[]
-  allData: UI_I_GraphDataSettingItem[]
-  updateHelper: number
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style>
-:root {
-  --overview-chart-loader-bg-color: #ffffff;
-}
-:root.dark-theme {
-  --overview-chart-loader-bg-color: #334453;
-}
-</style>
-
-<style scoped lang="scss">
-.charts-view {
-  position: relative;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  overflow: auto;
-  height: 100%;
-  gap: 16px;
-  padding: 0 16px;
-
-  .graphic-loader-block {
-    background-color: var(--overview-chart-loader-bg-color);
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-radius: 8px;
-  }
-
-  .graph-empty-block {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    background-color: var(--overview-chart-loader-bg-color);
-    border-radius: 8px;
-
-    .title {
-      text-align: center;
-      font-size: 18px;
-      margin-top: 10px;
-      color: var(--global-font-color);
-    }
-
-    .body-block {
-      height: 100%;
-      display: flex;
-      justify-content: center;
-      text-align: center;
-      align-items: center;
-      color: var(--global-font-color);
-    }
-  }
-
-  .chart-container {
-    position: relative;
-    width: 100%;
-    min-width: 300px;
-    height: 100%;
-    min-height: 300px;
-    flex-grow: 1;
-    box-sizing: border-box;
-
-    &:first-child:last-child {
-      height: 100%;
-      width: 100%;
-    }
-
-    &:first-child:nth-last-child(2),
-    &:nth-child(2):last-child {
-      width: 50%;
-      height: 100%;
-    }
-
-    :deep(svg > .skeleton-metric__line) {
-      display: none;
-    }
-  }
-
-  //.content-global-loading {
-  //  width: 100%;
-  //  height: 100%;
-  //  display: flex;
-  //  align-items: center;
-  //  justify-content: center;
-  //  color: var(--global-font-color);
-  //}
-}
-@media (min-width: 1280px) {
-  .charts-view .chart-container {
-    width: 50%;
-  }
-}
-@media (min-height: 800px) {
-  .charts-view .chart-container {
-    height: 50%;
-  }
-}
-</style>
+<template>
+  <div ref="chartsView" :class="['charts-view', { 'has-scroll': isHasScroll }]">
+    <template v-for="(chartData, key) in props.allData" :key="chartData.title">
+      <div :class="['chart-container', `graph-${chartData.title}`]">
+        <ui-skeleton-long-metric v-if="chartData.loader" height="336px" />
+        <common-graph
+          v-else-if="chartData.data"
+          :data="chartData.data"
+          :chart="props.charts[key]"
+          :update="props.updateHelper"
+        />
+        <div v-else class="graph-empty-block">
+          <div class="title">{{ chartData.title }}</div>
+          <div class="body-block">
+            {{ localization.common.emptyGraphText }}
+          </div>
+        </div>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useElementSize } from '@vueuse/core'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_GraphDataSettingItem } from '~/components/common/monitor/lib/models/interfaces'
+
+const props = defineProps<{
+  charts: (UI_I_GraphDataSettingItem | null)[]
+  allData: UI_I_GraphDataSettingItem[]
+  updateHelper: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const chartsView = ref<HTMLElement | null>(null)
+const { width, height } = useElementSize(chartsView)
+const isHasScroll = ref<boolean>(false)
+const isScrollVisible = (element: HTMLElement): boolean =>
+  element.scrollHeight > element.clientHeight &&
+  getComputedStyle(element).overflowY !== 'hidden'
+
+watch([width, height], () => {
+  if (!chartsView.value) return
+
+  isHasScroll.value = isScrollVisible(chartsView.value)
+})
+</script>
+
+<style scoped lang="scss">
+.charts-view {
+  position: relative;
+  display: grid;
+  overflow: auto;
+  height: 100%;
+  gap: 12px;
+  padding: 4px 16px 16px 16px;
+  grid-template-rows: 400px;
+
+  &.has-scroll {
+    padding-right: 3px;
+  }
+
+  &:has(.chart-container:nth-child(4)),
+  &:has(.chart-container:nth-child(3)):not(:has(.chart-container:nth-child(4))),
+  &:has(.chart-container:nth-child(2)):not(:has(.chart-container:nth-child(3))) {
+    grid-template-columns: 1fr 1fr;
+  }
+  &:has(.chart-container:nth-child(1)):not(:has(.chart-container:nth-child(2))) {
+    grid-template-columns: 1fr;
+  }
+  &:has(.chart-container:nth-child(3)):not(:has(.chart-container:nth-child(4)))
+    .chart-container:nth-child(3) {
+    grid-column: 1 / -1;
+  }
+
+  .graph-empty-block {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    background-color: var(--overview-chart-loader-bg-color);
+    border-radius: 8px;
+
+    .title {
+      text-align: center;
+      font-size: 18px;
+      margin-top: 10px;
+      color: var(--global-font-color);
+    }
+
+    .body-block {
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      text-align: center;
+      align-items: center;
+      color: var(--global-font-color);
+    }
+  }
+
+  .chart-container {
+    position: relative;
+    width: 100%;
+    min-width: 300px;
+    height: 100%;
+    min-height: 300px;
+    flex-grow: 1;
+    box-sizing: border-box;
+
+    :deep(svg > .skeleton-metric__line) {
+      display: none;
+    }
+  }
+}
+@container (max-width: 920px) {
+  .charts-view {
+    grid-template-columns: 1fr !important;
+  }
+}
+</style>

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

@@ -1,166 +1,169 @@
-<template>
-  <common-monitor-overview-filters-new
-    v-if="isNewView"
-    v-model:selected-period="selectedPeriod"
-    v-model:selected-view="selectedView"
-    :disabled-period-options="disabledPeriodOptions"
-    :period-options="periodOptions"
-    :is-show-custom-interval-button="isShowCustomIntervalButton"
-    :chart-title-date="chartTitleDate"
-    :view-options="viewOptions"
-    :valid-date-end="props.validDateEnd"
-    :is-show-interval-modal="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :format-date="props.formatDate"
-    :current-lang="props.currentLang"
-    @submit-interval-modal="onSubmitIntervalModal"
-    @show-interval-modal="onShowIntervalModal"
-    @hide-interval-modal="onHideIntervalModal"
-  />
-  <common-monitor-overview-filters-old
-    v-else
-    v-model:selected-period="selectedPeriod"
-    v-model:selected-view="selectedView"
-    :disabled-period-options="disabledPeriodOptions"
-    :period-options="periodOptions"
-    :is-show-custom-interval-button="isShowCustomIntervalButton"
-    :chart-title-date="chartTitleDate"
-    :view-options="viewOptions"
-    :valid-date-end="props.validDateEnd"
-    :is-show-interval-modal="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :format-date="props.formatDate"
-    :current-lang="props.currentLang"
-    @submit-interval-modal="onSubmitIntervalModal"
-    @show-interval-modal="onShowIntervalModal"
-    @hide-interval-modal="onHideIntervalModal"
-  />
-</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 { $formattedDatetime, $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-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 localization = computed<UI_I_Localization>(() => useLocal())
-
-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"></style>
+<template>
+  <common-monitor-overview-filters-new
+    v-if="isNewView"
+    v-model:selected-period="selectedPeriod"
+    v-model:selected-view="selectedView"
+    :disabled-period-options="disabledPeriodOptions"
+    :period-options="periodOptions"
+    :is-show-custom-interval-button="isShowCustomIntervalButton"
+    :chart-title-date="chartTitleDate"
+    :view-options="viewOptions"
+    :valid-date-end="props.validDateEnd"
+    :is-show-interval-modal="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :format-date="props.formatDate"
+    :current-lang="props.currentLang"
+    :selected-node-name="props.selectedNodeName"
+    @submit-interval-modal="onSubmitIntervalModal"
+    @show-interval-modal="onShowIntervalModal"
+    @hide-interval-modal="onHideIntervalModal"
+  />
+  <common-monitor-overview-filters-old
+    v-else
+    v-model:selected-period="selectedPeriod"
+    v-model:selected-view="selectedView"
+    :disabled-period-options="disabledPeriodOptions"
+    :period-options="periodOptions"
+    :is-show-custom-interval-button="isShowCustomIntervalButton"
+    :chart-title-date="chartTitleDate"
+    :view-options="viewOptions"
+    :valid-date-end="props.validDateEnd"
+    :is-show-interval-modal="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :format-date="props.formatDate"
+    :current-lang="props.currentLang"
+    :selected-node-name="props.selectedNodeName"
+    @submit-interval-modal="onSubmitIntervalModal"
+    @show-interval-modal="onShowIntervalModal"
+    @hide-interval-modal="onHideIntervalModal"
+  />
+</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 { $formattedDatetime, $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const props = defineProps<{
+  startDate: number
+  endDate: number
+  chartType: 'spline' | 'pie'
+  view: UI_T_OverviewViewType
+  selectedPeriods: number[]
+  formatDate: string
+  currentLang: string
+  validDateEnd: number
+  selectedNodeName: string
+  formatTime?: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
+  (event: 'update-custom-date', value: number[]): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+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"></style>