Skip to content

Commit

Permalink
Merge pull request #92 from ThatConference/fix/session-filters
Browse files Browse the repository at this point in the history
fix session list filter
  • Loading branch information
brettski committed Oct 6, 2023
2 parents 62c8e2b + a400a49 commit 879cea5
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thatconference.com",
"version": "5.0.6",
"version": "5.0.7",
"description": "THATConference.com website",
"main": "index.js",
"type": "module",
Expand Down
26 changes: 16 additions & 10 deletions src/_components/activities/List.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@
const tagsSet = new Set();
const communitiesSet = new Set();
for (const activity of activities) {
for (let j = 0; j < activities.length; j += 1) {
const activity = activities[j];
for (const tag of activity.tags) {
tagsSet.add(tag.toLowerCase());
}
Expand All @@ -87,23 +89,27 @@
$: primaryCategorySort = activitiesFiltered.filter(
(activity) =>
(activity.category == 'FAMILY' ? family : false) ||
(activity.category == 'PROFESSIONAL' ? professional : false) ||
activities.category == null
(activity.category === 'FAMILY' ? family : false) ||
(activity.category === 'PROFESSIONAL' ? professional : false) ||
activities.category === null
);
$: activitiesLocationCategoryFiltered = primaryCategorySort.filter(
(activity) =>
(activity.type == 'REGULAR' ? regular : false) ||
(activity.type == 'KEYNOTE' ? keynote : false) ||
(activity.type == 'WORKSHOP' ? workshop : false) ||
(activity.type == 'OPEN_SPACE' ? openSpace : false)
(activity.type === 'REGULAR' ? regular : false) ||
(activity.type === 'KEYNOTE' ? keynote : false) ||
(activity.type === 'WORKSHOP' ? workshop : false) ||
(activity.type === 'OPEN_SPACE' ? openSpace : false)
);
$: activitiesTaggedFiltered =
selectedFilterTerms.length > 0
? activitiesLocationCategoryFiltered.filter((activity) =>
selectedFilterTerms.some((tag) => activity.tags.some((t) => t.toLowerCase() === tag))
? activitiesLocationCategoryFiltered.filter(
(activity) =>
selectedFilterTerms.some((tag) => activity.tags.some((t) => t.toLowerCase() === tag)) ||
selectedFilterTerms.some((tag) =>
activity.communities.some((c) => c.toLowerCase() === tag.replace('@', ''))
)
)
: activitiesLocationCategoryFiltered;
Expand Down

0 comments on commit 879cea5

Please sign in to comment.