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

Removing deactivated collections from storage

Author: Ark2307

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js

@@ -11,7 +11,6 @@ import SemiCircleProgress from '../../shared/SemiCircleProgress';
 import { usePolling } from '../../../../main/PollingProvider';
 import { debounce } from 'lodash';
 import LocalStore from '../../../../main/LocalStorageStore';
-import homeFunctions from '../../../../dashboard/pages/home/module';
 
 function ContentWithIcon({icon,text, isAvatar= false}) {
     return(
@@ -40,7 +39,6 @@ export default function Header() {
 
     const allRoutes = Store((state) => state.allRoutes)
     const allCollections = PersistStore((state) => state.allCollections)
-    const setAllCollections = PersistStore(state => state.setAllCollections)
     var searchItemsArr = useMemo(() => func.getSearchItemsArr(allRoutes, allCollections), [])
     const [filteredItemsArr, setFilteredItemsArr] = useState(searchItemsArr)
     const toggleIsUserMenuOpen = useCallback(
@@ -65,15 +63,8 @@ export default function Header() {
     }
 
     const debouncedSearch = debounce(async (searchQuery) => {
-
-        let apiCollections = []
-        if (allCollections.length === 0 && searchItemsArr.length === 0) {
-            apiCollections = await homeFunctions.getAllCollections()
-            setAllCollections(apiCollections)
-        }
-
         if (searchItemsArr.length === 0) {
-            searchItemsArr = func.getSearchItemsArr(allRoutes, apiCollections)
+            searchItemsArr = func.getSearchItemsArr(allRoutes, allCollections)
         }
 
         if(searchQuery.length === 0){

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

@@ -42,6 +42,7 @@ function Dashboard() {
     const setSendEventOnLogin = LocalStore(state => state.setSendEventOnLogin)
     const fetchAllCollections = async () => {
         let apiCollections = await homeFunctions.getAllCollections()
+        apiCollections = apiCollections.filter((x) => x?.deactivated !== true)
         const allCollectionsMap = func.mapCollectionIdToName(apiCollections)
         const allHostNameMap = func.mapCollectionIdToHostName(apiCollections)
         setHostNameMap(allHostNameMap)

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

@@ -306,7 +306,7 @@ function ApiCollections() {
             envTypeObj[c.id] = c.envType
         })
         setEnvTypeMap(envTypeObj)
-        setAllCollections(apiCollectionsResp.apiCollections || [])
+        setAllCollections(apiCollectionsResp.apiCollections.filter(x => x?.deactivated !== true) || [])
 
         const shouldCallHeavyApis = (func.timeNow() - lastFetchedInfo.lastRiskScoreInfo) >= (5 * 60)
         // const shouldCallHeavyApis = false;
@@ -425,8 +425,8 @@ function ApiCollections() {
         summary.totalSensitiveEndpoints = sensitiveInfo.sensitiveUrls
         setSummaryData(summary)
 
-        setCollectionsMap(func.mapCollectionIdToName(tmp))
-        const allHostNameMap = func.mapCollectionIdToHostName(tmp)
+        setCollectionsMap(func.mapCollectionIdToName(tmp.filter(x => !x?.deactivated)))
+        const allHostNameMap = func.mapCollectionIdToHostName(tmp.filter(x => !x?.deactivated))
         setHostNameMap(allHostNameMap)
 
         tmp = {}

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

@@ -1,42 +1,36 @@
-import {create} from "zustand"
-import {devtools, persist, createJSONStorage} from "zustand/middleware"
+import { create } from "zustand";
+import { devtools, persist, createJSONStorage } from "zustand/middleware";
 
 const initialState = {
     quickstartTasksCompleted: 0,
     subCategoryFromSourceConfigMap: {},
     active: '',
-    collectionsMap: {},
-    allCollections: [],
-    hostNameMap: {},
-    lastFetchedInfo: {
-      lastRiskScoreInfo: 0,
-      lastSensitiveInfo: 0,
-    },
-    lastFetchedResp: {
-      criticalUrls: 0,
-      riskScoreMap: {},
-    },
+    allCollections: [], // Persist only this
+    collectionsMap: {}, // Keep in memory (not persisted)
+    hostNameMap: {}, // Keep in memory (not persisted)
+    lastFetchedInfo: { lastRiskScoreInfo: 0, lastSensitiveInfo: 0 },
+    lastFetchedResp: { criticalUrls: 0, riskScoreMap: {} },
     lastFetchedSeverityResp: {},
     lastCalledSensitiveInfo: 0,
     lastFetchedSensitiveResp: [],
     selectedSampleApi: {},
-    coverageMap:{},
-    filtersMap:{},
+    coverageMap: {},
+    filtersMap: {},
     tableInitialState: {},
     trafficAlerts: [],
     sendEventOnLogin: false,
     tableSelectedTab: {},
     threatFiltersMap: null,
 };
 
-let persistStore = (set) => ({
+let persistStore = (set, get) => ({
     ...initialState,
     accessToken: null,
-    storeAccessToken: (accessToken) => set({ accessToken: accessToken }),
+    storeAccessToken: (accessToken) => set({ accessToken }),
     setQuickstartTasksCompleted: (quickstartTasksCompleted) => set({ quickstartTasksCompleted }),
     setSubCategoryFromSourceConfigMap: (subCategoryFromSourceConfigMap) => set({ subCategoryFromSourceConfigMap }),
     setActive: (selected) => set({ active: selected }),
-    setCollectionsMap: (collectionsMap) => set({ collectionsMap }),
+
     setAllCollections: (allCollections) => {
         const optimizedCollections = allCollections.map(({ id, displayName, urlsCount, deactivated, type, automated, startTs }) => ({
             id,
@@ -49,27 +43,46 @@ let persistStore = (set) => ({
         }));
         set({ allCollections: optimizedCollections });
     },
+    setCollectionsMap: (collectionsMap) => set({ collectionsMap }),
     setHostNameMap: (hostNameMap) => set({ hostNameMap }),
     setLastFetchedInfo: (lastFetchedInfo) => set({ lastFetchedInfo }),
     setLastFetchedResp: (lastFetchedResp) => set({ lastFetchedResp }),
     setLastFetchedSeverityResp: (lastFetchedSeverityResp) => set({ lastFetchedSeverityResp }),
     setLastCalledSensitiveInfo: (lastCalledSensitiveInfo) => set({ lastCalledSensitiveInfo }),
     setLastFetchedSensitiveResp: (lastFetchedSensitiveResp) => set({ lastFetchedSensitiveResp }),
-    setSelectedSampleApi: (selectedSampleApi) => set({selectedSampleApi: selectedSampleApi}),
-    setCoverageMap:(coverageMap)=>{set({coverageMap: coverageMap})},
+    setSelectedSampleApi: (selectedSampleApi) => set({ selectedSampleApi }),
+    setCoverageMap: (coverageMap) => set({ coverageMap }),
     setFiltersMap: (filtersMap) => set({ filtersMap }),
     setTableInitialState: (tableInitialState) => set({ tableInitialState }),
-    setTrafficAlerts: (trafficAlerts) =>set ({trafficAlerts}),
-    setTableSelectedTab: (tableSelectedTab) => set({tableSelectedTab}),
-    setThreatFiltersMap: (threatFiltersMap) => set({threatFiltersMap}),
+    setTrafficAlerts: (trafficAlerts) => set({ trafficAlerts }),
+    setTableSelectedTab: (tableSelectedTab) => set({ tableSelectedTab }),
+    setThreatFiltersMap: (threatFiltersMap) => set({ threatFiltersMap }),
 
     resetAll: () => set(initialState), // Reset function
-})
+});
 
-persistStore = devtools(persistStore)
-persistStore = persist(persistStore,{storage: createJSONStorage(() => sessionStorage)})
+persistStore = devtools(persistStore);
+persistStore = persist(persistStore, { 
+    name: "persistedStore",
+    storage: createJSONStorage(() => sessionStorage),
+    partialize: (state) => ({
+        allCollections: state.allCollections, // Persist only allCollections
+        lastFetchedInfo: state.lastFetchedInfo,
+        lastFetchedResp: state.lastFetchedResp,
+        lastFetchedSeverityResp: state.lastFetchedSeverityResp,
+        lastCalledSensitiveInfo: state.lastCalledSensitiveInfo,
+        lastFetchedSensitiveResp: state.lastFetchedSensitiveResp,
+        selectedSampleApi: state.selectedSampleApi,
+        coverageMap: state.coverageMap,
+        filtersMap: state.filtersMap,
+        tableInitialState: state.tableInitialState,
+        trafficAlerts: state.trafficAlerts,
+        sendEventOnLogin: state.sendEventOnLogin,
+        tableSelectedTab: state.tableSelectedTab,
+        threatFiltersMap: state.threatFiltersMap,
+    }) 
+});
 
 const PersistStore = create(persistStore);
 
-export default PersistStore
-
+export default PersistStore;