bfg-common 1.5.774 → 1.5.775

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/old/lib/config/diskTable.ts

@@ -66,85 +66,69 @@ export const bodyItems = (
   data: UI_I_StorageConfigurePerDiskItem[]
 ): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
-  const localization = useLocal()
 
-  data.forEach((disk: UI_I_StorageConfigurePerDiskItem, key: number) => {
+  data.forEach((storage: UI_I_StorageConfigurePerDiskItem, key: number) => {
     const diskFormat =
       key === 0
         ? 'N/A'
-        : UI_E_SelectStorageDiskFormat[disk[vmMigrateDiskTableItemKeys[4]]]
-
-    const file =
-      disk.extra.disk_source === 'meta'
-        ? disk[vmMigrateDiskTableItemKeys[2]]
-        : `${disk.extra.disk_source} (${disk.extra.disk_size} ${localization.common.mb} )`
+        : UI_E_SelectStorageDiskFormat[storage[vmMigrateDiskTableItemKeys[4]]]
 
     bodyItems.push([
       {
         key: 'col0',
-        text: disk[vmMigrateDiskTableItemKeys[0]],
+        text: storage[vmMigrateDiskTableItemKeys[0]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col1',
-        text: disk[vmMigrateDiskTableItemKeys[1]],
+        text: storage[vmMigrateDiskTableItemKeys[1]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col2',
-        text: file,
+        text: storage[vmMigrateDiskTableItemKeys[2]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col3',
-        text: disk[vmMigrateDiskTableItemKeys[3]],
+        text: storage[vmMigrateDiskTableItemKeys[3]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col4',
         text: diskFormat,
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col5',
-        text: disk.extra[vmMigrateDiskTableItemKeys[5]],
+        text: storage.extra[vmMigrateDiskTableItemKeys[5]],
         id: key,
-        testId: `disk-table-${key}`,
       },
+
       {
         key: 'col6',
-        text: disk.extra[vmMigrateDiskTableItemKeys[6]],
+        text: storage.extra[vmMigrateDiskTableItemKeys[6]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col7',
-        text: disk.extra[vmMigrateDiskTableItemKeys[7]],
+        text: storage.extra[vmMigrateDiskTableItemKeys[7]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col8',
-        text: disk.extra[vmMigrateDiskTableItemKeys[8]],
+        text: storage.extra[vmMigrateDiskTableItemKeys[8]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col9',
-        text: disk.extra[vmMigrateDiskTableItemKeys[9]],
+        text: storage.extra[vmMigrateDiskTableItemKeys[9]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col10',
-        text: disk.extra[vmMigrateDiskTableItemKeys[10]],
+        text: storage.extra[vmMigrateDiskTableItemKeys[10]],
         id: key,
-        testId: `disk-table-${key}`,
       },
     ])
   })

package/composables/deepCopy.ts

@@ -0,0 +1,21 @@
+let exists: any = []
+export const useDeepCopy = (obj: any, is = false) => {
+  if (!is) exists = []
+  if (typeof obj !== 'object' || obj === null) {
+    return obj
+  }
+
+  const res: any = Array.isArray(obj) ? [] : {}
+  for (const i in obj) {
+    const item = obj[i]
+    if (exists.includes(item)) {
+      res[i] = item
+      continue
+    }
+    exists.push(item)
+
+    res[i] = useDeepCopy(item, true)
+  }
+
+  return res
+}

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/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

@@ -1,59 +1,60 @@
-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'
-  | 'b'
-
-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_ProcuratorTypeNodes =
-  | 'host'
-  | 'vm'
-  | 'datastore'
-  | 'network'
-  | '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_Project = 'sphere' | 'procurator'
+
+export type UI_T_Lang = 'ru' | 'en' | 'be' | 'hy' | 'kk' | 'zh'
+
+export type UI_T_NavNodes =
+  | 'h'
+  // для прокуратор
+  | 'v'
+  | 's'
+  | 'n'
+  | 'b'
+
+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'
+  | 'vmOverrides'
+  | 'datastoreWizard'
+  | 'inventorySummary'
+  | 'contextMenu'
+  | 'networks'
+  | 'inventory'
+  | 'inventoryMonitor'
+  | 'inventoryTabs'
+  | 'bottomPanel'
+
+export type UI_T_ProcuratorTypeNodes =
+  | 'host'
+  | 'vm'
+  | 'datastore'
+  | 'network'
+  | 'folder'
+  | 'file'
+
+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.774",
+  "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/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/validation.ts

@@ -1,4 +1,4 @@
-import { allRegExp } from '~/lib/config/regExp'
+import { RegExp } from '~/lib/config/regExp'
 import type {
   UI_I_Validation,
   UI_I_ValidationOption,
@@ -127,30 +127,30 @@ export default defineNuxtPlugin(() => {
           error = validation.errorText
         }
       } else if (validation.value === 'ip') {
-        const isValid = allRegExp.ip.test(value)
+        const isValid = RegExp.ip.test(value)
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'password') {
-        const isValid = value ? allRegExp.password.test(value) : true
+        const isValid = value ? RegExp.password.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'email') {
-        const isValid = value ? allRegExp.email.test(value) : true
+        const isValid = value ? RegExp.email.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'url') {
-        const isValid = value ? allRegExp.url.test(value) : true
+        const isValid = value ? RegExp.url.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'cron') {
-        const isValid = value ? allRegExp.cron.test(value) : true
+        const isValid = value ? RegExp.cron.test(value) : true
 
         if (!isValid) {
           error = validation.errorText

package/store/main/getters.ts

@@ -1,7 +1,7 @@
-import type { UI_I_MainState } from '~/store/main/lib/interfaces'
+import type {UI_I_MainState} from "~/store/main/lib/interfaces";
 
 export default {
   getIsMenuPined: (state: UI_I_MainState): boolean => {
     return state.isMenuPined
-  },
+  }
 }

package/store/tasks/actions.ts

@@ -63,7 +63,7 @@ export default {
           value: true,
         })
       },
-      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
+      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string>>) {
         const tasks = tasksConstructor(response._data)
 
         context.commit('M_SET_TASKS_LIST', tasks)

package/store/tasks/mappers/tasks.ts

@@ -10,15 +10,8 @@ import {
 } from '~/lib/models/store/tasks/enums'
 
 export const tasksConstructor = (
-  data: API_UI_I_Task<string> | null
+  data: API_UI_I_Task<string>
 ): UI_I_Task<string> => {
-  if (!data) {
-    return {
-      total_items: 1,
-      total_pages: 1,
-      items: []
-    }
-  }
   const items: UI_I_TaskItem<string>[] =
     data.items?.map((task: API_UI_I_TaskItem<string>) => {
       return {

package/components/common/backup/storage/actions/add/steps/typeMode/tooltip/Tooltip.vue

@@ -1,33 +0,0 @@
-<template>
-  <div
-    id="type-select-help-icon"
-    class="signpost-container relative flex cursor-pointer"
-  >
-    <atoms-the-icon
-      data-id="toggle-type-select-help-icon"
-      fill="#0072a3"
-      width="24px"
-      height="24px"
-      name="info-circle"
-      @click="isShowTypeHelp = !isShowTypeHelp"
-    />
-    <atoms-tooltip-signpost
-      v-if="isShowTypeHelp"
-      elem-id="type-select-help-icon"
-      test-id="select-datastore-type"
-      @hide="isShowTypeHelp = false"
-    >
-      <p class="help-desc">
-        {{ localization.common.datastoreTypeHelpDesc }}
-      </p>
-    </atoms-tooltip-signpost>
-  </div>
-</template>
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isShowTypeHelp = ref<boolean>(false)
-</script>
-<style scoped lang="scss"></style>

package/components/common/certificate/Certificate.vue

@@ -1,27 +0,0 @@
-<template>
-  <atoms-loader v-show="props.loading" test-id="certificate-spinner" />
-  <div class="certificate flex flex-col h-full">
-    <common-certificate-tools @renew-certificate="emits('renew-certificate')" />
-
-    <common-certificate-info :certificate-data="props.certificateData" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Certificate } from '~/components/common/certificate/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  certificateData: UI_I_Certificate | {}
-}>()
-
-const emits = defineEmits<{
-  (event: 'renew-certificate'): void
-}>()
-</script>
-
-<style lang="scss" scoped>
-.certificate {
-  padding-left: 10px;
-}
-</style>