bfg-common 1.4.884 → 1.4.901

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

@@ -39,8 +39,6 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
 
 <style scoped lang="scss">
 .chart-options-table-container {
-  padding-right: 2px;
-
   :deep(.bottom-grid-content) {
     max-height: 235px;
   }

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

@@ -21,11 +21,6 @@
     :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"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
     @update-timespan-type="emits('update-timespan-type', $event)"
@@ -101,11 +96,6 @@ const props = defineProps<{
   objectsLoading: boolean
   objectsData: UI_I_ObjectItem[]
   validDateEnd: number
-  errorLastInput?: string
-  errorDateFrom?: string
-  errorTimeFrom?: string
-  errorDateTo?: string
-  errorTimeTo?: string
 }>()
 
 const emits = defineEmits<{

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

@@ -12,11 +12,6 @@
       :custom-time-from="props.customTimeFrom"
       :custom-time-to="props.customTimeTo"
       :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"
       @update-chart-type="emits('update-chart-type', $event)"
       @update-custom-time="emits('update-custom-time', $event)"
       @update-timespan-type="emits('update-timespan-type', $event)"
@@ -31,24 +26,20 @@
       <div class="chart-type-container">
         <p class="title-block">{{ localization.inventoryMonitor.chartType }}</p>
         <div class="radio-buttons-container">
-          <div class="ui-radio-block">
-            <ui-radio
-              v-model="chartTypeLocal"
-              :label="localization.inventoryMonitor.lineGraph"
-              test-id="line-graph"
-              value="spline"
-              size="md"
-            />
-          </div>
-          <div class="ui-radio-block">
-            <ui-radio
-              v-model="chartTypeLocal"
-              :label="localization.inventoryMonitor.stackedGraph"
-              test-id="stacked-graph"
-              value="area"
-              size="md"
-            />
-          </div>
+          <ui-radio
+            v-model="chartTypeLocal"
+            :label="localization.inventoryMonitor.lineGraph"
+            test-id="line-graph"
+            value="spline"
+            size="sm"
+          />
+          <ui-radio
+            v-model="chartTypeLocal"
+            :label="localization.inventoryMonitor.stackedGraph"
+            test-id="stacked-graph"
+            value="area"
+            size="sm"
+          />
         </div>
       </div>
       <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
@@ -97,11 +88,6 @@ const props = defineProps<{
   objectsLoading: boolean
   objectsData: UI_I_ObjectItem[]
   validDateEnd: number
-  errorLastInput?: string
-  errorDateFrom?: string
-  errorTimeFrom?: string
-  errorDateTo?: string
-  errorTimeTo?: string
 }>()
 
 const emits = defineEmits<{
@@ -135,8 +121,6 @@ const chartTypeLocal = computed<string>({
   grid-template-columns: 55% 45%;
   grid-gap: 12px;
   margin-top: 12px;
-  padding-right: 14px;
-  padding-bottom: 5px;
 
   .timespan-object-container {
     display: grid;
@@ -154,26 +138,13 @@ const chartTypeLocal = computed<string>({
         font-size: 14px;
         font-weight: 500;
         margin-bottom: 16px;
-        line-height: 18px;
       }
       .radio-buttons-container {
         display: flex;
         flex-direction: column;
         grid-gap: 12px;
-
-        .ui-radio-block {
-          height: 20px;
-          display: flex;
-        }
       }
     }
   }
 }
-
-@media (max-width: 920px) {
-  .timespan-container {
-    grid-template-columns: 1fr;
-    padding-right: 0;
-  }
-}
 </style>

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

@@ -5,7 +5,6 @@
       :data="dataLocal"
       :options="optionsData"
       :loading="props.loading"
-      :texts="tableTexts"
       size="sm"
       @select-row="onSelectRow"
     />
@@ -17,7 +16,6 @@ import type {
   UI_I_DataTable,
   UI_I_DataTableBody,
   UI_I_DataTableOptions,
-  UI_I_TableTexts,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_DataGridType } from '~/components/atoms/table/dataGrid/lib/models/types'
@@ -37,10 +35,6 @@ const props = defineProps<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const tableTexts = ref<UI_I_TableTexts>({
-  noItemsFound: localization.value.common.noItemsFound,
-})
-
 const optionsData = computed<UI_I_DataTableOptions>(() =>
   options(props.tableType)
 )

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

@@ -1,5 +1,5 @@
 <template>
-  <common-monitor-advanced-tools-chart-options-modal-metrics-new
+  <common-monitor-advanced-tools-chart-options-modal-metrics-metrics-new
     v-if="isNewView"
     v-model:selected-metric="selectedMetricLocal"
     :metrics-items="props.metricsItems"

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/metricsNew/MetricsNew.vue

@@ -0,0 +1,101 @@
+<template>
+  <ui-accordion-recursion
+    v-for="(item, key) in accordionItems"
+    id="metrics-accordion-recursion"
+    :key="item.id"
+    :test-id="`${item.testId}-${key}`"
+    :accordion="item"
+  >
+    <template #header="{ data }">
+      <span class="main-headline">{{ data.headline }}</span>
+    </template>
+    <template #body="{ data }">
+      <div
+        v-for="(item2, key2) in data.children"
+        :key="key2"
+        class="accordion-main-text-content"
+        @click="selectedMetricLocal = item2.data.value"
+      >
+        <span
+          :class="[
+            'accordion-toggle-item',
+            { active: selectedMetricLocal === item2.data.value },
+          ]"
+        >
+          <span
+            :title="item2.headline"
+            class="accordion-toggle-item-text metrics-accordion-toggle-item-text text-ellipsis"
+            >{{ item2.headline }}</span
+          >
+        </span>
+        <div v-if="data.children.length - 1 > key2" class="divider"></div>
+      </div>
+    </template>
+  </ui-accordion-recursion>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Accordion } from '~/node_modules/bfg-uikit/components/ui/accordion/models/interfaces'
+import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
+import { constructAccordion } from '~/components/common/monitor/advanced/tools/chartOptionsModal/metrics/metricsNew/lib/utils/constructAccordion'
+import { updateElementShowWithId } from 'bfg-uikit/components/ui/accordion/utils/recursion'
+
+const selectedMetricLocal = defineModel<string>('selectedMetric', {
+  required: true,
+})
+
+const props = defineProps<{
+  metricsItems: UI_I_VerticalTabs[]
+}>()
+
+const accordionItems = ref<UI_I_Accordion[]>(
+  constructAccordion(props.metricsItems)
+)
+
+const onToggle = (id: number): void => {
+  accordionItems.value = updateElementShowWithId(accordionItems.value, id)
+}
+
+onMounted(() => {
+  onToggle(0)
+})
+</script>
+
+<style>
+:root {
+  --metrics-accordion-bg-color: #ffffff;
+  --metrics-accordion-item-color: #4d5d69;
+}
+:root.dark-theme {
+  --metrics-accordion-bg-color: #334453;
+  --metrics-accordion-item-color: #e9eaec;
+}
+</style>
+<style scoped lang="scss">
+#metrics-accordion-recursion {
+  padding: 12px;
+  background: var(--metrics-accordion-bg-color);
+  box-shadow: 0 1px 4px 0 #00000014;
+  border-radius: 8px;
+
+  .main-headline {
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--metrics-accordion-item-color);
+  }
+  :deep(.accordion-toggle-item-icon) {
+    display: none;
+  }
+  .accordion-toggle-item {
+    padding-left: 24px;
+
+    &:not(.active) {
+      color: var(--metrics-accordion-item-color);
+    }
+    .metrics-accordion-toggle-item-text {
+      font-size: 13px;
+      font-weight: 500;
+    }
+  }
+}
+</style>

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/metricsNew/lib/utils/constructAccordion.ts

@@ -0,0 +1,32 @@
+import type { UI_I_Accordion } from '~/node_modules/bfg-uikit/components/ui/accordion/models/interfaces'
+import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
+
+export const constructAccordion = (
+  items: UI_I_VerticalTabs[]
+): UI_I_Accordion[] => {
+  const localization = useLocal()
+  return [
+    {
+      id: 0,
+      testId: 'metrics-headline',
+      headline: `${localization.zabbix.metrics} (${items.length})`,
+      expended: false,
+      disabled: false,
+      hasChild: true,
+      children: items.map((item: UI_I_VerticalTabs, key) => {
+        return {
+          id: key + 1,
+          testId: `accordion-item-${item.value}`,
+          headline: item.text,
+          expended: false,
+          disabled: false,
+          hasChild: false,
+          children: [],
+          data: {
+            value: item.value,
+          },
+        }
+      }),
+    },
+  ]
+}

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

@@ -1,142 +1,142 @@
-<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">
-          <ui-skeleton-metric />
-        </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 {
-  --overview-chart-loader-bg-color: #ffffff;
-}
-:root.dark-theme {
-  --overview-chart-loader-bg-color: #334453;
-}
-</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;
-  padding: 0 16px;
-
-  .graphic-loader-block {
-    background-color: var(--overview-chart-loader-bg-color);
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-radius: 8px;
-  }
-
-  .graph-empty-block {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    background-color: var(--overview-chart-loader-bg-color);
-    border-radius: 8px;
-
-    .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 {
-    position: relative;
-    width: 100%;
-    min-width: 300px;
-    height: 100%;
-    min-height: 300px;
-    flex-grow: 1;
-    box-sizing: border-box;
-
-    &:first-child:last-child {
-      height: 100%;
-      width: 100%;
-    }
-
-    &:first-child:nth-last-child(2),
-    &:nth-child(2):last-child {
-      width: 50%;
-      height: 100%;
-    }
-
-    :deep(svg > .skeleton-metric__line) {
-      display: none;
-    }
-  }
-
-  //.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">
+          <ui-skeleton-metric />
+        </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 {
+  --overview-chart-loader-bg-color: #ffffff;
+}
+:root.dark-theme {
+  --overview-chart-loader-bg-color: #334453;
+}
+</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;
+  padding: 0 16px;
+
+  .graphic-loader-block {
+    background-color: var(--overview-chart-loader-bg-color);
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-radius: 8px;
+  }
+
+  .graph-empty-block {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    background-color: var(--overview-chart-loader-bg-color);
+    border-radius: 8px;
+
+    .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 {
+    position: relative;
+    width: 100%;
+    min-width: 300px;
+    height: 100%;
+    min-height: 300px;
+    flex-grow: 1;
+    box-sizing: border-box;
+
+    &:first-child:last-child {
+      height: 100%;
+      width: 100%;
+    }
+
+    &:first-child:nth-last-child(2),
+    &:nth-child(2):last-child {
+      width: 50%;
+      height: 100%;
+    }
+
+    :deep(svg > .skeleton-metric__line) {
+      display: none;
+    }
+  }
+
+  //.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>