bfg-common 1.5.732 → 1.5.735

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

@@ -12,6 +12,16 @@
       @hide="onHideModal"
       @submit="onCreateDatastore"
     >
+      <template #description="{ selectedStep }">
+        <div class="add-datastore__wizard-description">
+          <h2>{{ selectedStep.subTitle }}</h2>
+
+          <common-backup-storage-actions-add-steps-type-mode-tooltip
+            v-if="selectedStep.id === dynamicSteps.type"
+          />
+        </div>
+      </template>
+
       <template #modalBody="{ selectedStep }">
         <common-backup-storage-actions-add-steps-type-mode
           v-if="selectedStep.id === dynamicSteps.type"
@@ -119,4 +129,15 @@ const onHideModal = (): void => emits('hide')
 const onCreateDatastore = (): void => emits('submit')
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.add-datastore {
+  &__wizard-description {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+  .storage-datatable {
+    margin-top: 5px;
+  }
+}
+</style>

package/components/common/backup/storage/actions/add/steps/typeMode/TypeModeOld.vue

@@ -1,31 +1,5 @@
 <template>
   <section class="datastore-types">
-    <div class="header-row">
-      <span class="datastore-types__subtitle">
-        {{ localization.common.specifyDatastoreType }}
-      </span>
-      <div id="type-select-help-icon" class="signpost-container relative">
-        <atoms-the-icon
-          data-id="toggle-type-select-help-icon"
-          fill="#0072a3"
-          width="24px"
-          height="24px"
-          name="info-circle"
-          @click="isShowTypeHelp = !isShowTypeHelp"
-        />
-        <atoms-tooltip-signpost
-          v-if="isShowTypeHelp"
-          elem-id="type-select-help-icon"
-          test-id="select-datastore-type"
-          @hide="isShowTypeHelp = false"
-        >
-          <p class="help-desc">
-            {{ localization.common.datastoreTypeHelpDesc }}
-          </p>
-        </atoms-tooltip-signpost>
-      </div>
-    </div>
-
     <common-select-radio-group
       v-model="datastoreTypeModeLocal"
       :options="props.options"
@@ -34,33 +8,12 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
 
 const datastoreTypeModeLocal = defineModel<number>({ required: true })
 const props = defineProps<{
   options: UI_I_RadioOption[]
 }>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isShowTypeHelp = ref<boolean>(false)
 </script>
 
-<style lang="scss" scoped>
-.datastore-types {
-  .signpost-container {
-    display: flex;
-    cursor: pointer;
-
-    .help-desc-container {
-      max-width: 350px;
-    }
-  }
-  .header-row {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-  }
-}
-</style>
+<style lang="scss" scoped></style>

package/components/common/backup/storage/actions/add/steps/typeMode/tooltip/Tooltip.vue

@@ -0,0 +1,33 @@
+<template>
+  <div
+    id="type-select-help-icon"
+    class="signpost-container relative flex cursor-pointer"
+  >
+    <atoms-the-icon
+      data-id="toggle-type-select-help-icon"
+      fill="#0072a3"
+      width="24px"
+      height="24px"
+      name="info-circle"
+      @click="isShowTypeHelp = !isShowTypeHelp"
+    />
+    <atoms-tooltip-signpost
+      v-if="isShowTypeHelp"
+      elem-id="type-select-help-icon"
+      test-id="select-datastore-type"
+      @hide="isShowTypeHelp = false"
+    >
+      <p class="help-desc">
+        {{ localization.common.datastoreTypeHelpDesc }}
+      </p>
+    </atoms-tooltip-signpost>
+  </div>
+</template>
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowTypeHelp = ref<boolean>(false)
+</script>
+<style scoped lang="scss"></style>

package/components/common/pages/backups/modals/createBackup/CreateBackup.vue

@@ -28,7 +28,6 @@
     :selected-scheme="selectedScheme"
     :alert-messages="alertMessages"
     :title="title"
-    :alert-errors="errors"
     :is-scheduled-tasks="props.isScheduledTasks"
     :is-edit-scheduled-tasks="props.isEditScheduledTasks"
     :target="props.target"
@@ -74,10 +73,11 @@ import {
 import type {UI_I_NameCheck} from "~/components/common/pages/backups/modals/restore/name/lib/models/interfaces";
 import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
 import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
+import type {UI_I_ScheduleNewTasksForm} from "~/components/common/pages/scheduledTasks/modals/lib/models/interfaces";
 
 
 const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
-const schedulerForm = defineModel('schedulerForm', { required: true })
+const schedulerForm = defineModel<UI_I_ScheduleNewTasksForm>('schedulerForm', { required: true })
 
 const props = defineProps<{
   isEdit?: boolean // ToDo проверить на использование
@@ -152,13 +152,13 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
-    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
+    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value)
     value = disksValidation.newValue
     stepHasError = disksValidation.stepHasError
   }
 
   if (wizard.isValidateForStep(dynamicSteps.datastores, currentStep.id, nextStep.id)) {
-    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
+    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value)
     value = datastoreValidation.newValue
     stepHasError = datastoreValidation.stepHasError
   }
@@ -176,12 +176,8 @@ const validationFunc = async (
   }
 }
 
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
+const onRemoveValidationErrors = (stepId: number): void => {
+  wizard.hideAlertMessagesByStepId(stepId)
 }
 
 const strategyOptions = ref<UI_I_SelectInputItem[]>(

package/components/common/pages/backups/modals/createBackup/Old.vue

@@ -12,14 +12,6 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
-        <atoms-alert
-          v-show="props.alertErrors.length"
-          status="alert-danger"
-          :items="props.alertErrors"
-          test-id="create-backup-alert"
-          @remove="emits('remove-validation-errors')"
-        />
-
         <common-pages-scheduled-tasks-modals-common-new-task-form
           v-show="selectedStep.id === dynamicSteps.schedulingOptions"
           v-model="modelSchedulerTask"
@@ -31,6 +23,9 @@
           v-show="selectedStep.id === dynamicSteps.general"
           v-model="model"
           :show="selectedStep.id === dynamicSteps.general"
+          :messages-fields="selectedStep.fields"
+          :alert-messages="props.alertMessages[dynamicSteps.general]"
+          @remove-validation-errors="emits('remove-validation-errors', $event)"
         />
 
         <common-pages-backups-modals-create-backup-disks
@@ -38,6 +33,8 @@
           v-model="model"
           :disks="props.disks"
           :disks-loading="props.disksLoading"
+          :alert-messages="props.alertMessages[dynamicSteps.disks]"
+          @remove-validation-errors="emits('remove-validation-errors', $event)"
         />
 
         <common-pages-backups-modals-create-backup-datastores
@@ -45,6 +42,8 @@
           v-model="model"
           :datastore-table="props.datastoreTable"
           :datastore-table-loading="props.datastoreTableLoading"
+          :alert-messages="props.alertMessages[dynamicSteps.datastores]"
+          @remove-validation-errors="emits('remove-validation-errors', $event)"
         />
 
         <common-pages-backups-modals-create-backup-configuration
@@ -98,13 +97,12 @@ const props = defineProps<{
   disksLoading: boolean
   datastoreTable: UI_I_BackupDatastoreTable | null
   datastoreTableLoading: boolean
-  alertErrors: string[]
   readyToCompleteData: UI_I_TableInfoItem[]
 }>()
 
 const emits = defineEmits<{
   (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
-  (event: 'remove-validation-errors'): void
+  (event: 'remove-validation-errors', value: number): void
   (event: 'finish'): void
   (event: 'hide'): void
 }>()

package/components/common/pages/backups/modals/createBackup/configuration/backupWindow/BackupWindow.vue

@@ -1,29 +1,29 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-window-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.backupWindow }}</span>
-    </template>
-    <template #stackBlockContent>
-      <input
-        v-model="model.start_window_min"
-        data-id="hours-input"
-        type="number"
-        class="hrs"
-      />
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-window-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.backupWindow }}</span>
+    </template>
+    <template #stackBlockContent>
+      <input
+        v-model="model.start_window_min"
+        data-id="hours-input"
+        type="number"
+        class="hrs"
+      />
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/MaxBandwidth.vue

@@ -1,69 +1,69 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-max-bandwidth-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.maxBandwidth }}</span>
-    </template>
-    <template #stackBlockContent>
-      <div class="flex-align-center">
-        <input
-          v-model="maxBindwidthLocal"
-          data-id="mbps-input"
-          type="number"
-          class="mbps"
-        />
-
-        <common-select-input
-          v-model="selectedType"
-          :data="maxBandwidthOptionsLocal"
-          test-id="backup-max-bandwidth-type"
-          class="ml-1"
-        />
-      </div>
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $binary }: any = useNuxtApp()
-
-const maxBandwidthOptionsLocal =
-  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
-
-const maxBindwidthLocal = computed<number>({
-  get() {
-    return selectedType.value === 1
-      ? $binary.bToGb(model.value.bandwidth_limit)
-      : $binary.bToMb(model.value.bandwidth_limit)
-  },
-  set(newValue: number) {
-    model.value.bandwidth_limit =
-      selectedType.value === 1
-        ? $binary.gbToB(newValue)
-        : $binary.mbToB(newValue)
-  },
-})
-
-const selectedType = ref<UI_T_BandwidthOption>(0)
-watch(selectedType, (newValue) => {
-  if (newValue === 1) model.value.bandwidth_limit *= 1_024
-  else model.value.bandwidth_limit /= 1_024
-})
-</script>
-
-<style lang="scss" scoped>
-#backup-transaction-logs {
-  margin: 4px 4px 0 0;
-}
-</style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-max-bandwidth-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.maxBandwidth }}</span>
+    </template>
+    <template #stackBlockContent>
+      <div class="flex-align-center">
+        <input
+          v-model="maxBindwidthLocal"
+          data-id="mbps-input"
+          type="number"
+          class="mbps"
+        />
+
+        <common-select-input
+          v-model="selectedType"
+          :data="maxBandwidthOptionsLocal"
+          test-id="backup-max-bandwidth-type"
+          class="ml-1"
+        />
+      </div>
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $binary }: any = useNuxtApp()
+
+const maxBandwidthOptionsLocal =
+  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
+
+const maxBindwidthLocal = computed<number>({
+  get() {
+    return selectedType.value === 1
+      ? $binary.bToGb(model.value.bandwidth_limit)
+      : $binary.bToMb(model.value.bandwidth_limit)
+  },
+  set(newValue: number) {
+    model.value.bandwidth_limit =
+      selectedType.value === 1
+        ? $binary.gbToB(newValue)
+        : $binary.mbToB(newValue)
+  },
+})
+
+const selectedType = ref<UI_T_BandwidthOption>(0)
+watch(selectedType, (newValue) => {
+  if (newValue === 1) model.value.bandwidth_limit *= 1_024
+  else model.value.bandwidth_limit /= 1_024
+})
+</script>
+
+<style lang="scss" scoped>
+#backup-transaction-logs {
+  margin: 4px 4px 0 0;
+}
+</style>

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options.ts

@@ -1,6 +1,6 @@
-import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
-
-export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
-  { label: 'Mbps', value: 0 },
-  { label: 'Gbps', value: 1 },
-]
+import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
+
+export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
+  { label: 'Mbps', value: 0 },
+  { label: 'Gbps', value: 1 },
+]

package/components/common/pages/backups/modals/createBackup/configuration/strategy/Strategy.vue

@@ -1,38 +1,38 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-strategy-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.strategy }}</span>
-    </template>
-    <template #stackBlockContent>
-      <common-select-input
-        v-model="model.strategy"
-        :data="strategyOptions"
-        test-id="backup-strategy"
-      />
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const strategyOptions = ref<UI_I_SelectInputItem[]>(
-  strategyOptionsFunc(localization.value)
-)
-</script>
-
-<style lang="scss" scoped>
-#backup-transaction-logs {
-  margin: 4px 4px 0 0;
-}
-</style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-strategy-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.strategy }}</span>
+    </template>
+    <template #stackBlockContent>
+      <common-select-input
+        v-model="model.strategy"
+        :data="strategyOptions"
+        test-id="backup-strategy"
+      />
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
+  strategyOptionsFunc(localization.value)
+)
+</script>
+
+<style lang="scss" scoped>
+#backup-transaction-logs {
+  margin: 4px 4px 0 0;
+}
+</style>

package/components/common/pages/backups/modals/createBackup/datastores/Datastores.vue

@@ -10,6 +10,8 @@
     v-model="model"
     :datastore-table="props.datastoreTable"
     :datastore-table-loading="props.datastoreTableLoading"
+    :alert-messages="props.alertMessages"
+    @remove-validation-errors="emits('remove-validation-errors', $event)"
   />
 </template>
 
@@ -23,6 +25,10 @@ const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 const props = defineProps<{
   datastoreTable: UI_I_BackupDatastoreTable | null
   datastoreTableLoading: boolean
+  alertMessages: string[]
+}>()
+const emits = defineEmits<{
+  (event: 'remove-validation-errors', value: number): void
 }>()
 
 const { $store }: any = useNuxtApp()

package/components/common/pages/backups/modals/createBackup/datastores/DatastoresOld.vue

@@ -1,11 +1,20 @@
 <template>
   <div class="datastores h-full">
+    <atoms-alert
+      v-show="props.alertMessages.length"
+      status="alert-danger"
+      :items="props.alertMessages"
+      test-id="create-backup-datastores-alert"
+      @remove="onRemoveErrors"
+    />
+
     <common-pages-backups-modals-create-backup-datastores-table-view-old-table-view
       v-model:selected="model.backup_storage"
       :data-table="props.datastoreTable?.items || []"
       :total-items="props.datastoreTable?.total_items || 0"
       :total-pages="props.datastoreTable?.total_pages || 1"
       :loading="props.datastoreTableLoading"
+      class="datastores-table"
     />
   </div>
 </template>
@@ -15,17 +24,28 @@ import type {
   UI_I_BackupDatastoreTable,
   UI_I_CreateBackupForm
 } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import { dynamicSteps } from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 
 const props = defineProps<{
   datastoreTable: UI_I_BackupDatastoreTable | null
   datastoreTableLoading: boolean
+  alertMessages: string[]
+}>()
+const emits = defineEmits<{
+  (event: 'remove-validation-errors', value: number): void
 }>()
 
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
+const onRemoveErrors = (): void => {
+  emits('remove-validation-errors', dynamicSteps.datastores)
+}
 </script>
 
 <style lang="scss" scoped>
+.datastores-table {
+  margin-top: 5px;
+}
 .backups-table-content {
   height: 100%;
   padding: 0 10px 10px 10px;

package/components/common/pages/backups/modals/createBackup/disks/Disks.vue

@@ -4,6 +4,8 @@
     v-model="model"
     :disks="props.disks"
     :disks-loading="props.disksLoading"
+    :alert-messages="props.alertMessages"
+    @remove-validation-errors="emits('remove-validation-errors', $event)"
   />
   <common-pages-backups-modals-create-backup-disks-new
     v-else
@@ -24,6 +26,10 @@ const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 const props = defineProps<{
   disks: UI_I_Pvm['disk_devices']
   disksLoading: boolean
+  alertMessages: string[]
+}>()
+const emits = defineEmits<{
+  (event: 'remove-validation-errors', value: number): void
 }>()
 
 const { $store }: any = useNuxtApp()