bfg-common 1.3.252 → 1.3.254

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

@@ -175,7 +175,6 @@ const props = withDefaults(
     selectedStandardSwitchId?: string
     selectedSwitchId?: string
     tcpStacks?: UI_I_TCPStack[]
-    tcpStackLoading?: boolean
     diagramsData?: UI_I_DiagramData[]
     isNetworkingLoading?: boolean
   }>(),
@@ -187,7 +186,6 @@ const props = withDefaults(
     selectedStandardSwitchId: '',
     selectedSwitchId: '',
     tcpStacks: () => [],
-    tcpStackLoading: false,
     diagramsData: [],
     isNetworkingLoading: false,
   }
@@ -352,21 +350,13 @@ watch(
 )
 
 const onGetExistingStandardSwitches = (): void => {
-  wizard.setLoader(true)
-  emits('get-existing-standard-switches', () => wizard.setLoader(false))
+  emits('get-existing-standard-switches')
 }
 
 const onGetTcpStacks = (): void => {
   emits('get-tcp-stacks')
 }
 
-watch(
-  () => props.tcpStackLoading,
-  (newValue: boolean) => {
-    wizard.setLoader(newValue)
-  }
-)
-
 watch(
   () => wizard.selectedStepId,
   (newSelectedStep: number) => {
@@ -481,12 +471,8 @@ const onConfirmNoActiveAdaptersModal = (): void => {
   wizard.selectStepHard(wizard.waitingStepId)
 }
 
-const onGetFreeAdapters = (showAddAdapterModal: () => void): void => {
-  wizard.setLoader(true)
-  emits('get-free-adapters', () => {
-    wizard.setLoader(false)
-    showAddAdapterModal()
-  })
+const onGetFreeAdapters = (showModal: () => void): void => {
+  emits('get-free-adapters', showModal)
 }
 
 const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {

package/components/common/wizards/network/add/lib/models/interfaces.ts

@@ -216,12 +216,12 @@ export interface UI_I_AddNetworkingEmits {
     type: string,
     hideModal: () => void
   ): void
-  (event: 'get-existing-standard-switches', cb: () => void): void
+  (event: 'get-existing-standard-switches'): void
   (event: 'get-free-adapters', cb: () => void): void
   (
     event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void
+    label: string,
+    sendMessage: (message: string) => void
   ): void
   (event: 'get-tcp-stacks'): void
 }

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

@@ -57,7 +57,7 @@ const props = defineProps<{
 }>()
 
 const emits = defineEmits<{
-  (event: 'get-free-adapters', showAddAdapterModal: () => void): void
+  (event: 'get-free-adapters', showModal: () => void): void
   (event: 'change-added-adapters', addedAdapters: string[]): void
   (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
   (event: 'confirm-no-active-adapters-modal'): void
@@ -68,8 +68,8 @@ const emits = defineEmits<{
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const onGetFreeAdapters = (showAddAdapterModal: () => void): void =>
-  emits('get-free-adapters', showAddAdapterModal)
+const onGetFreeAdapters = (showModal: () => void): void =>
+  emits('get-free-adapters', showModal)
 
 const onChangeAddedAdapters = (addedAdapters: string[]): void =>
   emits('change-added-adapters', addedAdapters)

package/components/common/wizards/network/add/validations/networkValidation.ts

@@ -8,24 +8,24 @@ import {
 } from '~/components/atoms/wizard/lib/models/interfaces'
 
 const checkNetwork = async (
-  networkLabel: string,
+  label: string,
   localization: UI_I_Localization,
   emits: UI_I_AddNetworkingEmits
 ): Promise<UI_I_AsyncCheckReturn> => {
-  if (networkLabel) {
+  if (label) {
     return new Promise((resolve, _reject) =>
-      emits('check-network-label', networkLabel, (error_message: string) => {
-        if (error_message === '') {
+      emits('check-network-label', label, (message: string) => {
+        if (message === '') {
           resolve({
             isValid: true,
             message: '',
           })
         }
 
-        if (error_message !== '') {
+        if (message !== '') {
           resolve({
             isValid: false,
-            message: error_message,
+            message,
           })
         }
       })
@@ -40,7 +40,7 @@ const checkNetwork = async (
 
 export const checkNetworkAsync = async (
   value: UI_I_WizardStep[],
-  networkLabel: string,
+  label: string,
   stepId: number,
   fieldName: string,
   emits: UI_I_AddNetworkingEmits,
@@ -49,21 +49,17 @@ export const checkNetworkAsync = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  wizard.setLoader(true)
-
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkNetwork(networkLabel, localization, emits)
-
-  wizard.setLoader(false)
+  } = await checkNetwork(label, localization, emits)
 
-  if (labelValidation.message === 'onHideLoader') {
-    return {
-      newValue: value,
-      stepHasError: true,
-    }
-  }
+  // if (labelValidation.message === '$hasError') {
+  //   return {
+  //     newValue: value,
+  //     stepHasError: true,
+  //   }
+  // }
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {

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