Skip to content

Make SectionContainer resizable prop optional to fix Permissions and … #9693

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

Open
RohitBhati8269 wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −23
Open

Make SectionContainer resizable prop optional to fix Permissions and … #9693

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions web/pgadmin/dashboard/static/js/Dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,7 @@ function Dashboard({
{!_.isUndefined(preferences) && preferences.show_activity && (
<Fragment>
<CustomRefresh refresh={refresh} setRefresh={setRefresh}/>
<SectionContainer title={gettext('Sessions')}>
<SectionContainer title={gettext('Sessions')} resizable={true}>
<PgTable
caveTable={false}
tableNoBorder={false}
Expand All @@ -1074,15 +1074,15 @@ function Dashboard({
schema={activeQSchemaObj}
></PgTable>
</SectionContainer>
<SectionContainer title={gettext('Locks')}>
<SectionContainer title={gettext('Locks')} resizable={true}>
<PgTable
caveTable={false}
tableNoBorder={false}
columns={databaseLocksColumns}
data={(dashData?.[0]?.['locks']) || []}
></PgTable>
</SectionContainer>
<SectionContainer title={gettext('Prepared Transactions')}>
<SectionContainer title={gettext('Prepared Transactions')} resizable={true}>
<PgTable
caveTable={false}
tableNoBorder={false}
Expand Down
52 changes: 32 additions & 20 deletions web/pgadmin/dashboard/static/js/components/SectionContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,38 @@ const StyledBox = styled(Box)(({theme}) => ({
},
}));

export default function SectionContainer({title, titleExtras, children, style}) {
export default function SectionContainer({title, titleExtras, children, style, resizable = false, defaultHeight = 200}) {
const content = (
<>
<Box className='SectionContainer-cardHeader' title={title}>
<div className='SectionContainer-cardTitle'>{title}</div>
<div style={{marginLeft: 'auto'}}>
{titleExtras}
</div>
</Box>
<Box height="100%" display="flex" flexDirection="column" minHeight={0}>
{children}
</Box>
</>
);

return (
<StyledBox className='SectionContainer-root' style={style}>
<Resizable
enable={{ bottom: true }}
defaultSize={{ height: 200, width: '100%' }}
minHeight={25}
style={{
display: 'flex',
flexDirection: 'column'
}}
>
<Box className='SectionContainer-cardHeader' title={title}>
<div className='SectionContainer-cardTitle'>{title}</div>
<div style={{marginLeft: 'auto'}}>
{titleExtras}
</div>
</Box>
<Box height="100%" display="flex" flexDirection="column" minHeight={0}>
{children}
</Box>
</Resizable>
{resizable ? (
<Resizable
enable={{ bottom: true }}
defaultSize={{ height: defaultHeight, width: '100%' }}
minHeight={25}
style={{
display: 'flex',
flexDirection: 'column'
}}
>
{content}
</Resizable>
) : (
content
)}
</StyledBox>
);
}
Expand All @@ -70,4 +80,6 @@ SectionContainer.propTypes = {
titleExtras: PropTypes.node,
children: PropTypes.node.isRequired,
style: PropTypes.object,
resizable: PropTypes.bool,
defaultHeight: PropTypes.number,
};
Loading