bfg-common 1.4.242 → 1.4.243

package/assets/localization/local_ru.json

@@ -1359,7 +1359,7 @@
     "sharedDirect": "Общий Прямой",
     "sharedPassthroughGPUAssignmentPolicy": "Политика назначения общего сквозного графического процессора",
     "sharedSecret": "Общий ключ",
-    "sharedStorm": "Общий шторм",
+    "sharedStorm": "Шторм",
     "sharedStormDesc": "Создать общее хранилище данных Storm на диске/LUN",
     "sharePolicy": "Поделиться политикой",
     "shares": "Распределение",

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/NewTaskForm.vue

@@ -12,7 +12,7 @@
         >
           <input
             id="schedule-task-name-field"
-            v-model="form.taskName.value"
+            v-model="model.task_name"
             data-id="schedule-task-name-field"
             type="text"
             class="clr-input"
@@ -32,7 +32,7 @@
 
         <textarea
           id="description"
-          v-model="form.description.value"
+          v-model="model.description"
           data-id="admin-create-user-description-field"
           rows="3"
           class="clr-col-md-8"
@@ -70,7 +70,7 @@
         </label>
 
         <textarea
-          v-model="form.description.value"
+          v-model="model.ntfn_target"
           data-id="schedule-task-email-completion-field"
           placeholder="example1@email.com,example2@email.com"
           rows="3"
@@ -84,12 +84,8 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import type { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-import type {
-  UI_I_ScheduledTasksForm,
-  UI_I_InitialValidationFields,
-} from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/models/interfaces'
+import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/models/interfaces'
 import { frequencyMethodFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions'
 
 const props = defineProps<{
@@ -99,43 +95,16 @@ const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const { $validation }: any = useNuxtApp()
-const validation = $validation.call({})
-
-const defaultForm: UI_I_ScheduledTasksForm = {
-  taskName: {
-    value: model.value.task_name,
-    validations: [
-      { value: 'required', errorText: localization.value.common.fieldRequired },
-    ],
-  },
-  description: {
-    value: model.value.description,
-    validations: [],
-  },
-}
-
-const form = ref<UI_I_ScheduledTasksForm>(useDeepCopy(defaultForm))
-const validForm = ref<UI_I_ValidationTouchResult | null>(null)
-
-const setForm = (): void => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
-
 const initValidationFields = ref<UI_I_InitialValidationFields>({
   taskName: false,
 })
 const onInitValidation = (types: string[]): void => {
   types.forEach((type) => (initValidationFields.value[type] = true))
-  validForm.value = validation.touch()
-
-  model.value.task_name = form.value.taskName.value // Временно
 }
 const userNameErrorText = computed<string>(() => {
   if (!initValidationFields.value.taskName) return ''
-  return validForm.value?.errors?.taskName?.[0] || ''
+
+  return !model.value.task_name ? localization.value.common.fieldRequired : ''
 })
 
 const frequencyMethodOptions = computed<UI_I_SelectInputItem[]>(() =>

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/models/interfaces.ts

@@ -1,9 +1,3 @@
-import type { UI_I_Validation } from '~/lib/models/plugins/validation/interfaces'
-
-export interface UI_I_ScheduledTasksForm {
-  taskName: UI_I_Validation
-  description: UI_I_Validation
-}
 export interface UI_I_InitialValidationFields {
   taskName: boolean
 }

package/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask.ts

@@ -6,6 +6,7 @@ export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
   return {
     task_name: '',
     description: '',
+    ntfn_target: '',
     frequency: '',
     frg_after_startup: 0,
     frg_interval: 1,

package/components/common/pages/scheduledTasks/modals/lib/models/interfaces.ts

@@ -4,6 +4,7 @@ export interface UI_I_ScheduleNewTasksForm {
   task_name: string
   description: string
   frequency: string
+  ntfn_target: string
   frg_after_startup: number
   frg_interval: number
   frg_end_time: number | null

package/components/common/wizards/vm/migrate/Migrate.vue

@@ -130,8 +130,6 @@ const wizard: Wizard = new Wizard(
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
-const model = ref<any>({})
-
 const title = computed<string>(() => {
   let result = localization.value.common.migrate
   if (props.isScheduledTasks) {

package/package.json

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