bfg-common 1.5.491 → 1.5.493

package/components/atoms/perPage/PerPage.vue

@@ -1,58 +1,58 @@
-<template>
-  <div class="page-size">
-    {{ selectLabel }}
-
-    <div class="clr-select-wrapper">
-      <select
-        :id="`${props.testId}-select`"
-        v-development="props.development"
-        :data-id="`${props.testId}-select`"
-        :value="props.pageSize"
-        class="clr-page-size-select"
-        @change="change"
-      >
-        <option
-          v-for="(item, key) in props.options"
-          :key="key"
-          :value="item.value"
-        >
-          {{ item.text }}
-        </option>
-      </select>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    pageSize: number
-    options: UI_I_OptionItem[]
-    label?: string
-    testId?: string
-    development?: boolean
-  }>(),
-  {
-    testId: 'ui-per-page',
-    label: 'itemsPerPage',
-    development: false,
-  }
-)
-const emits = defineEmits<{
-  (event: 'change', value: number): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const selectLabel = computed<string>(
-  () => localization.value.common[props.label]
-)
-
-const change = (event: InputEvent): void => {
-  emits('change', +(event.target as HTMLInputElement).value)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <div class="page-size">
+    {{ selectLabel }}
+
+    <div class="clr-select-wrapper">
+      <select
+        :id="`${props.testId}-select`"
+        v-development="props.development"
+        :data-id="`${props.testId}-select`"
+        :value="props.pageSize"
+        class="clr-page-size-select"
+        @change="change"
+      >
+        <option
+          v-for="(item, key) in props.options"
+          :key="key"
+          :value="item.value"
+        >
+          {{ item.text }}
+        </option>
+      </select>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    pageSize: number
+    options: UI_I_OptionItem[]
+    label?: string
+    testId?: string
+    development?: boolean
+  }>(),
+  {
+    testId: 'ui-per-page',
+    label: 'itemsPerPage',
+    development: false,
+  }
+)
+const emits = defineEmits<{
+  (event: 'change', value: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const selectLabel = computed<string>(
+  () => localization.value.common[props.label]
+)
+
+const change = (event: InputEvent): void => {
+  emits('change', +(event.target as HTMLInputElement).value)
+}
+</script>
+
+<style scoped></style>

package/components/atoms/table/dataGrid/DataGridPagination.vue

@@ -1,97 +1,97 @@
-<template>
-  <div class="pagination">
-    <div v-if="!props.hidePagination" class="pagination-size">
-      <atoms-per-page
-        v-if="!props.hidePageSize"
-        :test-id="props.testId"
-        :page-size="props.pageSize"
-        :options="props.options"
-        @change="changePageSize"
-      />
-    </div>
-
-    <div
-      :class="['pagination-description', { 'ml-1': !props.isShowHiddenInfo }]"
-    >
-      {{ totalItemCount }}
-    </div>
-
-    <atoms-table-data-grid-page
-      v-if="!props.hidePagination"
-      :test-id="props.testId"
-      :page="props.page"
-      :total-items="props.totalItems"
-      :total-pages="props.totalPages"
-      :page-size="props.pageSize"
-      @change="changePage"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    options: UI_I_OptionItem[]
-    pageSize: number
-    page: number
-    totalItems: number
-    totalPages: number
-    pageItemsCount: number
-    hidePagination?: boolean
-    hidePageSize?: boolean
-    showPageInfo?: boolean
-    testId?: string
-    isShowHiddenInfo?: boolean
-  }>(),
-  {
-    hidePagination: undefined,
-    hidePageSize: undefined,
-    showPageInfo: undefined,
-    testId: 'ui-data-grid-pagination',
-    isShowHiddenInfo: false,
-  }
-)
-const emits = defineEmits<{
-  (event: 'change-page-size', value: number): void
-  (event: 'change-page', value: number): void
-}>()
-const localization = computed<UI_I_Localization>(() => useLocal())
-const totalItemCount = computed<string>(() => {
-  const start = (props.page - 1) * props.pageSize + 1
-
-  // const paginationInfo = props.showPageInfo
-  //   ? `${start} - ${props.pageItemsCount} ${localization.value.common.of}`
-  //   : ''
-
-  if (props.showPageInfo) {
-    return `${start} - ${props.pageItemsCount}
-    ${localization.value.common.of}
-    ${props.totalItems} ${localization.value.common.items.toLowerCase()}`
-  }
-
-  return `${
-    // props.totalItems
-    props.pageItemsCount
-  } ${localization.value.common.items.toLowerCase()}`
-})
-
-const changePageSize = (pageSize: number): void => {
-  const newTotalPages = Math.ceil(props.totalItems / pageSize)
-  if (newTotalPages < props.page) changePage(newTotalPages)
-  emits('change-page-size', pageSize)
-}
-
-const changePage = (page: number): void => {
-  emits('change-page', page)
-}
-</script>
-
-<style scoped lang="scss">
-.pagination {
-  display: inline-flex;
-  align-items: center;
-}
-</style>
+<template>
+  <div class="pagination">
+    <div v-if="!props.hidePagination" class="pagination-size">
+      <atoms-per-page
+        v-if="!props.hidePageSize"
+        :test-id="props.testId"
+        :page-size="props.pageSize"
+        :options="props.options"
+        @change="changePageSize"
+      />
+    </div>
+
+    <div
+      :class="['pagination-description', { 'ml-1': !props.isShowHiddenInfo }]"
+    >
+      {{ totalItemCount }}
+    </div>
+
+    <atoms-table-data-grid-page
+      v-if="!props.hidePagination"
+      :test-id="props.testId"
+      :page="props.page"
+      :total-items="props.totalItems"
+      :total-pages="props.totalPages"
+      :page-size="props.pageSize"
+      @change="changePage"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    options: UI_I_OptionItem[]
+    pageSize: number
+    page: number
+    totalItems: number
+    totalPages: number
+    pageItemsCount: number
+    hidePagination?: boolean
+    hidePageSize?: boolean
+    showPageInfo?: boolean
+    testId?: string
+    isShowHiddenInfo?: boolean
+  }>(),
+  {
+    hidePagination: undefined,
+    hidePageSize: undefined,
+    showPageInfo: undefined,
+    testId: 'ui-data-grid-pagination',
+    isShowHiddenInfo: false,
+  }
+)
+const emits = defineEmits<{
+  (event: 'change-page-size', value: number): void
+  (event: 'change-page', value: number): void
+}>()
+const localization = computed<UI_I_Localization>(() => useLocal())
+const totalItemCount = computed<string>(() => {
+  const start = (props.page - 1) * props.pageSize + 1
+
+  // const paginationInfo = props.showPageInfo
+  //   ? `${start} - ${props.pageItemsCount} ${localization.value.common.of}`
+  //   : ''
+
+  if (props.showPageInfo) {
+    return `${start} - ${props.pageItemsCount}
+    ${localization.value.common.of}
+    ${props.totalItems} ${localization.value.common.items.toLowerCase()}`
+  }
+
+  return `${
+    // props.totalItems
+    props.pageItemsCount
+  } ${localization.value.common.items.toLowerCase()}`
+})
+
+const changePageSize = (pageSize: number): void => {
+  const newTotalPages = Math.ceil(props.totalItems / pageSize)
+  if (newTotalPages < props.page) changePage(newTotalPages)
+  emits('change-page-size', pageSize)
+}
+
+const changePage = (page: number): void => {
+  emits('change-page', page)
+}
+</script>
+
+<style scoped lang="scss">
+.pagination {
+  display: inline-flex;
+  align-items: center;
+}
+</style>

package/components/atoms/table/dataGrid/lib/config/settingsTable.ts

@@ -1,94 +1,94 @@
-import type { UI_ColumnSettingsStrategy } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type {
-  UI_I_ColumnKey,
-  UI_I_HeadItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_DropdownButtonItem } from '~/components/common/select/button/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-
-export const defaultColumnKeys = (
-  items: [string, boolean, string, string][],
-  strategy?: UI_ColumnSettingsStrategy
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  items.forEach((item, i) => {
-    let col: string = `col${i}` // Стандартное значение по умолчанию
-
-    if (strategy) {
-      // Проходим по ключам объекта и ищем соответствие индекса i в значениях
-      for (const key in strategy) {
-        if (strategy[key].includes(i)) {
-          col = key
-          break
-        }
-      }
-    }
-
-    result.push(
-      constructColumnKey(col, item[0], item[1], `show-column-${item[3]}`)
-    )
-  })
-  return result
-}
-
-export const defaultHeadItems = (
-  items: [string, boolean, string, string][],
-  strategy?: UI_ColumnSettingsStrategy
-): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  items.forEach((item, i) => {
-    let col: string = `col${i}` // Стандартное значение по умолчанию
-
-    if (strategy) {
-      // Проходим по ключам объекта и ищем соответствие индекса i в значениях
-      for (const key in strategy) {
-        if (strategy[key].includes(i)) {
-          col = key
-          break
-        }
-      }
-    }
-
-    result.push(
-      constructHeadItem(
-        col,
-        item[0],
-        item[3],
-        false,
-        item[2],
-        undefined,
-        item[3]
-      )
-    )
-  })
-  return result
-}
-
-export const exportItemsFunc = (
-  localization: UI_I_Localization,
-  rows: number,
-  selectedRows: number,
-  testId: string
-): UI_I_DropdownButtonItem[] => {
-  return [
-    {
-      text: localization.common.allRowsCount.replace('{0}', '' + rows),
-      type: '0',
-      disabled: false,
-      testId: `${testId}-export-all`,
-    },
-    {
-      text: localization.common.selectedRowsCount.replace(
-        '{0}',
-        '' + selectedRows
-      ),
-      type: '1',
-      disabled: false,
-      testId: `${testId}-export-selected`,
-    },
-  ]
-}
+import type { UI_ColumnSettingsStrategy } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_DropdownButtonItem } from '~/components/common/select/button/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  constructColumnKey,
+  constructHeadItem,
+} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+
+export const defaultColumnKeys = (
+  items: [string, boolean, string, string][],
+  strategy?: UI_ColumnSettingsStrategy
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  items.forEach((item, i) => {
+    let col: string = `col${i}` // Стандартное значение по умолчанию
+
+    if (strategy) {
+      // Проходим по ключам объекта и ищем соответствие индекса i в значениях
+      for (const key in strategy) {
+        if (strategy[key].includes(i)) {
+          col = key
+          break
+        }
+      }
+    }
+
+    result.push(
+      constructColumnKey(col, item[0], item[1], `show-column-${item[3]}`)
+    )
+  })
+  return result
+}
+
+export const defaultHeadItems = (
+  items: [string, boolean, string, string][],
+  strategy?: UI_ColumnSettingsStrategy
+): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  items.forEach((item, i) => {
+    let col: string = `col${i}` // Стандартное значение по умолчанию
+
+    if (strategy) {
+      // Проходим по ключам объекта и ищем соответствие индекса i в значениях
+      for (const key in strategy) {
+        if (strategy[key].includes(i)) {
+          col = key
+          break
+        }
+      }
+    }
+
+    result.push(
+      constructHeadItem(
+        col,
+        item[0],
+        item[3],
+        false,
+        item[2],
+        undefined,
+        item[3]
+      )
+    )
+  })
+  return result
+}
+
+export const exportItemsFunc = (
+  localization: UI_I_Localization,
+  rows: number,
+  selectedRows: number,
+  testId: string
+): UI_I_DropdownButtonItem[] => {
+  return [
+    {
+      text: localization.common.allRowsCount.replace('{0}', '' + rows),
+      type: '0',
+      disabled: false,
+      testId: `${testId}-export-all`,
+    },
+    {
+      text: localization.common.selectedRowsCount.replace(
+        '{0}',
+        '' + selectedRows
+      ),
+      type: '1',
+      disabled: false,
+      testId: `${testId}-export-selected`,
+    },
+  ]
+}

package/components/atoms/table/dataGrid/lib/utils/export.ts

@@ -1,16 +1,16 @@
-export const generateCsvAndDownload = (rows: HTMLElement[]): void => {
-  const content: string[] = []
-  rows.forEach((row: HTMLElement) => {
-    content.push(row.innerText.replaceAll(';', ',').replaceAll('\n', ';'))
-  })
-
-  const csvContent = 'data:text/csv;charset=utf-8,' + content.join('\n')
-
-  const encodedUri = encodeURI(csvContent)
-  const link = document.createElement('a')
-  link.setAttribute('href', encodedUri)
-  link.setAttribute('download', 'my_data.csv')
-  document.body.appendChild(link)
-
-  link.click()
-}
+export const generateCsvAndDownload = (rows: HTMLElement[]): void => {
+  const content: string[] = []
+  rows.forEach((row: HTMLElement) => {
+    content.push(row.innerText.replaceAll(';', ',').replaceAll('\n', ';'))
+  })
+
+  const csvContent = 'data:text/csv;charset=utf-8,' + content.join('\n')
+
+  const encodedUri = encodeURI(csvContent)
+  const link = document.createElement('a')
+  link.setAttribute('href', encodedUri)
+  link.setAttribute('download', 'my_data.csv')
+  document.body.appendChild(link)
+
+  link.click()
+}

package/components/common/backup/storage/actions/add/Add.vue

@@ -66,8 +66,9 @@ const props = withDefaults(
     isDatastoreLoading: boolean
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
     hosts?: any[]
+    datacenterId?: string
   }>(),
-  { hosts: [] }
+  { hosts: [], datacenterId: '' }
 )
 const emits = defineEmits<{
   (event: 'create', value: UI_I_CreateDatastoreForm): void
@@ -110,7 +111,8 @@ const validationFunc = async (
       dynamicSteps.name,
       'name',
       wizard,
-      props.project
+      props.project,
+      props.datacenterId
     )
 
     value = nameValidation.newValue
@@ -132,7 +134,8 @@ const validationFunc = async (
       dynamicSteps.nameAndConfigure,
       'name',
       wizard,
-      props.project
+      props.project,
+      props.datacenterId
     )
     value = nameValidation.newValue
 

package/components/common/backup/storage/actions/add/lib/utils.ts

@@ -3,28 +3,60 @@ import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { UI_E_Kind } from '~/lib/models/enums'
 
-export const checkValidityName = async (
-  name: string,
-  wizard: Wizard,
-  project: UI_T_Project,
+export const checkValidityName = async ({
+  name,
+  wizard,
+  project,
+  sendMessage,
+  datacenterId,
+}: {
+  name: string
+  wizard: Wizard
+  project: UI_T_Project
   sendMessage: (message: string) => void
-): Promise<void> => {
-
+  datacenterId?: string
+}): Promise<void> => {
   wizard.setLoader(true)
-  const url =
-    project === 'procurator'
-      ? `/ui/ds/validate?name=${encodeURIComponent(name)}`
-      : `/ui/object/validate_name?name=${encodeURIComponent(name)}&kind=${UI_E_Kind.STORAGE_VALIDATION_NAME}`
-  // @ts-ignore
-  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
-    method: 'GET',
-  })
-  wizard.setLoader(false)
-
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-    sendMessage(existError)
-    return
+
+  try {
+    const url = buildValidationUrl(name, project, datacenterId)
+
+    const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+      method: 'GET',
+    })
+
+    if (
+      error?.value?.data?.error_code !== 0
+    ) {
+      const existError =
+        error.value.data?.error_message ?? String(error.value.data)
+      sendMessage(existError)
+      return
+    }
+
+    sendMessage('')
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : 'Unknown error'
+    sendMessage(msg)
+  } finally {
+    wizard.setLoader(false)
   }
-  sendMessage('')
+}
+
+const buildValidationUrl = (
+  name: string,
+  project: UI_T_Project,
+  datacenterId?: string
+): string => {
+  if (project === 'procurator') {
+    const params = new URLSearchParams({ name })
+    return `/ui/ds/validate?${params.toString()}`
+  }
+
+  const params = new URLSearchParams()
+  params.set('name', name)
+  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
+  if (datacenterId) params.set('datacenter', datacenterId)
+
+  return `/ui/object/validate_name?${params.toString()}`
 }