bfg-common 1.4.639 → 1.4.640

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter.ts

@@ -1,52 +1,52 @@
-import type { UI_I_SelectVmkernelAdapter } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-
-export const validateSelectedVmLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_SelectVmkernelAdapter,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    0,
-    'vm',
-    data.vm === '',
-    '',
-    localization.common.noVmKernelNetworkAdapterSelectedForMigration
-  )
-}
-
-export const checkSelectedVmSync = (
-  localization: UI_I_Localization,
-  data: UI_I_SelectVmkernelAdapter,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (data.vm === '') {
-    stepHasError = wizard.setValidation(
-      0,
-      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
-      {
-        fieldMessage: '',
-        alertMessage: localization.common.noVmKernelNetworkAdapterSelectedForMigration,
-      }
-    )
-  } else if (
-    wizard.hasMessage(0, UI_E_MigrationValidationFields.SELECT_ADAPTER_VM)
-  ) {
-    value = wizard.removeValidation(
-      0,
-      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_SelectVmkernelAdapter } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/lib/models/interfaces'
+import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+
+export const validateSelectedVmLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_SelectVmkernelAdapter,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    0,
+    'vm',
+    data.vm === '',
+    '',
+    localization.common.noVmKernelNetworkAdapterSelectedForMigration
+  )
+}
+
+export const checkSelectedVmSync = (
+  localization: UI_I_Localization,
+  data: UI_I_SelectVmkernelAdapter,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (data.vm === '') {
+    stepHasError = wizard.setValidation(
+      0,
+      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
+      {
+        fieldMessage: '',
+        alertMessage: localization.common.noVmKernelNetworkAdapterSelectedForMigration,
+      }
+    )
+  } else if (
+    wizard.hasMessage(0, UI_E_MigrationValidationFields.SELECT_ADAPTER_VM)
+  ) {
+    value = wizard.removeValidation(
+      0,
+      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/validations.ts

@@ -1,19 +1,19 @@
-import {
-  validateVlanIdConnectionSettingsLocal,
-  validateNetworkConnectionSettingsLocal,
-  checkConnectionSettingsSync,
-  checkNetworkAsync,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings'
-import {
-  checkSelectedVmSync,
-  validateSelectedVmLocal,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter'
-
-export {
-  validateVlanIdConnectionSettingsLocal,
-  validateNetworkConnectionSettingsLocal,
-  checkConnectionSettingsSync,
-  checkNetworkAsync,
-  checkSelectedVmSync,
-  validateSelectedVmLocal,
-}
+import {
+  validateVlanIdConnectionSettingsLocal,
+  validateNetworkConnectionSettingsLocal,
+  checkConnectionSettingsSync,
+  checkNetworkAsync,
+} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings'
+import {
+  checkSelectedVmSync,
+  validateSelectedVmLocal,
+} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter'
+
+export {
+  validateVlanIdConnectionSettingsLocal,
+  validateNetworkConnectionSettingsLocal,
+  checkConnectionSettingsSync,
+  checkNetworkAsync,
+  checkSelectedVmSync,
+  validateSelectedVmLocal,
+}

package/components/common/diagramMain/port/Ports.vue

@@ -1,47 +1,47 @@
-<template>
-  <g>
-    <template v-if="props.network.toggle">
-      <template v-for="port in props.network.ports" :key="port.id">
-        <common-diagram-main-port
-          :network="props.network"
-          :port="port"
-          :is-dark-mode="props.isDarkMode"
-          :selected-port="props.selectedPort"
-          :selected-adapter="props.selectedAdapter"
-          @select-port="onSelectPort"
-          @show-modal="onShowModal"
-        />
-      </template>
-    </template>
-  </g>
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_ModalsInitialData,
-  UI_I_NetworkFullWithPositions,
-  UI_I_SelectedAdapter,
-  UI_I_SelectedPort,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-const props = defineProps<{
-  network: UI_I_NetworkFullWithPositions
-  selectedPort: UI_I_SelectedPort
-  selectedAdapter: UI_I_SelectedAdapter
-  isDarkMode: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-port', networkId: string, portId: string): void
-  (
-    event: 'show-modal',
-    value: string,
-    properties?: UI_I_ModalsInitialData
-  ): void
-}>()
-
-const onSelectPort = (networkId: string, portId: string) =>
-  emits('select-port', networkId, portId)
-const onShowModal = (value: string, properties?: UI_I_ModalsInitialData) =>
-  emits('show-modal', value, properties)
-</script>
+<template>
+  <g>
+    <template v-if="props.network.toggle">
+      <template v-for="port in props.network.ports" :key="port.id">
+        <common-diagram-main-port
+          :network="props.network"
+          :port="port"
+          :is-dark-mode="props.isDarkMode"
+          :selected-port="props.selectedPort"
+          :selected-adapter="props.selectedAdapter"
+          @select-port="onSelectPort"
+          @show-modal="onShowModal"
+        />
+      </template>
+    </template>
+  </g>
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_ModalsInitialData,
+  UI_I_NetworkFullWithPositions,
+  UI_I_SelectedAdapter,
+  UI_I_SelectedPort,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = defineProps<{
+  network: UI_I_NetworkFullWithPositions
+  selectedPort: UI_I_SelectedPort
+  selectedAdapter: UI_I_SelectedAdapter
+  isDarkMode: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-port', networkId: string, portId: string): void
+  (
+    event: 'show-modal',
+    value: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
+}>()
+
+const onSelectPort = (networkId: string, portId: string) =>
+  emits('select-port', networkId, portId)
+const onShowModal = (value: string, properties?: UI_I_ModalsInitialData) =>
+  emits('show-modal', value, properties)
+</script>

package/components/common/layout/theHeader/TheHeader.vue

@@ -66,14 +66,14 @@
   />
 
   <common-layout-the-header-modals-reconnect />
-  <!--  <common-layout-the-header-modals-redirect-login />-->
+  <common-layout-the-header-modals-redirect-login />
 </template>
 
 <script setup lang="ts">
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
-// import { checkIsTokenExpired } from '~/lib/utils/token'
+import { checkIsTokenExpired } from '~/lib/utils/token'
 
 const props = defineProps<{
   isShowMainMenu: boolean
@@ -96,6 +96,8 @@ const props = defineProps<{
   isDarkTheme: boolean
   isPauseReconnect: boolean
   expireTimeFromState: number
+  isShowReconnectModal: boolean
+  isShowRedirectLoginModal: boolean
 }>()
 
 const emits = defineEmits<{
@@ -123,23 +125,29 @@ const startInactivityTimer = (): void => {
   inactivityTimer.value = setTimeout(() => {
     // Проверяем если isPauseReconnect истина то не показываем модальное окно переподключения,
     // к примеру если загружаем файл и он загружается дольше чем срабатывает таймаут
+
     if (props.isPauseReconnect) {
       startInactivityTimer()
       return
     }
 
-    // const expireTime =
-    //   props.expireTimeFromState || useCookie('token-expired-time')
-    //
-    // const isExpiredToken = checkIsTokenExpired(expireTime)
-    //
-    //
-    // isExpiredToken && emits('show-redirect-login-modal', true)
-    //
-    // if (!isExpiredToken) {
-    emits('show-reconnect-modal', true)
-    startInactivityTimer()
-    // }
+    const expireTime =
+      props.expireTimeFromState || useCookie('token-expired-time').value
+
+    const isExpiredToken = checkIsTokenExpired(expireTime)
+
+    if (isExpiredToken) {
+      emits('show-redirect-login-modal', true)
+
+      if (props.isShowReconnectModal) {
+        emits('show-reconnect-modal', false)
+      }
+    }
+
+    if (!isExpiredToken && !isShowRedirectLoginModal) {
+      emits('show-reconnect-modal', true)
+      startInactivityTimer()
+    }
 
     console.log('Пользователь бездействует!')
   }, inactivityTimeout.value)

package/components/common/layout/theHeader/helpMenu/About.vue

@@ -1,85 +1,85 @@
-<template>
-  <Teleport to="body">
-    <common-layout-the-header-help-menu-about-new
-      v-if="isNewView"
-      :title="title"
-      :subtitle="subtitle"
-      :about-heading-text="aboutHeadingText"
-      :about-desc-one="aboutDesc1"
-      :about-desc-second="aboutDesc2"
-      :is-beta-version="props.isBeta"
-      :is-dev="props.isDev"
-      :project-name="props.projectName"
-      :url="companyWebSitePath"
-      @hide="emits('hide')"
-    />
-
-    <common-layout-the-header-help-menu-about-old
-      v-else
-      :title="title"
-      :subtitle="subtitle"
-      :about-heading-text="aboutHeadingText"
-      :about-desc-one="aboutDesc1"
-      :about-desc-second="aboutDesc2"
-      :is-beta-version="props.isBeta"
-      :is-dev="props.isDev"
-      :project-name="props.projectName"
-      :url="companyWebSitePath"
-      @hide="emits('hide')"
-    />
-  </Teleport>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  version: string
-  isBeta: boolean
-  isDev: boolean
-  projectName: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-const config = useRuntimeConfig()
-
-const companyName = computed<string>(
-  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
-)
-const brandName = computed<string>(
-  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
-)
-
-const companyWebSitePath = ref<string>('https://iridium-soft.com/')
-
-const title = computed<string>(() => `${brandName.value}® ${props.projectName}`)
-const subtitle = computed<string>(() =>
-  localization.value.layout.aboutWebClientVersion
-    .replace('{0}', props.projectName)
-    .replace('{1}', props.version)
-)
-
-const aboutHeadingText = computed<string>(() =>
-  localization.value.layout.aboutHeading.replaceAll(
-    '{companyName}',
-    companyName.value
-  )
-)
-
-const aboutDesc1 = computed<string>(() =>
-  localization.value.layout.aboutDesc1
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-)
-const aboutDesc2 = computed<string>(() =>
-  localization.value.layout.aboutDesc2
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-)
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
+<template>
+  <Teleport to="body">
+    <common-layout-the-header-help-menu-about-new
+      v-if="isNewView"
+      :title="title"
+      :subtitle="subtitle"
+      :about-heading-text="aboutHeadingText"
+      :about-desc-one="aboutDesc1"
+      :about-desc-second="aboutDesc2"
+      :is-beta-version="props.isBeta"
+      :is-dev="props.isDev"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+
+    <common-layout-the-header-help-menu-about-old
+      v-else
+      :title="title"
+      :subtitle="subtitle"
+      :about-heading-text="aboutHeadingText"
+      :about-desc-one="aboutDesc1"
+      :about-desc-second="aboutDesc2"
+      :is-beta-version="props.isBeta"
+      :is-dev="props.isDev"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+  </Teleport>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  version: string
+  isBeta: boolean
+  isDev: boolean
+  projectName: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+const config = useRuntimeConfig()
+
+const companyName = computed<string>(
+  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
+)
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+
+const companyWebSitePath = ref<string>('https://iridium-soft.com/')
+
+const title = computed<string>(() => `${brandName.value}® ${props.projectName}`)
+const subtitle = computed<string>(() =>
+  localization.value.layout.aboutWebClientVersion
+    .replace('{0}', props.projectName)
+    .replace('{1}', props.version)
+)
+
+const aboutHeadingText = computed<string>(() =>
+  localization.value.layout.aboutHeading.replaceAll(
+    '{companyName}',
+    companyName.value
+  )
+)
+
+const aboutDesc1 = computed<string>(() =>
+  localization.value.layout.aboutDesc1
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+const aboutDesc2 = computed<string>(() =>
+  localization.value.layout.aboutDesc2
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>