Fix React Build by fixing ProfilePictureService

SE-TINF22B6 · Jun 10, 2024 · e74ea3b · e74ea3b
1 parent c1794e5
commit e74ea3b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/src/main/web/src/organisms/create-comment/CreateComment.tsx b/src/main/web/src/organisms/create-comment/CreateComment.tsx
@@ -5,6 +5,7 @@ import {fetchUserImage} from "../../services/ProfilePictureService";
 import config from "../../config/config";
 import {isUserLoggedIn} from "../../services/AuthService";
 import {Tooltip} from "react-tooltip";
+import {getDefaultOrRandomPicture} from "../../atoms/Pictures/PicturesComponent";
 
 interface CreateCommentProps {
   onReplyClick: (newCommentText: string) => void;
@@ -37,6 +38,9 @@ export const CreateComment: React.FC<CreateCommentProps> = ({ onReplyClick }) =>
       if (image) {
         setUserImage(image);
       }
+      else {
+        setUserImage(getDefaultOrRandomPicture(true));
+      }
     };
     fetchUserProfileImage();
   }, []);

diff --git a/src/main/web/src/organisms/header/Header.tsx b/src/main/web/src/organisms/header/Header.tsx
@@ -11,6 +11,7 @@ import config from "../../config/config";
 import {fetchUserImage} from "../../services/ProfilePictureService";
 import {fetchNotifications} from "../../services/NotificationsService";
 import {NotificationModel} from "./model/NotificationModel";
+import {getDefaultOrRandomPicture} from "../../atoms/Pictures/PicturesComponent";
 
 export const Header = () => {
     const [notifications, setNotifications] = useState<NotificationModel[]>([]);
@@ -29,6 +30,9 @@ export const Header = () => {
             if (image) {
                 setUserImage(image);
             }
+            else {
+                setUserImage(getDefaultOrRandomPicture(true));
+            }
         };
         fetchUserProfileImage();
     }, []);

diff --git a/src/main/web/src/scenes/Home/components/create-post/CreatePost.tsx b/src/main/web/src/scenes/Home/components/create-post/CreatePost.tsx
@@ -6,6 +6,7 @@ import {fetchUserImage} from "../../../../services/ProfilePictureService";
 import {isUserLoggedIn} from "../../../../services/AuthService";
 import {Tooltip} from "react-tooltip";
 import config from "../../../../config/config";
+import {getDefaultOrRandomPicture} from "../../../../atoms/Pictures/PicturesComponent";
 
 export const CreatePost = () => {
   const [draftOpen, setDraftOpen] = useState(false);
@@ -23,6 +24,9 @@ export const CreatePost = () => {
       if (image) {
         setUserImage(image);
       }
+      else {
+          setUserImage(getDefaultOrRandomPicture(true));
+      }
     };
     fetchUserProfileImage();
   }, []);

diff --git a/src/main/web/src/scenes/Home/components/create-post/PostDraft.tsx b/src/main/web/src/scenes/Home/components/create-post/PostDraft.tsx
@@ -12,6 +12,7 @@ import config from "../../../../config/config";
 import { getAccountId, getJWT } from "../../../../services/AuthService";
 import { handleTagInput } from "../../../../services/TagService";
 import {fetchUserImage} from "../../../../services/ProfilePictureService";
+import {getDefaultOrRandomPicture} from "../../../../atoms/Pictures/PicturesComponent";
 
 interface PostDraftProps {
   draftOpen: boolean;
@@ -40,6 +41,9 @@ export const PostDraft: React.FC<PostDraftProps> = (props: PostDraftProps) => {
       if (image) {
         setUserImage(image);
       }
+      else {
+        setUserImage(getDefaultOrRandomPicture(true));
+      }
     };
     fetchUserProfileImage();
   }, []);

diff --git a/src/main/web/src/services/ProfilePictureService.tsx b/src/main/web/src/services/ProfilePictureService.tsx
@@ -1,6 +1,5 @@
 import config from "../config/config";
 import { getJWT, getUserId, isUserLoggedIn } from "./AuthService";
-import {getDefaultOrRandomPicture} from "../atoms/Pictures/PicturesComponent";
 
 export const fetchUserImage = async (): Promise<string | null> => {
   const jwt: string | null = getJWT();
@@ -20,7 +19,8 @@ export const fetchUserImage = async (): Promise<string | null> => {
         localStorage.setItem('userImage', data.imageData);
         return data.imageData;
       } else {
-        return (getDefaultOrRandomPicture(true));
+        console.error("Failed to fetch user image");
+        return null;
       }
     } catch (error) {
       console.error("Error fetching user image:", error);