bfg-common 1.4.288 → 1.4.290

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/streamingMode/StreamingMode.vue

@@ -1,85 +1,85 @@
-<template>
-  <div class="">
-    <atoms-stack-block :has-children="false">
-      <template #stackBlockKey>
-        {{ localization.common.streamingMode }}
-      </template>
-      <template #stackBlockContent>
-        <atoms-tooltip-error
-          :has-error="!!apiError"
-          selector="#vm-wizard-streaming-mode-field"
-          @remove="onRemoveValidationError"
-        >
-          <template #elem>
-            <div class="select">
-              <select
-                id="vm-wizard-streaming-mode-field"
-                v-model="streamingModeLocal"
-                data-id="vm-wizard-streaming-mode-select"
-                :disabled="props.disabled"
-              >
-                <option
-                  v-for="(item, key) in streamingModeOptions"
-                  :key="key"
-                  :value="item.value"
-                >
-                  {{ item.text }}
-                </option>
-              </select>
-            </div>
-          </template>
-          <template #content>
-            {{ apiError }}
-          </template>
-        </atoms-tooltip-error>
-      </template>
-    </atoms-stack-block>
-  </div>
-</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 { streamingModeOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/streamingMode/lib/config/config'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  streamingMode: string
-  errorValidationFields: UI_I_ErrorValidationField[]
-  disabled: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'update:streaming-mode', value: string): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const streamingModeOptions = ref<UI_I_OptionItem[]>(
-  streamingModeOptionsFunc(localization.value)
-)
-
-const streamingModeLocal = computed<string>({
-  get() {
-    return props.streamingMode
-  },
-  set(newValue) {
-    emits('update:streaming-mode', newValue)
-  },
-})
-
-const typeError = 'options.remote_console.spice.streaming_mode'
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find((message) => message.field === typeError)
-      ?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <div class="">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.common.streamingMode }}
+      </template>
+      <template #stackBlockContent>
+        <atoms-tooltip-error
+          :has-error="!!apiError"
+          selector="#vm-wizard-streaming-mode-field"
+          @remove="onRemoveValidationError"
+        >
+          <template #elem>
+            <div class="select">
+              <select
+                id="vm-wizard-streaming-mode-field"
+                v-model="streamingModeLocal"
+                data-id="vm-wizard-streaming-mode-select"
+                :disabled="props.disabled"
+              >
+                <option
+                  v-for="(item, key) in streamingModeOptions"
+                  :key="key"
+                  :value="item.value"
+                >
+                  {{ item.text }}
+                </option>
+              </select>
+            </div>
+          </template>
+          <template #content>
+            {{ apiError }}
+          </template>
+        </atoms-tooltip-error>
+      </template>
+    </atoms-stack-block>
+  </div>
+</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 { streamingModeOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/streamingMode/lib/config/config'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  streamingMode: string
+  errorValidationFields: UI_I_ErrorValidationField[]
+  disabled: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'update:streaming-mode', value: string): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const streamingModeOptions = ref<UI_I_OptionItem[]>(
+  streamingModeOptionsFunc(localization.value)
+)
+
+const streamingModeLocal = computed<string>({
+  get() {
+    return props.streamingMode
+  },
+  set(newValue) {
+    emits('update:streaming-mode', newValue)
+  },
+})
+
+const typeError = 'options.remote_console.spice.streaming_mode'
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find((message) => message.field === typeError)
+      ?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError)
+}
+</script>
+
+<style scoped></style>

package/composables/productNameLocal.ts

@@ -1,30 +1,30 @@
-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)) {
-    let item = localization[key as UI_T_LanguageKey]
-
-    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)) {
+    let item = localization[key as UI_T_LanguageKey]
+
+    for (const key2 of Object.keys(item)) {
+      item[key2] = item[key2].replaceAll('{productName}', productName)
+    }
+  }
+
+  return localization
+}

package/package.json

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

package/plugins/date.ts

@@ -1,181 +1,181 @@
-import { defineNuxtPlugin } from '#app'
-import { format } from 'date-fns'
-import * as localizations from 'date-fns/locale'
-import type { UI_T_DateFormat } from '~/lib/models/plugins/date/types'
-import type { UI_I_Dateformat } from '~/lib/models/plugins/date/interfaces'
-
-export default defineNuxtPlugin(() => {
-  // Проверяем переданое является датой
-  const isDate = (date: string | number) => {
-    return new Date(date).toString() !== 'Invalid Date'
-  }
-
-  // Проверяем формат времени браузера равно 24h
-  const isBrowserLocale24h = () =>
-    !new Intl.DateTimeFormat(undefined, { hour: 'numeric' })
-      .format(0)
-      .match(/AM/)
-
-  // Получаем переводы для даты
-  const getDateLocalization = (lang?: string) => {
-    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
-    const { be, enUS, hy, kk, ru, zhCN } = localizations
-    let localization
-
-    switch (currentLanguage) {
-      case 'be_BY':
-        localization = be
-        break
-      case 'en_US':
-        localization = enUS
-        break
-      case 'hy_AM':
-        localization = hy
-        break
-      case 'kk_KZ':
-        localization = kk
-        break
-      case 'ru_RU':
-        localization = ru
-        break
-      case 'zh_CHS':
-        localization = zhCN
-        break
-    }
-
-    return localization
-  }
-
-  // Получаем формат даты
-  const getDateFormat = (lang?: string): UI_T_DateFormat => {
-    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
-    const dateFormats: UI_I_Dateformat = {
-      be_BY: 'yyyy-MM-dd',
-      en_US: 'MM-dd-yyyy',
-      hy_AM: 'yyyy-MM-dd',
-      kk_KZ: 'dd/MM/yyyy',
-      ru_RU: 'dd/MM/yyyy',
-      zh_CHS: 'yyyy-MM-dd',
-    }
-
-    const dateFormat = ref(dateFormats[currentLanguage])
-
-    window.addEventListener('timeFormatStorageChanged', function handler() {
-      dateFormat.value = dateFormats[lang || useLocalStorage('lang') || 'en_US'] // TODO нужно проверить когда будем работать без useLocalStorage
-
-      window.removeEventListener('timeFormatStorageChanged', handler)
-    })
-
-    return dateFormat.value
-  }
-
-  // Получаем формат времени
-  const getTimeFormat = (hasSeconds: boolean, timeFormat?: string) => {
-    let appTimeFormat = timeFormat || useLocalStorage('timeFormat') || 'DEFAULT'
-    let timeFormatLocal = ''
-
-    if (appTimeFormat === 'DEFAULT') {
-      const isBrowserTimeFormat24 = isBrowserLocale24h()
-
-      appTimeFormat = isBrowserTimeFormat24 ? '24H' : appTimeFormat
-    }
-
-    if (appTimeFormat === '24H') {
-      timeFormatLocal = 'HH:mm'
-    } else {
-      timeFormatLocal = 'h:mm aa'
-    }
-
-    hasSeconds && (timeFormatLocal = timeFormatLocal.replace(':mm', ':mm:ss'))
-
-    return timeFormatLocal
-  }
-
-  // Форматирование даты из английского в стандартный
-  const enFormatToStandardFormat = (date: string): string => {
-    const splitDate = date.split('-')
-    return [splitDate[2], splitDate[0], splitDate[1]].join('/')
-  }
-  const getUnixByDate = (dateTime: string, lang?: string): number => {
-    const currentFormat: UI_T_DateFormat = getDateFormat(lang)
-
-    const [date, time] = dateTime.split(' ')
-
-    let standardDate = ''
-    switch (currentFormat) {
-      case 'dd/MM/yyyy':
-        standardDate = date.split('/').reverse().join('/')
-        break
-      case 'yyyy-MM-dd':
-        standardDate = date.replaceAll('-', '/')
-        break
-      case 'MM-dd-yyyy':
-        standardDate = enFormatToStandardFormat(date)
-        break
-    }
-
-    const standard = time ? standardDate + ' ' + time : standardDate
-    return new Date(standard).getTime()
-  }
-
-  // Форматирование даты без временим
-  const formattedDate = (
-    date: number | string | Date,
-    formatDate = '',
-    lang?: string
-  ) => {
-    const formatDateLocal = formatDate || getDateFormat(lang)
-
-    return format(new Date(date), formatDateLocal, {
-      locale: getDateLocalization(lang),
-    })
-  }
-  // Форматирование временим
-  const formattedTime = (
-    date: number | string | Date,
-    formatDate = '',
-    hasSeconds = false,
-    timeFormat?: string
-  ) => {
-    const formatDateLocal = formatDate || getTimeFormat(hasSeconds, timeFormat)
-
-    return format(new Date(date), formatDateLocal)
-  }
-
-  // Форматирование даты с временим
-  const formattedDatetime = (
-    date: number | string | Date,
-    formatDate = '',
-    hasSeconds = false,
-    lang?: string,
-    timeFormat?: string
-  ) => {
-    const formatDateLocal = ref(formatDate || getDateFormat(lang))
-    const formatDatetime = ref(
-      formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
-    )
-
-    window.addEventListener('timeFormatStorageChanged', function handler() {
-      formatDatetime.value =
-        formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
-
-      window.removeEventListener('timeFormatStorageChanged', handler)
-    })
-
-    return format(new Date(date), formatDatetime.value, {
-      locale: getDateLocalization(lang),
-    })
-  }
-
-  return {
-    provide: {
-      isDate,
-      getTimeFormat,
-      getDateFormat,
-      formattedTime,
-      formattedDate,
-      formattedDatetime,
-      getUnixByDate,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import { format } from 'date-fns'
+import * as localizations from 'date-fns/locale'
+import type { UI_T_DateFormat } from '~/lib/models/plugins/date/types'
+import type { UI_I_Dateformat } from '~/lib/models/plugins/date/interfaces'
+
+export default defineNuxtPlugin(() => {
+  // Проверяем переданое является датой
+  const isDate = (date: string | number) => {
+    return new Date(date).toString() !== 'Invalid Date'
+  }
+
+  // Проверяем формат времени браузера равно 24h
+  const isBrowserLocale24h = () =>
+    !new Intl.DateTimeFormat(undefined, { hour: 'numeric' })
+      .format(0)
+      .match(/AM/)
+
+  // Получаем переводы для даты
+  const getDateLocalization = (lang?: string) => {
+    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
+    const { be, enUS, hy, kk, ru, zhCN } = localizations
+    let localization
+
+    switch (currentLanguage) {
+      case 'be_BY':
+        localization = be
+        break
+      case 'en_US':
+        localization = enUS
+        break
+      case 'hy_AM':
+        localization = hy
+        break
+      case 'kk_KZ':
+        localization = kk
+        break
+      case 'ru_RU':
+        localization = ru
+        break
+      case 'zh_CHS':
+        localization = zhCN
+        break
+    }
+
+    return localization
+  }
+
+  // Получаем формат даты
+  const getDateFormat = (lang?: string): UI_T_DateFormat => {
+    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
+    const dateFormats: UI_I_Dateformat = {
+      be_BY: 'yyyy-MM-dd',
+      en_US: 'MM-dd-yyyy',
+      hy_AM: 'yyyy-MM-dd',
+      kk_KZ: 'dd/MM/yyyy',
+      ru_RU: 'dd/MM/yyyy',
+      zh_CHS: 'yyyy-MM-dd',
+    }
+
+    const dateFormat = ref(dateFormats[currentLanguage])
+
+    window.addEventListener('timeFormatStorageChanged', function handler() {
+      dateFormat.value = dateFormats[lang || useLocalStorage('lang') || 'en_US'] // TODO нужно проверить когда будем работать без useLocalStorage
+
+      window.removeEventListener('timeFormatStorageChanged', handler)
+    })
+
+    return dateFormat.value
+  }
+
+  // Получаем формат времени
+  const getTimeFormat = (hasSeconds: boolean, timeFormat?: string) => {
+    let appTimeFormat = timeFormat || useLocalStorage('timeFormat') || 'DEFAULT'
+    let timeFormatLocal = ''
+
+    if (appTimeFormat === 'DEFAULT') {
+      const isBrowserTimeFormat24 = isBrowserLocale24h()
+
+      appTimeFormat = isBrowserTimeFormat24 ? '24H' : appTimeFormat
+    }
+
+    if (appTimeFormat === '24H') {
+      timeFormatLocal = 'HH:mm'
+    } else {
+      timeFormatLocal = 'h:mm aa'
+    }
+
+    hasSeconds && (timeFormatLocal = timeFormatLocal.replace(':mm', ':mm:ss'))
+
+    return timeFormatLocal
+  }
+
+  // Форматирование даты из английского в стандартный
+  const enFormatToStandardFormat = (date: string): string => {
+    const splitDate = date.split('-')
+    return [splitDate[2], splitDate[0], splitDate[1]].join('/')
+  }
+  const getUnixByDate = (dateTime: string, lang?: string): number => {
+    const currentFormat: UI_T_DateFormat = getDateFormat(lang)
+
+    const [date, time] = dateTime.split(' ')
+
+    let standardDate = ''
+    switch (currentFormat) {
+      case 'dd/MM/yyyy':
+        standardDate = date.split('/').reverse().join('/')
+        break
+      case 'yyyy-MM-dd':
+        standardDate = date.replaceAll('-', '/')
+        break
+      case 'MM-dd-yyyy':
+        standardDate = enFormatToStandardFormat(date)
+        break
+    }
+
+    const standard = time ? standardDate + ' ' + time : standardDate
+    return new Date(standard).getTime()
+  }
+
+  // Форматирование даты без временим
+  const formattedDate = (
+    date: number | string | Date,
+    formatDate = '',
+    lang?: string
+  ) => {
+    const formatDateLocal = formatDate || getDateFormat(lang)
+
+    return format(new Date(date), formatDateLocal, {
+      locale: getDateLocalization(lang),
+    })
+  }
+  // Форматирование временим
+  const formattedTime = (
+    date: number | string | Date,
+    formatDate = '',
+    hasSeconds = false,
+    timeFormat?: string
+  ) => {
+    const formatDateLocal = formatDate || getTimeFormat(hasSeconds, timeFormat)
+
+    return format(new Date(date), formatDateLocal)
+  }
+
+  // Форматирование даты с временим
+  const formattedDatetime = (
+    date: number | string | Date,
+    formatDate = '',
+    hasSeconds = false,
+    lang?: string,
+    timeFormat?: string
+  ) => {
+    const formatDateLocal = ref(formatDate || getDateFormat(lang))
+    const formatDatetime = ref(
+      formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
+    )
+
+    window.addEventListener('timeFormatStorageChanged', function handler() {
+      formatDatetime.value =
+        formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
+
+      window.removeEventListener('timeFormatStorageChanged', handler)
+    })
+
+    return format(new Date(date), formatDatetime.value, {
+      locale: getDateLocalization(lang),
+    })
+  }
+
+  return {
+    provide: {
+      isDate,
+      getTimeFormat,
+      getDateFormat,
+      formattedTime,
+      formattedDate,
+      formattedDatetime,
+      getUnixByDate,
+    },
+  }
+})