Skip to content

fix: added iframe overlay to 'remove' border #438

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 3 commits into from
Sep 18, 2024
Merged

fix: added iframe overlay to 'remove' border #438

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3228fb
fix: added iframe overlay to 'remove' border
dennisvankekem Sep 17, 2024
7f6e54c
fix: add iframe border mask to remove borders from the iframes for th…
ferruhcihan Sep 17, 2024
f02da95
fix: title in platform dashboard
srodenhuis Sep 18, 2024
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
39 changes: 30 additions & 9 deletions src/components/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,39 @@ const useStyles = makeStyles()((theme) => ({
iframeSmall: {
width: '25%',
height: '100px',
border: 'none',
margin: '10px 0px',
},
iframeMedium: {
width: '33.3%',
height: '200px',
border: 'none',
margin: '10px 0px',
},
iframeLarge: {
width: '50%',
height: '200px',
border: 'none',
margin: '10px 0px',
},
iframeFullWidth: {
width: '100%',
height: '200px',
border: 'none',
margin: '10px 0px',
},
iframe: {
width: '100%',
height: '100%',
border: 'none',
},
iframeBorderMask: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
bottom: 0,
border: '1px solid white',
pointerEvents: 'none',
background: 'transparent',
zIndex: 1,
},
}))

// types -----------------------------------------------------------
Expand Down Expand Up @@ -107,13 +119,16 @@ interface IFrameProps {
id: string
src: string
className: string
classes: any
themeMode: string
}

interface IFramesCardProps {
classes: any
title: string
iframeSources: any[]
iframeClass: string
themeMode: string
show?: boolean
}

Expand Down Expand Up @@ -155,11 +170,16 @@ function InventoryCard({ classes, title, inventory, themeView, teamId }: Invento
)
}

function IFrame({ id, src, className }: IFrameProps) {
return <iframe key={`iframe-${id}`} id={`iframe-${id}`} title={`iframe-${id}`} src={src} className={className} />
function IFrame({ id, src, className, classes, themeMode }: IFrameProps) {
return (
<div className={className} style={{ position: 'relative' }}>
{themeMode === 'light' && <div className={classes.iframeBorderMask} />}
<iframe key={`iframe-${id}`} id={`iframe-${id}`} title={`iframe-${id}`} src={src} className={classes.iframe} />
</div>
)
}

function IFramesCard({ classes, title, iframeSources, iframeClass, show = false }: IFramesCardProps) {
function IFramesCard({ classes, title, iframeSources, iframeClass, themeMode, show = false }: IFramesCardProps) {
const boxClass = iframeClass.includes('iframeFullWidth') ? classes.iframeColumn : classes.iframeRow
if (!show) return null
return (
Expand All @@ -169,7 +189,7 @@ function IFramesCard({ classes, title, iframeSources, iframeClass, show = false
</Typography>
<Box className={boxClass}>
{iframeSources.map((item) => (
<IFrame id={item.id} src={item.src} className={iframeClass} />
<IFrame id={item.id} src={item.src} className={iframeClass} classes={classes} themeMode={themeMode} />
))}
</Box>
</Grid>
Expand Down Expand Up @@ -219,7 +239,7 @@ export default function Dashboard({ team, inventory }: Props): React.ReactElemen
show: appsEnabled.grafana,
},
{
title: 'Cluster Resource Request Commitments',
title: 'Cluster Resource Requests Commitment',
iframeClass: classes.iframeLarge,
iframeSources: [
{ id: '4', src: `${clusterResourceUtilization}2` },
Expand Down Expand Up @@ -287,6 +307,7 @@ export default function Dashboard({ team, inventory }: Props): React.ReactElemen
iframeSources={item.iframeSources}
iframeClass={item.iframeClass}
show={item.show}
themeMode={theme.palette.mode}
/>
))}
</Box>
Expand Down