add custom layout for preupgrade entries index because of fixable_count

kmalyjur · kmalyjur · commit 0c1d50a75742 · 2026-06-24T09:57:51.000-04:00
diff --git a/app/controllers/api/v2/preupgrade_report_entries_controller.rb b/app/controllers/api/v2/preupgrade_report_entries_controller.rb
@@ -9,6 +9,8 @@ class PreupgradeReportEntriesController < ::Api::V2::BaseController
       skip_before_action :store_redirect_to_url, :reset_redirect_to_url, raise: false
       before_action :find_preupgrade_report, if: -> { params[:preupgrade_report_id].present? }
 
+      layout 'api/v2/layouts/preupgrade_report_entries_index', only: :index
+
       api :GET, '/preupgrade_reports/:preupgrade_report_id/preupgrade_report_entries',
         N_('List entries for a specific preupgrade report')
       api :GET, '/preupgrade_report_entries', N_('List all preupgrade report entries')
@@ -19,6 +21,7 @@ def index
         @total = resource_scope.count
         @preupgrade_report_entries = resource_scope_for_index
         @subtotal = @preupgrade_report_entries.total_entries
+        @fixable_count = fixable_scope.count
       end
 
       api :GET, '/preupgrade_report_entries/auto_complete_search',
@@ -82,11 +85,14 @@ def resource_scope_for_index(options = {})
 
       private
 
-      def filtered_remediation_entries
+      def fixable_scope
         combined_search = [params[:search].presence, 'fix_type = command'].compact.join(' AND ')
-        entries = resource_scope.search_for(combined_search)
-        entries = entries.where.not(id: params[:excluded_ids]) if params[:excluded_ids].present?
-        entries
+        resource_scope.search_for(combined_search)
+      end
+
+      def filtered_remediation_entries
+        scope = fixable_scope
+        params[:excluded_ids].present? ? scope.where.not(id: params[:excluded_ids]) : scope
       end
 
       def target_host_ids(entries)
diff --git a/app/views/api/v2/layouts/preupgrade_report_entries_index.json.erb b/app/views/api/v2/layouts/preupgrade_report_entries_index.json.erb
@@ -0,0 +1,16 @@
+{
+  "total": <%= @total.to_json.html_safe %>,
+  "subtotal": <%= @subtotal.to_json.html_safe %>,
+  "fixable_count": <%= @fixable_count.to_json.html_safe %>,
+  "page": <%= params[:page].to_json.html_safe %>,
+  "per_page": <%= params[:per_page].to_json.html_safe %>,
+  "search": <%= params[:search].to_json.html_safe %>,
+<% if params.has_key?(:include_permissions) %>
+  <%= index_node_permissions_snippet.html_safe %>,
+<% end %>
+  "sort": {
+    "by": <%= params[:order].to_s.split.first.to_json.html_safe %>,
+    "order": <%= (params[:order].to_s.match?(/desc$/i) ? 'DESC' : 'ASC').to_json.html_safe %>
+  },
+  "<%= "#{root_node_name}" %>": <%= yield %>
+}
diff --git a/test/functional/api/v2/preupgrade_report_entries_controller_test.rb b/test/functional/api/v2/preupgrade_report_entries_controller_test.rb
@@ -22,6 +22,7 @@ class PreupgradeReportEntriesControllerTest < ActionController::TestCase
         assert_equal @entry.id, body['results'].first['id']
         assert_equal 1, body['total']
         assert_equal 1, body['subtotal']
+        assert body.key?('fixable_count'), "Expected 'fixable_count' field to be present"
       end
 
       test ':index response includes expected entry fields' do
@@ -85,6 +86,43 @@ class PreupgradeReportEntriesControllerTest < ActionController::TestCase
         assert_equal other.id, body['results'].first['id']
       end
 
+      test ':index returns fixable_count for entries with fix_type = command' do
+        FactoryBot.create(:preupgrade_report_entry, host: @host,
+          preupgrade_report: @report,
+          detail: { remediations: [{ type: 'command', context: ['yum', 'install', 'pkg'] }] })
+        FactoryBot.create(:preupgrade_report_entry, host: @host,
+          preupgrade_report: @report,
+          detail: { remediations: [{ type: 'command', context: ['yum', 'remove', 'pkg'] }] })
+        FactoryBot.create(:preupgrade_report_entry, host: @host,
+          preupgrade_report: @report,
+          detail: { remediations: [{ type: 'hint', context: 'Manual fix required' }] })
+
+        get :index, params: { preupgrade_report_id: @report.id }
+        assert_response :success
+
+        body = JSON.parse(@response.body)
+        assert_equal 4, body['total']
+        assert_equal 3, body['fixable_count']
+      end
+
+      test ':index fixable_count respects search filter' do
+        FactoryBot.create(:preupgrade_report_entry, host: @host,
+          preupgrade_report: @report,
+          title: 'Fixable issue AAA',
+          detail: { remediations: [{ type: 'command', context: ['fix', 'aaa'] }] })
+        FactoryBot.create(:preupgrade_report_entry, host: @host,
+          preupgrade_report: @report,
+          title: 'Fixable issue BBB',
+          detail: { remediations: [{ type: 'command', context: ['fix', 'bbb'] }] })
+
+        get :index, params: { preupgrade_report_id: @report.id, search: 'title ~ AAA' }
+        assert_response :success
+
+        body = JSON.parse(@response.body)
+        assert_equal 1, body['fixable_count']
+        assert_equal 1, body['subtotal']
+      end
+
       test ':index supports order parameter' do
         FactoryBot.create(:preupgrade_report_entry, host: @host,
           preupgrade_report: @report, title: 'AAAA sorts first')
diff --git a/webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js b/webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js
@@ -15,6 +15,7 @@ export const usePreupgradeTableState = (data, isExpanded) => {
   const [reportId, setReportId] = useState(null);
   const [rows, setRows] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
+  const [fixableCount, setFixableCount] = useState(0);
   const [searchValue, setSearchValue] = useState('');
   const [pagination, setPagination] = useState({
     page: 1,
@@ -98,6 +99,7 @@ export const usePreupgradeTableState = (data, isExpanded) => {
           const fetchedResults = payload.results;
           setRows(fetchedResults ? [].concat(fetchedResults) : []);
           setTotalCount(payload.subtotal ?? payload.total ?? 0);
+          setFixableCount(payload.fixable_count ?? 0);
           setStatus(STATUS.RESOLVED);
           setExpandedRowIds(new Set());
         },
@@ -150,6 +152,7 @@ export const usePreupgradeTableState = (data, isExpanded) => {
     reportId,
     rows,
     totalCount,
+    fixableCount,
     pagination,
     sortBy,
     searchValue,
diff --git a/webpack/components/PreupgradeReportsTable/__tests__/PreupgradeReportsTable.test.js b/webpack/components/PreupgradeReportsTable/__tests__/PreupgradeReportsTable.test.js
@@ -56,7 +56,7 @@ const mockEntries = Array.from({ length: 12 }, (_, i) => ({
   flags: i === 0 ? ['inhibitor'] : [],
   detail: {
     remediations:
-      i === 0
+      i === 0 || i === 3 || i === 4
         ? [{ type: 'command', context: ['echo', 'fix_command'] }]
         : i === 1
         ? [{ type: 'hint', context: 'Do something manually' }]
@@ -76,10 +76,14 @@ describe('PreupgradeReportsTable', () => {
           handleSuccess({ results: [{ id: mockReportId }] });
         }
         if (key.includes('GET_LEAPP_REPORT_ENTRIES')) {
+          const fixableCount = mockEntries.filter(
+            e => e.detail?.remediations?.some(r => r.type === 'command')
+          ).length;
           handleSuccess({
             id: mockReportId,
             results: mockEntries,
             total: mockEntries.length,
+            fixable_count: fixableCount,
           });
         }
         return { type: 'MOCK_API_SUCCESS' };
@@ -560,4 +564,140 @@ describe('PreupgradeReportsTable', () => {
       })
     );
   });
+
+  it('fetches and displays fixableCount from API response', async () => {
+    const mockFixableCount = 3;
+    APIActions.get.mockImplementation(({ key, handleSuccess }) => {
+      return () => {
+        if (key.includes('GET_LEAPP_REPORT_LIST')) {
+          handleSuccess({ results: [{ id: mockReportId }] });
+        }
+        if (key.includes('GET_LEAPP_REPORT_ENTRIES')) {
+          handleSuccess({
+            id: mockReportId,
+            results: mockEntries,
+            total: mockEntries.length,
+            subtotal: mockEntries.length,
+            fixable_count: mockFixableCount,
+          });
+        }
+        return { type: 'MOCK_API_SUCCESS' };
+      };
+    });
+
+    renderComponent();
+    expandSection();
+    await waitForTable();
+
+    const selectDropdown = screen.getByRole('button', { name: 'Select' });
+    fireEvent.click(selectDropdown);
+
+    await waitFor(() => {
+      const selectAllText = screen.getByText(/Select all \(3/i);
+      expect(selectAllText).toBeInTheDocument();
+    });
+  });
+
+  it('displays correct fixableCount when search filters are applied', async () => {
+    const mockFilteredFixableCount = 1;
+    APIActions.get.mockImplementation(({ key, handleSuccess, params }) => {
+      return () => {
+        if (key.includes('GET_LEAPP_REPORT_LIST')) {
+          handleSuccess({ results: [{ id: mockReportId }] });
+        }
+        if (key.includes('GET_LEAPP_REPORT_ENTRIES')) {
+          if (params?.search) {
+            handleSuccess({
+              id: mockReportId,
+              results: [mockEntries[0]], // Only one filtered result
+              total: mockEntries.length,
+              subtotal: 1,
+              fixable_count: mockFilteredFixableCount,
+            });
+          } else {
+            handleSuccess({
+              id: mockReportId,
+              results: mockEntries,
+              total: mockEntries.length,
+              subtotal: mockEntries.length,
+              fixable_count: 3,
+            });
+          }
+        }
+        return { type: 'MOCK_API_SUCCESS' };
+      };
+    });
+
+    renderComponent();
+    expandSection();
+    await waitForTable();
+
+    const input = screen.getByTestId('search-input');
+    fireEvent.change(input, { target: { value: 'title = "Report Entry 1"' } });
+    fireEvent.keyDown(input, { key: 'Enter' });
+
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+
+    const selectDropdown = screen.getByRole('button', { name: 'Select' });
+    fireEvent.click(selectDropdown);
+
+    await waitFor(() => {
+      const selectAllText = screen.getByText(/Select all \(1/i);
+      expect(selectAllText).toBeInTheDocument();
+    });
+  });
+
+  it('shows 0 fixable items when all entries are non-fixable (hint-only)', async () => {
+    APIActions.get.mockImplementation(({ key, handleSuccess }) => {
+      return () => {
+        if (key.includes('GET_LEAPP_REPORT_LIST')) {
+          handleSuccess({ results: [{ id: mockReportId }] });
+        }
+        if (key.includes('GET_LEAPP_REPORT_ENTRIES')) {
+          handleSuccess({
+            id: mockReportId,
+            results: [
+              {
+                id: 1,
+                title: 'Hint-only Entry 1',
+                hostname: 'test.com',
+                host_id: 100,
+                severity: 'low',
+                summary: 'Summary',
+                detail: {
+                  remediations: [{ type: 'hint', context: 'Manual fix required' }],
+                },
+              },
+              {
+                id: 2,
+                title: 'Hint-only Entry 2',
+                hostname: 'test.com',
+                host_id: 101,
+                severity: 'low',
+                summary: 'Summary',
+                detail: {
+                  remediations: [{ type: 'hint', context: 'Manual fix required' }],
+                },
+              },
+            ],
+            total: 2,
+            subtotal: 2,
+            fixable_count: 0,
+          });
+        }
+        return { type: 'MOCK_API_SUCCESS' };
+      };
+    });
+
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Hint-only Entry 1', { selector: 'td' }));
+
+    const checkboxes = screen.getAllByRole('checkbox');
+    checkboxes.forEach(checkbox => {
+      expect(checkbox).toBeDisabled();
+    });
+
+    expect(screen.getByRole('button', { name: 'Fix Selected' })).toBeDisabled();
+  });
 });
diff --git a/webpack/components/PreupgradeReportsTable/index.js b/webpack/components/PreupgradeReportsTable/index.js
@@ -91,6 +91,7 @@ const PreupgradeReportsTable = ({ data = {} }) => {
     reportId,
     rows,
     totalCount,
+    fixableCount,
     pagination,
     sortBy,
     searchValue,
@@ -178,7 +179,7 @@ const PreupgradeReportsTable = ({ data = {} }) => {
     metadata: {
       total: totalCount,
       page: pagination.page,
-      selectable: totalCount,
+      selectable: fixableCount,
     },
     initialSearchQuery: searchValue,
   });
@@ -372,7 +373,7 @@ const PreupgradeReportsTable = ({ data = {} }) => {
                   selectNone={selectNone}
                   selectedCount={selectedCount}
                   pageRowCount={pagedFixableEntries.length}
-                  totalCount={totalCount}
+                  totalCount={fixableCount}
                   areAllRowsOnPageSelected={areAllPageFixableSelected}
                   areAllRowsSelected={areAllRowsSelected()}
                   isDisabled={status === STATUS.PENDING || isSubmitting}
