Skip to content
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

fix: add material-ui class name seed #721

Merged
merged 2 commits into from
Mar 14, 2023
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
1 change: 1 addition & 0 deletions packages/components/src/AppInfo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const useStyles = makeStyles((theme: Theme) => ({
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
overflowY: 'initial',
},
dialog: {
width: `${INFO_WINDOW_WIDTH}px`,
Expand Down
67 changes: 39 additions & 28 deletions packages/console/src/components/App/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import 'intersection-observer';
import * as React from 'react';
import { CssBaseline, Collapse } from '@material-ui/core';
import {
CssBaseline,
Collapse,
StylesProvider,
createGenerateClassName,
} from '@material-ui/core';
import { ThemeProvider } from '@material-ui/styles';
import { FlyteApiProvider } from '@flyteorg/flyte-api';
import { SnackbarProvider } from 'notistack';
Expand Down Expand Up @@ -57,34 +62,40 @@ export const AppComponent: React.FC<AppComponentProps> = (
<FeatureFlagsProvider>
<LocalCacheProvider>
<ThemeProvider theme={getMuiTheme(props.config)}>
<SnackbarProvider
// Notifications provider https://iamhosseindhv.com/notistack/demos
maxSnack={2}
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
TransitionComponent={Collapse}
<StylesProvider
generateClassName={createGenerateClassName({
seed: 'c-',
})}
>
<QueryClientProvider client={queryClient}>
<FlyteApiProvider flyteApiDomain={env.ADMIN_API_URL}>
<APIContext.Provider value={apiState}>
<QueryAuthorizationObserver />
<SkeletonTheme
color={skeletonColor}
highlightColor={skeletonHighlightColor}
>
<CssBaseline />
<Router history={history}>
<ErrorBoundary fixed={true}>
<NavBarRouter registry={props?.registry} />
<ApplicationRouter />
</ErrorBoundary>
</Router>
<SystemStatusBanner />
</SkeletonTheme>
</APIContext.Provider>
</FlyteApiProvider>
<ReactQueryDevtools initialIsOpen={false} />
</QueryClientProvider>
</SnackbarProvider>
<SnackbarProvider
// Notifications provider https://iamhosseindhv.com/notistack/demos
maxSnack={2}
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
TransitionComponent={Collapse}
>
<QueryClientProvider client={queryClient}>
<FlyteApiProvider flyteApiDomain={env.ADMIN_API_URL}>
<APIContext.Provider value={apiState}>
<QueryAuthorizationObserver />
<SkeletonTheme
color={skeletonColor}
highlightColor={skeletonHighlightColor}
>
<CssBaseline />
<Router history={history}>
<ErrorBoundary fixed={true}>
<NavBarRouter registry={props?.registry} />
<ApplicationRouter />
</ErrorBoundary>
</Router>
<SystemStatusBanner />
</SkeletonTheme>
</APIContext.Provider>
</FlyteApiProvider>
<ReactQueryDevtools initialIsOpen={false} />
</QueryClientProvider>
</SnackbarProvider>
</StylesProvider>
</ThemeProvider>
</LocalCacheProvider>
</FeatureFlagsProvider>
Expand Down