Merge pull request #1531 from akto-api-security/fix/testing_updates

Fixing testing bugs
akto-api-security · Sep 21, 2024 · f8ed0b0 · f8ed0b0
2 parents 9534801 + ea3f516
commit f8ed0b0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 191 deletions.
diff --git a/apps/dashboard/web/polaris_web/package-lock.json b/apps/dashboard/web/polaris_web/package-lock.json
diff --git a/apps/dashboard/web/polaris_web/package.json b/apps/dashboard/web/polaris_web/package.json
@@ -9,8 +9,6 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@mui/material": "^5.9.2",
     "@mui/x-date-pickers": "^5.0.0",
-    "@sentry/cli": "^2.25.0",
-    "@sentry/react": "^7.93.0",
     "@shopify/polaris": "^11.2.1",
     "@stigg/react-sdk": "^4.8.0",
     "@testing-library/jest-dom": "^5.16.5",

diff --git a/...eb/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx b/...eb/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx
@@ -48,7 +48,7 @@ function TestRoleSettings() {
     const [searchParams] = useSearchParams();
     const systemRole = searchParams.get("system")
 
-    const isDataInState = location?.state != undefined && Object.keys(location?.state).length > 0
+    const isDataInState = location.state && location?.state !== undefined && Object.keys(location?.state).length > 0
     const isDataInSearch = searchParams.get("name")
     const isNew = !isDataInState && !isDataInSearch
     const pageTitle = isNew ? "Add test role" : "Configure test role"
@@ -82,9 +82,7 @@ function TestRoleSettings() {
     }
     useEffect(() => {
         if (!isNew) {
-
             let newItems = initialItems
-
             if (isDataInState) {
                 newItems = location.state
                 setInitialItems(location.state);
@@ -127,7 +125,6 @@ function TestRoleSettings() {
     }
 
     const saveAction = async (updatedAuth=false, authWithCondLists = null) => {
-        setRefresh(!refresh)
         let andConditions = transform.filterContainsConditions(conditions, 'AND')
         let orConditions = transform.filterContainsConditions(conditions, 'OR')
         if (!(andConditions || orConditions) || roleName.length == 0) {
@@ -158,6 +155,9 @@ function TestRoleSettings() {
                 }
             }
         }
+        setTimeout(() => {
+            setRefresh(!refresh)
+        },200)
     }
 
     const handleTextChange = (val) => {

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/main/index.js b/apps/dashboard/web/polaris_web/web/src/apps/main/index.js
@@ -7,26 +7,6 @@ import en from "@shopify/polaris/locales/en.json";
 import { StiggProvider } from '@stigg/react-sdk';
 import "@shopify/polaris/build/esm/styles.css";
 import ExpiredApp from "./ExpiredApp"
-import * as Sentry from "@sentry/react";
-
-Sentry.init({
-  dsn: "https://ddf19fb1a875f83cfa3baa1a8efe35d0@o4506573945438208.ingest.sentry.io/4506574714306560",
-  integrations: [
-    new Sentry.BrowserTracing({
-      // Set 'tracePropagationTargets' to control for which URLs distributed tracing should be enabled
-      tracePropagationTargets: ["*"],
-    }),
-    new Sentry.Replay({
-      maskAllText: false,
-      blockAllMedia: false,
-    }),
-  ],
-  // Performance Monitoring
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-  // Session Replay
-  replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
-  replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.
-});
 
 const container = document.getElementById("root");
 const root = createRoot(container);

diff --git a/apps/testing/src/main/java/com/akto/testing/Main.java b/apps/testing/src/main/java/com/akto/testing/Main.java
@@ -40,6 +40,7 @@
 import com.akto.util.DashboardMode;
 import com.akto.util.EmailAccountName;
 import com.akto.util.enums.GlobalEnums;
+import com.akto.util.enums.GlobalEnums.Severity;
 import com.mongodb.BasicDBObject;
 import com.mongodb.ConnectionString;
 import com.mongodb.client.model.*;
@@ -70,6 +71,14 @@ public class Main {
     public static boolean SKIP_SSRF_CHECK = ("true".equalsIgnoreCase(System.getenv("SKIP_SSRF_CHECK")) || !DashboardMode.isSaasDeployment());
     public static final boolean IS_SAAS = "true".equalsIgnoreCase(System.getenv("IS_SAAS"));
 
+    private static Map<String, Integer> emptyCountIssuesMap = new HashMap<>();
+
+    static {
+        emptyCountIssuesMap.put(Severity.HIGH.toString(), 0);
+        emptyCountIssuesMap.put(Severity.MEDIUM.toString(), 0);
+        emptyCountIssuesMap.put(Severity.LOW.toString(), 0);
+    }
+
     private static TestingRunResultSummary createTRRSummaryIfAbsent(TestingRun testingRun, int start){
         ObjectId testingRunId = new ObjectId(testingRun.getHexId());
 
@@ -80,7 +89,9 @@ private static TestingRunResultSummary createTRRSummaryIfAbsent(TestingRun testi
                 ),
                 Updates.combine(
                         Updates.set(TestingRunResultSummary.STATE, TestingRun.State.RUNNING),
-                        Updates.setOnInsert(TestingRunResultSummary.START_TIMESTAMP, start)
+                        Updates.setOnInsert(TestingRunResultSummary.START_TIMESTAMP, start),
+                        Updates.set(TestingRunResultSummary.TEST_RESULTS_COUNT, 0),
+                        Updates.set(TestingRunResultSummary.COUNT_ISSUES, emptyCountIssuesMap)
                 ),
                 new FindOneAndUpdateOptions().upsert(true).returnDocument(ReturnDocument.AFTER)
         );
@@ -371,6 +382,8 @@ public void run() {
                                 trrs.setId(new ObjectId());
                                 trrs.setStartTimestamp(start);
                                 trrs.setState(State.RUNNING);
+                                trrs.setTestResultsCount(0);
+                                trrs.setCountIssues(emptyCountIssuesMap);
                                 TestingRunResultSummariesDao.instance.insertOne(trrs);
                                 summaryId = trrs.getId();
                             } else {