bfg-common 1.1.60 → 1.1.61

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.
@@ -646,20 +646,43 @@ export const getDefaultCounters = (
646
646
  type: string,
647
647
  view: string
648
648
  ): UI_I_AdvancedCounterItem[] => {
649
- if (type === 'datacenter') {
650
- return [hostItemsFunc('cpu', {})[0]]
651
- } else if (type === 'host') {
652
- if (view === 'cpuUsageInPercent')
653
- return hostItemsFunc('cpu', {}).splice(0, 2)
654
- else if (view === 'disk') {
655
- const allItems = hostItemsFunc('disk', {})
656
- return allItems.filter((_, key) => [0, 14].includes(key))
657
- } else if (view === 'memory') return hostItemsFunc('memory', {})
658
- else if (view === 'network')
659
- return hostItemsFunc('network', {}).splice(1, 3)
660
- } else if (type === 'vm') {
661
- if (view === 'cpuUsageInPercent') return []
649
+ switch (type) {
650
+ case 'datacenter':
651
+ return [hostItemsFunc('cpu', {})[0]]
652
+ case 'host':
653
+ switch (view) {
654
+ case 'cpuUsageInPercent':
655
+ return hostItemsFunc('cpu', {}).splice(0, 2)
656
+ case 'disk':
657
+ const allItems = hostItemsFunc('disk', {})
658
+ return allItems.filter((_, key) => [0, 14].includes(key))
659
+ case 'memory':
660
+ return hostItemsFunc('memory', {})
661
+ case 'network':
662
+ return hostItemsFunc('network', {}).splice(1, 3)
663
+ }
664
+ break
665
+ case 'vm':
666
+ switch (view) {
667
+ case 'cpuUsageInPercent':
668
+ return []
669
+ }
662
670
  }
663
671
 
672
+ // if (type === 'datacenter') {
673
+ // return [hostItemsFunc('cpu', {})[0]]
674
+ // } else if (type === 'host') {
675
+ // if (view === 'cpuUsageInPercent')
676
+ // return hostItemsFunc('cpu', {}).splice(0, 2)
677
+ // else if (view === 'disk') {
678
+ // const allItems = hostItemsFunc('disk', {})
679
+ // return allItems.filter((_, key) => [0, 14].includes(key))
680
+ // } else if (view === 'memory') return hostItemsFunc('memory', {})
681
+ // else if (view === 'network')
682
+ // return hostItemsFunc('network', {}).splice(1, 3)
683
+ // } else if (type === 'vm') {
684
+ // if (view === 'cpuUsageInPercent') return []
685
+ // }
686
+
664
687
  return []
665
688
  }
@@ -9,44 +9,105 @@ export const getValidDateByOptionFunc = (
9
9
  const newDate = new Date()
10
10
  let startTime = 0
11
11
 
12
- if (type === 'real_time') startTime = subHours(newDate, 1).getTime()
13
- else if (type === 'last_day') startTime = subDays(newDate, 1).getTime()
14
- else if (type === 'last_week') startTime = subWeeks(newDate, 1).getTime()
15
- else if (type === 'last_month') startTime = subMonths(newDate, 1).getTime()
16
- else if (type === 'last_year') startTime = subYears(newDate, 1).getTime()
17
- else if (type === 'custom_interval' && selectedOptions) {
18
- if (selectedOptions.timespan.periodType === 'last') {
19
- const currentUnits =
20
- selectedOptions.timespan.unitsCount < 1
21
- ? 1
22
- : +selectedOptions.timespan.unitsCount
12
+ switch (type) {
13
+ case 'real_time':
14
+ startTime = subHours(newDate, 1).getTime()
15
+ break
16
+ case 'last_day':
17
+ startTime = subDays(newDate, 1).getTime()
18
+ break
19
+ case 'last_week':
20
+ startTime = subWeeks(newDate, 1).getTime()
21
+ break
22
+ case 'last_month':
23
+ startTime = subMonths(newDate, 1).getTime()
24
+ break
25
+ case 'last_year':
26
+ startTime = subYears(newDate, 1).getTime()
27
+ break
28
+ case 'custom_interval':
29
+ if (selectedOptions) {
30
+ switch (selectedOptions.timespan.periodType) {
31
+ case 'last':
32
+ const currentUnits =
33
+ selectedOptions.timespan.unitsCount < 1
34
+ ? 1
35
+ : +selectedOptions.timespan.unitsCount
23
36
 
24
- if (selectedOptions.timespan.units === 'hours')
25
- startTime = subHours(newDate, currentUnits).getTime()
26
- else if (selectedOptions.timespan.units === 'days')
27
- startTime = subDays(newDate, currentUnits).getTime()
28
- else if (selectedOptions.timespan.units === 'weeks')
29
- startTime = subWeeks(newDate, currentUnits).getTime()
30
- else if (selectedOptions.timespan.units === 'months')
31
- startTime = subMonths(newDate, currentUnits).getTime()
32
- }
33
- } else if (
34
- type === 'custom_interval' &&
35
- !selectedOptions &&
36
- typeof unitsCount === 'number' &&
37
- typeof timeType === 'string'
38
- ) {
39
- if (timeType === 'hours')
40
- startTime = subHours(newDate, unitsCount).getTime()
41
- else if (timeType === 'days')
42
- startTime = subDays(newDate, unitsCount).getTime()
43
- else if (timeType === 'weeks')
44
- startTime = subWeeks(newDate, unitsCount).getTime()
45
- else if (timeType === 'months')
46
- startTime = subMonths(newDate, unitsCount).getTime()
47
-
48
- console.log(startTime, timeType, 777888)
37
+ switch (selectedOptions.timespan.units) {
38
+ case 'hours':
39
+ startTime = subHours(newDate, currentUnits).getTime()
40
+ break
41
+ case 'days':
42
+ startTime = subDays(newDate, currentUnits).getTime()
43
+ break
44
+ case 'weeks':
45
+ startTime = subWeeks(newDate, currentUnits).getTime()
46
+ break
47
+ case 'months':
48
+ startTime = subMonths(newDate, currentUnits).getTime()
49
+ break
50
+ }
51
+ }
52
+ } else if (
53
+ !selectedOptions &&
54
+ typeof unitsCount === 'number' &&
55
+ typeof timeType === 'string'
56
+ ) {
57
+ switch (timeType) {
58
+ case 'hours':
59
+ startTime = subHours(newDate, unitsCount).getTime()
60
+ break
61
+ case 'days':
62
+ startTime = subDays(newDate, unitsCount).getTime()
63
+ break
64
+ case 'weeks':
65
+ startTime = subWeeks(newDate, unitsCount).getTime()
66
+ break
67
+ case 'months':
68
+ startTime = subMonths(newDate, unitsCount).getTime()
69
+ break
70
+ }
71
+ }
72
+ break
49
73
  }
50
74
 
75
+ // if (type === 'real_time') startTime = subHours(newDate, 1).getTime()
76
+ // else if (type === 'last_day') startTime = subDays(newDate, 1).getTime()
77
+ // else if (type === 'last_week') startTime = subWeeks(newDate, 1).getTime()
78
+ // else if (type === 'last_month') startTime = subMonths(newDate, 1).getTime()
79
+ // else if (type === 'last_year') startTime = subYears(newDate, 1).getTime()
80
+ // else if (type === 'custom_interval' && selectedOptions) {
81
+ // if (selectedOptions.timespan.periodType === 'last') {
82
+ // const currentUnits =
83
+ // selectedOptions.timespan.unitsCount < 1
84
+ // ? 1
85
+ // : +selectedOptions.timespan.unitsCount
86
+ //
87
+ // if (selectedOptions.timespan.units === 'hours')
88
+ // startTime = subHours(newDate, currentUnits).getTime()
89
+ // else if (selectedOptions.timespan.units === 'days')
90
+ // startTime = subDays(newDate, currentUnits).getTime()
91
+ // else if (selectedOptions.timespan.units === 'weeks')
92
+ // startTime = subWeeks(newDate, currentUnits).getTime()
93
+ // else if (selectedOptions.timespan.units === 'months')
94
+ // startTime = subMonths(newDate, currentUnits).getTime()
95
+ // }
96
+ // } else if (
97
+ // type === 'custom_interval' &&
98
+ // !selectedOptions &&
99
+ // typeof unitsCount === 'number' &&
100
+ // typeof timeType === 'string'
101
+ // ) {
102
+ // if (timeType === 'hours')
103
+ // startTime = subHours(newDate, unitsCount).getTime()
104
+ // else if (timeType === 'days')
105
+ // startTime = subDays(newDate, unitsCount).getTime()
106
+ // else if (timeType === 'weeks')
107
+ // startTime = subWeeks(newDate, unitsCount).getTime()
108
+ // else if (timeType === 'months')
109
+ // startTime = subMonths(newDate, unitsCount).getTime()
110
+ // }
111
+
51
112
  return [startTime, newDate.getTime()]
52
113
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "bfg-common",
3
3
  "private": false,
4
- "version": "1.1.60",
4
+ "version": "1.1.61",
5
5
  "scripts": {
6
6
  "build": "nuxt build",
7
7
  "dev": "nuxt dev --port=3002",