bfg-common 1.3.246 → 1.3.248

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

@@ -129,6 +129,7 @@ import {
   UI_I_AdapterStatus,
   UI_I_SwitchAdapterItem,
   UI_I_DiagramData,
+  API_UI_I_SwitchItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_I_ValidationReturn,
@@ -175,6 +176,7 @@ const props = withDefaults(
     tcpStacks?: UI_I_TCPStack[]
     tcpStackLoading?: boolean
     diagramsData?: UI_I_DiagramData[]
+    isNetworkingLoading?: boolean
   }>(),
   {
     standardSwitchesInitial: () => [],
@@ -186,6 +188,7 @@ const props = withDefaults(
     tcpStacks: () => [],
     tcpStackLoading: false,
     diagramsData: [],
+    isNetworkingLoading: false,
   }
 )
 
@@ -486,17 +489,19 @@ const onGetFreeAdapters = (showAddAdapterModal: () => void): void => {
 }
 
 const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
-  let sendData:
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+  let data:
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
     | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+    | API_UI_I_SwitchItem
+    | null = null
 
   let type: 'network' | 'vmkernel' | 'adapter'
 
   if (wizard.isSelectedScheme(0) || wizard.isSelectedScheme(1)) {
     const vlan = getVlanId(portProperties.value.vlanId)
 
-    sendData = addNetworkingZeroOrFirstSchemeDataFunc(
+    data = addNetworkingZeroOrFirstSchemeDataFunc(
       targetDevice.value,
       Number(vlan),
       portProperties.value,
@@ -511,7 +516,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
   if (wizard.isSelectedScheme(2) || wizard.isSelectedScheme(3)) {
     const vlan = getVlanId(connectionSettings.value.vlanId)
 
-    sendData = addNetworkingSecondOrThirdSchemeDataFunc(
+    data = addNetworkingSecondOrThirdSchemeDataFunc(
       connectionSettings.value,
       targetDevice.value,
       Number(vlan),
@@ -523,7 +528,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
   }
 
   if (wizard.isSelectedScheme(4) || wizard.isSelectedScheme(5)) {
-    sendData = addNetworkingFourthOrFifthSchemeDataFunc(
+    data = addNetworkingFourthOrFifthSchemeDataFunc(
       targetDevice.value.switch,
       wizard.isSelectedScheme(4),
       adapterStatus.value,
@@ -537,7 +542,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
   return new Promise((resolve, _reject) =>
     emits(
       'add-networking-data-validate',
-      sendData,
+      data,
       type,
       (err_arg: UI_I_ArbitraryObject<string>): void => {
         resolve(err_arg)
@@ -551,13 +556,13 @@ const finalValidationFunc = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  wizard.setLoader(true)
+  // wizard.setLoader(true)
 
   const validationFields: {
     [key: string]: string
   } = await checkFinal()
 
-  wizard.setLoader(false)
+  // wizard.setLoader(false)
 
   for (const fieldName in validationFields) {
     const stepId = wizard.getStepIdByFieldName(fieldName)
@@ -723,17 +728,19 @@ const onHideAddNetworkingModal = (): void => {
 }
 
 const onSubmit = async (): Promise<void> => {
-  wizard.setLoader(true)
-  let sendData:
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+  let data:
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+    | API_UI_I_SwitchItem
     | null = null
+
   let type: 'network' | 'vmkernel' | 'adapter' = 'network'
 
   if (wizard.isSelectedScheme(0) || wizard.isSelectedScheme(1)) {
     const vlan = getVlanId(portProperties.value.vlanId)
     type = 'vmkernel'
-    sendData = addNetworkingZeroOrFirstSchemeDataFunc(
+    data = addNetworkingZeroOrFirstSchemeDataFunc(
       targetDevice.value,
       Number(vlan),
       portProperties.value,
@@ -746,7 +753,7 @@ const onSubmit = async (): Promise<void> => {
   if (wizard.isSelectedScheme(2) || wizard.isSelectedScheme(3)) {
     const vlan = getVlanId(connectionSettings.value.vlanId)
     type = 'network'
-    sendData = addNetworkingSecondOrThirdSchemeDataFunc(
+    data = addNetworkingSecondOrThirdSchemeDataFunc(
       connectionSettings.value,
       targetDevice.value,
       Number(vlan),
@@ -757,7 +764,7 @@ const onSubmit = async (): Promise<void> => {
 
   if (wizard.isSelectedScheme(4) || wizard.isSelectedScheme(5)) {
     type = 'adapter'
-    sendData = addNetworkingFourthOrFifthSchemeDataFunc(
+    data = addNetworkingFourthOrFifthSchemeDataFunc(
       targetDevice.value.switch,
       wizard.isSelectedScheme(4),
       adapterStatus.value,
@@ -766,20 +773,24 @@ const onSubmit = async (): Promise<void> => {
     )
   }
 
-  sendData &&
-    emits(
-      'send-add-networking-data',
-      sendData,
-      type,
-      () => wizard.setLoader(false),
-      onHideAddNetworkingModal
-    )
+  data &&
+    emits('send-add-networking-data', data, type, onHideAddNetworkingModal)
 }
 
 onMounted(() => {
   hostname.value = location.hostname
 })
 
+watch(
+  () => props.isNetworkingLoading,
+  (newValue: boolean) => {
+    wizard.setLoader(newValue)
+  },
+  {
+    immediate: true,
+  }
+)
+
 watch(
   props.tcpStacks,
   (newValue: UI_I_TCPStack[]) => {
@@ -1018,4 +1029,4 @@ watch(
     color: var(--main-color-mode2);
   }
 }
-</style>
+</style>

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

@@ -4,6 +4,10 @@ import {
   UI_I_State,
 } from '~/lib/models/interfaces'
 import { UI_T_TCP } from '~/components/common/wizards/network/add/lib/models/types'
+import {
+  UI_I_AdapterStatus,
+  API_UI_I_SwitchItem,
+} from '~/components/common/diagramMain/lib/models/interfaces'
 
 export interface UI_I_Services {
   vMotion?: boolean
@@ -69,7 +73,8 @@ export interface UI_I_SelectedNetwork {
 export interface UI_I_Switch {
   name: string
   id: string
-  mtu?: number
+  mtu: number
+  nics: UI_I_AdapterStatus
 }
 
 export interface UI_I_SelectedSwitch {
@@ -193,22 +198,23 @@ export interface UI_I_AddNetworkingEmits {
   (event: 'hide'): void
   (
     event: 'add-networking-data-validate',
-    networkData:
+    data:
       | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
       | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+      | API_UI_I_SwitchItem,
     type: string,
     setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
   ): void
   (
     event: 'send-add-networking-data',
-    schemeData:
+    data:
       | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
       | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+      | API_UI_I_SwitchItem,
     type: string,
-    hideSendNetworkDataLoader: () => void,
-    onHideAddNetworkingModal: () => void
+    hideModal: () => void
   ): void
   (event: 'get-existing-standard-switches', cb: () => void): void
   (event: 'get-free-adapters', cb: () => void): void

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/models/interfaces.ts

@@ -1,4 +1,4 @@
-import type { UI_T_Status } from '~/components/atoms/alert/lib/models/types'
+import { UI_T_NotificationStatus } from '~/components/atoms/alert/lib/models/types'
 import { UI_E_State } from '~/lib/models/enums'
 
 export interface UI_I_ItemView {
@@ -21,7 +21,7 @@ export interface UI_I_SendTaskParams {
   args: any
 }
 export interface UI_I_NotifyBodyMessage {
-  status: UI_T_Status
+  status: UI_T_NotificationStatus
   title: string
   desc: string
 }

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