Skip to content

ui: fix initial pagination for images in deploy forms #11349

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
merged 1 commit into from
Aug 1, 2025
Merged

ui: fix initial pagination for images in deploy forms #11349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ui/src/views/compute/CreateAutoScaleVmGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2980,10 +2980,10 @@ export default {
if (this.isModernImageSelection && this.form.guestoscategoryid && !['-1', '0'].includes(this.form.guestoscategoryid)) {
args.oscategoryid = this.form.guestoscategoryid
}
if (args.keyword || (args.category && args.category !== templateFilter)) {
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
args.page = 1
args.pageSize = args.pageSize || 10
}
args.pageSize = args.pageSize || 10
args.zoneid = _.get(this.zone, 'id')
if (this.isZoneSelectedMultiArch) {
args.arch = this.selectedArchitecture
Expand Down
8 changes: 4 additions & 4 deletions ui/src/views/compute/DeployVM.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,10 +2602,10 @@ export default {
if (this.isModernImageSelection && this.form.guestoscategoryid && !['-1', '0'].includes(this.form.guestoscategoryid)) {
args.oscategoryid = this.form.guestoscategoryid
}
if (args.keyword || (args.category && args.category !== templateFilter)) {
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
args.page = 1
args.pageSize = args.pageSize || 10
}
args.pageSize = args.pageSize || 10
args.zoneid = _.get(this.zone, 'id')
if (this.isZoneSelectedMultiArch) {
args.arch = this.selectedArchitecture
Expand Down Expand Up @@ -2640,10 +2640,10 @@ export default {
if (this.isModernImageSelection && this.form.guestoscategoryid) {
args.oscategoryid = this.form.guestoscategoryid
}
if (args.keyword || args.category !== isoFilter) {
if (!args.page || args.keyword || (args.category && args.category !== isoFilter)) {
args.page = 1
args.pageSize = args.pageSize || 10
}
args.pageSize = args.pageSize || 10
args.zoneid = _.get(this.zone, 'id')
if (this.isZoneSelectedMultiArch) {
args.arch = this.selectedArchitecture
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/compute/DeployVnfAppliance.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,10 +2546,10 @@ export default {
if (this.isModernImageSelection && this.form.guestoscategoryid && !['-1', '0'].includes(this.form.guestoscategoryid)) {
args.oscategoryid = this.form.guestoscategoryid
}
if (args.keyword || (args.category && args.category !== templateFilter)) {
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
args.page = 1
args.pageSize = args.pageSize || 10
}
args.pageSize = args.pageSize || 10
args.zoneid = _.get(this.zone, 'id')
if (this.isZoneSelectedMultiArch) {
args.arch = this.selectedArchitecture
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/compute/ReinstallVm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,10 @@ export default {
if (this.isModernImageSelection && this.selectedGuestOsCategoryId && !['-1', '0'].includes(this.selectedGuestOsCategoryId)) {
args.oscategoryid = this.selectedGuestOsCategoryId
}
if (args.keyword || (args.category && args.category !== templateFilter)) {
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
args.page = 1
args.pageSize = args.pageSize || 10
}
args.pageSize = args.pageSize || 10
args.zoneid = this.resource.zoneid
args.templatefilter = templateFilter
if (this.resource.arch) {
Expand Down
Loading