Merge pull request #1690 from florinnania/not-trigger-LoginRequired-f…

…or-ContributorsCard-in-EntityPage Fix for #1665 to not trigger login required for contributors card in entity page
RoadieHQ · Oct 23, 2024 · 85c687f · 85c687f
2 parents 5e556b3 + 0d9c26c
commit 85c687f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/.changeset/fuzzy-ads-sleep.md b/.changeset/fuzzy-ads-sleep.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/backstage-plugin-github-insights': patch
+---
+
+Fix to not trigger LoginRequired screen for ContributorsCard in EntityPage
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -62,6 +62,7 @@ import {
 } from '@roadiehq/backstage-plugin-aws-lambda';
 import {
   EntityGithubInsightsContent,
+  EntityGithubInsightsContributorsCard,
   EntityGithubInsightsLanguagesCard,
   EntityGithubInsightsReadmeCard,
   EntityGithubInsightsReleasesCard,
@@ -239,6 +240,9 @@ const overviewContent = (
     </EntitySwitch>
     <EntitySwitch>
       <EntitySwitch.Case if={e => Boolean(isGithubInsightsAvailable(e))}>
+        <Grid item md={3}>
+          <EntityGithubInsightsContributorsCard />
+        </Grid>
         <Grid item md={6}>
           <EntityGithubInsightsLanguagesCard />
           <EntityGithubInsightsReleasesCard />

diff --git a/...stage-plugin-github-insights/src/components/Widgets/ContributorsCard/ContributorsCard.tsx b/...stage-plugin-github-insights/src/components/Widgets/ContributorsCard/ContributorsCard.tsx
@@ -45,28 +45,19 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
-const ContributorsCard = () => {
+const ContributorsCardContent = () => {
   const { entity } = useEntity();
   const classes = useStyles();
   const { value, loading, error } = useRequest(entity, 'contributors', 10);
   const { hostname } = useEntityGithubScmIntegration(entity);
   const projectAlert = isGithubInsightsAvailable(entity);
   const { owner, repo } = useProjectEntity(entity);
-  const isLoggedIn = useGithubLoggedIn();
   if (!projectAlert) {
     return (
       <MissingAnnotationEmptyState annotation={GITHUB_INSIGHTS_ANNOTATION} />
     );
   }
 
-  if (!isLoggedIn) {
-    return (
-      <InfoCard title="Contributors" className={classes.infoCard}>
-        <GithubNotAuthorized />
-      </InfoCard>
-    );
-  }
-
   if (loading) {
     return <Progress />;
   } else if (error) {
@@ -97,4 +88,17 @@ const ContributorsCard = () => {
   );
 };
 
+const ContributorsCard = () => {
+  const classes = useStyles();
+  const isLoggedIn = useGithubLoggedIn();
+
+  return isLoggedIn ? (
+    <ContributorsCardContent />
+  ) : (
+    <InfoCard title="Contributors" className={classes.infoCard}>
+      <GithubNotAuthorized />
+    </InfoCard>
+  );
+};
+
 export default ContributorsCard;