From ac6388a9a229493dbca070ea32508b75086bd994 Mon Sep 17 00:00:00 2001 From: Francesco Torchia Date: Wed, 9 Oct 2024 17:44:21 +0200 Subject: [PATCH] Set inheritAttrs=false in Components using CruResource Signed-off-by: Francesco Torchia --- .../detail/harvesterhci.io.virtualmachinebackup/index.vue | 2 ++ pkg/harvester/detail/harvesterhci.io.vmsnapshot/index.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.addon/index.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.addon/rancher-vcluster.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.cloudtemplate.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.host/index.vue | 1 + pkg/harvester/edit/harvesterhci.io.keypair.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.logging.output.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.management.cluster.vue | 2 ++ .../harvesterhci.io.monitoring.alertmanagerconfig/index.vue | 2 ++ .../edit/harvesterhci.io.networkattachmentdefinition.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.secret.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.setting.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.storage/index.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue | 2 ++ .../edit/harvesterhci.io.virtualmachinetemplateversion.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.volume.vue | 2 ++ pkg/harvester/edit/harvesterhci.io.volumesnapshot.vue | 2 ++ pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue | 2 ++ .../edit/loadbalancer.harvesterhci.io.ippool/index.vue | 2 ++ .../edit/loadbalancer.harvesterhci.io.loadbalancer/index.vue | 2 ++ pkg/harvester/edit/management.cattle.io.project.vue | 3 +++ .../edit/network.harvesterhci.io.clusternetwork/index.vue | 2 ++ .../edit/network.harvesterhci.io.vlanconfig/index.vue | 2 ++ pkg/harvester/pages/c/_cluster/airgapupgrade/index.vue | 2 ++ 26 files changed, 52 insertions(+) diff --git a/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue b/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue index 14c98c2b..54fc81f3 100644 --- a/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue +++ b/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue @@ -36,6 +36,8 @@ export default { mixins: [CreateEditView, VM_MIXIN], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/detail/harvesterhci.io.vmsnapshot/index.vue b/pkg/harvester/detail/harvesterhci.io.vmsnapshot/index.vue index 80527424..ad14d74a 100644 --- a/pkg/harvester/detail/harvesterhci.io.vmsnapshot/index.vue +++ b/pkg/harvester/detail/harvesterhci.io.vmsnapshot/index.vue @@ -36,6 +36,8 @@ export default { mixins: [CreateEditView, VM_MIXIN], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.addon/index.vue b/pkg/harvester/edit/harvesterhci.io.addon/index.vue index fb3884ec..3bf65375 100644 --- a/pkg/harvester/edit/harvesterhci.io.addon/index.vue +++ b/pkg/harvester/edit/harvesterhci.io.addon/index.vue @@ -9,6 +9,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.addon/rancher-vcluster.vue b/pkg/harvester/edit/harvesterhci.io.addon/rancher-vcluster.vue index e7973b98..7d2aeac8 100644 --- a/pkg/harvester/edit/harvesterhci.io.addon/rancher-vcluster.vue +++ b/pkg/harvester/edit/harvesterhci.io.addon/rancher-vcluster.vue @@ -14,6 +14,8 @@ export default { name: 'EditAddonVcluster', components: { LabeledInput, RadioGroup }, + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.cloudtemplate.vue b/pkg/harvester/edit/harvesterhci.io.cloudtemplate.vue index 95fca5c9..b79b24e5 100644 --- a/pkg/harvester/edit/harvesterhci.io.cloudtemplate.vue +++ b/pkg/harvester/edit/harvesterhci.io.cloudtemplate.vue @@ -25,6 +25,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + data() { return { config: this.value.data?.cloudInit || '', diff --git a/pkg/harvester/edit/harvesterhci.io.host/index.vue b/pkg/harvester/edit/harvesterhci.io.host/index.vue index 555b51fc..a2960ff3 100644 --- a/pkg/harvester/edit/harvesterhci.io.host/index.vue +++ b/pkg/harvester/edit/harvesterhci.io.host/index.vue @@ -55,6 +55,7 @@ export default { MessageLink, }, mixins: [CreateEditView], + inheritAttrs: false, props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.keypair.vue b/pkg/harvester/edit/harvesterhci.io.keypair.vue index fd23a881..a513cc54 100644 --- a/pkg/harvester/edit/harvesterhci.io.keypair.vue +++ b/pkg/harvester/edit/harvesterhci.io.keypair.vue @@ -25,6 +25,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.logging.output.vue b/pkg/harvester/edit/harvesterhci.io.logging.output.vue index a1ef6c2a..ff0add21 100644 --- a/pkg/harvester/edit/harvesterhci.io.logging.output.vue +++ b/pkg/harvester/edit/harvesterhci.io.logging.output.vue @@ -31,6 +31,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + async fetch() { await this.$store.dispatch('harvester/findAll', { type: SECRET }); }, diff --git a/pkg/harvester/edit/harvesterhci.io.management.cluster.vue b/pkg/harvester/edit/harvesterhci.io.management.cluster.vue index 4943a788..93860b88 100644 --- a/pkg/harvester/edit/harvesterhci.io.management.cluster.vue +++ b/pkg/harvester/edit/harvesterhci.io.management.cluster.vue @@ -32,6 +32,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + props: { mode: { type: String, diff --git a/pkg/harvester/edit/harvesterhci.io.monitoring.alertmanagerconfig/index.vue b/pkg/harvester/edit/harvesterhci.io.monitoring.alertmanagerconfig/index.vue index 80213988..ec40027b 100644 --- a/pkg/harvester/edit/harvesterhci.io.monitoring.alertmanagerconfig/index.vue +++ b/pkg/harvester/edit/harvesterhci.io.monitoring.alertmanagerconfig/index.vue @@ -30,6 +30,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + async fetch() { const inStore = this.$store.getters['currentProduct'].inStore; const alertmanagerConfigId = this.value.id; diff --git a/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue b/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue index 02a70b97..8f816a55 100644 --- a/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue +++ b/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue @@ -30,6 +30,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue b/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue index 7b2f4196..2f0eca9d 100644 --- a/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue +++ b/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue @@ -31,6 +31,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + async fetch() { const hash = await allHash({ settings: this.$store.dispatch('harvester/findAll', { type: HCI.SETTING }), diff --git a/pkg/harvester/edit/harvesterhci.io.secret.vue b/pkg/harvester/edit/harvesterhci.io.secret.vue index 841d0474..b7a94c52 100644 --- a/pkg/harvester/edit/harvesterhci.io.secret.vue +++ b/pkg/harvester/edit/harvesterhci.io.secret.vue @@ -39,6 +39,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + async fetch() { if ( this.isCloud ) { this.nodeDrivers = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_DRIVER }); diff --git a/pkg/harvester/edit/harvesterhci.io.setting.vue b/pkg/harvester/edit/harvesterhci.io.setting.vue index 9b8af494..f6580f15 100644 --- a/pkg/harvester/edit/harvesterhci.io.setting.vue +++ b/pkg/harvester/edit/harvesterhci.io.setting.vue @@ -20,6 +20,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + data() { const t = this.$store.getters['i18n/t']; const setting = diff --git a/pkg/harvester/edit/harvesterhci.io.storage/index.vue b/pkg/harvester/edit/harvesterhci.io.storage/index.vue index def4b490..33bb9ad0 100644 --- a/pkg/harvester/edit/harvesterhci.io.storage/index.vue +++ b/pkg/harvester/edit/harvesterhci.io.storage/index.vue @@ -41,6 +41,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + data() { const reclaimPolicyOptions = [{ label: this.t('storageClass.customize.reclaimPolicy.delete'), diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue index fc50e6ee..46804723 100644 --- a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue +++ b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue @@ -27,6 +27,8 @@ const rawORqcow2 = 'raw_qcow2'; export default { name: 'EditImage', + inheritAttrs: false, + emits: ['update:value'], components: { diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue index d7f6e4a4..fe1b8645 100644 --- a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue +++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue @@ -53,6 +53,8 @@ export default { mixins: [CreateEditView, VM_MIXIN], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/harvesterhci.io.volume.vue b/pkg/harvester/edit/harvesterhci.io.volume.vue index d0e433e7..0882a72e 100644 --- a/pkg/harvester/edit/harvesterhci.io.volume.vue +++ b/pkg/harvester/edit/harvesterhci.io.volume.vue @@ -38,6 +38,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + async fetch() { const inStore = this.$store.getters['currentProduct'].inStore; const _hash = { diff --git a/pkg/harvester/edit/harvesterhci.io.volumesnapshot.vue b/pkg/harvester/edit/harvesterhci.io.volumesnapshot.vue index 517d5fde..4c71badb 100644 --- a/pkg/harvester/edit/harvesterhci.io.volumesnapshot.vue +++ b/pkg/harvester/edit/harvesterhci.io.volumesnapshot.vue @@ -24,6 +24,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + computed: { volume() { return this.volumes.find((V) => { diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue index ae1ceac8..a5cfad87 100644 --- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue +++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue @@ -78,6 +78,8 @@ export default { mixins: [CreateEditView, VM_MIXIN], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/loadbalancer.harvesterhci.io.ippool/index.vue b/pkg/harvester/edit/loadbalancer.harvesterhci.io.ippool/index.vue index 0b07ff8d..b2cf74fb 100644 --- a/pkg/harvester/edit/loadbalancer.harvesterhci.io.ippool/index.vue +++ b/pkg/harvester/edit/loadbalancer.harvesterhci.io.ippool/index.vue @@ -26,6 +26,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + async fetch() { const inStore = this.$store.getters['currentProduct'].inStore; diff --git a/pkg/harvester/edit/loadbalancer.harvesterhci.io.loadbalancer/index.vue b/pkg/harvester/edit/loadbalancer.harvesterhci.io.loadbalancer/index.vue index 9f076a09..410857a9 100644 --- a/pkg/harvester/edit/loadbalancer.harvesterhci.io.loadbalancer/index.vue +++ b/pkg/harvester/edit/loadbalancer.harvesterhci.io.loadbalancer/index.vue @@ -41,6 +41,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + props: { value: { type: Object, diff --git a/pkg/harvester/edit/management.cattle.io.project.vue b/pkg/harvester/edit/management.cattle.io.project.vue index a9027aa7..67bb9751 100644 --- a/pkg/harvester/edit/management.cattle.io.project.vue +++ b/pkg/harvester/edit/management.cattle.io.project.vue @@ -27,6 +27,9 @@ export default { }, mixins: [CreateEditView, FormValidation], + + inheritAttrs: false, + async fetch() { if ( this.$store.getters['management/canList'](MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE) ) { this.allPSPs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE }); diff --git a/pkg/harvester/edit/network.harvesterhci.io.clusternetwork/index.vue b/pkg/harvester/edit/network.harvesterhci.io.clusternetwork/index.vue index 3e1f8b7a..609dae2b 100644 --- a/pkg/harvester/edit/network.harvesterhci.io.clusternetwork/index.vue +++ b/pkg/harvester/edit/network.harvesterhci.io.clusternetwork/index.vue @@ -22,6 +22,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + computed: { doneLocationOverride() { return this.value.doneOverride; diff --git a/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue b/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue index 9d5cef6d..664ac0f9 100644 --- a/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue +++ b/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue @@ -43,6 +43,8 @@ export default { mixins: [CreateEditView], + inheritAttrs: false, + data() { const originNics = clone(this.value?.spec?.uplink?.nics || []); diff --git a/pkg/harvester/pages/c/_cluster/airgapupgrade/index.vue b/pkg/harvester/pages/c/_cluster/airgapupgrade/index.vue index f9a956fc..03356afa 100644 --- a/pkg/harvester/pages/c/_cluster/airgapupgrade/index.vue +++ b/pkg/harvester/pages/c/_cluster/airgapupgrade/index.vue @@ -25,6 +25,8 @@ export default { Checkbox, CruResource, LabeledSelect, LabeledInput, RadioGroup, UpgradeInfo }, + inheritAttrs: false, + async fetch() { await this.$store.dispatch('harvester/findAll', { type: HCI.IMAGE });