bfg-common 1.5.752 → 1.5.753

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

@@ -84,57 +84,67 @@ export const bodyItems = (
         key: 'col0',
         text: disk[vmMigrateDiskTableItemKeys[0]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col1',
         text: disk[vmMigrateDiskTableItemKeys[1]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col2',
         text: file,
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col3',
         text: disk[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]],
         id: key,
+        testId: `disk-table-${key}`,
       },
-
       {
         key: 'col6',
         text: disk.extra[vmMigrateDiskTableItemKeys[6]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col7',
         text: disk.extra[vmMigrateDiskTableItemKeys[7]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col8',
         text: disk.extra[vmMigrateDiskTableItemKeys[8]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col9',
         text: disk.extra[vmMigrateDiskTableItemKeys[9]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col10',
         text: disk.extra[vmMigrateDiskTableItemKeys[10]],
         id: key,
+        testId: `disk-table-${key}`,
       },
     ])
   })

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 RegExp = {
+export const allRegExp = {
   ip,
   email,
   password,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.752",
+  "version": "1.5.753",
   "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.538",
+    "bfg-uikit": "1.0.539",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/plugins/time.ts

@@ -1,58 +1,58 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_LangValue } from '~/lib/models/types'
-export default defineNuxtPlugin(() => {
-  const time = function (): any {
-    const self: any = {}
-    self.millisecondsToHour = function (ms: number): number {
-      return ~~(ms / 1000 / 60 / 60 / 24)
-    }
-    self.formatTime = (
-      seconds: number,
-      lang: UI_T_LangValue = 'ru_RU'
-    ): string => {
-      const units = {
-        en_US: { s: 's', m: 'm', h: 'h' },
-        ru_RU: { s: 'с', m: 'м', h: 'ч' },
-        hy_AM: { s: 'վ', m: 'ր', h: 'ժ' },
-        be_BY: { s: 'с', m: 'хв', h: 'г' },
-        kk_KZ: { s: 'сек', m: 'мин', h: 'сағ' },
-        zh_CHS: { s: '秒', m: '分', h: '时' },
-        BROWSER: { s: 's', m: 'm', h: 'h' },
-      }
-
-      const unit = units[lang] || units.en_US
-
-      if (seconds < 60) {
-        return `${seconds}${unit.s}`
-      }
-
-      const hours = Math.floor(seconds / 3600)
-      const minutes = Math.floor((seconds % 3600) / 60)
-      const secs = seconds % 60
-
-      let result = ''
-
-      if (hours > 0) {
-        result += `${hours}${unit.h} `
-      }
-
-      if (minutes > 0) {
-        result += `${minutes}${unit.m} `
-      }
-
-      if (secs > 0) {
-        result += `${secs}${unit.s}`
-      }
-
-      return result.trim()
-    }
-
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      time,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_LangValue } from '~/lib/models/types'
+export default defineNuxtPlugin(() => {
+  const time = function (): any {
+    const self: any = {}
+    self.millisecondsToHour = function (ms: number): number {
+      return ~~(ms / 1000 / 60 / 60 / 24)
+    }
+    self.formatTime = (
+      seconds: number,
+      lang: UI_T_LangValue = 'ru_RU'
+    ): string => {
+      const units = {
+        en_US: { s: 's', m: 'm', h: 'h' },
+        ru_RU: { s: 'с', m: 'м', h: 'ч' },
+        hy_AM: { s: 'վ', m: 'ր', h: 'ժ' },
+        be_BY: { s: 'с', m: 'хв', h: 'г' },
+        kk_KZ: { s: 'сек', m: 'мин', h: 'сағ' },
+        zh_CHS: { s: '秒', m: '分', h: '时' },
+        BROWSER: { s: 's', m: 'm', h: 'h' },
+      }
+
+      const unit = units[lang] || units.en_US
+
+      if (seconds < 60) {
+        return `${seconds}${unit.s}`
+      }
+
+      const hours = Math.floor(seconds / 3600)
+      const minutes = Math.floor((seconds % 3600) / 60)
+      const secs = seconds % 60
+
+      let result = ''
+
+      if (hours > 0) {
+        result += `${hours}${unit.h} `
+      }
+
+      if (minutes > 0) {
+        result += `${minutes}${unit.m} `
+      }
+
+      if (secs > 0) {
+        result += `${secs}${unit.s}`
+      }
+
+      return result.trim()
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      time,
+    },
+  }
+})

package/plugins/validation.ts

@@ -1,4 +1,4 @@
-import { RegExp } from '~/lib/config/regExp'
+import { allRegExp } 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 = RegExp.ip.test(value)
+        const isValid = allRegExp.ip.test(value)
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'password') {
-        const isValid = value ? RegExp.password.test(value) : true
+        const isValid = value ? allRegExp.password.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'email') {
-        const isValid = value ? RegExp.email.test(value) : true
+        const isValid = value ? allRegExp.email.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'url') {
-        const isValid = value ? RegExp.url.test(value) : true
+        const isValid = value ? allRegExp.url.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'cron') {
-        const isValid = value ? RegExp.cron.test(value) : true
+        const isValid = value ? allRegExp.cron.test(value) : true
 
         if (!isValid) {
           error = validation.errorText