feat(RHIF-283): extend CVE systems filter with edge #2002

mkholjuraev · 2023-10-10T20:40:58Z

Resolves: https://issues.redhat.com/browse/RHIF-283

We need to extend the filter options of the Systems filter on the CVEs table to have

1 or more Conventional systems (RPM-DNF)
1 or more Immutable (OSTree)
None

jira-linking · 2023-10-10T20:41:02Z

Commits missing Jira IDs:
90c6baa
8ce23d1
383b5b8
54244a1
fc4f0a6
e0a0084
6708801
f72f729
978b873
9d60037
02eb3c4

codecov-commenter · 2023-11-07T08:50:34Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (8ae3f66) 70.13% compared to head (02eb3c4) 71.42%.
Report is 7 commits behind head on master.

Files	Patch %	Lines
src/Components/SmartComponents/Dashbar/Dashbar.js	75.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2002      +/-   ##
==========================================
+ Coverage   70.13%   71.42%   +1.29%     
==========================================
  Files         127      127              
  Lines        3328     3353      +25     
  Branches     1019     1028       +9     
==========================================
+ Hits         2334     2395      +61     
+ Misses        994      958      -36

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bastilian · 2023-11-09T11:46:12Z

src/Components/SmartComponents/CVEs/CVEsTableToolbar.test.js

@@ -23,6 +23,11 @@ jest.mock('../../../Store/Actions/Actions', () => ({
    }) }
 ));

+jest.mock('../../../Helpers/Hooks', () => ({
+    ...jest.requireActual('../../../Helpers/Hooks'),
+    useFeatureFlag: () => true 


It would also make sense to add tests with the feature set to false.

We might also want to investigate a wrapper function that we can use to run tests with both the feature turned on and off without having to duplicate the tests.

bastilian · 2023-11-14T11:33:06Z

src/Components/SmartComponents/Reports/ReportsPage.test.js

@@ -9,7 +9,8 @@ import { useSelector } from 'react-redux';
 /* Mock function returning permissions */
 jest.mock('../../../Helpers/Hooks', () => ({
    ...jest.requireActual('../../../Helpers/Hooks'),
-    useRbac: () => [[true, true, true], false]
+    useRbac: () => [[true, true, true], false],
+    useFeatureFlag: () => true


The tests (all in this PR) should by default run with the feature turned off/false. and tests added for the feature should turn them on explicitly.

This way we can ensure that the functionality stays the same until the feature is realeased.

bastilian · 2023-11-14T11:34:57Z

src/Components/PresentationalComponents/Filters/PrimaryToolbarFilters/AffectingFilter.js

@@ -13,6 +13,7 @@ const affectingFilter = (apply, currentFilter = {}) => {
        });
    };

+    const filterItems = getAffectingFilterOptions(isEdgeParityEnabled);


It might be better to filter out the unwanted items with the feature turned off here and not have to pass down the feature flag into all the functions.

I also went this way so that I have minimal tech-debt. But there are multiple places where affecting filter values are used e.g. affecting filter, report custom filter, and chip builders. The changes were not clean to read and brought more tech debt. Thus, I changed the approach to use the feature flag in components so that when we get rid of the flag, we can easily remove the flags

mkholjuraev · 2023-11-14T15:29:17Z

@bastilian I have disabled the feature flag in the ReportPage test file.

bastilian · 2023-11-14T15:38:15Z

@mkholjuraev Yeah, but now there aren't any with it enabled, and just for this one test:

The tests (all in this PR) should by default run with the feature turned off/false. and tests added for the feature should turn them on explicitly.

mkholjuraev · 2023-11-17T09:52:12Z

src/Components/SmartComponents/Modals/ReportConfigModal.test.js

@@ -25,8 +25,14 @@ const customMiddleWare = store => next => action => {
    next(action);
 }

+jest.mock('../../../Helpers/Hooks', () => ({
+    ...jest.requireActual('../../../Helpers/Hooks'),
+    useHybridSystemFilterFlag: () => false 


I am planning to write meaningful tests for changes in ReportConficModal when I am working on RHIF-302.

bastilian · 2023-11-17T12:41:00Z

src/Components/SmartComponents/CVEs/CVEsTableToolbar.test.js

@@ -23,6 +25,11 @@ jest.mock('../../../Store/Actions/Actions', () => ({
    }) }
 ));

+jest.mock('../../../Helpers/Hooks', () => ({
+    ...jest.requireActual('../../../Helpers/Hooks'),
+    useHybridSystemFilterFlag: jest.fn(() => true)


Shouldn't this be default false as well and set to true only on line 232?

@bastilian Yup, I have made the change and also added test cases covering the flag is both off and on. PTAL

@bastilian can I ask for your review on this? Thanks

bastilian

LGTM! Thank you @mkholjuraev!

…ts#2002) Fixes https://issues.redhat.com/browse/ESSNTL-5253. This is another patch for ESSNTL-5253 that makes sure that all of the params are passed to the tabs components and the tabs are loaded correctly.

mkholjuraev requested a review from a team as a code owner October 10, 2023 20:40

mkholjuraev marked this pull request as draft October 10, 2023 20:41

mkholjuraev force-pushed the rhif-293 branch from 3a1057e to 95e040e Compare October 20, 2023 11:30

mkholjuraev force-pushed the rhif-293 branch 3 times, most recently from c6e0521 to a17db6a Compare November 6, 2023 12:02

mkholjuraev marked this pull request as ready for review November 7, 2023 14:24

bastilian reviewed Nov 9, 2023

View reviewed changes

mkholjuraev requested review from bastilian and a team November 10, 2023 23:02

mkholjuraev force-pushed the rhif-293 branch from 4de6731 to 8b5c364 Compare November 10, 2023 23:02

bastilian reviewed Nov 14, 2023

View reviewed changes

mkholjuraev requested a review from a team November 14, 2023 14:28

mkholjuraev added 9 commits November 16, 2023 16:02

chore(VulnerabilityRoutes): introduce loading state

90c6baa

feat(RHIF-283): extend CVE systems filter with edge

8ce23d1

fix(RHIF-283): change conventional and immutable filter titles

383b5b8

chore: adjust api request filter key according to flag status

54244a1

chore(tests): fix tests

fc4f0a6

chore(tests): add test coverage for flag disabled state

e0a0084

chore(tests): disaable mocked feature flag in ReportPage tests

6708801

WIP: chore(tests): reportsPage changes with tests

f72f729

chore(rhif-283): show extended filter only when there is edge

978b873

mkholjuraev force-pushed the rhif-293 branch from 37eea76 to 8e896b3 Compare November 16, 2023 15:03

mkholjuraev requested a review from bastilian November 16, 2023 15:04

mkholjuraev force-pushed the rhif-293 branch from 8e896b3 to 3a9fe9d Compare November 16, 2023 15:07

chore(tests): ReportsPage has tests finished.

9d60037

mkholjuraev force-pushed the rhif-293 branch from 3a9fe9d to 9d60037 Compare November 16, 2023 15:11

mkholjuraev commented Nov 17, 2023

View reviewed changes

bastilian reviewed Nov 17, 2023

View reviewed changes

chore(tests): improve tests for CVEsTableToolbar

02eb3c4

mkholjuraev requested a review from bastilian November 17, 2023 22:06

gkarat requested a review from a team November 21, 2023 09:49

gkarat assigned mkholjuraev Nov 21, 2023

gkarat added the enhancement New feature or request label Nov 21, 2023

bastilian approved these changes Nov 28, 2023

View reviewed changes

mkholjuraev merged commit acde36d into RedHatInsights:master Nov 29, 2023
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(RHIF-283): extend CVE systems filter with edge #2002

feat(RHIF-283): extend CVE systems filter with edge #2002

mkholjuraev commented Oct 10, 2023 •

edited

Loading

jira-linking bot commented Oct 10, 2023 •

edited

Loading

codecov-commenter commented Nov 7, 2023 •

edited

Loading

bastilian Nov 9, 2023

bastilian Nov 14, 2023

bastilian Nov 14, 2023

mkholjuraev Nov 14, 2023 •

edited

Loading

mkholjuraev commented Nov 14, 2023

bastilian commented Nov 14, 2023 •

edited

Loading

mkholjuraev Nov 17, 2023

bastilian Nov 17, 2023

mkholjuraev Nov 17, 2023

mkholjuraev Nov 23, 2023

bastilian left a comment

feat(RHIF-283): extend CVE systems filter with edge #2002

feat(RHIF-283): extend CVE systems filter with edge #2002

Conversation

mkholjuraev commented Oct 10, 2023 • edited Loading

jira-linking bot commented Oct 10, 2023 • edited Loading

codecov-commenter commented Nov 7, 2023 • edited Loading

Codecov Report

bastilian Nov 9, 2023

Choose a reason for hiding this comment

bastilian Nov 14, 2023

Choose a reason for hiding this comment

bastilian Nov 14, 2023

Choose a reason for hiding this comment

mkholjuraev Nov 14, 2023 • edited Loading

Choose a reason for hiding this comment

mkholjuraev commented Nov 14, 2023

bastilian commented Nov 14, 2023 • edited Loading

mkholjuraev Nov 17, 2023

Choose a reason for hiding this comment

bastilian Nov 17, 2023

Choose a reason for hiding this comment

mkholjuraev Nov 17, 2023

Choose a reason for hiding this comment

mkholjuraev Nov 23, 2023

Choose a reason for hiding this comment

bastilian left a comment

Choose a reason for hiding this comment

mkholjuraev commented Oct 10, 2023 •

edited

Loading

jira-linking bot commented Oct 10, 2023 •

edited

Loading

codecov-commenter commented Nov 7, 2023 •

edited

Loading

mkholjuraev Nov 14, 2023 •

edited

Loading

bastilian commented Nov 14, 2023 •

edited

Loading