We were using the AppState incorrectly in our selectors. We should use `DefaultRootState` from react-redux. /ok-to-test tags="@tag.Sanity" <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Refactor** - Updated state parameter types in numerous selectors and hooks across the application from a custom application state type to a standard Redux root state type, enhancing type consistency and maintainability without impacting functionality or user experience. <!-- end of auto-generated comment: release notes by coderabbit.ai --> <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/14771101257> > Commit: 48aef24d9a54ee63d06943128f7545ba0d461172 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=14771101257&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Sanity` > Spec: > <hr>Thu, 01 May 2025 07:16:33 UTC <!-- end of auto-generated comment: Cypress test results -->
115 lines
3.2 KiB
TypeScript
115 lines
3.2 KiB
TypeScript
import type { ReactElement } from "react";
|
|
import React from "react";
|
|
import type { RenderOptions } from "@testing-library/react";
|
|
import { render, queries } from "@testing-library/react";
|
|
import { Provider } from "react-redux";
|
|
import { ThemeProvider } from "styled-components";
|
|
import { getCurrentThemeDetails } from "selectors/themeSelectors";
|
|
import * as customQueries from "./customQueries";
|
|
import { BrowserRouter } from "react-router-dom";
|
|
import type { DefaultRootState } from "react-redux";
|
|
import appReducer from "ee/reducers";
|
|
import { applyMiddleware, compose, createStore } from "redux";
|
|
import { reduxBatch } from "@manaflair/redux-batch";
|
|
import createSagaMiddleware from "redux-saga";
|
|
import store, { testStore } from "store";
|
|
import { sagasToRunForTests } from "./sagas";
|
|
import { all, call, spawn } from "redux-saga/effects";
|
|
import type { FeatureFlags } from "ee/entities/FeatureFlag";
|
|
import { fetchFeatureFlagsSuccess } from "../src/actions/userActions";
|
|
import { DEFAULT_FEATURE_FLAG_VALUE } from "ee/entities/FeatureFlag";
|
|
|
|
const testSagaMiddleware = createSagaMiddleware();
|
|
|
|
const testStoreWithTestMiddleWare = (initialState: Partial<DefaultRootState>) =>
|
|
createStore(
|
|
appReducer,
|
|
initialState,
|
|
compose(reduxBatch, applyMiddleware(testSagaMiddleware), reduxBatch),
|
|
);
|
|
|
|
const rootSaga = function* (sagasToRun = sagasToRunForTests) {
|
|
yield all(
|
|
sagasToRun.map((saga) =>
|
|
spawn(function* () {
|
|
while (true) {
|
|
yield call(saga);
|
|
break;
|
|
}
|
|
}),
|
|
),
|
|
);
|
|
};
|
|
|
|
interface State {
|
|
url?: string;
|
|
initialState?: Partial<DefaultRootState>;
|
|
sagasToRun?: typeof sagasToRunForTests;
|
|
featureFlags?: Partial<FeatureFlags>;
|
|
}
|
|
const setupState = (state?: State) => {
|
|
let reduxStore = store;
|
|
|
|
window.history.pushState({}, "Appsmith", state?.url || "/");
|
|
|
|
if (state && (state.initialState || state.featureFlags)) {
|
|
reduxStore = testStore(state.initialState || {});
|
|
|
|
if (state.featureFlags) {
|
|
reduxStore.dispatch(
|
|
fetchFeatureFlagsSuccess({
|
|
...DEFAULT_FEATURE_FLAG_VALUE,
|
|
...state.featureFlags,
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
|
|
if (state && state.sagasToRun) {
|
|
reduxStore = testStoreWithTestMiddleWare(reduxStore.getState());
|
|
testSagaMiddleware.run(() => rootSaga(state.sagasToRun));
|
|
}
|
|
|
|
const defaultTheme = getCurrentThemeDetails(reduxStore.getState());
|
|
|
|
return { reduxStore, defaultTheme };
|
|
};
|
|
|
|
const customRender = (
|
|
ui: ReactElement,
|
|
state?: State,
|
|
options?: Omit<RenderOptions, "queries">,
|
|
) => {
|
|
const { defaultTheme, reduxStore } = setupState(state);
|
|
|
|
return render(
|
|
<BrowserRouter>
|
|
<Provider store={reduxStore}>
|
|
<ThemeProvider theme={defaultTheme}>{ui}</ThemeProvider>
|
|
</Provider>
|
|
</BrowserRouter>,
|
|
{
|
|
queries: { ...queries, ...customQueries },
|
|
...options,
|
|
},
|
|
);
|
|
};
|
|
|
|
const hookWrapper = (state: State) => {
|
|
return ({ children }: { children: ReactElement }) => {
|
|
const { defaultTheme, reduxStore } = setupState(state);
|
|
|
|
return (
|
|
<BrowserRouter>
|
|
<Provider store={reduxStore}>
|
|
<ThemeProvider theme={defaultTheme}>{children}</ThemeProvider>
|
|
</Provider>
|
|
</BrowserRouter>
|
|
);
|
|
};
|
|
};
|
|
|
|
export * from "@testing-library/react";
|
|
|
|
export { customRender as render, hookWrapper };
|