Skip to content

Fix filter #526

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
tgreenx merged 2 commits into from
Dec 18, 2025
Merged

Fix filter #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692f1dc
Since we now set `trailingSlash: "always"`, we need to add a trailing…
tbleckert Dec 18, 2025
deef66a
Simplify and make filtered result reactive
tbleckert Dec 18, 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
2 changes: 1 addition & 1 deletion src/lib/components/DomainTest/DomainTest.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
$effect(() => {
if (currentState === 'complete' && previousState === 'testing') {
const base = import.meta.env.BASE_URL;
document.location.href = `${base}${getLocale()}/result/${currentContext.testId}`;
document.location.href = `${base}${getLocale()}/result/${currentContext.testId}/`;
Copy link
Contributor

@tgreenx tgreenx Dec 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Out of curiosity, any particular reason for this change?) Nvm, commit 692f1dc message description explains it :)

transition('RESET');
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/DomainTest/History.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
{#each paginatedHistory as item}
<li class={item.overall_result}>
<a
href={`${import.meta.env.BASE_URL}${getLocale()}/result/${item.id}`}
href={`${import.meta.env.BASE_URL}${getLocale()}/result/${item.id}/`}
onclick={onClickLink}
>
{formatDate(item.created_at)}
Expand Down
25 changes: 11 additions & 14 deletions src/lib/components/DomainTest/ResultInfo.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,10 @@
},
query: '',
});
const rawData = $derived(data.results);
const result = $derived(groupResult(data.results));
let showExport = $state(false);
let showShare = $state(false);
let showURL = $state(false);

function filterResults() {
const result = $derived.by(() => {
const newResult = groupResult(data.results);
const filtered = groupResult(
rawData.filter(
data.results.filter(
(r) =>
(filter.levels[r.level] || filter.levels['ALL']) &&
(!filter.query.length ||
Expand All @@ -60,9 +55,14 @@
),
);

result.modules = filtered.modules;
result.modulesMap = filtered.modulesMap;
}
newResult.modules = filtered.modules;
newResult.modulesMap = filtered.modulesMap;

return newResult;
});
let showExport = $state(false);
let showShare = $state(false);
let showURL = $state(false);

function onCheck({ target }: Event) {
const { value, checked } = target as HTMLInputElement;
Expand All @@ -84,13 +84,10 @@
if (Object.values(filter.levels).every((v) => !v)) {
filter.levels['ALL'] = true;
}

filterResults();
}

function onQueryChange({ target }: Event) {
filter.query = (target as HTMLInputElement).value;
filterResults();
}

function expandAllModules() {
Expand Down