Skip to content

Commit

Permalink
Merge branch 'release/0.6.9' into feature/CE-1135-webeoc-polling
Browse files Browse the repository at this point in the history
  • Loading branch information
afwilcox authored Dec 6, 2024
2 parents f499411 + 9d5f0ee commit 5e02450
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,12 @@ export const ComplaintList: FC<Props> = ({ type, searchQuery }) => {

const renderNoComplaintsFound = () => {
return (
<td colSpan={11}>
<i className="bi bi-info-circle-fill"></i>
<span>No complaints found using your current filters. Remove or change your filters to see complaints.</span>
</td>
<tr>
<td colSpan={11}>
<i className="bi bi-info-circle-fill p-2"></i>
<span>No complaints found using your current filters. Remove or change your filters to see complaints.</span>
</td>
</tr>
);
};

Expand Down
20 changes: 18 additions & 2 deletions frontend/src/app/store/store.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
import { configureStore, ThunkAction, Action } from "@reduxjs/toolkit";
import { createMigrate, persistReducer, persistStore } from "redux-persist";
import {
createMigrate,
persistReducer,
persistStore,
FLUSH,
REHYDRATE,
PAUSE,
PERSIST,
PURGE,
REGISTER,
} from "redux-persist";
import storage from "redux-persist/lib/storage";
import { rootReducer } from "./reducers";
import migration from "./migrations";
Expand All @@ -9,7 +19,7 @@ const persistConfig = {
storage,
blacklist: ["app"],
whitelist: ["codeTables", "officers"],
version: 22, // This needs to be incremented every time a new migration is added
version: 23, // This needs to be incremented every time a new migration is added
debug: true,
migrate: createMigrate(migration, { debug: false }),
};
Expand All @@ -18,6 +28,12 @@ const persistedReducer = persistReducer(persistConfig, rootReducer);

export const store = configureStore({
reducer: persistedReducer,
middleware: (getDefaultMiddleware) =>
getDefaultMiddleware({
serializableCheck: {
ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER],
},
}),
});

export type AppDispatch = typeof store.dispatch;
Expand Down

0 comments on commit 5e02450

Please sign in to comment.