bfg-common 1.5.773 → 1.5.775

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*b$/
-  // const regexHasDotAndD = /\..*d/
-
-  // const isBeta = regexHasDotAndB.test(version)
-  // const isDev =
-  //   regexHasDotAndD.test(version) ||
-  //   (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    // isBeta,
-    // isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}

package/composables/useEnvLanguage.ts

@@ -1,10 +1,11 @@
 export function useEnvLanguage(): string {
-  // const { $store }: any = useNuxtApp()
+  const { $store }: any = useNuxtApp()
 
-  const localizationCode = ref<string>('en_US')
+  let localizationCode = 'en_US'
   const langFromLocalStorage =
-    // $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
-    useLocalStorage('lang')
+    $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+    useLocalStorage('lang') ||
+    useLocalStorage('languageType')
 
   if (langFromLocalStorage) {
     if (
@@ -12,11 +13,11 @@ export function useEnvLanguage(): string {
       langFromLocalStorage === 'ru_RU' ||
       langFromLocalStorage === 'hy_AM'
     ) {
-      localizationCode.value = langFromLocalStorage
+      localizationCode = langFromLocalStorage
     }
   }
 
-  localizationCode.value = localizationCode.value.slice(0, 2).toUpperCase()
+  localizationCode = localizationCode.slice(0, 2).toUpperCase()
 
-  return localizationCode.value
+  return localizationCode
 }

package/composables/useLocal.ts

@@ -1,6 +1,6 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { useLocalCommon } from '~/composables/useLocalCommon'
-
-export const useLocal = (): UI_I_Localization => {
-  return useLocalCommon()
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { useLocalCommon } from '~/composables/useLocalCommon'
+
+export const useLocal = (): UI_I_Localization => {
+  return useLocalCommon()
+}

package/composables/useLocalCommon.ts

@@ -1,39 +1,39 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import localAr from '~/assets/scss/clarity/local_ar.json'
-import localRu from '~/assets/localization/local_ru.json'
-import localEn from '~/assets/localization/local_en.json'
-import localHy from '~/assets/localization/local_hy.json'
-import localZh from '~/assets/localization/local_zh.json'
-import localKk from '~/assets/localization/local_kk.json'
-import localBe from '~/assets/localization/local_be.json'
-import { productNameLocal } from '~/lib/utils/localizationMapper'
-
-const rawLocals: Record<string, any> = {
-  ar: localAr,
-  ru: localRu,
-  en: localEn,
-  hy: localHy,
-  zh: localZh,
-  kk: localKk,
-  be: localBe,
-}
-
-// Кешируем уже обработанные локали
-const processedCache: Record<string, UI_I_Localization | undefined> = {}
-
-export const useLocalCommon = (): UI_I_Localization => {
-  const config = useRuntimeConfig()
-  let code = String(config?.public?.LOCALIZATION_CODE || 'ru').toLowerCase()
-
-  if (code === 'ar' && !useLocalStorage('rtl')) code = 'ru'
-
-  if (typeof document !== 'undefined') document.documentElement.lang = code
-
-  // если в кеше нет — создаём и сохраняем
-  if (!processedCache[code]) {
-    const raw = rawLocals[code] || rawLocals['ru']
-    processedCache[code] = productNameLocal(raw)
-  }
-
-  return processedCache[code] as UI_I_Localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import localAr from '~/assets/scss/clarity/local_ar.json'
+import localRu from '~/assets/localization/local_ru.json'
+import localEn from '~/assets/localization/local_en.json'
+import localHy from '~/assets/localization/local_hy.json'
+import localZh from '~/assets/localization/local_zh.json'
+import localKk from '~/assets/localization/local_kk.json'
+import localBe from '~/assets/localization/local_be.json'
+import { productNameLocal } from '~/lib/utils/localizationMapper'
+
+const rawLocals: Record<string, any> = {
+  ar: localAr,
+  ru: localRu,
+  en: localEn,
+  hy: localHy,
+  zh: localZh,
+  kk: localKk,
+  be: localBe,
+}
+
+// Кешируем уже обработанные локали
+const processedCache: Record<string, UI_I_Localization | undefined> = {}
+
+export const useLocalCommon = (): UI_I_Localization => {
+  const config = useRuntimeConfig()
+  let code = String(config?.public?.LOCALIZATION_CODE || 'ru').toLowerCase()
+
+  if (code === 'ar' && !useLocalStorage('rtl')) code = 'ru'
+
+  if (typeof document !== 'undefined') document.documentElement.lang = code
+
+  // если в кеше нет — создаём и сохраняем
+  if (!processedCache[code]) {
+    const raw = rawLocals[code] || rawLocals['ru']
+    processedCache[code] = productNameLocal(raw)
+  }
+
+  return processedCache[code] as UI_I_Localization
+}

package/composables/useUniqueId.ts

@@ -0,0 +1,5 @@
+let id = 0
+export const useUniqueId = (): number => {
+  id++
+  return id
+}

package/lib/config/regExp.ts

@@ -8,7 +8,7 @@ const url = /https?:\/\/([a-zA-Zа-яА-Я0-9.-]+\.[a-zA-Zа-яА-Я]{2,6})\b/
 const specialChar = /[!@#$%^&*(),.?":{}|<>]/
 const specialCharWidthSpace = /[!@#$%^&*(),?":{}|<>]|(\s)|\.$/
 const cron = /^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$/
-export const allRegExp = {
+export const RegExp = {
   ip,
   email,
   password,

package/lib/models/enums.ts

@@ -18,34 +18,6 @@ export enum UI_E_NodeIconsByState {
   'network_Error' = 'vsphere-icon-network-error',
   'network_Warning' = 'vsphere-icon-network-warning',
   'network_connected' = 'vsphere-icon-network',
-
-  'network-error' = 'vsphere-icon-network-error',
-  'network' = 'vsphere-icon-network',
-  'network-warning' = 'vsphere-icon-network-warning',
-
-  'folder_Normal' = 'vsphere-icon-folder',
-  'folder_Error' = 'vsphere-icon-folder-error',
-  'folder_Warning' = 'vsphere-icon-folder-warning',
-  'folder_connected' = 'vsphere-icon-folder',
-
-  'file_Normal' = 'vsphere-icon-file',
-  'file_Error' = 'vsphere-icon-file-error',
-  'file_Warning' = 'vsphere-icon-file-warning',
-  'file_connected' = 'vsphere-icon-file',
-}
-
-export enum UI_E_TabsByType {
-  'zone' = 'h',
-  'datacenter' = 'h',
-  'folder' = 'h',
-  'cluster' = 'h',
-  'zonedir' = 'h', // TODO ??
-  'zone_dir' = 'h',
-  // для прокуратор
-  'host' = 'h',
-  'vm' = 'v',
-  'datastore' = 's',
-  'network' = 'n',
 }
 
 export enum UI_E_State {

package/lib/models/interfaces.ts

@@ -60,8 +60,6 @@ export interface UI_I_Localization {
   registerVm: UI_I_ArbitraryObject<string>
   files: UI_I_ArbitraryObject<string>
   myPreferences: UI_I_ArbitraryObject<string>
-  cacheConfiguration: UI_I_ArbitraryObject<string>
-  configureSecurityProfile: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/lib/models/types.ts

@@ -3,9 +3,8 @@ export type UI_T_Project = 'sphere' | 'procurator'
 export type UI_T_Lang = 'ru' | 'en' | 'be' | 'hy' | 'kk' | 'zh'
 
 export type UI_T_NavNodes =
-  // для Сферы
   | 'h'
-  // для Прокуратора и Сферы
+  // для прокуратор
   | 'v'
   | 's'
   | 'n'
@@ -31,6 +30,25 @@ export type UI_T_LangValue =
   | 'be_BY'
   | 'BROWSER'
 
+export type UI_T_LanguageKey =
+  | 'common'
+  | 'auth'
+  | 'home'
+  | 'tasks'
+  | 'layout'
+  | 'mainNavigation'
+  | 'administration'
+  | 'inventoryConfigure'
+  | 'vmOverrides'
+  | 'datastoreWizard'
+  | 'inventorySummary'
+  | 'contextMenu'
+  | 'networks'
+  | 'inventory'
+  | 'inventoryMonitor'
+  | 'inventoryTabs'
+  | 'bottomPanel'
+
 export type UI_T_ProcuratorTypeNodes =
   | 'host'
   | 'vm'
@@ -39,21 +57,4 @@ export type UI_T_ProcuratorTypeNodes =
   | 'folder'
   | 'file'
 
-export type UI_T_SphereTypeNodes =
-  | UI_T_ProcuratorTypeNodes
-  | 'zone'
-  | 'datacenter'
-  | 'cluster'
-  | 'zone_dir'
-  | 'dc_hc_dir'
-  | 'dc_net_dir'
-  | 'dc_ds_dir'
-  | 'dc_vmt_dir'
-  | 'dc_backup_dir'
-  | 'IdentityProviders'
-  | 'networks' // может быть это не нужный тип так как есть 'network' в UI_T_ProcuratorTypeNodes
-  | 'backup_storage'
-  | 'bucket'
-  | 'vmtemplate' // TODO думаю нужно добавить в UI_T_ProcuratorTypeNodes
-
-export type UI_T_AllTypeNodes = UI_T_SphereTypeNodes
+export type UI_T_SphereTypeNodes = UI_T_ProcuratorTypeNodes // TODO добавить осталиные типи те что исползуется в сфере

package/lib/utils/localizationMapper.ts

@@ -1,11 +1,12 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
 
 const replaceProductNameRecursion = (
   localization: UI_I_Localization,
   productName: any
 ): UI_I_Localization => {
   for (const key of Object.keys(localization)) {
-    let item = localization[key as keyof typeof localization]
+    let item = localization[key as UI_T_LanguageKey]
 
     for (const key2 of Object.keys(item)) {
       item[key2] = item[key2].replaceAll('{productName}', productName)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.773",
+  "version": "1.5.775",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.0.539",
+    "bfg-uikit": "1.0.533",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",
@@ -38,6 +38,7 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "html2canvas": "^1.4.1",
-    "prettier-eslint": "^15.0.1"
+    "prettier-eslint": "^15.0.1",
+    "qrcode": "^1.5.4"
   }
 }

package/plugins/console.ts

@@ -1,21 +1,21 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_CODEC } from '~/components/common/spiceConsole/lib/models/types'
-
-export default defineNuxtPlugin(() => {
-  const console = function (): any {
-    const self: any = {
-      codec: ref<UI_T_CODEC>(1),
-    }
-
-    self.changeCodec = (codec: UI_T_CODEC): void => {
-      self.codec.value = codec
-    }
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      console,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_CODEC } from '~/components/common/spiceConsole/lib/models/types'
+
+export default defineNuxtPlugin(() => {
+  const console = function (): any {
+    const self: any = {
+      codec: ref<UI_T_CODEC>(1),
+    }
+
+    self.changeCodec = (codec: UI_T_CODEC): void => {
+      self.codec.value = codec
+    }
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      console,
+    },
+  }
+})

package/plugins/date.ts

@@ -135,7 +135,15 @@ export default defineNuxtPlugin(() => {
       zh_CHS: 'yyyy-MM-dd',
     }
 
-    return dateFormats[currentLanguage]
+    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
   }
 
   // Получаем формат времени
@@ -277,45 +285,60 @@ export default defineNuxtPlugin(() => {
 
     const dateObj: Date = new Date(date)
 
-    const formatDateLocal =
+    const formatDateLocal = ref(
       localOptions.formatDate || getDateFormat(localOptions.lang)
+    )
 
-    const formatTimeLocal =
+    const formatTimeLocal = ref(
       localOptions.formatTime ||
-      getTimeFormat(localOptions.hasSeconds, localOptions.formatTime)
+        getTimeFormat(localOptions.hasSeconds, localOptions.formatTime)
+    )
 
-    let formatDatetime = ''
+    const formatDatetime = ref('')
 
     if (localOptions.onlyDate) {
-      formatDatetime = formatDateLocal
+      formatDatetime.value = formatDateLocal.value
     }
 
     if (localOptions.onlyTime) {
-      formatDatetime = formatTimeLocal
+      formatDatetime.value = formatTimeLocal.value
     }
 
     if (!localOptions.onlyDate && !localOptions.onlyTime) {
-      formatDatetime =
-        formatDateLocal +
+      formatDatetime.value =
+        formatDateLocal.value +
         (localOptions.separator ? localOptions.separator : ' ') +
-        formatTimeLocal
+        formatTimeLocal.value
     }
 
+    window.addEventListener('timeFormatStorageChanged', function handler() {
+      formatDatetime.value =
+        formatDateLocal.value +
+        ' ' +
+        getTimeFormat(localOptions.hasSeconds, localOptions.formatTime)
+
+      window.removeEventListener('timeFormatStorageChanged', handler)
+    })
+
     if (!localOptions.onlyTime) {
-      formatDatetime = formattedDate(dateObj, formatDatetime, localOptions.lang)
+      formatDatetime.value = formattedDate(
+        dateObj,
+        formatDatetime.value,
+        localOptions.lang
+      )
     }
 
     if (!localOptions.onlyDate) {
-      formatDatetime = formattedTime(
+      formatDatetime.value = formattedTime(
         dateObj,
-        formatDatetime,
+        formatDatetime.value,
         localOptions.hasSeconds,
         localOptions.formatTime,
         localOptions.lang
       )
     }
 
-    return formatDatetime
+    return formatDatetime.value
   }
 
   const correctRuUnit = (value: number, type: string): string => {

package/plugins/mouse.ts

@@ -1,21 +1,21 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_MouseMode } from '~/components/common/spiceConsole/lib/models/types'
-
-export default defineNuxtPlugin(() => {
-  const mouse = function (): any {
-    const self: any = {
-      mode: ref<UI_T_MouseMode>(1),
-    }
-
-    self.changeMode = (mode: UI_T_MouseMode): void => {
-      self.mode.value = mode
-    }
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      mouse,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_MouseMode } from '~/components/common/spiceConsole/lib/models/types'
+
+export default defineNuxtPlugin(() => {
+  const mouse = function (): any {
+    const self: any = {
+      mode: ref<UI_T_MouseMode>(1),
+    }
+
+    self.changeMode = (mode: UI_T_MouseMode): void => {
+      self.mode.value = mode
+    }
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      mouse,
+    },
+  }
+})

package/plugins/panelStates.ts

@@ -1,70 +1,70 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_I_PanelOptions } from '~/lib/models/plugins/panelStates/interfaces'
-
-export default defineNuxtPlugin(() => {
-  const panelStates = function (): any {
-    const self: any = {}
-    let options: UI_I_PanelOptions = {
-      leftPanelWidth: 20,
-      topPanelHeight: 80,
-      isBottomPanelCollapsed: false,
-    }
-
-    self.setLeftPanelWidth = function (width: number): void {
-      options.leftPanelWidth = width
-
-      self.setPanelStatesInStorage()
-    }
-    self.setTopPanelHeight = function (height: number): void {
-      options.topPanelHeight = height
-
-      self.setPanelStatesInStorage()
-    }
-    self.bottomPanelCollapse = function (collapse: boolean): void {
-      options.isBottomPanelCollapsed = collapse
-
-      self.setPanelStatesInStorage()
-    }
-
-    self.setPanelStatesInStorage = function (): void {
-      useLocalStorage('panelStates', options)
-      self.emitChanges()
-    }
-    self.getPanelStatesOfStorage = function (): UI_I_PanelOptions {
-      let panelStates = useLocalStorage('panelStates')
-
-      if (!panelStates) {
-        // const parent = document.getElementById('default-layout-outer')
-        const parent = document.body
-        const parentHeight = parent?.clientHeight || 0
-        const onePercent = parentHeight / 100
-        const defaultRecentTasksHeight = 250
-
-        options.topPanelHeight =
-          (parentHeight - defaultRecentTasksHeight - 1.5) / onePercent
-
-        panelStates = options
-      }
-
-      options = panelStates
-
-      return panelStates
-    }
-
-    self.cb = (): void => {}
-    self.on = function (cb: () => any | void): void {
-      self.cb = cb
-    }
-    self.emitChanges = function (): void {
-      self.cb(options)
-    }
-
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      panelStates,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_I_PanelOptions } from '~/lib/models/plugins/panelStates/interfaces'
+
+export default defineNuxtPlugin(() => {
+  const panelStates = function (): any {
+    const self: any = {}
+    let options: UI_I_PanelOptions = {
+      leftPanelWidth: 20,
+      topPanelHeight: 80,
+      isBottomPanelCollapsed: false,
+    }
+
+    self.setLeftPanelWidth = function (width: number): void {
+      options.leftPanelWidth = width
+
+      self.setPanelStatesInStorage()
+    }
+    self.setTopPanelHeight = function (height: number): void {
+      options.topPanelHeight = height
+
+      self.setPanelStatesInStorage()
+    }
+    self.bottomPanelCollapse = function (collapse: boolean): void {
+      options.isBottomPanelCollapsed = collapse
+
+      self.setPanelStatesInStorage()
+    }
+
+    self.setPanelStatesInStorage = function (): void {
+      useLocalStorage('panelStates', options)
+      self.emitChanges()
+    }
+    self.getPanelStatesOfStorage = function (): UI_I_PanelOptions {
+      let panelStates = useLocalStorage('panelStates')
+
+      if (!panelStates) {
+        // const parent = document.getElementById('default-layout-outer')
+        const parent = document.body
+        const parentHeight = parent?.clientHeight || 0
+        const onePercent = parentHeight / 100
+        const defaultRecentTasksHeight = 250
+
+        options.topPanelHeight =
+          (parentHeight - defaultRecentTasksHeight - 1.5) / onePercent
+
+        panelStates = options
+      }
+
+      options = panelStates
+
+      return panelStates
+    }
+
+    self.cb = (): void => {}
+    self.on = function (cb: () => any | void): void {
+      self.cb = cb
+    }
+    self.emitChanges = function (): void {
+      self.cb(options)
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      panelStates,
+    },
+  }
+})