bfg-common 1.4.884 → 1.4.885

package/components/common/monitor/advanced/tools/chartOptionsModal/actions/Actions.vue

@@ -1,106 +1,106 @@
-<template>
-  <common-monitor-advanced-tools-chart-options-modal-actions-new
-    v-if="isNewView"
-    v-model:is-confirm-modal="isConfirmModal"
-    v-model:local-selected-chart-option="localSelectedChartOption"
-    :chart-options="chartOptions"
-    :is-disabled-delete-action="isDisabledDeleteAction"
-    @save-options="onSaveOptions"
-    @delete-action="onDeleteAction"
-    @apply-delete="onApplyDelete"
-  />
-  <common-monitor-advanced-tools-chart-options-modal-actions-old
-    v-else
-    v-model:is-confirm-modal="isConfirmModal"
-    v-model:local-selected-chart-option="localSelectedChartOption"
-    :chart-options="chartOptions"
-    :is-show-save-options-modal="isShowSaveOptionsModal"
-    :is-disabled-delete-action="isDisabledDeleteAction"
-    @show-save-options-modal="onShowSaveOptionsModal"
-    @hide-save-options-modal="onHideSaveOptionsModal"
-    @save-options="onSaveOptions"
-    @delete-action="onDeleteAction"
-    @apply-delete="onApplyDelete"
-  />
-</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 { chartOptionItems } from '~/components/common/monitor/advanced/tools/chartOptionsModal/actions/lib/utils/optionsActions'
-
-const props = defineProps<{
-  isDisabledSave: boolean
-  optionsNames: string[]
-  selectedChartOptionName: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'save', value: string): void
-  (event: 'check-validation'): void
-  (event: 'select-local-option-name', value: string): void
-  (event: 'delete-chart-name', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const localSelectedChartOption = ref<string>('select_options')
-const isDisabledDeleteAction = computed<boolean>(() => {
-  const chartOptionName = localSelectedChartOption.value
-  let result = false
-
-  if (chartOptionName !== 'select_options' && chartOptionName !== 'default')
-    result = true
-
-  return result
-})
-const chartOptions = computed<UI_I_OptionItem[]>(() =>
-  chartOptionItems(localization.value, props.optionsNames)
-)
-watch(
-  () => props.selectedChartOptionName,
-  (newValue) => {
-    localSelectedChartOption.value =
-      newValue || localSelectedChartOption.value || 'select_options'
-  },
-  { immediate: true }
-)
-watch(
-  localSelectedChartOption,
-  (newValue) => {
-    emits('select-local-option-name', newValue)
-  },
-  { immediate: true }
-)
-
-const isShowSaveOptionsModal = ref<boolean>(false)
-const onShowSaveOptionsModal = (): void => {
-  if (!props.isDisabledSave) isShowSaveOptionsModal.value = true
-
-  emits('check-validation')
-}
-const onHideSaveOptionsModal = (): boolean =>
-  (isShowSaveOptionsModal.value = false)
-const onSaveOptions = (name: string): void => {
-  onHideSaveOptionsModal()
-  emits('save', name)
-}
-
-const isConfirmModal = ref<boolean>(false)
-
-const onDeleteAction = (): void => {
-  isConfirmModal.value = true
-}
-
-const onApplyDelete = (): void => {
-  isConfirmModal.value = false
-  emits('delete-chart-name', localSelectedChartOption.value)
-  localSelectedChartOption.value = 'select_options'
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-monitor-advanced-tools-chart-options-modal-actions-new
+    v-if="isNewView"
+    v-model:is-confirm-modal="isConfirmModal"
+    v-model:local-selected-chart-option="localSelectedChartOption"
+    :chart-options="chartOptions"
+    :is-disabled-delete-action="isDisabledDeleteAction"
+    @save-options="onSaveOptions"
+    @delete-action="onDeleteAction"
+    @apply-delete="onApplyDelete"
+  />
+  <common-monitor-advanced-tools-chart-options-modal-actions-old
+    v-else
+    v-model:is-confirm-modal="isConfirmModal"
+    v-model:local-selected-chart-option="localSelectedChartOption"
+    :chart-options="chartOptions"
+    :is-show-save-options-modal="isShowSaveOptionsModal"
+    :is-disabled-delete-action="isDisabledDeleteAction"
+    @show-save-options-modal="onShowSaveOptionsModal"
+    @hide-save-options-modal="onHideSaveOptionsModal"
+    @save-options="onSaveOptions"
+    @delete-action="onDeleteAction"
+    @apply-delete="onApplyDelete"
+  />
+</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 { chartOptionItems } from '~/components/common/monitor/advanced/tools/chartOptionsModal/actions/lib/utils/optionsActions'
+
+const props = defineProps<{
+  isDisabledSave: boolean
+  optionsNames: string[]
+  selectedChartOptionName: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'save', value: string): void
+  (event: 'check-validation'): void
+  (event: 'select-local-option-name', value: string): void
+  (event: 'delete-chart-name', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const localSelectedChartOption = ref<string>('select_options')
+const isDisabledDeleteAction = computed<boolean>(() => {
+  const chartOptionName = localSelectedChartOption.value
+  let result = false
+
+  if (chartOptionName !== 'select_options' && chartOptionName !== 'default')
+    result = true
+
+  return result
+})
+const chartOptions = computed<UI_I_OptionItem[]>(() =>
+  chartOptionItems(localization.value, props.optionsNames, isNewView.value)
+)
+watch(
+  () => props.selectedChartOptionName,
+  (newValue) => {
+    localSelectedChartOption.value =
+      newValue || localSelectedChartOption.value || 'select_options'
+  },
+  { immediate: true }
+)
+watch(
+  localSelectedChartOption,
+  (newValue) => {
+    emits('select-local-option-name', newValue)
+  },
+  { immediate: true }
+)
+
+const isShowSaveOptionsModal = ref<boolean>(false)
+const onShowSaveOptionsModal = (): void => {
+  if (!props.isDisabledSave) isShowSaveOptionsModal.value = true
+
+  emits('check-validation')
+}
+const onHideSaveOptionsModal = (): boolean =>
+  (isShowSaveOptionsModal.value = false)
+const onSaveOptions = (name: string): void => {
+  onHideSaveOptionsModal()
+  emits('save', name)
+}
+
+const isConfirmModal = ref<boolean>(false)
+
+const onDeleteAction = (): void => {
+  isConfirmModal.value = true
+}
+
+const onApplyDelete = (): void => {
+  isConfirmModal.value = false
+  emits('delete-chart-name', localSelectedChartOption.value)
+  localSelectedChartOption.value = 'select_options'
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/monitor/advanced/tools/chartOptionsModal/actions/ActionsNew.vue

@@ -4,6 +4,7 @@
       v-model="localSelectedChartOptionLocal"
       :items="props.chartOptions"
       :label="localization.common.options"
+      :margin-between-trigger="4"
       select-width="100%"
       show-text
       test-id="chart-options-select"

package/components/common/monitor/advanced/tools/chartOptionsModal/actions/lib/utils/optionsActions.ts

@@ -1,25 +1,28 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-export const chartOptionItems = (
-  localization: UI_I_Localization,
-  names: string[]
-): UI_I_OptionItem[] => {
-  const mainOptionsNames = [
-    {
-      text: `--${localization.common.new}--`,
-      value: 'select_options',
-    },
-    {
-      text: localization.common.default,
-      value: 'default',
-    },
-  ]
-  names.forEach((name) => {
-    mainOptionsNames.push({
-      text: name,
-      value: name,
-    })
-  })
-  return mainOptionsNames
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+export const chartOptionItems = (
+  localization: UI_I_Localization,
+  names: string[],
+  isNewView: boolean
+): UI_I_OptionItem[] => {
+  const mainOptionsNames = [
+    {
+      text: isNewView
+        ? `--${localization.common.new}--`
+        : `--${localization.inventoryMonitor.selectOption}--`,
+      value: 'select_options',
+    },
+    {
+      text: localization.common.default,
+      value: 'default',
+    },
+  ]
+  names.forEach((name) => {
+    mainOptionsNames.push({
+      text: name,
+      value: name,
+    })
+  })
+  return mainOptionsNames
+}

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

@@ -1,224 +1,132 @@
-<template>
-  <common-monitor-overview-new
-    v-if="isNewView"
-    :charts="chartsLocal"
-    :all-data="allData"
-    :update-helper="updateHelper"
-  />
-  <common-monitor-overview-old
-    v-else
-    :charts="chartsLocal"
-    :all-data="allData"
-    :update-helper="updateHelper"
-  />
-</template>
-
-<script setup lang="ts">
-import { format } from 'date-fns'
-import type {
-  I_SeriesColumn,
-  I_SeriesLine,
-  I_ColumnGraph,
-  I_LineGraph,
-} from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
-import {
-  columnGraphDataFunc,
-  graphDataFunc,
-} from '~/node_modules/bfg-nuxt-3-graph/graph/lib/utils/renderGraph'
-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[]
-  themeMode?: string
-  formatDate?: string
-  formatTime?: string
-  graphType: string
-}>()
-
-const { $formattedDatetime, $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const allData = ref<UI_I_GraphDataSettingItem[]>([])
-
-const chartsLocal = ref<any>([])
-
-const getCurrentChart = (chart: any): void => {
-  chartsLocal.value = chart
-}
-
-const instanceOfSeriesLine = (
-  object: I_SeriesLine | I_SeriesColumn
-): object is I_SeriesLine => {
-  return 'lines' in object
-}
-
-const getCurrentData = (
-  chart: UI_I_GraphDataSettingItem,
-  chartType: string
-): I_LineGraph | I_ColumnGraph | null => {
-  if (!chart || !chart.data) return null
-
-  const themeMode = useLocalStorage('themeMode') || props.themeMode
-  const isDarkMode = themeMode === 'dark-theme'
-
-  let graphData = null
-
-  if (chartType === 'column' && !instanceOfSeriesLine(chart.data)) {
-    graphData = columnGraphDataFunc({
-      chart,
-      isDarkMode,
-      localization: localization.value,
-    })
-  } else if (instanceOfSeriesLine(chart.data)) {
-    graphData = graphDataFunc({
-      graphData: chart.data,
-      isDarkMode: isDarkMode,
-      localization: localization.value,
-      fullScreenCallBack: () => {},
-      disabledTitle: false,
-      disabledExportButton: true,
-      disabledLegends: true,
-      graphType: props.graphType,
-      width: 700,
-      chartCallBack: getCurrentChart,
-      formattedDatetime: $formattedDatetime,
-      format: format,
-      formatDate: props.formatDate,
-      timeFormat: props.formatTime,
-    })
-  }
-
-  return graphData
-}
-
-const updateHelper = ref<number>(0)
-
-const updateGraph = (charts: Array<UI_I_GraphDataSettingItem | null>): void => {
-  allData.value = []
-  charts.forEach((chart) => {
-    if (chart && chart.data) {
-      const constructedData = getCurrentData(chart, chart.chartType)
-      if (constructedData)
-        allData.value.push({
-          title: chart.title,
-          loader: chart.loader,
-          data: constructedData,
-          chartType: 'column',
-        })
-    } else {
-      allData.value.push({
-        title: '',
-        loader: chart.loader,
-        data: null,
-        chartType: 'column',
-      })
-    }
-  })
-  updateHelper.value++
-}
-
-watch(
-  () => props.charts,
-  (newValue) => {
-    updateGraph(newValue)
-  },
-  { deep: true, immediate: true }
-)
-</script>
-
-<style>
-:root {
-  --loader-bg-color: #ffffff;
-}
-:root.dark-theme {
-  --loader-bg-color: #22343c;
-}
-</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%;
-
-  .graphic-loader-block {
-    background-color: var(--loader-bg-color);
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .graph-empty-block {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    background-color: var(--loader-bg-color);
-
-    .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 {
-    box-sizing: border-box;
-    flex-grow: 1;
-    padding: 5px;
-    min-height: 300px;
-    height: 100%;
-    min-width: 300px;
-    width: 100%;
-    position: relative;
-
-    &:first-child:last-child {
-      height: 100%;
-      width: 100%;
-    }
-
-    &:first-child:nth-last-child(2),
-    &:nth-child(2):last-child {
-      width: 50%;
-      height: 100%;
-    }
-  }
-
-  .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>
+  <common-monitor-overview-new
+    v-if="isNewView"
+    :charts="chartsLocal"
+    :all-data="allData"
+    :update-helper="updateHelper"
+  />
+  <common-monitor-overview-old
+    v-else
+    :charts="chartsLocal"
+    :all-data="allData"
+    :update-helper="updateHelper"
+  />
+</template>
+
+<script setup lang="ts">
+import { format } from 'date-fns'
+import type {
+  I_SeriesColumn,
+  I_SeriesLine,
+  I_ColumnGraph,
+  I_LineGraph,
+} from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import {
+  columnGraphDataFunc,
+  graphDataFunc,
+} from '~/node_modules/bfg-nuxt-3-graph/graph/lib/utils/renderGraph'
+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[]
+  themeMode?: string
+  formatDate?: string
+  formatTime?: string
+  graphType: string
+}>()
+
+const { $formattedDatetime, $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const allData = ref<UI_I_GraphDataSettingItem[]>([])
+
+const chartsLocal = ref<any>([])
+
+const getCurrentChart = (chart: any): void => {
+  chartsLocal.value = chart
+}
+
+const instanceOfSeriesLine = (
+  object: I_SeriesLine | I_SeriesColumn
+): object is I_SeriesLine => {
+  return 'lines' in object
+}
+
+const getCurrentData = (
+  chart: UI_I_GraphDataSettingItem,
+  chartType: string
+): I_LineGraph | I_ColumnGraph | null => {
+  if (!chart || !chart.data) return null
+
+  const themeMode = useLocalStorage('themeMode') || props.themeMode
+  const isDarkMode = themeMode === 'dark-theme'
+
+  let graphData = null
+
+  if (chartType === 'column' && !instanceOfSeriesLine(chart.data)) {
+    graphData = columnGraphDataFunc({
+      chart,
+      isDarkMode,
+      localization: localization.value,
+    })
+  } else if (instanceOfSeriesLine(chart.data)) {
+    graphData = graphDataFunc({
+      graphData: chart.data,
+      isDarkMode: isDarkMode,
+      localization: localization.value,
+      fullScreenCallBack: () => {},
+      disabledTitle: false,
+      disabledExportButton: true,
+      disabledLegends: true,
+      graphType: props.graphType,
+      width: 700,
+      chartCallBack: getCurrentChart,
+      formattedDatetime: $formattedDatetime,
+      format: format,
+      formatDate: props.formatDate,
+      timeFormat: props.formatTime,
+    })
+  }
+
+  return graphData
+}
+
+const updateHelper = ref<number>(0)
+
+const updateGraph = (charts: Array<UI_I_GraphDataSettingItem | null>): void => {
+  allData.value = []
+  charts.forEach((chart) => {
+    if (chart && chart.data) {
+      const constructedData = getCurrentData(chart, chart.chartType)
+      if (constructedData)
+        allData.value.push({
+          title: chart.title,
+          loader: chart.loader,
+          data: constructedData,
+          chartType: 'column',
+        })
+    } else {
+      allData.value.push({
+        title: '',
+        loader: chart.loader,
+        data: null,
+        chartType: 'column',
+      })
+    }
+  })
+  updateHelper.value++
+}
+
+watch(
+  () => props.charts,
+  (newValue) => {
+    updateGraph(newValue)
+  },
+  { deep: true, immediate: true }
+)
+</script>
+
+<style scoped lang="scss"></style>