[Dashboard] Upgrade to MUIv5 and dependency updates #45789
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,23 +1,26 @@ | ||||||
| import { | ||||||
| Box, | ||||||
| Card, | ||||||
| Link, | ||||||
| SxProps, | ||||||
| Theme, | ||||||
| Typography, | ||||||
| useTheme, | ||||||
| } from "@mui/material"; | ||||||
| import yaml from "js-yaml"; | ||||||
| import React, { useState } from "react"; | ||||||
| import DialogWithTitle from "../DialogWithTitle"; | ||||||
| import { ClassNameProps } from "../props"; | ||||||
|
|
||||||
| const useStyles = (theme: Theme) => ({ | ||||||
| configText: { | ||||||
| whiteSpace: "pre", | ||||||
| fontFamily: "SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace", | ||||||
| padding: theme.spacing(2), | ||||||
| overflow: "scroll", | ||||||
| maxHeight: 600, | ||||||
| }, | ||||||
| }); | ||||||
|
|
||||||
| export type CodeDialogButtonProps = { | ||||||
| /** | ||||||
|
|
@@ -32,6 +35,7 @@ export type CodeDialogButtonProps = { | |||||
| * Code to show in the dialog. If an object is passed in, that object will be stringified to yaml. | ||||||
| */ | ||||||
| code: string | object; | ||||||
| sx?: SxProps<Theme>; | ||||||
| }; | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -42,7 +46,7 @@ export const CodeDialogButton = ({ | |||||
| buttonText = "View", | ||||||
| code, | ||||||
| }: CodeDialogButtonProps) => { | ||||||
| const styles = useStyles(useTheme()); | ||||||
|
|
||||||
| const [showConfigDialog, setShowConfigDialog] = useState(false); | ||||||
|
|
||||||
|
|
@@ -63,7 +67,7 @@ export const CodeDialogButton = ({ | |||||
| }} | ||||||
| > | ||||||
| <Card variant="outlined"> | ||||||
| <Typography sx={styles.configText}> | ||||||
| {typeof code === "string" ? code : yaml.dump(code, { indent: 2 })} | ||||||
| </Typography> | ||||||
| </Card> | ||||||
|
|
@@ -73,23 +77,21 @@ export const CodeDialogButton = ({ | |||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| const useCodeDialogButtonWithPreviewStyles = (theme: Theme) => ({ | ||||||
| root: { | ||||||
| display: "flex", | ||||||
| flexWrap: "nowrap", | ||||||
| flexDirection: "row", | ||||||
| gap: theme.spacing(1), | ||||||
| }, | ||||||
| previewText: { | ||||||
| display: "block", | ||||||
| whiteSpace: "nowrap", | ||||||
| overflow: "hidden", | ||||||
| textOverflow: "ellipsis", | ||||||
| flex: 1, | ||||||
| }, | ||||||
| }); | ||||||
|
|
||||||
| type CodeDialogButtonWithPreviewProps = CodeDialogButtonProps & ClassNameProps; | ||||||
| /** | ||||||
|
|
@@ -99,9 +101,10 @@ export const CodeDialogButtonWithPreview = ({ | |||||
| code, | ||||||
| buttonText, | ||||||
| className, | ||||||
| sx, | ||||||
| ...props | ||||||
| }: CodeDialogButtonWithPreviewProps) => { | ||||||
| const styles = useCodeDialogButtonWithPreviewStyles(useTheme()); | ||||||
|
|
||||||
| const codeText = | ||||||
| typeof code === "string" | ||||||
|
|
@@ -111,13 +114,15 @@ export const CodeDialogButtonWithPreview = ({ | |||||
| const buttonTextToPass = buttonText ?? "Expand"; | ||||||
|
|
||||||
| return ( | ||||||
| <Box className={className} sx={Object.assign({}, styles.root, sx)}> | ||||||
| <Box component="span" sx={styles.previewText}> | ||||||
|
There was a problem hiding this comment.
Suggested change
Please use array syntax instead There was a problem hiding this comment. Sure! Made a minor adjustment to |
||||||
| {codeText} | ||||||
| </Box> | ||||||
| <CodeDialogButton | ||||||
| code={codeText} | ||||||
| buttonText={buttonTextToPass} | ||||||
| {...props} | ||||||
| /> | ||||||
| </Box> | ||||||
| ); | ||||||
| }; | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There shouldn't be a need to create an object like this.
When using sx props, you can also easily get access to the theme by passing a function into sx.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In most cases, I would prefer if we inlined styles instead of creating a separate styles object, but this is not a blocker.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understood, I've removed the redundant object and directly passed the function instead. Additionally, converted some parts to use inlined styles, while leaving the rest as is for readability considerations.