bfg-common 1.5.708 → 1.5.710

package/components/common/certificate/modals/renew/Old.vue

@@ -0,0 +1,122 @@
+<template>
+  <atoms-modal
+    :title="title"
+    :second-title="props.hostName"
+    :test-id="props.testId"
+    class="certificate-modal"
+    show
+    @hide="onHide"
+  >
+    <template #modalBody>
+      <form
+        id="certificate-renew-form"
+        data-id="certificate-renew-form"
+        class="pt-0"
+        @submit.prevent="onHide"
+      >
+        <section class="form-block flex-align-center m-0 flex">
+          <div class="icon-wrap">
+            <atoms-the-icon class="icon-warning" name="warning" />
+          </div>
+          <p>{{ description }}</p>
+        </section>
+      </form>
+    </template>
+    <template #modalFooter>
+      <button
+        id="certificate-renew-modal-close-button"
+        data-id="certificate-renew-modal-close-button"
+        class="btn btn-primary"
+        @click="onHide"
+      >
+        {{ localization.common.no }}
+      </button>
+      <button
+        id="certificate-renew-modal-apply-button"
+        :class="['btn btn-outline', props.loading && 'pending']"
+        data-id="certificate-renew-modal-apply-button"
+        @click="emits('submit')"
+      >
+        <atoms-loader-pre-loader
+          v-if="props.loading"
+          id="loader"
+          :show="props.loading"
+          class="absolute-center btn__loading flex"
+          test-id="certificate-renew-spinner"
+        />
+        <span v-else>
+          {{ localization.common.yes }}
+        </span>
+      </button>
+    </template>
+  </atoms-modal>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_ModeModal } from '~/components/common/certificate/lib/models/types'
+
+const props = defineProps<{
+  mode: UI_T_ModeModal
+  hostName: string
+  testId: string
+  loading: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'submit'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const title = computed<string>(
+  () =>
+    localization.value.common[
+      props.mode === 'renew'
+        ? 'certificateRenewTitle'
+        : 'certificateRefreshTitle'
+    ]
+)
+
+const description = computed<string>(
+  () =>
+    localization.value.common[
+      props.mode === 'renew'
+        ? 'certificateRenewDescription'
+        : 'certificateRefreshDescription'
+    ]
+)
+
+const onHide = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+.certificate-modal {
+  form {
+    .form-block {
+      .icon-warning {
+        width: 48px;
+        margin-right: 20px;
+      }
+    }
+  }
+}
+
+.btn {
+  &.pending {
+    position: relative;
+    pointer-events: none;
+  }
+  &__loading {
+    :deep(.spinner) {
+      width: 25px;
+      height: 25px;
+      min-width: 25px;
+      min-height: 25px;
+    }
+  }
+}
+</style>

package/components/common/certificate/modals/renew/Renew.vue

@@ -0,0 +1,67 @@
+<template>
+  <component
+    :is="currentComponent"
+    :mode="props.mode"
+    :host-name="hostName"
+    :test-id="testId"
+    :loading="loading"
+    @hide="onHide"
+    @submit="onSubmit"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_T_ModeModal } from '~/components/common/certificate/lib/models/types'
+
+const props = defineProps<{
+  mode: UI_T_ModeModal
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'renew-certificate'): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const hostName = location.hostname
+
+const loading = ref<boolean>(false)
+
+const testId = computed<string>(() =>
+  props.mode === 'renew'
+    ? 'certificate-renew-modal'
+    : 'certificate-refresh-modal'
+)
+
+const renewCertificate = (): void => {
+  emits('renew-certificate')
+}
+
+const refreshCertificate = (): void => {
+  console.log('It will be soon')
+}
+
+const onSubmit = (): void => {
+  loading.value = true
+
+  props.mode === 'renew' ? renewCertificate() : refreshCertificate()
+
+  loading.value = false
+
+  onHide()
+}
+
+const onHide = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped></style>

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

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

@@ -8,7 +8,8 @@
     >
       <atoms-the-icon name="arrow" />
     </button>
-    <div v-else class="height-100">
+
+    <div v-else class="h-full flex-direction-column">
       <div class="navbar__header">
         <p class="title">{{ props.title }}</p>
         <button
@@ -19,15 +20,17 @@
           <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: route.hash === item.to }]"
-          >{{ item.text }}</a
+          :class="['link-item', { active: activeHash === item.to }]"
         >
+          {{ item.text }}
+        </a>
       </div>
     </div>
   </div>
@@ -41,39 +44,96 @@ const props = defineProps<{
   items: UI_I_ContentNavbarItem[]
 }>()
 
-const route = useRoute()
-
 const isShow = ref<boolean>(true)
+const activeHash = ref<string>('')
 
-const checkActiveLink = (): void => {
-  const links = document.querySelectorAll('.content-links .link-item')
+let observer: IntersectionObserver | null = null
+let rootElement: Element | null = null
 
-  if (!links.length) return
+const setActiveHashFromLocation = () => {
+  // decodeURIComponent чтобы корректно читать хэши с кириллицей/спецсимволами
+  activeHash.value =
+    typeof window !== 'undefined'
+      ? decodeURIComponent(window.location.hash || '')
+      : ''
+}
+
+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'
 
-  links.forEach((item) => {
-    const linkElement = item as HTMLLinkElement
+  const headingNodes = Array.from(
+    document.querySelectorAll<HTMLElement>(headingsSelector)
+  ).filter((h) => !!h.id)
 
-    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')
-  })
+  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))
+  }
 }
 
-const parentCurrentScrollPosition = (): void => {
-  const parentElement = document.querySelector('.help__content')
-  if (!parentElement || route.hash) return
+const init = (): void => {
+  rootElement = document.querySelector('.help__content')
+
+  setActiveHashFromLocation()
 
-  parentElement.scrollTop = 0
+  if (props.items?.length) {
+    const first = props.items[0]?.to ?? ''
+    if (first) {
+      history.replaceState(null, '', first)
+      setActiveHashFromLocation()
+    }
+  }
+
+  observeLinks()
 }
 
+onMounted(() => {
+  init()
+})
+let isRouteUpdated = false
 onUpdated(() => {
-  parentCurrentScrollPosition()
-  checkActiveLink()
+  if (isRouteUpdated) {
+    init()
+    isRouteUpdated = false
+  }
 })
 
-onMounted(() => {
-  checkActiveLink()
+// cleanup при unmount
+onUnmounted(() => {
+  observer?.disconnect()
+})
+onBeforeRouteUpdate((to, from, next) => {
+  // обработка оснавной навигации, делаем cleanup
+  if (from.path !== to.path) {
+    observer?.disconnect()
+    isRouteUpdated = true
+  }
+  next()
 })
 </script>
 
@@ -101,6 +161,7 @@ onMounted(() => {
     cursor: pointer;
     margin: 12px 6px;
   }
+
   &__header {
     display: flex;
     justify-content: space-between;
@@ -128,10 +189,12 @@ onMounted(() => {
       }
     }
   }
+
   &__content {
     height: 100%;
     overflow: auto;
   }
+
   .link-item {
     display: block;
     color: var(--global-font-color);

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/modals/changePassword/ChangePassword.vue

@@ -4,7 +4,6 @@
     v-model="form"
     :subtitle="props.hostname"
     :project="props.project"
-    :first-time="props.firstTime"
     @change-password="onChangePassword"
     @hide="onHideModal"
   />
@@ -14,20 +13,16 @@
 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 = withDefaults(
-  defineProps<{
-    hostname: string
-    project: UI_T_Project
-    firstTime?: boolean
-  }>(),
-  { firstTime: false }
-)
+const props = defineProps<{
+  hostname: string
+  project: UI_T_Project
+}>()
 const isShowModalLocal = defineModel<boolean>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -51,25 +46,21 @@ 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,15 +11,6 @@
   >
     <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>
@@ -71,7 +62,6 @@ import {
 const props = defineProps<{
   project: UI_T_Project
   subtitle: string
-  firstTime: boolean
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -81,9 +71,7 @@ const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const description = ref<string>(props.firstTime
-    ? localization.value.common.firstTimeChangePasswordDesc
-    : localization.value.common.changePasswordDesc)
+const description = ref<string>(localization.value.common.changePasswordDesc)
 
 const modalTexts = computed<UI_I_ModalTexts>(() => {
   return {
@@ -92,7 +80,6 @@ const modalTexts = computed<UI_I_ModalTexts>(() => {
   }
 })
 
-const alertErrorText = ref<string>('')
 const initValidationFields = ref<UI_I_InitialValidationFields>({
   currentPassword: false,
   newPassword: false,
@@ -111,32 +98,48 @@ const initValidation = (types: string[]): boolean => {
 const passwordErrorText = computed<string>(() => {
   if (!initValidationFields.value.currentPassword) return ''
 
-  return !modelLocal.value.current_password
-    ? localization.value.common.fieldRequired
-    : ''
+  if (!modelLocal.value.current_password) {
+    return localization.value.common.fieldRequired
+  } else {
+    return ''
+  }
 })
 const newPasswordErrorText = computed<string>(() => {
   if (!initValidationFields.value.newPassword) return ''
 
-  const { new_password, confirm_password } = modelLocal.value
-  return !new_password
-    ? localization.value.common.fieldRequired
-    : getPasswordMismatchError(
-        localization.value,
-        new_password,
-        confirm_password
-      )
+  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 confirmPasswordErrorText = computed<string>(() => {
   if (!initValidationFields.value.confirmPassword) return ''
   const { new_password, confirm_password } = modelLocal.value
-  return !confirm_password
-    ? localization.value.common.fieldRequired
-    : getPasswordMismatchError(
-        localization.value,
-        new_password,
-        confirm_password
-      )
+
+  if (!confirm_password) {
+    return localization.value.common.fieldRequired
+  } else {
+    return getPasswordMismatchError(
+      localization.value,
+      new_password,
+      confirm_password
+    )
+  }
 })
 const onSubmit = (): void => {
   const isFieldValid = initValidation([
@@ -145,17 +148,7 @@ const onSubmit = (): void => {
     'confirmPassword',
   ])
 
-  const { current_password, new_password } = modelLocal.value
-
-  if (!isFieldValid) {
-    alertErrorText.value = validateField(
-      localization.value,
-      current_password,
-      new_password
-    )
-  }
-
-  !isFieldValid && !alertErrorText.value && emits('change-password')
+  !isFieldValid && emits('change-password')
 }
 const onHideModal = (): void => {
   emits('hide')

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

@@ -10,7 +10,6 @@
     @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">
@@ -98,7 +97,6 @@ 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,6 +45,14 @@
           />
         </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"
@@ -63,6 +71,9 @@ 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
@@ -73,6 +84,7 @@ const props = defineProps<{
   newViewLocal: boolean
   remoteConsole: string
   vmCluster: boolean
+  recovery: UI_I_Recovery | null // для Сферы
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -82,6 +94,7 @@ 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
 }>()

package/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/ChangeLanguage.vue

@@ -1,16 +1,6 @@
 <template>
-  <common-layout-the-header-user-menu-modals-preferences-change-language-new
-    v-if="props.newView"
-    :selected-language="selectedLanguageLocal"
-    :description="description"
-    :radio-options="radioOptions"
-    :language-mode="languageMode"
-    :locales="locales"
-    @update-language="onSelectLang"
-    @update-is-browser="onUpdateIsBrowser"
-  />
-  <common-layout-the-header-user-menu-modals-preferences-change-language-old
-    v-else
+  <component
+    :is="currentComponent"
     :selected-language="selectedLanguageLocal"
     :description="description"
     :radio-options="radioOptions"
@@ -47,6 +37,12 @@ const emits = defineEmits<{
 const config = useRuntimeConfig()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const currentComponent = computed(() =>
+  props.newView
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
 const description = computed<string>(() => {
   return localization.value.common.languageDesc.replaceAll(
     '{trademark}',
@@ -109,7 +105,4 @@ watch(
   },
   { immediate: true }
 )
-
-// TODO remove
-// const localsLocal = ref<any>(locales.filter((_, i) => i > 0))
 </script>