bfg-common 1.6.95 → 1.6.97

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModalNew.vue

@@ -1,83 +1,94 @@
 <template>
-  <ui-modal
-    :subtitle="props.selectedNodeName"
-    :texts="modalTexts"
-    test-id="chart-options-modal"
-    width="1120px"
-    show
-    @hide="emits('hide-main-modal')"
-    @submit="emits('submit-main-modal')"
-  >
-    <template #headerContent>
-      {{ localization.inventoryMonitor.chartOptions }}
-    </template>
-    <template #content>
-      <div class="chart-options-modal">
-        <common-monitor-advanced-tools-chart-options-modal-notification
-          v-show="props.isShowAlerts"
-          :alerts="props.alerts"
-          @remove="emits('remove-alerts')"
-        />
-
-        <common-monitor-advanced-tools-chart-options-modal-actions
-          :is-disabled-save="!selectedRowsLocal.length"
-          :options-names="props.optionsNames"
-          :selected-chart-option-name="props.localSelectedChartOptionName"
-          @save="emits('save-options', $event)"
-          @check-validation="emits('check-validations')"
-          @select-local-option-name="emits('select-local-option-name', $event)"
-          @delete-chart-name="emits('delete-chart-name', $event)"
-        />
-
-        <p class="title-details">{{ localization.common.details }}</p>
-        <div class="bottom-container">
-          <common-monitor-advanced-tools-chart-options-modal-metrics
-            v-model:selected-metric="localSelectedMetricLocal"
-            :metrics-items="props.metricsItems"
+  <div class="advanced-modal">
+    <ui-modal
+      :subtitle="props.selectedNodeName"
+      :texts="modalTexts"
+      test-id="chart-options-modal"
+      width="1120px"
+      show
+      @hide="emits('hide-main-modal')"
+      @submit="emits('submit-main-modal')"
+    >
+      <template #headerContent>
+        {{ localization.inventoryMonitor.chartOptions }}
+      </template>
+      <template #content>
+        <div class="chart-options-modal">
+          <common-monitor-advanced-tools-chart-options-modal-notification
+            v-show="props.isShowAlerts"
+            :alerts="props.alerts"
+            @remove="emits('remove-alerts')"
           />
-          <common-monitor-advanced-tools-chart-options-modal-counters
-            :chart="localSelectedMetricLocal"
-            :language="props.language"
-            :type="props.type"
-            :selected-keys="props.localSelectedCountersKeys"
-            :selected-chart-type="props.localSelectedChartType"
-            :selected-timespan-type="props.localSelectedTimespanType"
-            :units-count="props.localUnitsCount"
-            :period-type="localPeriodTypeLocal"
-            :selected-custom-time="customTimeLocal"
-            :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"
-            :selected-objects="props.selectedObjects"
-            :objects-loading="props.objectsLoading"
-            :objects-data="props.objectsData"
-            :valid-date-end="props.validDateEnd"
-            :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"
-            @select-row="selectedRowsLocal = $event"
-            @update-chart-type="localSelectedChartTypeLocal = $event"
-            @update-custom-time="customTimeLocal = $event"
-            @update-timespan-type="timespanTypeLocal = $event"
-            @update-unit-count="unitCountLocal = $event"
-            @update-period-type="localPeriodTypeLocal = $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('local-selected-objects', $event)"
+
+          <common-monitor-advanced-tools-chart-options-modal-actions
+            :is-disabled-save="!selectedRowsLocal.length"
+            :options-names="props.optionsNames"
+            :selected-chart-option-name="props.localSelectedChartOptionName"
+            @save="emits('save-options', $event)"
+            @check-validation="emits('check-validations')"
+            @select-local-option-name="
+              emits('select-local-option-name', $event)
+            "
+            @delete-chart-name="emits('delete-chart-name', $event)"
           />
+
+          <p class="title-details">{{ localization.common.details }}</p>
+          <div class="bottom-container">
+            <common-monitor-advanced-tools-chart-options-modal-metrics
+              v-model:selected-metric="localSelectedMetricLocal"
+              :metrics-items="props.metricsItems"
+            />
+            <common-monitor-advanced-tools-chart-options-modal-counters
+              :chart="localSelectedMetricLocal"
+              :language="props.language"
+              :type="props.type"
+              :selected-keys="props.localSelectedCountersKeys"
+              :selected-chart-type="props.localSelectedChartType"
+              :selected-timespan-type="props.localSelectedTimespanType"
+              :units-count="props.localUnitsCount"
+              :period-type="localPeriodTypeLocal"
+              :selected-custom-time="customTimeLocal"
+              :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"
+              :objects-loading="props.objectsLoading"
+              :objects-data="props.objectsData"
+              :valid-date-end="props.validDateEnd"
+              :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"
+              :project="props.project"
+              :power-data="props.powerData"
+              :temperature-data="props.temperatureData"
+              :current-selected-objects="props.currentSelectedObjects"
+              @select-row="selectedRowsLocal = $event"
+              @update-chart-type="localSelectedChartTypeLocal = $event"
+              @update-custom-time="customTimeLocal = $event"
+              @update-timespan-type="timespanTypeLocal = $event"
+              @update-unit-count="unitCountLocal = $event"
+              @update-period-type="localPeriodTypeLocal = $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('local-selected-objects', $event)"
+            />
+          </div>
         </div>
-      </div>
-    </template>
-    <template #footerLeftContent><span></span></template>
-  </ui-modal>
+      </template>
+      <template #footerLeftContent><span></span></template>
+    </ui-modal>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -91,6 +102,7 @@ import type {
   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'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const props = withDefaults(
   defineProps<{
@@ -104,7 +116,6 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
@@ -117,6 +128,10 @@ const props = withDefaults(
     localSelectedTimespanType: string
     localUnitsCount: number
     selectedMetricsKeys: number[]
+    project: UI_T_Project
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
+    currentSelectedObjects: string
     selectedNodeName?: string
     errorLastInput?: string
     errorDateFrom?: string
@@ -185,20 +200,24 @@ const modalTexts = ref<UI_I_ModalTexts>({
 </script>
 
 <style scoped lang="scss">
+:deep(.modal-body) {
+  max-height: 100%;
+}
+
 .chart-options-modal {
-  margin: 16px 2px 16px 32px;
+  margin: 16px 2px 11px 32px;
 
   .title-details {
     font-weight: 500;
     font-size: 16px;
     color: var(--chart-options-details-title-color);
     margin-top: 24px;
-    margin-bottom: 16px;
+    margin-bottom: 10px;
   }
+
   .bottom-container {
     display: grid;
     grid-template-columns: 216px 1fr;
-    grid-gap: 12px;
     height: 320px;
   }
 }

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModalOld.vue

@@ -49,10 +49,13 @@
               :total-cores="props.totalCores"
               :host-id="props.hostId"
               :selected-metrics-keys="props.selectedMetricsKeys"
-              :selected-objects="props.selectedObjects"
               :objects-loading="props.objectsLoading"
               :objects-data="props.objectsData"
               :valid-date-end="props.validDateEnd"
+              :project="props.project"
+              :power-data="props.powerData"
+              :temperature-data="props.temperatureData"
+              :current-selected-objects="props.currentSelectedObjects"
               @select-row="selectedRowsLocal = $event"
               @update-chart-type="localSelectedChartTypeLocal = $event"
               @update-custom-time="customTimeLocal = $event"
@@ -86,6 +89,7 @@ import type {
   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'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const props = defineProps<{
   type: UI_T_AdvancedType
@@ -98,7 +102,6 @@ const props = defineProps<{
   customTimeTo: string
   totalCores: number
   hostId: string
-  selectedObjects: string
   objectsLoading: boolean
   objectsData: UI_I_ObjectItem[]
   validDateEnd: number
@@ -111,6 +114,10 @@ const props = defineProps<{
   localSelectedTimespanType: string
   localUnitsCount: number
   selectedMetricsKeys: number[]
+  project: UI_T_Project
+  powerData: UI_I_AdvancedCounterItem[]
+  temperatureData: UI_I_AdvancedCounterItem[]
+  currentSelectedObjects: string
 }>()
 
 const selectedRowsLocal = defineModel<UI_I_AdvancedCounterItem[]>(

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

@@ -39,7 +39,7 @@
         data-id="chart-options-delete-button"
         @click="emits('delete-action')"
       >
-        {{ localization.inventoryMonitor.deleteOptions }}
+        {{ localization.inventoryMonitor.deleteOptionSettings }}
       </button>
     </div>
   </div>

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

@@ -10,7 +10,7 @@ export const chartOptionItems = (
     {
       text: isNewView
         ? `--${localization.common.new}--`
-        : `--${localization.inventoryMonitor.selectOption}--`,
+        : `--${localization.inventoryMonitor.chooseSettings}--`,
       value: 'select_options',
     },
     {
@@ -21,7 +21,7 @@ export const chartOptionItems = (
   names.forEach((name) => {
     let currentText = name
     if (name === 'custom') {
-      currentText = localization.common.custom
+      currentText = localization.inventoryMonitor.custom
     }
     mainOptionsNames.push({
       text: currentText,

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue

@@ -18,7 +18,6 @@
     :total-cores="props.totalCores"
     :host-id="props.hostId"
     :selected-metrics-keys="props.selectedMetricsKeys"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
@@ -27,6 +26,10 @@
     :error-time-from="props.errorTimeFrom"
     :error-date-to="props.errorDateTo"
     :error-time-to="props.errorTimeTo"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
+    :current-selected-objects="props.currentSelectedObjects"
     @select-row="emits('select-row', $event)"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
@@ -58,10 +61,13 @@
     :total-cores="props.totalCores"
     :host-id="props.hostId"
     :selected-metrics-keys="props.selectedMetricsKeys"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
+    :current-selected-objects="props.currentSelectedObjects"
     @select-row="emits('select-row', $event)"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
@@ -84,6 +90,7 @@ import type {
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
 import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const props = withDefaults(
   defineProps<{
@@ -103,10 +110,13 @@ const props = withDefaults(
     totalCores: number
     hostId: string
     selectedMetricsKeys: number[]
-    selectedObjects: string
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
+    project: UI_T_Project
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
+    currentSelectedObjects: string
     errorLastInput?: string
     errorDateFrom?: string
     errorTimeFrom?: string

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersNew.vue

@@ -1,7 +1,10 @@
 <template>
   <div
     ref="chartOptionsBottomBlock"
-    class="chart-options-bottom-right-container"
+    :class="[
+      'chart-options-bottom-right-container',
+      { 'is-scrolled': isScrolledBlock },
+    ]"
   >
     <div v-show="isScrolledBlock" class="border-block"></div>
     <common-monitor-advanced-tools-chart-options-modal-counters-table
@@ -9,6 +12,9 @@
       :type="props.type"
       :selected-keys="props.selectedKeys"
       :total-cores="props.totalCores"
+      :project="props.project"
+      :power-data="props.powerData"
+      :temperature-data="props.temperatureData"
       @select-row="emits('select-row', $event)"
       @total-items="totalMetricItemsLocal = $event"
     />
@@ -29,7 +35,6 @@
       :host-id="props.hostId"
       :selected-metrics-keys="props.selectedMetricsKeys"
       :total-metric-items="totalMetricItemsLocal"
-      :selected-objects="props.selectedObjects"
       :objects-loading="props.objectsLoading"
       :objects-data="props.objectsData"
       :valid-date-end="props.validDateEnd"
@@ -38,6 +43,7 @@
       :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)"
@@ -61,6 +67,7 @@ import type {
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
 import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const totalMetricItemsLocal = defineModel<number>('totalMetricItems', {
   required: true,
@@ -84,10 +91,13 @@ const props = withDefaults(
     totalCores: number
     hostId: string
     selectedMetricsKeys: number[]
-    selectedObjects: string
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
+    project: UI_T_Project
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
+    currentSelectedObjects: string
     errorLastInput?: string
     errorDateFrom?: string
     errorTimeFrom?: string
@@ -127,10 +137,18 @@ const isScrolledBlock = computed<boolean>(() => y.value > 0)
   overflow-x: hidden;
   overflow-y: auto;
   padding-right: 18px;
+  padding-left: 12px;
+  padding-top: 6px;
+  scrollbar-gutter: stable;
+
+  &.is-scrolled {
+    margin-top: 6px;
+    padding-top: 0;
+  }
 
   .border-block {
     box-shadow: -5px 1px 8px #e9ebeda3;
-    border-top: 4px solid var(--counters-border-block-border-color);
+    border-top: 1px solid var(--counters-border-block-border-color);
     position: sticky;
     inset: 0;
     z-index: 999; // TODO use z-index from global (bfg-uikit)

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersOld.vue

@@ -5,6 +5,9 @@
       :type="props.type"
       :selected-keys="props.selectedKeys"
       :total-cores="props.totalCores"
+      :project="props.project"
+      :power-data="props.powerData"
+      :temperature-data="props.temperatureData"
       @select-row="emits('select-row', $event)"
       @total-items="totalMetricItemsLocal = $event"
     />
@@ -25,10 +28,10 @@
       :host-id="props.hostId"
       :selected-metrics-keys="props.selectedMetricsKeys"
       :total-metric-items="totalMetricItemsLocal"
-      :selected-objects="props.selectedObjects"
       :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)"
@@ -51,6 +54,7 @@ import type {
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
 import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const totalMetricItemsLocal = defineModel<number>('totalMetricItems', {
   required: true,
@@ -73,10 +77,13 @@ const props = defineProps<{
   totalCores: number
   hostId: string
   selectedMetricsKeys: number[]
-  selectedObjects: string
   objectsLoading: boolean
   objectsData: UI_I_ObjectItem[]
   validDateEnd: number
+  project: UI_T_Project
+  powerData: UI_I_AdvancedCounterItem[]
+  temperatureData: UI_I_AdvancedCounterItem[]
+  currentSelectedObjects: string
 }>()
 
 const emits = defineEmits<{

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/Table.vue

@@ -24,15 +24,17 @@ import type {
   UI_T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
+import type { UI_T_Project } from '~/lib/models/types'
 import { countersItemsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/config/utils'
 
 const props = defineProps<{
   chart: UI_T_ChartHost | UI_T_ChartVm
   type: UI_T_AdvancedType
   selectedKeys: number[]
-  totalCores: number
+  project: UI_T_Project
+  powerData: UI_I_AdvancedCounterItem[]
+  temperatureData: UI_I_AdvancedCounterItem[]
 }>()
-
 const emits = defineEmits<{
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'total-items', value: number): void
@@ -49,7 +51,9 @@ const counters = computed<UI_I_AdvancedCounterItem[]>(() =>
     props.type,
     props.chart,
     localization.value,
-    props.totalCores
+    props.project,
+    props.powerData,
+    props.temperatureData
   )
 )