bfg-common 1.5.647 → 1.5.648

package/components/common/layout/theHeader/userMenu/modals/changePassword/{ChangePasswordNew.vue → New.vue}

@@ -1,188 +1,193 @@
-<template>
-  <ui-modal
-    :title="localization.common.changePassword"
-    :texts="modalTexts"
-    :subtitle="props.subtitle"
-    width="560px"
-    test-id="change-password-modal"
-    show
-    @submit="onSubmit"
-    @hide="onHideModal"
-  >
-    <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">
-          {{ localization.common.changePasswordDesc }}
-        </p>
-
-        <div class="change-password__form">
-          <ui-input
-            v-model="modelLocal.current_password"
-            :label="localization.common.currentPassword"
-            :error="passwordErrorText"
-            :autocomplete="'new-password'"
-            type="password"
-            test-id="change-password-password-field"
-          />
-
-          <ui-input
-            v-model="modelLocal.new_password"
-            :label="localization.common.newPassword"
-            :error="newPasswordErrorText"
-            test-id="change-password-new-password-field"
-            type="password"
-          />
-
-          <ui-input
-            v-model="modelLocal.confirm_password"
-            :label="localization.common.confirmNewPassword"
-            :error="confirmPasswordErrorText"
-            test-id="change-password-confirm-password-field"
-            type="password"
-          />
-        </div>
-      </ui-modal-block-standard>
-    </template>
-
-    <template #footerLeftContent><span /></template>
-  </ui-modal>
-</template>
-
-<script setup lang="ts">
-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_I_ChangePasswordForm } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_InitialValidationFields } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
-import {
-  validateField,
-  getPasswordMismatchError,
-} from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils'
-
-const props = defineProps<{
-  project: UI_T_Project
-  subtitle: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'change-password'): void
-}>()
-const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const modalTexts = computed<UI_I_ModalTexts>(() => {
-  return {
-    button1: localization.value.common.cancel,
-    button2: localization.value.common.save,
-  }
-})
-
-const alertErrorText = ref<string>('')
-const initValidationFields = ref<UI_I_InitialValidationFields>({
-  currentPassword: false,
-  newPassword: false,
-  confirmPassword: false,
-})
-const initValidation = (types: string[]): boolean => {
-  types.forEach((type) => (initValidationFields.value[type] = true))
-
-  return (
-    !!passwordErrorText.value ||
-    !!newPasswordErrorText.value ||
-    !!confirmPasswordErrorText.value
-  )
-}
-
-const passwordErrorText = computed<string>(() => {
-  if (!initValidationFields.value.currentPassword) return ''
-
-  return !modelLocal.value.current_password
-    ? localization.value.common.fieldRequired
-    : ''
-})
-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 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
-      )
-})
-const onSubmit = (): void => {
-  const isFieldValid = initValidation([
-    'currentPassword',
-    'newPassword',
-    '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')
-}
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins.scss';
-.modal-container-standard {
-  padding-top: 8px;
-  padding-bottom: 8px;
-
-  .change-password {
-    &__description {
-      color: #9da6ad;
-      font-size: 12px;
-      font-weight: 400;
-      line-height: 14.52px;
-      margin-bottom: 20px;
-    }
-    &__alert {
-      padding: 10px 12px;
-      margin-bottom: 12px;
-      :deep(svg) {
-        width: 16px;
-        height: 16px;
-      }
-    }
-    &__form {
-      @include flex($dir: column);
-      row-gap: 16px;
-    }
-  }
-}
-</style>
+<template>
+  <ui-modal
+    :title="localization.common.changePassword"
+    :texts="modalTexts"
+    :subtitle="props.subtitle"
+    width="560px"
+    test-id="change-password-modal"
+    show
+    @submit="onSubmit"
+    @hide="onHideModal"
+  >
+    <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>
+
+        <div class="change-password__form">
+          <ui-input
+            v-model="modelLocal.current_password"
+            :label="localization.common.currentPassword"
+            :error="passwordErrorText"
+            :autocomplete="'new-password'"
+            type="password"
+            test-id="change-password-password-field"
+          />
+
+          <ui-input
+            v-model="modelLocal.new_password"
+            :label="localization.common.newPassword"
+            :error="newPasswordErrorText"
+            test-id="change-password-new-password-field"
+            type="password"
+          />
+
+          <ui-input
+            v-model="modelLocal.confirm_password"
+            :label="localization.common.confirmNewPassword"
+            :error="confirmPasswordErrorText"
+            test-id="change-password-confirm-password-field"
+            type="password"
+          />
+        </div>
+      </ui-modal-block-standard>
+    </template>
+
+    <template #footerLeftContent><span /></template>
+  </ui-modal>
+</template>
+
+<script setup lang="ts">
+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_I_ChangePasswordForm } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_InitialValidationFields } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import {
+  validateField,
+  getPasswordMismatchError,
+} from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils'
+
+const props = defineProps<{
+  project: UI_T_Project
+  subtitle: string
+  firstTime: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'change-password'): void
+}>()
+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 modalTexts = computed<UI_I_ModalTexts>(() => {
+  return {
+    button1: localization.value.common.cancel,
+    button2: localization.value.common.save,
+  }
+})
+
+const alertErrorText = ref<string>('')
+const initValidationFields = ref<UI_I_InitialValidationFields>({
+  currentPassword: false,
+  newPassword: false,
+  confirmPassword: false,
+})
+const initValidation = (types: string[]): boolean => {
+  types.forEach((type) => (initValidationFields.value[type] = true))
+
+  return (
+    !!passwordErrorText.value ||
+    !!newPasswordErrorText.value ||
+    !!confirmPasswordErrorText.value
+  )
+}
+
+const passwordErrorText = computed<string>(() => {
+  if (!initValidationFields.value.currentPassword) return ''
+
+  return !modelLocal.value.current_password
+    ? localization.value.common.fieldRequired
+    : ''
+})
+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 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
+      )
+})
+const onSubmit = (): void => {
+  const isFieldValid = initValidation([
+    'currentPassword',
+    'newPassword',
+    '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')
+}
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+.modal-container-standard {
+  padding-top: 8px;
+  padding-bottom: 8px;
+
+  .change-password {
+    &__description {
+      color: #9da6ad;
+      font-size: 12px;
+      font-weight: 400;
+      line-height: 14.52px;
+      margin-bottom: 20px;
+    }
+    &__alert {
+      padding: 10px 12px;
+      margin-bottom: 12px;
+      :deep(svg) {
+        width: 16px;
+        height: 16px;
+      }
+    }
+    &__form {
+      @include flex($dir: column);
+      row-gap: 16px;
+    }
+  }
+}
+</style>

package/components/common/layout/theHeader/userMenu/modals/changePassword/{ChangePasswordOld.vue → 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/models/interfaces.ts

@@ -21,3 +21,6 @@ export interface UI_I_ChangePasswordBodyRequest {
   current_password: string
   new_password: string
 }
+export interface UI_I_ChangePasswordFirstTimeBodyRequest {
+  password: string
+}

package/components/common/pages/backups/DetailView.vue

@@ -1,52 +1,52 @@
-<template>
-  <div class="detail-view overflow-auto py-0 px-6">
-    <table v-if="detailData" class="table table-noborder">
-      <tbody>
-        <tr>
-          <td class="left">{{ localization.common.name }}</td>
-          <td class="left backup-name-label">{{ detailData.name }}</td>
-        </tr>
-        <tr>
-          <td class="left">{{ localization.common.description }}</td>
-          <td class="left backup-name-label">{{ detailData.description }}</td>
-        </tr>
-        <tr>
-          <td class="left">{{ localization.common.timestamp }}</td>
-          <td class="left backup-name-label">{{ detailData.timestamp }}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
-
-const props = defineProps<{
-  detail: UI_I_BackupsTreeNode | null
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const detailData = ref<UI_I_BackupsTreeNode | null>(null)
-watch(
-  () => props.detail,
-  (newValue) => {
-    detailData.value = newValue
-  },
-  { immediate: true, deep: true }
-)
-</script>
-
-<style scoped lang="scss">
-.detail-view {
-  width: 50%;
-
-  .table {
-    .left:not(.backup-name-label) {
-      width: 320px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="detail-view overflow-auto py-0 px-6">
+    <table v-if="detailData" class="table table-noborder">
+      <tbody>
+        <tr>
+          <td class="left">{{ localization.common.name }}</td>
+          <td class="left backup-name-label">{{ detailData.name }}</td>
+        </tr>
+        <tr>
+          <td class="left">{{ localization.common.description }}</td>
+          <td class="left backup-name-label">{{ detailData.description }}</td>
+        </tr>
+        <tr>
+          <td class="left">{{ localization.common.timestamp }}</td>
+          <td class="left backup-name-label">{{ detailData.timestamp }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
+
+const props = defineProps<{
+  detail: UI_I_BackupsTreeNode | null
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const detailData = ref<UI_I_BackupsTreeNode | null>(null)
+watch(
+  () => props.detail,
+  (newValue) => {
+    detailData.value = newValue
+  },
+  { immediate: true, deep: true }
+)
+</script>
+
+<style scoped lang="scss">
+.detail-view {
+  width: 50%;
+
+  .table {
+    .left:not(.backup-name-label) {
+      width: 320px;
+    }
+  }
+}
+</style>

package/components/common/pages/backups/lib/models/interfaces.ts

@@ -1,36 +1,36 @@
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_T_BackupActionType } from '~/components/common/pages/backups/lib/models/types'
-
-export interface API_UI_I_Backup {
-  creation_time: number
-  creation_type: number
-  description: string
-  kind: number // TODO
-  msg: string
-  name: string
-  state: number // TODO
-  uuid: string
-  vm_name: string
-  vmid: string
-  storage_id: string
-  storage_name: string
-}
-
-export interface UI_I_Backup extends API_UI_I_Backup {}
-
-export interface UI_I_BackupsTreeNode
-  extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
-  parent_id: string
-  timestamp: string
-  description: string
-}
-
-export interface UI_I_BackupAction {
-  action: UI_T_BackupActionType | ''
-  id?: string
-  name?: string
-  backupId?: string
-  bucketId?: string
-  storageId?: string
-}
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_BackupActionType } from '~/components/common/pages/backups/lib/models/types'
+
+export interface API_UI_I_Backup {
+  creation_time: number
+  creation_type: number
+  description: string
+  kind: number // TODO
+  msg: string
+  name: string
+  state: number // TODO
+  uuid: string
+  vm_name: string
+  vmid: string
+  storage_id: string
+  storage_name: string
+}
+
+export interface UI_I_Backup extends API_UI_I_Backup {}
+
+export interface UI_I_BackupsTreeNode
+  extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
+  parent_id: string
+  timestamp: string
+  description: string
+}
+
+export interface UI_I_BackupAction {
+  action: UI_T_BackupActionType | ''
+  id?: string
+  name?: string
+  backupId?: string
+  bucketId?: string
+  storageId?: string
+}