bfg-common 1.3.215 → 1.3.217

package/components/common/weekSelect/WeekSelect.vue

@@ -1,112 +1,112 @@
-<template>
-  <div class="flex-align-center">
-    <common-select-input
-      v-model="selectedOption"
-      :data="options"
-      class="mr-1"
-    />
-
-    <div class="btn-group">
-      <button
-        v-for="item in tabs"
-        :key="item"
-        :class="['btn btn-sm btn-secondary', { 'btn-primary': item.isActive }]"
-        :disabled="!isCustom"
-        @click="onSelectDay(item.value)"
-      >
-        {{ item.text }}
-      </button>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import type { UI_I_TabItem } from '~/components/common/weekSelect/lib/models/interfaces'
-import { optionsFunc } from '~/components/common/weekSelect/lib/config/options'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const model = defineModel<number[]>()
-
-const selectedOption = ref<number>(0)
-if (model.value.length === 2 && model.value.includes(6) && model.value.includes(0)) {
-  selectedOption.value = 1
-} else if (model.value.length < 7) {
-  selectedOption.value = 2
-}
-
-const options = ref<UI_I_SelectInputItem[]>(optionsFunc(localization.value))
-
-const isCustom = computed<boolean>(() => selectedOption.value === 2)
-const onSelectDay = (value: number): void => {
-  const index = model.value?.indexOf(value)
-  if (index === -1) {
-    model.value.push(value)
-    model.value.sort((a: number, b: number) => a - b)
-  }
-  else if (model.value.length > 1) {
-    model.value = model.value?.filter((_: number, key: number) => key !== index)
-  }
-}
-
-const tabs = computed<UI_I_TabItem[]>(() => {
-  return [
-    { text: localization.value.weekM, value: 1, isActive: checkIsActiveDay(1) },
-    { text: localization.value.weekT, value: 2, isActive: checkIsActiveDay(2) },
-    { text: localization.value.weekW, value: 3, isActive: checkIsActiveDay(3) },
-    {
-      text: localization.value.weekTh,
-      value: 4,
-      isActive: checkIsActiveDay(4),
-    },
-    { text: localization.value.weekF, value: 5, isActive: checkIsActiveDay(5) },
-    { text: localization.value.weekS, value: 6, isActive: checkIsActiveDay(6) },
-    {
-      text: localization.value.weekSu,
-      value: 0,
-      isActive: checkIsActiveDay(0),
-    },
-  ]
-})
-const checkIsActiveDay = (value: number): boolean => {
-  let result = false
-  switch (selectedOption.value) {
-    case 0:
-      result = true
-      break
-    case 1:
-      if (value === 6 || value === 0) result = true
-      break
-    default:
-      result = !!model.value?.includes(value)
-      break
-  }
-
-  return result
-}
-watch(
-  tabs,
-  (newValue: UI_I_TabItem[]) => {
-    if (selectedOption.value === 2) return
-
-    model.value = newValue.filter((tab) => tab.isActive).map((tab) => tab.value)
-  },
-  { immediate: true }
-)
-</script>
-
-<style lang="scss" scoped>
-:deep(.select::after) {
-  top: 2px;
-  right: -16px;
-}
-.btn-group {
-  button {
-    width: 24px;
-    min-width: 24px;
-    padding: 0;
-  }
-}
-</style>
+<template>
+  <div class="flex-align-center">
+    <common-select-input
+      v-model="selectedOption"
+      :data="options"
+      class="mr-1"
+    />
+
+    <div class="btn-group">
+      <button
+        v-for="item in tabs"
+        :key="item"
+        :class="['btn btn-sm btn-secondary', { 'btn-primary': item.isActive }]"
+        :disabled="!isCustom"
+        @click="onSelectDay(item.value)"
+      >
+        {{ item.text }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import type { UI_I_TabItem } from '~/components/common/weekSelect/lib/models/interfaces'
+import { optionsFunc } from '~/components/common/weekSelect/lib/config/options'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const model = defineModel<number[]>()
+
+const selectedOption = ref<number>(0)
+if (model.value.length === 2 && model.value.includes(6) && model.value.includes(0)) {
+  selectedOption.value = 1
+} else if (model.value.length < 7) {
+  selectedOption.value = 2
+}
+
+const options = ref<UI_I_SelectInputItem[]>(optionsFunc(localization.value))
+
+const isCustom = computed<boolean>(() => selectedOption.value === 2)
+const onSelectDay = (value: number): void => {
+  const index = model.value?.indexOf(value)
+  if (index === -1) {
+    model.value.push(value)
+    model.value.sort((a: number, b: number) => a - b)
+  }
+  else if (model.value.length > 1) {
+    model.value = model.value?.filter((_: number, key: number) => key !== index)
+  }
+}
+
+const tabs = computed<UI_I_TabItem[]>(() => {
+  return [
+    { text: localization.value.weekM, value: 1, isActive: checkIsActiveDay(1) },
+    { text: localization.value.weekT, value: 2, isActive: checkIsActiveDay(2) },
+    { text: localization.value.weekW, value: 3, isActive: checkIsActiveDay(3) },
+    {
+      text: localization.value.weekTh,
+      value: 4,
+      isActive: checkIsActiveDay(4),
+    },
+    { text: localization.value.weekF, value: 5, isActive: checkIsActiveDay(5) },
+    { text: localization.value.weekS, value: 6, isActive: checkIsActiveDay(6) },
+    {
+      text: localization.value.weekSu,
+      value: 0,
+      isActive: checkIsActiveDay(0),
+    },
+  ]
+})
+const checkIsActiveDay = (value: number): boolean => {
+  let result = false
+  switch (selectedOption.value) {
+    case 0:
+      result = true
+      break
+    case 1:
+      if (value === 6 || value === 0) result = true
+      break
+    default:
+      result = !!model.value?.includes(value)
+      break
+  }
+
+  return result
+}
+watch(
+  tabs,
+  (newValue: UI_I_TabItem[]) => {
+    if (selectedOption.value === 2) return
+
+    model.value = newValue.filter((tab) => tab.isActive).map((tab) => tab.value)
+  },
+  { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+:deep(.select::after) {
+  top: 2px;
+  right: -16px;
+}
+.btn-group {
+  button {
+    width: 24px;
+    min-width: 24px;
+    padding: 0;
+  }
+}
+</style>

package/components/common/weekSelect/lib/config/options.ts

@@ -1,10 +1,10 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-
-export const optionsFunc = (
-  localization: UI_I_Localization
-): UI_I_SelectInputItem[] => [
-  { label: localization.daily, value: 0 },
-  { label: localization.weekly, value: 1 },
-  { label: localization.custom, value: 2 },
-]
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+
+export const optionsFunc = (
+  localization: UI_I_Localization
+): UI_I_SelectInputItem[] => [
+  { label: localization.daily, value: 0 },
+  { label: localization.weekly, value: 1 },
+  { label: localization.custom, value: 2 },
+]

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

@@ -691,6 +691,22 @@ const validationFunc = async (
       connectionSettingsValidation.stepHasError
   }
 
+  // if (wizard.isValidateForStep(6, currentStep.id, nextStep.id)) {
+  //     const connectionSettingsValidation = checkConnectionSettingsSync(
+  //         localization.value,
+  //         connectionSettings.value,
+  //         wizard,
+  //         value
+  //     )
+  //
+  //     value = connectionSettingsValidation.newValue
+  //
+  //     stepHasError =
+  //         stepHasError ||
+  //         labelValidation.stepHasError ||
+  //         connectionSettingsValidation.stepHasError
+  // }
+
   return {
     newValue: value,
     stepHasError,
@@ -1002,4 +1018,4 @@ watch(
     color: var(--main-color-mode2);
   }
 }
-</style>
+</style>

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

@@ -0,0 +1,70 @@
+// import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
+// import { UI_I_Localization } from '~/lib/models/interfaces'
+// import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+// import {
+//     UI_I_ValidationReturn,
+//     UI_I_WizardStep,
+// } from '~/components/atoms/wizard/lib/models/interfaces'
+// import {
+//     UI_I_AdapterStatus,
+//     UI_I_Adapter,
+//     UI_I_DiagramData,
+// } from '~/components/common/diagramMain/lib/models/interfaces'
+//
+// export const checkPhysicalAdaptersSync = (
+//     localization: UI_I_Localization,
+//     adapterStatus: UI_I_AdapterStatus,
+//     diagramsData: UI_I_DiagramData[],
+//     switchId: string,
+//     wizard: Wizard,
+//     value: UI_I_WizardStep[]
+// ): UI_I_ValidationReturn => {
+//     let stepHasError = false
+//
+//     const adapters = [
+//         ...(adapterStatus.active as string[]),
+//         ...(adapterStatus.standby as string[]),
+//         ...(adapterStatus.unused as string[]),
+//     ]
+//
+//     const switchData: UI_I_DiagramData | undefined = diagramsData.find(
+//         (diagram: UI_I_DiagramData) => diagram.id === switchId
+//     )
+//
+//     let existing: string[] = []
+//
+//     if (!switchData) {
+//         existing = []
+//     } else {
+//         existing =
+//             switchData.physicalAdapters?.adapters.map(
+//                 (adapter: UI_I_Adapter) => adapter.id
+//             ) || []
+//     }
+//
+//     const assignedAdapters: string[] = adapters.filter(
+//         (adapterId: string) => !existing.includes(adapterId)
+//     )
+//
+//     if (checkVlanId(data.vlanId)) {
+//         stepHasError = wizard.setValidation(
+//             3,
+//             UI_E_ValidationFields.PORT_PROPERTIES_VLAN,
+//             {
+//                 fieldMessage: localization.vlanIdInvalidMessage,
+//                 alertMessage: localization.vlanIdInvalidMessage,
+//             }
+//         )
+//     } else if (wizard.hasMessage(3, UI_E_ValidationFields.PORT_PROPERTIES_VLAN)) {
+//         value = wizard.removeValidation(
+//             3,
+//             UI_E_ValidationFields.PORT_PROPERTIES_VLAN,
+//             value
+//         )
+//     }
+//
+//     return {
+//         newValue: value,
+//         stepHasError,
+//     }
+// }

package/composables/productNameLocal.ts

@@ -6,17 +6,17 @@ export function productNameLocal(
   const config = useRuntimeConfig()
 
   const keys = Object.keys(localization)
-  const procuratorName =
+  const productName =
     config.public.LOCALIZATION_CODE === 'ru'
       ? config.public.PRODUCT_NAME_RU
       : config.public.PRODUCT_NAME_EN
 
-  keys.forEach((key) => {
+  for (let key in localization) {
     localization[key] = localization[key].replaceAll(
       '{productName}',
-      String(procuratorName)
+      String(productName)
     )
-  })
+  }
 
   return localization
 }

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

@@ -23,9 +23,6 @@ export const useLocal = (): UI_I_Localization => {
 
   let result: UI_I_Localization = locals.localRu
   switch (code) {
-    case 'ru':
-      result = locals.localRu
-      break
     case 'en':
       result = locals.localEn
       break

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