bfg-common 1.5.773 → 1.5.775

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

@@ -1,5 +1,12 @@
 <template>
-  <component :is="currentComponent" @select-dropdown="onSelectDropdown" />
+  <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"
+  />
 
   <common-layout-the-header-help-menu-about
     v-if="isShowAbout"
@@ -18,11 +25,6 @@ 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/New.vue → aboutNew/AboutNew.vue}

@@ -17,16 +17,15 @@
         </div>
 
         <div class="about-modal__description">
-          {{ props.aboutDescOne
-          }}<a
+          {{ 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 }}
+            {{ props.url }}
+          </a>{{ props.aboutDescSecond }}
         </div>
       </ui-modal-block-standard>
     </template>
@@ -43,8 +42,8 @@ const props = defineProps<{
   aboutHeadingText: string
   aboutDescOne: string
   aboutDescSecond: string
+  projectName: string
   url: string
-  projectName: string // для warning console
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void

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

@@ -0,0 +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>

package/components/common/layout/theHeader/helpMenu/{new/New.vue → helpMenuNew/HelpMenuNew.vue}

@@ -83,7 +83,7 @@
 <script setup lang="ts">
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { helpMenuFunc } from '~/components/common/layout/theHeader/helpMenu/new/lib/config/dropMenu'
+import { helpMenuFunc } from '~/components/common/layout/theHeader/helpMenu/helpMenuNew/lib/config/dropMenu'
 
 const emits = defineEmits<{
   (event: 'select-dropdown', value: string): void

package/components/common/layout/theHeader/helpMenu/{new → helpMenuNew}/lib/config/dropMenu.ts

@@ -1,5 +1,5 @@
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 
 export const helpMenuFunc = (
   localization: UI_I_Localization

package/components/common/layout/theHeader/helpMenu/{old/Old.vue → helpMenuOld/HelpMenuOld.vue}

@@ -15,8 +15,8 @@
 <script setup lang="ts">
 import type { UI_I_DropMenu } from '~/components/atoms/dropdown/dropdown/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_ActionTypeHelpMenu } from '~/components/common/layout/theHeader/helpMenu/old/lib/models/types'
-import { helpMenuFunc } from '~/components/common/layout/theHeader/helpMenu/old/lib/config/dropMenu'
+import type { UI_T_ActionTypeHelpMenu } from '~/components/common/layout/theHeader/helpMenu/helpMenuOld/lib/models/types'
+import { helpMenuFunc } from '~/components/common/layout/theHeader/helpMenu/helpMenuOld/lib/config/dropMenu'
 
 const emits = defineEmits<{
   (event: 'select-dropdown', value: string): void

package/components/common/layout/theHeader/helpMenu/{old → helpMenuOld}/lib/config/dropMenu.ts

@@ -1,6 +1,6 @@
 import type { UI_I_DropMenu } from '~/components/atoms/dropdown/dropdown/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_ActionTypeHelpMenu } from '~/components/common/layout/theHeader/helpMenu/old/lib/models/types'
+import type { UI_T_ActionTypeHelpMenu } from '~/components/common/layout/theHeader/helpMenu/helpMenuOld/lib/models/types'
 
 export const helpMenuFunc = (
   localization: UI_I_Localization

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

@@ -1,7 +1,14 @@
 <template>
-  <component
-    v-if="isShow"
-    :is="currentComponent"
+  <common-layout-the-header-modals-reconnect-new
+    v-if="isNewView && isShow"
+    :title="title"
+    :timer="timer"
+    :total-time="totalTime"
+    @logout="onLogout"
+    @reconnect="onReconnect"
+  />
+  <common-layout-the-header-modals-reconnect-old
+    v-else-if="!isNewView && isShow"
     :title="title"
     :timer="timer"
     :total-time="totalTime"
@@ -18,19 +25,12 @@ const { $store }: any = useNuxtApp()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
 
 const isShow = computed<boolean>(
   () => $store.getters['main/isShowReconnectModal']
 )
 
-const title = computed<string>(
-  () => localization.value.common.connectionTimeout
-)
+const title = ref<string>(localization.value.common.connectionTimeout)
 
 const timer = ref<NodeJS.Timer | null>(null)
 const totalTime = ref<number>(60)

package/components/common/layout/theHeader/modals/reconnect/{New.vue → ReconnectNew.vue}

@@ -57,7 +57,7 @@ const modalTexts = ref<UI_I_ModalTexts>({
 
 <style lang="scss" scoped>
 .reconnect-content {
-  padding: 8px 32px 8px 32px;
+  padding: 16px 32px 8px 32px;
 
   .icon-content {
     .icon-sessions {

package/components/common/layout/theHeader/modals/reconnect/{Old.vue → ReconnectOld.vue}

@@ -58,8 +58,6 @@ 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,6 +1,11 @@
 <template>
-  <component
-    :is="currentComponent"
+  <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"
   />
@@ -16,21 +21,24 @@
     <common-layout-the-header-user-menu-modals-preferences
       v-if="props.isPreference"
       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"
+      :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')"
     />
@@ -41,23 +49,23 @@
 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'
+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<{
   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 // для Сферы
 }>()
@@ -65,20 +73,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
 }>()
 
 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> => {
@@ -94,7 +101,7 @@ const onSelectDropdown = (value: string): void => {
       emits('show-preference')
       break
     case 'themeMode':
-      isDarkTheme.value = !isDarkTheme.value
+      emits('change-theme-mode')
       break
     case 'logout':
       onLogout()

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePassword.vue

@@ -4,6 +4,7 @@
     v-model="form"
     :subtitle="props.hostname"
     :project="props.project"
+    :first-time="props.firstTime"
     @change-password="onChangePassword"
     @hide="onHideModal"
   />
@@ -13,16 +14,20 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type {
-  UI_I_ChangePasswordBodyRequest,
-  UI_I_ChangePasswordFirstTimeBodyRequest,
+  UI_I_ChangePasswordBodyRequest, UI_I_ChangePasswordFirstTimeBodyRequest,
   UI_I_ChangePasswordForm,
 } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
+// import {} from '#build/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
 
-const props = defineProps<{
-  hostname: string
-  project: UI_T_Project
-}>()
+const props = withDefaults(
+  defineProps<{
+    hostname: string
+    project: UI_T_Project
+    firstTime?: boolean
+  }>(),
+  { firstTime: false }
+)
 const isShowModalLocal = defineModel<boolean>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -46,21 +51,25 @@ const onChangePassword = async (): Promise<void> => {
 
   onHideModal()
 
-  let sendData:
-    | UI_I_ChangePasswordBodyRequest
-    | UI_I_ChangePasswordFirstTimeBodyRequest = {
+  let sendData: UI_I_ChangePasswordBodyRequest | UI_I_ChangePasswordFirstTimeBodyRequest = {
     current_password,
     new_password,
   }
 
   let url = ''
   if (props.project === 'sphere') {
+    const { id } = useLocalStorage('userData')
+
+    url = `ui/users/${id}/passwd`
+  } else if (props.project === 'procurator') {
+    url = '/ui/passwd'
+  }
+
+  if (props.firstTime) {
     sendData = {
-      password: new_password,
+      password: new_password
     }
     url = 'ui/users/current/change_password'
-  } else if (props.project === 'procurator') {
-    url = '/ui/passwd'
   }
 
   const { error } = await useMyFetch<never, API_UI_I_Error>(url, {

package/components/common/layout/theHeader/userMenu/modals/changePassword/New.vue

@@ -11,6 +11,15 @@
   >
     <template #content>
       <ui-modal-block-standard>
+        <ui-alert
+          v-if="alertErrorText"
+          :messages="[alertErrorText]"
+          test-id="change-password-error-alert"
+          type="error"
+          class="change-password__alert"
+          hide-close-button
+        />
+
         <p class="change-password__description">
           {{ description }}
         </p>
@@ -62,6 +71,7 @@ import {
 const props = defineProps<{
   project: UI_T_Project
   subtitle: string
+  firstTime: boolean
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -71,7 +81,9 @@ const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const description = ref<string>(localization.value.common.changePasswordDesc)
+const description = ref<string>(props.firstTime
+    ? localization.value.common.firstTimeChangePasswordDesc
+    : localization.value.common.changePasswordDesc)
 
 const modalTexts = computed<UI_I_ModalTexts>(() => {
   return {
@@ -80,6 +92,7 @@ const modalTexts = computed<UI_I_ModalTexts>(() => {
   }
 })
 
+const alertErrorText = ref<string>('')
 const initValidationFields = ref<UI_I_InitialValidationFields>({
   currentPassword: false,
   newPassword: false,
@@ -98,48 +111,32 @@ const initValidation = (types: string[]): boolean => {
 const passwordErrorText = computed<string>(() => {
   if (!initValidationFields.value.currentPassword) return ''
 
-  if (!modelLocal.value.current_password) {
-    return localization.value.common.fieldRequired
-  } else {
-    return ''
-  }
+  return !modelLocal.value.current_password
+    ? localization.value.common.fieldRequired
+    : ''
 })
 const newPasswordErrorText = computed<string>(() => {
   if (!initValidationFields.value.newPassword) return ''
 
-  const { current_password, new_password, confirm_password } = modelLocal.value
-
-  const validateText = validateField(
-    localization.value,
-    current_password,
-    new_password
-  )
-  const mismatchError = getPasswordMismatchError(
-    localization.value,
-    new_password,
-    confirm_password
-  )
-  if (!new_password) {
-    return localization.value.common.fieldRequired
-  } else if (validateText) {
-    return validateText
-  } else if (mismatchError) {
-    return mismatchError
-  } else return ''
+  const { new_password, confirm_password } = modelLocal.value
+  return !new_password
+    ? localization.value.common.fieldRequired
+    : getPasswordMismatchError(
+        localization.value,
+        new_password,
+        confirm_password
+      )
 })
 const confirmPasswordErrorText = computed<string>(() => {
   if (!initValidationFields.value.confirmPassword) return ''
   const { new_password, confirm_password } = modelLocal.value
-
-  if (!confirm_password) {
-    return localization.value.common.fieldRequired
-  } else {
-    return getPasswordMismatchError(
-      localization.value,
-      new_password,
-      confirm_password
-    )
-  }
+  return !confirm_password
+    ? localization.value.common.fieldRequired
+    : getPasswordMismatchError(
+        localization.value,
+        new_password,
+        confirm_password
+      )
 })
 const onSubmit = (): void => {
   const isFieldValid = initValidation([
@@ -148,7 +145,17 @@ const onSubmit = (): void => {
     'confirmPassword',
   ])
 
-  !isFieldValid && emits('change-password')
+  const { current_password, new_password } = modelLocal.value
+
+  if (!isFieldValid) {
+    alertErrorText.value = validateField(
+      localization.value,
+      current_password,
+      new_password
+    )
+  }
+
+  !isFieldValid && !alertErrorText.value && emits('change-password')
 }
 const onHideModal = (): void => {
   emits('hide')

package/components/common/layout/theHeader/userMenu/modals/changePassword/Old.vue

@@ -10,6 +10,7 @@
     @submit="onChangePassword"
   >
     <template #modalBody>
+      <p v-if="props.firstTime">{{ localization.common.firstTimeChangePasswordDesc }}</p>
       <form id="change-password-form" class="compact" @submit.prevent>
         <section class="form-block">
           <div class="form-group">
@@ -97,6 +98,7 @@ import { defaultFormFunc } from '~/components/common/layout/theHeader/userMenu/m
 const props = defineProps<{
   hostname: string
   project: UI_T_Project
+  firstTime: boolean
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void

package/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils.ts

@@ -1,5 +1,5 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { allRegExp } from '~/lib/config/regExp'
+import type { UI_I_Localization } from '~//lib/models/interfaces'
+import { RegExp } from '~/lib/config/regExp'
 
 export const getPasswordMismatchError = (
   localization: UI_I_Localization,
@@ -16,7 +16,7 @@ export const validateField = (
   password: string,
   newPassword: string
 ): string => {
-  if (!allRegExp.password.test(newPassword)) {
+  if (!RegExp.password.test(newPassword)) {
     return localization.common.currentPasswordIncorrect
   }