Only show report page advisory filter/column when FF is enabled

RedHatInsights · Jul 31, 2023 · 1d8a227 · 1d8a227
1 parent 7707261
commit 1d8a227
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 370 deletions.
diff --git a/src/Components/SmartComponents/Modals/ReportConfigModal.js b/src/Components/SmartComponents/Modals/ReportConfigModal.js
@@ -42,14 +42,15 @@ const ReportConfigModal = ({
     setReportTitle,
     inheritGlobalTags,
     setInheritGlobalTags,
-    globalFilterTags
+    globalFilterTags,
+    cvesWithoutErrata
 }) => {
     const dispatch = useDispatch();
     const [includeAllColumns, setIncludeAllColumns] = useState(true);
     const operatingSystems = useSelector(({ ReportsPageStore }) => ReportsPageStore?.operatingSystems?.data);
     const osGroups = buildOSGroups(operatingSystems || []);
 
-    const activeFilters = [
+    const ACTIVE_FILTERS = [
         'rule_presence',
         'known_exploit',
         'impact',
@@ -58,7 +59,7 @@ const ReportConfigModal = ({
         'status_id',
         'publish_date',
         'rhel_version',
-        'advisory_available'
+        ...cvesWithoutErrata ? ['advisory_available'] : []
     ];
 
     const handleCheckboxChange = (parameter, value) => {
@@ -130,28 +131,27 @@ const ReportConfigModal = ({
                     label={intl.formatMessage(messages.customReportFilterDataByLabel)}
                 >
                     <div className="custom-report-select-wrapper">
-                        {activeFilters &&
-                            activeFilters.map((filterId) => {
-                                return (
-                                    CVE_REPORT_FILTERS[filterId]?.component({
-                                        ...CVE_REPORT_FILTERS[filterId],
-                                        filterData,
-                                        setFilterData,
-                                        selectProps: {
-                                            className: 'pf-u-mr-sm pf-u-mb-sm',
-                                            ...CVE_REPORT_FILTERS[filterId].selectProps
-                                        },
-                                        options: CVE_REPORT_FILTERS[filterId].items,
-                                        filterId,
-                                        filterName: CVE_REPORT_FILTERS[filterId].title,
-                                        ...(filterId === 'rhel_version' ? {
-                                            // overriding parameters specific to the OS filter
-                                            options: Object.values(osGroups).flat(),
-                                            groups: osGroups
-                                        } : {})
-                                    })
-                                );
-                            })}
+                        {ACTIVE_FILTERS.map((filterId) => {
+                            return (
+                                CVE_REPORT_FILTERS[filterId]?.component({
+                                    ...CVE_REPORT_FILTERS[filterId],
+                                    filterData,
+                                    setFilterData,
+                                    selectProps: {
+                                        className: 'pf-u-mr-sm pf-u-mb-sm',
+                                        ...CVE_REPORT_FILTERS[filterId].selectProps
+                                    },
+                                    options: CVE_REPORT_FILTERS[filterId].items,
+                                    filterId,
+                                    filterName: CVE_REPORT_FILTERS[filterId].title,
+                                    ...(filterId === 'rhel_version' ? {
+                                        // overriding parameters specific to the OS filter
+                                        options: Object.values(osGroups).flat(),
+                                        groups: osGroups
+                                    } : {})
+                                })
+                            );
+                        })}
                     </div>
                 </FormGroup>
                 <FormGroup
@@ -202,6 +202,7 @@ const ReportConfigModal = ({
                             />
                             {
                                 Object.entries(CVE_REPORT_FILTERS)
+                                    .filter(([key]) => cvesWithoutErrata || key !== 'advisory_available')
                                     .filter(([, value]) => value.hasColumn !== false)
                                     .map(([key, value]) =>
                                         <Checkbox
@@ -268,7 +269,8 @@ ReportConfigModal.propTypes = {
     setReportTitle: propTypes.func,
     inheritGlobalTags: propTypes.bool,
     setInheritGlobalTags: propTypes.func,
-    globalFilterTags: propTypes.array
+    globalFilterTags: propTypes.array,
+    cvesWithoutErrata: propTypes.bool
 };
 
 export default ReportConfigModal;