Skip to content

DT-1125: Migrate away from @mui/styles Part 2 - ThemeProvider to use @mui/system #1731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2025
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
2 changes: 1 addition & 1 deletion src/components/AppBreadcrumbs/AppBreadcrumbs.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import history from 'modules/hist';
import globalTheme from 'modules/theme';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import AppBreadcrumbs from './AppBreadcrumbs';
import { BreadcrumbType } from '../../constants';

Expand Down
2 changes: 1 addition & 1 deletion src/components/EditableFieldView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import createMockStore from 'redux-mock-store';
import React from 'react';
import EditableFieldView from './EditableFieldView';
Expand Down
2 changes: 1 addition & 1 deletion src/components/JobView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import createMockStore from 'redux-mock-store';
import React from 'react';
import _ from 'lodash';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ManageUsersView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
2 changes: 1 addition & 1 deletion src/components/SnapshotAccessRequestView.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { routerMiddleware } from 'connected-react-router';
import history from 'modules/hist';
import { Provider } from 'react-redux';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import globalTheme from 'modules/theme';
import React from 'react';

Expand Down
2 changes: 1 addition & 1 deletion src/components/UserList.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/TabWrapper.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { routerMiddleware } from 'connected-react-router';
import history from 'modules/hist';
import { Provider } from 'react-redux';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import globalTheme from 'modules/theme';
import React from 'react';
import TabWrapper from 'components/common/TabWrapper';
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/TerraAvatar.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import createMockStore from 'redux-mock-store';

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/TextContent.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import createMockStore from 'redux-mock-store';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import createMockStore from 'redux-mock-store';

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/overview/SchemaPanel.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import React from 'react';
import { TableDataType, TableModel } from 'generated/tdr';
import history from '../../../modules/hist';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { routerMiddleware } from 'connected-react-router';
import createMockStore, { MockStoreEnhanced } from 'redux-mock-store';
import React from 'react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Provider } from 'react-redux';
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { routerMiddleware } from 'connected-react-router';
import createMockStore, { MockStoreEnhanced } from 'redux-mock-store';
import React from 'react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { routerMiddleware } from 'connected-react-router';
import createMockStore, { MockStoreEnhanced } from 'redux-mock-store';
import React from 'react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import createMockStore, { MockStoreEnhanced } from 'redux-mock-store';
import React from 'react';
import _ from 'lodash';
Expand Down
2 changes: 1 addition & 1 deletion src/components/snapshot/DataAccessControlGroup.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
2 changes: 1 addition & 1 deletion src/components/snapshot/SnapshotAccess.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
2 changes: 1 addition & 1 deletion src/components/snapshot/overview/SnapshotExport.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import React from 'react';
import createMockStore from 'redux-mock-store';
Expand Down
2 changes: 1 addition & 1 deletion src/components/table/LightTable.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { initialUserState } from 'reducers/user';
import { initialQueryState } from 'reducers/query';
import _ from 'lodash';
Expand Down
2 changes: 1 addition & 1 deletion src/components/table/ResourceName.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import createMockStore from 'redux-mock-store';
import { mount } from 'cypress/react';
import { Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';

import history from '../../modules/hist';
import globalTheme from '../../modules/theme';
Expand Down
2 changes: 1 addition & 1 deletion src/components/table/SnapshotAccessRequestTable.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { routerMiddleware } from 'connected-react-router';
import history from 'modules/hist';
import { Provider } from 'react-redux';
import { Router } from 'react-router-dom';
import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import globalTheme from 'modules/theme';
import React from 'react';
import SnapshotAccessRequestTable from 'components/table/SnapshotAccessRequestTable';
Expand Down
Loading