Skip to content

Fix VMware VM ingestion template selection and default template failure #8429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shwstppr merged 2 commits into from
Jan 5, 2024
Merged

Fix VMware VM ingestion template selection and default template failure #8429

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c82c6
UI: Fix VMware VM ingestion template selection
nvazquez Jan 2, 2024
09bcf41
Fixes on the default template import
nvazquez Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/views/tools/ImportUnmanagedInstance.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item name="templateid" ref="templateid" v-if="cluster.hypervisortype === 'KVM' && !selectedVmwareVcenter && !isDiskImport && !isExternalImport">
<a-form-item name="templateid" ref="templateid" v-if="cluster.hypervisortype === 'VMware' || (cluster.hypervisortype === 'KVM' && !selectedVmwareVcenter && !isDiskImport && !isExternalImport)">

@DaanHoogland DaanHoogland Jan 3, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be some kind of [].contains() structure, right?

Suggested change
<a-form-item name="templateid" ref="templateid" v-if="cluster.hypervisortype === 'VMware' || (cluster.hypervisortype === 'KVM' && !selectedVmwareVcenter && !isDiskImport && !isExternalImport)">
<a-form-item name="templateid" ref="templateid" v-if="['VMware', 'KVM'].contains(cluster.hypervisortype) && !selectedVmwareVcenter && !isDiskImport && !isExternalImport)">

?

@nvazquez nvazquez Jan 3, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry this is not the same condition, we always want to display if for VMware but for KVM only if !selectedVmwareVcenter && !isDiskImport && !isExternalImport

@harikrishna-patnala harikrishna-patnala Jan 4, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had the same question, thanks @nvazquez

@DaanHoogland DaanHoogland Jan 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha yes thanks @nvazquez. sorry about my crooked eyes. Maybe you can extract the condition to a method or otherwise make it a little more reader friendly?

@shwstppr shwstppr Jan 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nvazquez @DaanHoogland I'm merging this as it is as default template import is blocking testing for #8426 . Please open a new PR if the refactoring is needed here 🙏

<template #label>
<tooltip-label :title="$t('label.templatename')" :tooltip="apiParams.templateid.description + '. ' + $t('message.template.import.vm.temporary')"/>
</template>
Expand Down