bfg-common 1.5.707 → 1.5.708

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,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/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,4 +1,4 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Localization } from '~//lib/models/interfaces'
 import { RegExp } from '~/lib/config/regExp'
 
 export const getPasswordMismatchError = (

package/components/common/layout/theHeader/userMenu/modals/preferences/PreferencesNew.vue

@@ -45,14 +45,6 @@
           />
         </ui-modal-block-form-standard>
 
-        <ui-modal-block-form-standard v-if="isSphere">
-          <common-layout-the-header-user-menu-modals-preferences-security
-            v-model:security="security"
-            :recovery="props.recovery"
-            @confirm="emits('security-confirm', $event)"
-          />
-        </ui-modal-block-form-standard>
-
         <ui-modal-block-form-standard without-border-bottom>
           <common-layout-the-header-user-menu-modals-preferences-view
             :new-view="props.newView"
@@ -71,9 +63,6 @@ import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/mod
 import type { UI_I_Localization } from '~/lib/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<{
   project: UI_T_Project
@@ -84,7 +73,6 @@ const props = defineProps<{
   newViewLocal: boolean
   remoteConsole: string
   vmCluster: boolean
-  recovery: UI_I_Recovery | null // для Сферы
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -94,7 +82,6 @@ const emits = defineEmits<{
   (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'): void
   (event: 'reset'): void
 }>()