implemented suggestions

Rajgupta36 · Rajgupta36 · commit 857041c98ce6 · 2025-10-09T01:10:49.000+05:30
diff --git a/frontend/__tests__/unit/components/CardDetailsPage.test.tsx b/frontend/__tests__/unit/components/CardDetailsPage.test.tsx
@@ -518,6 +518,7 @@ describe('CardDetailsPage', () => {
 
   const mockPullRequests = [
     {
+      id: 'mock-pull-request-1',
       author: mockUser,
       createdAt: new Date(Date.now() - 172800000).toISOString(),
       organizationName: 'test-org',
diff --git a/frontend/__tests__/unit/components/ItemCardList.test.tsx b/frontend/__tests__/unit/components/ItemCardList.test.tsx
@@ -148,6 +148,7 @@ const mockMilestone: Milestone = {
 }
 
 const mockPullRequest: PullRequest = {
+  id: 'mock-pull-request-id',
   author: {
     ...mockUser,
     login: 'author3',
diff --git a/frontend/__tests__/unit/components/RecentPullRequests.test.tsx b/frontend/__tests__/unit/components/RecentPullRequests.test.tsx
@@ -40,6 +40,7 @@ const mockUser = {
 
 const minimalData = [
   {
+    id: 'mock-pull-request',
     author: mockUser,
     createdAt: '2024-06-01T12:00:00Z',
     organizationName: 'test-org',
@@ -51,6 +52,7 @@ const minimalData = [
 
 const noRepoData = [
   {
+    id: 'mock-pull-request',
     author: mockUser,
     createdAt: '2024-06-01T12:00:00Z',
     organizationName: 'test-org',
diff --git a/frontend/__tests__/unit/data/mockOrganizationData.ts b/frontend/__tests__/unit/data/mockOrganizationData.ts
@@ -76,6 +76,7 @@ export const mockOrganizationDetailsData = {
   ],
   recentPullRequests: [
     {
+      id: 'mock-org-pr-1',
       title: 'Test Pull Request 1',
       createdAt: 1727390000,
       url: 'https://github.com/test-org/test-repo-1/pull/1',
@@ -85,6 +86,7 @@ export const mockOrganizationDetailsData = {
       },
     },
     {
+      id: 'mock-org-pr-2',
       title: 'Test Pull Request 2',
       createdAt: 1727380000,
       url: 'https://github.com/test-org/test-repo-2/pull/2',
diff --git a/frontend/__tests__/unit/data/mockProjectDetailsData.ts b/frontend/__tests__/unit/data/mockProjectDetailsData.ts
@@ -101,6 +101,7 @@ export const mockProjectDetailsData = {
     ],
     recentPullRequests: [
       {
+        id: 'mock-project-pr-1',
         author: {
           avatarUrl: 'https://avatars.githubusercontent.com/u/11111?v=4',
           login: 'user1',
@@ -110,6 +111,7 @@ export const mockProjectDetailsData = {
         url: 'https://github.com/test-org/test-repo-1/pull/1',
       },
       {
+        id: 'mock-project-pr-2',
         author: {
           avatarUrl: 'https://avatars.githubusercontent.com/u/22222?v=4',
           login: 'user2',
diff --git a/frontend/__tests__/unit/data/mockRepositoryData.ts b/frontend/__tests__/unit/data/mockRepositoryData.ts
@@ -62,6 +62,7 @@ export const mockRepositoryData = {
   },
   recentPullRequests: [
     {
+      id: 'mock-repo-pr-1',
       title: 'Test Pull Request 1',
       createdAt: 1727390000,
       url: 'https://github.com/test-org/test-repo-1/pull/1',
@@ -71,6 +72,7 @@ export const mockRepositoryData = {
       },
     },
     {
+      id: 'mock-repo-pr-2',
       title: 'Test Pull Request 2',
       createdAt: 1727380000,
       url: 'https://github.com/test-org/test-repo-2/pull/2',
diff --git a/frontend/__tests__/unit/data/mockUserDetails.ts b/frontend/__tests__/unit/data/mockUserDetails.ts
@@ -45,6 +45,7 @@ export const mockUserDetailsData = {
   ],
   recentPullRequests: [
     {
+      id: 'mock-user-pr-1',
       createdAt: 1723002473,
       repositoryName: 'test-repo-3',
       title: 'Test Pull Request',
diff --git a/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/issues/[issueId]/page.tsx b/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/issues/[issueId]/page.tsx
@@ -160,13 +160,17 @@ const ModuleIssueDetailsPage = () => {
                   href={`/members/${a.login}`}
                   className="inline-flex items-center gap-2 text-blue-600 hover:underline dark:text-blue-400"
                 >
-                  <Image
-                    src={a.avatarUrl}
-                    alt={a.login}
-                    width={32}
-                    height={32}
-                    className="rounded-full"
-                  />
+                  {a.avatarUrl ? (
+                    <Image
+                      src={a.avatarUrl}
+                      alt={a.login}
+                      width={32}
+                      height={32}
+                      className="rounded-full"
+                    />
+                  ) : (
+                    <div className="h-8 w-8 rounded-full bg-gray-400" aria-hidden="true" />
+                  )}
                   <span className="text-sm font-medium">{a.login || a.name}</span>
                 </Link>
                 <button
@@ -204,13 +208,17 @@ const ModuleIssueDetailsPage = () => {
                   className="flex items-center justify-between gap-3 rounded-lg bg-gray-200 p-4 dark:bg-gray-700"
                 >
                   <div className="flex items-center gap-3">
-                    <Image
-                      src={pr.author?.avatarUrl}
-                      alt={pr.author?.login || 'Unknown'}
-                      width={32}
-                      height={32}
-                      className="rounded-full"
-                    />
+                    {pr.author?.avatarUrl ? (
+                      <Image
+                        src={pr.author.avatarUrl}
+                        alt={pr.author?.login || 'Unknown'}
+                        width={32}
+                        height={32}
+                        className="rounded-full"
+                      />
+                    ) : (
+                      <div className="h-8 w-8 rounded-full bg-gray-400" aria-hidden="true" />
+                    )}
                     <div className="min-w-0 flex-1">
                       <Link
                         href={pr.url}
@@ -255,13 +263,17 @@ const ModuleIssueDetailsPage = () => {
                 className="flex items-center justify-between gap-2 rounded-lg bg-gray-200 p-3 dark:bg-gray-700"
               >
                 <div className="inline-flex items-center gap-2">
-                  <Image
-                    src={u.avatarUrl}
-                    alt={u.login}
-                    width={32}
-                    height={32}
-                    className="rounded-full"
-                  />
+                  {u.avatarUrl ? (
+                    <Image
+                      src={u.avatarUrl}
+                      alt={u.login}
+                      width={32}
+                      height={32}
+                      className="rounded-full"
+                    />
+                  ) : (
+                    <div className="h-8 w-8 rounded-full bg-gray-400" aria-hidden="true" />
+                  )}
                   <span className="text-sm font-medium">@{u.login}</span>
                 </div>
                 <button
diff --git a/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/issues/page.tsx b/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/issues/page.tsx
@@ -92,8 +92,11 @@ const IssuesPage = () => {
                 trigger: 'bg-gray-200 dark:bg-[#323232] pl-0 text-nowrap w-40',
                 popoverContent: 'text-md min-w-40 dark:bg-[#323232] rounded-none p-0',
               }}
-              selectedKeys={[selectedLabel]}
-              onChange={(e) => handleLabelChange((e.target as HTMLSelectElement).value)}
+              selectedKeys={new Set([selectedLabel])}
+              onSelectionChange={(keys) => {
+                const [key] = Array.from(keys as Set<string>)
+                if (key) handleLabelChange(key)
+              }}
             >
               {[LABEL_ALL, ...allLabels].map((l) => (
                 <SelectItem
diff --git a/frontend/src/components/CardDetailsPage.tsx b/frontend/src/components/CardDetailsPage.tsx
@@ -87,7 +87,7 @@ const DetailsCard = ({
                 <div className="flex items-center gap-2">
                   <button
                     type="button"
-                    className="dark:hover:text-white' flex items-center justify-center gap-2 rounded-md border border-[#1D7BD7] bg-transparent px-2 py-2 text-nowrap text-[#1D7BD7] hover:bg-[#1D7BD7] hover:text-white"
+                    className="flex items-center justify-center gap-2 rounded-md border border-[#1D7BD7] bg-transparent px-2 py-2 text-nowrap text-[#1D7BD7] hover:bg-[#1D7BD7] hover:text-white dark:hover:text-white"
                     onClick={() => {
                       router.push(`${window.location.pathname}/issues`)
                     }}
@@ -96,7 +96,7 @@ const DetailsCard = ({
                   </button>
                   <button
                     type="button"
-                    className="dark:hover:text-white' flex items-center justify-center gap-2 rounded-md border border-[#1D7BD7] bg-transparent px-2 py-2 text-nowrap text-[#1D7BD7] hover:bg-[#1D7BD7] hover:text-white"
+                    className="flex items-center justify-center gap-2 rounded-md border border-[#1D7BD7] bg-transparent px-2 py-2 text-nowrap text-[#1D7BD7] hover:bg-[#1D7BD7] hover:text-white dark:hover:text-white"
                     onClick={() => {
                       router.push(`${window.location.pathname}/edit`)
                     }}
diff --git a/frontend/src/components/ModuleCard.tsx b/frontend/src/components/ModuleCard.tsx
@@ -8,14 +8,13 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import upperFirst from 'lodash/upperFirst'
 import Link from 'next/link'
+import { usePathname } from 'next/navigation'
 import { useState } from 'react'
 import type { Module } from 'types/mentorship'
 import { formatDate } from 'utils/dateFormatter'
 import { TextInfoItem } from 'components/InfoItem'
-import { usePathname } from 'next/navigation'
 import SingleModuleCard from 'components/SingleModuleCard'
 import { TruncatedText } from 'components/TruncatedText'
-import { PathnameContext } from 'next/dist/shared/lib/hooks-client-context.shared-runtime'
 
 interface ModuleCardProps {
   modules: Module[]

Original file line number	Diff line number	Diff line change
`@@ -518,6 +518,7 @@ describe('CardDetailsPage', () => {`
`518`	`518`
`519`	`519`	`const mockPullRequests = [`
`520`	`520`	`{`
	`521`	`+ id: 'mock-pull-request-1',`
`521`	`522`	`author: mockUser,`
`522`	`523`	`createdAt: new Date(Date.now() - 172800000).toISOString(),`
`523`	`524`	`organizationName: 'test-org',`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ const mockMilestone: Milestone = {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`const mockPullRequest: PullRequest = {`
	`151`	`+ id: 'mock-pull-request-id',`
`151`	`152`	`author: {`
`152`	`153`	`...mockUser,`
`153`	`154`	`login: 'author3',`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ const mockUser = {`
`40`	`40`
`41`	`41`	`const minimalData = [`
`42`	`42`	`{`
	`43`	`+ id: 'mock-pull-request',`
`43`	`44`	`author: mockUser,`
`44`	`45`	`createdAt: '2024-06-01T12:00:00Z',`
`45`	`46`	`organizationName: 'test-org',`
`@@ -51,6 +52,7 @@ const minimalData = [`
`51`	`52`
`52`	`53`	`const noRepoData = [`
`53`	`54`	`{`
	`55`	`+ id: 'mock-pull-request',`
`54`	`56`	`author: mockUser,`
`55`	`57`	`createdAt: '2024-06-01T12:00:00Z',`
`56`	`58`	`organizationName: 'test-org',`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ export const mockUserDetailsData = {`
`45`	`45`	`],`
`46`	`46`	`recentPullRequests: [`
`47`	`47`	`{`
	`48`	`+ id: 'mock-user-pr-1',`
`48`	`49`	`createdAt: 1723002473,`
`49`	`50`	`repositoryName: 'test-repo-3',`
`50`	`51`	`title: 'Test Pull Request',`