Skip to content

Commit 46bdf5f

Browse files
authored
Merge pull request #526 from sewebb/fix-filter
Fix filter
2 parents b2701f4 + deef66a commit 46bdf5f

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

src/lib/components/DomainTest/DomainTest.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
$effect(() => {
5555
if (currentState === 'complete' && previousState === 'testing') {
5656
const base = import.meta.env.BASE_URL;
57-
document.location.href = `${base}${getLocale()}/result/${currentContext.testId}`;
57+
document.location.href = `${base}${getLocale()}/result/${currentContext.testId}/`;
5858
transition('RESET');
5959
}
6060
});

src/lib/components/DomainTest/History.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
{#each paginatedHistory as item}
111111
<li class={item.overall_result}>
112112
<a
113-
href={`${import.meta.env.BASE_URL}${getLocale()}/result/${item.id}`}
113+
href={`${import.meta.env.BASE_URL}${getLocale()}/result/${item.id}/`}
114114
onclick={onClickLink}
115115
>
116116
{formatDate(item.created_at)}

src/lib/components/DomainTest/ResultInfo.svelte

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,10 @@
4242
},
4343
query: '',
4444
});
45-
const rawData = $derived(data.results);
46-
const result = $derived(groupResult(data.results));
47-
let showExport = $state(false);
48-
let showShare = $state(false);
49-
let showURL = $state(false);
50-
51-
function filterResults() {
45+
const result = $derived.by(() => {
46+
const newResult = groupResult(data.results);
5247
const filtered = groupResult(
53-
rawData.filter(
48+
data.results.filter(
5449
(r) =>
5550
(filter.levels[r.level] || filter.levels['ALL']) &&
5651
(!filter.query.length ||
@@ -60,9 +55,14 @@
6055
),
6156
);
6257
63-
result.modules = filtered.modules;
64-
result.modulesMap = filtered.modulesMap;
65-
}
58+
newResult.modules = filtered.modules;
59+
newResult.modulesMap = filtered.modulesMap;
60+
61+
return newResult;
62+
});
63+
let showExport = $state(false);
64+
let showShare = $state(false);
65+
let showURL = $state(false);
6666
6767
function onCheck({ target }: Event) {
6868
const { value, checked } = target as HTMLInputElement;
@@ -84,13 +84,10 @@
8484
if (Object.values(filter.levels).every((v) => !v)) {
8585
filter.levels['ALL'] = true;
8686
}
87-
88-
filterResults();
8987
}
9088
9189
function onQueryChange({ target }: Event) {
9290
filter.query = (target as HTMLInputElement).value;
93-
filterResults();
9491
}
9592
9693
function expandAllModules() {

0 commit comments

Comments
 (0)