bfg-common 1.6.112 → 1.6.113

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

@@ -1,6 +1,6 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-monitor-advanced-tools-chart-options-modal-counters-timespan-new
+    v-if="isNewView"
     :type="props.type"
     :chart="props.chart"
     :language="props.language"
@@ -20,12 +20,45 @@
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
-    :current-selected-objects="props.currentSelectedObjects"
     :error-last-input="props.errorLastInput"
     :error-date-from="props.errorDateFrom"
     :error-time-from="props.errorTimeFrom"
     :error-date-to="props.errorDateTo"
     :error-time-to="props.errorTimeTo"
+    :current-selected-objects="props.currentSelectedObjects"
+    @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)"
+    @select-objects="emits('select-objects', $event)"
+  />
+  <common-monitor-advanced-tools-chart-options-modal-counters-timespan-old
+    v-else
+    :type="props.type"
+    :chart="props.chart"
+    :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"
+    :total-cores="props.totalCores"
+    :host-id="props.hostId"
+    :selected-metrics-keys="props.selectedMetricsKeys"
+    :total-metric-items="props.totalMetricItems"
+    :objects-loading="props.objectsLoading"
+    :objects-data="props.objectsData"
+    :valid-date-end="props.validDateEnd"
+    :current-selected-objects="props.currentSelectedObjects"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
     @update-timespan-type="emits('update-timespan-type', $event)"
@@ -100,12 +133,6 @@ const emits = defineEmits<{
 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'))
-)
 </script>
 
 <style scoped lang="scss"></style>

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

@@ -1,6 +1,13 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object-object-new
+    v-if="isNewView"
+    v-model:selected-row="selectedRow"
+    :table-type="tableType"
+    :loading="props.loading"
+    :body-items="bodyItems"
+  />
+  <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object-object-old
+    v-else
     v-model:selected-row="selectedRow"
     v-model:column-items="columnItems"
     v-model:pagination="pagination"
@@ -49,12 +56,6 @@ 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'))
-)
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const tableType = computed<UI_T_DataGridType>(() => {

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{new/New.vue → objectNew/ObjectNew.vue}

@@ -22,8 +22,8 @@ import type {
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_DataGridType } from '~/components/atoms/table/dataGrid/lib/models/types'
 import type { UI_I_BodyItem } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import { options } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/config/options'
-import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/config/tableData'
+import { options } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/config/options'
+import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/config/tableData'
 
 const selectedRowLocal = defineModel<number[] | number>('selectedRow', {
   required: true,

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{new → objectNew}/lib/config/tableData.ts

@@ -1,7 +1,7 @@
 import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_BodyItem } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/utils/constructTable'
+import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/utils/constructTable'
 
 export const tableDataFunc = (
   localization: UI_I_Localization,

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{old/Old.vue → objectOld/ObjectOld.vue}

@@ -20,7 +20,8 @@
           class="data-table"
           hide-footer
           server-off
-        />
+        >
+        </atoms-table-data-grid>
       </div>
     </div>
   </div>

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/Metrics.vue

@@ -1,6 +1,11 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-monitor-advanced-tools-chart-options-modal-metrics-new
+    v-if="isNewView"
+    v-model:selected-metric="selectedMetricLocal"
+    :metrics-items="props.metricsItems"
+  />
+  <common-monitor-advanced-tools-chart-options-modal-metrics-old
+    v-else
     v-model:selected-metric="selectedMetricLocal"
     :metrics-items="props.metricsItems"
   />
@@ -20,12 +25,6 @@ const props = defineProps<{
 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'))
-)
 </script>
 
 <style scoped lang="scss"></style>

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

@@ -12,7 +12,7 @@
           :chart="props.charts[key]"
           :update="props.updateHelper"
         />
-        <common-graph-new-empty-block v-else />
+        <common-graph-graph-new-empty-block v-else />
       </div>
     </template>
   </div>

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

@@ -6,7 +6,7 @@
     <template v-else>
       <template
         v-for="(chartData, key) in props.allData"
-        :key="chartData.title || key"
+        :key="chartData.title"
       >
         <div :class="['chart-container', `graph-${chartData.title}`]">
           <div v-if="chartData.loader" class="graphic-loader-block">

package/components/common/monitor/overview/filters/FiltersNew.vue

@@ -78,7 +78,6 @@
     :current-lang="props.currentLang"
     :valid-date-end="props.validDateEnd"
     :selected-node-name="props.selectedNodeName"
-    format-date=""
     @hide="onHideIntervalModal"
     @submit="onSubmitIntervalModal"
   />

package/components/common/monitor/overview/filters/FiltersOld.vue

@@ -59,7 +59,6 @@
     :current-lang="props.currentLang"
     :valid-date-end="props.validDateEnd"
     :selected-node-name="props.selectedNodeName"
-    format-date=""
     @hide="onHideIntervalModal"
     @submit="onSubmitIntervalModal"
   />

package/components/common/pages/hardwareHealth/historyTestimony/GraphNew.vue

@@ -45,7 +45,7 @@
         { loading: props.powerLoading },
       ]"
     >
-      <common-graph-new-empty-block
+      <common-graph-graph-new-empty-block
         v-if="!props.powerData && !props.powerLoading"
       />
       <ui-skeleton-long-metric v-if="props.powerLoading" height="336px" />
@@ -65,7 +65,7 @@
         { loading: props.temperatureLoading },
       ]"
     >
-      <common-graph-new-empty-block
+      <common-graph-graph-new-empty-block
         v-if="!props.temperatureData && !props.temperatureLoading"
       />
       <ui-skeleton-long-metric v-if="props.temperatureLoading" height="336px" />

package/lib/models/interfaces.ts

@@ -43,7 +43,6 @@ export interface UI_I_Localization {
   license: UI_I_ArbitraryObject<string>
   events: UI_I_ArbitraryObject<string>
   zabbix: UI_I_ArbitraryObject<string>
-  monq: UI_I_ArbitraryObject<string>
   glpi: UI_I_ArbitraryObject<string>
   remoteConsole: UI_I_ArbitraryObject<string>
   vmWizard: UI_I_ArbitraryObject<string>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.6.112",
+  "version": "1.6.113",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",