bfg-common 1.4.233 → 1.4.235

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

@@ -0,0 +1,18 @@
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+
+export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
+  return {
+    task_name: '',
+    description: '',
+    frequency: '',
+    frg_after_startup: 0,
+    frg_interval: 1,
+    frg_end_time: null,
+    frg_start_on_time: null,
+    frg_monthly_day: 0,
+    frq_week_day: '',
+    frq_ordinal_number: '',
+    frg_on_time: null,
+    frg_on_week_days: [],
+  }
+}

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

@@ -0,0 +1,14 @@
+export interface UI_I_ScheduleNewTasksForm {
+  task_name: string
+  description: string
+  frequency: string
+  frg_after_startup: number
+  frg_interval: number
+  frg_end_time: number | null
+  frg_start_on_time: number | null
+  frg_monthly_day: number
+  frq_ordinal_number: string
+  frq_week_day: string
+  frg_on_time: number | null
+  frg_on_week_days: number[]
+}

package/components/common/vm/actions/clone/Clone.vue

@@ -13,7 +13,7 @@
       <template #modalBody="{ selectedStep }">
         <atoms-loader v-show="!vmSettings" id="loader" />
         <div v-if="vmSettings" class="vm-context">
-<!--          TODO refactoring-->
+          <!--          TODO refactoring-->
           <templates-inventory-vm-configure-scheduled-tasks-modals-common-new-task-form
             v-show="selectedStep.id === dynamicSteps.scheduledTasks"
             v-model="newTaskForm"
@@ -136,7 +136,7 @@ import {
 } from '~/components/common/vm/actions/clone/lib/config/steps'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import { mapCapabilities } from '~/components/common/vm/actions/common/lib/utils/capabilities'
-import { scheduledTaskDefaultFormFunc } from '~/components/common/vm/actions/clone/lib/config/defaultScheduledTask'
+import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/lib/config/createScheduledTask'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -288,12 +288,20 @@ const checkName = async (
   return new Promise((resolve) => {
     nameFormSubmit.value = (isValid: boolean) => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(dynamicSteps.value.selectName, 'name', {
-          fieldMessage: 'aaa',
-          alertMessage: 'aaa',
-        })
+        stepHasError = wizard.setValidation(
+          dynamicSteps.value.selectName,
+          'name',
+          {
+            fieldMessage: 'aaa',
+            alertMessage: 'aaa',
+          }
+        )
       } else if (wizard.hasMessage(dynamicSteps.value.selectName, 'name')) {
-        value = wizard.removeValidation(dynamicSteps.value.selectName, 'name', value)
+        value = wizard.removeValidation(
+          dynamicSteps.value.selectName,
+          'name',
+          value
+        )
       }
 
       resolve({
@@ -312,12 +320,22 @@ const checkStorage = async (
   return new Promise((resolve) => {
     storageSubmit.value = (isValid: boolean) => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(dynamicSteps.value.selectStorage, 'storage', {
-          fieldMessage: 'aaa',
-          alertMessage: 'aaa',
-        })
-      } else if (wizard.hasMessage(dynamicSteps.value.selectStorage, 'storage')) {
-        value = wizard.removeValidation(dynamicSteps.value.selectStorage, 'storage', value)
+        stepHasError = wizard.setValidation(
+          dynamicSteps.value.selectStorage,
+          'storage',
+          {
+            fieldMessage: 'aaa',
+            alertMessage: 'aaa',
+          }
+        )
+      } else if (
+        wizard.hasMessage(dynamicSteps.value.selectStorage, 'storage')
+      ) {
+        value = wizard.removeValidation(
+          dynamicSteps.value.selectStorage,
+          'storage',
+          value
+        )
       }
 
       resolve({
@@ -336,12 +354,25 @@ const checkCustomizeHardware = async (
   return new Promise((resolve) => {
     customizeHardwareSubmit.value = (isValid: boolean) => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(dynamicSteps.value.customizeHardware, 'customizeHardware', {
-          fieldMessage: 'aaa',
-          alertMessage: 'aaa',
-        })
-      } else if (wizard.hasMessage(dynamicSteps.value.customizeHardware, 'customizeHardware')) {
-        value = wizard.removeValidation(dynamicSteps.value.customizeHardware, 'customizeHardware', value)
+        stepHasError = wizard.setValidation(
+          dynamicSteps.value.customizeHardware,
+          'customizeHardware',
+          {
+            fieldMessage: 'aaa',
+            alertMessage: 'aaa',
+          }
+        )
+      } else if (
+        wizard.hasMessage(
+          dynamicSteps.value.customizeHardware,
+          'customizeHardware'
+        )
+      ) {
+        value = wizard.removeValidation(
+          dynamicSteps.value.customizeHardware,
+          'customizeHardware',
+          value
+        )
       }
 
       resolve({

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

@@ -13,10 +13,11 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
+        <!-- TODO refactoring  move to common-->
         <templates-inventory-vm-configure-scheduled-tasks-modals-common-new-task-form
           v-if="selectedStep.id === 0"
-          v-model="model"
-          :target="''"
+          v-model="newScheduledTaskForm"
+          :target="selectedVirtualMachine"
         />
 
         <common-wizards-vm-migrate-select-type
@@ -95,7 +96,9 @@ import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/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/lib/models/interfaces'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/vm/migrate/lib/config/constructDataReady'
+import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/lib/config/createScheduledTask'
 import * as validation from '~/components/common/wizards/vm/migrate/lib/validations'
 
 const props = defineProps<{
@@ -109,6 +112,7 @@ const props = defineProps<{
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
   computeResourceTableData?: any
   computeResourceTree?: UI_I_TreeNode
+  selectedVirtualMachine?: string
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -125,8 +129,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) {
@@ -163,6 +165,9 @@ const form = ref<UI_I_MigrateFormLocal>({
   },
   vMotion_priority: 'high',
 })
+const newScheduledTaskForm = ref<UI_I_ScheduleNewTasksForm>(
+  useDeepCopy(scheduledTaskDefaultFormFunc())
+)
 
 const validationFunc = async (
   value: UI_I_WizardStep[],

package/components/common/wizards/vm/migrate/lib/config/steps.ts

@@ -6,7 +6,7 @@ export const stepsFunc = (
   localization: UI_I_Localization,
   isScheduledTasks: boolean
 ): UI_I_WizardStep[] => {
-  let result: UI_I_WizardStep[] = [
+  const result: UI_I_WizardStep[] = [
     {
       id: 0,
       stepName: '',

package/package.json

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

package/components/common/vm/actions/clone/lib/config/defaultScheduledTask.ts

@@ -1,8 +0,0 @@
-// export const scheduledTaskDefaultFormFunc = (): I_ScheduleNewTasksForm => {
-export const scheduledTaskDefaultFormFunc = (): any => {
-  return {
-    task_name: '',
-    description: '',
-    frequency: '',
-  }
-}