Skip to content

Org list box size 1236 #1252

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
maxskewes wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Org list box size 1236 #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
38df676
added '...' truncation to longer org names
maxskewes May 24, 2022
ca71363
Added ellipsis to org names
maxskewes May 27, 2022
c0c84c8
Merge branch 'main' into org-list-box-size-1236
maxskewes May 27, 2022
b9216d9
Merge branch 'main' into org-list-box-size-1236
bruceplai Jun 3, 2022
caf9020
Merge branch 'main' into org-list-box-size-1236
bruceplai Jun 6, 2022
e14ec00
Clean Up 6.6.22
maxskewes Jun 6, 2022
c01fb18
Merge branch 'main' into org-list-box-size-1236
bruceplai Jun 8, 2022
e15c390
Merge branch 'main' into org-list-box-size-1236
bruceplai Jun 8, 2022
910a7d8
Merge branch 'main' into org-list-box-size-1236
bruceplai Jun 9, 2022
afbc86b
Merge branch 'main' into org-list-box-size-1236
bruceplai Jun 10, 2022
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
143 changes: 64 additions & 79 deletions src/components/ContributorThumbnail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import React, { useEffect, useState } from 'react';
import Box from '@material-ui/core/Box';
import CardMedia from '@material-ui/core/CardMedia';
import Grid from '@material-ui/core/Grid';
import Link from '@material-ui/core/Link';
import Typography from '@material-ui/core/Typography';
import makeStyles from '@material-ui/core/styles/makeStyles';
Expand All @@ -14,15 +13,28 @@ const useStyles = makeStyles((theme) => ({
thumbnailWrapper: {
display: 'flex',
flexDirection: 'row',
alignItems: 'flex-end',
padding: '13px',
alignItems: 'center',
flexWrap: 'nowrap',
padding: '12px 16px',
[theme.breakpoints.down('md')]: {
padding: '8px 16px',
},
[theme.breakpoints.down('sm')]: {
padding: '0px',
marginTop: '1px',
marginLeft: '1px',
padding: '8px 8px',
// marginTop: '1px',
// marginLeft: '1px',
},
},
// thumbnailWrapperContributor: {
// display: 'flex',
// flexDirection: 'row',
// alignItems: 'flex-end',
// padding: '13px',
// flexWrap: 'nowrap',
// [theme.breakpoints.down('sm')]: {
// padding: '5px',
// },
// },
thumbnailImage: {
width: '48px',
height: '48px',
Expand All @@ -31,9 +43,19 @@ const useStyles = makeStyles((theme) => ({
height: '26px',
},
},
thumbnailChildImage: {
width: '32px',
height: '32px',
[theme.breakpoints.down('sm')]: {
width: '20px',
height: '20px',
},
},
textElipsisLimiter: {
width: '97%',
},
orgText: {
paddingLeft: '9px',
paddingTop: '3px',
'& a:link': {
color: `${spectrum.teal} !important`,
textDecoration: 'none',
Expand Down Expand Up @@ -101,38 +123,16 @@ const useStyles = makeStyles((theme) => ({
right: 0,
},
},
thumbnailWrapperContributor: {
display: 'flex',
flexDirection: 'row',
alignItems: 'flex-end',
padding: '13px',
flexWrap: 'nowrap',
position: 'relative',
[theme.breakpoints.down('sm')]: {
padding: '5px',
},
},
thumbnailChildImage: {
width: '32px',
height: '32px',
[theme.breakpoints.down('sm')]: {
width: '20px',
height: '20px',
marginTop: '5px',
marginLeft: '10px',
},
},
contributorIcon: {
margin: '24px',
width: '24px',
height: '24px',
[theme.breakpoints.down('sm')]: {
margin: '17px',
width: '17px',
height: '17px',
},
},
parentText: {
alignItems: 'center',
},
}));

export const ContributorThumbnail = ({
Expand All @@ -143,7 +143,7 @@ export const ContributorThumbnail = ({
checkboxValue,
filtersActive,
}) => {
const classes = useStyles();

const [thumbnailInfo, setThumbnailInfo] = useState({});

useEffect(() => {
Expand All @@ -152,26 +152,24 @@ export const ContributorThumbnail = ({

return (
<>
<Box style={{ position: 'relative' }}>
{thumbnailInfo.organizationUrl ? (
<Thumbnail
thumbnailInfo={thumbnailInfo}
organization={organization}
isOpen={isOpen}
dropdownLength={dropdownLength}
isChildThumbnail={isChildThumbnail}
checkboxValue={checkboxValue}
filtersActive={filtersActive}
/>
) : (
<Grid className={classes.textWrapperWithoutImage} component='span'>
<Typography component='span'>
{' '}
No URL Data for {organization.name}{' '}
</Typography>
</Grid>
)}
</Box>
{thumbnailInfo.organizationUrl ? (
<Thumbnail
thumbnailInfo={thumbnailInfo}
organization={organization}
isOpen={isOpen}
dropdownLength={dropdownLength}
isChildThumbnail={isChildThumbnail}
checkboxValue={checkboxValue}
filtersActive={filtersActive}
/>
) : (
<>
<Typography component='span'>
{' '}
No URL Data for {organization.name}{' '}
</Typography>
</>
)}
</>
);
};
Expand All @@ -188,11 +186,11 @@ const Thumbnail = ({
const classes = useStyles();
let thumbnailImageStyle, thumbnailWrapperStyle;

if (organization.cti_contributor) {
thumbnailWrapperStyle = classes.thumbnailWrapperContributor;
} else {
thumbnailWrapperStyle = `${classes.thumbnailWrapper} ${classes.parentText}`;
}
// if (organization.cti_contributor) {
// thumbnailWrapperStyle = classes.thumbnailWrapperContributor;
// } else {
// thumbnailWrapperStyle = classes.thumbnailWrapper;
// }
if (organization.affiliated && organization.depth === 3) {
thumbnailImageStyle = classes.thumbnailImage;
} else if (organization.depth === 4) {
Expand All @@ -218,21 +216,8 @@ const Thumbnail = ({
'childNodes' in organization && organization.depth === 2;

return (
<>
<Box className={classes.contributorItem}>
{organization.depth === 4 &&
checkboxValue &&
organization.cti_contributor ? (
<img
alt='contributor-icon'
data-cy='contributor-icon'
className={classes.contributorIcon}
src='/images/Child_contributed.svg'
/>
) : null}
</Box>
<Grid className={thumbnailWrapperStyle}>
<Grid item className={classes.imageWrapper}>
<Box className={classes.thumbnailWrapper}>
<Box className={classes.imageWrapper}>
<CardMedia
component='img'
src={thumbnailInfo.imageUrl}
Expand All @@ -246,8 +231,8 @@ const Thumbnail = ({
alt={`${organization.name} logo`}
loading='lazy'
/>
</Grid>
<Grid item className={classes.affthumbnailText}>
</Box>
<Box className={classes.textElipsisLimiter}>
<Typography
variant={isChildThumbnail ? 'h6' : 'h5'}
aria-level={isChildThumbnail ? '4' : '3'}
Expand All @@ -266,8 +251,9 @@ const Thumbnail = ({
</Link>{' '}
{showtotalChildCount()}
</Typography>
</Grid>
<Grid>
</Box>
{/* what is gparenticon? */}
{/* <Box>
<Typography>
{organization.childNodes?.length > 0 && checkboxValue ? (
<img
Expand All @@ -280,8 +266,7 @@ const Thumbnail = ({
' '
)}
</Typography>
</Grid>
</Grid>
</>
</Box> */}
</Box>
);
};
69 changes: 33 additions & 36 deletions src/components/Dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,45 @@ import { ContributorThumbnail } from './ContributorThumbnail';
import { DropdownArrow } from './DropdownArrow';
import Grid from '@material-ui/core/Grid';
import clsx from 'clsx';
import { Box } from '@material-ui/core';

const useStyles = makeStyles((theme) => ({
dropdown: {
margin: '24px auto',
width: '100%',
margin: '16px 0 0 0',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: theme.palette.background.default,
boxSizing: 'border-box',
border: '1px solid',
borderColor: theme.palette.outline.gray,
borderRadius: '6px',
height: '80px',
padding: '12px 16px',
[theme.breakpoints.down('sm')]: {
height: '49px',
},
},
arrowBox: {
display: 'flex',
alignItems: 'center',
padding: '0 16px',
[theme.breakpoints.down('md')]: {
padding: '0 16px',
},
[theme.breakpoints.down('sm')]: {
padding: '0 8px',
},
},
open: {
backgroundColor: theme.palette.secondary.dark,
color: theme.palette.text.secondary,
borderRadius: '6px 6px 0 0',
marginBottom: 0,
[theme.breakpoints.down('sm')]: {
height: '49px',
},
},
flexGrid: {
flexGrow: 1,
justifyContent: 'flex-end',
},
}));

export const Dropdown = ({
Expand Down Expand Up @@ -60,49 +70,36 @@ export const Dropdown = ({
}, [isOpen]);

return (
<Grid data-cy='thumbnail-dropdown'>
<Box data-cy='thumbnail-dropdown'>
{dropdownLength > 0 ? (
<Grid
item
xs={10}
<Box
className={clsx(classes.dropdown, {
[classes.open]: isOpen,
})}
>
<Grid>
<ContributorThumbnail
organization={organization}
filtersActive={filtersActive}
checkboxValue={checkboxValue}
dropdownLength={dropdownLength}
isOpen={isOpen}
isChildThumbnail={false}
/>
</Grid>
<Grid className={classes.flexGrid}></Grid>
<Grid
item
container
className={classes.flexGrid}
onClick={handleClick}
>
<DropdownArrow
open={isOpen}
handleArrow={handleClick}
/>
</Grid>
</Grid>
<ContributorThumbnail
organization={organization}
filtersActive={filtersActive}
checkboxValue={checkboxValue}
dropdownLength={dropdownLength}
isOpen={isOpen}
isChildThumbnail={false}
/>
<Box onClick={handleClick} className={classes.arrowBox}>
<DropdownArrow open={isOpen} />
</Box>
</Box>
) : (
<Grid item xs={10} className={classes.dropdown}>
<Box item className={classes.dropdown}>
<ContributorThumbnail
organization={organization}
checkboxValue={checkboxValue}
isChildThumbnail={false}
/>
</Grid>
</Box>
)}
{isOpen && children}
</Grid>
</Box>
);
};
export default Dropdown;
Loading