QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-18 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting unintented change to code-viewer layout (keeping reveal layout good)

Browse Source
This commit is contained in:
darin.kelkhoff
2023-05-04 18:49:56 -05:00
parent 0895c614d9
commit 35068b6b69
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qqq/pages/records/view/RecordView.tsx
View File

@ -369,8 +369,8 @@ function RecordView({table, launchProcess}: Props): JSX.Element
<Box key={section.name} display="flex" flexDirection="column" py={1} pr={2}> <Box key={section.name} display="flex" flexDirection="column" py={1} pr={2}>
{ {
section.fieldNames.map((fieldName: string) => ( section.fieldNames.map((fieldName: string) => (
<Box display="flex" key={fieldName} flexDirection="row" pb={2} pr={2}> <Box key={fieldName} flexDirection="row" pr={2}>
<Typography sx={{display: "flex"}} variant="button" textTransform="none" fontWeight="bold" pr={1} color="rgb(52, 71, 103)"> <Typography variant="button" textTransform="none" fontWeight="bold" pr={1} color="rgb(52, 71, 103)">
{tableMetaData.fields.get(fieldName).label}: {tableMetaData.fields.get(fieldName).label}:
<div style={{display: "inline-block", width: 0}}>&nbsp;</div> <div style={{display: "inline-block", width: 0}}>&nbsp;</div>
</Typography> </Typography>

9
src/qqq/utils/qqq/ValueUtils.tsx
View File

@ -456,7 +456,7 @@ function CodeViewer({name, mode, code}: {name: string; mode: string; code: strin
}; };
return ( return (
<> <Box component="span">
{mode == "json" && code && <Button onClick={() => formatJson()}>{isFormatted ? "Reset Format" : "Format JSON"}</Button>} {mode == "json" && code && <Button onClick={() => formatJson()}>{isFormatted ? "Reset Format" : "Format JSON"}</Button>}
{code && <Button onClick={() => toggleSize()}>{isExpanded ? "Collapse" : "Expand"}</Button>} {code && <Button onClick={() => toggleSize()}>{isExpanded ? "Collapse" : "Expand"}</Button>}
{errorMessage} {errorMessage}
@ -471,10 +471,11 @@ function CodeViewer({name, mode, code}: {name: string; mode: string; code: strin
readOnly readOnly
highlightActiveLine={false} highlightActiveLine={false}
width="100%" width="100%"
style={{border: "1px solid gray", marginBottom: "1rem"}}
showPrintMargin={false} showPrintMargin={false}
height={isExpanded ? "80vh" : code ? "200px" : "50px"} height={isExpanded ? "80vh" : code ? "200px" : "50px"}
/> />
</>); </Box>);
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
@ -514,7 +515,7 @@ function RevealComponent({fieldName, value, usage}: {fieldName: string, value: s
return ( return (
usage === "view" && adornmentFieldsMap.get(fieldName) === true ? ( usage === "view" && adornmentFieldsMap.get(fieldName) === true ? (
<Box> <Box component="span">
<Icon onClick={() => handleRevealIconClick(fieldName)} sx={{cursor: "pointer", fontSize: "15px !important", position: "relative", top: "3px", marginRight: "5px"}}>visibility_on</Icon> <Icon onClick={() => handleRevealIconClick(fieldName)} sx={{cursor: "pointer", fontSize: "15px !important", position: "relative", top: "3px", marginRight: "5px"}}>visibility_on</Icon>
{displayValue} {displayValue}
<ClickAwayListener onClickAway={handleTooltipClose}> <ClickAwayListener onClickAway={handleTooltipClose}>
@ -534,7 +535,7 @@ function RevealComponent({fieldName, value, usage}: {fieldName: string, value: s
</ClickAwayListener> </ClickAwayListener>
</Box> </Box>
):( ):(
<Box><Icon onClick={() => handleRevealIconClick(fieldName)} sx={{cursor: "pointer", fontSize: "15px !important", position: "relative", top: "3px", marginRight: "5px"}}>visibility_off</Icon>{displayValue}</Box> <Box component="span"><Icon onClick={() => handleRevealIconClick(fieldName)} sx={{cursor: "pointer", fontSize: "15px !important", position: "relative", top: "3px", marginRight: "5px"}}>visibility_off</Icon>{displayValue}</Box>
) )
); );
} }