- {calcDistanceFromToday(new Date(parseInt(prIssuedTime, 10)))}
+ {calcDistanceFromToday(new Date(prIssuedTime))}
- {merged ? calcDistanceFromToday(new Date(parseInt(prMergedTime, 10))) : "-"}
+ {merged ? calcDistanceFromToday(new Date(prMergedTime)) : "-"}
{noOfFilesChanged >= 1000 ? humanizeNumber(noOfFilesChanged, "abbreviation") : noOfFilesChanged}
diff --git a/components/molecules/PullRequestTable/pull-request-table.tsx b/components/molecules/PullRequestTable/pull-request-table.tsx
index 288500cfcc..eef5b1ee2d 100644
--- a/components/molecules/PullRequestTable/pull-request-table.tsx
+++ b/components/molecules/PullRequestTable/pull-request-table.tsx
@@ -1,4 +1,4 @@
-import { useTopicContributorPRs } from "lib/hooks/useTopicContributorPRs";
+import useContributorPullRequests from "lib/hooks/api/useContributorPullRequests";
import SkeletonWrapper from "components/atoms/SkeletonLoader/skeleton-wrapper";
import LatestPrTableHeader from "../LatestPrTableHeader/latest-pr-table-header";
@@ -22,7 +22,7 @@ interface CardTableProps {
}
const PullRequestTable = ({ contributor, topic, repositories, limit, isHoverCard }: CardTableProps): JSX.Element => {
- const { data, isLoading } = useTopicContributorPRs(contributor, topic, repositories, limit);
+ const { data, isLoading } = useContributorPullRequests(contributor, topic, repositories, limit);
return data.length > 0 ? (
<>
@@ -37,11 +37,11 @@ const PullRequestTable = ({ contributor, topic, repositories, limit, isHoverCard
merged,
merged_at: prMergedTime,
created_at: prIssuedTime,
- filesCount: noOfFilesChanged,
- linesCount: noOfLinesChanged,
+ changed_files: noOfFilesChanged,
+ additions,
+ deletions,
number: prNumber,
- repo_name: repoName,
- repo_owner: repoOwner,
+ full_name: fullName,
updated_at: prUpdatedTime
},
index
@@ -53,9 +53,8 @@ const PullRequestTable = ({ contributor, topic, repositories, limit, isHoverCard
prStatus,
merged,
noOfFilesChanged,
- noOfLinesChanged,
- repoName,
- repoOwner,
+ noOfLinesChanged: Math.abs(additions - deletions),
+ repoFullName: fullName,
prNumber,
prUpdatedTime
};
diff --git a/components/molecules/RepoCardProfile/repo-card-profile.tsx b/components/molecules/RepoCardProfile/repo-card-profile.tsx
index 33c83643b1..afb463a9f8 100644
--- a/components/molecules/RepoCardProfile/repo-card-profile.tsx
+++ b/components/molecules/RepoCardProfile/repo-card-profile.tsx
@@ -6,8 +6,8 @@ import { VscIssues } from "react-icons/vsc";
export interface RepoCardProfileProps {
avatar?: string | StaticImageData;
- orgName?: string;
- repoName?: string;
+ orgName: string;
+ repoName: string;
prCount?: number;
issueCount?: number;
className?: string;
diff --git a/components/molecules/SuggestedRepo/suggested-repo.tsx b/components/molecules/SuggestedRepo/suggested-repo.tsx
index 44b0a5f4b5..ce5e8c3f8b 100644
--- a/components/molecules/SuggestedRepo/suggested-repo.tsx
+++ b/components/molecules/SuggestedRepo/suggested-repo.tsx
@@ -7,14 +7,16 @@ import Avatar from "components/atoms/Avatar/avatar";
import RepoCardProfile, { RepoCardProfileProps } from "../RepoCardProfile/repo-card-profile";
interface SuggestedRopsitoryProps {
- data?: RepoCardProfileProps;
+ data: RepoCardProfileProps;
+ onAddRepo?: (repo: string) => void;
}
-const SuggestedRepository = ({ data }: SuggestedRopsitoryProps) => {
- // Utilizing static data for testing purpose until real data is available
+const SuggestedRepository = ({ data, onAddRepo }: SuggestedRopsitoryProps) => {
return (
-
diff --git a/components/organisms/Dashboard/dashboard.tsx b/components/organisms/Dashboard/dashboard.tsx
index dc2881e485..8fe50a14fc 100644
--- a/components/organisms/Dashboard/dashboard.tsx
+++ b/components/organisms/Dashboard/dashboard.tsx
@@ -9,10 +9,10 @@ import { ScatterChartDataItems } from "components/molecules/NivoScatterChart/niv
import humanizeNumber from "lib/utils/humanizeNumber";
import { useMediaQuery } from "lib/hooks/useMediaQuery";
import { getInsights, useInsights } from "lib/hooks/useInsights";
-import { useTopicPRs } from "lib/hooks/useTopicPRs";
import { calcDaysFromToday } from "lib/utils/date-utils";
import roundedImage from "lib/utils/roundedImages";
import { useTopicContributions } from "lib/hooks/useTopicContributions";
+import usePullRequests from "lib/hooks/api/usePullRequests";
type ContributorPrMap = { [contributor: string]: DbRepoPR };
export type PrStatusFilter = "open" | "closed" | "all";
@@ -23,7 +23,7 @@ interface DashboardProps {
export const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
const { data: insightsData, isLoading } = useInsights(repositories);
- const { data: prData, isError: prError } = useTopicPRs(undefined, repositories);
+ const { data: prData, isError: prError } = usePullRequests(undefined, repositories);
const { data: contributorData } = useTopicContributions(10, repositories);
const [showBots, setShowBots] = useState(false);
const isMobile = useMediaQuery("(max-width:720px)");
@@ -44,10 +44,10 @@ export const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
if (curr.state !== prStateFilter && prStateFilter !== "all") return prs;
if (prs[curr.author_login]) {
- prs[curr.author_login].linesCount += curr.linesCount;
+ prs[curr.author_login].linesCount += Math.abs(curr.additions - curr.deletions);
} else {
prs[curr.author_login] = { ...curr };
- prs[curr.author_login].linesCount = curr.linesCount;
+ prs[curr.author_login].linesCount = Math.abs(curr.additions - curr.deletions);
}
return prs;
@@ -70,7 +70,7 @@ export const Dashboard = ({ repositories }: DashboardProps): JSX.Element => {
const author_image = author_login.includes("[bot]") ? "octocat" : author_login;
const data = {
- x: calcDaysFromToday(new Date(parseInt(updated_at, 10))),
+ 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)
diff --git a/components/organisms/InsightPage/InsightPage.tsx b/components/organisms/InsightPage/InsightPage.tsx
index 4123962424..66d913a18d 100644
--- a/components/organisms/InsightPage/InsightPage.tsx
+++ b/components/organisms/InsightPage/InsightPage.tsx
@@ -18,6 +18,8 @@ import useStore from "lib/store";
import Error from "components/atoms/Error/Error";
import Search from "components/atoms/Search/search";
import { useDebounce } from "rooks";
+import SuggestedRepositoriesList from "../SuggestedRepoList/suggested-repo-list";
+import { RepoCardProfileProps } from "components/molecules/RepoCardProfile/repo-card-profile";
enum RepoLookupError {
Initial = 0,
@@ -105,7 +107,7 @@ const InsightPage = ({ edit, insight, pageRepos }: InsightPageProps) => {
},
body: JSON.stringify({
name,
- ids: repos.map((repo) => repo.id),
+ repos: repos.map((repo) => ({ id: repo.host_id, fullName: repo.full_name })),
// eslint-disable-next-line
is_public: isPublic
})
@@ -129,7 +131,7 @@ const InsightPage = ({ edit, insight, pageRepos }: InsightPageProps) => {
},
body: JSON.stringify({
name,
- ids: repos.map((repo) => repo.id),
+ repos: repos.map((repo) => ({ id: repo.host_id, fullName: repo.full_name })),
// eslint-disable-next-line
is_public: isPublic
})
@@ -261,6 +263,11 @@ const InsightPage = ({ edit, insight, pageRepos }: InsightPageProps) => {
updateSuggestionsDebounced();
}, [repoSearchTerm]);
+ const staticSuggestedRepos: RepoCardProfileProps[] = [
+ { avatar: "https://avatars.githubusercontent.com/u/57568598?s=200&v=4", prCount: 8, repoName: "insights", issueCount: 87, orgName: "open-sauced" },
+ { avatar: "https://avatars.githubusercontent.com/u/59704711?s=200&v=4", prCount: 26, repoName: "cli", issueCount: 398, orgName: "cli" },
+ { avatar: "https://avatars.githubusercontent.com/u/42048915?s=200&v=4", prCount: 100, repoName: "deno", issueCount: 1200, orgName: "denoland" }
+ ];
return (
@@ -299,6 +306,9 @@ const InsightPage = ({ edit, insight, pageRepos }: InsightPageProps) => {
Add Repository