Skip to content
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.

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

latest changes for the header #45

Merged
merged 1 commit into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion src/components/common/Heatmap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ const HeatmapGrid: FC<HeatmapGridProps> = ({
'& .MuiButtonBase-root': {
left: '1.6rem',
top: '2rem',
width: '6rem',
width: '4.5rem',
height: '2rem',
marginRight: '0.5rem',
borderRadius: '0.25rem',
Expand All @@ -224,6 +224,15 @@ const HeatmapGrid: FC<HeatmapGridProps> = ({
},
}}
>
<Typography
variant="subtitle1"
color={gray500}
style={{
marginTop: '2rem',
}}
>
Tree hierarchy:
</Typography>
<Button onClick={() => handleExpandAll()}>Open All</Button>
<Button onClick={() => handleCompressAll()}>Close All</Button>
</ButtonGroup>
Expand Down
61 changes: 37 additions & 24 deletions src/components/connections/SummaryHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,42 @@ const SummaryHeader = ({
<Button onClick={() => setShowDetails(SummaryType.Summary)}>
Back to Summary
</Button>
</ButtonGroup>
)}

<Breadcrumbs separator={<ArrowRight />} aria-label="breadcrumb">
{showDetails === SummaryType.DetailedSummary ? (
<></>
) : (
<Typography>Summary</Typography>
)}
</Breadcrumbs>
</Stack>

<Box
sx={{
display: 'flex',
alignItems: 'center',
gap: '0.75rem',
}}
>
{showDetails === SummaryType.DetailedSummary ? (
<ButtonGroup
variant="outlined"
sx={{
'& .MuiButtonBase-root': {
width: '4rem',
height: '2rem',
borderRadius: '0.25rem',
border: `0.0625rem solid ${primaryPurple600}`,
color: primaryPurple600,
marginRight: '1rem',
},
}}
>
<Button
sx={{
width: '4rem !important',
width: '5rem !important',
marginLeft: '.25rem',
}}
onClick={handleDownClick}
Expand All @@ -109,40 +142,20 @@ const SummaryHeader = ({
<Typography
variant="subtitle1"
color={gray500}
style={{ width: '8rem' }}
style={{ width: '12rem' }}
>
Connection {connectionPage} of {totalUniqueKS}
Displaying connection {connectionPage} of {totalUniqueKS}
</Typography>
<Button
sx={{
width: '4rem !important',
width: '5rem !important',
marginLeft: '.25rem',
}}
onClick={handleUpClick}
>
Next
</Button>
</ButtonGroup>
)}

<Breadcrumbs separator={<ArrowRight />} aria-label="breadcrumb">
{showDetails === SummaryType.DetailedSummary ? (
<></>
) : (
<Typography>Summary</Typography>
)}
</Breadcrumbs>
</Stack>

<Box
sx={{
display: 'flex',
alignItems: 'center',
gap: '0.75rem',
}}
>
{showDetails === SummaryType.DetailedSummary ? (
<></>
) : (
<>
<Box
Expand Down