bfg-common 1.6.111 → 1.6.113

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/assets/img/icons/icons-sprite-dark-4.svg +17 -38
  2. package/assets/img/icons/icons-sprite-light-4.svg +17 -49
  3. package/assets/localization/local_be.json +4 -33
  4. package/assets/localization/local_en.json +4 -33
  5. package/assets/localization/local_hy.json +4 -33
  6. package/assets/localization/local_kk.json +4 -33
  7. package/assets/localization/local_ru.json +7 -36
  8. package/assets/localization/local_zh.json +4 -33
  9. package/components/common/configure/advancedSystemSettings/AdvancedSystemSettings.vue +17 -25
  10. package/components/common/configure/advancedSystemSettings/modals/edit/Edit.vue +4 -4
  11. package/components/common/configure/advancedSystemSettings/modals/edit/New.vue +23 -42
  12. package/components/common/configure/advancedSystemSettings/modals/edit/Old.vue +3 -5
  13. package/components/common/configure/advancedSystemSettings/tableView/TableView.vue +2 -27
  14. package/components/common/configure/advancedSystemSettings/tableView/new/New.vue +130 -60
  15. package/components/common/configure/advancedSystemSettings/tableView/new/lib/config/hostTable.ts +308 -0
  16. package/components/common/configure/advancedSystemSettings/tableView/old/Old.vue +41 -14
  17. package/components/common/configure/advancedSystemSettings/tableView/{field → old/field}/Field.vue +50 -20
  18. package/components/common/configure/advancedSystemSettings/tableView/old/field/lib/models/enums.ts +14 -0
  19. package/components/common/configure/advancedSystemSettings/tools/New.vue +3 -64
  20. package/components/common/configure/advancedSystemSettings/tools/Old.vue +2 -2
  21. package/components/common/configure/advancedSystemSettings/tools/Tools.vue +2 -2
  22. package/components/common/graph/Graph.vue +8 -19
  23. package/components/common/graph/{new/New.vue → graphNew/GraphNew.vue} +3 -3
  24. package/components/common/graph/lib/utils/renderGraph.ts +393 -0
  25. package/components/common/modals/confirmation/Confirmation.vue +0 -1
  26. package/components/common/monitor/advanced/Advanced.vue +49 -9
  27. package/components/common/monitor/advanced/graphView/GraphView.vue +12 -8
  28. package/components/common/monitor/advanced/graphView/{New.vue → GraphViewNew.vue} +1 -1
  29. package/components/common/monitor/advanced/table/Table.vue +8 -9
  30. package/components/common/monitor/advanced/table/{new/New.vue → tableNew/TableNew.vue} +5 -6
  31. package/components/common/monitor/advanced/table/{new → tableNew}/lib/config/options.ts +1 -1
  32. package/components/common/monitor/advanced/table/{old/Old.vue → tableOld/TableOld.vue} +3 -6
  33. package/components/common/monitor/advanced/tools/Tools.vue +53 -11
  34. package/components/common/monitor/advanced/tools/{New.vue → ToolsNew.vue} +0 -4
  35. package/components/common/monitor/advanced/tools/{Old.vue → ToolsOld.vue} +0 -2
  36. package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue +569 -569
  37. package/components/common/monitor/advanced/tools/chartOptionsModal/{notification/Notification.vue → Notification.vue} +6 -8
  38. package/components/common/monitor/advanced/tools/chartOptionsModal/{notification/New.vue → NotificationNew.vue} +1 -1
  39. package/components/common/monitor/advanced/tools/chartOptionsModal/{notification/Old.vue → NotificationOld.vue} +5 -1
  40. package/components/common/monitor/advanced/tools/chartOptionsModal/actions/Actions.vue +13 -9
  41. package/components/common/monitor/advanced/tools/chartOptionsModal/actions/{New.vue → ActionsNew.vue} +3 -6
  42. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue +44 -12
  43. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/Table.vue +7 -8
  44. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{new/New.vue → tableNew/TableNew.vue} +2 -2
  45. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{new → tableNew}/config/tableData.ts +1 -1
  46. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{old/Old.vue → tableOld/TableOld.vue} +1 -1
  47. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{old → tableOld}/lib/config/tableConfig.ts +1 -1
  48. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue +36 -9
  49. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/Object.vue +9 -8
  50. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{new/New.vue → objectNew/ObjectNew.vue} +2 -2
  51. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{new → objectNew}/lib/config/tableData.ts +1 -1
  52. package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{old/Old.vue → objectOld/ObjectOld.vue} +2 -1
  53. package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/Metrics.vue +7 -8
  54. package/components/common/monitor/overview/OverviewNew.vue +1 -1
  55. package/components/common/monitor/overview/OverviewOld.vue +1 -1
  56. package/components/common/monitor/overview/filters/FiltersNew.vue +0 -1
  57. package/components/common/monitor/overview/filters/FiltersOld.vue +0 -1
  58. package/components/common/pages/hardwareHealth/historyTestimony/GraphNew.vue +2 -2
  59. package/lib/models/interfaces.ts +0 -1
  60. package/package.json +1 -1
  61. package/components/common/configure/advancedSystemSettings/New.vue +0 -37
  62. package/components/common/configure/advancedSystemSettings/Old.vue +0 -36
  63. package/components/common/configure/advancedSystemSettings/tableView/field/New.vue +0 -88
  64. package/components/common/configure/advancedSystemSettings/tableView/field/Old.vue +0 -73
  65. package/components/common/configure/advancedSystemSettings/tableView/field/lib/config/index.ts +0 -10
  66. package/components/common/configure/advancedSystemSettings/tableView/field/lib/models/enums.ts +0 -14
  67. package/components/common/configure/advancedSystemSettings/tableView/new/lib/config/index.ts +0 -112
  68. /package/components/common/graph/{Old.vue → GraphOld.vue} +0 -0
  69. /package/components/common/graph/{new → graphNew}/EmptyBlock.vue +0 -0
  70. /package/components/common/graph/{new → graphNew}/lib/models/enums.ts +0 -0
  71. /package/components/common/monitor/advanced/{New.vue → AdvancedNew.vue} +0 -0
  72. /package/components/common/monitor/advanced/{Old.vue → AdvancedOld.vue} +0 -0
  73. /package/components/common/monitor/advanced/graphView/{Old.vue → GraphViewOld.vue} +0 -0
  74. /package/components/common/monitor/advanced/table/{new → tableNew}/lib/utils/constructBody.ts +0 -0
  75. /package/components/common/monitor/advanced/table/{old → tableOld}/lib/config/performanceDatatable.ts +0 -0
  76. /package/components/common/monitor/advanced/tools/chartOptionsModal/{New.vue → ChartOptionsModalNew.vue} +0 -0
  77. /package/components/common/monitor/advanced/tools/chartOptionsModal/{Old.vue → ChartOptionsModalOld.vue} +0 -0
  78. /package/components/common/monitor/advanced/tools/chartOptionsModal/actions/{Old.vue → ActionsOld.vue} +0 -0
  79. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/{New.vue → CountersNew.vue} +0 -0
  80. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/{Old.vue → CountersOld.vue} +0 -0
  81. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{new → tableNew}/config/options.ts +0 -0
  82. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{new → tableNew}/utils/constructTable.ts +0 -0
  83. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/{old → tableOld}/lib/models/types.ts +0 -0
  84. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/{New.vue → TimespanNew.vue} +0 -0
  85. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/{Old.vue → TimespanOld.vue} +0 -0
  86. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{new → objectNew}/lib/config/options.ts +0 -0
  87. /package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/{new → objectNew}/lib/utils/constructTable.ts +0 -0
  88. /package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/{New.vue → MetricsNew.vue} +0 -0
  89. /package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/{Old.vue → MetricsOld.vue} +0 -0
@@ -1,6 +1,10 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-notification-new
3
+ v-if="isNewView"
4
+ :alerts="props.alerts"
5
+ />
6
+ <common-monitor-advanced-tools-chart-options-modal-notification-old
7
+ v-else
4
8
  :alerts="props.alerts"
5
9
  @remove="emits('remove-alerts')"
6
10
  />
@@ -18,12 +22,6 @@ const emits = defineEmits<{
18
22
  const { $store }: any = useNuxtApp()
19
23
 
20
24
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
21
-
22
- const currentComponent = computed(() =>
23
- isNewView.value
24
- ? defineAsyncComponent(() => import('./New.vue'))
25
- : defineAsyncComponent(() => import('./Old.vue'))
26
- )
27
25
  </script>
28
26
 
29
27
  <style scoped lang="scss"></style>
@@ -3,8 +3,8 @@
3
3
  :messages="props.alerts"
4
4
  test-id="chart-options-alerts"
5
5
  class="chart-options-alerts"
6
- size="md"
7
6
  hide-close-button
7
+ size="md"
8
8
  />
9
9
  </template>
10
10
 
@@ -5,7 +5,7 @@
5
5
  status="alert-danger"
6
6
  class="notification"
7
7
  test-id="notification-alert"
8
- @remove="emits('remove-alerts')"
8
+ @remove="onRemove"
9
9
  >
10
10
  </atoms-alert>
11
11
  </template>
@@ -18,6 +18,10 @@ const props = defineProps<{
18
18
  const emits = defineEmits<{
19
19
  (event: 'remove-alerts'): void
20
20
  }>()
21
+
22
+ const onRemove = (): void => {
23
+ emits('remove-alerts')
24
+ }
21
25
  </script>
22
26
 
23
27
  <style scoped lang="scss"></style>
@@ -1,16 +1,26 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-actions-new
3
+ v-if="isNewView"
4
4
  v-model:is-confirm-modal="isConfirmModal"
5
5
  v-model:local-selected-chart-option="localSelectedChartOption"
6
6
  :chart-options="chartOptions"
7
7
  :is-disabled-delete-action="isDisabledDeleteAction"
8
- :is-show-save-options-modal="isShowSaveOptionsModal"
9
8
  @save-options="onSaveOptions"
10
9
  @delete-action="onDeleteAction"
11
10
  @apply-delete="onApplyDelete"
11
+ />
12
+ <common-monitor-advanced-tools-chart-options-modal-actions-old
13
+ v-else
14
+ v-model:is-confirm-modal="isConfirmModal"
15
+ v-model:local-selected-chart-option="localSelectedChartOption"
16
+ :chart-options="chartOptions"
17
+ :is-show-save-options-modal="isShowSaveOptionsModal"
18
+ :is-disabled-delete-action="isDisabledDeleteAction"
12
19
  @show-save-options-modal="onShowSaveOptionsModal"
13
20
  @hide-save-options-modal="onHideSaveOptionsModal"
21
+ @save-options="onSaveOptions"
22
+ @delete-action="onDeleteAction"
23
+ @apply-delete="onApplyDelete"
14
24
  />
15
25
  </template>
16
26
 
@@ -36,12 +46,6 @@ const { $store }: any = useNuxtApp()
36
46
 
37
47
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
38
48
 
39
- const currentComponent = computed(() =>
40
- isNewView.value
41
- ? defineAsyncComponent(() => import('./New.vue'))
42
- : defineAsyncComponent(() => import('./Old.vue'))
43
- )
44
-
45
49
  const localization = computed<UI_I_Localization>(() => useLocal())
46
50
 
47
51
  const localSelectedChartOption = ref<string>('select_options')
@@ -6,8 +6,8 @@
6
6
  :label="localization.common.options"
7
7
  :margin-between-trigger="4"
8
8
  select-width="100%"
9
- test-id="chart-options-select"
10
9
  show-text
10
+ test-id="chart-options-select"
11
11
  />
12
12
  <ui-input
13
13
  v-model="newChartName"
@@ -27,7 +27,7 @@
27
27
  @click="onSaveNewName"
28
28
  >
29
29
  <template #icon>
30
- <ui-icon name="check" width="18" height="18" />
30
+ <ui-icon name="check" width="18" height="18"></ui-icon>
31
31
  </template>
32
32
  <span>{{ localization.common.save }}</span>
33
33
  </ui-button>
@@ -42,7 +42,7 @@
42
42
  @click="emits('delete-action')"
43
43
  >
44
44
  <template #icon>
45
- <ui-icon name="delete" width="18" height="18" />
45
+ <ui-icon name="delete" width="18" height="18"></ui-icon>
46
46
  </template>
47
47
  <span>{{ localization.common.delete }}</span>
48
48
  </ui-button>
@@ -75,13 +75,10 @@ const isConfirmModalLocal = defineModel<boolean>('isConfirmModal', {
75
75
 
76
76
  const props = defineProps<{
77
77
  chartOptions: UI_I_OptionItem[]
78
- isShowSaveOptionsModal: boolean // For Console Warning
79
78
  isDisabledDeleteAction: boolean
80
79
  }>()
81
80
 
82
81
  const emits = defineEmits<{
83
- (event: 'show-save-options-modal'): void // For Console Warning
84
- (event: 'hide-save-options-modal'): void // For Console Warning
85
82
  (event: 'save-options', value: string): void
86
83
  (event: 'delete-action'): void
87
84
  (event: 'apply-delete'): void
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-counters-new
3
+ v-if="isNewView"
4
4
  v-model:total-metric-items="totalMetricItems"
5
5
  :chart="props.chart"
6
6
  :language="props.language"
@@ -21,15 +21,53 @@
21
21
  :objects-loading="props.objectsLoading"
22
22
  :objects-data="props.objectsData"
23
23
  :valid-date-end="props.validDateEnd"
24
- :project="props.project"
25
- :power-data="props.powerData"
26
- :temperature-data="props.temperatureData"
27
- :current-selected-objects="props.currentSelectedObjects"
28
24
  :error-last-input="props.errorLastInput"
29
25
  :error-date-from="props.errorDateFrom"
30
26
  :error-time-from="props.errorTimeFrom"
31
27
  :error-date-to="props.errorDateTo"
32
28
  :error-time-to="props.errorTimeTo"
29
+ :project="props.project"
30
+ :power-data="props.powerData"
31
+ :temperature-data="props.temperatureData"
32
+ :current-selected-objects="props.currentSelectedObjects"
33
+ @select-row="emits('select-row', $event)"
34
+ @update-chart-type="emits('update-chart-type', $event)"
35
+ @update-custom-time="emits('update-custom-time', $event)"
36
+ @update-timespan-type="emits('update-timespan-type', $event)"
37
+ @update-unit-count="emits('update-unit-count', $event)"
38
+ @update-period-type="emits('update-period-type', $event)"
39
+ @update-custom-date-from="emits('update-custom-date-from', $event)"
40
+ @update-custom-date-to="emits('update-custom-date-to', $event)"
41
+ @update-custom-time-from="emits('update-custom-time-from', $event)"
42
+ @update-custom-time-to="emits('update-custom-time-to', $event)"
43
+ @select-objects="emits('select-objects', $event)"
44
+ />
45
+ <common-monitor-advanced-tools-chart-options-modal-counters-old
46
+ v-else
47
+ v-model:total-metric-items="totalMetricItems"
48
+ :chart="props.chart"
49
+ :language="props.language"
50
+ :type="props.type"
51
+ :selected-keys="props.selectedKeys"
52
+ :selected-chart-type="props.selectedChartType"
53
+ :selected-timespan-type="props.selectedTimespanType"
54
+ :units-count="props.unitsCount"
55
+ :period-type="props.periodType"
56
+ :selected-custom-time="props.selectedCustomTime"
57
+ :custom-date-from="props.customDateFrom"
58
+ :custom-date-to="props.customDateTo"
59
+ :custom-time-from="props.customTimeFrom"
60
+ :custom-time-to="props.customTimeTo"
61
+ :total-cores="props.totalCores"
62
+ :host-id="props.hostId"
63
+ :selected-metrics-keys="props.selectedMetricsKeys"
64
+ :objects-loading="props.objectsLoading"
65
+ :objects-data="props.objectsData"
66
+ :valid-date-end="props.validDateEnd"
67
+ :project="props.project"
68
+ :power-data="props.powerData"
69
+ :temperature-data="props.temperatureData"
70
+ :current-selected-objects="props.currentSelectedObjects"
33
71
  @select-row="emits('select-row', $event)"
34
72
  @update-chart-type="emits('update-chart-type', $event)"
35
73
  @update-custom-time="emits('update-custom-time', $event)"
@@ -112,12 +150,6 @@ const { $store }: any = useNuxtApp()
112
150
 
113
151
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
114
152
 
115
- const currentComponent = computed(() =>
116
- isNewView.value
117
- ? defineAsyncComponent(() => import('./New.vue'))
118
- : defineAsyncComponent(() => import('./Old.vue'))
119
- )
120
-
121
153
  const totalMetricItems = ref<number>(0)
122
154
  </script>
123
155
 
@@ -1,6 +1,11 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-counters-table-table-new
3
+ v-if="isNewView"
4
+ v-model:selected-counters="selectedCounters"
5
+ :counters="counters"
6
+ />
7
+ <common-monitor-advanced-tools-chart-options-modal-counters-table-table-old
8
+ v-else
4
9
  v-model:selected-counters="selectedCounters"
5
10
  v-model:pagination="pagination"
6
11
  :counters="counters"
@@ -39,12 +44,6 @@ const { $store }: any = useNuxtApp()
39
44
 
40
45
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
41
46
 
42
- const currentComponent = computed(() =>
43
- isNewView.value
44
- ? defineAsyncComponent(() => import('./new/New.vue'))
45
- : defineAsyncComponent(() => import('./old/Old.vue'))
46
- )
47
-
48
47
  const localization = computed<UI_I_Localization>(() => useLocal())
49
48
 
50
49
  const counters = computed<UI_I_AdvancedCounterItem[]>(() =>
@@ -15,8 +15,8 @@ import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/data
15
15
  import type { UI_I_DataTableBody } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
16
16
  import type { UI_I_Localization } from '~/lib/models/interfaces'
17
17
  import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
18
- import { options } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/new/config/options'
19
- import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/new/config/tableData'
18
+ import { options } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableNew/config/options'
19
+ import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableNew/config/tableData'
20
20
 
21
21
  const selectedCountersLocal = defineModel<number[]>('selectedCounters', {
22
22
  required: true,
@@ -1,7 +1,7 @@
1
1
  import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
2
2
  import type { UI_I_Localization } from '~/lib/models/interfaces'
3
3
  import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
4
- import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/new/utils/constructTable'
4
+ import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableNew/utils/constructTable'
5
5
 
6
6
  export const tableDataFunc = (
7
7
  localization: UI_I_Localization,
@@ -32,7 +32,7 @@ import type {
32
32
  import type { UI_I_Localization } from '~/lib/models/interfaces'
33
33
  import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
34
34
  import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
35
- import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/old/lib/config/tableConfig'
35
+ import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableOld/lib/config/tableConfig'
36
36
 
37
37
  const selectedCountersLocal = defineModel<number[]>('selectedCounters', {
38
38
  required: true,
@@ -4,7 +4,7 @@ import type {
4
4
  UI_I_BodyItem,
5
5
  UI_I_ColumnKey,
6
6
  } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
7
- import type { UI_T_AdvancedCountersColumnKey } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/old/lib/models/types'
7
+ import type { UI_T_AdvancedCountersColumnKey } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableOld/lib/models/types'
8
8
  import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
9
9
  import {
10
10
  constructColumnKey,
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-counters-timespan-new
3
+ v-if="isNewView"
4
4
  :type="props.type"
5
5
  :chart="props.chart"
6
6
  :language="props.language"
@@ -20,12 +20,45 @@
20
20
  :objects-loading="props.objectsLoading"
21
21
  :objects-data="props.objectsData"
22
22
  :valid-date-end="props.validDateEnd"
23
- :current-selected-objects="props.currentSelectedObjects"
24
23
  :error-last-input="props.errorLastInput"
25
24
  :error-date-from="props.errorDateFrom"
26
25
  :error-time-from="props.errorTimeFrom"
27
26
  :error-date-to="props.errorDateTo"
28
27
  :error-time-to="props.errorTimeTo"
28
+ :current-selected-objects="props.currentSelectedObjects"
29
+ @update-chart-type="emits('update-chart-type', $event)"
30
+ @update-custom-time="emits('update-custom-time', $event)"
31
+ @update-timespan-type="emits('update-timespan-type', $event)"
32
+ @update-unit-count="emits('update-unit-count', $event)"
33
+ @update-period-type="emits('update-period-type', $event)"
34
+ @update-custom-date-from="emits('update-custom-date-from', $event)"
35
+ @update-custom-date-to="emits('update-custom-date-to', $event)"
36
+ @update-custom-time-from="emits('update-custom-time-from', $event)"
37
+ @update-custom-time-to="emits('update-custom-time-to', $event)"
38
+ @select-objects="emits('select-objects', $event)"
39
+ />
40
+ <common-monitor-advanced-tools-chart-options-modal-counters-timespan-old
41
+ v-else
42
+ :type="props.type"
43
+ :chart="props.chart"
44
+ :language="props.language"
45
+ :selected-chart-type="props.selectedChartType"
46
+ :selected-timespan-type="props.selectedTimespanType"
47
+ :units-count="props.unitsCount"
48
+ :period-type="props.periodType"
49
+ :selected-custom-time="props.selectedCustomTime"
50
+ :custom-date-from="props.customDateFrom"
51
+ :custom-date-to="props.customDateTo"
52
+ :custom-time-from="props.customTimeFrom"
53
+ :custom-time-to="props.customTimeTo"
54
+ :total-cores="props.totalCores"
55
+ :host-id="props.hostId"
56
+ :selected-metrics-keys="props.selectedMetricsKeys"
57
+ :total-metric-items="props.totalMetricItems"
58
+ :objects-loading="props.objectsLoading"
59
+ :objects-data="props.objectsData"
60
+ :valid-date-end="props.validDateEnd"
61
+ :current-selected-objects="props.currentSelectedObjects"
29
62
  @update-chart-type="emits('update-chart-type', $event)"
30
63
  @update-custom-time="emits('update-custom-time', $event)"
31
64
  @update-timespan-type="emits('update-timespan-type', $event)"
@@ -100,12 +133,6 @@ const emits = defineEmits<{
100
133
  const { $store }: any = useNuxtApp()
101
134
 
102
135
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
103
-
104
- const currentComponent = computed(() =>
105
- isNewView.value
106
- ? defineAsyncComponent(() => import('./New.vue'))
107
- : defineAsyncComponent(() => import('./Old.vue'))
108
- )
109
136
  </script>
110
137
 
111
138
  <style scoped lang="scss"></style>
@@ -1,6 +1,13 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object-object-new
3
+ v-if="isNewView"
4
+ v-model:selected-row="selectedRow"
5
+ :table-type="tableType"
6
+ :loading="props.loading"
7
+ :body-items="bodyItems"
8
+ />
9
+ <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object-object-old
10
+ v-else
4
11
  v-model:selected-row="selectedRow"
5
12
  v-model:column-items="columnItems"
6
13
  v-model:pagination="pagination"
@@ -49,12 +56,6 @@ const { $store }: any = useNuxtApp()
49
56
 
50
57
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
51
58
 
52
- const currentComponent = computed(() =>
53
- isNewView.value
54
- ? defineAsyncComponent(() => import('./new/New.vue'))
55
- : defineAsyncComponent(() => import('./old/Old.vue'))
56
- )
57
-
58
59
  const localization = computed<UI_I_Localization>(() => useLocal())
59
60
 
60
61
  const tableType = computed<UI_T_DataGridType>(() => {
@@ -22,8 +22,8 @@ import type {
22
22
  import type { UI_I_Localization } from '~/lib/models/interfaces'
23
23
  import type { UI_T_DataGridType } from '~/components/atoms/table/dataGrid/lib/models/types'
24
24
  import type { UI_I_BodyItem } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
25
- import { options } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/config/options'
26
- import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/config/tableData'
25
+ import { options } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/config/options'
26
+ import { tableDataFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/config/tableData'
27
27
 
28
28
  const selectedRowLocal = defineModel<number[] | number>('selectedRow', {
29
29
  required: true,
@@ -1,7 +1,7 @@
1
1
  import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
2
2
  import type { UI_I_Localization } from '~/lib/models/interfaces'
3
3
  import type { UI_I_BodyItem } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
4
- import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/new/lib/utils/constructTable'
4
+ import { constructTable } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/objectNew/lib/utils/constructTable'
5
5
 
6
6
  export const tableDataFunc = (
7
7
  localization: UI_I_Localization,
@@ -20,7 +20,8 @@
20
20
  class="data-table"
21
21
  hide-footer
22
22
  server-off
23
- />
23
+ >
24
+ </atoms-table-data-grid>
24
25
  </div>
25
26
  </div>
26
27
  </div>
@@ -1,6 +1,11 @@
1
1
  <template>
2
- <component
3
- :is="currentComponent"
2
+ <common-monitor-advanced-tools-chart-options-modal-metrics-new
3
+ v-if="isNewView"
4
+ v-model:selected-metric="selectedMetricLocal"
5
+ :metrics-items="props.metricsItems"
6
+ />
7
+ <common-monitor-advanced-tools-chart-options-modal-metrics-old
8
+ v-else
4
9
  v-model:selected-metric="selectedMetricLocal"
5
10
  :metrics-items="props.metricsItems"
6
11
  />
@@ -20,12 +25,6 @@ const props = defineProps<{
20
25
  const { $store }: any = useNuxtApp()
21
26
 
22
27
  const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
23
-
24
- const currentComponent = computed(() =>
25
- isNewView.value
26
- ? defineAsyncComponent(() => import('./New.vue'))
27
- : defineAsyncComponent(() => import('./Old.vue'))
28
- )
29
28
  </script>
30
29
 
31
30
  <style scoped lang="scss"></style>
@@ -12,7 +12,7 @@
12
12
  :chart="props.charts[key]"
13
13
  :update="props.updateHelper"
14
14
  />
15
- <common-graph-new-empty-block v-else />
15
+ <common-graph-graph-new-empty-block v-else />
16
16
  </div>
17
17
  </template>
18
18
  </div>
@@ -6,7 +6,7 @@
6
6
  <template v-else>
7
7
  <template
8
8
  v-for="(chartData, key) in props.allData"
9
- :key="chartData.title || key"
9
+ :key="chartData.title"
10
10
  >
11
11
  <div :class="['chart-container', `graph-${chartData.title}`]">
12
12
  <div v-if="chartData.loader" class="graphic-loader-block">
@@ -78,7 +78,6 @@
78
78
  :current-lang="props.currentLang"
79
79
  :valid-date-end="props.validDateEnd"
80
80
  :selected-node-name="props.selectedNodeName"
81
- format-date=""
82
81
  @hide="onHideIntervalModal"
83
82
  @submit="onSubmitIntervalModal"
84
83
  />
@@ -59,7 +59,6 @@
59
59
  :current-lang="props.currentLang"
60
60
  :valid-date-end="props.validDateEnd"
61
61
  :selected-node-name="props.selectedNodeName"
62
- format-date=""
63
62
  @hide="onHideIntervalModal"
64
63
  @submit="onSubmitIntervalModal"
65
64
  />
@@ -45,7 +45,7 @@
45
45
  { loading: props.powerLoading },
46
46
  ]"
47
47
  >
48
- <common-graph-new-empty-block
48
+ <common-graph-graph-new-empty-block
49
49
  v-if="!props.powerData && !props.powerLoading"
50
50
  />
51
51
  <ui-skeleton-long-metric v-if="props.powerLoading" height="336px" />
@@ -65,7 +65,7 @@
65
65
  { loading: props.temperatureLoading },
66
66
  ]"
67
67
  >
68
- <common-graph-new-empty-block
68
+ <common-graph-graph-new-empty-block
69
69
  v-if="!props.temperatureData && !props.temperatureLoading"
70
70
  />
71
71
  <ui-skeleton-long-metric v-if="props.temperatureLoading" height="336px" />
@@ -43,7 +43,6 @@ export interface UI_I_Localization {
43
43
  license: UI_I_ArbitraryObject<string>
44
44
  events: UI_I_ArbitraryObject<string>
45
45
  zabbix: UI_I_ArbitraryObject<string>
46
- monq: UI_I_ArbitraryObject<string>
47
46
  glpi: UI_I_ArbitraryObject<string>
48
47
  remoteConsole: UI_I_ArbitraryObject<string>
49
48
  vmWizard: UI_I_ArbitraryObject<string>
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "bfg-common",
3
3
  "private": false,
4
- "version": "1.6.111",
4
+ "version": "1.6.113",
5
5
  "scripts": {
6
6
  "build": "nuxt build",
7
7
  "dev": "nuxt dev --port=3002",
@@ -1,37 +0,0 @@
1
- <template>
2
- <div class="advanced-system-settings flex flex-col h-full">
3
- <div v-if="props.isLoading" class="flex justify-between items-start mb-4">
4
- <ui-skeleton-item width="160" height="22" />
5
- <ui-skeleton-item width="34" height="34" border-radius="8" />
6
- </div>
7
- <common-configure-advanced-system-settings-tools
8
- v-else
9
- @show-edit-modal="emits('show-edit-modal')"
10
- />
11
- <common-configure-advanced-system-settings-table-view
12
- :data="props.settings"
13
- :is-loading="props.isLoading"
14
- />
15
- </div>
16
- </template>
17
-
18
- <script lang="ts" setup>
19
- import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
20
- import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
21
-
22
- const props = defineProps<{
23
- isLoading: boolean
24
- settings: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
25
- }>()
26
-
27
- const emits = defineEmits<{
28
- (event: 'show-edit-modal'): void
29
- }>()
30
- </script>
31
-
32
- <style lang="scss" scoped>
33
- .advanced-system-settings {
34
- margin-top: 6px;
35
- margin-right: 14px;
36
- }
37
- </style>
@@ -1,36 +0,0 @@
1
- <template>
2
- <atoms-loader
3
- v-show="props.isLoading"
4
- test-id="advanced-system-settings-spinner"
5
- />
6
- <div class="advanced-system-settings flex flex-col h-full">
7
- <common-configure-advanced-system-settings-tools
8
- class="mb-1"
9
- @show-edit-modal="emits('show-edit-modal')"
10
- />
11
-
12
- <common-configure-advanced-system-settings-table-view
13
- :data="props.settings"
14
- />
15
- </div>
16
- </template>
17
-
18
- <script lang="ts" setup>
19
- import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
20
- import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
21
-
22
- const props = defineProps<{
23
- isLoading: boolean
24
- settings: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
25
- }>()
26
-
27
- const emits = defineEmits<{
28
- (event: 'show-edit-modal'): void
29
- }>()
30
- </script>
31
-
32
- <style lang="scss" scoped>
33
- .advanced-system-settings {
34
- padding-left: 10px;
35
- }
36
- </style>