bfg-common 1.5.426 → 1.5.428

package/components/common/pages/backups/modals/Modals.vue

@@ -1,10 +1,10 @@
 <template>
   <common-pages-backups-modals-create-backup
-    v-if="isShowCreateBackupModal.isShow"
+    v-if="schedulerTask.isShow"
     v-model="backupForm"
     v-model:scheduler-form="schedulerTaskForm"
-    :is-scheduled-tasks="isShowCreateBackupModal.scheduler.isSchedulerTask"
-    :is-edit-scheduled-tasks="isShowCreateBackupModal.scheduler.editTask"
+    :is-scheduled-tasks="schedulerTask.scheduler.isSchedulerTask"
+    :is-edit-scheduled-tasks="schedulerTask.scheduler.editTask"
     :target="props.target"
     :selected-vm-name="props.selectedVmName"
     :disks="props.disks"
@@ -55,6 +55,7 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_BackupAction } from '~/components/common/pages/backups/lib/models/interfaces'
 import type { UI_I_NameCheck } from '~/components/common/pages/backups/modals/restore/name/lib/models/interfaces'
+import type { UI_I_ModalPayloadSchedulerData } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
 import { sendTask } from '~/lib/utils/sendTask'
 import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask'
 import { backupDefaultFormFunc } from '~/components/common/pages/backups/modals/lib/config/createBackup'
@@ -100,10 +101,18 @@ const schedulerTaskForm = ref<UI_I_ScheduleNewTasksForm>(
 const restoreForm = ref<UI_I_RestoreForm>(useDeepCopy(restoreDefaultFormFunc()))
 const deleteBackupId = ref<string>('')
 
-// TODO fix after refactor schedule tasks
-const isShowCreateBackupModal = computed<any>( // ??
+const schedulerTask = computed<UI_I_ModalPayloadSchedulerData>(
   () => $store.getters['backup/getCreateBackupModal']
 )
+watch(
+  schedulerTask,
+  (newValue: UI_I_ModalPayloadSchedulerData) => {
+    if (!newValue.isSchedulerTask) return
+    schedulerTaskForm.value = newValue.data
+  },
+  { immediate: true, deep: true }
+)
+
 const isShowDeleteBackupModal = ref<boolean>(false)
 const isShowDeleteAllBackupsModal = ref<boolean>(false)
 const isLoadingDeleteBackup = ref<boolean>(false)
@@ -122,7 +131,7 @@ const onCreateBackup = (): void => {
 
   const {
     scheduler: { isSchedulerTask, editTask, data },
-  } = isShowCreateBackupModal.value
+  } = schedulerTask.value
   const sendData = isSchedulerTask
     ? scheduledTasks(
         schedulerTaskForm.value,

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

@@ -1,4 +1,6 @@
-export interface UI_I_ModalPayloadSchedulerData<T = any> {
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+
+export interface UI_I_ModalPayloadSchedulerData<T = UI_I_ScheduleNewTasksForm> {
   isSchedulerTask: false
   editTask: false
   data: T
@@ -27,7 +29,7 @@ export interface API_UI_I_ScheduledTasksTableItem {
   }[]
 }
 export interface UI_I_ScheduledTasksTableItem
-    extends API_UI_I_ScheduledTasksTableItem {}
+  extends API_UI_I_ScheduledTasksTableItem {}
 
 export interface UI_I_CreateScheduledTaskArgs {
   name: string
@@ -37,4 +39,4 @@ export interface UI_I_CreateScheduledTaskArgs {
   cron_2: string
   notify_emails: string
   args: string
-}
+}

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

@@ -183,10 +183,6 @@ import { mapCapabilities } from '~/components/common/vm/actions/common/lib/utils
 import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask'
 import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
 
-const modelSchedulerTask = defineModel<UI_I_ScheduleNewTasksForm>(
-  'schedulerForm',
-  { required: true }
-)
 const props = withDefaults(
   defineProps<{
     project: UI_T_Project

package/package.json

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