fix: update contributors hook to use contributor API endpoint (#1238)

components/molecules/ContributorListTableRow/contributor-list-table-row.tsx

@@ -14,7 +14,7 @@ import useRepoList from "lib/hooks/useRepoList";
 import { useFetchUser } from "lib/hooks/useFetchUser";
 
 interface ContributorListTableRow {
-  contributor: DbRepoPR;
+  contributor: DbPRContributor;
   topic: string;
 }
 
@@ -50,7 +50,7 @@ const ContributorListTableRow = ({ contributor, topic }: ContributorListTableRow
   const totalPrs = data.length;
   const last30days = [
     {
-      id: `last30-${contributor.repo_id}`,
+      id: `last30-${contributor.author_login}`,
       color: "hsl(63, 70%, 50%)",
       data: days,
     },

components/organisms/Contributors/contributors.tsx

@@ -34,7 +34,7 @@ const Contributors = ({ repositories }: ContributorProps): JSX.Element => {
   const contributors = data.map((pr) => {
     return {
       host_login: pr.author_login,
-      first_commit_time: pr.created_at,
+      first_commit_time: pr.updated_at,
     };
   });
 
@@ -52,8 +52,6 @@ const Contributors = ({ repositories }: ContributorProps): JSX.Element => {
       };
     });
 
-  // console.log(data);
-
   return (
     <>
       {/* Table section */}

components/organisms/ContributorsTable/contributors-table.tsx

@@ -3,7 +3,7 @@ import ContributorListTableRow from "components/molecules/ContributorListTableRo
 import React from "react";
 
 export interface ContributorTableProps {
-  contributors: DbRepoPR[];
+  contributors: DbPRContributor[];
   topic: string;
   loading?: boolean;
 }

components/organisms/Dashboard/dashboard.tsx

@@ -12,7 +12,7 @@ import { getInsights, useInsights } from "lib/hooks/api/useInsights";
 import { calcDaysFromToday } from "lib/utils/date-utils";
 import roundedImage from "lib/utils/roundedImages";
 import usePullRequests from "lib/hooks/api/usePullRequests";
-import getPullRequestsContributors from "lib/utils/get-pr-contributors";
+import useContributors from "lib/hooks/api/useContributors";
 
 type ContributorPrMap = { [contributor: string]: DbRepoPR };
 export type PrStatusFilter = "open" | "closed" | "all";
@@ -23,11 +23,11 @@ interface DashboardProps {
 
 const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
   const { data: insightsData, isLoading } = useInsights(repositories);
-  const { data: prData, meta: prMeta, isError: prError } = usePullRequests(undefined, repositories);
+  const { data: prData, isError: prError } = usePullRequests(undefined, repositories);
+  const { data: contributorData, meta: contributorMeta } = useContributors(undefined, repositories);
   const [showBots, setShowBots] = useState(false);
   const isMobile = useMediaQuery("(max-width:720px)");
   const [prStateFilter, setPrStateFilter] = useState<PrStatusFilter>("all");
-  const contributorData = getPullRequestsContributors(prData);
 
   const handleSetPrFilter = (state: PrStatusFilter) => {
     setPrStateFilter(state);
@@ -37,7 +37,7 @@ const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
   let metadata: ScatterChartMetadata = {
     allPrs: prData.length,
     openPrs: prData.filter((pr) => pr.state.toLowerCase() === "open").length,
-    closedPrs: prData.filter((pr) => pr.state.toLowerCase() === "closed" || pr.state.toLowerCase() === "merged").length
+    closedPrs: prData.filter((pr) => pr.state.toLowerCase() === "closed" || pr.state.toLowerCase() === "merged").length,
   };
 
   const uniqueContributors: ContributorPrMap = prData.reduce((prs, curr) => {
@@ -73,7 +73,7 @@ const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
         x: calcDaysFromToday(new Date(updated_at)),
         y: linesCount,
         contributor: author_login,
-        image: roundedImage(`https://www.github.com/${author_image}.png?size=60`, process.env.NEXT_PUBLIC_CLOUD_NAME)
+        image: roundedImage(`https://www.github.com/${author_image}.png?size=60`, process.env.NEXT_PUBLIC_CLOUD_NAME),
       };
       return data;
     });
@@ -99,8 +99,8 @@ const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
           metricIncreases={compare1.allPrsTotal - compare2.allPrsTotal >= 0}
           increased={compare1.allPrsTotal - compare2.allPrsTotal >= 0}
           numChanged={humanizeNumber(Math.abs(compare1.allPrsTotal - compare2.allPrsTotal), "abbreviation")}
-          value={humanizeNumber(prMeta.itemCount, "comma")}
-          contributors={contributorData}
+          value={humanizeNumber(contributorMeta.itemCount, "comma")}
+          contributors={contributorData.map((contributor) => ({ host_login: contributor.author_login }))}
           isLoading={isLoading}
         />
         <HighlightCard

lib/hooks/api/useContributors.ts

@@ -6,18 +6,17 @@ import publicApiFetcher from "lib/utils/public-api-fetcher";
 import getFilterQuery from "lib/utils/get-filter-query";
 
 interface PaginatedResponse {
-  readonly data: DbRepoPR[];
+  readonly data: DbPRContributor[];
   readonly meta: Meta;
 }
 
 /**
  * Fetch contributors based on pull requests.
- * Replace with contributors API endpoint when available.
- * 
- * @param intialLimit 
- * @param repoIds 
- * @param range 
- * @returns 
+ *
+ * @param intialLimit
+ * @param repoIds
+ * @param range
+ * @returns
  */
 const useContributors = (intialLimit = 10, repoIds: number[] = [], range = 30) => {
   const router = useRouter();
@@ -51,7 +50,7 @@ const useContributors = (intialLimit = 10, repoIds: number[] = [], range = 30) =
 
   query.set("range", `${range}`);
 
-  const baseEndpoint = "prs/search";
+  const baseEndpoint = "contributors/search";
   const endpointString = `${baseEndpoint}?${query.toString()}`;
 
   const { data, error, mutate } = useSWR<PaginatedResponse, Error>(
@@ -67,7 +66,7 @@ const useContributors = (intialLimit = 10, repoIds: number[] = [], range = 30) =
     mutate,
     page,
     setPage,
-    setLimit
+    setLimit,
   };
 };
 

next-types.d.ts

@@ -41,6 +41,11 @@ interface DbRepoPR {
   readonly last_updated_at: string;
 }
 
+interface DbPRContributor {
+  readonly author_login: string;
+  readonly updated_at: string;
+}
+
 interface DbFollowUser {
   readonly id: number;
   readonly user_id: number;