Merge branch 'main' into update-landing-909

Author: bruceplai

src/components/ContributorThumbnail.js

@@ -40,7 +40,7 @@ const useStyles = makeStyles((theme) => ({
     '& a:visited': {
       color: theme.palette.secondary.dark,
     },
-    [theme.breakpoints.between('xs','sm')]: {
+    [theme.breakpoints.between('xs', 'sm')]: {
       fontSize: '12px',
     },
     [theme.breakpoints.up('md')]: {
@@ -56,7 +56,7 @@ const useStyles = makeStyles((theme) => ({
     '& a:visited': {
       color: theme.palette.text.secondary,
     },
-    [theme.breakpoints.between('xs','sm')]: {
+    [theme.breakpoints.between('xs', 'sm')]: {
       fontSize: '12px',
     },
     [theme.breakpoints.up('md')]: {
@@ -81,7 +81,7 @@ const useStyles = makeStyles((theme) => ({
   },
   contributorItem: {
     display: 'grid',
-    position:'absolute',
+    position: 'absolute',
     marginTop: '2px',
     right: '0',
     [theme.breakpoints.down('sm')]: {
@@ -172,17 +172,27 @@ const Thumbnail = ({
   dropdownLength,
   isChildThumbnail,
   checkboxValue,
-  inputValue,
   filtersActive,
 }) => {
   const classes = useStyles();
   let thumbnailImageStyle, thumbnailWrapperStyle;
-  if (
-    thumbnailInfo.imageUrl.includes('undefined') ||
-    thumbnailInfo.imageUrl.includes('scontent')
-  ) {
-    thumbnailInfo.imageUrl = '/images/default-github-repo-image.png';
+
+  const githubId = organization.github_id;
+
+  if (!githubId) {
+    if (thumbnailInfo.imageUrl && organization.image_url) {
+      thumbnailInfo.imageUrl = organization.image_url;
+    }
+    if (
+      thumbnailInfo.imageUrl.includes('undefined') ||
+      thumbnailInfo.imageUrl.includes('scontent')
+    ) {
+      thumbnailInfo.imageUrl = '/images/default-github-repo-image.png';
+    }
+  } else {
+    thumbnailInfo.imageUrl = `https://avatars1.githubusercontent.com/u/${githubId}?s=100&v=4`;
   }
+
   if (organization.cti_contributor) {
     thumbnailWrapperStyle = classes.thumbnailWrapperContributor;
   } else {
@@ -197,7 +207,6 @@ const Thumbnail = ({
   }
 
   const showtotalChildCount = () => {
-
     let displayedCount = '';
 
     if (dropdownLength) {

src/components/getOrgId.js

@@ -1,16 +1,15 @@
-import { names } from "./data/orgs.js";
+import { names } from './data/orgs.js';
 
 export const getOrgId = (githubUrl) => {
   let orgname;
-  if (githubUrl.split("https://github.com/")[1]) {
-    orgname = githubUrl.split("https://github.com/")[1].split("/")[0];
-    const org = orgname.replace(/\s/g, "").trim().toLowerCase();
+  if (githubUrl.split('https://github.com/')[1]) {
+    orgname = githubUrl.split('https://github.com/')[1].split('/')[0];
+    const org = orgname.replace(/\s/g, '').trim().toLowerCase();
     const id = names.get(org);
     return id;
   } else {
-    // TODO: Sean handle github url error
     // eslint-disable-next-line
     console.log(`error with github url: ${githubUrl}`);
-    return 11635254;
+    return '';
   }
-}
+};