bfg-common 1.4.799 → 1.4.801

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

@@ -1,95 +1,95 @@
-<template>
-  <div class="timespan-objects-section-direction">
-    <common-chart-options-modal-counters-timespan-form
-      :language="props.language"
-      :selected-chart-type="props.selectedChartType"
-      :selected-timespan-type="props.selectedTimespanType"
-      :units-count="props.unitsCount"
-      :period-type="props.periodType"
-      :selected-custom-time="props.selectedCustomTime"
-      :custom-date-from="props.customDateFrom"
-      :custom-date-to="props.customDateTo"
-      :custom-time-from="props.customTimeFrom"
-      :custom-time-to="props.customTimeTo"
-      :valid-date-end="props.validDateEnd"
-      @update-chart-type="emits('update-chart-type', $event)"
-      @update-custom-time="emits('update-custom-time', $event)"
-      @update-timespan-type="emits('update-timespan-type', $event)"
-      @update-unit-count="emits('update-unit-count', $event)"
-      @update-period-type="emits('update-period-type', $event)"
-      @update-custom-date-from="emits('update-custom-date-from', $event)"
-      @update-custom-date-to="emits('update-custom-date-to', $event)"
-      @update-custom-time-from="emits('update-custom-time-from', $event)"
-      @update-custom-time-to="emits('update-custom-time-to', $event)"
-    />
-    <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
-      :type="props.type"
-      :chart="props.chart"
-      :total-cores="props.totalCores"
-      :host-id="props.hostId"
-      :selected-metrics-keys="props.selectedMetricsKeys"
-      :total-metric-items="props.totalMetricItems"
-      :selected-objects="props.selectedObjects"
-      :loading="props.objectsLoading"
-      :current-items="props.objectsData"
-      @select-objects="emits('select-objects', $event)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
-import type {
-  UI_T_ChartHost,
-  UI_T_ChartVm,
-} from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
-import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
-
-const props = defineProps<{
-  type: UI_T_AdvancedType
-  chart: UI_T_ChartHost | UI_T_ChartVm
-  language: string
-  selectedChartType: string
-  selectedTimespanType: string
-  unitsCount: number
-  periodType: string
-  selectedCustomTime: string
-  customDateFrom: string
-  customDateTo: string
-  customTimeFrom: string
-  customTimeTo: string
-  totalCores: number
-  hostId: string
-  selectedMetricsKeys: number[]
-  totalMetricItems: number
-  selectedObjects: string
-  objectsLoading: boolean
-  objectsData: UI_I_ObjectItem[]
-  validDateEnd: number
-}>()
-
-const emits = defineEmits<{
-  (event: 'update-chart-type', value: string): void
-  (event: 'update-custom-time', value: string): void
-  (event: 'update-timespan-type', value: string): void
-  (event: 'update-unit-count', value: number): void
-  (event: 'update-period-type', value: string): void
-  (event: 'update-custom-date-from', value: string): void
-  (event: 'update-custom-date-to', value: string): void
-  (event: 'update-custom-time-from', value: string): void
-  (event: 'update-custom-time-to', value: string): void
-  (event: 'select-objects', value: string): void
-}>()
-</script>
-
-<style scoped lang="scss">
-.timespan-objects-section-direction {
-  display: flex;
-  flex-direction: row;
-}
-@media (max-width: 1024px) {
-  .timespan-objects-section-direction {
-    flex-direction: column;
-  }
-}
-</style>
+<template>
+  <div class="timespan-objects-section-direction">
+    <common-chart-options-modal-counters-timespan-form
+      :language="props.language"
+      :selected-chart-type="props.selectedChartType"
+      :selected-timespan-type="props.selectedTimespanType"
+      :units-count="props.unitsCount"
+      :period-type="props.periodType"
+      :selected-custom-time="props.selectedCustomTime"
+      :custom-date-from="props.customDateFrom"
+      :custom-date-to="props.customDateTo"
+      :custom-time-from="props.customTimeFrom"
+      :custom-time-to="props.customTimeTo"
+      :valid-date-end="props.validDateEnd"
+      @update-chart-type="emits('update-chart-type', $event)"
+      @update-custom-time="emits('update-custom-time', $event)"
+      @update-timespan-type="emits('update-timespan-type', $event)"
+      @update-unit-count="emits('update-unit-count', $event)"
+      @update-period-type="emits('update-period-type', $event)"
+      @update-custom-date-from="emits('update-custom-date-from', $event)"
+      @update-custom-date-to="emits('update-custom-date-to', $event)"
+      @update-custom-time-from="emits('update-custom-time-from', $event)"
+      @update-custom-time-to="emits('update-custom-time-to', $event)"
+    />
+    <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
+      :type="props.type"
+      :chart="props.chart"
+      :total-cores="props.totalCores"
+      :host-id="props.hostId"
+      :selected-metrics-keys="props.selectedMetricsKeys"
+      :total-metric-items="props.totalMetricItems"
+      :selected-objects="props.selectedObjects"
+      :loading="props.objectsLoading"
+      :current-items="props.objectsData"
+      @select-objects="emits('select-objects', $event)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
+import type {
+  UI_T_ChartHost,
+  UI_T_ChartVm,
+} from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
+
+const props = defineProps<{
+  type: UI_T_AdvancedType
+  chart: UI_T_ChartHost | UI_T_ChartVm
+  language: string
+  selectedChartType: string
+  selectedTimespanType: string
+  unitsCount: number
+  periodType: string
+  selectedCustomTime: string
+  customDateFrom: string
+  customDateTo: string
+  customTimeFrom: string
+  customTimeTo: string
+  totalCores: number
+  hostId: string
+  selectedMetricsKeys: number[]
+  totalMetricItems: number
+  selectedObjects: string
+  objectsLoading: boolean
+  objectsData: UI_I_ObjectItem[]
+  validDateEnd: number
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
+  (event: 'update-custom-time', value: string): void
+  (event: 'update-timespan-type', value: string): void
+  (event: 'update-unit-count', value: number): void
+  (event: 'update-period-type', value: string): void
+  (event: 'update-custom-date-from', value: string): void
+  (event: 'update-custom-date-to', value: string): void
+  (event: 'update-custom-time-from', value: string): void
+  (event: 'update-custom-time-to', value: string): void
+  (event: 'select-objects', value: string): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.timespan-objects-section-direction {
+  display: flex;
+  flex-direction: row;
+}
+@media (max-width: 1024px) {
+  .timespan-objects-section-direction {
+    flex-direction: column;
+  }
+}
+</style>

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

@@ -1,31 +1,16 @@
 <template>
-  <div class="charts-view">
-    <div v-if="!allData.length" class="content-global-loading">
-      {{ localization.common.loading }}...
-    </div>
-    <template v-else>
-      <template v-for="(chartData, key) in 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="charts[key]"
-            :update="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>
+  <common-monitor-overview-new
+    v-if="isNewView"
+    :charts="props.charts"
+    :all-data="allData"
+    :update-helper="updateHelper"
+  />
+  <common-monitor-overview-old
+    v-else
+    :charts="props.charts"
+    :all-data="allData"
+    :update-helper="updateHelper"
+  />
 </template>
 
 <script setup lang="ts">
@@ -51,7 +36,8 @@ const props = defineProps<{
   graphType: string
 }>()
 
-const { $formattedDatetime } = useNuxtApp()
+const { $formattedDatetime, $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 

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

@@ -0,0 +1,138 @@
+<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%;
+  gap: 16px;
+
+  .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/monitor/overview/OverviewOld.vue

@@ -0,0 +1,137 @@
+<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/monitor/overview/filters/Filters.vue

@@ -1,64 +1,39 @@
 <template>
-  <div class="horizontal-flex-container overview-chart-title-bar">
-    <div class="horizontal-flex-container">
-      <label for="periodSelect" class="label-select"
-        >{{ localization.inventoryMonitor.period }}:</label
-      >
-      <div v-if="!disabledPeriodOptions" class="select">
-        <select
-          id="periodSelect"
-          v-model="selectedPeriod"
-          data-id="period-select"
-        >
-          <option
-            v-for="(item, index) in periodOptions"
-            :key="index"
-            :value="item.value"
-          >
-            {{ item.text }}
-          </option>
-        </select>
-      </div>
-      <span v-else class="single-option">{{ periodOptions[0].text }}</span>
-    </div>
-    <div v-show="isShowCustomIntervalButton">
-      <a
-        id="show-interval-modal-button"
-        data-id="show-interval-modal-button"
-        @click="onShowIntervalModal"
-        >{{ localization.inventoryMonitor.changeCustomInterval }}</a
-      >
-    </div>
-    <div v-if="!disabledPeriodOptions" class="chart-title">
-      {{ chartTitleDate }}
-    </div>
-    <div class="view-select-label horizontal-flex-container">
-      <label for="viewSelect" class="label-select"
-        >{{ localization.common.view }}:</label
-      >
-      <div class="select">
-        <select id="viewSelect" v-model="selectedView" data-id="view-select">
-          <option
-            v-for="(item, index) in viewOptions"
-            :key="index"
-            :value="item.value"
-          >
-            {{ item.text }}
-          </option>
-        </select>
-      </div>
-    </div>
-  </div>
-
-  <common-monitor-overview-filters-custom-interval-modal
-    v-if="props.validDateEnd"
-    v-show="isShowIntervalModal"
+  <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"
-    @hide="onHideIntervalModal"
-    @submit="onSubmitIntervalModal"
+    :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>
 
@@ -73,8 +48,8 @@ import {
 } from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
 import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $formattedDatetime } = useNuxtApp()
+const { $formattedDatetime, $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const props = defineProps<{
   startDate: number
@@ -93,6 +68,8 @@ const emits = defineEmits<{
   (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)
@@ -187,49 +164,4 @@ watch(
 </script>
 
 <style scoped lang="scss">
-.horizontal-flex-container {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  line-height: 20px;
-  flex-shrink: 0;
-  padding-top: 5px;
-
-  .select {
-    position: relative;
-
-    select {
-      height: 20px;
-      margin: 5px;
-      color: var(--global-font-color);
-    }
-  }
-  .single-option {
-    margin-left: 5px;
-  }
-
-  .chart-title {
-    color: var(--global-font-color);
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin: 6px;
-    font-weight: 700;
-    text-transform: uppercase;
-  }
-
-  #show-interval-modal-button {
-    cursor: pointer;
-    color: var(--dropdown-item-color);
-  }
-
-  .view-select-label {
-    margin-left: auto;
-    padding-right: 7px;
-    padding-left: 7px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    align-items: center;
-  }
-}
 </style>