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

Merge branch 'dev' into integration/sprint-26

Browse Source 
# Conflicts:
#	src/qqq/utils/qqq/ValueUtils.tsx
This commit is contained in:
Tim Chamberlain
2023-05-05 13:03:33 -05:00
parent 06c78d4dec 97d499b0b6
commit f1adf3aa5e
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qqq/components/misc/RecordSidebar.tsx
View File

@ -41,7 +41,7 @@ interface Props
QRecordSidebar.defaultProps = { QRecordSidebar.defaultProps = {
light: false, light: false,
stickyTop: "100px", stickyTop: "110px",
}; };
interface SidebarEntry interface SidebarEntry

9
src/qqq/pages/records/developer/TableDeveloperView.tsx
View File

@ -117,11 +117,6 @@ function TableDeveloperView({table}: Props): JSX.Element
})(); })();
} }
const beforeTry = (e: any) =>
{
e.detail.request.headers.append("Authorization", "Bearer " + accessToken);
};
const selectApi = async (event: SelectChangeEvent) => const selectApi = async (event: SelectChangeEvent) =>
{ {
setSelectedApi(null); setSelectedApi(null);
@ -208,11 +203,11 @@ function TableDeveloperView({table}: Props): JSX.Element
font-size="large" font-size="large"
render-style="view" render-style="view"
show-header={false} show-header={false}
allow-authentication={false} allow-authentication={true}
persist-auth={true}
allow-server-selection={false} allow-server-selection={false}
allow-spec-file-download={true} allow-spec-file-download={true}
sort-endpoints-by="method" sort-endpoints-by="method"
beforeTry={beforeTry}
schema-description-expanded={true} schema-description-expanded={true}
css-file={"/api/rapi-doc.css"} css-file={"/api/rapi-doc.css"}
css-classes={"qqq-rapi-doc"} css-classes={"qqq-rapi-doc"}

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>

5
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>);
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////