PRJ-Game-Ideas/game-ideas
3
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Display no element and nb element (#47)
All checks were successful
Game Ideas build for PR / build_test (pull_request) Successful in 43s
Details

Browse Source
This commit is contained in:
Maxime Adler
2025-05-15 14:34:55 +02:00
parent 3c3448dee0
commit 7a7863f789
13 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor
View File

@@ -23,10 +23,20 @@
<div class="content">
@if (!IsLoading)
{
@foreach (var game in GamesDto)
@if (GamesDto.NumberOfGames != 0)
{
<GameRow GameDto="game" OnDelete="HandleDeleteGame" OnEdit="HandleEditGame" />
<div class="games-number">@string.Format(ResourcesKey.GamesNumberFormat, GamesDto.NumberOfGames)</div>
@foreach (var game in GamesDto.Games)
{
<GameRow GameDto="game" OnDelete="HandleDeleteGame" OnEdit="HandleEditGame" />
}
}
else
{
<div class="no-games">@ResourcesKey.NoGames</div>
}
}
else
{

3
src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor.cs
View File

@@ -12,7 +12,7 @@ public partial class Games : GameBaseComponent
{
private DisplayType DisplayType = DisplayType.List;
private GameFilterParams GameFilter = new();
private IEnumerable<GameDto> GamesDto = [];
private GameListDto GamesDto = new();
private int CurrentPage;
private Popup? DeletePopup;
private GameDto? GameToDelete;
@@ -47,6 +47,7 @@ public partial class Games : GameBaseComponent
finally
{
IsLoading = false;
StateHasChanged();
}
}
private async Task HandleFilterChanged(GameFilterParams args)

6
src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Gateways/GameGateway.cs
View File

@@ -35,7 +35,7 @@ public class GameGateway(IHttpClientService httpClientService) : IGameGateway
}
}
public async Task<IEnumerable<GameDto>> FetchGames(GameFilterParams filterParams, int currentPage)
public async Task<GameListDto> FetchGames(GameFilterParams filterParams, int currentPage)
{
try
{
@@ -52,9 +52,11 @@ public class GameGateway(IHttpClientService httpClientService) : IGameGateway
PropertyIds = filterParams.Properties?.Select(d => d.Id ?? 0).ToList(),
ReleaseYears = filterParams.ReleaseYears,
TagIds = filterParams.Tags?.Select(d => d.Id ?? 0).ToList(),
SortPropertyName = filterParams.SortProperty?.PropertyName,
SortType = filterParams.SortType?.SortType
};
var result = await httpClientService.FetchDataAsync<IEnumerable<GameDto>>(Endpoints.Game.Fetch(filter));
var result = await httpClientService.FetchDataAsync<GameListDto>(Endpoints.Game.Fetch(filter));
return result ?? throw new InvalidOperationException(ResourcesKey.ErrorFetchGames);
}
catch (Exception)

2
src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Gateways/IGameGateway.cs
View File

@@ -7,7 +7,7 @@ public interface IGameGateway
{
Task<CategoriesDto> FetchCategories();
Task<int> CreateGame(GameDetailDto game);
Task<IEnumerable<GameDto>> FetchGames(GameFilterParams filter, int currentPage);
Task<GameListDto> FetchGames(GameFilterParams filter, int currentPage);
Task<GameDetailDto> GetGameById(int gameId);
Task<bool> DeleteGame(int gameIdToDelete);
Task<int> UpdateGame(GameDetailDto gameDto);

15
src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor
View File

@@ -16,7 +16,7 @@
<div class="header-content">
<SearchInput Placeholder="@ResourcesKey.EnterUsername" @bind-Text="FilterParams.Name" @bind-Text:after=HandleFilterChanged />
<SelectSearch TItem="RoleDto" Placeholder="@ResourcesKey.Roles" @bind-Values="FilterParams.Roles" @bind-Values:after=HandleFilterChanged
Items="Roles.ToList()" GetLabel="@(role => role.Name)" Theme="SelectTheme.Filter" />
Items="Roles.ToList()" GetLabel="@(role => role.Name)" Theme="SelectTheme.Filter" />
</div>
</HeaderGameIdeas>
@@ -28,9 +28,18 @@
<div class="content">
@if (!IsLoading)
{
@foreach (var user in UserList.Users ?? [])
@if (UserList.UsersCount != 0)
{
<UserRow User="user" Roles="Roles.ToList()" OnRemove="HandleOpenConfirmationPopup" OnSubmit="HandleUpdateUser" Validator="@(new UserUpdateValidator())" CanDelete=@(user.Id != currentUserId) />
<div class="user-number">@string.Format(ResourcesKey.UsersNumberFormat, UserList.UsersCount)</div>
@foreach (var user in UserList.Users ?? [])
{
<UserRow User="user" Roles="Roles.ToList()" OnRemove="HandleOpenConfirmationPopup" OnSubmit="HandleUpdateUser" Validator="@(new UserUpdateValidator())" CanDelete=@(user.Id != currentUserId) />
}
}
else
{
<div class="no-users">@ResourcesKey.NoUsers</div>
}
}
else

36
src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.cs
View File

@@ -36,20 +36,36 @@ public partial class Users
}
await FetchData();
await FetchUsers();
await FetchRoles();
await base.OnInitializedAsync();
}
private async Task FetchData(bool fetchRoles = true)
private async Task FetchUsers(bool displayLoading = true)
{
try
{
IsLoading = displayLoading;
UserList = await UserGateway.GetUsers(FilterParams, CurrentPage);
}
catch (Exception)
{
throw;
}
finally
{
IsLoading = false;
}
}
private async Task FetchRoles()
{
try
{
IsLoading = true;
if (fetchRoles)
Roles = await UserGateway.GetRoles();
UserList = await UserGateway.GetUsers(FilterParams, CurrentPage);
Roles = await UserGateway.GetRoles();
}
catch (Exception)
{
@@ -68,7 +84,7 @@ public partial class Users
IsLoading = true;
await UserGateway.CreateUser(user);
await FetchData(false);
await FetchUsers();
}
catch (Exception)
{
@@ -89,7 +105,7 @@ public partial class Users
IsLoading = true;
await UserGateway.UpdateUser(user);
await FetchData(false);
await FetchUsers();
}
catch (Exception)
{
@@ -115,7 +131,7 @@ public partial class Users
IsLoading = true;
await UserGateway.DeleteUser(UserDelete.Id);
await FetchData(false);
await FetchUsers();
}
catch (Exception)
{
@@ -134,7 +150,7 @@ public partial class Users
}
private async Task HandleFilterChanged()
{
await FetchData(false);
await FetchUsers(false);
}
private void HandleCancelPopupClicked()
{

8
src/GameIdeas/GameIdeas.Resources/CreateStaticResourceKey.cs
View File

@@ -74,6 +74,10 @@ public class Translations (TranslationService translationService)
public string Detail => translationService.Translate(nameof(Detail));
public string Edit => translationService.Translate(nameof(Edit));
public string Delete => translationService.Translate(nameof(Delete));
public string NoGames => translationService.Translate(nameof(NoGames));
public string NoUsers => translationService.Translate(nameof(NoUsers));
public string GamesNumberFormat => translationService.Translate(nameof(GamesNumberFormat));
public string UsersNumberFormat => translationService.Translate(nameof(UsersNumberFormat));
}
public static class ResourcesKey
@@ -156,4 +160,8 @@ public static class ResourcesKey
public static string Detail => _instance?.Detail ?? throw new InvalidOperationException("ResourcesKey.Detail is not initialized.");
public static string Edit => _instance?.Edit ?? throw new InvalidOperationException("ResourcesKey.Edit is not initialized.");
public static string Delete => _instance?.Delete ?? throw new InvalidOperationException("ResourcesKey.Delete is not initialized.");
public static string NoGames => _instance?.NoGames ?? throw new InvalidOperationException("ResourcesKey.NoGames is not initialized.");
public static string NoUsers => _instance?.NoUsers ?? throw new InvalidOperationException("ResourcesKey.NoUsers is not initialized.");
public static string GamesNumberFormat => _instance?.GamesNumberFormat ?? throw new InvalidOperationException("ResourcesKey.GamesNumberFormat is not initialized.");
public static string UsersNumberFormat => _instance?.UsersNumberFormat ?? throw new InvalidOperationException("ResourcesKey.UsersNumberFormat is not initialized.");
}

7
src/GameIdeas/GameIdeas.Shared/Dto/GameListDto.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace GameIdeas.Shared.Dto;
public class GameListDto
{
public IEnumerable<GameDto> Games { get; set; } = [];
public int NumberOfGames { get; set; }
}

2
src/GameIdeas/Server/GameIdeas.WebAPI/Controllers/GameController.cs
View File

@@ -17,7 +17,7 @@ public class GameController(
private readonly ILogger<GameController> logger = loggerFactory.CreateLogger<GameController>();
[HttpGet]
public async Task<ActionResult<IEnumerable<GameDto>>> SearchGames([FromQuery] GameFilterDto filter)
public async Task<ActionResult<GameListDto>> SearchGames([FromQuery] GameFilterDto filter)
{
try
{

6
src/GameIdeas/Server/GameIdeas.WebAPI/Files/GameIdeas.fr.json
View File

@@ -69,5 +69,9 @@
"ReadLess": "Réduire",
"Detail": "Détail",
"Edit": "Modifier",
"Delete": "Supprimer"
"Delete": "Supprimer",
"NoGames": "Pas de jeux disponible",
"NoUsers": "Pas d'utilisateurs disponible",
"GamesNumberFormat": "Nombre de jeux : {0}",
"UsersNumberFormat": "Nombre d'utilisateurs : {0}"
}

16
src/GameIdeas/Server/GameIdeas.WebAPI/Services/Games/GameReadService.cs
View File

@@ -12,7 +12,7 @@ namespace GameIdeas.WebAPI.Services.Games;
public class GameReadService(GameIdeasContext context, IMapper mapper, ICategoryService categoryService) : IGameReadService
{
public async Task<IEnumerable<GameDto>> GetGames(GameFilterDto filter)
public async Task<GameListDto> GetGames(GameFilterDto filter)
{
var query = context.Games
.Include(g => g.GamePlatforms).ThenInclude(gp => gp.Platform)
@@ -26,13 +26,19 @@ public class GameReadService(GameIdeasContext context, IMapper mapper, ICategory
ApplyOrder(ref query, filter);
var games = await query.Skip((filter.CurrentPage - 1) * GlobalConstants.NUMBER_PER_PAGE)
.Take(GlobalConstants.NUMBER_PER_PAGE)
.ToListAsync();
var games = await query.ToListAsync();
ApplyStaticFilter(ref games, filter);
return mapper.Map<IEnumerable<GameDto>>(games);
games = [.. games
.Skip((filter.CurrentPage - 1) * GlobalConstants.NUMBER_PER_PAGE)
.Take(GlobalConstants.NUMBER_PER_PAGE)];
return new()
{
Games = mapper.Map<IEnumerable<GameDto>>(games),
NumberOfGames = games.Count
};
}
public async Task<GameDetailDto> GetGameById(int gameId)

2
src/GameIdeas/Server/GameIdeas.WebAPI/Services/Games/IGameReadService.cs
View File

@@ -4,6 +4,6 @@ namespace GameIdeas.WebAPI.Services.Games;
public interface IGameReadService
{
Task<IEnumerable<GameDto>> GetGames(GameFilterDto filter);
Task<GameListDto> GetGames(GameFilterDto filter);
Task<GameDetailDto> GetGameById(int gameId);
}

3
src/GameIdeas/Server/GameIdeas.WebAPI/Services/Users/UserReadService.cs
View File

@@ -33,9 +33,10 @@ public class UserReadService(
.OrderBy(u => u.UserName)
.ToListAsync();
var count = users.Count;
ApplyStaticFilter(ref users, filter);
var count = users.Count;
var usersDto = mapper.Map<IEnumerable<UserDto>>(users);
usersDto = await ApplyRoles(usersDto, filter);