bfg-common 1.1.18 → 1.1.20

package/components/common/monitor/advanced/Advanced.vue

@@ -20,11 +20,13 @@
             :selected-metric="props.selectedMetric"
             :disabled-period="props.disabledPeriod"
             :disabled-view="props.disabledView"
+            :selected-chart-type="props.selectedChartType"
             @update-tools="onUpdateTools"
             @exporting="onExporting"
             @open-advanced-page="onGetEmptyPage"
             @select-row="emits('select-row', $event)"
             @select-metric="emits('select-metric', $event)"
+            @update-chart-type="emits('update-chart-type', $event)"
           />
 
           <div v-show="!props.data" class="empty-container">
@@ -45,6 +47,7 @@
                 :formatted-datetime="props.formattedDatetime"
                 :get-date-format="props.getDateFormat"
                 :language="props.language"
+                :selected-chart-type="props.selectedChartType"
               />
               <div class="datatable">
                 <common-monitor-advanced-table
@@ -83,6 +86,7 @@ const props = defineProps<{
   getDateFormat: any
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
+  selectedChartType: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -93,6 +97,7 @@ const emits = defineEmits<{
   (event: 'update-selected-row', value: number[]): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/monitor/advanced/GraphView.vue

@@ -33,6 +33,7 @@ const props = defineProps<{
   formattedDatetime: any
   getDateFormat: any
   language: string
+  selectedChartType: string
 }>()
 
 const chartData = ref<I_LineGraph | null>(null)
@@ -62,7 +63,7 @@ const startChart = (): void => {
     true,
     false,
     false,
-    '',
+    props.selectedChartType,
     '',
     0,
     chartCallback,
@@ -99,6 +100,14 @@ watch(
   }
 )
 
+watch(
+  () => props.selectedChartType,
+  () => {
+    startChart()
+  },
+  { immediate: true }
+)
+
 const chartsView = ref(null)
 const { width } = useElementSize(chartsView)
 

package/components/common/monitor/advanced/tools/Tools.vue

@@ -87,9 +87,11 @@
     :language="props.language"
     :selected-counters-keys="props.selectedCountersKeys"
     :selected-metric="props.selectedMetric"
+    :selected-chart-type="props.selectedChartType"
     @hide="isShowModal = false"
     @select-row="emits('select-row', $event)"
     @select-metric="emits('select-metric', $event)"
+    @update-chart-type="emits('update-chart-type', $event)"
   />
 </template>
 
@@ -118,6 +120,7 @@ const props = defineProps<{
   language: string
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
+  selectedChartType: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -128,6 +131,7 @@ const emits = defineEmits<{
   (event: 'open-advanced-page'): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

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

@@ -26,7 +26,9 @@
               :language="props.language"
               :type="props.type"
               :selected-keys="props.selectedCountersKeys"
+              :selected-chart-type="props.selectedChartType"
               @select-row="selectedRows = $event"
+              @update-chart-type="selectedChartType = $event"
             />
           </div>
         </div>
@@ -51,12 +53,14 @@ const props = defineProps<{
   language: string
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
+  selectedChartType: string
 }>()
 
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -81,6 +85,7 @@ const onHide = (): void => {
 }
 
 const selectedRows = ref<UI_I_AdvancedCounterItem[]>([])
+const selectedChartType = ref<string>('')
 
 const checkValidations = (): boolean => {
   if (selectedRows.value.length) return true
@@ -96,6 +101,7 @@ const onSave = (): void => {
 
   emits('select-metric', selectedMetric.value)
   emits('select-row', selectedRows.value)
+  emits('update-chart-type', selectedChartType.value)
   onHide()
 }
 </script>

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

@@ -9,6 +9,8 @@
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan
       :language="props.language"
       :selected="selectedOptions"
+      :selected-chart-type="props.selectedChartType"
+      @update-chart-type="emits('update-chart-type', $event)"
     />
   </div>
 </template>
@@ -29,10 +31,12 @@ const props = defineProps<{
   chart: T_ChartHost | T_ChartVm
   type: UI_T_AdvancedType
   selectedKeys: number[]
+  selectedChartType: string
 }>()
 
 const emits = defineEmits<{
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const selectedOptions = ref<UI_I_AdvancedTargetObject[][]>([])

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

@@ -2,6 +2,8 @@
   <div class="timespan-objects-section-direction flex horizontal">
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-form
       :language="props.language"
+      :selected-chart-type="props.selectedChartType"
+      @update-chart-type="emits('update-chart-type', $event)"
     />
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
       :selected="props.selected"
@@ -15,6 +17,11 @@ import { UI_I_AdvancedTargetObject } from '~/components/common/monitor/advanced/
 const props = defineProps<{
   selected: UI_I_AdvancedTargetObject[][]
   language: string
+  selectedChartType: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
 }>()
 </script>
 

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

@@ -188,7 +188,7 @@
             >{{ localization.chartType }}:</label
           >
           <div class="select">
-            <select id="chart-type-select" v-model="selectedChartType">
+            <select id="chart-type-select" v-model="chartType">
               <option
                 v-for="(item, index) in chartTypeOptions"
                 :key="index"
@@ -216,6 +216,11 @@ import {
 
 const props = defineProps<{
   language: string
+  selectedChartType: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const { $formattedDate, $isDate, $getTimeFormat, $getUnixByDate } = useNuxtApp()
@@ -236,11 +241,38 @@ const customTimeOptions = computed<UI_I_OptionItem[]>(() =>
   customTimeFunc(localization.value)
 )
 
-const selectedChartType = ref<string>('line_graph')
+const chartType = ref<string>('line_graph')
 const chartTypeOptions = computed<UI_I_OptionItem[]>(() =>
   chartTypeFunc(localization.value)
 )
 
+const setCurrentChartType = (): void => {
+  const selected = props.selectedChartType
+  let result = 'line_graph'
+
+  if (selected === 'spline') result = 'line_graph'
+  else if (selected === 'area') result = 'stacked_graph'
+
+  chartType.value = result
+}
+
+watch(
+  () => props.selectedChartType,
+  () => {
+    setCurrentChartType()
+  },
+  { immediate: true }
+)
+
+watch(chartType, (newValue) => {
+  let currentValue = 'spline'
+
+  if (newValue === 'line_graph') currentValue = 'spline'
+  else if (newValue === 'stacked_graph') currentValue = 'area'
+
+  emits('update-chart-type', currentValue)
+})
+
 const yesterday = new Date().setDate(new Date().getDate() - 1)
 const dateFrom = ref<number>(yesterday)
 const dateTo = ref<number>(new Date().getTime())

package/components/common/vm/actions/add/select/storage/config/config.ts

@@ -1,148 +1,154 @@
-import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
-import type {
-  UI_I_ColumnKey,
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/models/interfaces'
-import type { UI_I_Localization } from '~/models/interfaces'
-import { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/add/select/storage/models/types'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/utils/constructDataTable'
-
-export const storageTableKeys: UI_T_StorageColumnKeys = [
-  'name',
-  'state',
-  'capacity_mb',
-  'provisioned_mb',
-  'free_mb',
-  'used_mb',
-  'type_text',
-  'thin_provisioning',
-  'access_mode',
-  'hardware_acceleration',
-  'drive_type',
-  'device',
-  'storage_io_control',
-]
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [localization.name, true, '96px', storageTableKeys[0]],
-    [localization.state, true, '138px', storageTableKeys[1]],
-    [localization.capacity, true, '110px', storageTableKeys[2]],
-    [localization.provisioned, true, '128px', storageTableKeys[3]],
-    [localization.free, true, '110px', storageTableKeys[4]],
-    [localization.used, true, '110px', storageTableKeys[5]],
-    [localization.type, true, '110px', storageTableKeys[6]],
-    [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
-    [localization.access, true, '110px', storageTableKeys[8]],
-    [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
-    [localization.driverType, true, '110px', storageTableKeys[10]],
-    [localization.device, true, '110px', storageTableKeys[11]],
-    [localization.storageIoControl, true, '110px', storageTableKeys[12]],
-  ]
-}
-
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
-  })
-  return result
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_DatastoreTableItem[],
-  localization: UI_I_Localization
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-  const { $binary } = useNuxtApp()
-
-  data.forEach((storage: UI_I_DatastoreTableItem, key: number) => {
-    bodyItems.push([
-      {
-        key: 'icon',
-        text: storage[storageTableKeys[0]].toString(),
-        data: 'vsphere-icon-datastore',
-        id: key,
-      },
-      {
-        key: 'col1',
-        text: storage[storageTableKeys[1]].text,
-        id: key,
-      },
-      {
-        key: 'col2',
-        text: $binary.round(storage.capacity[storageTableKeys[2]]),
-        id: key,
-      },
-      {
-        key: 'col3',
-        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
-        id: key,
-      },
-      {
-        key: 'col4',
-        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
-        id: key,
-      },
-      {
-        key: 'col5',
-        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
-        id: key,
-      },
-      {
-        key: 'col6',
-        text: storage[storageTableKeys[6]].toString(),
-        id: key,
-      },
-      {
-        key: 'col7',
-        text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
-        id: key,
-      },
-      {
-        key: 'col8',
-        text: storage[storageTableKeys[8]].toString(),
-        id: key,
-      },
-      {
-        key: 'col9',
-        text: storage[storageTableKeys[9]].toString(),
-        id: key,
-      },
-      {
-        key: 'col10',
-        text: storage[storageTableKeys[10]].toString(),
-        id: key,
-      },
-      {
-        key: 'col11',
-        text: storage[storageTableKeys[11]].toString(),
-        id: key,
-      },
-      {
-        key: 'col12',
-        text: storage[storageTableKeys[12]].toString(),
-        id: key,
-      },
-    ])
-  })
-  return bodyItems
-}
+import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/models/interfaces'
+import type { UI_I_Localization } from '~/models/interfaces'
+import { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/add/select/storage/models/types'
+import {
+  constructColumnKey,
+  constructHeadItem,
+} from '~/components/atoms/table/dataGrid/utils/constructDataTable'
+import {
+  datastoreIconByState,
+  datastoreLocalizationByState,
+} from '~/components/common/config/states'
+
+export const storageTableKeys: UI_T_StorageColumnKeys = [
+  'name',
+  'state',
+  'capacity_mb',
+  'provisioned_mb',
+  'free_mb',
+  'used_mb',
+  'type_text',
+  'thin_provisioning',
+  'access_mode',
+  'hardware_acceleration',
+  'drive_type',
+  'device',
+  'storage_io_control',
+]
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.name, true, '96px', storageTableKeys[0]],
+    [localization.state, true, '138px', storageTableKeys[1]],
+    [localization.capacity, true, '110px', storageTableKeys[2]],
+    [localization.provisioned, true, '128px', storageTableKeys[3]],
+    [localization.free, true, '110px', storageTableKeys[4]],
+    [localization.used, true, '110px', storageTableKeys[5]],
+    [localization.type, true, '110px', storageTableKeys[6]],
+    [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
+    [localization.access, true, '110px', storageTableKeys[8]],
+    [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
+    [localization.driverType, true, '110px', storageTableKeys[10]],
+    [localization.device, true, '110px', storageTableKeys[11]],
+    [localization.storageIoControl, true, '110px', storageTableKeys[12]],
+  ]
+}
+
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 0 ? 'icon' : `col${i}`
+    result.push(constructColumnKey(col, item[0], item[1]))
+  })
+  return result
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 0 ? 'icon' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_DatastoreTableItem[],
+  localization: UI_I_Localization
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+  const { $binary } = useNuxtApp()
+
+  data.forEach((storage: UI_I_DatastoreTableItem, key: number) => {
+    const state =
+      localization[datastoreLocalizationByState[storage[storageTableKeys[1]]]]
+    bodyItems.push([
+      {
+        key: 'icon',
+        text: storage[storageTableKeys[0]].toString(),
+        data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
+        id: key,
+      },
+      {
+        key: 'col1',
+        text: state,
+        id: key,
+      },
+      {
+        key: 'col2',
+        text: $binary.round(storage.capacity[storageTableKeys[2]]),
+        id: key,
+      },
+      {
+        key: 'col3',
+        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
+        id: key,
+      },
+      {
+        key: 'col4',
+        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
+        id: key,
+      },
+      {
+        key: 'col5',
+        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
+        id: key,
+      },
+      {
+        key: 'col6',
+        text: storage[storageTableKeys[6]].toString(),
+        id: key,
+      },
+      {
+        key: 'col7',
+        text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
+        id: key,
+      },
+      {
+        key: 'col8',
+        text: storage[storageTableKeys[8]].toString(),
+        id: key,
+      },
+      {
+        key: 'col9',
+        text: storage[storageTableKeys[9]].toString(),
+        id: key,
+      },
+      {
+        key: 'col10',
+        text: storage[storageTableKeys[10]].toString(),
+        id: key,
+      },
+      {
+        key: 'col11',
+        text: storage[storageTableKeys[11]].toString(),
+        id: key,
+      },
+      {
+        key: 'col12',
+        text: storage[storageTableKeys[12]].toString(),
+        id: key,
+      },
+    ])
+  })
+  return bodyItems
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.1.18",
+  "version": "1.1.20",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",