bfg-common 1.5.225 → 1.5.227

package/components/common/backup/storage/actions/add/lib/utils.ts

@@ -1,6 +1,6 @@
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import { UI_E_Kind } from '~/lib/models/enums'
 
 export const checkValidityName = async (
@@ -28,36 +28,3 @@ export const checkValidityName = async (
   }
   sendMessage('')
 }
-
-export const validateNameAndGenerateDataId = (
-  name: string,
-  _errorMessage: string,
-  defaultDataId?: string
-): string => {
-  let baseDataId = defaultDataId || 'storage-name-alert-error'
-
-  const patterns = [
-    {
-      regex: /^[a-zA-Z0-9_\-\.]+$/,
-      error_message:
-        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
-      suffix: '-invalid-name-symbols',
-    },
-    {
-      regex: /^.{3,64}$/,
-      error_message:
-        /invalid name length, must be between: \d+ and \d+ characters/,
-      suffix: '-invalid-name-length',
-    },
-  ]
-
-  // Проверка error_message на соответствие шаблонам
-
-  for (const pattern of patterns) {
-    if (!pattern.regex.test(name)) {
-      return `${baseDataId}${pattern.suffix}`
-    }
-  }
-
-  return baseDataId
-}

package/components/common/backup/storage/actions/add/lib/validations.ts

@@ -1,12 +1,12 @@
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_AsyncCheckReturn,
   UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
 import { checkValidityName } from '~/components/common/backup/storage/actions/add/lib/utils'
 import { dynamicSteps } from '~/components/common/backup/storage/actions/add/lib/config/steps'
 
@@ -16,13 +16,7 @@ const checkName = async (
   wizard: Wizard,
   project: UI_T_Project
 ): Promise<UI_I_AsyncCheckReturn> => {
-  const typeCode = form.type_code
-
-  let help: boolean = true
-  if (typeCode === 2 || typeCode === 3) {
-    help = !!form.folder && !!form.server
-  }
-  if (form.name && help) {
+  if (form.name) {
     return new Promise((resolve, _reject) =>
       checkValidityName(form.name, wizard, project, (message: string) => {
         resolve({
@@ -34,7 +28,7 @@ const checkName = async (
   } else {
     return {
       isValid: false,
-      message: !form.name ? localization.common.specifyDatastoreName : '',
+      message: !form.name ? localization.common.fieldRequired : '',
     }
   }
 }
@@ -69,7 +63,7 @@ export const checkDatastoreNameAsync = async (
   }
 }
 
-export const checkNfsFolderSync = (
+export const checkFolderSync = (
   localization: UI_I_Localization,
   name: string,
   wizard: Wizard,
@@ -82,7 +76,7 @@ export const checkNfsFolderSync = (
       dynamicSteps.nameAndConfigure,
       'folder',
       {
-        fieldMessage: localization.common.specifyFolderName,
+        fieldMessage: localization.common.fieldRequired,
         alertMessage: '',
       }
     )
@@ -100,7 +94,7 @@ export const checkNfsFolderSync = (
   }
 }
 
-export const checkNfsServerSync = (
+export const checkServerSync = (
   localization: UI_I_Localization,
   name: string,
   wizard: Wizard,
@@ -113,7 +107,7 @@ export const checkNfsServerSync = (
       dynamicSteps.nameAndConfigure,
       'server',
       {
-        fieldMessage: localization.common.specifyServerName,
+        fieldMessage: localization.common.fieldRequired,
         alertMessage: '',
       }
     )
@@ -131,6 +125,68 @@ export const checkNfsServerSync = (
   }
 }
 
+export const checkUsernameSync = (
+  localization: UI_I_Localization,
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(
+      dynamicSteps.nameAndConfigure,
+      'user',
+      {
+        fieldMessage: localization.common.fieldRequired,
+        alertMessage: '',
+      }
+    )
+  } else if (wizard.hasMessage(dynamicSteps.nameAndConfigure, 'user')) {
+    value = wizard.removeValidation(
+      dynamicSteps.nameAndConfigure,
+      'user',
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+export const checkPasswordSync = (
+  localization: UI_I_Localization,
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(
+      dynamicSteps.nameAndConfigure,
+      'password',
+      {
+        fieldMessage: localization.common.fieldRequired,
+        alertMessage: '',
+      }
+    )
+  } else if (wizard.hasMessage(dynamicSteps.nameAndConfigure, 'password')) {
+    value = wizard.removeValidation(
+      dynamicSteps.nameAndConfigure,
+      'password',
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
 export const checkHostsAccessibilitySync = (
   localization: UI_I_Localization,
   hosts: string[],

package/components/common/backup/storage/actions/add/steps/common/tooltipInfo/TooltipInfo.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="tooltip-info">
+    <ui-icon
+      :id="`${props.id}-info-trigger`"
+      name="info"
+      width="16"
+      height="16"
+      :class="['tooltip-info__icon pointer', { active: isShowInfo }]"
+      @click.stop="isShowInfo = !isShowInfo"
+    />
+    <ui-popup-window
+      v-model="isShowInfo"
+      top
+      left
+      width="272px"
+      :elem-id="`${props.id}-info-trigger`"
+    >
+      <div class="common-widget-info">
+        <div class="flex justify-between">
+          <div class="flex">
+            <ui-icon name="info-2" width="16px" height="16px" />
+            <span class="title"> {{ localization.common.information }}</span>
+          </div>
+          <ui-icon
+            name="close"
+            class="pointer hide-icon"
+            width="16px"
+            height="16px"
+            @click.stop="isShowInfo = false"
+          />
+        </div>
+
+        <div class="common-widget-info-description">
+          {{ props.description }}
+        </div>
+      </div>
+    </ui-popup-window>
+  </div>
+</template>
+
+<script lang="ts" setup>
+// TODO move to global
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  id: string
+  description: string
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowInfo = ref<boolean>(false)
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+.tooltip-info {
+  @include flex($align: center);
+  &__icon {
+    color: var(--form-icon-color);
+    &:hover {
+      color: var(--close-icon);
+    }
+    &.active {
+      color: var(--btn-primary-fill-bg-color);
+    }
+  }
+
+  .common-widget-info {
+    padding: 16px;
+
+    .title {
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 16px;
+      color: var(--zabbix-text-color);
+      margin-left: 8px;
+    }
+
+    .common-widget-info-description {
+      font-size: 13px;
+      line-height: 15.73px;
+      color: var(--zabbix-text-color);
+      margin-top: 12px;
+      white-space: pre-line;
+    }
+
+    svg {
+      color: var(--alert-icon);
+      min-width: 16px;
+    }
+  }
+}
+</style>

package/components/common/backup/storage/actions/add/steps/name/New.vue

@@ -8,9 +8,9 @@
       </div>
       <div class="row__content">
         <ui-input
-          id="device-selection-input"
+          id="name-selection-input"
           v-model="formModelLocal.name"
-          test-id="device-selection-input"
+          test-id="name-selection-input"
           :error="nameErrorText"
           @blur="initValidation(true)"
           @input="initValidation(false)"
@@ -42,10 +42,10 @@ const initValidation = (onlyBlur: boolean): void => {
 }
 const nameErrorText = computed<string>(() => {
   if (
-    props.messagesFields?.datastoreName?.field &&
+    props.messagesFields?.name?.field &&
     !formModelLocal.value.name
   ) {
-    return props.messagesFields.datastoreName.field
+    return props.messagesFields.name.field
   }
 
   if (!isInitDatastoreNameValidation.value) return ''

package/components/common/backup/storage/actions/add/steps/name/Old.vue

@@ -1,24 +1,24 @@
 <template>
-  <div class="device-selection-step">
+  <div class="name-selection-step">
     <atoms-alert
       v-show="props.alertMessages?.length"
-      :test-id="errorAlertDataId"
+      test-id="storage-name-alert-error"
       status="alert-danger"
       :items="props.alertMessages"
       @remove="onHideAlert"
     />
 
     <div class="clr-form-control clr-row">
-      <label for="" class="clr-control-label clr-col-md-2">
+      <label for="name-selection-input" class="clr-control-label clr-col-md-2">
         {{ localization.common.name }}
       </label>
 
       <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
         <div class="flex-align-center">
           <input
-            id="device-selection-input"
+            id="name-selection-input"
             v-model="formModelLocal.name"
-            data-id="device-selection-input"
+            data-id="name-selection-input"
             type="text"
             class="clr-input"
             @blur="initValidation(true)"
@@ -42,7 +42,6 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-import { validateNameAndGenerateDataId } from '~/components/common/backup/storage/actions/add/lib/utils'
 import { dynamicSteps } from '~/components/common/backup/storage/actions/add/lib/config/steps'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
@@ -63,10 +62,10 @@ const initValidation = (onlyBlur: boolean): void => {
 
 const nameErrorText = computed<string>(() => {
   if (
-    props.messagesFields?.datastoreName?.field &&
+    props.messagesFields?.name?.field &&
     !formModelLocal.value.name
   ) {
-    return props.messagesFields.datastoreName.field
+    return props.messagesFields.name.field
   }
 
   if (!isInitDatastoreNameValidation.value) return ''
@@ -75,26 +74,13 @@ const nameErrorText = computed<string>(() => {
     : ''
 })
 
-const defaultDataId = ref<string>('device-selection-alert-error')
-const errorAlertDataId = computed<string>(() => {
-  if (!props.alertMessages?.length) return
-
-  return !formModelLocal.value.dev_names.length
-    ? `${defaultDataId.value}-not-selected-lundisk`
-    : validateNameAndGenerateDataId(
-        formModelLocal.value.name,
-        props.alertMessages[0],
-        defaultDataId.value
-      )
-})
-
 const onHideAlert = (): void => {
-  emits('hide-alert', dynamicSteps.nameAndDevice)
+  emits('hide-alert', dynamicSteps.name)
 }
 </script>
 
 <style lang="scss" scoped>
-.device-selection-step {
+.name-selection-step {
   display: flex;
   flex-direction: column;
   height: inherit;
@@ -132,10 +118,5 @@ const onHideAlert = (): void => {
       }
     }
   }
-  &__disk-list {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-  }
 }
 </style>

package/components/common/backup/storage/actions/add/steps/nameAndConfigure/NameAndConfigure.vue

@@ -1,41 +1,41 @@
-<template>
-  <common-backup-storage-actions-add-steps-name-and-configure-new
-    v-if="isNewView"
-    v-model="formModel"
-    v-model:alert-info="isShowAlertInfo"
-    :messages-fields="props.messagesFields"
-  />
-
-  <common-backup-storage-actions-add-steps-name-and-configure-old
-    v-else
-    v-model="formModel"
-    v-model:alert-info="isShowAlertInfo"
-    :alert-messages="props.alertMessages"
-    :messages-fields="props.messagesFields"
-    @hide-alert="(e) => emits('hide-alert', e)"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-
-const formModel = defineModel<UI_I_CreateDatastoreForm>({ required: true })
-const props = defineProps<{
-  project: UI_T_Project
-  alertMessages: string[]
-  messagesFields: UI_I_WizardStep['fields']
-}>()
-const emits = defineEmits<{
-  (event: 'hide-alert', value: number): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const isShowAlertInfo = ref<boolean>(props.project === 'procurator')
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-backup-storage-actions-add-steps-name-and-configure-new
+    v-if="isNewView"
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :messages-fields="props.messagesFields"
+  />
+
+  <common-backup-storage-actions-add-steps-name-and-configure-old
+    v-else
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :alert-messages="props.alertMessages"
+    :messages-fields="props.messagesFields"
+    @hide-alert="(e) => emits('hide-alert', e)"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
+
+const formModel = defineModel<UI_I_CreateDatastoreForm>({ required: true })
+const props = defineProps<{
+  project: UI_T_Project
+  alertMessages: string[]
+  messagesFields: UI_I_WizardStep['fields']
+}>()
+const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const isShowAlertInfo = ref<boolean>(true)
+</script>
+
+<style lang="scss" scoped></style>