fix Restore New / Restore Existing action route

Signed-off-by: andy.lee <andy.lee@suse.com>
harvester · Sep 26, 2024 · 1e78d08 · 1e78d08
1 parent c02f2c2
commit 1e78d08
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 140 deletions.
diff --git a/pkg/harvester/components/FilterVMSchedule.vue b/pkg/harvester/components/FilterVMSchedule.vue
@@ -69,7 +69,7 @@ export default {
     </template>
 
     <v-popover
-      trigger="click"
+      :trigger="scheduleOptions.length ? 'click' : 'manual'"
       placement="bottom-end"
     >
       <slot name="header">

diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
@@ -53,4 +53,5 @@ export const HCI = {
   NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
   CPU_MANAGER:                    'cpumanager',
   VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
+  SVM_BACKUP_ID:                  'harvesterhci.io/svmbackupId',
 };
diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue
@@ -4,6 +4,7 @@ import { STATE, NAME, AGE } from '@shell/config/table-headers';
 import { allSettled } from '../../utils/promise';
 import { BACKUP_TYPE } from '../../config/types';
 import { HCI } from '../../types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 
 export default {
   name: 'BackupList',
@@ -90,7 +91,7 @@ export default {
       let r = this.rows.filter(row => row.spec?.type === BACKUP_TYPE.BACKUP);
 
       if (this.id) {
-        r = r.filter(backup => backup.metadata.annotations?.['harvesterhci.io/svmbackupId'] === this.id);
+        r = r.filter(backup => backup.metadata.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID] === this.id);
       }
 
       return r;

diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue
@@ -3,6 +3,7 @@ import ResourceTable from '@shell/components/ResourceTable';
 import { STATE, NAME, AGE } from '@shell/config/table-headers';
 import { allSettled } from '../../utils/promise';
 import { BACKUP_TYPE } from '../../config/types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { HCI } from '../../types';
 import { schema } from '../../list/harvesterhci.io.vmsnapshot';
 
@@ -58,7 +59,7 @@ export default {
       let r = this.rows.filter(row => row.spec?.type === BACKUP_TYPE.SNAPSHOT);
 
       if (this.id) {
-        r = r.filter(row => row.metadata.annotations?.['harvesterhci.io/svmbackupId'] === this.id);
+        r = r.filter(row => row.metadata.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID] === this.id);
       }
 
       return r;

diff --git a/pkg/harvester/dialog/HarvesterScheduleModal.vue b/pkg/harvester/dialog/HarvesterScheduleModal.vue
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
@@ -159,6 +159,10 @@ export default {
   },
 
   methods: {
+    cancelAction() {
+      this.$router.go(-1);
+    },
+
     async saveRestore(buttonCb) {
       this.update();
 
@@ -261,7 +265,7 @@ export default {
       />
     </div>
 
-    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="done" />
+    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="cancelAction" />
   </div>
 </template>
 

diff --git a/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue b/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
@@ -157,6 +157,9 @@ export default {
   },
 
   methods: {
+    cancelAction() {
+      this.$router.go(-1);
+    },
     async saveRestore(buttonCb) {
       this.update();
 
@@ -241,7 +244,7 @@ export default {
       <LabeledSelect v-if="!restoreNewVm" v-model="deletionPolicy" :label="t('harvester.backup.restore.deletePreviousVolumes')" :options="deletionPolicyOption" />
     </div>
 
-    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="done" />
+    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="cancelAction" />
   </div>
 </template>
 

diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js b/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
@@ -2,6 +2,7 @@ import { HCI } from '../types';
 import { get, clone } from '@shell/utils/object';
 import { findBy } from '@shell/utils/array';
 import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { _CREATE } from '@shell/config/query-params';
 import HarvesterResource from './harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
@@ -81,22 +82,29 @@ export default class HciVmBackup extends HarvesterResource {
 
   restoreExistingVM(resource = this) {
     const router = this.currentRouter();
+    const targetResource = resource.spec.type === BACKUP_TYPE.BACKUP ? HCI.BACKUP : HCI.VM_SNAPSHOT;
 
     router.push({
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
-      params: { resource: HCI.BACKUP },
-      query:  { restoreMode: 'existing', resourceName: resource.name }
+      params: { resource: targetResource },
+      query:  {
+        restoreMode:  'existing',
+        resourceName: resource.name,
+      }
     });
   }
 
   restoreNewVM(resource = this) {
-    // const route = this.currentRoute();
     const router = this.currentRouter();
+    const targetResource = resource.spec.type === BACKUP_TYPE.BACKUP ? HCI.BACKUP : HCI.VM_SNAPSHOT;
 
     router.push({
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
-      params: { resource: HCI.BACKUP },
-      query:  { restoreMode: 'new', resourceName: resource.name }
+      params: { resource: targetResource },
+      query:  {
+        restoreMode:  'new',
+        resourceName: resource.name,
+      }
     });
   }
 
@@ -123,8 +131,23 @@ export default class HciVmBackup extends HarvesterResource {
     return colorForState(state);
   }
 
+  getTargetResource(hash, route) {
+    if (hash === '') {
+      return route.params.resource;
+    }
+
+    switch (hash) {
+    case `#backups`:
+      return HCI.BACKUP;
+    case `#snapshots`:
+      return HCI.VM_SNAPSHOT;
+    default:
+      return route.params.resource;
+    }
+  }
+
   get sourceSchedule() {
-    return this.metadata?.annotations['harvesterhci.io/svmbackupId'];
+    return this.metadata?.annotations[HCI_ANNOTATIONS.SVM_BACKUP_ID];
   }
 
   get attachVM() {