bfg-common 1.5.710 → 1.5.711

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

@@ -1,191 +1,183 @@
-<template>
-  <common-layout-the-header-new
-    v-if="props.newView"
-    v-model:security="security"
-    :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"
-    :new-view-local="props.newViewLocal"
-    :time-format="props.timeFormat"
-    :project="props.project"
-    :is-dark-theme="props.isDarkTheme"
-    :remote-console="props.remoteConsole"
-    :vm-cluster="props.vmCluster"
-    :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-time-format="emits('update-time-format', $event)"
-    @change-theme-mode="emits('change-theme-mode')"
-    @update-language="emits('update-language', $event)"
-    @update-is-browser="emits('update-is-browser', $event)"
-    @update-is-new-view="emits('update-is-new-view', $event)"
-    @update-remote-console="emits('update-remote-console', $event)"
-    @update-vm-clusters="emits('update-vm-clusters', $event)"
-    @security-confirm="emits('security-confirm', $event)"
-    @submit-preferences="emits('submit-preferences')"
-  />
-  <common-layout-the-header-old
-    v-else
-    v-model:security="security"
-    :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"
-    :new-view-local="props.newViewLocal"
-    :time-format="props.timeFormat"
-    :project="props.project"
-    :remote-console="props.remoteConsole"
-    :vm-cluster="props.vmCluster"
-    :security-loader="props.securityLoader"
-    :recovery="props.recovery"
-    @toggle-main-menu="emits('toggle-main-menu')"
-    @show-preference="emits('show-preference')"
-    @hide-preference="emits('hide-preference')"
-    @global-refresh="emits('global-refresh')"
-    @update-time-format="emits('update-time-format', $event)"
-    @change-theme-mode="emits('change-theme-mode')"
-    @update-language="emits('update-language', $event)"
-    @update-is-browser="emits('update-is-browser', $event)"
-    @update-is-new-view="emits('update-is-new-view', $event)"
-    @update-remote-console="emits('update-remote-console', $event)"
-    @update-vm-clusters="emits('update-vm-clusters', $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 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
-      remoteConsole: string
-      vmCluster: boolean
-      newView: boolean
-      newViewLocal: boolean
-      timeFormat: string
-      isDarkTheme: 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-time-format', value: UI_T_TimeValue): void
-  (event: 'update-language', value: UI_I_Dropdown): void
-  (event: 'update-is-browser', value: string): void
-  (event: 'update-is-new-view', value: boolean): void
-  (event: 'update-remote-console', value: string): void
-  (event: 'update-vm-clusters', value: boolean): 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 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>
+  <common-layout-the-header-new
+    v-if="props.newView"
+    v-model:security="security"
+    v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
+    :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"
+    :is-dark-theme="props.isDarkTheme"
+    :remote-console="props.remoteConsole"
+    :vm-cluster="props.vmCluster"
+    :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)"
+    @update-remote-console="emits('update-remote-console', $event)"
+    @update-vm-clusters="emits('update-vm-clusters', $event)"
+    @security-confirm="emits('security-confirm', $event)"
+    @submit-preferences="emits('submit-preferences')"
+  />
+  <common-layout-the-header-old
+    v-else
+    v-model:security="security"
+    v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
+    :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"
+    :remote-console="props.remoteConsole"
+    :vm-cluster="props.vmCluster"
+    :security-loader="props.securityLoader"
+    :recovery="props.recovery"
+    @toggle-main-menu="emits('toggle-main-menu')"
+    @show-preference="emits('show-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)"
+    @update-remote-console="emits('update-remote-console', $event)"
+    @update-vm-clusters="emits('update-vm-clusters', $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 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
+    remoteConsole: string
+    vmCluster: boolean
+    newView: boolean
+    isDarkTheme: 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: 'update-remote-console', value: string): void
+  (event: 'update-vm-clusters', value: boolean): 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 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/TheHeaderNew.vue

@@ -102,13 +102,13 @@
         <div class="container-content user-menu-container">
           <common-layout-the-header-user-menu
             v-model:security="security"
+            v-model:new-view-local="newViewLocal"
+            v-model:time-format="timeFormat"
             :hostname="props.hostname"
             :is-preference="isPreference"
-            :time-format="props.timeFormat"
             :selected-language-type="props.selectedLanguageType"
             :selected-language="props.selectedLang"
             :new-view="props.newView"
-            :new-view-local="props.newViewLocal"
             :project="props.project"
             :remote-console="props.remoteConsole"
             :vm-cluster="props.vmCluster"
@@ -118,10 +118,8 @@
             @reset-preference="emits('reset-preference')"
             @hide-preference="emits('hide-preference')"
             @change-theme-mode="emits('change-theme-mode')"
-            @update-time-format="emits('update-time-format', $event)"
             @update-language="emits('update-language', $event)"
             @update-is-browser="emits('update-is-browser', $event)"
-            @update-is-new-view="emits('update-is-new-view', $event)"
             @update-remote-console="emits('update-remote-console', $event)"
             @update-vm-clusters="emits('update-vm-clusters', $event)"
             @security-confirm="emits('security-confirm', $event)"
@@ -138,11 +136,11 @@ import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropd
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_Recovery
-} from "~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces";
+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 props = defineProps<{
   isShowMainMenu: boolean
@@ -158,8 +156,6 @@ const props = defineProps<{
   remoteConsole: string
   vmCluster: boolean
   newView: boolean
-  newViewLocal: boolean
-  timeFormat: string
   isDarkTheme: boolean
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
@@ -172,10 +168,8 @@ const emits = defineEmits<{
   (event: 'reset-preference'): void
   (event: 'hide-preference'): void
   (event: 'change-theme-mode'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
-  (event: 'update-is-new-view', value: boolean): void
   (event: 'update-remote-console', value: string): void
   (event: 'update-vm-clusters', value: boolean): void
   (event: 'security-confirm', value: boolean): void

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

@@ -59,13 +59,13 @@
 
         <common-layout-the-header-user-menu
           v-model:security="security"
+          v-model:new-view-local="newViewLocal"
+          v-model:time-format="timeFormat"
           :hostname="props.hostname"
           :is-preference="props.isPreference"
-          :time-format="props.timeFormat"
           :selected-language-type="props.selectedLanguageType"
           :selected-language="props.selectedLang.value"
           :new-view="props.newView"
-          :new-view-local="props.newViewLocal"
           :project="props.project"
           :remote-console="props.remoteConsole"
           :vm-cluster="props.vmCluster"
@@ -74,10 +74,8 @@
           @show-preference="emits('show-preference')"
           @hide-preference="emits('hide-preference')"
           @change-theme-mode="emits('change-theme-mode')"
-          @update-time-format="emits('update-time-format', $event)"
           @update-language="onUpdateLanguage"
           @update-is-browser="emits('update-is-browser', $event)"
-          @update-is-new-view="emits('update-is-new-view', $event)"
           @update-remote-console="emits('update-remote-console', $event)"
           @update-vm-clusters="emits('update-vm-clusters', $event)"
           @security-confirm="emits('security-confirm', $event)"
@@ -106,12 +104,12 @@
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
 import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Recovery
-} from "~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces";
+import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
 import { findInLocals } from '~/components/common/selectLanguage/lib/utils/utils'
 
 const security = defineModel<boolean>('security')
+const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   companyName: string
@@ -126,8 +124,6 @@ const props = defineProps<{
   remoteConsole: string
   vmCluster: boolean
   newView: boolean
-  newViewLocal: boolean
-  timeFormat: string
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
 }>()
@@ -138,10 +134,8 @@ const emits = defineEmits<{
   (event: 'show-preference'): void
   (event: 'hide-preference'): void
   (event: 'change-theme-mode'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
-  (event: 'update-is-new-view', value: boolean): void
   (event: 'update-remote-console', value: string): void
   (event: 'update-vm-clusters', value: boolean): void
   (event: 'security-confirm', value: boolean): void