bfg-common 1.5.790 → 1.5.791

package/components/common/configure/advancedSystemSettings/tableView/old/Old.vue

@@ -14,7 +14,7 @@
     >
       <template #value="{ item }">
         <common-configure-advanced-system-settings-table-view-old-field
-          :item="item"
+          :data="item.data"
           @change="onChangeSetting($event, item.data.key)"
           @error-message="onUpdateInvalidFields($event, item.data.key)"
         />
@@ -38,6 +38,7 @@ import type {
   UI_I_Pagination,
 } from '~/lib/models/table/interfaces'
 import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
+import type { UI_I_AdvancedSystemSettingsEditData } from '~/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces'
 import * as table from '~/components/common/configure/advancedSystemSettings/tableView/old/lib/config/table'
 
 const settings = defineModel<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>(
@@ -57,7 +58,10 @@ const props = defineProps<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const onChangeSetting = (value: any, key: string): void => {
+const onChangeSetting = (
+  value: UI_I_AdvancedSystemSettingsEditData['value'],
+  key: string
+): void => {
   settings.value.items = settings.value.items.map((item) => {
     if (item.key === key) {
       item.value = value
@@ -70,7 +74,9 @@ const invalidFieldsLocal = ref<UI_I_ArbitraryObject<string>>({})
 const onUpdateInvalidFields = (value: string, key: string): void => {
   invalidFieldsLocal.value[key] = value
   if (invalidFields.value)
-    invalidFields.value = Object.values(invalidFieldsLocal.value).filter(error => error)
+    invalidFields.value = Object.values(invalidFieldsLocal.value).filter(
+      (error) => error
+    )
 }
 
 const paginationLocal = ref<UI_I_Pagination>({

package/components/common/configure/advancedSystemSettings/tableView/old/field/Field.vue

@@ -1,7 +1,7 @@
 <template>
   <atoms-tooltip-error :has-error="invalid">
     <template #elem>
-      <div v-if="props.item.data.type === 'number'">
+      <div v-if="props.data.type === 'number'">
         <input
           v-model="valueLocal"
           type="number"
@@ -9,7 +9,7 @@
           @input="onChangeSetting($event)"
         />
       </div>
-      <div v-if="props.item.data.type === 'string'">
+      <div v-if="props.data.type === 'string'">
         <input
           v-model="valueLocal"
           type="text"
@@ -17,7 +17,7 @@
           @input="onChangeSetting($event)"
         />
       </div>
-      <div v-if="props.item.data.type === 'boolean'" class="select">
+      <div v-if="props.data.type === 'boolean'" class="select">
         <select
           v-model="valueLocal"
           @change="onChangeSetting($event)"
@@ -27,21 +27,21 @@
           <option value="true">true</option>
         </select>
       </div>
-      <div v-if="props.item.data.type === 'select'" class="select">
-        <select
-          v-model="valueLocal"
-          @change="onChangeSetting($event)"
-          :class="{ 'has-error': invalid }"
-        >
-          <option
-            v-for="item2 in props.item.data.options"
-            :key="item2.key"
-            :value="item2.key"
-          >
-            {{ item2.value }}
-          </option>
-        </select>
-      </div>
+<!--      <div v-if="props.data.type === 'select'" class="select">-->
+<!--        <select-->
+<!--          v-model="valueLocal"-->
+<!--          @change="onChangeSetting($event)"-->
+<!--          :class="{ 'has-error': invalid }"-->
+<!--        >-->
+<!--          <option-->
+<!--            v-for="item2 in props.data.options"-->
+<!--            :key="item2.key"-->
+<!--            :value="item2.key"-->
+<!--          >-->
+<!--            {{ item2.value }}-->
+<!--          </option>-->
+<!--        </select>-->
+<!--      </div>-->
     </template>
     <template #content>
       {{ errorMessage }}
@@ -50,31 +50,35 @@
 </template>
 
 <script setup lang="ts">
+import type {
+  UI_I_AdvancedSystemSettingsEditData
+} from "~/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces";
 import { E_Format } from '~/components/common/configure/advancedSystemSettings/tableView/old/field/lib/models/enums'
 import { allRegExp } from '~/lib/config/regExp'
 
 const props = defineProps<{
-  item: any
+  data: UI_I_AdvancedSystemSettingsEditData
 }>()
 const emits = defineEmits<{
-  (event: 'change', value: any): void
+  (event: 'change', value: UI_I_AdvancedSystemSettingsEditData['value']): void
   (event: 'error-message', value: string): void
 }>()
 
-const valueLocal = ref<any>(props.item.data.value)
+const valueLocal = ref<UI_I_AdvancedSystemSettingsEditData['value']>(props.data.value)
 
 const invalid = ref<boolean>(false)
 const errorMessage = ref<string>('')
 
-const onChangeSetting = (event: any): void => {
+const onChangeSetting = (event: Event): void => {
   invalid.value = false
   errorMessage.value = ''
 
-  let value = event.target.value
-  if (props.item.data.type === 'boolean') value = !!value
-  if (props.item.data.type === 'number') value = +value
+  const target = event.target as HTMLInputElement
+  let value: UI_I_AdvancedSystemSettingsEditData['value'] = target.value
+  if (props.data.type === 'boolean') value = !!value
+  if (props.data.type === 'number') value = +value
 
-  const { validation } = props.item.data
+  const { validation } = props.data
   if (Object.hasOwn(validation, 'equal')) {
     invalid.value = !validation.equal.includes(value)
     errorMessage.value = invalid.value

package/components/common/configure/advancedSystemSettings/tableView/old/lib/config/table.ts

@@ -87,17 +87,15 @@ export const bodyItems = (
       type: item.type,
       value: item.value,
       validation: item.validation,
-      options: item.options,
-      invalid: false,
-      errorMessage: '',
+      // options: item.options,
     }
 
-    let valueText = item[tableItemKeys[1]]
-    if (item.type === 'select') {
-      valueText =
-        item.options.find((option) => option.key === valueText)?.value ||
-        valueText
-    }
+    // let valueText = item[tableItemKeys[1]]
+    // if (item.type === 'select') {
+    //   valueText =
+    //     item.options.find((option) => option.key === valueText)?.value ||
+    //     valueText
+    // }
     const cols = [
       {
         key: 'col0',
@@ -109,7 +107,7 @@ export const bodyItems = (
       },
       {
         key: isEdit ? 'value' : 'col1',
-        text: valueText,
+        text: item[tableItemKeys[1]],
         id: key,
         testId: `advanced-system-settings-table-item-${key}${
           isEdit ? '-edit' : ''

package/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces.ts

@@ -0,0 +1,10 @@
+import type {
+    UI_I_AdvancedSystemSetting
+} from "~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces";
+
+export interface UI_I_AdvancedSystemSettingsEditData {
+    key: UI_I_AdvancedSystemSetting['key'];
+    type: UI_I_AdvancedSystemSetting['type'];
+    value: UI_I_AdvancedSystemSetting['value'];
+    validation: UI_I_AdvancedSystemSetting['validation'];
+}

package/components/common/pages/backups/modals/restore/Restore.vue

@@ -90,7 +90,35 @@ watch(
 )
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
-  wizard.changeSteps(value, validationFunc)
+  wizard.changeSteps(value, validationFunc, finalValidationFunc)
+}
+
+const finalValidationFunc = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  if (model.value.restore_code === 3) {
+    // Все это сделано для генерации имени вм, если она не заведена
+    const data = await $store.dispatch('backup/A_CHECK_VALIDATION', {
+      pvm: model.value.pvm,
+      start: true
+    })
+
+    model.value.pvm.name = data.vm_desc.name
+  }
+
+  // if (!data) {
+  //   stepHasError = wizard.setValidation(dynamicSteps.selectStorage, 'storage', {
+  //     fieldMessage: localization.value.common.selectStorage,
+  //     alertMessage: localization.value.common.selectValidDestinationStorage,
+  //   })
+  // }
+
+  return {
+    stepHasError,
+    newValue: value,
+  }
 }
 
 const storageSubmit = ref<null | Function>(null)
@@ -235,6 +263,7 @@ const getPvm = async (): Promise<void> => {
   })
 
   model.value.pvm = useDeepCopy($store.getters['backup/getPvm'])
+  model.value.pvm.network_devices = model.value.pvm.network_devices || [] // Обрабатываем если null, так не нужно в многих местах делать проверки
 
   loadingCount.value--
 }

package/components/common/pages/backups/modals/restore/validation/validation.ts

@@ -20,10 +20,10 @@ export const checkNameValidation = async (
   let stepErrorMessage = ''
 
   if (!name) {
-    stepHasError = wizard.setValidation(dynamicSteps.selectName, 'name', {
-      fieldMessage: localization.common.fieldRequired,
-      alertMessage: localization.common.emptyNameValidationDescription,
-    })
+    // stepHasError = wizard.setValidation(dynamicSteps.selectName, 'name', {
+    //   fieldMessage: localization.common.fieldRequired,
+    //   alertMessage: localization.common.emptyNameValidationDescription,
+    // })
     return { stepHasError, newValue: value }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.790",
+  "version": "1.5.791",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",