bfg-common 1.5.773 → 1.5.775

package/components/common/graph/graphNew/EmptyBlock.vue

@@ -36,12 +36,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   background-color: var(--metric-empty-block-bg);
   box-shadow: 0 1px 4px 0 #00000014;
   border-radius: 8px;
-  padding: 16px;
 
   .title {
     text-align: center;
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 500;
     color: var(--metric-empty-block-title);
     margin-bottom: 6px;
     margin-top: 8px;

package/components/common/help/navbar/left/lib/utils/constructAccordion.ts

@@ -13,7 +13,7 @@ export const constructItems = (
         !parent || (item.title !== parent.title && item._path !== parent._path)
       )
     })
-    .map((item: UI_I_ContentNavigation, key: number): UI_I_AccordionRecursion => {
+    .map((item: UI_I_ContentNavigation): UI_I_AccordionRecursion => {
       const children = constructItems(item.children, item)
       return {
         children,
@@ -22,7 +22,6 @@ export const constructItems = (
         name: item.title,
         hasChild: !!children.length,
         isOpen: !parent,
-        testId: `nav-accordion-${key}`,
       }
     })
 }

package/components/common/help/navbar/right/Right.vue

@@ -8,8 +8,7 @@
     >
       <atoms-the-icon name="arrow" />
     </button>
-
-    <div v-else class="h-full flex-direction-column">
+    <div v-else class="height-100">
       <div class="navbar__header">
         <p class="title">{{ props.title }}</p>
         <button
@@ -20,17 +19,15 @@
           <atoms-the-icon name="close" />
         </button>
       </div>
-
       <div class="navbar__content content-links">
         <a
           v-for="item in props.items"
           :key="item.text"
           :data-id="item.testId"
           :href="item.to"
-          :class="['link-item', { active: activeHash === item.to }]"
+          :class="['link-item', { active: route.hash === item.to }]"
+          >{{ item.text }}</a
         >
-          {{ item.text }}
-        </a>
       </div>
     </div>
   </div>
@@ -44,96 +41,39 @@ const props = defineProps<{
   items: UI_I_ContentNavbarItem[]
 }>()
 
-const isShow = ref<boolean>(true)
-const activeHash = ref<string>('')
+const route = useRoute()
 
-let observer: IntersectionObserver | null = null
-let rootElement: Element | null = null
+const isShow = ref<boolean>(true)
 
-const setActiveHashFromLocation = () => {
-  // decodeURIComponent чтобы корректно читать хэши с кириллицей/спецсимволами
-  activeHash.value =
-    typeof window !== 'undefined'
-      ? decodeURIComponent(window.location.hash || '')
-      : ''
-}
+const checkActiveLink = (): void => {
+  const links = document.querySelectorAll('.content-links .link-item')
 
-const observeLinks = (): void => {
-  const headingsSelector =
-    '.help .content-renderer h1, .help .content-renderer h2, .help .content-renderer h3, .help .content-renderer h4, .help .content-renderer h5, .help .content-renderer h6'
+  if (!links.length) return
 
-  const headingNodes = Array.from(
-    document.querySelectorAll<HTMLElement>(headingsSelector)
-  ).filter((h) => !!h.id)
+  links.forEach((item) => {
+    const linkElement = item as HTMLLinkElement
 
-  if (headingNodes.length) {
-    const options: IntersectionObserverInit = {
-      root: rootElement || null,
-      rootMargin: '0px 0px -99% 0px', // активна пока верх секции у top root
-      threshold: 0,
-    }
-
-    observer = new IntersectionObserver((entries) => {
-      entries.forEach((entry) => {
-        if (!entry.isIntersecting) return
-        const id = entry.target.getAttribute('id')
-        if (!id) return
-        const newHash = `#${id}`
-
-        // Если уже такой hash — ничего не делаем
-        if (decodeURIComponent(window.location.hash || '') === newHash) {
-          activeHash.value = newHash
-          return
-        }
-
-        // Обновляем URL без скролла
-        history.replaceState(null, '', newHash)
-        activeHash.value = newHash
-      })
-    }, options)
-
-    headingNodes.forEach((h) => observer?.observe(h))
-  }
+    linkElement.classList.remove('active')
+    const linkHref = linkElement.getAttribute('href')
+    if (linkHref && route.hash === linkHref) linkElement.classList.add('active')
+    else if (!route.hash) links[0].classList.add('active')
+  })
 }
 
-const init = (): void => {
-  rootElement = document.querySelector('.help__content')
-
-  setActiveHashFromLocation()
+const parentCurrentScrollPosition = (): void => {
+  const parentElement = document.querySelector('.help__content')
+  if (!parentElement || route.hash) return
 
-  if (props.items?.length) {
-    const first = props.items[0]?.to ?? ''
-    if (first) {
-      history.replaceState(null, '', first)
-      setActiveHashFromLocation()
-    }
-  }
-
-  observeLinks()
+  parentElement.scrollTop = 0
 }
 
-onMounted(() => {
-  init()
-})
-let isRouteUpdated = false
 onUpdated(() => {
-  if (isRouteUpdated) {
-    init()
-    isRouteUpdated = false
-  }
+  parentCurrentScrollPosition()
+  checkActiveLink()
 })
 
-// cleanup при unmount
-onUnmounted(() => {
-  observer?.disconnect()
-})
-onBeforeRouteUpdate((to, from, next) => {
-  // обработка оснавной навигации, делаем cleanup
-  if (from.path !== to.path) {
-    observer?.disconnect()
-    isRouteUpdated = true
-  }
-  next()
+onMounted(() => {
+  checkActiveLink()
 })
 </script>
 
@@ -161,7 +101,6 @@ onBeforeRouteUpdate((to, from, next) => {
     cursor: pointer;
     margin: 12px 6px;
   }
-
   &__header {
     display: flex;
     justify-content: space-between;
@@ -189,12 +128,10 @@ onBeforeRouteUpdate((to, from, next) => {
       }
     }
   }
-
   &__content {
     height: 100%;
     overflow: auto;
   }
-
   .link-item {
     display: block;
     color: var(--global-font-color);

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

@@ -1,13 +1,7 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-layout-the-header-new
+    v-if="props.newView"
     v-model:security="security"
-    v-model:is-show-notification="isShowNotification"
-    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"
@@ -18,7 +12,12 @@
     :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')"
@@ -26,8 +25,46 @@
     @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')"
   />
@@ -40,41 +77,42 @@
 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 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 isShowNotification = defineModel<boolean>('isShowNotification')
-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,
-  }
+    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<{
@@ -83,20 +121,19 @@ const emits = defineEmits<{
   (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 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)
 

package/components/common/layout/theHeader/{New.vue → TheHeaderNew.vue}

@@ -87,7 +87,10 @@
         </ui-tooltip>
         <div class="divider right-divider-global-refresh" />
         <div class="container-content">
-          <common-layout-the-header-theme-switch v-model="isDarkTheme" />
+          <common-layout-the-header-theme-switch
+            :is-dark-theme="props.isDarkTheme"
+            @change-theme-mode="emits('change-theme-mode')"
+          />
         </div>
         <div class="divider" />
         <div class="container-content">
@@ -99,25 +102,28 @@
         <div class="container-content user-menu-container">
           <common-layout-the-header-user-menu
             v-model:security="security"
-            v-model:is-show-notification="isShowNotification"
-            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"
             :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"
             :security-loader="props.securityLoader"
             :recovery="props.recovery"
             @show-preference="emits('show-preference')"
             @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)"
             @submit-preferences="emits('submit-preferences')"
           />
@@ -132,15 +138,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 isShowNotification = defineModel<boolean>('isShowNotification')
-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<{
   isShowMainMenu: boolean
@@ -153,7 +155,12 @@ const props = defineProps<{
   isPreference: boolean
   selectedLanguageType: string
   selectedLang: UI_I_Dropdown
+  remoteConsole: string
+  vmCluster: boolean
   newView: boolean
+  newViewLocal: boolean
+  timeFormat: string
+  isDarkTheme: boolean
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
 }>()
@@ -164,8 +171,13 @@ const emits = defineEmits<{
   (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
 }>()

package/components/common/layout/theHeader/{Old.vue → TheHeaderOld.vue}

@@ -59,24 +59,27 @@
 
         <common-layout-the-header-user-menu
           v-model:security="security"
-          v-model:is-show-notification="isShowNotification"
-          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"
           :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"
           :security-loader="props.securityLoader"
           :recovery="props.recovery"
           @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)"
           @submit-preferences="emits('submit-preferences')"
         />
@@ -103,16 +106,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 isShowNotification = defineModel<boolean>('isShowNotification')
-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<{
   companyName: string
@@ -124,7 +123,11 @@ const props = defineProps<{
   isPreference: boolean
   selectedLanguageType: string
   selectedLang: UI_I_Dropdown
+  remoteConsole: string
+  vmCluster: boolean
   newView: boolean
+  newViewLocal: boolean
+  timeFormat: string
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
 }>()
@@ -134,8 +137,13 @@ const emits = defineEmits<{
   (event: 'global-refresh'): void
   (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
   (event: 'submit-preferences'): void
 }>()

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

@@ -11,12 +11,7 @@
         id="tooltip-theme-mode-toggle-button"
         class="popped tooltip inline-block"
       >
-        <ui-switch
-          v-model="isDarkTheme"
-          test-id="switch-theme-mode"
-          size="md"
-          dark
-        >
+        <ui-switch v-model="model" test-id="switch-theme-mode" size="md" dark>
           <template #rightIcon>
             <ui-icon name="light-theme" width="14" height="14" />
           </template>
@@ -37,12 +32,27 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const isDarkTheme = defineModel<boolean>()
+const props = defineProps<{
+  isDarkTheme: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'change-theme-mode'): void
+}>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const model = computed<boolean>({
+  get() {
+    return props.isDarkTheme
+  },
+  set() {
+    emits('change-theme-mode')
+  },
+})
+
 const tooltipText = computed<string>(() =>
-  isDarkTheme.value
+  model.value
     ? localization.value.layout.darkMode
     : localization.value.layout.lightMode
 )

package/components/common/layout/theHeader/feedback/new/email/Email.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script setup lang="ts">
-import { allRegExp } from '~/lib/config/regExp'
+import { RegExp } from '~/lib/config/regExp'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const emailModelLocal = defineModel<string>({ required: true })
@@ -23,7 +23,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const emailErrorText = computed<string>(() => {
   if (!emailModelLocal.value) return ''
 
-  return allRegExp.email.test(emailModelLocal.value)
+  return RegExp.email.test(emailModelLocal.value)
     ? ''
     : localization.value.common.emailErrorText
 })

package/components/common/layout/theHeader/helpMenu/{about/About.vue → About.vue}

@@ -1,7 +1,19 @@
 <template>
   <Teleport to="body">
-    <component
-      :is="currentComponent"
+    <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"
+      :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"
@@ -46,24 +58,22 @@ const subtitle = computed<string>(() =>
 )
 
 const aboutHeadingText = computed<string>(() =>
-  localization.value.layout.aboutHeading
-    .replace('{companyName}', companyName.value)
-    .replace('{year}', new Date().getFullYear() + '')
+  localization.value.layout.aboutHeading.replace(
+    '{companyName}',
+    companyName.value
+  ).replace(
+    '{year}',
+      new Date().getFullYear() + ''
+  )
 )
 
 const aboutDesc = computed<string[]>(() =>
   localization.value.layout.aboutDesc
     .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-    .split('{url}')
+    .replaceAll('{trademark}', brandName.value).split('{url}')
 )
 const aboutDesc1 = computed<string>(() => aboutDesc.value[0])
 const aboutDesc2 = computed<string>(() => aboutDesc.value[1])
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
 </script>