bfg-common 1.4.226 → 1.4.229

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

@@ -4,7 +4,7 @@
       show
       :wizard="wizard"
       :selected-scheme="selectedScheme"
-      :title="localization.common.cloneExistingVirtualMachine"
+      :title="title"
       :localization="localization"
       @change-steps="onChangeSteps"
       @hide="onHideModal"
@@ -13,16 +13,22 @@
       <template #modalBody="{ selectedStep }">
         <atoms-loader v-show="!vmSettings" id="loader" />
         <div v-if="vmSettings" class="vm-context">
+          <templates-inventory-vm-configure-scheduled-tasks-modals-common-new-task-form
+            v-show="selectedStep.id === dynamicSteps.scheduledTasks"
+            v-model="newTaskForm"
+            :target="selectedVirtualMachine"
+            class="new-task-form"
+          />
           <common-vm-actions-common-select-name
-            v-show="selectedStep.id === 0"
-            :show="selectedStep.id === 0"
+            v-show="selectedStep.id === dynamicSteps.selectName"
+            :show="selectedStep.id === dynamicSteps.selectName"
             :name-form-submit="nameFormSubmit"
             :project="props.project"
             @submit="onChangeName(...$event)"
             @check-name="emits('check-name', $event)"
           />
           <common-vm-actions-common-select-storage
-            v-show="selectedStep.id === 1"
+            v-show="selectedStep.id === dynamicSteps.selectStorage"
             :storage-submit="storageSubmit"
             :datastore="props.datastore"
             :storage="vmSettings.storage"
@@ -30,12 +36,12 @@
             @submit="onChangeStorage"
           />
           <common-vm-actions-clone-select-options
-            v-show="selectedStep.id === 2"
+            v-show="selectedStep.id === dynamicSteps.selectOptions"
             :select-options-submit="selectOptionsSubmit"
             @submit="onChangeSelectOptions"
           />
           <common-vm-actions-common-customize-hardware
-            v-show="selectedStep.id === 3"
+            v-show="selectedStep.id === dynamicSteps.customizeHardware"
             v-model:vm-name="vmName"
             v-model:guest-machine-type="vmSettings.guestMachineType"
             v-model:guest-os-family="vmSettings.guestOsFamily"
@@ -79,7 +85,7 @@
             @get-pci-devices="emits('get-pci-devices')"
           />
           <common-ready-to-complete
-            v-show="selectedStep.id === 4"
+            v-show="selectedStep.id === dynamicSteps.readyComplete"
             :data="props.readyCompleteTableInfo"
           />
         </div>
@@ -113,7 +119,10 @@ import type { UI_I_ConfigurePciDevicesTable } from '~/lib/models/store/host/inte
 import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
-import type { UI_I_VmForm } from '~/components/common/vm/actions/clone/lib/models/interfaces'
+import type {
+  I_DynamicSteps,
+  UI_I_VmForm,
+} from '~/components/common/vm/actions/clone/lib/models/interfaces'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
@@ -122,9 +131,11 @@ import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/li
 import {
   stepsSchemeInitial,
   stepsFunc,
+  getDynamicSteps,
 } 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'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -142,6 +153,8 @@ const props = defineProps<{
   passthroughDevices: UI_I_ConfigurePciDevicesTable | null
   vmNameInWizard: string
   capabilities?: UI_I_Capabilities
+  isScheduledTasks?: boolean
+  selectedVirtualMachine?: UI_I_Capabilities
 }>()
 
 const emits = defineEmits<{
@@ -158,6 +171,24 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const title = computed<string>(() => {
+  let result = localization.value.common.cloneExistingVirtualMachine
+  if (props.isScheduledTasks) {
+    result = `${localization.value.common.scheduleNewTasks} (${localization.value.common.cloneExistingVirtualMachine})`
+  }
+
+  return result
+})
+
+// const { id, type } = useRoute().params
+// const selectedVirtualMachine = computed<string>(() => {
+//   return $store.getters['inventory/getNodeByTypeAndId'](type, id)?.name || ''
+// })
+
+const dynamicSteps = ref<I_DynamicSteps>(
+  getDynamicSteps(props.isScheduledTasks)
+)
+
 watch(
   () => props.capabilities,
   () => {
@@ -167,9 +198,21 @@ watch(
 )
 
 const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial
+  stepsFunc(localization.value, props.isScheduledTasks),
+  stepsSchemeInitial(props.isScheduledTasks)
+)
+// TODO move to common
+// const newTaskForm = ref<I_ScheduleNewTasksForm>(
+const newTaskForm = ref<any>(useDeepCopy(scheduledTaskDefaultFormFunc()))
+watch(
+  newTaskForm,
+  (newValue) => {
+    if (props.isScheduledTasks)
+      wizard.setDisabledNextButton(!newValue.task_name || !newValue.frequency)
+  },
+  { immediate: true, deep: true }
 )
+
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
@@ -189,25 +232,49 @@ const validationFunc = async (
   }
 
   wizard.setLoader(true)
-  if (wizard.isValidateForStep(0, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.value.selectName,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const nameValidation = await checkName(value)
 
     value = nameValidation.newValue
     stepHasError = stepHasError || nameValidation.stepHasError
-  } else if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
+  } else if (
+    wizard.isValidateForStep(
+      dynamicSteps.value.selectStorage,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const storageValidation = await checkStorage(value)
 
     value = storageValidation.newValue
 
     stepHasError = stepHasError || storageValidation.stepHasError
-  } else if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
+  } else if (
+    wizard.isValidateForStep(
+      dynamicSteps.value.selectOptions,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     selectOptionsSubmit.value++
-  } else if (wizard.isValidateForStep(3, currentStep.id, nextStep.id)) {
-    const storageValidation = await checkCustomizeHardware(value)
+  } else if (
+    wizard.isValidateForStep(
+      dynamicSteps.value.customizeHardware,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const customizeHardwareValidation = await checkCustomizeHardware(value)
 
-    value = storageValidation.newValue
+    value = customizeHardwareValidation.newValue
 
-    stepHasError = stepHasError || storageValidation.stepHasError
+    stepHasError = stepHasError || customizeHardwareValidation.stepHasError
   }
   wizard.setLoader(false)
 
@@ -508,6 +575,10 @@ const onHideModal = (): void => {
     margin-right: 6px;
   }
 }
+
+.new-task-form {
+  padding: 0 25px 0 5px;
+}
 </style>
 
 <style>

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

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

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

@@ -1,18 +1,31 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
+import type { I_DynamicSteps } from '~/components/common/vm/actions/clone/lib/models/interfaces'
 
 export const stepsFunc = (
-  localization: UI_I_Localization
+  localization: UI_I_Localization,
+  isScheduledTasks: boolean
 ): UI_I_WizardStep[] => {
-  return [
+  let result: UI_I_WizardStep[] = [
     {
       id: 0,
       stepName: '',
+      title: localization.common.schedulingOptions,
+      subTitle: '',
+      status: UI_E_WIZARD_STATUS.SELECTED,
+      isValid: true,
+      fields: {},
+      testId: 'new-roles-scheduling-options',
+    },
+    {
+      id: 1,
+      stepName: '',
       title: localization.common.selectName,
       subTitle: localization.common.specifyUniqueName,
-      status: UI_E_WIZARD_STATUS.SELECTED,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-wizard-select-name',
       fields: {
         name: {
           field: '',
@@ -21,12 +34,13 @@ export const stepsFunc = (
       },
     },
     {
-      id: 1,
+      id: 2,
       stepName: '',
       title: localization.common.selectStorage,
       subTitle: localization.common.selectStorageConfigurationDiskFiles,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-wizard-select-storage',
       fields: {
         storage: {
           field: '',
@@ -35,21 +49,24 @@ export const stepsFunc = (
       },
     },
     {
-      id: 2,
+      id: 3,
       stepName: '',
       title: localization.common.selectCloneOptions,
-      subTitle: localization.common.chooseGuestOSInstalledVmAndMachineTypeUsedCreateVm,
+      subTitle:
+        localization.common.chooseGuestOSInstalledVmAndMachineTypeUsedCreateVm,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-wizard-select-clone-options',
       fields: {},
     },
     {
-      id: 3,
+      id: 4,
       stepName: '',
       title: localization.common.customizeHardware,
       subTitle: localization.common.configureVirtualMachineHardware,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-wizard-customize-hardware',
       fields: {
         customizeHardware: {
           field: '',
@@ -58,17 +75,64 @@ export const stepsFunc = (
       },
     },
     {
-      id: 4,
+      id: 5,
       stepName: '',
       title: localization.common.readyComplete,
       subTitle: localization.common.clickFinishStartCreation,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-wizard-ready-complete',
       fields: {},
     },
   ]
+
+  console.log(isScheduledTasks, 111111);
+
+  if (!isScheduledTasks) {
+    console.log(2222222);
+    result.shift()
+    result[0].status = UI_E_WIZARD_STATUS.SELECTED
+    result = result.map((item) => {
+      item.id--
+      return item
+    })
+  }
+
+  console.log(result, 33333333);
+
+  return result
+}
+
+// export const stepsSchemeInitial = [
+//   [0, 1, 2, 3, 4], // Procurator
+// ]
+
+export const stepsSchemeInitial = (isScheduledTasks: boolean): number[][] => {
+  const resultWithOutScheduledTasks = [0, 1, 2, 3, 4]
+  const resultWithScheduledTasks = [0, 1, 2, 3, 4, 5]
+
+  return isScheduledTasks
+    ? [resultWithScheduledTasks]
+    : [resultWithOutScheduledTasks]
 }
+export const getDynamicSteps = (isScheduledTasks: boolean): I_DynamicSteps => {
+  const resultWithOutScheduledTasks = {
+    selectName: 0,
+    selectStorage: 1,
+    selectOptions: 2,
+    customizeHardware: 3,
+    readyComplete: 4,
+  }
+  const resultWithScheduledTasks = {
+    scheduledTasks: 0,
+    selectName: 1,
+    selectStorage: 2,
+    selectOptions: 3,
+    customizeHardware: 4,
+    readyComplete: 5,
+  }
 
-export const stepsSchemeInitial = [
-  [0, 1, 2, 3, 4], // Procurator
-]
+  return isScheduledTasks
+    ? resultWithScheduledTasks
+    : resultWithOutScheduledTasks
+}

package/components/common/vm/actions/clone/lib/models/interfaces.ts

@@ -1,7 +1,16 @@
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-
-export interface UI_I_VmForm {
-  name: string
-  storage: UI_I_DatastoreTableItem | null
-  options: string[]
-}
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+
+export interface UI_I_VmForm {
+  name: string
+  storage: UI_I_DatastoreTableItem | null
+  options: string[]
+}
+
+export interface I_DynamicSteps {
+  selectName: number
+  selectStorage: number
+  selectOptions: number
+  customizeHardware: number
+  readyComplete: number
+  scheduledTasks?: number
+}

package/components/common/vm/actions/clone/lib/utils.ts

@@ -1,43 +1,43 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-export const stepItemsFunc = (
-  localization: UI_I_Localization,
-  project: UI_T_Project
-): UI_I_VerticalStepItem[] => {
-  if (project === 'sphere') {
-    return []
-  }
-  return [
-    {
-      text: localization.common.selectName,
-      disabled: false,
-      complete: false,
-    },
-    { text: localization.common.selectStorage, disabled: true, complete: false },
-    { text: localization.common.selectCloneOptions, disabled: true, complete: false },
-    {
-      text: localization.common.customizeHardware,
-      disabled: true,
-      complete: false,
-    },
-    { text: localization.common.readyComplete, disabled: true, complete: false },
-  ]
-}
-
-export const subTitleFunc = (
-  localization: UI_I_Localization,
-  project: UI_T_Project
-): string[] => {
-  if (project === 'sphere') {
-    return []
-  }
-  return [
-    localization.common.specifyUniqueName,
-    localization.common.selectStorageConfigurationDiskFiles,
-    localization.common.chooseGuestOSInstalledVmAndMachineTypeUsedCreateVm,
-    localization.common.selectFurtherCloneOptions,
-    localization.common.clickFinishStartCreation,
-  ]
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+export const stepItemsFunc = (
+  localization: UI_I_Localization,
+  project: UI_T_Project
+): UI_I_VerticalStepItem[] => {
+  if (project === 'sphere') {
+    return []
+  }
+  return [
+    {
+      text: localization.common.selectName,
+      disabled: false,
+      complete: false,
+    },
+    { text: localization.common.selectStorage, disabled: true, complete: false },
+    { text: localization.common.selectCloneOptions, disabled: true, complete: false },
+    {
+      text: localization.common.customizeHardware,
+      disabled: true,
+      complete: false,
+    },
+    { text: localization.common.readyComplete, disabled: true, complete: false },
+  ]
+}
+
+export const subTitleFunc = (
+  localization: UI_I_Localization,
+  project: UI_T_Project
+): string[] => {
+  if (project === 'sphere') {
+    return []
+  }
+  return [
+    localization.common.specifyUniqueName,
+    localization.common.selectStorageConfigurationDiskFiles,
+    localization.common.chooseGuestOSInstalledVmAndMachineTypeUsedCreateVm,
+    localization.common.selectFurtherCloneOptions,
+    localization.common.clickFinishStartCreation,
+  ]
+}

package/components/common/vm/actions/clone/select/options/Options.vue

@@ -1,71 +1,71 @@
-<template>
-  <div class="select-options">
-    <div class="checkbox">
-      <input
-        id="customize-os"
-        v-model="selectedOptions"
-        data-id="customize-os"
-        type="checkbox"
-        value="customize-os"
-      />
-      <label for="customize-os">{{
-        localization.common.customizeTheOperatingSystem
-      }}</label>
-    </div>
-    <div class="checkbox">
-      <input
-        id="customize-hardware"
-        v-model="selectedOptions"
-        data-id="customize-hardware"
-        type="checkbox"
-        value="customize-hardware"
-      />
-      <label for="customize-hardware">{{
-        localization.common.customizeThisVirtualMachineHardware
-      }}</label>
-    </div>
-    <div class="checkbox">
-      <input
-        id="power-on"
-        v-model="selectedOptions"
-        data-id="power-on"
-        type="checkbox"
-        value="power-on"
-      />
-      <label for="power-on">{{
-        localization.common.powerOnVirtualMachineAfterCreation
-      }}</label>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  selectOptionsSubmit: number
-}>()
-
-const emits = defineEmits<{
-  (event: 'submit', value: string[]): void
-}>()
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedOptions = ref<string[]>([])
-watch(
-  () => props.selectOptionsSubmit,
-  () => {
-    emits('submit', selectedOptions.value)
-  }
-)
-</script>
-
-<style scoped lang="scss">
-.select-options {
-  padding: 12px 0 0;
-
-  .checkbox {
-    margin: 6px 0;
-  }
-}
-</style>
+<template>
+  <div class="select-options">
+    <div class="checkbox">
+      <input
+        id="customize-os"
+        v-model="selectedOptions"
+        data-id="customize-os"
+        type="checkbox"
+        value="customize-os"
+      />
+      <label for="customize-os">{{
+        localization.common.customizeTheOperatingSystem
+      }}</label>
+    </div>
+    <div class="checkbox">
+      <input
+        id="customize-hardware"
+        v-model="selectedOptions"
+        data-id="customize-hardware"
+        type="checkbox"
+        value="customize-hardware"
+      />
+      <label for="customize-hardware">{{
+        localization.common.customizeThisVirtualMachineHardware
+      }}</label>
+    </div>
+    <div class="checkbox">
+      <input
+        id="power-on"
+        v-model="selectedOptions"
+        data-id="power-on"
+        type="checkbox"
+        value="power-on"
+      />
+      <label for="power-on">{{
+        localization.common.powerOnVirtualMachineAfterCreation
+      }}</label>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  selectOptionsSubmit: number
+}>()
+
+const emits = defineEmits<{
+  (event: 'submit', value: string[]): void
+}>()
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedOptions = ref<string[]>([])
+watch(
+  () => props.selectOptionsSubmit,
+  () => {
+    emits('submit', selectedOptions.value)
+  }
+)
+</script>
+
+<style scoped lang="scss">
+.select-options {
+  padding: 12px 0 0;
+
+  .checkbox {
+    margin: 6px 0;
+  }
+}
+</style>