Merge branch 'stud-dashboard-stats' into truth-redefined-again

kossiitkgp · Dec 27, 2023 · 2f0e7f7 · 2f0e7f7
2 parents c86a362 + 2a17ce5
commit 2f0e7f7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/pages/MentorDashboard.tsx b/src/pages/MentorDashboard.tsx
@@ -11,6 +11,7 @@ import { REGISTRATIONS_OPEN, ROUTER_PATHS } from "../util/constants";
 import { makeRequest } from "../util/backend";
 import SpinnerLoader from "../components/SpinnerLoader";
 import { Profile, Resources } from "../components/DashboardElements";
+import { formatPullRequest } from "../util/format";
 
 function MentorDashboard() {
   const navigate = useNavigate();
@@ -150,10 +151,7 @@ function MentorDashboard() {
                       rel="noopener noreferrer"
                       className="text-primary hover:text-primary-600 hover:underline"
                     >
-                      {pull
-                        .replace("https://github.com/", "")
-                        .replace("pull/", "")
-                        .replace(/\/\d/, "#")}
+                      {formatPullRequest(pull)}
                     </a>
                   ))}
               </div>

diff --git a/src/pages/StudentDashboard.tsx b/src/pages/StudentDashboard.tsx
@@ -16,6 +16,7 @@ import { BiGitCommit, BiGitPullRequest } from "react-icons/bi";
 import { MdOutlineDifference } from "react-icons/md";
 import { FaCode } from "react-icons/fa";
 import { HiOutlineDocumentReport } from "react-icons/hi";
+import { formatPullRequest } from "../util/format";
 
 function StudentDashboard() {
   const navigate = useNavigate();
@@ -283,10 +284,7 @@ function StudentDashboard() {
                       rel="noopener noreferrer"
                       className="text-primary hover:text-primary-600 hover:underline"
                     >
-                      {pull
-                        .replace("https://github.com/", "")
-                        .replace("pull/", "")
-                        .replace(/\/\d/, "#")}
+                      {formatPullRequest(pull)}
                     </a>
                   ))
                 : "None"}

diff --git a/src/util/format.ts b/src/util/format.ts
@@ -0,0 +1,13 @@
+// Formats a pull request in the format [org]/[repo]#[number] from the url
+export function formatPullRequest(url: string): string {
+  return url
+    .replace("https://github.com/", "")
+    .replace("pull/", "")
+    .split("")
+    .reverse()
+    .join("")
+    .replace("/", "#")
+    .split("")
+    .reverse()
+    .join("");
+}