bfg-common 1.5.723 → 1.5.725

package/components/common/layout/console/Console.vue

@@ -1,70 +1,70 @@
-<template>
-  <atoms-window
-    v-if="consoleInWindow?.isShow"
-    :top="consoleInWindow.top"
-    :left="consoleInWindow.left"
-    :width="consoleInWindow.width"
-    :height="consoleInWindow.height"
-    :title="consoleInWindow.name"
-    :loading="consoleInWindow.isLoading"
-    @hide="onHide"
-  >
-    <template #header>
-      <div class="flex-align-center gap-2 overflow-hidden">
-        <ui-icon name="monitor" width="16" height="16" class="monitor-icon" />
-        <span class="text-ellipsis">{{ consoleInWindow.name }}</span>
-      </div>
-    </template>
-    <embed
-      id="embed"
-      type="text/html"
-      width="100%"
-      height="100%"
-      :src="consoleInWindow.url"
-      @load="onLoad"
-    />
-  </atoms-window>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ConsoleInWindow } from '~/components/common/layout/console/lib/models/interfaces'
-
-const { $store }: any = useNuxtApp()
-
-const onLoad = (): void => {
-  $store.dispatch('main/A_CHANGE_CONSOLE_IN_WINDOW_LOADING', false)
-}
-
-const consoleInWindow = computed<UI_I_ConsoleInWindow | null>(() => {
-  return $store.getters['main/getConsoleInWindow']
-})
-watch(
-  consoleInWindow,
-  (newValue, oldValue) => {
-    if (newValue?.url === oldValue?.url) {
-      $store.dispatch('main/A_CHANGE_CONSOLE_IN_WINDOW_LOADING', false)
-    }
-  },
-  { deep: true }
-)
-
-const onHide = (): void => {
-  $store.dispatch('main/A_SHOW_CONSOLE_IN_WINDOW', {
-    width: -1,
-    height: -1,
-    top: -1,
-    left: -1,
-    name: '',
-    isShow: false,
-    isLoading: false,
-    url: '',
-  })
-}
-</script>
-
-<style scoped lang="scss">
-.monitor-icon {
-  min-width: 16px;
-  min-height: 16px;
-}
-</style>
+<template>
+  <atoms-window
+    v-if="consoleInWindow?.isShow"
+    :top="consoleInWindow.top"
+    :left="consoleInWindow.left"
+    :width="consoleInWindow.width"
+    :height="consoleInWindow.height"
+    :title="consoleInWindow.name"
+    :loading="consoleInWindow.isLoading"
+    @hide="onHide"
+  >
+    <template #header>
+      <div class="flex-align-center gap-2 overflow-hidden">
+        <ui-icon name="monitor" width="16" height="16" class="monitor-icon" />
+        <span class="text-ellipsis">{{ consoleInWindow.name }}</span>
+      </div>
+    </template>
+    <embed
+      id="embed"
+      type="text/html"
+      width="100%"
+      height="100%"
+      :src="consoleInWindow.url"
+      @load="onLoad"
+    />
+  </atoms-window>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ConsoleInWindow } from '~/components/common/layout/console/lib/models/interfaces'
+
+const { $store }: any = useNuxtApp()
+
+const onLoad = (): void => {
+  $store.dispatch('main/A_CHANGE_CONSOLE_IN_WINDOW_LOADING', false)
+}
+
+const consoleInWindow = computed<UI_I_ConsoleInWindow | null>(() => {
+  return $store.getters['main/getConsoleInWindow']
+})
+watch(
+  consoleInWindow,
+  (newValue, oldValue) => {
+    if (newValue?.url === oldValue?.url) {
+      $store.dispatch('main/A_CHANGE_CONSOLE_IN_WINDOW_LOADING', false)
+    }
+  },
+  { deep: true }
+)
+
+const onHide = (): void => {
+  $store.dispatch('main/A_SHOW_CONSOLE_IN_WINDOW', {
+    width: -1,
+    height: -1,
+    top: -1,
+    left: -1,
+    name: '',
+    isShow: false,
+    isLoading: false,
+    url: '',
+  })
+}
+</script>
+
+<style scoped lang="scss">
+.monitor-icon {
+  min-width: 16px;
+  min-height: 16px;
+}
+</style>

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

@@ -87,10 +87,7 @@
         </ui-tooltip>
         <div class="divider right-divider-global-refresh" />
         <div class="container-content">
-          <common-layout-the-header-theme-switch
-            :is-dark-theme="props.isDarkTheme"
-            @change-theme-mode="emits('change-theme-mode')"
-          />
+          <common-layout-the-header-theme-switch v-model="isDarkTheme" />
         </div>
         <div class="divider" />
         <div class="container-content">
@@ -141,6 +138,7 @@ 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
@@ -154,7 +152,6 @@ const props = defineProps<{
   selectedLanguageType: string
   selectedLang: UI_I_Dropdown
   newView: boolean
-  isDarkTheme: boolean
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
 }>()

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

@@ -1,11 +1,12 @@
 <template>
-  <common-layout-the-header-new
-    v-if="props.newView"
+  <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"
@@ -17,7 +18,6 @@
     :selected-lang="props.selectedLang"
     :new-view="props.newView"
     :project="props.project"
-    :is-dark-theme="props.isDarkTheme"
     :security-loader="props.securityLoader"
     :recovery="props.recovery"
     @toggle-main-menu="emits('toggle-main-menu')"
@@ -31,35 +31,6 @@
     @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"
-    v-model:console-value="consoleValue"
-    v-model:vm-in-hosts-clusters="vmInHostsClusters"
-    :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')"
-    @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 />
@@ -77,6 +48,7 @@ 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<{
@@ -91,7 +63,6 @@ const props = withDefaults(
     selectedLanguageType: string
     selectedLang: UI_I_Dropdown
     newView: boolean
-    isDarkTheme: boolean
     isPauseReconnect: boolean
     expireTimeFromState: number
     isShowReconnectModal: boolean
@@ -120,6 +91,12 @@ const emits = defineEmits<{
   (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/ThemeSwitch.vue

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

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

@@ -1,12 +1,5 @@
 <template>
-  <common-layout-the-header-help-menu-help-menu-new
-    v-if="isNewView"
-    @select-dropdown="onSelectDropdown"
-  />
-  <common-layout-the-header-help-menu-help-menu-old
-    v-else
-    @select-dropdown="onSelectDropdown"
-  />
+  <component :is="currentComponent" @select-dropdown="onSelectDropdown" />
 
   <common-layout-the-header-help-menu-about
     v-if="isShowAbout"
@@ -25,6 +18,11 @@ const { $store }: any = useNuxtApp()
 const { version } = useAppVersion()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./new/New.vue'))
+    : defineAsyncComponent(() => import('./old/Old.vue'))
+)
 
 const isShowAbout = ref<boolean>(false)
 

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

@@ -1,79 +1,69 @@
-<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"
-      :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"
-      :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
-  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>(config.public.SUPPORT_SITE)
-
-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.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}')
-)
-const aboutDesc1 = computed<string>(() => aboutDesc.value[0])
-const aboutDesc2 = computed<string>(() => aboutDesc.value[1])
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
+<template>
+  <Teleport to="body">
+    <component
+      :is="currentComponent"
+      :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')"
+    />
+  </Teleport>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  version: string
+  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>(config.public.SUPPORT_SITE)
+
+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
+    .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}')
+)
+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>

package/components/common/layout/theHeader/helpMenu/{aboutNew/AboutNew.vue → about/New.vue}

@@ -1,96 +1,97 @@
-<template>
-  <ui-modal
-    :title="props.title"
-    :subtitle="props.subtitle"
-    :texts="{}"
-    test-id="about-modal"
-    width="720px"
-    show
-    @hide="onHideModal"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <div class="about-modal__text">
-          <p>{{ aboutHeadingText }}</p>
-
-          <p>{{ localization.layout.aboutSubtitle }}</p>
-        </div>
-
-        <div class="about-modal__description">
-          {{ props.aboutDescOne }}<a
-            id="about-description-link"
-            :href="url"
-            data-id="about-description-link"
-            target="_blank"
-            class="about-modal__description-link"
-          >
-            {{ props.url }}
-          </a>{{ props.aboutDescSecond }}
-        </div>
-      </ui-modal-block-standard>
-    </template>
-    <template #footer><div class="modal-footer-block"></div></template>
-  </ui-modal>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  title: string
-  subtitle: string
-  aboutHeadingText: string
-  aboutDescOne: string
-  aboutDescSecond: string
-  projectName: string
-  url: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style lang="scss" scoped>
-.modal-container-standard {
-  padding-top: 12px;
-  padding-bottom: 12px;
-
-  .about-modal {
-    &__text {
-      color: var(--about-text-color);
-      font-size: 13px;
-      font-weight: 400;
-      line-height: 15.73px;
-
-      p:last-child {
-        margin: 16px 0;
-      }
-    }
-    &__description {
-      color: var(--about-text-color);
-      font-size: 13px;
-      font-weight: 400;
-      line-height: 15.73px;
-
-      &-link {
-        color: var(--about-text-link-color);
-        &:hover {
-          color: var(--about-text-link-hover-color);
-        }
-      }
-    }
-  }
-}
-.modal-footer-block {
-  height: 32px;
-}
-:deep(.title-wrapper__subtitle) {
-  max-width: 400px;
-}
-</style>
+<template>
+  <ui-modal
+    :title="props.title"
+    :subtitle="props.subtitle"
+    :texts="{}"
+    test-id="about-modal"
+    width="720px"
+    show
+    @hide="onHideModal"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <div class="about-modal__text">
+          <p>{{ aboutHeadingText }}</p>
+
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-modal__description">
+          {{ props.aboutDescOne
+          }}<a
+            id="about-description-link"
+            :href="url"
+            data-id="about-description-link"
+            target="_blank"
+            class="about-modal__description-link"
+          >
+            {{ props.url }} </a
+          >{{ props.aboutDescSecond }}
+        </div>
+      </ui-modal-block-standard>
+    </template>
+    <template #footer><div class="modal-footer-block"></div></template>
+  </ui-modal>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  title: string
+  subtitle: string
+  aboutHeadingText: string
+  aboutDescOne: string
+  aboutDescSecond: string
+  url: string
+  projectName: string // для warning console
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+.modal-container-standard {
+  padding-top: 12px;
+  padding-bottom: 12px;
+
+  .about-modal {
+    &__text {
+      color: var(--about-text-color);
+      font-size: 13px;
+      font-weight: 400;
+      line-height: 15.73px;
+
+      p:last-child {
+        margin: 16px 0;
+      }
+    }
+    &__description {
+      color: var(--about-text-color);
+      font-size: 13px;
+      font-weight: 400;
+      line-height: 15.73px;
+
+      &-link {
+        color: var(--about-text-link-color);
+        &:hover {
+          color: var(--about-text-link-hover-color);
+        }
+      }
+    }
+  }
+}
+.modal-footer-block {
+  height: 32px;
+}
+:deep(.title-wrapper__subtitle) {
+  max-width: 400px;
+}
+</style>