fix: stop calling unused api calls in the run test

akto-api-security · Nov 22, 2024 · e949fe4 · e949fe4
1 parent ddd1501
commit e949fe4
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 35 deletions.
diff --git a/...board/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiDetails.jsx b/...board/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiDetails.jsx
@@ -16,15 +16,11 @@ import PersistStore from "../../../../main/PersistStore";
 import values from "@/util/values";
 
 import { HorizontalDotsMinor, FileMinor } from "@shopify/polaris-icons"
-import LocalStore from "../../../../main/LocalStorageStore";
 
 function ApiDetails(props) {
 
     const { showDetails, setShowDetails, apiDetail, headers, getStatus, isGptActive } = props
 
-    const localCategoryMap = LocalStore.getState().categoryMap
-    const localSubCategoryMap = LocalStore.getState().subCategoryMap
-
     const [sampleData, setSampleData] = useState([])
     const [paramList, setParamList] = useState([])
     const [selectedUrl, setSelectedUrl] = useState({})
@@ -36,8 +32,6 @@ function ApiDetails(props) {
     const setSelectedSampleApi = PersistStore(state => state.setSelectedSampleApi)
     const [disabledTabs, setDisabledTabs] = useState([])
 
-    const [useLocalSubCategoryData, setUseLocalSubCategoryData] = useState(false)
-
     const statusFunc = getStatus ? getStatus : (x) => {
         try {
             if (paramList && paramList.length > 0 &&
@@ -136,13 +130,6 @@ function ApiDetails(props) {
     }
 
     useEffect(() => {
-        if (
-            (localCategoryMap && Object.keys(localCategoryMap).length > 0) &&
-            (localSubCategoryMap && Object.keys(localSubCategoryMap).length > 0)
-        ) {
-            setUseLocalSubCategoryData(true)
-        }
-
         fetchData();
     }, [apiDetail])
 
@@ -260,7 +247,7 @@ function ApiDetails(props) {
                     apiCollectionId={apiDetail["apiCollectionId"]}
                     endpoints={[apiDetail]}
                     filtered={true}
-                    useLocalSubCategoryData={useLocalSubCategoryData}
+                    useLocalData={true}
                 />
                 <Box>
                     <Tooltip content="Open URL in test editor" dismissOnMouseOut>

diff --git a/...ashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx b/...ashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx
@@ -9,9 +9,9 @@ import func from "@/util/func"
 import { useNavigate } from "react-router-dom"
 import PersistStore from "../../../../main/PersistStore";
 import transform from "../../testing/transform";
-import LocalStore from "../../../../main/LocalStorageStore";
+import ObserveStore from "../observeStore";
 
-function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOutside, closeRunTest, selectedResourcesForPrimaryAction, useLocalSubCategoryData }) {
+function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOutside, closeRunTest, selectedResourcesForPrimaryAction, useLocalData }) {
 
     const initialState = {
         categories: [],
@@ -66,8 +66,8 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
 
     const [testAlreadyRunning, setTestAlreadyRunning] = useState(false)
 
-    const localCategoryMap = LocalStore.getState().categoryMap
-    const localSubCategoryMap = LocalStore.getState().subCategoryMap
+    const runTestModalData = useLocalData ? ObserveStore(state => state.runTestModalData) : {}
+    const setRunTestModalData = ObserveStore(state => state.setRunTestModalData)
 
     function nameSuffixes(tests) {
         return Object.entries(tests)
@@ -91,29 +91,45 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
 
     async function fetchData() {
         setLoading(true)
+        let tempRunTestModalData = {}
 
-        observeApi.fetchSlackWebhooks().then((resp) => {
-            const apiTokenList = resp.apiTokenList
-            setSlackIntegrated(apiTokenList && apiTokenList.length > 0)
-        })
-
-        let metaDataObj = {
-            categories: [],
-            subCategories: [],
-            testSourceConfigs: []
+        if(runTestModalData.slackIntegrated != null) {
+            setSlackIntegrated(runTestModalData.slackIntegrated)
+        } else {
+            observeApi.fetchSlackWebhooks().then((resp) => {
+                const apiTokenList = resp.apiTokenList
+                setSlackIntegrated(apiTokenList && apiTokenList.length > 0)
+                tempRunTestModalData = {
+                    ...tempRunTestModalData,
+                    slackIntegrated: (apiTokenList && apiTokenList.length > 0)
+                }
+            })
         }
-        if(!useLocalSubCategoryData) {
-            metaDataObj = await transform.getAllSubcategoriesData(true, "runTests")
+
+        let metaDataObj = {}
+        if(runTestModalData.metaDataObj != null) {
+            metaDataObj = runTestModalData.metaDataObj
         } else {
-            metaDataObj = {
-                categories: Object.values(localCategoryMap),
-                subCategories: Object.values(localSubCategoryMap),
-                testSourceConfigs: []
+            metaDataObj = await transform.getAllSubcategoriesData(true, "runTests")
+            tempRunTestModalData = {
+                ...tempRunTestModalData,
+                metaDataObj
             }
         }
         let categories = metaDataObj.categories
         let businessLogicSubcategories = metaDataObj.subCategories
-        const testRolesResponse = await testingApi.fetchTestRoles()
+
+
+        let testRolesResponse
+        if(runTestModalData.testRolesResponse != null) {
+            testRolesResponse = runTestModalData.testRolesResponse
+        } else {
+            testRolesResponse = await testingApi.fetchTestRoles()
+            tempRunTestModalData = {
+                ...tempRunTestModalData,
+                testRolesResponse
+            }
+        }
         var testRoles = testRolesResponse.testRoles.map(testRole => {
             return {
                 "label": testRole.name,
@@ -145,7 +161,16 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
 
         //Auth Mechanism
         let authMechanismPresent = false
-        const authMechanismDataResponse = await testingApi.fetchAuthMechanismData()
+        let authMechanismDataResponse
+        if(runTestModalData.authMechanismDataResponse != null) {
+            authMechanismDataResponse = runTestModalData.authMechanismDataResponse
+        } else {
+            authMechanismDataResponse = await testingApi.fetchAuthMechanismData()
+            tempRunTestModalData = {
+                ...tempRunTestModalData,
+                authMechanismDataResponse
+            }
+        }
         if (authMechanismDataResponse.authMechanism)
             authMechanismPresent = true
 
@@ -158,6 +183,10 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
             authMechanismPresent: authMechanismPresent
         }))
 
+        if(tempRunTestModalData != null && Object.keys(tempRunTestModalData).length > 0) {
+            setRunTestModalData(tempRunTestModalData)
+        }
+
         setLoading(false)
     }
 

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/observeStore.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/observeStore.js
@@ -22,6 +22,11 @@ let observeStore = (set)=>({
     setSelectedUrl:(selectedUrl)=>{
         set({selectedUrl: selectedUrl})
     },
+
+    runTestModalData: {},
+    setRunTestModalData: (runTestModalData)=>{
+        set({runTestModalData: runTestModalData})
+    }
 })
 
 observeStore = devtools(observeStore)