Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ import About from "./components/About";
import { useAppDispatch } from "./store";
import { fetchOcVersion, fetchUserInfo } from "./slices/userInfoSlice";
import { subscribeToAuthEvents } from "./utils/broadcastSync";
import { useTableFilterStateValidation } from "./hooks/useTableFilterStateValidation";

function App() {
const dispatch = useAppDispatch();

useTableFilterStateValidation();

useEffect(() => {
// Load information about current user on mount
dispatch(fetchUserInfo());
Expand All @@ -33,7 +37,7 @@ function App() {
dispatch(fetchUserInfo());
});

// eslint-disable-next-line react-hooks/exhaustive-deps
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
Expand Down
26 changes: 26 additions & 0 deletions src/hooks/useTableFilterStateValidation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { useEffect } from "react";
import { useAppDispatch, useAppSelector } from "../store";
import { resetCorruptedState } from "../slices/tableFilterSlice";

/**
* Custom hook to validate and fix corrupted table filter state in localStorage.
* This hook should be used in components that rely on table filter state to ensure
* the state is valid before using it.
*/
export const useTableFilterStateValidation = () => {
const dispatch = useAppDispatch();
const tableFilters = useAppSelector(state => state.tableFilters);

useEffect(() => {
// Check for corrupted state and dispatch reset action if needed
const hasCorruption =
!Array.isArray(tableFilters.data) ||
!Array.isArray(tableFilters.textFilter) ||
!Array.isArray(tableFilters.stats);

if (hasCorruption) {
console.warn("Detected corrupted table filter state, resetting to defaults");
dispatch(resetCorruptedState());
}
}, [dispatch, tableFilters.data, tableFilters.textFilter, tableFilters.stats]);
};
18 changes: 17 additions & 1 deletion src/slices/tableFilterSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const fetchStats = createAppAsyncThunk("tableFilters/fetchStats", async (
}[],
description: string,
order: number,
}
}
// fetch information about possible status an event can have
const data = await axios.get<FetchStats>("/admin-ng/resources/STATS.json");
const response = data.data;
Expand Down Expand Up @@ -380,6 +380,21 @@ const tableFilterSlice = createSlice({
removeSecondFilter(state) {
state.secondFilter = "";
},
resetCorruptedState(state) {
// Reset corrupted localStorage state to initial values
if (!Array.isArray(state.data)) {
console.warn("Resetting corrupted tableFilters.data to empty array");
state.data = [];
}
if (!Array.isArray(state.textFilter)) {
console.warn("Resetting corrupted tableFilters.textFilter to empty array");
state.textFilter = [];
}
if (!Array.isArray(state.stats)) {
console.warn("Resetting corrupted tableFilters.stats to empty array");
state.stats = [];
}
},
},
extraReducers: builder => {
builder
Expand Down Expand Up @@ -427,6 +442,7 @@ export const {
removeSelectedFilter,
editSecondFilter,
removeSecondFilter,
resetCorruptedState,
} = tableFilterSlice.actions;

// Export the slice reducer as the default export
Expand Down
Loading