Skip to content

Commit dbe30c7

Browse files
committed
Include tags as filter option in bielefunke mode
1 parent c31152d commit dbe30c7

6 files changed

Lines changed: 30 additions & 4 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
99
"@emotion/react": "^11.11.4",
1010
"@emotion/styled": "^11.11.5",
11-
"@foerderfunke/matching-engine": "^1.2.8",
11+
"@foerderfunke/matching-engine": "^1.3.0",
1212
"@mui/icons-material": "^5.15.19",
1313
"@mui/material": "^5.15.19",
1414
"@mui/x-charts": "^7.6.2",

src/ui/language/translations.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ const translations = {
240240
administrativeLevels: "Administrative level",
241241
providingAgencies: "Providing agency",
242242
associatedLaws: "Associated law",
243+
tags: "Tag",
243244
},
244245
item: {
245246
eligible: "You are likely eligible",
@@ -557,6 +558,7 @@ const translations = {
557558
administrativeLevels: "Verwaltungsebene",
558559
providingAgencies: "Zuständige Behörde",
559560
associatedLaws: "Zugehöriges Gesetz",
561+
tags: "Schlagwort",
560562
},
561563
item: {
562564
eligible: "Sie haben womöglich Anspruch",

src/ui/screens/eligibilty-overview/components/EligibilityOverviewItem.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ const filterKeys = [
1414
'benefitCategories',
1515
'administrativeLevels',
1616
'associatedLaws',
17-
'providingAgencies'
17+
'providingAgencies',
18+
'tags'
1819
];
1920

2021
const EligibilityOverviewItem = ({ t, item, eligible }) => {

src/ui/screens/eligibilty-overview/hooks/useEligibilityData.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useMemo } from "react";
2+
import featureFlags from "@/featureFlags";
23

34
const useEligibilityData = (validationReport, metadata, hydrationData, language) => {
45
return useMemo(() => {
@@ -69,6 +70,15 @@ const useEligibilityData = (validationReport, metadata, hydrationData, language)
6970
}))
7071
: [];
7172

73+
// tags
74+
const rawTags = rpMetadata?.['ff:tag'];
75+
const tags = rawTags
76+
? (Array.isArray(rawTags) ? rawTags : [rawTags])
77+
.map(tag => ({
78+
id: tag['@id'],
79+
label: defDict[tag['@id']] || ''
80+
}))
81+
: [];
7282

7383
// benefit categories
7484
const rawCategories = rpMetadata?.['ff:category'];
@@ -95,6 +105,7 @@ const useEligibilityData = (validationReport, metadata, hydrationData, language)
95105
validationStage,
96106
associatedLaws,
97107
providingAgencies,
108+
tags,
98109
administrativeLevels,
99110
benefitCategories
100111
};
@@ -138,6 +149,17 @@ const useEligibilityData = (validationReport, metadata, hydrationData, language)
138149
),
139150
};
140151

152+
if (featureFlags.bielefunke) {
153+
filterOptions.tags = Array.from(
154+
new Map(
155+
allReports
156+
.flatMap(r => r.tags || [])
157+
.filter(Boolean)
158+
.map(cat => [cat.id, cat])
159+
).values()
160+
)
161+
}
162+
141163
const eligibilityData = allReports.reduce((acc, report) => {
142164
const { category, result } = report;
143165

src/ui/screens/eligibilty-overview/hooks/useFilterEligibilityData.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const useFilterEligibilityData = (eligibilityData, filters) => {
88
'providingAgencies',
99
'associatedLaws',
1010
'benefitCategories',
11-
'administrativeLevels'
11+
'administrativeLevels',
12+
'tags'
1213
];
1314

1415
const passesAllFilters = item => {

src/ui/screens/landing-page/sections/top-section/LandingPageTopSection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const LandingPageTopSection = ({ runway }) => {
2727
<Typography variant="body1" sx={{ textAlign: 'left' }}>
2828
Gebt uns gerne Feedback: (dedicated email address?)
2929
<br/><br/>
30-
Siehe <Link to={"/eligibility-overview"}>hier</Link> die Leistungen die wir im Rahmen des Pilotprojekts bis jetzt eingepflegt haben.
30+
<Link to="/eligibility-overview?tags=ff%3Abielefunke">hier</Link> die Leistungen die wir im Rahmen des Pilotprojekts bis jetzt eingepflegt haben.
3131
</Typography>
3232
</>
3333
)}

0 commit comments

Comments
 (0)