bfg-common 1.3.595 → 1.3.596

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

@@ -10,7 +10,7 @@
           v-model:column-keys="columnItems"
           v-model:page-size="pagination.pageSize"
           v-model:page="pagination.page"
-          type="checkbox"
+          :type="tableType"
           class="data-table"
           test-id="object-table"
           :loading="props.loading"
@@ -35,7 +35,9 @@ import type {
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type { UI_T_DataGridType } from '~/components/atoms/table/dataGrid/lib/models/types'
 import type { UI_I_AdvancedTargetObject } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
 import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/config/objectTable'
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type {
@@ -52,16 +54,20 @@ const props = defineProps<{
   totalMetricItems: number
   selectedObjects: string
   loading: boolean
+  currentItems: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
   (event: 'select-objects', value: string): void
-  (event: 'update-cores'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedRow = ref<number[]>([])
+const tableType = computed<UI_T_DataGridType>(() =>
+  ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
+)
+
+const selectedRow = ref<number[] | number>([])
 const pagination = ref<UI_I_Pagination>({
   page: 1,
   pageSize: 35,
@@ -101,6 +107,7 @@ watch(
     props.totalCores,
     props.hostId,
     props.selectedMetricsKeys,
+    props.currentItems,
   ],
   (newValue) => {
     items = []
@@ -141,10 +148,16 @@ watch(
           target_object: 'averageMHz',
         })
       }
-      bodyItems.value = table.bodyItems(items)
-    } else bodyItems.value = []
+    } else if (
+      newValue[0] === 'host' &&
+      ['disk', 'network'].includes(newValue[1])
+    ) {
+      items = props.currentItems
+    }
+
+    bodyItems.value = table.bodyItems(items)
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 
 watch(
@@ -152,9 +165,12 @@ watch(
   (newValue) => {
     const selectedItems: string[] = []
 
-    newValue.forEach((key) => {
-      selectedItems.push(items[key].id)
-    })
+    if (['disk', 'network'].includes(props.chart)) {
+      selectedItems.push(items[newValue]?.target_object)
+    } else
+      newValue.forEach((key) => {
+        selectedItems.push(items[key].id)
+      })
 
     const selectedNames =
       items.length === newValue.length &&
@@ -185,13 +201,19 @@ watch(
         })
         selectedRow.value = selectedKeys
       }
+    } else if (
+      props.type === 'host' &&
+      ['disk', 'network'].includes(props.chart)
+    ) {
+      if (selected) {
+        const selectedId = all.find((item) => item[0].text === selected)?.[0]
+          ?.id
+        typeof selectedId === 'number' && (selectedRow.value = selectedId)
+      }
     }
   },
   { immediate: true }
 )
-onMounted(() => {
-  emits('update-cores')
-})
 </script>
 
 <style scoped lang="scss">

package/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit.ts

@@ -1,12 +1,17 @@
 export const checkIsDisabledSubmit = (
   type: string,
   selectedMetric: string,
+  selectedRowsLength: number,
   localSelectedObjects: string
 ): boolean => {
-  let result = false
+  let result = !selectedRowsLength
 
-  if (type === 'host' && selectedMetric === 'cpu' && !localSelectedObjects)
-    result = true
+  if (type === 'host') {
+    if (selectedMetric === 'cpu' && !localSelectedObjects) result = true
+    else if (selectedMetric === 'disk') {
+      result = !localSelectedObjects
+    }
+  }
 
   return result
 }

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

@@ -43,7 +43,7 @@ const getItems = (
     [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.common.access, true, '110px', storageTableKeys[8]],
     [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
     [localization.driverType, true, '110px', storageTableKeys[10]],
     [localization.device, true, '110px', storageTableKeys[11]],

package/components/common/wizards/datastore/add/nfs/configuration/Configuration.vue

@@ -90,9 +90,9 @@
         >
           <div class="flex-align-center input-action-wrapper">
             <input
-              id="configuration-folder-input"
+              id="configuration-server-input"
               v-model="form.server.value"
-              data-id="configuration-folder-input"
+              data-id="configuration-server-input"
               type="text"
               class="clr-input"
               @blur="onBlurInputServer"

package/components/common/wizards/vm/migrate/select/storage/table/datastore/lib/config/config.ts

@@ -43,7 +43,7 @@ const getItems = (
     [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.common.access, true, '110px', storageTableKeys[8]],
     [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
     [localization.driverType, true, '110px', storageTableKeys[10]],
     [localization.device, true, '110px', storageTableKeys[11]],

package/composables/productNameLocal.ts

@@ -1,40 +1,47 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
-
-export function productNameLocal(
-  localization: UI_I_Localization
-): UI_I_Localization {
-  const config = useRuntimeConfig()
-
-  const productName =
-    config.public.LOCALIZATION_CODE === 'ru'
-      ? config.public.PRODUCT_NAME_RU
-      : config.public.PRODUCT_NAME_EN
-
-  return replaceProductNameRecursion(localization, productName)
-}
-
-const replaceProductNameRecursion = (
-  localization: UI_I_Localization,
-  productName: any
-): UI_I_Localization => {
-  for (const key of Object.keys(localization)) {
-    const item = localization[key as UI_T_LanguageKey]
-    // TODO move to config
-    const localizationKeys = [
-      'common',
-      'auth',
-      'home',
-      'tasks',
-      'layout',
-      'mainNavigation'
-    ]
-    if (localizationKeys.includes(key)) {
-      for (const key2 of Object.keys(item)) {
-        item[key2] = item[key2].replaceAll('{productName}', productName)
-      }
-    }
-  }
-
-  return localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
+
+export function productNameLocal(
+  localization: UI_I_Localization
+): UI_I_Localization {
+  const config = useRuntimeConfig()
+
+  const productName =
+    config.public.LOCALIZATION_CODE === 'ru'
+      ? config.public.PRODUCT_NAME_RU
+      : config.public.PRODUCT_NAME_EN
+
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    const item = localization[key as UI_T_LanguageKey]
+    // TODO move to config
+    const localizationKeys = [
+      'common',
+      'auth',
+      'home',
+      'tasks',
+      'layout',
+      'mainNavigation',
+      'administration',
+      'inventoryConfigure',
+      'datastoreWizard',
+      'inventorySummary',
+      'contextMenu',
+      'networks',
+      'inventory',
+    ]
+    if (localizationKeys.includes(key)) {
+      for (const key2 of Object.keys(item)) {
+        item[key2] = item[key2].replaceAll('{productName}', productName)
+      }
+    }
+  }
+
+  return localization
+}

package/composables/useEnvLanguage.ts

@@ -3,9 +3,9 @@ export function useEnvLanguage(): string {
 
   let localizationCode = 'en_US'
   const langFromLocalStorage =
+    $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
     useLocalStorage('lang') ||
-    useLocalStorage('languageType') ||
-    $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+    useLocalStorage('languageType')
 
   if (langFromLocalStorage) {
     if (

package/lib/models/interfaces.ts

@@ -20,6 +20,13 @@ export interface UI_I_Localization {
   tasks: UI_I_ArbitraryObject<string>
   layout: UI_I_ArbitraryObject<string>
   mainNavigation: UI_I_ArbitraryObject<string>
+  administration: UI_I_ArbitraryObject<string>
+  inventoryConfigure: UI_I_ArbitraryObject<string>
+  datastoreWizard: UI_I_ArbitraryObject<string>
+  inventorySummary: UI_I_ArbitraryObject<string>
+  contextMenu: UI_I_ArbitraryObject<string>
+  networks: UI_I_ArbitraryObject<string>
+  inventory: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/lib/models/types.ts

@@ -1,29 +1,36 @@
-export type UI_T_Project = 'sphere' | 'procurator'
-
-export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
-export type UI_T_BinaryLower =
-  | 'kb'
-  | 'mb'
-  | 'gb'
-  | 'tb'
-  | 'pb'
-  | 'eb'
-  | 'zb'
-  | 'yb'
-
-export type UI_T_LangValue =
-  | 'en_US'
-  | 'ru_RU'
-  | 'hy_AM'
-  | 'zh_CHS'
-  | 'kk_KZ'
-  | 'be_BY'
-  | 'BROWSER'
-
-export type UI_T_LanguageKey =
-  | 'common'
-  | 'auth'
-  | 'home'
-  | 'tasks'
-  | 'layout'
-  | 'mainNavigation'
+export type UI_T_Project = 'sphere' | 'procurator'
+
+export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
+export type UI_T_BinaryLower =
+  | 'kb'
+  | 'mb'
+  | 'gb'
+  | 'tb'
+  | 'pb'
+  | 'eb'
+  | 'zb'
+  | 'yb'
+
+export type UI_T_LangValue =
+  | 'en_US'
+  | 'ru_RU'
+  | 'hy_AM'
+  | 'zh_CHS'
+  | 'kk_KZ'
+  | 'be_BY'
+  | 'BROWSER'
+
+export type UI_T_LanguageKey =
+  | 'common'
+  | 'auth'
+  | 'home'
+  | 'tasks'
+  | 'layout'
+  | 'mainNavigation'
+  | 'administration'
+  | 'inventoryConfigure'
+  | 'datastoreWizard'
+  | 'inventorySummary'
+  | 'contextMenu'
+  | 'networks'
+  | 'inventory'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.3.595",
+  "version": "1.3.596",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "^1.0.15",
-    "bfg-uikit": "1.0.88",
+    "bfg-uikit": "1.0.91",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }