bfg-common 1.1.8 → 1.1.10

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

@@ -1,113 +1,121 @@
-<template>
-  <div class="vertical-flex-container chart-option-counters-vertical-split">
-    <span class="chart-options-grid-title">{{
-      localization.selectCountersForThisChart
-    }}</span>
-
-    <atoms-table-data-grid
-      v-model:selected-row="selectedCounters"
-      v-model:column-keys="columnItems"
-      v-model:page-size="pagination.pageSize"
-      v-model:page="pagination.page"
-      type="checkbox"
-      class="data-table"
-      :head-items="headItems"
-      :body-items="bodyItems"
-      :total-items="totalItems"
-      :total-pages="totalPages"
-      hide-footer
-      server-off
-      @change="onChangeRow"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-  UI_I_ColumnKey,
-} from '~/components/atoms/table/dataGrid/models/interfaces'
-import { UI_I_Localization } from '~/models/interfaces'
-import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/tableConfig'
-import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
-import {
-  T_ChartHost,
-  T_ChartVm,
-} from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
-import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/types'
-import { countersItemsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/utils'
-
-const props = defineProps<{
-  chart: T_ChartHost | T_ChartVm
-  type: UI_T_AdvancedType
-  selectedKeys: number[]
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const counters = computed<UI_I_AdvancedCounterItem[]>(() =>
-  countersItemsFunc(props.type, props.chart, localization.value)
-)
-
-const totalItems = computed<number>(() => counters.value.length)
-const totalPages = computed<number>(() => 1)
-
-const selectedCounters = ref<number[]>([])
-watch(
-  () => props.selectedKeys,
-  (newValue) => {
-    selectedCounters.value = newValue
-  },
-  { immediate: true, deep: true }
-)
-watch(
-  () => props.chart,
-  () => {
-    selectedCounters.value = []
-  }
-)
-const pagination = ref<any>({
-  page: 1,
-  pageSize: 35,
-})
-
-const columnItems = computed<UI_I_ColumnKey[]>(() =>
-  table.columnKeys(localization.value)
-)
-const headItems = computed<UI_I_HeadItem[]>(() =>
-  table.headItems(localization.value)
-)
-const bodyItems = ref<UI_I_BodyItem[][]>([])
-
-watch(
-  counters,
-  (newValue) => {
-    if (!newValue.length) return
-
-    bodyItems.value = table.bodyItems(newValue)
-  },
-  { deep: true, immediate: true }
-)
-
-const onChangeRow = (val: number[]): void => {
-  const result: UI_I_AdvancedCounterItem[] = []
-
-  counters.value.forEach((item) => {
-    if (val.includes(item.id)) result.push(item)
-  })
-
-  emits('select-row', result)
-}
-</script>
-
-<style scoped lang="scss">
-.chart-options-grid-title {
-  display: block;
-  margin-bottom: -20px;
-}
-</style>
+<template>
+  <div class="vertical-flex-container chart-option-counters-vertical-split">
+    <span class="chart-options-grid-title">{{
+      localization.selectCountersForThisChart
+    }}</span>
+
+    <atoms-table-data-grid
+      v-model:selected-row="selectedCounters"
+      v-model:column-keys="columnItems"
+      v-model:page-size="pagination.pageSize"
+      v-model:page="pagination.page"
+      type="checkbox"
+      class="data-table"
+      :head-items="headItems"
+      :body-items="bodyItems"
+      :total-items="totalItems"
+      :total-pages="totalPages"
+      hide-footer
+      server-off
+      @change="onChangeRow"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+  UI_I_ColumnKey,
+} from '~/components/atoms/table/dataGrid/models/interfaces'
+import { UI_I_Localization } from '~/models/interfaces'
+import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/tableConfig'
+import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
+import {
+  T_ChartHost,
+  T_ChartVm,
+} from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
+import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/types'
+import { countersItemsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/utils'
+
+const props = defineProps<{
+  chart: T_ChartHost | T_ChartVm
+  type: UI_T_AdvancedType
+  selectedKeys: number[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const counters = computed<UI_I_AdvancedCounterItem[]>(() =>
+  countersItemsFunc(props.type, props.chart, localization.value)
+)
+
+const totalItems = computed<number>(() => counters.value.length)
+const totalPages = computed<number>(() => 1)
+
+const selectedCounters = ref<number[]>([])
+watch(
+  () => props.selectedKeys,
+  (newValue) => {
+    selectedCounters.value = newValue
+  },
+  { immediate: true, deep: true }
+)
+watch(
+  () => props.chart,
+  () => {
+    selectedCounters.value = []
+  }
+)
+const pagination = ref<any>({
+  page: 1,
+  pageSize: 35,
+})
+
+const columnItems = computed<UI_I_ColumnKey[]>(() =>
+  table.columnKeys(localization.value)
+)
+const headItems = computed<UI_I_HeadItem[]>(() =>
+  table.headItems(localization.value)
+)
+const bodyItems = ref<UI_I_BodyItem[][]>([])
+
+watch(
+  counters,
+  (newValue) => {
+    if (!newValue.length) return
+
+    bodyItems.value = table.bodyItems(newValue)
+  },
+  { deep: true, immediate: true }
+)
+
+const onChangeRow = (val: number[]): void => {
+  const result: UI_I_AdvancedCounterItem[] = []
+
+  counters.value.forEach((item) => {
+    if (val.includes(item.id)) result.push(item)
+  })
+
+  emits('select-row', result)
+}
+
+watch(
+  selectedCounters,
+  (newValue) => {
+    onChangeRow(newValue)
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss">
+.chart-options-grid-title {
+  display: block;
+  margin-bottom: -20px;
+}
+</style>

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

@@ -2,6 +2,8 @@
   <div class="timespan-objects-section-direction flex horizontal">
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-form
       :language="props.language"
+      :selected-chart-type="props.selectedChartType"
+      @update-chart-type="emits('update-chart-type', $event)"
     />
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
       :selected="props.selected"
@@ -15,6 +17,11 @@ import { UI_I_AdvancedTargetObject } from '~/components/common/monitor/advanced/
 const props = defineProps<{
   selected: UI_I_AdvancedTargetObject[][]
   language: string
+  selectedChartType: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
 }>()
 </script>
 

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

@@ -188,7 +188,7 @@
             >{{ localization.chartType }}:</label
           >
           <div class="select">
-            <select id="chart-type-select" v-model="selectedChartType">
+            <select id="chart-type-select" v-model="chartType">
               <option
                 v-for="(item, index) in chartTypeOptions"
                 :key="index"
@@ -216,6 +216,11 @@ import {
 
 const props = defineProps<{
   language: string
+  selectedChartType: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const { $formattedDate, $isDate, $getTimeFormat, $getUnixByDate } = useNuxtApp()
@@ -236,11 +241,38 @@ const customTimeOptions = computed<UI_I_OptionItem[]>(() =>
   customTimeFunc(localization.value)
 )
 
-const selectedChartType = ref<string>('line_graph')
+const chartType = ref<string>('line_graph')
 const chartTypeOptions = computed<UI_I_OptionItem[]>(() =>
   chartTypeFunc(localization.value)
 )
 
+const setCurrentChartType = (): void => {
+  const selected = props.selectedChartType
+  let result = 'line_graph'
+
+  if (selected === 'spline') result = 'line_graph'
+  else if (selected === 'area') result = 'stacked_graph'
+
+  chartType.value = result
+}
+
+watch(
+  () => props.selectedChartType,
+  () => {
+    setCurrentChartType()
+  },
+  { immediate: true }
+)
+
+watch(chartType, (newValue) => {
+  let currentValue = 'spline'
+
+  if (newValue === 'line_graph') currentValue = 'spline'
+  else if (newValue === 'stacked_graph') currentValue = 'area'
+
+  emits('update-chart-type', currentValue)
+})
+
 const yesterday = new Date().setDate(new Date().getDate() - 1)
 const dateFrom = ref<number>(yesterday)
 const dateTo = ref<number>(new Date().getTime())

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>