bfg-common 1.3.85 → 1.3.86

package/components/common/wizards/datastore/add/Add.vue

@@ -27,8 +27,10 @@
             :datastore-type="datastoreType"
             :local-create-name-submit="localCreateNameSubmit"
             :datacenter-hosts="datacenterHosts"
+            :is-main-filter="props.isMainFilter"
             @loading="(e) => (loading = e)"
             @submit="onSaveNameAndNextLocal"
+            @main-filter="emits('main-filter', $event)"
           />
 
           <common-wizards-datastore-add-shared-storm
@@ -38,8 +40,10 @@
             :datastore-type="datastoreType"
             :device-selection-submit="deviceSelectionSubmit"
             :datacenter-hosts="datacenterHosts"
+            :is-main-filter="props.isMainFilter"
             @loading="(e) => (loading = e)"
             @submit="onSaveAndNextSharedStorm"
+            @main-filter="emits('main-filter', $event)"
           />
 
           <common-wizards-datastore-add-nfs
@@ -88,10 +92,12 @@ const props = defineProps<{
     version: UI_T_NfsType
   ) => Promise<void>
   datacenterHosts?: UI_I_SelectHostOptions[]
+  isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'global-refresh'): void
+  (event: 'main-filter', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/wizards/datastore/add/local/Local.vue

@@ -22,8 +22,10 @@
       :step-position="props.stepPosition"
       :datastore-type="props.datastoreType"
       :datacenter-hosts="props.datacenterHosts"
+      :is-main-filter="props.isMainFilter"
       @loading="(e) => emits('loading', e)"
       @submit="(e) => emits('submit', e)"
+      @main-filter="emits('main-filter', $event)"
     />
   </div>
 </template>
@@ -45,10 +47,12 @@ const props = defineProps<{
   datastoreType: UI_T_DatastoreType
   mode: UI_T_WizardDatastoreMode
   datacenterHosts?: UI_I_SelectHostOptions[]
+  isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
   (event: 'submit', value: string): void
+  (event: 'main-filter', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/wizards/datastore/add/sharedStorm/SharedStorm.vue

@@ -10,8 +10,10 @@
       :datastore-type="props.datastoreType"
       :mode="props.mode"
       :datacenter-hosts="props.datacenterHosts"
+      :is-main-filter="props.isMainFilter"
       @loading="(e) => emits('loading', e)"
       @submit="(e) => emits('submit', e)"
+      @main-filter="emits('main-filter', $event)"
     />
 
     <!--    <templates-home-datastore-actions-add-vmfs-version-->
@@ -47,10 +49,12 @@ const props = defineProps<{
   deviceSelectionSubmit: number
   datastoreType: UI_T_DatastoreType
   datacenterHosts?: UI_I_SelectHostOptions[]
+  isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
   (event: 'submit', value: { name: string; lunDisk: string[] }): void
   (event: 'loading', value: boolean): void
+  (event: 'main-filter', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/wizards/datastore/add/sharedStorm/deviceSelection/DeviceSelection.vue

@@ -81,8 +81,10 @@
         :total-pages="dataTable?.total_pages || 1"
         :pagination="pagination"
         :loading="loading"
+        :is-main-filter="props.isMainFilter"
         @pagination="updatePagination"
         @sort="sortTable"
+        @main-filter="emits('main-filter', $event)"
       />
     </div>
   </div>
@@ -91,9 +93,7 @@
 <script lang="ts" setup>
 import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 // import { UI_I_SchemaTablePayload } from '~/lib/models/store/interfaces'
-import {
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
 import {
   API_UI_I_DataTable,
   UI_I_Pagination,
@@ -122,6 +122,7 @@ const props = defineProps<{
   stepPosition: number
   datastoreType: UI_T_DatastoreType
   datacenterHosts?: UI_I_SelectHostOptions[] | undefined
+  isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
@@ -130,6 +131,7 @@ const emits = defineEmits<{
     event: 'update:lun-disk',
     value: UI_I_CreateStorageLunDiskItem[] | null
   ): void
+  (event: 'main-filter', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

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

@@ -13,8 +13,11 @@
       :total-items="props.totalItems"
       :total-pages="props.totalPages"
       :loading="loading"
+      :is-main-filter="props.isMainFilter"
+      :main-filter-placeholder="localization.filter"
       hide-page-size
       @filtering="filtering"
+      @main-filter="onMainFiltering"
       @sorting="sorting"
     >
       <template #icon="{ item }">
@@ -28,6 +31,7 @@
 </template>
 
 <script lang="ts" setup>
+import { useDebounceFn } from '@vueuse/core'
 import {
   UI_I_HeadItem,
   UI_I_ColumnKey,
@@ -46,11 +50,13 @@ const props = defineProps<{
   totalItems: number
   totalPages: number
   pagination: UI_I_Pagination
+  isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
   (event: 'update:selected', value: number[] | null): void
   (event: 'pagination', value: UI_I_Pagination): void
   (event: 'sort', value: string): void
+  (event: 'main-filter', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -75,6 +81,12 @@ const sorting = (e: [number, boolean]): void => {
 
   emits('sort', sort)
 }
+const sendFilter = useDebounceFn((searchText: string) => {
+  emits('main-filter', searchText)
+}, 1000)
+const onMainFiltering = (data: string): void => {
+  sendFilter(data)
+}
 
 const pagination = ref<UI_I_Pagination>({
   page: 1,

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/composables/useLocal.ts

@@ -1,38 +1,38 @@
-import localRu from '~/assets/localization/local_ru.json'
-import localEn from '~/assets/localization/local_en.json'
-import localHy from '~/assets/localization/local_hy.json'
-import localZh from '~/assets/localization/local_zh.json'
-import localKk from '~/assets/localization/local_kk.json'
-import localBe from '~/assets/localization/local_be.json'
-const locals = {
-  localRu,
-  localEn,
-  localHy,
-  localZh,
-  localKk,
-  localBe,
-}
-export const useLocal = () => {
-  const config = useRuntimeConfig()
-
-  const code: string = config?.public?.LOCALIZATION_CODE?.toLowerCase() || 'ru'
-
-  document.getElementsByTagName('html')[0].setAttribute('lang', code)
-
-  switch (code) {
-    case 'ru':
-      return locals.localRu
-    case 'en':
-      return locals.localEn
-    case 'hy':
-      return locals.localHy
-    case 'zh':
-      return locals.localZh
-    case 'kk':
-      return locals.localKk
-    case 'be':
-      return locals.localBe
-    default:
-      return locals.localRu
-  }
-}
+import localRu from '~/assets/localization/local_ru.json'
+import localEn from '~/assets/localization/local_en.json'
+import localHy from '~/assets/localization/local_hy.json'
+import localZh from '~/assets/localization/local_zh.json'
+import localKk from '~/assets/localization/local_kk.json'
+import localBe from '~/assets/localization/local_be.json'
+const locals = {
+  localRu,
+  localEn,
+  localHy,
+  localZh,
+  localKk,
+  localBe,
+}
+export const useLocal = () => {
+  const config = useRuntimeConfig()
+
+  const code: string = config?.public?.LOCALIZATION_CODE?.toLowerCase() || 'ru'
+
+  document.getElementsByTagName('html')[0].setAttribute('lang', code)
+
+  switch (code) {
+    case 'ru':
+      return locals.localRu
+    case 'en':
+      return locals.localEn
+    case 'hy':
+      return locals.localHy
+    case 'zh':
+      return locals.localZh
+    case 'kk':
+      return locals.localKk
+    case 'be':
+      return locals.localBe
+    default:
+      return locals.localRu
+  }
+}

package/lib/models/store/tasks/interfaces.ts

@@ -1,108 +1,115 @@
-import type { UI_I_LoadingPayload } from '~/lib/models/store/interfaces'
-import type {
-  UI_T_TasksStateLoading,
-  UI_T_TaskStatus,
-} from '~/lib/models/store/tasks/types'
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
-
-export interface UI_I_TasksLoadingPayload
-  extends UI_I_LoadingPayload<UI_T_TasksStateLoading> {}
-
-export interface UI_I_RTaskQuery {
-  last: number
-  sortBy?: string
-}
-
-export interface API_UI_I_RecentTaskItem<T, E = any> {
-  args: string // base64
-  completion: number
-  creation_time: number
-  details: string
-  error: string
-  id: string
-  initiator: string
-  method: string
-  mod_revision: number
-  server: string
-  start_time: number
-  status: UI_T_TaskStatus
-  target: string
-  target_type: T
-  task_name: string
-  zone: string
-  extra: E // Динамические данные зависит от того что нужно на фронте
-}
-
-export interface UI_I_RecentTaskItem<T, E = any> {
-  completion: string
-  queuedFor: number
-  execution: number
-  details: string
-  error: string
-  initiator: string
-  server: string
-  startTime: string
-  status: UI_T_TaskStatus
-  statusIcon: string
-  statusText: string
-  target: string
-  targetType: T
-  taskName: string
-  id: string
-  zone: string
-  extra: E
-}
-
-export interface API_UI_I_RecentTask<T, I = API_UI_I_RecentTaskItem<T>> {
-  items: I[]
-  last: number
-}
-export interface UI_I_RawRecentTask<T> extends API_UI_I_RecentTask<T> {}
-export interface UI_I_RecentTask<T>
-  extends API_UI_I_RecentTask<UI_I_RecentTaskItem<T>> {}
-export interface UI_I_RawRecentTaskItem<T, E = any>
-  extends API_UI_I_RecentTaskItem<T, E> {}
-
-export interface API_UI_I_TaskItem<T, E = any> {
-  completion: number
-  creation_time: number
-  details: string
-  error: string
-  id: string
-  initiator: string
-  method: string
-  mod_revision: number
-  server: string
-  start_time: number
-  status: UI_T_TaskStatus
-  target: string
-  target_type: T
-  task_name: string
-  zone: string
-  extra: E // Динамические данные зависит от того что нужно на фронте
-  args?: string // base64
-}
-
-export interface UI_I_TaskItem<T> {
-  relatedEvents: any
-  completion: number | string
-  queuedFor: number
-  execution: number
-  details: string
-  error: string
-  initiator: string
-  server: string
-  startTime: number | string
-  statusIcon: string
-  statusText: string
-  status: UI_T_TaskStatus
-  target: string
-  targetType: T
-  taskName: string
-  id: string
-  zone: string
-}
-
-export interface API_UI_I_Task<T>
-  extends API_UI_I_DataTable<API_UI_I_TaskItem<T>[]> {}
-export interface UI_I_Task<T> extends API_UI_I_DataTable<UI_I_TaskItem<T>[]> {}
+import type { UI_I_LoadingPayload } from '~/lib/models/store/interfaces'
+import type {
+  UI_T_TasksStateLoading,
+  UI_T_TaskStatus,
+} from '~/lib/models/store/tasks/types'
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+
+export interface UI_I_TasksLoadingPayload
+  extends UI_I_LoadingPayload<UI_T_TasksStateLoading> {}
+
+export interface UI_I_RTaskQuery {
+  last: number
+  sortBy?: string
+}
+
+export interface API_UI_I_RTask_Extra {
+  created_objects: {
+    created_id: string
+    created_name: string
+  }[] | {}
+}
+
+export interface API_UI_I_RecentTaskItem<T, E = any> {
+  args: string // base64
+  completion: number
+  creation_time: number
+  details: string
+  error: string
+  id: string
+  initiator: string
+  method: string
+  mod_revision: number
+  server: string
+  start_time: number
+  status: UI_T_TaskStatus
+  target: string
+  target_type: T
+  task_name: string
+  zone: string
+  extra: E // Динамические данные зависит от того что нужно на фронте
+}
+
+export interface UI_I_RecentTaskItem<T, E = any> {
+  completion: string
+  queuedFor: number
+  execution: number
+  details: string
+  error: string
+  initiator: string
+  server: string
+  startTime: string
+  status: UI_T_TaskStatus
+  statusIcon: string
+  statusText: string
+  target: string
+  targetType: T
+  taskName: string
+  id: string
+  zone: string
+  extra: E
+}
+
+export interface API_UI_I_RecentTask<T, I = API_UI_I_RecentTaskItem<T>> {
+  items: I[]
+  last: number
+}
+export interface UI_I_RawRecentTask<T> extends API_UI_I_RecentTask<T> {}
+export interface UI_I_RecentTask<T>
+  extends API_UI_I_RecentTask<UI_I_RecentTaskItem<T>> {}
+export interface UI_I_RawRecentTaskItem<T, E = API_UI_I_RTask_Extra>
+  extends API_UI_I_RecentTaskItem<T, E> {}
+
+export interface API_UI_I_TaskItem<T, E = any> {
+  completion: number
+  creation_time: number
+  details: string
+  error: string
+  id: string
+  initiator: string
+  method: string
+  mod_revision: number
+  server: string
+  start_time: number
+  status: UI_T_TaskStatus
+  target: string
+  target_type: T
+  task_name: string
+  zone: string
+  extra: E // Динамические данные зависит от того что нужно на фронте
+  args?: string // base64
+}
+
+export interface UI_I_TaskItem<T> {
+  relatedEvents: any
+  completion: number | string
+  queuedFor: number
+  execution: number
+  details: string
+  error: string
+  initiator: string
+  server: string
+  startTime: number | string
+  statusIcon: string
+  statusText: string
+  status: UI_T_TaskStatus
+  target: string
+  targetType: T
+  taskName: string
+  id: string
+  zone: string
+}
+
+export interface API_UI_I_Task<T>
+  extends API_UI_I_DataTable<API_UI_I_TaskItem<T>[]> {}
+export interface UI_I_Task<T> extends API_UI_I_DataTable<UI_I_TaskItem<T>[]> {}