(#433) wasm: update post razor components params

SaintAngeLs · Oct 13, 2024 · 9ade62d · 9ade62d
1 parent 35550ac
commit 9ade62d
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 22 deletions.
diff --git a/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Feeds/Home.razor b/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Feeds/Home.razor
@@ -47,7 +47,8 @@
                                 <MudItem xs="12">
                                     <PostItem 
                                         Post="@post"
-                                        Username="@GetCachedUserName(post.UserId)"
+                                        FirstName="@GetCachedUserFirstName(post.UserId)"
+                                        LastName="@GetCachedUserLastName(post.UserId)"
                                         UserProfileImage="@GetCachedUserAvatar(post.UserId)"
                                         PostDate="@post.CreatedAt.ToString("g")"
                                         ReactionsSummaries="@reactionsSummaries"
@@ -83,7 +84,8 @@
     private Dictionary<Guid, ReactionsSummaryDto> reactionsSummaries = new Dictionary<Guid, ReactionsSummaryDto>();
 
     // Cache for user names and avatars
-    private Dictionary<Guid, string> userNames = new Dictionary<Guid, string>();
+    private Dictionary<Guid, string> userFirstNames = new Dictionary<Guid, string>();
+    private Dictionary<Guid, string> userLastNames = new Dictionary<Guid, string>();
     private Dictionary<Guid, string> userAvatars = new Dictionary<Guid, string>();
 
     private List<BreadcrumbItem> _items = new List<BreadcrumbItem>
@@ -126,11 +128,13 @@
                 var userIds = posts.Select(p => p.UserId).Where(id => id.HasValue).Select(id => id.Value).Distinct().ToList();
                 foreach (var userId in userIds)
                 {
-                    if (!userNames.ContainsKey(userId))
+                     if (!userFirstNames.ContainsKey(userId))
                     {
                         var user = await StudentsService.GetStudentAsync(userId);
                         if (user != null)
                         {
+                            userFirstNames[userId] = user.FirstName ?? "Unknown";
+                            userLastNames[userId] = user.LastName ?? "User";
                             userAvatars[userId] = user.ProfileImageUrl ?? string.Empty;
                         }
                     }
@@ -144,15 +148,7 @@
             }
 
     }
-    // Method to get cached user name
-    private string GetCachedUserName(Guid? userId)
-    {
-        if (userId.HasValue && userNames.ContainsKey(userId.Value))
-        {
-            return userNames[userId.Value];
-        }
-        return "Unknown User";
-    }
+
 
     // Method to get cached user avatar
     private string GetCachedUserAvatar(Guid? userId)
@@ -164,6 +160,24 @@
         return string.Empty;
     }
 
+    private string GetCachedUserFirstName(Guid? userId)
+    {
+        if (userId.HasValue && userFirstNames.ContainsKey(userId.Value))
+        {
+            return userFirstNames[userId.Value];
+        }
+        return "Unknown";
+    }
+
+    private string GetCachedUserLastName(Guid? userId)
+    {
+        if (userId.HasValue && userLastNames.ContainsKey(userId.Value))
+        {
+            return userLastNames[userId.Value];
+        }
+        return "User";
+    }
+
     private async Task HandleReaction((Guid postId, ReactionType reactionType) reactionInfo)
     {
         var (postId, reactionType) = reactionInfo;

diff --git a/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Posts/Components/PostItem.razor b/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Posts/Components/PostItem.razor
@@ -9,7 +9,9 @@
         </CardHeaderAvatar>
 
         <CardHeaderContent>
-            <MudText Typo="Typo.subtitle1" Class="mb-1 cursor-pointer" @onclick="NavigateToUserProfile">@Username</MudText>
+            <MudText Typo="Typo.subtitle1" Class="mb-1 cursor-pointer" @onclick="NavigateToUserProfile">
+                @($"{FirstName} {LastName}")
+            </MudText>
             <MudText Typo="Typo.caption" Class="text-muted">@PostDate</MudText>
         </CardHeaderContent>
     </MudCardHeader>
@@ -89,7 +91,8 @@
 
 @code {
     [Parameter] public PostDto Post { get; set; }
-    [Parameter] public string Username { get; set; }
+    [Parameter] public string FirstName { get; set; }
+    [Parameter] public string LastName { get; set; }
     [Parameter] public string UserProfileImage { get; set; }
     [Parameter] public string PostDate { get; set; }
     [Parameter] public Dictionary<Guid, ReactionsSummaryDto> ReactionsSummaries { get; set; } = new();
@@ -102,7 +105,6 @@
 
     private bool isCommentSectionVisible;
 
-    // Property to determine which image to show
     private string DisplayedUserProfileImage => string.IsNullOrEmpty(UserProfileImage) ? "images/default_profile_image.webp" : UserProfileImage;
 
     private void ToggleCommentSection()
@@ -115,7 +117,7 @@
         var parameters = new DialogParameters
         {
             { "Post", Post },
-            { "Username", Username },
+            { "Username", $"{FirstName} {LastName}" },
             { "UserProfileImage", DisplayedUserProfileImage },
             { "IssuerId", IdentityService.GetCurrentUserIdFromJwtAsync() }
         };

diff --git a/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Posts/PostsList.razor b/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Posts/PostsList.razor
@@ -29,7 +29,8 @@
                 <MudItem xs="12">
                     <PostItem 
                         Post="@post"
-                        Username="@GetUserName(post.UserId)"
+                        FirstName="@GetUserFirstName(post.UserId)"
+                        LastName="@GetUserLastName(post.UserId)"
                         UserProfileImage="@GetUserAvatar(post.UserId)"
                         PostDate="@post.CreatedAt.ToString("g")"
                         ReactionsSummaries="@reactionsSummaries"
@@ -221,4 +222,23 @@
             Snackbar.Add($"Failed to add comment: {response.ErrorMessage?.Reason}", Severity.Error);
         }
     }
+
+    private string GetUserFirstName(Guid? userId)
+    {
+        if (userId.HasValue && studentsCache.ContainsKey(userId.Value))
+        {
+            return studentsCache[userId.Value].FirstName ?? "Unknown";
+        }
+        return "Unknown";
+    }
+
+    private string GetUserLastName(Guid? userId)
+    {
+        if (userId.HasValue && studentsCache.ContainsKey(userId.Value))
+        {
+            return studentsCache[userId.Value].LastName ?? "User";
+        }
+        return "User";
+    }
+
 }
diff --git a/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Posts/PostsMy.razor b/MiniSpace.Web/src/Astravent.Web.Wasm/Pages/Posts/PostsMy.razor
@@ -32,7 +32,8 @@
                 <MudItem xs="12">
                     <PostItem 
                         Post="@post"
-                        Username="@GetUserName(post.UserId)"
+                        FirstName="@GetUserFirstName(post.UserId)"
+                        LastName="@GetUserLastName(post.UserId)"
                         UserProfileImage="@GetUserAvatar(post.UserId)"
                         PostDate="@post.CreatedAt.ToString("g")"
                         ReactionsSummaries="@reactionsSummaries"
@@ -67,7 +68,6 @@
         {
             isLoading = true;
 
-            // Initialize the authentication and get the current user ID
             await IdentityService.InitializeAuthenticationState();
 
             if (IdentityService.IsAuthenticated)
@@ -172,13 +172,22 @@
         return string.Empty;
     }
 
-    private string GetUserName(Guid? userId)
+    private string GetUserFirstName(Guid? userId)
     {
         if (userId.HasValue && studentsCache.ContainsKey(userId.Value))
         {
-            return $"{studentsCache[userId.Value].FirstName} {studentsCache[userId.Value].LastName}";
+            return studentsCache[userId.Value].FirstName ?? "Unknown";
         }
-        return "Unknown User";
+        return "Unknown";
+    }
+
+    private string GetUserLastName(Guid? userId)
+    {
+        if (userId.HasValue && studentsCache.ContainsKey(userId.Value))
+        {
+            return studentsCache[userId.Value].LastName ?? "User";
+        }
+        return "User";
     }
 
     private async Task OnPageChanged(int newPage)