Skip to content

Commit f2ead07

Browse files
authored
Merge pull request #64 from akvo/social-accountibility-updates
fix filter
2 parents 422b76f + f2af732 commit f2ead07

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

frontend/components/FilterSection.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ export default function FilterSection({
1616
onFilterChange,
1717
onClearFilters,
1818
visibleFilters = ['region', 'topic', 'type', 'year', 'valueChain'],
19+
isStakeholderDirectory = false,
20+
isNewsEvents = false,
1921
className = '',
2022
}) {
2123
const {
@@ -70,10 +72,20 @@ export default function FilterSection({
7072
label: 'Type',
7173
icon: TypeIcon,
7274
hasAllOption: false,
73-
options: [
74-
{ value: 'File', label: 'File' },
75-
{ value: 'Link', label: 'Link' },
76-
],
75+
options: isStakeholderDirectory
76+
? [
77+
{ value: 'Individual', label: 'Individual' },
78+
{ value: 'Organization', label: 'Organization' },
79+
]
80+
: isNewsEvents
81+
? [
82+
{ value: 'News', label: 'News' },
83+
{ value: 'Events', label: 'Events' },
84+
]
85+
: [
86+
{ value: 'File', label: 'File' },
87+
{ value: 'Link', label: 'Link' },
88+
],
7789
},
7890
year: {
7991
label: 'Year',

frontend/pages/news-events.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,16 @@ export default function NewsEventsDirectory() {
204204
} else if (filterKey === 'upcoming') {
205205
handleFilterChange('upcoming', values[0] || 'Upcoming');
206206
} else {
207-
handleFilterChange(filterKey, values);
207+
console.log('Unhandled filter key:', filterKey);
208+
handleFilterChange(
209+
filterKey === 'type' ? 'types' : filterKey,
210+
values
211+
);
208212
}
209213
}}
214+
isNewsEvents={true}
210215
onClearFilters={handleClearFilters}
211-
visibleFilters={['type', 'region']}
216+
visibleFilters={['region', 'type']}
212217
/>
213218
</div>
214219

frontend/pages/stakeholder-directory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ export default function StakeholderDirectory() {
196196
onFilterChange={handleFilterChange}
197197
onClearFilters={handleClearFilters}
198198
visibleFilters={['region', 'topic', 'type']}
199+
isStakeholderDirectory={true}
199200
customLabels={{
200201
type: 'Type',
201202
}}

0 commit comments

Comments
 (0)