Skip to content

ConfigurationV2Card: swap out toml table for code block #13

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.

Sign up for GitHub

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 1 commit into from
Oct 26, 2022
Merged

ConfigurationV2Card: swap out toml table for code block #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 9 additions & 32 deletions src/screens/Configuration/ConfigurationV2Card/ConfigurationV2Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { gql, useQuery } from '@apollo/client'

import Card from '@material-ui/core/Card'
import CardHeader from '@material-ui/core/CardHeader'
import Table from '@material-ui/core/Table'
import TableBody from '@material-ui/core/TableBody'
import TableCell from '@material-ui/core/TableCell'
import TableRow from '@material-ui/core/TableRow'
import Grid from '@material-ui/core/Grid'
Expand All @@ -26,31 +24,14 @@ export const ConfigurationV2Card = () => {
fetchPolicy: 'cache-and-network',
})

var user: string[] = []
if (data != undefined) {
user = data?.configv2.user.split(/\n/).map((l) => {
return l
})
} else {
user = []
}
var effective: string[] = []
if (data != undefined) {
effective = data?.configv2.effective.split(/\n/).map((l) => {
return l
})
} else {
effective = []
}

return (
<>
<Grid item xs={12}>
<TOMLCard
title="TOML Configuration (user-specified)"
error={error?.message}
loading={loading}
entries={user}
toml={data?.configv2.user}
showHead
/>
</Grid>
Expand All @@ -59,7 +40,7 @@ export const ConfigurationV2Card = () => {
title="TOML Configuration (effective)"
error={error?.message}
loading={loading}
entries={effective}
toml={data?.configv2.effective}
showHead
/>
</Grid>
Expand All @@ -68,7 +49,7 @@ export const ConfigurationV2Card = () => {
}

interface Props {
entries: Array<string>
toml?: string
loading: boolean
showHead?: boolean
title?: string
Expand All @@ -87,7 +68,7 @@ const FetchingRow = () => <SpanRow>...</SpanRow>

const ErrorRow: React.FC = ({ children }) => <SpanRow>{children}</SpanRow>

const TOMLCard = ({ loading, entries, error = '', title }: Props) => {
const TOMLCard = ({ loading, toml, error = '', title }: Props) => {
if (error) {
return <ErrorRow>{error}</ErrorRow>
}
Expand All @@ -96,18 +77,14 @@ const TOMLCard = ({ loading, entries, error = '', title }: Props) => {
return <FetchingRow />
}

let styles = {marginLeft: '1em'};

return (
<Card>
{title && <CardHeader title={title} />}
<Table>
<TableBody>
{entries.map((k, i) => (
<TableRow key={title + k + i}>
<TableCell>{k}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
<pre style={styles}>
<code>{toml}</code>
</pre>
</Card>
)
}