Skip to content

1181 crashing achievements list if name null #1186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jernejk merged 3 commits into from
Jan 31, 2025
Merged

1181 crashing achievements list if name null #1186

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55f10f8
🐛 Fix crashing rewards search and make achievement search return resu…
jernejk Jan 30, 2025
be4c189
🐛 Achievements list crashed if name is empty.
jernejk Jan 31, 2025
827a7bd
Merge branch 'main' of https://github.com/SSWConsulting/SSW.Rewards.M…
jernejk Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/AdminUI/Pages/Achievements.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Placeholder="Search for an achievement"
Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium"
Class="mt-0"/>

<MudCheckBox @bind-Checked="ShowArchived" Label="Show archived"></MudCheckBox>
</ToolbarContent>
<HeadingTemplate>
Expand All @@ -55,7 +55,10 @@
</HeadingTemplate>
<RowTemplate>
<MudTd DataLabel="Code">
<AdminQRCode QRCodeString="@context.Code" Height="100" />
@if (!string.IsNullOrWhiteSpace(context.Code))
{
<AdminQRCode QRCodeString="@context.Code" Height="100" />
}
</MudTd>
<MudTd DataLabel="Name">
@context.Name
Expand All @@ -80,7 +83,7 @@
private IEnumerable<AchievementAdminDto> _model = Enumerable.Empty<AchievementAdminDto>();

private IEnumerable<AchievementAdminDto> FilteredAchievementList => _model
.Where(s => s.Name.Contains(_searchString, StringComparison.InvariantCultureIgnoreCase) && (ShowArchived || !s.IsArchived.GetValueOrDefault(false)));
.Where(s => s.Name?.Contains(_searchString, StringComparison.InvariantCultureIgnoreCase) == true && (ShowArchived || !s.IsArchived.GetValueOrDefault(false)));

private bool ShowArchived { get; set; }

Expand Down
Loading