bfg-common 1.6.111 → 1.6.113

package/components/common/monitor/advanced/Advanced.vue

@@ -1,6 +1,53 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-monitor-advanced-new
+    v-if="isNewView"
+    v-model:selected-timespan-type="localSelectedTimespanType"
+    :type="props.type"
+    :is-empty="props.isEmpty"
+    :advanced-loading="props.advancedLoading"
+    :data="props.data"
+    :export-graph-type="exportGraphType"
+    :table-data="props.tableData"
+    :language="props.language"
+    :dark-mode="props.darkMode"
+    :selected-counters-keys="props.selectedCountersKeys"
+    :selected-metric="props.selectedMetric"
+    :selected-chart-type="props.selectedChartType"
+    :units-count="props.unitsCount"
+    :period-type="props.periodType"
+    :selected-custom-time="props.selectedCustomTime"
+    :selected-chart-option-name="props.selectedChartOptionName"
+    :custom-date-from="props.customDateFrom"
+    :custom-date-to="props.customDateTo"
+    :custom-time-from="props.customTimeFrom"
+    :custom-time-to="props.customTimeTo"
+    :total-cores="totalCores"
+    :host-id="props.hostId"
+    :objects-loading="props.objectsLoading"
+    :objects-data="props.objectsData"
+    :valid-date-end="props.validDateEnd"
+    :format-date="props.formatDate"
+    :selected-table-row="selectedTableRow"
+    :selected-node-name="props.selectedNodeName"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
+    @update-tools="emits('update-tools', $event)"
+    @export-graph="onExporting"
+    @open-advanced-page="emits('open-advanced-page')"
+    @select-row="emits('select-row', $event)"
+    @select-metric-local="emits('select-metric-local', $event)"
+    @update-chart-type="emits('update-chart-type', $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-time="emits('update-custom-time', $event)"
+    @delete-option="emits('delete-option')"
+    @submit-options="emits('submit-options', $event)"
+    @selected-table-row="onSelectTableRow"
+  />
+  <common-monitor-advanced-old
+    v-else
     v-model:selected-timespan-type="localSelectedTimespanType"
     :type="props.type"
     :is-empty="props.isEmpty"
@@ -31,7 +78,6 @@
     :project="props.project"
     :power-data="props.powerData"
     :temperature-data="props.temperatureData"
-    :selected-node-name="props.selectedNodeName"
     @update-tools="emits('update-tools', $event)"
     @export-graph="onExporting"
     @open-advanced-page="emits('open-advanced-page')"
@@ -124,12 +170,6 @@ const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
 const localSelectedTimespanType = computed<string>({
   get() {
     return props.selectedTimespanType

package/components/common/monitor/advanced/graphView/GraphView.vue

@@ -1,7 +1,17 @@
 <template>
   <div ref="chartsView">
-    <component
-      :is="currentComponent"
+    <common-monitor-advanced-graph-view-new
+      v-if="isNewView"
+      :loading="props.loading"
+      :is-loading="isLoading"
+      :chart-data="chartData"
+      :chart="chart"
+      :chart-helper="chartHelper"
+      :export-type="props.export"
+      :selected-row="props.selectedRow"
+    />
+    <common-monitor-advanced-graph-view-old
+      v-else
       :loading="props.loading"
       :is-loading="isLoading"
       :chart-data="chartData"
@@ -41,12 +51,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
 const isLoading = ref<boolean>(true)
 
 const chartData = ref<I_LineGraph | null>(null)

package/components/common/monitor/advanced/graphView/{New.vue → GraphViewNew.vue}

@@ -1,6 +1,6 @@
 <template>
   <div :class="['advanced-graph-container', { loading: props.isLoading }]">
-    <common-graph-new-empty-block v-if="!props.loading && !props.chartData" />
+    <common-graph-graph-new-empty-block v-if="!props.loading && !props.chartData" />
     <ui-skeleton-long-metric
       v-if="props.isLoading && props.loading"
       height="336px"

package/components/common/monitor/advanced/table/Table.vue

@@ -1,8 +1,13 @@
 <template>
-  <component
-    :is="currentComponent"
-    :data="props.data"
+  <common-monitor-advanced-table-table-new
+    v-if="isNewView"
     :loading="props.loading"
+    :items="props.data"
+    @select="emits('select', $event)"
+  />
+  <common-monitor-advanced-table-table-old
+    v-else
+    :data="props.data"
     @select="emits('select', $event)"
   />
 </template>
@@ -21,12 +26,6 @@ const emits = defineEmits<{
 const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./new/New.vue'))
-    : defineAsyncComponent(() => import('./old/Old.vue'))
-)
 </script>
 
 <style scoped lang="scss"></style>

package/components/common/monitor/advanced/table/{new/New.vue → tableNew/TableNew.vue}

@@ -37,22 +37,21 @@ import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/
 import {
   bodyOptions,
   headOptions,
-} from '~/components/common/monitor/advanced/table/new/lib/config/options'
+} from '~/components/common/monitor/advanced/table/tableNew/lib/config/options'
 import { tableTextsFunc } from '~/lib/config/uiTable'
 
+const localization = computed<UI_I_Localization>(() => useLocal())
+
 const props = defineProps<{
   loading: boolean
-  data: UI_I_PerformanceItem[]
+  items: UI_I_PerformanceItem[]
 }>()
-
 const emits = defineEmits<{
   (event: 'select', value: number[]): void
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 const data = computed<UI_I_DataTable>(() =>
-  bodyOptions(localization.value, props.data)
+  bodyOptions(localization.value, props.items)
 )
 
 const options = computed<UI_I_DataTableOptions>(() => headOptions())

package/components/common/monitor/advanced/table/{new → tableNew}/lib/config/options.ts

@@ -2,7 +2,7 @@ import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/data
 import type { UI_I_DataTableOptions } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/lib/models/interfaces'
-import { constructUsersAndGroupsTableItems } from '~/components/common/monitor/advanced/table/new/lib/utils/constructBody'
+import { constructUsersAndGroupsTableItems } from '~/components/common/monitor/advanced/table/tableNew/lib/utils/constructBody'
 
 export const bodyOptions = (
   localization: UI_I_Localization,

package/components/common/monitor/advanced/table/{old/Old.vue → tableOld/TableOld.vue}

@@ -13,7 +13,6 @@
         :body-items="dataBody"
         :total-items="dataBody.length"
         :total-pages="1"
-        :loading="props.loading"
         type="checkbox"
         class="data-table"
         test-id="advances-table"
@@ -38,19 +37,17 @@ import type {
   UI_I_ColumnKey,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/lib/models/interfaces'
-import * as table from '~/components/common/monitor/advanced/table/old/lib/config/performanceDatatable'
+import * as table from '~/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
 
 const props = defineProps<{
   data: UI_I_PerformanceItem[]
-  loading: boolean
 }>()
-
 const emits = defineEmits<{
   (event: 'select', value: number[]): void
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 const selectedRow = ref<number[]>([])
 const pageSize = ref<number>(100)
 const page = ref<number>(1)

package/components/common/monitor/advanced/tools/Tools.vue

@@ -1,6 +1,6 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-monitor-advanced-tools-new
+    v-if="isNewView"
     v-model:selected-view="selectedView"
     v-model:is-show-modal-local="isShowModal"
     v-model:selected-period="selectedPeriod"
@@ -12,6 +12,7 @@
     :selected-metric="props.selectedMetric"
     :disabled-period="props.disabledPeriod"
     :disabled-view="props.disabledView"
+    :selected-chart-type="props.selectedChartType"
     :units-count="props.unitsCount"
     :period-type="props.periodType"
     :selected-custom-time="props.selectedCustomTime"
@@ -29,17 +30,62 @@
     :format-date="props.formatDate"
     :view-options="viewOptions"
     :period-options="periodOptions"
+    :selected-node-name="props.selectedNodeName"
     :power-data="props.powerData"
     :temperature-data="props.temperatureData"
-    :selected-chart-type="props.selectedChartType"
-    :selected-node-name="props.selectedNodeName"
+    @save-option-name="onSaveOptionName"
+    @change-period="updateTools"
+    @change-view="updateTools"
+    @select-row="emits('select-row', $event)"
+    @select-metric-local="emits('select-metric-local', $event)"
+    @update-chart-type="emits('update-chart-type', $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-time="emits('update-custom-time', $event)"
+    @delete-option="onDeleteOption"
+    @submit-options="emits('submit-options', $event)"
+  />
+  <common-monitor-advanced-tools-old
+    v-else
+    v-model:selected-view="selectedView"
+    v-model:is-show-modal-local="isShowModal"
+    v-model:selected-period="selectedPeriod"
+    :selected-timespan-type="localSelectedTimespanType"
+    :type="props.type"
     :chart-title="props.chartTitle"
+    :chart-title-date="chartTitleDate"
+    :language="props.language"
+    :selected-counters-keys="props.selectedCountersKeys"
+    :selected-metric="props.selectedMetric"
+    :disabled-period="props.disabledPeriod"
+    :disabled-view="props.disabledView"
+    :selected-chart-type="props.selectedChartType"
+    :units-count="props.unitsCount"
+    :period-type="props.periodType"
+    :selected-custom-time="props.selectedCustomTime"
+    :selected-chart-option-name="props.selectedChartOptionName"
+    :custom-date-from="props.customDateFrom"
+    :custom-date-to="props.customDateTo"
+    :custom-time-from="props.customTimeFrom"
+    :custom-time-to="props.customTimeTo"
+    :total-cores="totalCores"
+    :host-id="props.hostId"
+    :project="props.project"
+    :objects-loading="props.objectsLoading"
+    :objects-data="props.objectsData"
+    :valid-date-end="props.validDateEnd"
+    :format-date="props.formatDate"
+    :view-options="viewOptions"
+    :period-options="periodOptions"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @save-option-name="onSaveOptionName"
     @change-period="updateTools"
     @change-view="updateTools"
     @exporting="emits('exporting', $event)"
-    @select-row="emits('select-row', $event)"
     @open-advanced-page="emits('open-advanced-page')"
+    @select-row="emits('select-row', $event)"
     @select-metric-local="emits('select-metric-local', $event)"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-timespan-type="emits('update-timespan-type', $event)"
@@ -132,13 +178,9 @@ const { $store, $formattedDatetime }: any = useNuxtApp()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const routeType = '' + useRoute().params.type
 
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const updateTimeFormatAndInterfaceLang = computed<number>(
   () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']

package/components/common/monitor/advanced/tools/{New.vue → ToolsNew.vue}

@@ -132,13 +132,11 @@ const props = withDefaults(
     temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
-    chartTitle?: string // For Console Warning
     selectedNodeName?: string
   }>(),
   {
     disabledPeriod: undefined,
     disabledView: undefined,
-    chartTitle: undefined,
     selectedNodeName: undefined,
   }
 )
@@ -151,8 +149,6 @@ const emits = defineEmits<{
   (event: 'save-option-name'): void
   (event: 'change-period'): void
   (event: 'change-view'): void
-  (event: 'exporting', value: string): void // For Console Warning
-  (event: 'open-advanced-page'): void // For Console Warning
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric-local', value: string): void
   (event: 'update-chart-type', value: string): void

package/components/common/monitor/advanced/tools/{Old.vue → ToolsOld.vue}

@@ -179,12 +179,10 @@ const props = withDefaults(
     temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
-    selectedNodeName?: string // For Console Warning
   }>(),
   {
     disabledPeriod: undefined,
     disabledView: undefined,
-    selectedNodeName: undefined,
   }
 )