bfg-common 1.6.113 → 1.6.114

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

@@ -32,7 +32,7 @@ import type {
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
-import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableOld/lib/config/tableConfig'
+import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/old/lib/config/tableConfig'
 
 const selectedCountersLocal = defineModel<number[]>('selectedCounters', {
   required: true,

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{tableOld → old}/lib/config/tableConfig.ts

@@ -4,7 +4,7 @@ import type {
   UI_I_BodyItem,
   UI_I_ColumnKey,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_T_AdvancedCountersColumnKey } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableOld/lib/models/types'
+import type { UI_T_AdvancedCountersColumnKey } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/old/lib/models/types'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
 import {
   constructColumnKey,

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

@@ -1,6 +1,6 @@
 <template>
-  <common-monitor-advanced-tools-chart-options-modal-counters-timespan-new
-    v-if="isNewView"
+  <component
+    :is="currentComponent"
     :type="props.type"
     :chart="props.chart"
     :language="props.language"
@@ -20,45 +20,12 @@
     :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)"
@@ -133,6 +100,12 @@ 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,13 +1,6 @@
 <template>
-  <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
+  <component
+    :is="currentComponent"
     v-model:selected-row="selectedRow"
     v-model:column-items="columnItems"
     v-model:pagination="pagination"
@@ -56,6 +49,12 @@ 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/{objectNew/ObjectNew.vue → new/New.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/objectNew/lib/config/options'
-import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/config/tableData'
+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'
 
 const selectedRowLocal = defineModel<number[] | number>('selectedRow', {
   required: true,

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{objectNew → new}/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/objectNew/lib/utils/constructTable'
+import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/utils/constructTable'
 
 export const tableDataFunc = (
   localization: UI_I_Localization,

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

@@ -20,8 +20,7 @@
           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,11 +1,6 @@
 <template>
-  <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
+  <component
+    :is="currentComponent"
     v-model:selected-metric="selectedMetricLocal"
     :metrics-items="props.metricsItems"
   />
@@ -25,6 +20,12 @@ 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/advanced/tools/chartOptionsModal/{NotificationNew.vue → notification/New.vue}

@@ -3,8 +3,8 @@
     :messages="props.alerts"
     test-id="chart-options-alerts"
     class="chart-options-alerts"
-    hide-close-button
     size="md"
+    hide-close-button
   />
 </template>
 

package/components/common/monitor/advanced/tools/chartOptionsModal/{Notification.vue → notification/Notification.vue}

@@ -1,10 +1,6 @@
 <template>
-  <common-monitor-advanced-tools-chart-options-modal-notification-new
-    v-if="isNewView"
-    :alerts="props.alerts"
-  />
-  <common-monitor-advanced-tools-chart-options-modal-notification-old
-    v-else
+  <component
+    :is="currentComponent"
     :alerts="props.alerts"
     @remove="emits('remove-alerts')"
   />
@@ -22,6 +18,12 @@ 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/{NotificationOld.vue → notification/Old.vue}

@@ -5,7 +5,7 @@
     status="alert-danger"
     class="notification"
     test-id="notification-alert"
-    @remove="onRemove"
+    @remove="emits('remove-alerts')"
   >
   </atoms-alert>
 </template>
@@ -18,10 +18,6 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'remove-alerts'): void
 }>()
-
-const onRemove = (): void => {
-  emits('remove-alerts')
-}
 </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-graph-new-empty-block v-else />
+        <common-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="chartData.title || key"
       >
         <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,6 +78,7 @@
     :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,6 +59,7 @@
     :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-graph-new-empty-block
+      <common-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-graph-new-empty-block
+      <common-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,6 +43,7 @@ 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.113",
+  "version": "1.6.114",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/components/common/configure/advancedSystemSettings/tableView/new/lib/config/hostTable.ts

@@ -1,308 +0,0 @@
-import type {
-  UI_I_DataTableBody,
-  UI_I_DataTableOptions,
-  UI_I_DataTableHeader,
-} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_HostTableItem } from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/lib/models/interfaces'
-import {
-  UI_E_DeviceStatus,
-  UI_E_DeviceStatusChipColor,
-  UI_E_DeviceStatusIcon,
-} from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/models/enums'
-import {
-  hostIconByState,
-  hostLocalizationByState,
-} from '~/components/common/lib/config/states'
-
-// Маппинг для статусов
-const STATUS_MAPPING = {
-  [UI_E_DeviceStatus.Unknown]: {
-    icon: UI_E_DeviceStatusIcon.HelpIcon,
-    chipColor: UI_E_DeviceStatusChipColor.Primary,
-  },
-  [UI_E_DeviceStatus.Supported]: {
-    icon: UI_E_DeviceStatusIcon.StatusCheck,
-    chipColor: UI_E_DeviceStatusChipColor.Green,
-  },
-  [UI_E_DeviceStatus.NotSupported]: {
-    icon: UI_E_DeviceStatusIcon.Close,
-    chipColor: UI_E_DeviceStatusChipColor.Red,
-  },
-}
-
-export const getHeaderDataFunc = (
-  localization: UI_I_Localization
-): UI_I_DataTableHeader[] => [
-  {
-    col: 'col0',
-    colName: 'name',
-    text: localization.common.name,
-    isSortable: true,
-    sort: 'asc',
-    width: '180px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col1',
-    colName: 'state',
-    text: localization.inventorySummary.state,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col2',
-    colName: 'cluster',
-    text: localization.common.cluster,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col3',
-    colName: 'fault_domain',
-    text: localization.common.faultDomain,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col4',
-    colName: 'consumed_cpu',
-    text: `${localization.common.consumedCpu} %`,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col5',
-    colName: 'consumed_mem',
-    text: `${localization.common.consumedMemory} %`,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col6',
-    colName: 'ha_state',
-    text: localization.common.haState,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col7',
-    colName: 'uptime',
-    text: localization.inventorySummary.uptime,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col8',
-    colName: 'cert_valid_to',
-    text: localization.common.certificateValidTo,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col9',
-    colName: 'mem_size',
-    text: `${localization.common.memorySize} (${localization.common.mb})`,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col10',
-    colName: 'cpus',
-    text: localization.common.cpus,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col11',
-    colName: 'nics',
-    text: localization.inventorySummary.nics,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col12',
-    colName: 'version',
-    text: localization.common.version,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-  {
-    col: 'col13',
-    colName: 'alarm_action',
-    text: localization.common.alarmActions,
-    isSortable: true,
-    sort: 'asc',
-    width: '96px',
-    show: true,
-    filter: false,
-  },
-]
-export const options: UI_I_DataTableOptions = {
-  perPageOptions: [{ text: '10', value: 100, default: true }],
-  isSelectable: true,
-  selectType: 'radio',
-  showPagination: false,
-  showPageInfo: false,
-  isSortable: true,
-  server: true,
-  isResizable: true,
-  showSelectedRows: false,
-  showColumnManager: true,
-  inModal: true,
-  inBlock: false,
-  // isFocusable: false,
-  // showPaginationOnTop: false,
-  // showSearch: false,
-  // withActions: false,
-  // showExport: false,
-  // withCollapse: false,
-}
-
-export const getBodyDataFunc = (
-  bodyData: UI_I_HostTableItem[],
-  localization: UI_I_Localization
-): UI_I_DataTableBody[] => {
-  const { $number } = useNuxtApp() as any
-
-  return bodyData.map((host, index: number) => {
-    const statusKey = host.state
-      ? UI_E_DeviceStatus.Unknown
-      : UI_E_DeviceStatus.Supported
-    const statusData = {
-      ...STATUS_MAPPING[statusKey],
-      testId: `${host.name}-${index}-status`,
-    }
-
-    return {
-      row: index,
-      collapse: false,
-      isHiddenCollapse: false,
-      collapseToggle: false,
-
-      data: [
-        {
-          key: 'icon',
-          col: 'col0',
-          text: host.name,
-          data: `vsphere-icon-${hostIconByState[host.state]}`,
-          testId: `migrate-host-table-item-${index}`,
-        },
-
-        {
-          key: 'status',
-          col: 'col1',
-          text: localization.common[hostLocalizationByState[host.state]],
-          testId: `migrate-host-table-item-${index}`,
-          data: statusData,
-        },
-        {
-          col: 'col2',
-          text: host.cluster,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col3',
-          text: host.fault_domain,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          key: 'progress',
-          col: 'col4',
-          text: `${host.consumed_cpu.toFixed(2)}%`,
-          data: host.consumed_cpu,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          key: 'progress',
-          col: 'col5',
-          text: `${host.consumed_mem.toFixed(2)}%`,
-          data: host.consumed_mem,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col6',
-          text: host.ha_state,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col7',
-          text: host.uptime + '',
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col8',
-          text: host.cert_valid_to,
-          testId: `migrate-host-table-item-${index}`,
-        },
-
-        {
-          col: 'col9',
-          text: `${$number.format(host.mem_size, 'en')} ${
-            localization.common.mb
-          }`,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col10',
-          text: host.cpus + '',
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col11',
-          text: host.nics + '',
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          col: 'col12',
-          text: host.version,
-          testId: `migrate-host-table-item-${index}`,
-        },
-        {
-          key: 'status',
-          col: 'col13',
-          text: host.alarm_action,
-          data: statusData,
-          testId: `migrate-host-table-item-${index}`,
-        },
-      ],
-    }
-  })
-}

package/components/common/configure/advancedSystemSettings/tableView/old/field/lib/models/enums.ts

@@ -1,14 +0,0 @@
-export enum E_Format {
-    'unix path' = 'unixPath',
-    'win path' = 'winPath',
-    'mac' = 'mac',
-    'ip4' = 'ip4',
-    'ip6' = 'ip6',
-    'url' = 'url',
-    'uuid' = 'uuid',
-    'semver' = 'semver',
-    'domain' = 'domain',
-    'base64' = 'base64',
-    'regex' = 'regex',
-    'hex color' = 'hexColor',
-}