Merge pull request #2206 from akto-api-security/hotfix/fix_store_capacity

Hotfix/fix store capacity

Author: Ark2307

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard/HomeDashboard.jsx

@@ -33,6 +33,7 @@ function HomeDashboard() {
     const [testSummaryInfo, setTestSummaryInfo] = useState([])
 
     const allCollections = PersistStore(state => state.allCollections)
+    const hostNameMap = PersistStore(state => state.hostNameMap)
     const coverageMap = PersistStore(state => state.coverageMap)
     const [authMap, setAuthMap] = useState({})
     const [apiTypesData, setApiTypesData] = useState([{ "data": [], "color": "#D6BBFB" }])
@@ -383,9 +384,9 @@ function HomeDashboard() {
     }
 
     function getCollectionsWithCoverage() {
-        const validCollections = allCollections.filter(collection => collection.hostName !== null && collection.hostName !== undefined && !collection.deactivated);
+        const validCollections = allCollections.filter(collection => hostNameMap.hasOwnProperty(collection.id) && !collection.deactivated);
 
-        const sortedCollections = validCollections.sort((a, b) => b.startTs - a.startTs);
+        const sortedCollections = validCollections.sort((a, b) => b?.startTs - a?.startTs);
 
         const result = sortedCollections.slice(0, 10).map(collection => {
             const apisTested = coverageMap[collection.id] || 0;

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx

@@ -769,7 +769,7 @@ function ApiCollections() {
     const tableComponent = (
         treeView ?
         <TreeViewTable
-            collectionsArr={normalData.filter((x) => x?.type !== "API_GROUP")}
+            collectionsArr={normalData.filter((x) => (!x?.deactivated && x?.type !== "API_GROUP"))}
             sortOptions={sortOptions}
             resourceName={resourceName}
             tableHeaders={headers.filter((x) => x.shouldMerge !== undefined)}

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx

@@ -154,6 +154,7 @@ function ApiEndpoints(props) {
     const setShowDetails = ObserveStore(state => state.setInventoryFlyout)
     const collectionsMap = PersistStore(state => state.collectionsMap)
     const allCollections = PersistStore(state => state.allCollections);
+    const hostNameMap = PersistStore(state => state.hostNameMap);
     const setCollectionsMap = PersistStore(state => state.setCollectionsMap)
     const setAllCollections = PersistStore(state => state.setAllCollections)
 
@@ -665,7 +666,7 @@ function ApiEndpoints(props) {
                                     </div> :
                                     null
                             }
-                            { !isApiGroup && !(collectionsObj?.hostName && collectionsObj?.hostName?.length > 0) ?
+                            { !isApiGroup && !(hostNameMap.hasOwnProperty(collectionsObj?.id)) ?
                                 <UploadFile
                                 fileFormat=".har"
                                 fileChanged={file => handleFileChange(file)}

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/default_payloads/DefaultPayloads.jsx

@@ -1,5 +1,4 @@
 import { Page, LegacyCard, TextField, VerticalStack, Button } from '@shopify/polaris'
-import Dropdown from '../../../components/layouts/Dropdown'
 import DropdownSearch from '../../../components/shared/DropdownSearch'
 import PersistStore from '@/apps/main/PersistStore';
 
@@ -9,14 +8,8 @@ import func from '@/util/func'
 import {useState, useEffect} from 'react'
 function DefaultPayloads() {
 
-    const allCollections = PersistStore(state => state.allCollections)
-    const allHostnames = allCollections.map(x => x.hostName).filter(x => x!=null)
-    const hostNameOptions = allHostnames.map(x => {
-        return {
-            label: x,
-            value: x
-        }
-    })
+    const hostNameMap = PersistStore(state => state.hostNameMap)
+    const allHostnames = Object.keys(hostNameMap)
 
 
     const [selectedDomain, setSelectedDomain] = useState('')

apps/dashboard/web/polaris_web/web/src/apps/main/PersistStore.js

@@ -37,7 +37,18 @@ let persistStore = (set) => ({
     setSubCategoryFromSourceConfigMap: (subCategoryFromSourceConfigMap) => set({ subCategoryFromSourceConfigMap }),
     setActive: (selected) => set({ active: selected }),
     setCollectionsMap: (collectionsMap) => set({ collectionsMap }),
-    setAllCollections: (allCollections) => set({ allCollections }),
+    setAllCollections: (allCollections) => {
+        const optimizedCollections = allCollections.map(({ id, displayName, urlsCount, deactivated, type, automated, startTs }) => ({
+            id,
+            displayName,
+            urlsCount,
+            deactivated, 
+            type,
+            automated,
+            startTs
+        }));
+        set({ allCollections: optimizedCollections });
+    },
     setHostNameMap: (hostNameMap) => set({ hostNameMap }),
     setLastFetchedInfo: (lastFetchedInfo) => set({ lastFetchedInfo }),
     setLastFetchedResp: (lastFetchedResp) => set({ lastFetchedResp }),