Skip to content

Commit

Permalink
fix: table overflow and word wrapping (#720)
Browse files Browse the repository at this point in the history
- applications (table)
- clients (table)
- plugins (table, info card word wrapping, and card padding)

Co-authored-by: David Kalmakoff <[email protected]>
  • Loading branch information
david-kalmakoff and David Kalmakoff authored Nov 5, 2024
1 parent 3f29ded commit b08b5ae
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 28 deletions.
2 changes: 1 addition & 1 deletion ui/src/application/Applications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Applications extends Component<Stores<'appStore'>> {
}
maxWidth={1000}>
<Grid item xs={12}>
<Paper elevation={6}>
<Paper elevation={6} style={{overflowX: 'auto'}}>
<Table id="app-table">
<TableHead>
<TableRow>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/client/Clients.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Clients extends Component<Stores<'clientStore'>> {
</Button>
}>
<Grid item xs={12}>
<Paper elevation={6}>
<Paper elevation={6} style={{overflowX: 'auto'}}>
<Table id="client-table">
<TableHead>
<TableRow style={{textAlign: 'center'}}>
Expand Down
60 changes: 36 additions & 24 deletions ui/src/plugin/PluginDetailView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,29 +131,41 @@ const PanelWrapper: React.FC<IPanelWrapperProps> = ({
}) => {
const Icon = icon;
return (
<Container style={{display: 'block', width: '100%', margin: '20px'}}>
<Typography variant="h5">
{Icon ? (
<span>
<Icon />
&nbsp;
</span>
) : null}
{name}
{refresh ? (
<Button
style={{float: 'right'}}
onClick={() => {
refresh();
}}>
<Refresh />
</Button>
) : null}
</Typography>
{description ? <Typography variant="subtitle1">{description}</Typography> : null}
<hr />
<div className={name.toLowerCase().trim().replace(/ /g, '-')}>{children}</div>
</Container>
<div
style={{
width: '100%',
paddingLeft: '16px',
paddingRight: '16px',
}}>
<Container
style={{
display: 'block',
width: '100%',
margin: '12px 0px',
}}>
<Typography variant="h5">
{Icon ? (
<span>
<Icon />
&nbsp;
</span>
) : null}
{name}
{refresh ? (
<Button
style={{float: 'right'}}
onClick={() => {
refresh();
}}>
<Refresh />
</Button>
) : null}
</Typography>
{description ? <Typography variant="subtitle1">{description}</Typography> : null}
<hr />
<div className={name.toLowerCase().trim().replace(/ /g, '-')}>{children}</div>
</Container>
</div>
);
};

Expand Down Expand Up @@ -225,7 +237,7 @@ class PluginInfo extends Component<{pluginInfo: IPlugin}> {
},
} = this;
return (
<div>
<div style={{wordWrap: 'break-word'}}>
{name ? (
<Typography variant="body2" className="name">
Name: <span>{name}</span>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/plugin/Plugins.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Plugins extends Component<Stores<'pluginStore'>> {
return (
<DefaultPage title="Plugins" maxWidth={1000}>
<Grid item xs={12}>
<Paper elevation={6}>
<Paper elevation={6} style={{overflowX: 'auto'}}>
<Table id="plugin-table">
<TableHead>
<TableRow>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/user/Users.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class Users extends Component<WithStyles<'wrapper'> & Stores<'userStore'>> {
</Button>
}>
<Grid item xs={12}>
<Paper elevation={6}>
<Paper elevation={6} style={{overflowX: 'auto'}}>
<Table id="user-table">
<TableHead>
<TableRow style={{textAlign: 'center'}}>
Expand Down

0 comments on commit b08b5ae

Please sign in to comment.