bfg-common 1.0.29 → 1.0.31

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

@@ -118,7 +118,7 @@
                       <div class="section-datepicker">
                         <atoms-datepicker
                           v-model="dateFrom"
-                          :lang="currentLang"
+                          :lang="props.language"
                           class="calendar-from calendar-popup btn-show-hide-calendar"
                           @update="onUpdateDateFrom"
                         />
@@ -152,7 +152,7 @@
                       <div class="section-datepicker">
                         <atoms-datepicker
                           v-model="dateTo"
-                          :lang="currentLang"
+                          :lang="props.language"
                           class="calendar-from calendar-popup btn-show-hide-calendar"
                           @update="onUpdateDateTo"
                         />
@@ -174,7 +174,7 @@
                       { active: timespanRadioSelect === 'from' },
                     ]"
                   >
-                    <span> (time is in ISO 8601 format) </span>
+                    <span> ({{ localization.isoTimeFormat }}) </span>
                   </td>
                 </tr>
               </tbody>
@@ -214,8 +214,11 @@ import {
   chartTypeFunc,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/config/dateForm'
 
-const { $store, $formattedDate, $isDate, $getTimeFormat, $getUnixByDate } =
-  useNuxtApp()
+const props = defineProps<{
+  language: string
+}>()
+
+const { $formattedDate, $isDate, $getTimeFormat, $getUnixByDate } = useNuxtApp()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -242,16 +245,6 @@ const yesterday = new Date().setDate(new Date().getDate() - 1)
 const dateFrom = ref<number>(yesterday)
 const dateTo = ref<number>(new Date().getTime())
 
-const currentLang = ref<string>(useLocalStorage('lang') ?? 'ru_RU')
-
-const timeFormatUpdater = computed<number>(
-  () => $store.getters['main/getTimeFormatUpdater']
-)
-watch(timeFormatUpdater, () => {
-  currentLang.value = useLocalStorage('lang') ?? 'ru_RU'
-  getCurrentTime()
-})
-
 const currentDateFrom = ref<string>('')
 const currentDateTo = ref<string>('')
 const currentTimeFrom = ref<string>('')

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

@@ -1,26 +1,36 @@
 <template>
   <div class="chart-option-groups-container">
     <span>{{ localization.chartMetrics }}</span>
-    <atoms-tabs-vertical-tabs v-model="selectedMetric" :items="metricsItems" />
+    <atoms-tabs-vertical-tabs
+      v-model="selectedMetricLocal"
+      :items="props.metricsItems"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
 import { UI_I_Localization } from '~/models/interfaces'
 import { UI_I_VerticalTabs } from '~/components/atoms/tabs/models/interfaces'
-import { metricsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/metrics/config/optionsMetrics'
-import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/types'
 
 const props = defineProps<{
-  type: UI_T_AdvancedType
+  metricsItems: UI_I_VerticalTabs[]
+  selectedMetric: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update:selected-metric', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const metricsItems = computed<UI_I_VerticalTabs[]>(() =>
-  metricsFunc(localization.value, props.type)
-)
-const selectedMetric = ref<string>(metricsItems.value[0].value)
+const selectedMetricLocal = computed<string>({
+  get() {
+    return props.selectedMetric
+  },
+  set(newValue) {
+    emits('update:selected-metric', newValue)
+  },
+})
 </script>
 
 <style scoped lang="scss">

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/config/optionsMetrics.ts

@@ -13,14 +13,16 @@ export const metricsFunc = (
         text: localization.cpu,
         value: 'cpu',
       },
-      {
-        text: currentRegister(localization.clusterServices, 'first'),
-        value: 'cluster_services',
-      },
-      {
-        text: localization.datastore,
-        value: 'datastore',
-      },
+      // {
+      //   text: currentRegister(localization.clusterServices, 'first'),
+      //   value: 'cluster_services',
+      //   disabled: true,
+      // },
+      // {
+      //   text: localization.datastore,
+      //   value: 'datastore',
+      //   disabled: true,
+      // },
       {
         text: localization.disk,
         value: 'disk',
@@ -33,72 +35,64 @@ export const metricsFunc = (
         text: localization.network,
         value: 'network',
       },
-      {
-        text: localization.power,
-        value: 'power',
-      },
-      {
-        text: currentRegister(localization.storageAdapter, 'first'),
-        value: 'storage_adapter',
-      },
-      {
-        text: localization.storagePath,
-        value: 'storage_path',
-      },
-      {
-        text: localization.system,
-        value: 'system',
-      },
-      {
-        text: currentRegister(localization.procuratorReplication, 'last'),
-        value: 'v_sphere_replication',
-      },
+      // {
+      //   text: localization.power,
+      //   value: 'power',
+      //   disabled: true,
+      // },
+      // {
+      //   text: currentRegister(localization.storageAdapter, 'first'),
+      //   value: 'storage_adapter',
+      //   disabled: true,
+      // },
+      // {
+      //   text: localization.storagePath,
+      //   value: 'storage_path',
+      //   disabled: true,
+      // },
+      // {
+      //   text: localization.system,
+      //   value: 'system',
+      //   disabled: true,
+      // },
+      // {
+      //   text: currentRegister(localization.procuratorReplication, 'last'),
+      //   value: 'v_sphere_replication',
+      //   disabled: true,
+      // },
     ],
     vm: [
-      {
-        text: localization.cpu,
-        value: 'cpu',
-      },
-      {
-        text: localization.datastore,
-        value: 'datastore',
-      },
       {
         text: localization.disk,
         value: 'disk',
       },
-      {
-        text: localization.memory,
-        value: 'memory',
-      },
       {
         text: localization.network,
         value: 'network',
       },
       {
-        text: localization.power,
-        value: 'power',
+        text: localization.cpu,
+        value: 'cpu',
+      },
+      {
+        text: localization.memory,
+        value: 'memory',
       },
       {
-        text: localization.system,
-        value: 'system',
+        text: localization.datastore,
+        value: 'datastore',
       },
-      { text: localization.virtualDisk, value: 'virtualDisk' },
+      // {
+      //   text: localization.power,
+      //   value: 'power',
+      // },
+      // {
+      //   text: localization.system,
+      //   value: 'system',
+      // },
+      // { text: localization.virtualDisk, value: 'virtualDisk' },
     ],
   }
 
   return metrics[type]
 }
-
-const currentRegister = (text: string, type: string): string => {
-  let result = ''
-  const { $text } = useNuxtApp()
-
-  if (type === 'first') {
-    result = $text.toCapitalize(text)
-  } else if (type === 'last') {
-    result = $text.toCapitalizeByIndex(text, [1])
-  }
-
-  return result
-}

package/components/common/monitor/advanced/tools/chartOptionsModal/models/types.ts

@@ -0,0 +1,3 @@
+export type T_ChartHost = 'cpu' | 'memory' | 'network' | 'disk'
+
+export type T_ChartVm = 'cpu' | 'memory' | 'network' | 'disk' | 'datastore'

package/components/common/monitor/models/interfaces.ts

@@ -10,8 +10,10 @@ export interface UI_I_GraphDataSettingItem {
 export interface UI_I_MonitorGraphPayload {
   period: number[]
   view: string
+  periodType?: string
   id?: string
   requestType?: UI_T_OverviewRequestType
   storageId?: string
   hostName?: string
+  fields?: string
 }

package/package.json

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

package/public/spice-console/application/application.js

@@ -485,7 +485,7 @@ Application = $.spcExtend(wdi.DomainObject, {
     },
 
     sendCtrlAltDelete: function() {
-        this._sendCtrlKey(225, 46);
+        this._sendCtrlKey(18, 46);
     },
 
     _sendCtrlKey: function (keycode, keycode2){