bfg-common 1.5.708 → 1.5.709

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/Preferences.vue

@@ -1,86 +1,81 @@
-<template>
-  <common-layout-the-header-user-menu-modals-preferences-new
-    v-if="props.newView"
-    v-model:security="security"
-    :project="props.project"
-    :time-format="props.timeFormat"
-    :new-view="props.newView"
-    :new-view-local="props.newViewLocal"
-    :selected-language-type="props.selectedLanguageType"
-    :selected-language="props.selectedLanguage"
-    :remote-console="props.remoteConsole"
-    :vm-cluster="props.vmCluster"
-    :security-loader="props.securityLoader"
-    :recovery="props.recovery"
-    @hide="emits('hide')"
-    @reset="emits('reset')"
-    @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')"
-  />
-  <common-layout-the-header-user-menu-modals-preferences-old
-    v-else
-    v-model:security="security"
-    :project="props.project"
-    :time-format="props.timeFormat"
-    :new-view="props.newView"
-    :new-view-local="props.newViewLocal"
-    :selected-language-type="props.selectedLanguageType"
-    :selected-language="props.selectedLanguage"
-    :remote-console="props.remoteConsole"
-    :vm-cluster="props.vmCluster"
-    :security-loader="props.securityLoader"
-    :recovery="props.recovery"
-    @hide="emits('hide')"
-    @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')"
-  />
-</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<{
-  project: UI_T_Project
-  timeFormat: UI_T_TimeValue
-  newView: boolean
-  newViewLocal: boolean
-  selectedLanguageType: UI_T_LangValue
-  selectedLanguage: UI_I_Dropdown | string
-  remoteConsole: string
-  vmCluster: boolean
-  securityLoader: boolean // для Сферы
-  recovery: UI_I_Recovery | null // для Сферы
-}>()
-
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'reset'): 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'): void
-}>()
-</script>
+<template>
+  <common-layout-the-header-user-menu-modals-preferences-new
+    v-if="props.newView"
+    v-model:security="security"
+    v-model:new-view-local="newViewLocal"
+    :project="props.project"
+    :time-format="props.timeFormat"
+    :new-view="props.newView"
+    :selected-language-type="props.selectedLanguageType"
+    :selected-language="props.selectedLanguage"
+    :remote-console="props.remoteConsole"
+    :vm-cluster="props.vmCluster"
+    :security-loader="props.securityLoader"
+    :recovery="props.recovery"
+    @hide="emits('hide')"
+    @reset="emits('reset')"
+    @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')"
+  />
+  <common-layout-the-header-user-menu-modals-preferences-old
+    v-else
+    v-model:security="security"
+    v-model:new-view-local="newViewLocal"
+    :project="props.project"
+    :time-format="props.timeFormat"
+    :new-view="props.newView"
+    :selected-language-type="props.selectedLanguageType"
+    :selected-language="props.selectedLanguage"
+    :remote-console="props.remoteConsole"
+    :vm-cluster="props.vmCluster"
+    :security-loader="props.securityLoader"
+    :recovery="props.recovery"
+    @hide="emits('hide')"
+    @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')"
+  />
+</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<{
+  project: UI_T_Project
+  timeFormat: UI_T_TimeValue
+  newView: boolean
+  selectedLanguageType: UI_T_LangValue
+  selectedLanguage: UI_I_Dropdown | string
+  remoteConsole: string
+  vmCluster: boolean
+  securityLoader: boolean // для Сферы
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'reset'): 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'): void
+}>()
+</script>

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

@@ -1,102 +1,113 @@
-<template>
-  <ui-modal
-    :title="localization.common.preferences"
-    :texts="modalTexts"
-    test-id="user-preferences-modal"
-    width="580px"
-    show
-    @reset="emits('reset')"
-    @submit="emits('submit')"
-    @hide="onHide"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <ui-modal-block-form-standard>
-          <common-layout-the-header-user-menu-modals-preferences-time-format
-            :new-view="props.newView"
-            :time-format="props.timeFormat"
-            @update-time-format="emits('update-time-format', $event)"
-          />
-        </ui-modal-block-form-standard>
-
-        <ui-modal-block-form-standard>
-          <common-layout-the-header-user-menu-modals-preferences-change-language
-            :new-view="props.newView"
-            :selected-type="props.selectedLanguageType"
-            :selected-language="props.selectedLanguage"
-            @update-language="emits('update-language', $event)"
-            @update-is-browser="emits('update-is-browser', $event)"
-          />
-        </ui-modal-block-form-standard>
-
-        <ui-modal-block-form-standard v-if="isSphere">
-          <common-layout-the-header-user-menu-modals-preferences-default-console
-            :new-view="props.newView"
-            :remote-console="props.remoteConsole"
-            @update-remote-console="emits('update-remote-console', $event)"
-          />
-        </ui-modal-block-form-standard>
-
-        <ui-modal-block-form-standard v-if="isSphere">
-          <common-layout-the-header-user-menu-modals-preferences-inventory
-            :new-view="props.newView"
-            :vm-cluster="props.vmCluster"
-            @update-vm-clusters="emits('update-vm-clusters', $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"
-            :new-view-local="props.newViewLocal"
-            @update-is-new-view="emits('update-is-new-view', $event)"
-          />
-        </ui-modal-block-form-standard>
-      </ui-modal-block-standard>
-    </template>
-  </ui-modal>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
-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'
-
-const props = defineProps<{
-  project: UI_T_Project
-  timeFormat: UI_T_TimeValue
-  selectedLanguage: UI_I_Dropdown
-  selectedLanguageType: UI_T_LangValue
-  newView: boolean
-  newViewLocal: boolean
-  remoteConsole: string
-  vmCluster: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): 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: 'submit'): void
-  (event: 'reset'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const modalTexts = ref<UI_I_ModalTexts>({
-  resetToDefault: localization.value.common.resetToDefault,
-  button1: localization.value.common.cancel,
-  button2: localization.value.common.save,
-})
-
-const isSphere = ref<boolean>(props.project === 'sphere')
-
-const onHide = (): void => {
-  emits('hide')
-}
-</script>
+<template>
+  <ui-modal
+    :title="localization.common.preferences"
+    :texts="modalTexts"
+    test-id="user-preferences-modal"
+    width="580px"
+    show
+    @reset="emits('reset')"
+    @submit="emits('submit')"
+    @hide="onHide"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <ui-modal-block-form-standard>
+          <common-layout-the-header-user-menu-modals-preferences-time-format
+            :new-view="props.newView"
+            :time-format="props.timeFormat"
+            @update-time-format="emits('update-time-format', $event)"
+          />
+        </ui-modal-block-form-standard>
+
+        <ui-modal-block-form-standard>
+          <common-layout-the-header-user-menu-modals-preferences-change-language
+            :new-view="props.newView"
+            :selected-type="props.selectedLanguageType"
+            :selected-language="props.selectedLanguage"
+            @update-language="emits('update-language', $event)"
+            @update-is-browser="emits('update-is-browser', $event)"
+          />
+        </ui-modal-block-form-standard>
+
+        <ui-modal-block-form-standard v-if="isSphere">
+          <common-layout-the-header-user-menu-modals-preferences-default-console
+            :new-view="props.newView"
+            :remote-console="props.remoteConsole"
+            @update-remote-console="emits('update-remote-console', $event)"
+          />
+        </ui-modal-block-form-standard>
+
+        <ui-modal-block-form-standard v-if="isSphere">
+          <common-layout-the-header-user-menu-modals-preferences-inventory
+            :new-view="props.newView"
+            :vm-cluster="props.vmCluster"
+            @update-vm-clusters="emits('update-vm-clusters', $event)"
+          />
+        </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
+            v-model:new-view-local="newViewLocal"
+            :new-view="props.newView"
+          />
+        </ui-modal-block-form-standard>
+      </ui-modal-block-standard>
+    </template>
+  </ui-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
+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 newViewLocal = defineModel<boolean>('newViewLocal')
+
+const props = defineProps<{
+  project: UI_T_Project
+  timeFormat: UI_T_TimeValue
+  selectedLanguage: UI_I_Dropdown
+  selectedLanguageType: UI_T_LangValue
+  newView: boolean
+  remoteConsole: string
+  vmCluster: boolean
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): 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'): void
+  (event: 'reset'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const modalTexts = ref<UI_I_ModalTexts>({
+  resetToDefault: localization.value.common.resetToDefault,
+  button1: localization.value.common.cancel,
+  button2: localization.value.common.save,
+})
+
+const isSphere = ref<boolean>(props.project === 'sphere')
+
+const onHide = (): void => {
+  emits('hide')
+}
+</script>

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

@@ -54,9 +54,8 @@
 
       <common-layout-the-header-user-menu-modals-preferences-view
         v-if="selectedTab === 'view-tab'"
+        v-model:new-view-local="newViewLocal"
         :new-view="props.newView"
-        :new-view-local="props.newViewLocal"
-        @update-is-new-view="emits('update-is-new-view', $event)"
       />
     </template>
 
@@ -91,6 +90,7 @@ import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMen
 import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/config/preferencesTabs'
 
 const security = defineModel<boolean>('security')
+const newViewLocal = defineModel<boolean>('newViewLocal')
 
 const props = defineProps<{
   project: UI_T_Project
@@ -98,7 +98,6 @@ const props = defineProps<{
   selectedLanguage: UI_T_LangValue
   selectedLanguageType: UI_T_LangValue
   newView: boolean
-  newViewLocal: boolean
   remoteConsole: string
   vmCluster: boolean
   securityLoader: boolean // для Сферы
@@ -109,7 +108,6 @@ const emits = defineEmits<{
   (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: string): 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