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
66 changes: 56 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@openedx/frontend-plugin-framework": "^1.7.0",
"@openedx/paragon": "^23.5.0",
"@redux-devtools/extension": "^3.3.0",
"@reduxjs/toolkit": "1.9.7",
"@reduxjs/toolkit": "2.11.1",
"@tanstack/react-query": "5.90.12",
"@tinymce/tinymce-react": "^6.0.0",
"classnames": "2.5.1",
Expand Down
14 changes: 11 additions & 3 deletions src/optimizer-page/data/slice.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { AnyAction, configureStore, ThunkMiddleware } from '@reduxjs/toolkit';
import { ToolkitStore } from '@reduxjs/toolkit/dist/configureStore';
import {
configureStore,
type EnhancedStore,
type StoreEnhancer,
type ThunkDispatch,
type Tuple,
type UnknownAction,
} from '@reduxjs/toolkit';
import {
CourseOptimizerState,
reducer,
Expand All @@ -19,7 +25,9 @@ import {
} from './slice';

describe('courseOptimizer slice', () => {
let store: ToolkitStore<CourseOptimizerState, AnyAction, [ThunkMiddleware<CourseOptimizerState, AnyAction>]>;
let store: EnhancedStore<CourseOptimizerState, UnknownAction, Tuple<[StoreEnhancer<{
dispatch: ThunkDispatch<CourseOptimizerState, undefined, UnknownAction>;
}>, StoreEnhancer]>>;

beforeEach(() => {
store = configureStore({ reducer });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,7 @@ describe.each([
},
});

store = initializeStore({
models: {
courseDetails: {
[courseId]: {},
},
},
});
store = initializeStore();
axiosMock = new MockAdapter(getAuthenticatedHttpClient());

axiosMock.onGet(getDiscussionsProvidersUrl(courseId))
Expand Down
2 changes: 1 addition & 1 deletion src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ export default function initializeStore(preloadedState: Partial<DeprecatedReduxS
groupConfigurations: groupConfigurationsReducer,
textbooks: textbooksReducer,
},
preloadedState,
preloadedState: (preloadedState as DeprecatedReduxState | undefined),
});
}
4 changes: 2 additions & 2 deletions src/testUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ const defaultUser = {
*/
export function initializeMocks({ user = defaultUser, initialState = undefined }: {
user?: { userId: number, username: string },
initialState?: Partial<DeprecatedReduxState>
initialState?: Partial<DeprecatedReduxState>,
} = {}) {
initializeMockApp({
authenticatedUser: user,
});
reduxStore = initializeReduxStore(initialState as any);
reduxStore = initializeReduxStore(initialState);
queryClient = new QueryClient({
defaultOptions: {
queries: {
Expand Down