bfg-common 1.5.726 → 1.5.727

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

@@ -1,154 +1,152 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model:security="security"
-    v-model:new-view-local="newViewLocal"
-    v-model:time-format="timeFormat"
-    v-model:console-value="consoleValue"
-    v-model:vm-in-hosts-clusters="vmInHostsClusters"
-    v-model:is-dark-theme="isDarkTheme"
-    :is-show-main-menu="props.isShowMainMenu"
-    :company-name="props.companyName"
-    :beta-text="props.betaText"
-    :global-refresh-loading="props.globalRefreshLoading"
-    :hostname="props.hostname"
-    :project-name="props.projectName"
-    :is-preference="props.isPreference"
-    :selected-language-type="props.selectedLanguageType"
-    :selected-lang="props.selectedLang"
-    :new-view="props.newView"
-    :project="props.project"
-    :security-loader="props.securityLoader"
-    :recovery="props.recovery"
-    @toggle-main-menu="emits('toggle-main-menu')"
-    @show-preference="emits('show-preference')"
-    @reset-preference="emits('reset-preference')"
-    @hide-preference="emits('hide-preference')"
-    @global-refresh="emits('global-refresh')"
-    @change-theme-mode="emits('change-theme-mode')"
-    @update-language="emits('update-language', $event)"
-    @update-is-browser="emits('update-is-browser', $event)"
-    @security-confirm="emits('security-confirm', $event)"
-    @submit-preferences="emits('submit-preferences')"
-  />
-
-  <common-layout-the-header-modals-reconnect />
-  <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 type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
-import { checkIsTokenExpired } from '~/lib/utils/token'
-
-const security = defineModel<boolean>('security')
-const newViewLocal = defineModel<boolean>('newViewLocal')
-const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
-const consoleValue = defineModel<string>('consoleValue')
-const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
-const isDarkTheme = defineModel<boolean>('isDarkTheme')
-
-const props = withDefaults(
-  defineProps<{
-    isShowMainMenu: boolean
-    companyName: string
-    betaText: string
-    globalRefreshLoading: boolean
-    project: UI_T_Project
-    projectName: string
-    hostname: string
-    isPreference: boolean
-    selectedLanguageType: string
-    selectedLang: UI_I_Dropdown
-    newView: boolean
-    isPauseReconnect: boolean
-    expireTimeFromState: number
-    isShowReconnectModal: boolean
-    isShowRedirectLoginModal: boolean
-    securityLoader?: boolean // для Сферы
-    recovery?: UI_I_Recovery | null // для Сферы
-  }>(),
-  {
-    securityLoader: false,
-    recovery: null,
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'toggle-main-menu'): void
-  (event: 'global-refresh'): void
-  (event: 'show-preference'): void
-  (event: 'reset-preference'): void
-  (event: 'hide-preference'): void
-  (event: 'change-theme-mode'): void
-  (event: 'update-language', value: UI_I_Dropdown): void
-  (event: 'update-is-browser', value: string): void
-  (event: 'security-confirm', value: boolean): void
-  (event: 'submit-preferences'): void
-  (event: 'show-redirect-login-modal', value: boolean): void
-  (event: 'show-reconnect-modal', value: boolean): void
-}>()
-
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const inactivityTimer = ref<NodeJS.Timeout | undefined>(undefined)
-const inactivityTimeout = ref<number>(10 * 60 * 1000)
-
-const startInactivityTimer = (): void => {
-  inactivityTimer.value = setTimeout(() => {
-    // Проверяем если isPauseReconnect истина то не показываем модальное окно переподключения,
-    // к примеру если загружаем файл и он загружается дольше чем срабатывает таймаут
-
-    if (props.isPauseReconnect) {
-      startInactivityTimer()
-      return
-    }
-
-    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 && !props.isShowRedirectLoginModal) {
-      emits('show-reconnect-modal', true)
-      startInactivityTimer()
-    }
-
-    console.log('Пользователь бездействует!')
-  }, inactivityTimeout.value)
-}
-
-const resetInactivityTimer = (): void => {
-  // Сброс таймера бездействия при каждом действии пользователя
-  inactivityTimer.value !== null && clearTimeout(inactivityTimer.value)
-  startInactivityTimer()
-}
-
-onMounted(() => {
-  document.addEventListener('mousemove', resetInactivityTimer)
-
-  startInactivityTimer()
-})
-
-onBeforeUnmount(() => {
-  document.removeEventListener('mousemove', resetInactivityTimer)
-
-  inactivityTimer.value !== null && clearTimeout(inactivityTimer.value)
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    v-model:security="security"
+    v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
+    v-model:console-value="consoleValue"
+    v-model:vm-in-hosts-clusters="vmInHostsClusters"
+    v-model:is-dark-theme="isDarkTheme"
+    :is-show-main-menu="props.isShowMainMenu"
+    :company-name="props.companyName"
+    :beta-text="props.betaText"
+    :global-refresh-loading="props.globalRefreshLoading"
+    :hostname="props.hostname"
+    :project-name="props.projectName"
+    :is-preference="props.isPreference"
+    :selected-language-type="props.selectedLanguageType"
+    :selected-lang="props.selectedLang"
+    :new-view="props.newView"
+    :project="props.project"
+    :security-loader="props.securityLoader"
+    :recovery="props.recovery"
+    @toggle-main-menu="emits('toggle-main-menu')"
+    @show-preference="emits('show-preference')"
+    @reset-preference="emits('reset-preference')"
+    @hide-preference="emits('hide-preference')"
+    @global-refresh="emits('global-refresh')"
+    @update-language="emits('update-language', $event)"
+    @update-is-browser="emits('update-is-browser', $event)"
+    @security-confirm="emits('security-confirm', $event)"
+    @submit-preferences="emits('submit-preferences')"
+  />
+
+  <common-layout-the-header-modals-reconnect />
+  <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 type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
+import { checkIsTokenExpired } from '~/lib/utils/token'
+
+const security = defineModel<boolean>('security')
+const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
+const consoleValue = defineModel<string>('consoleValue')
+const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
+const isDarkTheme = defineModel<boolean>('isDarkTheme')
+
+const props = withDefaults(
+  defineProps<{
+    isShowMainMenu: boolean
+    companyName: string
+    betaText: string
+    globalRefreshLoading: boolean
+    project: UI_T_Project
+    projectName: string
+    hostname: string
+    isPreference: boolean
+    selectedLanguageType: string
+    selectedLang: UI_I_Dropdown
+    newView: boolean
+    isPauseReconnect: boolean
+    expireTimeFromState: number
+    isShowReconnectModal: boolean
+    isShowRedirectLoginModal: boolean
+    securityLoader?: boolean // для Сферы
+    recovery?: UI_I_Recovery | null // для Сферы
+  }>(),
+  {
+    securityLoader: false,
+    recovery: null,
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'toggle-main-menu'): void
+  (event: 'global-refresh'): void
+  (event: 'show-preference'): void
+  (event: 'reset-preference'): void
+  (event: 'hide-preference'): void
+  (event: 'update-language', value: UI_I_Dropdown): void
+  (event: 'update-is-browser', value: string): void
+  (event: 'security-confirm', value: boolean): void
+  (event: 'submit-preferences'): void
+  (event: 'show-redirect-login-modal', value: boolean): void
+  (event: 'show-reconnect-modal', value: boolean): void
+}>()
+
+const currentComponent = computed(() =>
+  props.newView
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const inactivityTimer = ref<NodeJS.Timeout | undefined>(undefined)
+const inactivityTimeout = ref<number>(10 * 60 * 1000)
+
+const startInactivityTimer = (): void => {
+  inactivityTimer.value = setTimeout(() => {
+    // Проверяем если isPauseReconnect истина то не показываем модальное окно переподключения,
+    // к примеру если загружаем файл и он загружается дольше чем срабатывает таймаут
+
+    if (props.isPauseReconnect) {
+      startInactivityTimer()
+      return
+    }
+
+    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 && !props.isShowRedirectLoginModal) {
+      emits('show-reconnect-modal', true)
+      startInactivityTimer()
+    }
+
+    console.log('Пользователь бездействует!')
+  }, inactivityTimeout.value)
+}
+
+const resetInactivityTimer = (): void => {
+  // Сброс таймера бездействия при каждом действии пользователя
+  inactivityTimer.value !== null && clearTimeout(inactivityTimer.value)
+  startInactivityTimer()
+}
+
+onMounted(() => {
+  document.addEventListener('mousemove', resetInactivityTimer)
+
+  startInactivityTimer()
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('mousemove', resetInactivityTimer)
+
+  inactivityTimer.value !== null && clearTimeout(inactivityTimer.value)
+})
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/layout/theHeader/userMenu/UserMenu.vue

@@ -1,104 +1,104 @@
-<template>
-  <component
-    :is="currentComponent"
-    :hostname="props.hostname"
-    @select-dropdown="onSelectDropdown"
-  />
-
-  <Teleport to="body">
-    <common-layout-the-header-user-menu-modals-change-password
-      v-if="isShowChangePasswordModal"
-      v-model="isShowChangePasswordModal"
-      :hostname="props.hostname"
-      :project="props.project"
-    />
-
-    <common-layout-the-header-user-menu-modals-preferences
-      v-if="props.isPreference"
-      v-model:security="security"
-      v-model:new-view-local="newViewLocal"
-      v-model:time-format="timeFormat"
-      v-model:console-value="consoleValue"
-      v-model:vm-in-hosts-clusters="vmInHostsClusters"
-      :new-view="props.newView"
-      :selected-language-type="props.selectedLanguageType"
-      :selected-language="props.selectedLanguage"
-      :project="props.project"
-      :security-loader="props.securityLoader"
-      :recovery="props.recovery"
-      @hide="emits('hide-preference')"
-      @reset="emits('reset-preference')"
-      @update-language="emits('update-language', $event)"
-      @update-is-browser="emits('update-is-browser', $event)"
-      @security-confirm="emits('security-confirm', $event)"
-      @submit="emits('submit-preferences')"
-    />
-  </Teleport>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_T_LangValue, 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 type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
-
-const security = defineModel<boolean>('security')
-const newViewLocal = defineModel<boolean>('newViewLocal')
-const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
-const consoleValue = defineModel<string>('consoleValue')
-const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
-
-const props = defineProps<{
-  hostname: string
-  project: UI_T_Project
-  isPreference: boolean
-  newView: boolean
-  selectedLanguageType: UI_T_LangValue
-  selectedLanguage: UI_I_Dropdown | string
-  securityLoader: boolean // для Сферы
-  recovery: UI_I_Recovery | null // для Сферы
-}>()
-const emits = defineEmits<{
-  (event: 'show-preference'): void
-  (event: 'reset-preference'): void
-  (event: 'hide-preference'): void
-  (event: 'change-theme-mode'): void
-  (event: 'update-language', value: UI_I_Dropdown): void
-  (event: 'update-is-browser', value: string): void
-  (event: 'security-confirm', value: boolean): void
-  (event: 'submit-preferences'): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./new/New.vue'))
-    : defineAsyncComponent(() => import('./old/Old.vue'))
-)
-
-const isShowChangePasswordModal = ref<boolean>(false)
-
-const onLogout = async (): Promise<void> => {
-  await $store.dispatch('auth/A_LOGOUT', null)
-}
-
-const onSelectDropdown = (value: string): void => {
-  switch (value) {
-    case 'changePassword':
-      isShowChangePasswordModal.value = true
-      break
-    case 'preferences':
-      emits('show-preference')
-      break
-    case 'themeMode':
-      emits('change-theme-mode')
-      break
-    case 'logout':
-      onLogout()
-      break
-  }
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    :hostname="props.hostname"
+    @select-dropdown="onSelectDropdown"
+  />
+
+  <Teleport to="body">
+    <common-layout-the-header-user-menu-modals-change-password
+      v-if="isShowChangePasswordModal"
+      v-model="isShowChangePasswordModal"
+      :hostname="props.hostname"
+      :project="props.project"
+    />
+
+    <common-layout-the-header-user-menu-modals-preferences
+      v-if="props.isPreference"
+      v-model:security="security"
+      v-model:new-view-local="newViewLocal"
+      v-model:time-format="timeFormat"
+      v-model:console-value="consoleValue"
+      v-model:vm-in-hosts-clusters="vmInHostsClusters"
+      :new-view="props.newView"
+      :selected-language-type="props.selectedLanguageType"
+      :selected-language="props.selectedLanguage"
+      :project="props.project"
+      :security-loader="props.securityLoader"
+      :recovery="props.recovery"
+      @hide="emits('hide-preference')"
+      @reset="emits('reset-preference')"
+      @update-language="emits('update-language', $event)"
+      @update-is-browser="emits('update-is-browser', $event)"
+      @security-confirm="emits('security-confirm', $event)"
+      @submit="emits('submit-preferences')"
+    />
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type { UI_T_LangValue, 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 type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
+
+const security = defineModel<boolean>('security')
+const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
+const consoleValue = defineModel<string>('consoleValue')
+const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
+const isDarkTheme = defineModel<boolean>('isDarkTheme')
+
+const props = defineProps<{
+  hostname: string
+  project: UI_T_Project
+  isPreference: boolean
+  newView: boolean
+  selectedLanguageType: UI_T_LangValue
+  selectedLanguage: UI_I_Dropdown | string
+  securityLoader: boolean // для Сферы
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+const emits = defineEmits<{
+  (event: 'show-preference'): void
+  (event: 'reset-preference'): void
+  (event: 'hide-preference'): void
+  (event: 'update-language', value: UI_I_Dropdown): void
+  (event: 'update-is-browser', value: string): void
+  (event: 'security-confirm', value: boolean): void
+  (event: 'submit-preferences'): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const currentComponent = computed(() =>
+  props.newView
+    ? defineAsyncComponent(() => import('./new/New.vue'))
+    : defineAsyncComponent(() => import('./old/Old.vue'))
+)
+
+const isShowChangePasswordModal = ref<boolean>(false)
+
+const onLogout = async (): Promise<void> => {
+  await $store.dispatch('auth/A_LOGOUT', null)
+}
+
+const onSelectDropdown = (value: string): void => {
+  switch (value) {
+    case 'changePassword':
+      isShowChangePasswordModal.value = true
+      break
+    case 'preferences':
+      emits('show-preference')
+      break
+    case 'themeMode':
+      isDarkTheme.value = !isDarkTheme.value
+      break
+    case 'logout':
+      onLogout()
+      break
+  }
+}
+</script>
+
+<style scoped lang="scss"></style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.726",
+  "version": "1.5.727",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",