bfg-common 1.5.708 → 1.5.709

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"
           :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"
@@ -77,7 +77,6 @@
           @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 +105,11 @@
 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 props = defineProps<{
   companyName: string
@@ -126,7 +124,6 @@ const props = defineProps<{
   remoteConsole: string
   vmCluster: boolean
   newView: boolean
-  newViewLocal: boolean
   timeFormat: string
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
@@ -141,7 +138,6 @@ const emits = defineEmits<{
   (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/helpMenu/About.vue

@@ -1,79 +1,79 @@
-<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">
+    <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>

package/components/common/layout/theHeader/helpMenu/aboutOld/AboutOld.vue

@@ -1,79 +1,79 @@
-<template>
-  <Teleport to="body">
-    <atoms-modal :title="props.title" show width="864px" test-id="about-modal">
-      <template #modalHeader>
-        <div class="flex-align-center">
-          <h3 class="modal-title">{{ brandName }}® {{ props.projectName }}</h3>
-          <span class="separator" />
-          <h4 class="secondary-title">
-            {{ props.subtitle }}
-          </h4>
-        </div>
-        <button id="about-modal-button-close" class="close">
-          <atoms-the-icon
-            data-id="about-modal-button-close-icon"
-            class="close-icon"
-            name="close"
-            @click="() => emits('hide')"
-          />
-        </button>
-      </template>
-
-      <template #modalBody>
-        <div class="about-vsphere-dialog-legal-section">
-          <p>{{ props.aboutHeadingText }}</p>
-          <p>{{ localization.layout.aboutSubtitle }}</p>
-        </div>
-
-        <div class="about-vsphere-dialog-legal-section description">
-          {{ props.aboutDescOne }}<a
-            id="about-description-link"
-            :href="url"
-            data-id="about-description-link"
-            target="_blank"
-            >{{ props.url }}</a
-          >{{ props.aboutDescSecond }}
-        </div>
-      </template>
-
-      <template #modalFooter>
-        <span></span>
-      </template>
-    </atoms-modal>
-  </Teleport>
-</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 config = useRuntimeConfig()
-
-const brandName = computed<string>(
-  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
-)
-</script>
-
-<style lang="scss" scoped>
-.modal-title {
-  color: var(--main-color-mode);
-}
-.description {
-  padding-top: 10px;
-  font-size: 13px;
-  line-height: 19px;
-}
-</style>
+<template>
+  <Teleport to="body">
+    <atoms-modal :title="props.title" show width="864px" test-id="about-modal">
+      <template #modalHeader>
+        <div class="flex-align-center">
+          <h3 class="modal-title">{{ brandName }}® {{ props.projectName }}</h3>
+          <span class="separator" />
+          <h4 class="secondary-title">
+            {{ props.subtitle }}
+          </h4>
+        </div>
+        <button id="about-modal-button-close" class="close">
+          <atoms-the-icon
+            data-id="about-modal-button-close-icon"
+            class="close-icon"
+            name="close"
+            @click="() => emits('hide')"
+          />
+        </button>
+      </template>
+
+      <template #modalBody>
+        <div class="about-vsphere-dialog-legal-section">
+          <p>{{ props.aboutHeadingText }}</p>
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-vsphere-dialog-legal-section description">
+          {{ props.aboutDescOne }}<a
+            id="about-description-link"
+            :href="url"
+            data-id="about-description-link"
+            target="_blank"
+            >{{ props.url }}</a
+          >{{ props.aboutDescSecond }}
+        </div>
+      </template>
+
+      <template #modalFooter>
+        <span></span>
+      </template>
+    </atoms-modal>
+  </Teleport>
+</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 config = useRuntimeConfig()
+
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+</script>
+
+<style lang="scss" scoped>
+.modal-title {
+  color: var(--main-color-mode);
+}
+.description {
+  padding-top: 10px;
+  font-size: 13px;
+  line-height: 19px;
+}
+</style>

package/components/common/layout/theHeader/modals/reconnect/ReconnectOld.vue

@@ -58,6 +58,8 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 <style lang="scss" scoped>
 .connection-timeout {
+  z-index: var(--z-popover);
+
   &__body {
     text-align: center;
     margin: 15px 0;

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

@@ -1,113 +1,109 @@
-<template>
-  <common-layout-the-header-user-menu-user-menu-new
-    v-if="props.newView"
-    :hostname="props.hostname"
-    @select-dropdown="onSelectDropdown"
-  />
-  <common-layout-the-header-user-menu-user-menu-old
-    v-else
-    :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"
-      :time-format="props.timeFormat"
-      :new-view="props.newView"
-      :new-view-local="props.newViewLocal"
-      :selected-language-type="props.selectedLanguageType"
-      :selected-language="props.selectedLanguage"
-      :project="props.project"
-      :remote-console="props.remoteConsole"
-      :vm-cluster="props.vmCluster"
-      :security-loader="props.securityLoader"
-      :recovery="props.recovery"
-      @hide="emits('hide-preference')"
-      @reset="emits('reset-preference')"
-      @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="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 props = defineProps<{
-  hostname: string
-  project: UI_T_Project
-  isPreference: boolean
-  newView: boolean
-  newViewLocal: boolean
-  timeFormat: UI_T_TimeValue
-  selectedLanguageType: UI_T_LangValue
-  selectedLanguage: UI_I_Dropdown | string
-  remoteConsole: string
-  vmCluster: boolean
-  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-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
-}>()
-
-const { $store }: any = useNuxtApp()
-
-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>
+  <common-layout-the-header-user-menu-user-menu-new
+    v-if="props.newView"
+    :hostname="props.hostname"
+    @select-dropdown="onSelectDropdown"
+  />
+  <common-layout-the-header-user-menu-user-menu-old
+    v-else
+    :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"
+      :time-format="props.timeFormat"
+      :new-view="props.newView"
+      :selected-language-type="props.selectedLanguageType"
+      :selected-language="props.selectedLanguage"
+      :project="props.project"
+      :remote-console="props.remoteConsole"
+      :vm-cluster="props.vmCluster"
+      :security-loader="props.securityLoader"
+      :recovery="props.recovery"
+      @hide="emits('hide-preference')"
+      @reset="emits('reset-preference')"
+      @update-time-format="emits('update-time-format', $event)"
+      @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="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 props = defineProps<{
+  hostname: string
+  project: UI_T_Project
+  isPreference: boolean
+  newView: boolean
+  timeFormat: UI_T_TimeValue
+  selectedLanguageType: UI_T_LangValue
+  selectedLanguage: UI_I_Dropdown | string
+  remoteConsole: string
+  vmCluster: boolean
+  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-time-format', value: UI_T_TimeValue): 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
+}>()
+
+const { $store }: any = useNuxtApp()
+
+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>