bfg-common 1.3.76 → 1.3.78

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

@@ -1,4 +1,4 @@
-const lastTimestamp = 1714121078845
+const lastTimestamp = 1714217566043
 
 export const useLocalStorage = (
   name: string,

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

@@ -1,108 +1,108 @@
-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_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>[]> {}

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,
+    },
+  })
+}