Merge pull request #1191 from akto-api-security/fix/fix_ui_bugs_for_t…

…esting Made changes for testing and issues
akto-api-security · Jun 14, 2024 · 8d67bc7 · 8d67bc7
2 parents f4433f3 + 96c1054
commit 8d67bc7
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/DonutChart.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/DonutChart.jsx
@@ -16,7 +16,6 @@ function DonutChart({data, title, size,type,navUrl}) {
     let seriesData = []
     if(data && Object.keys(data).length > 0){
         seriesData = Object.keys(data).map((ele)=>{
-
             return {...data[ele], y: data[ele].text, name: ele }
         })
     }
@@ -68,7 +67,6 @@ function DonutChart({data, title, size,type,navUrl}) {
                             }
                             else if( navUrl && navUrl==='/dashboard/issues/'){
                                 const filterUrl = '/dashboard/issues'
-
                                 let updatedFiltersMap = { ...filtersMap };
                                 updatedFiltersMap[filterUrl] = {}
 

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/GithubServerTable.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/GithubServerTable.js
@@ -111,12 +111,10 @@ function GithubServerTable(props) {
     tempData ? setData([...tempData.value]) : setData([])
     tempData ? setTotal(tempData.total) : setTotal(0)
     applyFilter(tempData.total)
-    if(!performance.getEntriesByType('navigation')[0].type === 'reload'){
-      setTableInitialState({
-        ...tableInitialState,
-        [currentPageKey]: tempData.total
-      })
-    }
+    setTableInitialState({
+      ...tableInitialState,
+      [currentPageKey]: tempData.total
+    })
   }
 
   useEffect(() => {

diff --git a/...ard/web/polaris_web/web/src/apps/dashboard/pages/dashboard/components/ActivityTracker.jsx b/...ard/web/polaris_web/web/src/apps/dashboard/pages/dashboard/components/ActivityTracker.jsx
@@ -52,9 +52,9 @@ function ActivityTracker({latestActivity, onLoadMore, showLoadMore, collections
 
         let updatedFiltersMap = { ...filtersMap }; 
 
-            const filterkey = '/dashboard/issues'
+            const filterKey = '/dashboard/issues'
 
-            const filterarray = [{
+            const filterArray = [{
               key: "severity",
               label: "High",
               value: ["HIGH"],
@@ -65,7 +65,7 @@ function ActivityTracker({latestActivity, onLoadMore, showLoadMore, collections
               value: [timestamp-10000],
             }]
 
-            updatedFiltersMap[filterkey] = {filters: filterarray, sort : []};
+            updatedFiltersMap[filterKey] = {filters: filterArray, sort : []};
 
 
         setFiltersMap(updatedFiltersMap)

diff --git a/...shboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunsPage/TestRunsPage.js b/...shboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunsPage/TestRunsPage.js
@@ -116,7 +116,7 @@ function TestRunsPage() {
 
   filters = func.getCollectionFilters(filters)
 
-const [currDateRange, dispatchCurrDateRange] = useReducer(produce((draft, action) => func.dateRangeReducer(draft, action)), values.ranges[3]);
+const [currDateRange, dispatchCurrDateRange] = useReducer(produce((draft, action) => func.dateRangeReducer(draft, action)), values.ranges[4]);
 const getTimeEpoch = (key) => {
     return Math.floor(Date.parse(currDateRange.period[key]) / 1000)
 }

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/transform.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/transform.js
@@ -681,14 +681,14 @@ convertSubIntoSubcategory(resp){
       obj[objectKey] = {
         text: resp[key],
         color: func.getColorForCharts(key),
-        filterkey: objectKeyName
+        filterKey: objectKeyName
       }
       countObj.HIGH+=resp[key]
     }else{
       obj[objectKey] = {
         text: resp[key],
         color: func.getColorForCharts(subCategoryMap[key].superCategory.name),
-        filterkey: objectKeyName
+        filterKey: objectKeyName
       }
       countObj[subCategoryMap[key].superCategory.severity._name]+=resp[key]
     }

diff --git a/apps/dashboard/web/polaris_web/web/src/util/values.js b/apps/dashboard/web/polaris_web/web/src/util/values.js
@@ -53,6 +53,21 @@ const ranges = [
             ),
             until: todayDayEnd,
         }
+    },
+    {
+        title: 'Last 1 year',
+        alias: "lastYear",
+        period:{
+            since: new Date(
+                new Date(new Date().setDate(today.getDate() - 365)).setHours(
+                    0,
+                    0,
+                    0,
+                    0
+                )
+            ),
+            until: todayDayEnd,
+        }
     }
 ];