Add ifHaveType for schedule page

Signed-off-by: andy.lee <andy.lee@suse.com>
harvester · Sep 24, 2024 · 6ab98fa · 6ab98fa
1 parent 759fefb
commit 6ab98fa
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 23 deletions.
diff --git a/pkg/harvester/config/harvester.js b/pkg/harvester/config/harvester.js
@@ -478,7 +478,8 @@ export function init($plugin, store) {
       name:   `${ PRODUCT_NAME }-c-cluster-resource`,
       params: { resource: HCI.SCHEDULE_VM_BACKUP }
     },
-    exact: false
+    exact:      false,
+    ifHaveType: HCI.SCHEDULE_VM_BACKUP,
   });
 
   configureType(HCI.BACKUP, { showListMasthead: false, showConfigView: false });

diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
@@ -11,7 +11,6 @@ import { HCI } from '../../../../types';
 import { formatSi, parseSi } from '@shell/utils/units';
 import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
 import { _VIEW } from '@shell/config/query-params';
-
 import { ucFirst } from '@shell/utils/string';
 
 export default {
@@ -101,6 +100,12 @@ export default {
       return image ? image.label : '-';
     },
 
+    readyToUse() {
+      const val = String(this.value.volumeBackups?.readyToUse || false);
+
+      return ucFirst(val);
+    },
+
     pvcsResource() {
       const allPVCs = this.$store.getters['harvester/all'](PVC) || [];
 
@@ -308,16 +313,13 @@ export default {
           :value="encryptionValue"
         />
       </div>
-      <div
-        v-if="value.volumeBackups"
-        class="col span-3"
-      >
-        <InputOrDisplay :name="t('harvester.virtualMachine.volume.readyToUse')" :value="value.volumeBackups.readyToUse" :mode="mode">
-          <LabelValue
-            :name="t('harvester.virtualMachine.volume.readyToUse')"
-            :value="value.volumeBackups.readyToUse"
-          />
-        </InputOrDisplay>
+    </div>
+    <div class="row mb-20">
+      <div v-if="value.volumeBackups && isView" class="col span-3">
+        <LabelValue
+          :name="t('harvester.virtualMachine.volume.readyToUse')"
+          :value="readyToUse"
+        />
       </div>
     </div>
     <Banner

diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue
@@ -65,9 +65,16 @@ export default {
       return ucFirst(String(this.value.isEncrypted));
     },
 
+    readyToUse() {
+      const val = String(this.value.volumeBackups?.readyToUse || false);
+
+      return ucFirst(val);
+    },
+
     isView() {
       return this.mode === _VIEW;
     },
+
     pvcsResource() {
       const allPVCs = this.$store.getters['harvester/all'](PVC) || [];
 
@@ -243,16 +250,13 @@ export default {
           :value="encryptionValue"
         />
       </div>
-      <div
-        v-if="value.volumeBackups"
-        class="col span-6"
-      >
-        <InputOrDisplay :name="t('harvester.virtualMachine.volume.readyToUse')" :value="value.volumeBackups.readyToUse" :mode="mode">
-          <LabelValue
-            :name="t('harvester.virtualMachine.volume.readyToUse')"
-            :value="value.volumeBackups.readyToUse"
-          />
-        </InputOrDisplay>
+    </div>
+    <div class="row mb-20">
+      <div v-if="value.volumeBackups && isView" class="col span-3">
+        <LabelValue
+          :name="t('harvester.virtualMachine.volume.readyToUse')"
+          :value="readyToUse"
+        />
       </div>
     </div>
     <Banner

diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
@@ -25,7 +25,6 @@ import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations
 import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { uniq } from '@shell/utils/array';
 import { parseVolumeClaimTemplates } from '../../utils/vm';
-import aardvark_blue from '../../../../../iTerm2-Color-Schemes/screenshots/aardvark_blue.png';
 
 export const MANAGEMENT_NETWORK = 'management Network';