bfg-common 1.4.619 → 1.4.621

package/assets/localization/local_ru.json

@@ -2295,7 +2295,7 @@
     "useWindowsSessionAuthentication": "Использовать проверку подлинности сеанса Windows",
     "authBgTextSphere": "Легко контролируйте узлы виртуализации $*и$ управляйте ими",
     "logout": "Выйти",
-    "loginErrorText": "Не верное имя пользователя или пароль"
+    "loginErrorText": "Неверное имя пользователя или пароль"
   },
   "home": {
     "objectsWithMostAlerts": " Объекты с большим количестом оповещений",

package/components/common/pages/home/widgets/warnings/lib/config/config.ts

@@ -26,12 +26,12 @@ export const getHeaderDataFunc = (
     col: 1,
     colName: 'alerts',
     text: localization.common.alerts,
-
     isSortable: true,
     sort: 'asc',
     width: '33.3%',
     show: true,
     filter: true,
+    icon: 'error-outline',
   },
   {
     col: 2,
@@ -42,6 +42,8 @@ export const getHeaderDataFunc = (
     width: '33.3%',
     show: true,
     filter: true,
+    icon: 'warning-outline',
+    iconColor: '#fbce28',
   },
 ]
 

package/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/Limit.vue

@@ -1,216 +1,220 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-limit-new
-    v-if="isNewView"
-    v-model:limit="limitLocalByLocalization"
-    v-model:limit-type="limitTypeLocal"
-    :limit-errors-texts="limitLocalAndApiErrorsTexts"
-    :component-type="props.componentType"
-    :limit-options="limitOptionsLocal"
-    :limit-type-options="limitTypeOptions"
-    :disabled="props.disabled"
-    @select-limit="onSelectLimit"
-    @remove-error="onRemoveValidationError"
-  />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-limit-old
-    v-else
-    v-model:limit="limitLocalByLocalization"
-    v-model:limit-type="limitTypeLocal"
-    :limit-errors-texts="limitLocalAndApiErrorsTexts"
-    :component-type="props.componentType"
-    :limit-options="limitOptionsLocal"
-    :limit-type-options="limitTypeOptions"
-    :disabled="props.disabled"
-    @select-limit="onSelectLimit"
-    @remove-error="onRemoveValidationError"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import {
-  limitOptionsFunc,
-  limitTypeOptionsFunc,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/lib/config/options'
-
-const props = withDefaults(
-  defineProps<{
-    limit: string
-    limitType: string
-    type: 'mb' | 'mhz'
-    componentType: string
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
-    disabled?: boolean
-    limitOptions?: UI_I_OptionItem[]
-    multiply?: number
-  }>(),
-  {
-    limitOptions: undefined,
-    multiply: 1,
-  }
-)
-const emits = defineEmits<{
-  (event: 'update:limit', value: string): void
-  (event: 'update:limit-type', value: string): void
-  (event: 'invalid', value: boolean): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const typeError = computed<string>(() => `${props.componentType}.limit_mb`)
-
-const apiErrorLocal = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === typeError.value
-    )?.error_message || ''
-  )
-})
-
-const binaryKeys: [string, string] =
-  props.type === 'mb' ? ['mb', 'gb'] : ['mhz', 'ghz']
-
-const limitOptionsLocal = computed<UI_I_OptionItem[]>(
-  () => props.limitOptions || limitOptionsFunc(localization.value, binaryKeys)
-)
-const limitTypeOptions = ref<UI_I_OptionItem[]>(
-  limitTypeOptionsFunc(localization.value, binaryKeys)
-)
-
-const limitLocalByLocalization = computed<string>({
-  get() {
-    return limitLocal.value === 'Unlimited'
-      ? localization.value.common.unlimited
-      : limitLocal.value
-  },
-  set(newValue) {
-    limitLocal.value =
-      newValue === localization.value.common.unlimited ? 'Unlimited' : newValue
-  },
-})
-const limitLocal = computed<string>({
-  get() {
-    return props.limit
-  },
-  set(newValue) {
-    emits('update:limit', '' + newValue)
-  },
-})
-const limitTypeLocal = computed<string>({
-  get() {
-    return props.limitType
-  },
-  set(newValue) {
-    emits('update:limit-type', newValue)
-  },
-})
-
-const { $binary } = useNuxtApp()
-const onSelectLimit = ({
-  value,
-  type,
-}: {
-  value: number | 'Unlimited'
-  type: string
-}): void => {
-  limitLocal.value = '' + value
-  if (limitTypeLocal.value !== type) {
-    limitTypeLocal.value = type
-  }
-
-  // if (limitTypeLocal.value === binaryKeys[0] || value === 'Unlimited') {
-  //   limitLocal.value = '' + value
-  //   return
-  // }
-  //
-  // limitLocal.value =
-  //   '' + $binary.universalFromTo(value, binaryKeys[0], binaryKeys[1], 8)
-}
-
-const limitErrorLocalText = computed<string>(() => {
-  const valueForMin = $binary.universalFromTo(
-    +limitLocal.value,
-    limitTypeLocal.value,
-    limitOptionsLocal.value[0].value.type,
-    0
-  )
-  const valueForMax = $binary.universalFromTo(
-    +limitLocal.value,
-    limitTypeLocal.value,
-    limitOptionsLocal.value[1].value.type,
-    0
-  )
-  const minValue = limitOptionsLocal.value[0].value.value
-  const maxValue = limitOptionsLocal.value[1].value.value
-  if (valueForMin < minValue) {
-    return localization.value.common.limitMustBe.replace(
-      '{0}',
-      `${minValue} ${localization.value.common[binaryKeys[0]]}`
-    )
-  }
-  if (props.limitOptions && valueForMax > maxValue) {
-    return localization.value.common.limitMustBeMax.replace(
-      '{0}',
-      `${maxValue} ${localization.value.common[binaryKeys[0]]}`
-    )
-  }
-
-  const validValue = /^\d+(\.\d+)?$/.test(limitLocal.value)
-  if (
-    !validValue &&
-    (limitLocal.value !== limitOptionsLocal.value[1].value.value ||
-      props.limitOptions)
-  ) {
-    return localization.value.common.inputContainsInvalidCharacters
-  }
-
-  if (limitLocal.value !== 'Unlimited') {
-    const value = $binary.universalFromTo(
-      +limitLocal.value,
-      limitTypeLocal.value,
-      binaryKeys[0],
-      0
-    )
-    if (value % props.multiply !== 0) {
-      return localization.value.common.valueShouldMultiple.replace(
-        '{0}',
-        `${props.multiply} ${binaryKeys[0].toUpperCase()}`
-      )
-    }
-  }
-
-  return ''
-})
-const limitInvalid = computed<boolean>(() => !!limitErrorLocalText.value)
-watch(
-  limitInvalid,
-  (newValue) => {
-    emits('invalid', newValue)
-  },
-  { immediate: true }
-)
-
-const limitLocalAndApiErrorsTexts = computed<string>(() => {
-  const localError = limitErrorLocalText.value
-  const apiError = apiErrorLocal.value
-
-  let result = ''
-  if (localError && !apiError) result = localError
-  if (!localError && apiError) result = apiError
-  if (localError && apiError) result = localError + ', ' + apiError
-  if (!localError && apiError) result = apiError
-
-  return result
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError.value)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-limit-new
+    v-if="isNewView"
+    v-model:limit="limitLocalByLocalization"
+    v-model:limit-type="limitTypeLocal"
+    :limit-errors-texts="limitLocalAndApiErrorsTexts"
+    :component-type="props.componentType"
+    :limit-options="limitOptionsLocal"
+    :limit-type-options="limitTypeOptions"
+    :disabled="props.disabled"
+    @select-limit="onSelectLimit"
+    @remove-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-limit-old
+    v-else
+    v-model:limit="limitLocalByLocalization"
+    v-model:limit-type="limitTypeLocal"
+    :limit-errors-texts="limitLocalAndApiErrorsTexts"
+    :component-type="props.componentType"
+    :limit-options="limitOptionsLocal"
+    :limit-type-options="limitTypeOptions"
+    :disabled="props.disabled"
+    @select-limit="onSelectLimit"
+    @remove-error="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import {
+  limitOptionsFunc,
+  limitTypeOptionsFunc,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/lib/config/options'
+
+const props = withDefaults(
+  defineProps<{
+    limit: string
+    limitType: string
+    type: 'mb' | 'mhz'
+    componentType: string
+    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    disabled?: boolean
+    limitOptions?: UI_I_OptionItem[]
+    multiply?: number
+  }>(),
+  {
+    limitOptions: undefined,
+    multiply: 1,
+  }
+)
+const emits = defineEmits<{
+  (event: 'update:limit', value: string): void
+  (event: 'update:limit-type', value: string): void
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const typeError = computed<string>(() => `${props.componentType}.limit_mb`)
+
+const apiErrorLocal = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === typeError.value
+    )?.error_message || ''
+  )
+})
+
+const binaryKeys: [string, string] =
+  props.type === 'mb' ? ['mb', 'gb'] : ['mhz', 'ghz']
+
+const limitOptionsLocal = computed<UI_I_OptionItem[]>(
+  () => props.limitOptions || limitOptionsFunc(localization.value, binaryKeys)
+)
+const limitTypeOptions = ref<UI_I_OptionItem[]>(
+  limitTypeOptionsFunc(localization.value, binaryKeys)
+)
+
+const limitLocalByLocalization = computed<string>({
+  get() {
+    return limitLocal.value === 'Unlimited'
+      ? localization.value.common.unlimited
+      : limitLocal.value
+  },
+  set(newValue) {
+    limitLocal.value =
+      newValue === localization.value.common.unlimited ? 'Unlimited' : newValue
+  },
+})
+const limitLocal = computed<string>({
+  get() {
+    return props.limit
+  },
+  set(newValue) {
+    emits('update:limit', '' + newValue)
+  },
+})
+const limitTypeLocal = computed<string>({
+  get() {
+    return props.limitType
+  },
+  set(newValue) {
+    emits('update:limit-type', newValue)
+  },
+})
+
+const { $binary } = useNuxtApp()
+const onSelectLimit = ({
+  value,
+  type,
+}: {
+  value: number | 'Unlimited'
+  type: string
+}): void => {
+  limitLocal.value = '' + value
+  if (limitTypeLocal.value !== type) {
+    limitTypeLocal.value = type
+  }
+
+  // if (limitTypeLocal.value === binaryKeys[0] || value === 'Unlimited') {
+  //   limitLocal.value = '' + value
+  //   return
+  // }
+  //
+  // limitLocal.value =
+  //   '' + $binary.universalFromTo(value, binaryKeys[0], binaryKeys[1], 8)
+}
+
+const limitErrorLocalText = computed<string>(() => {
+  const valueForMin = $binary.universalFromTo(
+    +limitLocal.value,
+    limitTypeLocal.value,
+    limitOptionsLocal.value[0].value.type,
+    0
+  )
+  const valueForMax = $binary.universalFromTo(
+    +limitLocal.value,
+    limitTypeLocal.value,
+    limitOptionsLocal.value[1].value.type,
+    0
+  )
+  const minValue = limitOptionsLocal.value[0].value.value
+  const maxValue = limitOptionsLocal.value[1].value.value
+  if (valueForMin < minValue) {
+    const minUnit =
+      localization.value.common[limitOptionsLocal.value[0].value.type]
+    return localization.value.common.limitMustBe.replace(
+      '{0}',
+      `${minValue} ${minUnit}`
+    )
+  }
+  if (props.limitOptions && valueForMax > maxValue) {
+    const maxUnit =
+      localization.value.common[limitOptionsLocal.value[1].value.type]
+    return localization.value.common.limitMustBeMax.replace(
+      '{0}',
+      `${maxValue} ${maxUnit}`
+    )
+  }
+
+  const validValue = /^\d+(\.\d+)?$/.test(limitLocal.value)
+  if (
+    !validValue &&
+    (limitLocal.value !== limitOptionsLocal.value[1].value.value ||
+      props.limitOptions)
+  ) {
+    return localization.value.common.inputContainsInvalidCharacters
+  }
+
+  if (limitLocal.value !== 'Unlimited') {
+    const value = $binary.universalFromTo(
+      +limitLocal.value,
+      limitTypeLocal.value,
+      binaryKeys[0],
+      0
+    )
+    if (value % props.multiply !== 0) {
+      return localization.value.common.valueShouldMultiple.replace(
+        '{0}',
+        `${props.multiply} ${binaryKeys[0].toUpperCase()}`
+      )
+    }
+  }
+
+  return ''
+})
+const limitInvalid = computed<boolean>(() => !!limitErrorLocalText.value)
+watch(
+  limitInvalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+const limitLocalAndApiErrorsTexts = computed<string>(() => {
+  const localError = limitErrorLocalText.value
+  const apiError = apiErrorLocal.value
+
+  let result = ''
+  if (localError && !apiError) result = localError
+  if (!localError && apiError) result = apiError
+  if (localError && apiError) result = localError + ', ' + apiError
+  if (!localError && apiError) result = apiError
+
+  return result
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError.value)
+}
+</script>
+
+<style scoped></style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.619",
+  "version": "1.4.621",
   "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.270",
+    "bfg-uikit": "1.0.272",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }