bfg-common 1.5.23 → 1.5.24

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

@@ -88,6 +88,7 @@ const getCurrentData = (
       format: format,
       formatDate: props.formatDate,
       timeFormat: props.formatTime,
+      isNewView: isNewView.value,
     })
   }
 

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

@@ -0,0 +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 scoped lang="scss"></style>

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

@@ -1,139 +1,139 @@
-<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">
-            <div class="spinner"></div>
-            <p>{{ localization.inventoryMonitor.retrievingData }}...</p>
-          </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 {
-  --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>
+  <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">
+            <div class="spinner"></div>
+            <p>{{ localization.inventoryMonitor.retrievingData }}...</p>
+          </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 {
+  --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>

package/components/common/pages/home/StatusContent.vue

@@ -1,49 +1,49 @@
-<template>
-  <div class="entity-status-content">
-    <div v-for="(text, value) in props.items" :key="value" class="item">
-      <h3 class="entity-status-item-value">
-        {{ text }}
-      </h3>
-      <div class="entity-status-item-status">
-        {{ localization.common[value] }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
-
-const props = defineProps<{
-  items: UI_I_Hosts
-}>()
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-.entity-status-content {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  min-height: 100px;
-
-  .item {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: inherit;
-    background-color: inherit;
-
-    .entity-status-item-value {
-      font-size: 22px;
-      font-weight: 200;
-    }
-    .entity-status-item-status {
-      font-size: 13px;
-      margin-top: 5px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="entity-status-content">
+    <div v-for="(text, value) in props.items" :key="value" class="item">
+      <h3 class="entity-status-item-value">
+        {{ text }}
+      </h3>
+      <div class="entity-status-item-status">
+        {{ localization.common[value] }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
+
+const props = defineProps<{
+  items: UI_I_Hosts
+}>()
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.entity-status-content {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  min-height: 100px;
+
+  .item {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: inherit;
+    background-color: inherit;
+
+    .entity-status-item-value {
+      font-size: 22px;
+      font-weight: 200;
+    }
+    .entity-status-item-status {
+      font-size: 13px;
+      margin-top: 5px;
+    }
+  }
+}
+</style>

package/components/common/pages/home/headline/Headline.vue

@@ -1,45 +1,45 @@
-<template>
-  <div class="home-headline">
-    <common-pages-home-headline-new
-      v-if="isNewView"
-      v-model="selectedZone"
-      :data="zoneOptionList"
-      :project="props.project"
-    />
-
-    <common-pages-home-headline-old
-      v-else
-      v-model="selectedZone"
-      :data="zoneOptionList"
-      :project="props.project"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_ZoneList } from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-const selectedZone = defineModel<string>('selectedZone', { required: true })
-
-const props = defineProps<{
-  zoneList: UI_I_ZoneList[]
-  project: UI_T_Project
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const zoneOptionList = computed<UI_I_ZoneList[]>(() => props.zoneList)
-</script>
-
-<style lang="scss">
-:root {
-  --home-title-color: #4d5d69;
-}
-
-:root.dark-theme {
-  --home-title-color: #e9eaec;
-}
-</style>
+<template>
+  <div class="home-headline">
+    <common-pages-home-headline-new
+      v-if="isNewView"
+      v-model="selectedZone"
+      :data="zoneOptionList"
+      :project="props.project"
+    />
+
+    <common-pages-home-headline-old
+      v-else
+      v-model="selectedZone"
+      :data="zoneOptionList"
+      :project="props.project"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_ZoneList } from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+const selectedZone = defineModel<string>('selectedZone', { required: true })
+
+const props = defineProps<{
+  zoneList: UI_I_ZoneList[]
+  project: UI_T_Project
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const zoneOptionList = computed<UI_I_ZoneList[]>(() => props.zoneList)
+</script>
+
+<style lang="scss">
+:root {
+  --home-title-color: #4d5d69;
+}
+
+:root.dark-theme {
+  --home-title-color: #e9eaec;
+}
+</style>