Fixes #39246 - Add sorting and searching to the new Leapp preupgrade report by kmalyjur · Pull Request #171 · theforeman/foreman_leapp

kmalyjur · 2026-04-22T10:23:02Z

I’d appreciate an extra pair of eyes on the backend to confirm it's good, because I'm not sure about some parts.

EDIT: Dependent on theforeman/foreman#11060

Before:

After:

Lukshio

The old sorting was more user friendly :/

Anyway there are some issues

I didn't find fix type in new filter.

kmalyjur · 2026-04-30T14:43:36Z

~~DON'T REVIEW NOW, IT'S WORK IN PROGRESS.~~
~~Thank you for the reviews. I made quite a lot of changes to the backend, and it currently doesn't work.~~

~~To-do: add test/functional/api/v2/preupgrade_report_entries_controller_test.rb~~

The old sorting was more user friendly :/

@Lukshio do you mean searching? In my opinion, the new version is more consistent with the rest of the tables.

Lukshio · 2026-05-03T19:50:14Z

DON'T REVIEW NOW, IT'S WORK IN PROGRESS.

Thank you for the reviews. I made quite a lot of changes to the backend, and it currently doesn't work.

To-do: add test/functional/api/v2/preupgrade_report_entries_controller_test.rb

The old sorting was more user friendly :/

@Lukshio do you mean searching? In my opinion, the new version is more consistent with the rest of the tables.

@kmalyjur Yes, I meant search, anyway I didn't find way how to search for "Fix type"

kmalyjur · 2026-05-05T13:05:11Z

@Lukshio @adamruzicka it's ready for a re-review now. (sorry for all the pushes, I had broken rubycop)

MariaAga · 2026-05-07T10:50:43Z

when changing pages, the toolbar items disappear for a second

Lukshio

Changing filters causes buttons to disapear.

Expadning some rows with long title causes columns to change its width

I would prefer to have the column names in one row as with expanded items.

kmalyjur · 2026-05-07T17:41:29Z

I fixed all the issues except for this one:

I would prefer to have the column names in one row as with expanded items.

@Lukshio I didn't see it before, is it okay now?

kmalyjur · 2026-06-25T09:10:02Z

Added a custom layout for the preupgrade entries index endpoint to include fixable_count in the response. This
allows the frontend to show the correct count of fixable entries (those with fix_type = command) in the bulk
selection dropdown without affecting other API responses.

…report

kmalyjur · 2026-06-25T10:01:25Z

Snaps has to be replaced by RTL (PreupgradeReports/components/snapshots/NoReports.test.js.snap)

I replaced this one test, however, I don't think it's necessary to replace the rest (13) of them, because they are going to be deleted when deleting the legacy leapp table. @Lukshio what do you think?

Rebased.

Lukshio · 2026-06-25T11:31:18Z

I replaced this one test, however, I don't think it's necessary to replace the rest (13) of them, because they are going to be deleted when deleting the legacy leapp table. @Lukshio what do you think?

Sure, leave it as it is.

adamruzicka

I'm not a huge fan of the custom layout. Normally I'd argue that those things will eventually deviate from the original they're supposed to be extending, but this one already does. Additionally I'd be worried that if the original changes, noone will remember to update this.

If this is strictly about showing the count when you select all, could that count be retrieved on demand? Once the user clicks that checkbox, it would make a call to the index endpoint and explicitly ask for fixable issues (maybe with per_page=0 since we just need the count)?

adamruzicka · 2026-06-29T10:26:13Z

+      protected
+
+      def model_of_controller
+        resource_scope


Judging by the method name, shouldn't this be "just" PreupgradeReportEntry?

…able_count" This reverts commit 71e7469.

kmalyjur · 2026-07-01T10:22:17Z

It is now fetching the accurate count of fixable entries only when the user clicks "Select All". The commit 71e7469 using a custom layout was reverted.
This PR is now dependent on theforeman/foreman#11060.

Lukshio · 2026-07-01T12:21:47Z

@kmalyjur Can you please provide screenshots/video of the issue with 0 select? I am probably not seeing/understanding the issue correctly

kmalyjur · 2026-07-01T13:32:56Z

@Lukshio Without the foreman core commit, the fixableCount is initially null, SelectAllCheckbox would use its default value of 0. This makes the "Select all" dropdown option disabled (isDisabled={totalCount === 0 || areAllRowsSelected}) even though fixable items exist - it just hasn't fetched the count yet.

Screen.Recording.2026-07-01.at.15.22.40.mov

Lukshio · 2026-07-01T17:53:31Z

-    () => rawSelectedIds.filter(id => validFixableIds.includes(id)),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [rawSelectedIds.join(','), validFixableIds]
+  const selectAll = useCallback(


its causing number glitching between total and subtotal.

Screencast_20260701_190714.mp4

Lukshio

Core PR merged, changes looks good, packit tested

Lukshio · 2026-07-03T10:45:56Z

Thanks @kmalyjur @adamruzicka

adamruzicka reviewed Apr 22, 2026

View reviewed changes

Comment thread app/controllers/api/v2/preupgrade_reports_controller.rb Outdated

This was referenced Apr 28, 2026

WIP: Add sorting and searching to new leapp preupgrade report #168

Closed

Fixes #39128 - Add checkboxes + actions to the new Leapp preupgrade report #169

Merged

kmalyjur force-pushed the job-inv-leapp-filter branch from 7f9dd42 to 839459c Compare April 29, 2026 14:27

Lukshio self-assigned this Apr 29, 2026

adamruzicka reviewed Apr 29, 2026

View reviewed changes

Comment thread app/controllers/preupgrade_report_entries_controller.rb Outdated

Comment thread app/controllers/preupgrade_report_entries_controller.rb Outdated

kmalyjur force-pushed the job-inv-leapp-filter branch from 839459c to 9c13592 Compare April 29, 2026 14:58

Lukshio requested changes Apr 29, 2026

View reviewed changes

Comment thread app/views/api/v2/preupgrade_report_entries/index.json.rabl Outdated

Comment thread webpack/components/PreupgradeReportsTable/index.js Outdated

Comment thread webpack/components/PreupgradeReportsTable/index.js Outdated

pr-processor Bot added the Waiting on contributor label Apr 29, 2026

kmalyjur force-pushed the job-inv-leapp-filter branch 3 times, most recently from cf0a4d1 to 05b5b8a Compare April 30, 2026 14:34

kmalyjur force-pushed the job-inv-leapp-filter branch from 05b5b8a to 9c4945f Compare April 30, 2026 15:09

kmalyjur marked this pull request as draft May 4, 2026 08:33

kmalyjur force-pushed the job-inv-leapp-filter branch 4 times, most recently from f93e38d to d5da017 Compare May 5, 2026 13:01

kmalyjur marked this pull request as ready for review May 5, 2026 13:02

kmalyjur requested review from Lukshio and adamruzicka May 5, 2026 13:02

kmalyjur force-pushed the job-inv-leapp-filter branch from d5da017 to c22140f Compare May 7, 2026 10:48

Lukshio requested changes May 7, 2026

View reviewed changes

Comment thread app/controllers/preupgrade_report_entries_controller.rb Outdated

Comment thread webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js Outdated

Comment thread webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js

kmalyjur force-pushed the job-inv-leapp-filter branch from c22140f to 4ce7bf4 Compare May 7, 2026 17:39

kmalyjur requested a review from Lukshio May 7, 2026 17:41

kmalyjur added 6 commits June 25, 2026 05:48

Fixes #39246 - Add sorting and searching to the new Leapp preupgrade …

03ad055

…report

fix bulk_remediate and remove div

5ab4fd7

address code review

4f667dc

fix "Fix Selected" with no fixable entries + replace redux-mock-store

9b41075

add custom layout for preupgrade entries index because of fixable_count

71e7469

replace NoReports snapshot test with RTL

4c7cf07

kmalyjur force-pushed the job-inv-leapp-filter branch from e45ccd2 to 4c7cf07 Compare June 25, 2026 09:50

adamruzicka reviewed Jun 29, 2026

View reviewed changes

Revert "add custom layout for preupgrade entries index because of fix…

982e31a

…able_count" This reverts commit 71e7469.

kmalyjur mentioned this pull request Jun 30, 2026

Fixes #39475 - Hide count in SelectAllCheckbox when unavailable theforeman/foreman#11060

Merged

fetch fixable count on demand for Select All

3721906

fix PreupgradeReportsTable.test.js

59cf0be

Lukshio requested changes Jul 1, 2026

View reviewed changes

pr-processor Bot added the Waiting on contributor label Jul 1, 2026

fix SelectAllCheckbox count glitch and invalid prop

ab900db

kmalyjur removed the Waiting on contributor label Jul 2, 2026

kmalyjur requested a review from Lukshio July 2, 2026 08:55

kmalyjur added 2 commits July 2, 2026 05:11

fix PreupgradeReportsTable.test.js

cf9031e

review fix - SelectAllCheckbox in model_of_controller

8e566f5

Lukshio reviewed Jul 2, 2026

View reviewed changes

Comment thread webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js Outdated

fix subtotal fallback in pagination count

ebbe407

Lukshio approved these changes Jul 3, 2026

View reviewed changes

Lukshio merged commit 146d843 into theforeman:master Jul 3, 2026
16 checks passed

Uh oh!

Conversation

kmalyjur commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Lukshio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kmalyjur commented Apr 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Lukshio commented May 3, 2026

DON'T REVIEW NOW, IT'S WORK IN PROGRESS.

Uh oh!

kmalyjur commented May 5, 2026

Uh oh!

MariaAga commented May 7, 2026

Uh oh!

Lukshio left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kmalyjur commented May 7, 2026

Uh oh!

kmalyjur commented Jun 25, 2026

Uh oh!

kmalyjur commented Jun 25, 2026

Uh oh!

Lukshio commented Jun 25, 2026

Uh oh!

adamruzicka left a comment

Choose a reason for hiding this comment

Uh oh!

adamruzicka Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

kmalyjur commented Jul 1, 2026

Uh oh!

Lukshio commented Jul 1, 2026

Uh oh!

kmalyjur commented Jul 1, 2026

Uh oh!

Uh oh!

Lukshio Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Lukshio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Lukshio commented Jul 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kmalyjur commented Apr 22, 2026 •

edited

Loading

kmalyjur commented Apr 30, 2026 •

edited

Loading

Lukshio left a comment •

edited

Loading