Revert "chore: Correct prop types (#1720)" (#1727)

This reverts commit 0eb04ef.
RedHatInsights · Jul 20, 2022 · e5421e7 · e5421e7
1 parent 0eb04ef
commit e5421e7
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/src/Components/PresentationalComponents/AdvisoryColumn/AdvisoryColumn.js b/src/Components/PresentationalComponents/AdvisoryColumn/AdvisoryColumn.js
@@ -14,9 +14,9 @@ const AdvisoryColumn = ({ cve, advisoriesList, linkToCustomerPortal }) => {
     return (
         advisoriesList?.length > 0
             ? (
-                advisoriesList.map((advisory, index) =>
+                advisoriesList.map((advisory, _i) =>
                     <a
-                        key={`a_${index}`}
+                        key={_i}
                         href={linkToCustomerPortal
                             ? `${CUSTOMER_PORTAL_ADVISORY_PATH}/${advisory}`
                             : `${PATCHMAN_ADVISORY_PATH}/${advisory}`
@@ -26,7 +26,7 @@ const AdvisoryColumn = ({ cve, advisoriesList, linkToCustomerPortal }) => {
                     >
                         {advisory}
                     </a>
-                ).reduce((prev, curr, index) => [prev, ', ', <br key={`br_${index}`}/>, curr])
+                ).reduce((prev, curr, index) => [prev, ', ', <br key={index}/>, curr])
             ) : (
                 <Fragment>
                     <FormattedMessage {...messages.notAvailable} />

diff --git a/src/Components/PresentationalComponents/Filters/CustomFilters/TagFilter.js b/src/Components/PresentationalComponents/Filters/CustomFilters/TagFilter.js
@@ -20,7 +20,7 @@ const TagFilter = ({ selectedTags, setSelectedTags, onEdit, globalTags }) => {
 
     const [isLoading, setLoading] = useState(true);
     const [tags, setTags] = useState([]);
-    const [totalItemsCount, setTotalItemsCount] = useState(0);
+    const [totalItemsCount, setTotalItemsCount] = useState([]);
     const [page, setPage] = useState(1);
     const [perPage, setPerPage] = useState(10);
     const [tagSearch, setTagSearch] = useState('');

diff --git a/src/Components/PresentationalComponents/Sorters/CustomSorters/SelectCustomSorter.js b/src/Components/PresentationalComponents/Sorters/CustomSorters/SelectCustomSorter.js
@@ -32,7 +32,7 @@ const SelectCustomSorter = ({ sorterData, setSorterData, selectProps, options })
 };
 
 SelectCustomSorter.propTypes = {
-    sorterData: propTypes.string,
+    sorterData: propTypes.object,
     setSorterData: propTypes.func,
     selectProps: propTypes.object,
     options: propTypes.array

diff --git a/src/Components/SmartComponents/Modals/ReportConfigModal.js b/src/Components/SmartComponents/Modals/ReportConfigModal.js
@@ -239,7 +239,7 @@ const ReportConfigModal = ({
 ReportConfigModal.propTypes = {
     isOpen: propTypes.bool,
     filterData: propTypes.object,
-    sorterData: propTypes.oneOf(CUSTOM_REPORT_SORT_OPTIONS.map(option => option.value)),
+    sorterData: propTypes.object,
     setFilterData: propTypes.func,
     setSorterData: propTypes.func,
     handleModalClose: propTypes.func,

diff --git a/src/Components/SmartComponents/Modals/__snapshots__/ReportConfigModal.test.js.snap b/src/Components/SmartComponents/Modals/__snapshots__/ReportConfigModal.test.js.snap
@@ -2825,7 +2825,7 @@ exports[`Report config modal component Should match snapshots 1`] = `
                                             onUpdateData={[Function]}
                                             pagination={
                                               Object {
-                                                "count": 0,
+                                                "count": Array [],
                                                 "page": 1,
                                                 "perPage": 10,
                                               }

diff --git a/src/Components/SmartComponents/Remediation/Remediation.js b/src/Components/SmartComponents/Remediation/Remediation.js
@@ -74,7 +74,7 @@ const Remediation = ({ cves, systems, manyRules, isDisabled }) => {
 Remediation.propTypes = {
     cves: propTypes.oneOfType([
         propTypes.array,
-        propTypes.object
+        propTypes.string
     ]),
     systems: propTypes.oneOfType([
         propTypes.array,

diff --git a/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTableToolbar.js b/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTableToolbar.js
@@ -147,7 +147,7 @@ SystemsExposedTableToolbar.propTypes = {
     parameters: propTypes.object,
     cveName: propTypes.string,
     cveStatusDetails: propTypes.object,
-    filterRuleValues: propTypes.array,
+    filterRuleValues: propTypes.object,
     expandAll: propTypes.func,
     hasSecurityRule: propTypes.bool,
     isAllExpanded: propTypes.bool,

diff --git a/src/Helpers/Hooks.js b/src/Helpers/Hooks.js
@@ -21,7 +21,7 @@ export const useNotification = (config) => {
 
     useEffect(() => {
         return () => {
-            if (!config?.preventClear) {
+            if (!config.preventClear) {
                 dispatch(clearNotificationsFEC());
             }
         };
@@ -220,7 +220,7 @@ export const useRbac = (requestedPermissions, app = 'vulnerability') => {
     }, []);
 
     if (loading) {
-        return [requestedPermissions.map(() => true), true];
+        return [requestedPermissions.map(() => []), true];
     }
 
     return [requestedPermissions.map(requestedPermission =>

diff --git a/src/Utilities/Routes.js b/src/Utilities/Routes.js
@@ -68,14 +68,13 @@ const InsightsRoute = ({ component: Component, title, ...rest }) => {
 };
 
 InsightsRoute.propTypes = {
-    component: Route.propTypes.component,
+    component: PropTypes.func,
     title: PropTypes.string
 };
 
 export const Routes = () => {
     let location = useLocation();
     let path = location.pathname;
-
     return (
         // TODO: Discuss with UX some nice loading placeholder
         <Suspense fallback={Fragment}>