Merge pull request #990 from akto-api-security/hotfix/fix_filters_on_api_changes

fixing null checks and adding filter operators for method header in a…

Author: notshivansh

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/component/ApiChangesTable.jsx

@@ -123,7 +123,7 @@ function ApiChangesTable(props) {
       selected={selected}
       onSelect={handleSelectedTab}
       mode={IndexFiltersMode.Default}
-      headings={tableDataObj.headers}
+      headings={tableDataObj.headings}
       useNewRow={true}
       condensedHeight={true}
       tableTabs={tableTabs}

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/data/apiChanges.js

@@ -121,6 +121,14 @@ const endpointResourceName = {
     plural: 'API endpoints',
 };
 
+const methodObj = [{
+    text: 'Method',
+    value: 'method',
+    filterKey: 'method',
+    showFilter: true,
+    textValue: 'method',
+}]
+
 const endpointSortOptions = [
     { label: 'Method', value: 'method asc', directionLabel: 'A-Z', sortKey: 'method' },
     { label: 'Method', value: 'method desc', directionLabel: 'Z-A', sortKey: 'method' },
@@ -180,13 +188,15 @@ const apiChangesData = {
     getData(key){
         if(key === 'param'){
             const obj = {
-                headers: newParametersHeaders,
+                headers: [...newParametersHeaders, ...methodObj],
+                headings: newParametersHeaders,
                 resourceName: parameterResourceName,
                 sortOptions: parameterSortOptions,
             }
             return obj;
         }else{
             const obj = {
+                headings: endpointHeadings,
                 headers: endpointHeadings,
                 resourceName: endpointResourceName,
                 sortOptions: endpointSortOptions,

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/SingleTestRunPage/TrendChart.jsx

@@ -64,10 +64,11 @@ function TrendChart(props) {
         items.forEach((x) => {
             let ts = x["startTimestamp"] * 1000
             let countIssuesMap = x["countIssues"]
-
-            retH.push([ts, countIssuesMap["HIGH"]])
-            retM.push([ts, countIssuesMap["MEDIUM"]])
-            retL.push([ts, countIssuesMap["LOW"]])
+            if(countIssuesMap && Object.keys(countIssuesMap).length > 0){
+                retH.push([ts, countIssuesMap["HIGH"]])
+                retM.push([ts, countIssuesMap["MEDIUM"]])
+                retL.push([ts, countIssuesMap["LOW"]])
+            }
         })
 
         return [
@@ -144,7 +145,7 @@ function TrendChart(props) {
 
             let count = 0
             testingRunResultSummaries.forEach((ele)=>{
-                let obj = Object.keys(ele.countIssues) ? ele.countIssues : {HIGH: 0, MEDIUM: 0, LOW: 0}
+                let obj = Object.keys(ele.countIssues).length > 0 ? ele.countIssues : {HIGH: 0, MEDIUM: 0, LOW: 0}
                 count += (obj.HIGH + obj.MEDIUM + obj.LOW)
             })