variable name fix

Real-Dev-Squad · Dec 2, 2024 · 1b6374e · 1b6374e
1 parent 13b5ef5
commit 1b6374e
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 22 deletions.
diff --git a/__tests__/Unit/Components/Tasks/ProgressUpdateCard/ProgressUpdateCardPresentation.test.tsx b/__tests__/Unit/Components/Tasks/ProgressUpdateCard/ProgressUpdateCardPresentation.test.tsx
@@ -19,7 +19,7 @@ import ProgressUpdateCardPresentation from '@/components/taskDetails/ProgressUpd
 let initialProps: ProgressUpdateCardPresentationProps;
 const titleToShow = mockGetTaskProgress.data[1].completed;
 const username = 'mock-user-name';
-const profileImageUrl = 'random-profile-pic-url';
+const userProfileImageUrl = 'random-profile-pic-url';
 const momentDate = moment(mockGetTaskProgress.data[2].createdAt);
 const fullDate = momentDate.format('DD-MM-YY');
 const time = momentDate.format('hh:mmA');
@@ -121,7 +121,7 @@ describe('ProgressUpdateCardPresentation Component', () => {
         mockedOnCardClick = jest.fn<void, [React.MouseEvent<HTMLElement>]>();
         initialProps = {
             username: username,
-            profileImageUrl: profileImageUrl,
+            userProfileImageUrl: userProfileImageUrl,
             titleToShow: titleToShow,
             isExpanded: false,
             dateInAgoFormat: dateInAgoFormat,
@@ -241,33 +241,39 @@ describe('ProgressUpdateCardPresentation Component', () => {
         );
         expect(usernameElement).toBeInTheDocument();
         expect(usernameElement.textContent).toContain('mock-user-name');
-        const profileImageUrlElement = screen.getByTestId(
+        const userProfileImageUrlElement = screen.getByTestId(
             'progress-update-card-profile-picture'
         );
 
-        expect(profileImageUrlElement).toBeInTheDocument();
-        expect(profileImageUrlElement).toHaveAttribute('src', profileImageUrl);
-        expect(profileImageUrlElement).toHaveAttribute('alt', 'Avatar');
+        expect(userProfileImageUrlElement).toBeInTheDocument();
+        expect(userProfileImageUrlElement).toHaveAttribute(
+            'src',
+            userProfileImageUrl
+        );
+        expect(userProfileImageUrlElement).toHaveAttribute('alt', 'Avatar');
     });
     it('should display the default avatar if profile url is empty', () => {
         (useRouter as jest.Mock).mockReturnValue({
             query: { dev: 'true' },
         });
         const props: ProgressUpdateCardPresentationProps = {
             ...initialProps,
-            profileImageUrl: '',
+            userProfileImageUrl: '',
         };
         renderWithRouter(
             <Provider store={store()}>
                 <ProgressUpdateCardPresentation {...props} />
             </Provider>
         );
-        const profileImageUrlElement = screen.getByTestId(
+        const userProfileImageUrlElement = screen.getByTestId(
             'progress-update-card-profile-picture'
         );
 
-        expect(profileImageUrlElement).toBeInTheDocument();
-        expect(profileImageUrlElement).toHaveAttribute('src', DEFAULT_AVATAR);
+        expect(userProfileImageUrlElement).toBeInTheDocument();
+        expect(userProfileImageUrlElement).toHaveAttribute(
+            'src',
+            DEFAULT_AVATAR
+        );
     });
     it('should render the updater name as a link with the correct href', () => {
         (useRouter as jest.Mock).mockReturnValue({

diff --git a/src/components/taskDetails/ProgressUpdateCard/LatestProgressUpdateCard.tsx b/src/components/taskDetails/ProgressUpdateCard/LatestProgressUpdateCard.tsx
@@ -27,7 +27,7 @@ export default function LatestProgressUpdateCard({
         searchString: userId,
     });
     const username = userData?.user?.username ?? '';
-    const profileImageUrl = userData?.user?.picture?.url ?? '';
+    const userProfileImageUrl = userData?.user?.picture?.url ?? '';
 
     const dateInAgoFormat = momentDate.fromNow();
     const fullDate = momentDate.format('dddd, MMMM DD, YYYY, hh:mm A [GMT] Z');
@@ -81,7 +81,7 @@ export default function LatestProgressUpdateCard({
     return (
         <LatestProgressUpdateCardPresentation
             username={username}
-            profileImageUrl={profileImageUrl}
+            userProfileImageUrl={userProfileImageUrl}
             dataToShowState={dataToShowState}
             tooltipText={tooltipText}
             onMoreOrLessButtonClick={onMoreOrLessButtonClick}

diff --git a/src/components/taskDetails/ProgressUpdateCard/LatestProgressUpdateCardPresentation.tsx b/src/components/taskDetails/ProgressUpdateCard/LatestProgressUpdateCardPresentation.tsx
@@ -11,7 +11,7 @@ import { USER_MANAGEMENT_URL } from '@/constants/url';
 import { DEFAULT_AVATAR } from '@/constants/url';
 export default function LatestProgressUpdateCardPresentation({
     username,
-    profileImageUrl,
+    userProfileImageUrl,
     dataToShowState,
     tooltipText,
     onMoreOrLessButtonClick,
@@ -109,9 +109,9 @@ export default function LatestProgressUpdateCardPresentation({
                             >
                                 <img
                                     src={
-                                        profileImageUrl == ''
+                                        userProfileImageUrl == ''
                                             ? DEFAULT_AVATAR
-                                            : profileImageUrl
+                                            : userProfileImageUrl
                                     }
                                     alt={'Avatar'}
                                     className={

diff --git a/src/components/taskDetails/ProgressUpdateCard/ProgressUpdateCard.tsx b/src/components/taskDetails/ProgressUpdateCard/ProgressUpdateCard.tsx
@@ -18,7 +18,7 @@ export default memo(function ProgressUpdateCard({
         searchString: userId,
     });
     const username = userData?.user?.username ?? '';
-    const profileImageUrl = userData?.user?.picture?.url ?? '';
+    const userProfileImageUrl = userData?.user?.picture?.url ?? '';
 
     const charactersToShow = 70;
     const readMoreTitle = readMoreFormatter(data?.completed, charactersToShow);
@@ -81,7 +81,7 @@ export default memo(function ProgressUpdateCard({
     return (
         <ProgressUpdateCardPresentation
             username={username}
-            profileImageUrl={profileImageUrl}
+            userProfileImageUrl={userProfileImageUrl}
             dataToShowState={dataToShowState}
             titleToShow={titleToShow}
             onMoreOrLessButtonClick={onMoreOrLessButtonClick}

diff --git a/src/components/taskDetails/ProgressUpdateCard/ProgressUpdateCardPresentation.tsx b/src/components/taskDetails/ProgressUpdateCard/ProgressUpdateCardPresentation.tsx
@@ -11,7 +11,7 @@ import { DEFAULT_AVATAR, USER_MANAGEMENT_URL } from '@/constants/url';
 
 export default function ProgressUpdateCardPresentation({
     username,
-    profileImageUrl,
+    userProfileImageUrl,
     titleToShow,
     dateInAgoFormat,
     tooltipString,
@@ -123,9 +123,9 @@ export default function ProgressUpdateCardPresentation({
                                 >
                                     <img
                                         src={
-                                            profileImageUrl == ''
+                                            userProfileImageUrl == ''
                                                 ? DEFAULT_AVATAR
-                                                : profileImageUrl
+                                                : userProfileImageUrl
                                         }
                                         alt={'Avatar'}
                                         data-testid="progress-update-card-profile-picture"

diff --git a/src/components/taskDetails/ProgressUpdateCard/latest-progress-update-card.module.scss b/src/components/taskDetails/ProgressUpdateCard/latest-progress-update-card.module.scss
@@ -92,6 +92,7 @@
             height: 32px;
             border-radius: 50%;
             object-fit: cover;
+            margin-right: 4px;
             @media (width<=425px) {
                 width: 28px;
                 height: 28px;

diff --git a/src/components/taskDetails/ProgressUpdateCard/progress-update-card.module.scss b/src/components/taskDetails/ProgressUpdateCard/progress-update-card.module.scss
@@ -95,6 +95,7 @@
     .progress-update-card__profile-picture {
         width: 32px;
         height: 32px;
+        margin-right: 4px;
         border-radius: 50%;
         object-fit: cover;
         @media (width<=425px) {

diff --git a/src/components/taskDetails/ProgressUpdateCard/progressUpdateCard.types.ts b/src/components/taskDetails/ProgressUpdateCard/progressUpdateCard.types.ts
@@ -9,7 +9,7 @@ type MouseEventType = (event: MouseEvent<HTMLElement>) => void;
 
 export type ProgressUpdateCardPresentationProps = {
     username: string;
-    profileImageUrl: string;
+    userProfileImageUrl: string;
     titleToShow: string;
     dateInAgoFormat: string;
     tooltipString: string;
@@ -24,7 +24,7 @@ export type ProgressUpdateCardPresentationProps = {
 
 export type LatestProgressUpdateCardPresentationProps = {
     username: string;
-    profileImageUrl: string;
+    userProfileImageUrl: string;
     dataToShowState: ProgressUpdateDataToShow[];
     tooltipText: string;
     onMoreOrLessButtonClick: (