bfg-common 1.3.254 → 1.3.255

package/components/common/wizards/datastore/add/nfs/configuration/serversList/ServersList.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="servers-list">
     <atoms-table-data-grid
-      test-id="servers-list-table"
       v-model:selected-row="selectedDisk"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
       type="any"
       class="data-table"
+      test-id="servers-list-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="1"

package/components/common/wizards/datastore/add/sharedStorm/deviceSelection/hostTable/HostTable.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="data-table-view">
     <atoms-table-data-grid
-      test-id="host-table"
       v-model:selected-row="selectedDisk"
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
       type="checkbox"
       class="data-table"
+      test-id="host-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="props.totalItems"

package/components/common/wizards/network/add/modals/SelectNetwork.vue

@@ -12,6 +12,7 @@
           v-if="isShowErrorMessageAlert"
           status="alert-danger"
           :items="[localization.noSwitchIsSelectedSelectSwitchToContinue]"
+          test-id="select-network-alert"
           @remove="onHideErrorMessageAlert"
         />
         <div class="network-select-dialog-content">

package/components/common/wizards/network/add/modals/SelectStandardSwitch.vue

@@ -12,6 +12,7 @@
           v-if="isShowErrorMessageAlert"
           status="alert-danger"
           :items="[localization.noSwitchIsSelectedSelectSwitchToContinue]"
+          test-id="select-standard-switch-alert"
           @remove="onHideErrorMessageAlert"
         />
         <div class="table-top-margin-container">

package/components/common/wizards/network/add/modals/SelectSwitch.vue

@@ -12,6 +12,7 @@
           v-if="isShowErrorMessageAlert"
           status="alert-danger"
           :items="[localization.noSwitchIsSelectedSelectSwitchToContinue]"
+          test-id="select-switch-alert"
           @remove="onHideErrorMessageAlert"
         />
         <div class="table-top-margin-container">

package/components/common/wizards/network/add/steps/ConnectionSettings.vue

@@ -5,6 +5,7 @@
         v-if="props.alertMessages.length"
         status="alert-danger"
         :items="props.alertMessages"
+        test-id="connection-settings-alert"
         @remove="onHideAlert"
       />
       <form>

package/components/common/wizards/network/add/steps/IpFourSettings.vue

@@ -5,6 +5,7 @@
         v-if="props.alertMessages.length"
         status="alert-danger"
         :items="props.alertMessages"
+        test-id="ip-four-settings-alert"
         @remove="onHideAlert"
       />
       <form>

package/components/common/wizards/vm/migrate/select/computeResource/tableView/TableView.vue

@@ -11,6 +11,7 @@
       :total-pages="props.totalPages"
       :loading="loading"
       class="data-table"
+      test-id="compute-resource-table"
       server-off
       hide-page-size
       hide-pagination

package/components/common/wizards/vm/migrate/select/network/table/network/Network.vue

@@ -10,6 +10,7 @@
       :total-items="bodyItems.length"
       :total-pages="1"
       class="select-network"
+      test-id="network-table"
       :off-select-by-row="props.type === 'advanced'"
       server-off
       hide-footer

package/components/common/wizards/vm/migrate/select/network/table/useAt/UseAt.vue

@@ -8,6 +8,7 @@
       :page="1"
       :total-pages="1"
       class="select-network"
+      test-id="use-at-table"
       server-off
       off-select-by-row
       hide-footer

package/components/common/wizards/vm/migrate/select/storage/table/datastore/Datastore.vue

@@ -6,6 +6,7 @@
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
       type="radio"
+      test-id="datastore-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="bodyItems.length"

package/components/common/wizards/vm/migrate/select/storage/table/datastore/lib/config/config.ts

@@ -57,7 +57,9 @@ export const columnKeys = (
   const result: UI_I_ColumnKey[] = []
   getItems(localization).forEach((item, i) => {
     const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
+    result.push(
+      constructColumnKey(col, item[0], item[1], `show-column-${item[3]}`)
+    )
   })
   return result
 }
@@ -66,7 +68,17 @@ export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
   const result: UI_I_HeadItem[] = []
   getItems(localization).forEach((item, i) => {
     const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
+    result.push(
+      constructHeadItem(
+        col,
+        item[0],
+        item[3],
+        true,
+        item[2],
+        undefined,
+        item[3]
+      )
+    )
   })
   return result
 }
@@ -87,66 +99,79 @@ export const bodyItems = (
         text: storage[storageTableKeys[0]].toString(),
         data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col1',
         text: state,
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col2',
         text: $binary.round(storage.capacity[storageTableKeys[2]]),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col3',
         text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col4',
         text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col5',
         text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col6',
         text: storage[storageTableKeys[6]].toString(),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col7',
         text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col8',
         text: storage[storageTableKeys[8]].toString(),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col9',
         text: storage[storageTableKeys[9]].toString(),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col10',
         text: storage[storageTableKeys[10]].toString(),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col11',
         text: storage[storageTableKeys[11]].toString(),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
       {
         key: 'col12',
         text: storage[storageTableKeys[12]].toString(),
         id: key,
+        testId: `storage-table-item-${key}`,
       },
     ])
   })

package/components/common/wizards/vm/migrate/select/storage/table/disk/Disk.vue

@@ -7,6 +7,7 @@
       v-model:page="pagination.page"
       type="checkbox"
       class="data-table"
+      test-id="disk-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="bodyItems.length"

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

package/lib/utils/sendTask.ts

@@ -1,72 +1,72 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  API_UI_I_Error,
-  UI_I_RequestBody,
-} from '~/lib/models/store/interfaces'
-import type {
-  UI_I_NotifyBodyMessage,
-  UI_I_SendTaskParams,
-} from '~/lib/models/interfaces'
-import { base64 } from './base64'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const showNotification = (message: UI_I_NotifyBodyMessage): void => {
-  const { title, desc, status } = message
-  const { $store } = useNuxtApp()
-
-  // @ts-ignore
-  $store.dispatch('main/A_SHOW_NOTIFICATION', {
-    status,
-    messages: [
-      {
-        title,
-        descriptions: [desc],
-      },
-    ],
-    headline: '',
-    timeout: status === 'success' ? 3000 : '',
-  })
-}
-const msgError: UI_I_NotifyBodyMessage = {
-  status: 'error',
-  title: localization.value.error,
-  desc: '',
-}
-const handleErrors = (error: Ref<API_UI_I_Error>): void => {
-  if (error.value.data?.error_message) {
-    msgError.desc = error.value.data?.error_message
-    showNotification(msgError)
-  }
-}
-
-export const handleRequest = async (
-  url: string,
-  body: UI_I_RequestBody
-): Promise<void> => {
-  // @ts-ignore
-  const { error } = await useMyFetch<never, API_UI_I_Error>(url, {
-    body,
-    method: 'POST',
-    key: Date.now().toString(),
-  })
-
-  if (error.value && error.value.data.error_code !== 0) {
-    handleErrors(error)
-  }
-}
-
-export async function sendTask({
-  method,
-  target,
-  args,
-}: UI_I_SendTaskParams): Promise<void> {
-  const argsToBase64 = args ? base64.encode(args) : ''
-  await handleRequest('/ui/tasks', {
-    method,
-    params: {
-      target,
-      args: argsToBase64,
-    },
-  })
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  API_UI_I_Error,
+  UI_I_RequestBody,
+} from '~/lib/models/store/interfaces'
+import type {
+  UI_I_NotifyBodyMessage,
+  UI_I_SendTaskParams,
+} from '~/lib/models/interfaces'
+import { base64 } from './base64'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const showNotification = (message: UI_I_NotifyBodyMessage): void => {
+  const { title, desc, status } = message
+  const { $store } = useNuxtApp()
+
+  // @ts-ignore
+  $store.dispatch('main/A_SHOW_NOTIFICATION', {
+    status,
+    messages: [
+      {
+        title,
+        descriptions: [desc],
+      },
+    ],
+    headline: '',
+    timeout: status === 'success' ? 3000 : '',
+  })
+}
+const msgError: UI_I_NotifyBodyMessage = {
+  status: 'error',
+  title: localization.value.error,
+  desc: '',
+}
+const handleErrors = (error: Ref<API_UI_I_Error>): void => {
+  if (error.value.data?.error_message) {
+    msgError.desc = error.value.data?.error_message
+    showNotification(msgError)
+  }
+}
+
+export const handleRequest = async (
+  url: string,
+  body: UI_I_RequestBody
+): Promise<void> => {
+  // @ts-ignore
+  const { error } = await useMyFetch<never, API_UI_I_Error>(url, {
+    body,
+    method: 'POST',
+    key: Date.now().toString(),
+  })
+
+  if (error.value && error.value.data.error_code !== 0) {
+    handleErrors(error)
+  }
+}
+
+export async function sendTask({
+  method,
+  target,
+  args,
+}: UI_I_SendTaskParams): Promise<void> {
+  const argsToBase64 = args ? base64.encode(args) : ''
+  await handleRequest('/ui/tasks', {
+    method,
+    params: {
+      target,
+      args: argsToBase64,
+    },
+  })
+}