bfg-common 1.5.302 → 1.5.303

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/atoms/tabs/VerticalTabs.vue

@@ -1,105 +1,105 @@
-<template>
-  <nav class="sidenav vertical-groups-sidenav">
-    <ul class="sidenav-content">
-      <li
-        v-for="(item, key) in props.items"
-        :id="`${props.testId}-item-${key}`"
-        :data-id="item.testId"
-        :key="item.value"
-        :class="[
-          'vertical-nav-link group-nav-link',
-          { active: item.value === props.modelValue },
-          { disabled: item.disabled },
-        ]"
-        :title="item.title || item.text"
-        @click="selectItem(item)"
-      >
-        {{ item.text }}
-      </li>
-    </ul>
-  </nav>
-</template>
-<script setup lang="ts">
-import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    modelValue: string | number
-    items: UI_I_VerticalTabs[]
-    hasErrorMessages?: number | boolean
-    testId?: string
-  }>(),
-  { testId: 'ui-vertical-tabs' }
-)
-
-const emits = defineEmits<{
-  (event: 'update:model-value', value: string): void
-  (event: 'set-alert'): void
-}>()
-
-const selectItem = ({
-  value,
-  disabled,
-}: {
-  value: string
-  disabled: boolean
-}): void => {
-  if (disabled) return
-  if (
-    props.hasErrorMessages === undefined ||
-    props.hasErrorMessages === 0 ||
-    props.hasErrorMessages === false
-  ) {
-    emits('update:model-value', value)
-    return
-  }
-  emits('set-alert')
-}
-</script>
-
-<style>
-:root {
-  --vertical-tabs-nav-link: --grey-100;
-  --vertical-tabs-bg-color: #fafafa;
-}
-:root.dark-theme {
-  --vertical-tabs-nav-link: #ffffff;
-  --vertical-tabs-bg-color: transparent;
-}
-</style>
-<style lang="scss" scoped>
-.vertical-groups-sidenav {
-  min-height: 94%;
-  background-color: var(--vertical-tabs-bg-color);
-
-  .vertical-nav-link {
-    display: inline-block;
-    width: 100%;
-    margin-top: 5px;
-    padding-left: 12px;
-    color: var(--vertical-tabs-nav-link);
-    border-bottom: 1px solid transparent;
-    text-decoration: none;
-    font-size: 14px;
-    cursor: pointer;
-    border-radius: 2.5px 0 0 2.5px;
-
-    &.active {
-      color: var(--vertical-nav-active-item-color);
-      background: var(--vertical-nav-active-bg-color);
-      border-bottom: 1px solid transparent;
-    }
-
-    &.disabled {
-      cursor: not-allowed;
-      opacity: 0.6;
-    }
-
-    &:hover:not(.active) {
-      background: var(--vertical-nav-hover-bg-color);
-      color: var(--blue-950);
-      border-bottom: 1px solid #666;
-    }
-  }
-}
-</style>
+<template>
+  <nav class="sidenav vertical-groups-sidenav">
+    <ul class="sidenav-content">
+      <li
+        v-for="(item, key) in props.items"
+        :id="`${props.testId}-item-${key}`"
+        :data-id="item.testId"
+        :key="item.value"
+        :class="[
+          'vertical-nav-link group-nav-link',
+          { active: item.value === props.modelValue },
+          { disabled: item.disabled },
+        ]"
+        :title="item.title || item.text"
+        @click="selectItem(item)"
+      >
+        {{ item.text }}
+      </li>
+    </ul>
+  </nav>
+</template>
+<script setup lang="ts">
+import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    modelValue: string | number
+    items: UI_I_VerticalTabs[]
+    hasErrorMessages?: number | boolean
+    testId?: string
+  }>(),
+  { testId: 'ui-vertical-tabs' }
+)
+
+const emits = defineEmits<{
+  (event: 'update:model-value', value: string): void
+  (event: 'set-alert'): void
+}>()
+
+const selectItem = ({
+  value,
+  disabled,
+}: {
+  value: string
+  disabled: boolean
+}): void => {
+  if (disabled) return
+  if (
+    props.hasErrorMessages === undefined ||
+    props.hasErrorMessages === 0 ||
+    props.hasErrorMessages === false
+  ) {
+    emits('update:model-value', value)
+    return
+  }
+  emits('set-alert')
+}
+</script>
+
+<style>
+:root {
+  --vertical-tabs-nav-link: --grey-100;
+  --vertical-tabs-bg-color: #fafafa;
+}
+:root.dark-theme {
+  --vertical-tabs-nav-link: #ffffff;
+  --vertical-tabs-bg-color: transparent;
+}
+</style>
+<style lang="scss" scoped>
+.vertical-groups-sidenav {
+  min-height: 94%;
+  background-color: var(--vertical-tabs-bg-color);
+
+  .vertical-nav-link {
+    display: inline-block;
+    width: 100%;
+    margin-top: 5px;
+    padding-left: 12px;
+    color: var(--vertical-tabs-nav-link);
+    border-bottom: 1px solid transparent;
+    text-decoration: none;
+    font-size: 14px;
+    cursor: pointer;
+    border-radius: 2.5px 0 0 2.5px;
+
+    &.active {
+      color: var(--vertical-nav-active-item-color);
+      background: var(--vertical-nav-active-bg-color);
+      border-bottom: 1px solid transparent;
+    }
+
+    &.disabled {
+      cursor: not-allowed;
+      opacity: 0.6;
+    }
+
+    &:hover:not(.active) {
+      background: var(--vertical-nav-hover-bg-color);
+      color: var(--blue-950);
+      border-bottom: 1px solid #666;
+    }
+  }
+}
+</style>

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

@@ -22,13 +22,15 @@
               <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
 
               <common-tooltip-help
-                  test-id="datastore-type-subtitle-tooltip"
-                  help-id="datastore-type-subtitle-tooltip-icon"
-                  :title="localization.common.information"
-                  :help-text="localization.common.datastoreTypeHelpDesc"
-                  dropdown-width="320px"
-                  dropdown-left
-                  class="ml-2"
+                test-id="datastore-type-subtitle-tooltip"
+                help-id="datastore-type-subtitle-tooltip-icon"
+                :title="localization.common.information"
+                :help-text="localization.common.datastoreTypeHelpDesc"
+                :is-show-help="isShowFirstStepHelp"
+                dropdown-width="320px"
+                dropdown-left
+                class="ml-2"
+                @update-is-show="onUpdateIsShowFirstStepHelp"
               />
             </div>
           </div>
@@ -38,6 +40,8 @@
             v-if="selectedStep.id === dynamicSteps.type"
             v-model="formModelLocal.type_code"
             :project="props.project"
+            :updater-hide-all-help-popups="updaterHideAllHelpPopups"
+            @hide-all-help-popups="isShowFirstStepHelp = false"
           />
         </template>
       </ui-wizard-block>
@@ -125,15 +129,17 @@
           </div>
         </template>
         <template #content>
-          <common-vm-actions-common-select-storage
-            :datastore="props.datastore"
-            :is-datastore-loading="props.isDatastoreLoading"
-            :get-datastore-table-func="props.getDatastoreTableFunc"
-            hide-compatibility
-            hide-alert
-            class="storage-datatable h-full"
-            @change-storage="onChangeStorage"
-          />
+          <div class="pb-4">
+            <common-vm-actions-common-select-storage
+              :datastore="props.datastore"
+              :is-datastore-loading="props.isDatastoreLoading"
+              :get-datastore-table-func="props.getDatastoreTableFunc"
+              hide-compatibility
+              hide-alert
+              class="storage-datatable h-full"
+              @change-storage="onChangeStorage"
+            />
+          </div>
         </template>
       </ui-wizard-block>
 
@@ -245,6 +251,13 @@ const texts = computed<UI_I_WizardTexts>(() => ({
   of: localization.value.common.of2,
 }))
 
+const updaterHideAllHelpPopups = ref<number>(0)
+const isShowFirstStepHelp = ref<boolean>(false)
+const onUpdateIsShowFirstStepHelp = (value: boolean): void => {
+  updaterHideAllHelpPopups.value++
+  isShowFirstStepHelp.value = value
+}
+
 const subTitleBlock0 = ref<HTMLElement | null>(null)
 const { height: height0 } = useElementSize(subTitleBlock0)