Skip to content

Commit 9ca5526

Browse files
wbglaeserwbglaeser
committed
Merge branch 'main' of github.com:Citizen-Knowledge-Graph/foerderfunke-react-app
2 parents 5cde130 + b23bacb commit 9ca5526

9 files changed

Lines changed: 25 additions & 64 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.4.5",
11+
"@foerderfunke/matching-engine": "^1.4.6",
1212
"@mui/icons-material": "^5.15.19",
1313
"@mui/material": "^5.15.19",
1414
"@mui/x-charts": "^7.6.2",

‎public/assets/data/requirement-profiles/requirement-profiles.json‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"datafields": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/datafields.ttl",
3-
"datafields-bielefeld": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/datafields-bielefeld.ttl",
4-
"definitions": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/definitions.ttl",
5-
"materialization": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/materialization.ttl",
6-
"consistency": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/consistency.ttl",
72
"def": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/build/def.built.ttl",
83
"queries": [
94
{
@@ -109,43 +104,35 @@
109104
},
110105
{
111106
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/schwerbehindertenausweis.ttl",
112-
"rpUri": "https://foerderfunke.org/default#schwerbehindertenausweis",
113-
"behindFeatureFlag": "bielefunke"
107+
"rpUri": "https://foerderfunke.org/default#schwerbehindertenausweis"
114108
},
115109
{
116110
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/erwerbsminderungsrente-voll.ttl",
117-
"rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-voll",
118-
"behindFeatureFlag": "bielefunke"
111+
"rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-voll"
119112
},
120113
{
121114
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/erwerbsminderungsrente-teilweise.ttl",
122-
"rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-teilweise",
123-
"behindFeatureFlag": "bielefunke"
115+
"rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-teilweise"
124116
},
125117
{
126118
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/substitutionstherapie-regulaer.ttl",
127-
"rpUri": "https://foerderfunke.org/default#substitutionstherapie-regulaer",
128-
"behindFeatureFlag": "bielefunke"
119+
"rpUri": "https://foerderfunke.org/default#substitutionstherapie-regulaer"
129120
},
130121
{
131122
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/substitutionstherapie-diamorphin.ttl",
132-
"rpUri": "https://foerderfunke.org/default#substitutionstherapie-diamorphin",
133-
"behindFeatureFlag": "bielefunke"
123+
"rpUri": "https://foerderfunke.org/default#substitutionstherapie-diamorphin"
134124
},
135125
{
136126
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/arbeitsassistenz.ttl",
137-
"rpUri": "https://foerderfunke.org/default#arbeitsassistenz",
138-
"behindFeatureFlag": "bielefunke"
127+
"rpUri": "https://foerderfunke.org/default#arbeitsassistenz"
139128
},
140129
{
141130
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/persoenliches-budget.ttl",
142-
"rpUri": "https://foerderfunke.org/default#persoenliches-budget",
143-
"behindFeatureFlag": "bielefunke"
131+
"rpUri": "https://foerderfunke.org/default#persoenliches-budget"
144132
},
145133
{
146134
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/eingliederungshilfe.ttl",
147-
"rpUri": "https://foerderfunke.org/default#eingliederungshilfe",
148-
"behindFeatureFlag": "bielefunke"
135+
"rpUri": "https://foerderfunke.org/default#eingliederungshilfe"
149136
},
150137
{
151138
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/blindengeld.ttl",

‎src/core/managers/matchingEngineManager.js‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,9 @@ const matchingEngineManager = {
2020
"assets/data/requirement-profiles/requirement-profiles.json"
2121
);
2222

23-
/*const datafieldsString = await resourceService.fetchResourceWithCache(validationConfig["datafields"]);
24-
const datafieldsBielefeldString = await resourceService.fetchResourceWithCache(validationConfig["datafields-bielefeld"]);
25-
const definitionsString = await resourceService.fetchResourceWithCache(validationConfig["definitions"]);
26-
const materializationString = await resourceService.fetchResourceWithCache(validationConfig["materialization"]);
27-
const consistencyString = await resourceService.fetchResourceWithCache(validationConfig["consistency"]);*/
28-
const defString = await resourceService.fetchResourceWithCache(validationConfig["def"]);
29-
3023
const engine = new MatchingEngine();
31-
/*engine.addDatafieldsTurtle(datafieldsString)
32-
engine.addDatafieldsTurtle(datafieldsBielefeldString)
33-
engine.addDefinitionsTurtle(definitionsString);
34-
engine.addMaterializationTurtle(materializationString);
35-
engine.addConsistencyTurtle(consistencyString);*/
36-
engine.addDef(defString)
24+
if (featureFlags.matchingEnginePerformanceLogging) engine.turnOnPerformanceLogging()
25+
engine.addDef(await resourceService.fetchResourceWithCache(validationConfig["def"]))
3726

3827
for (const { fileUrl, behindFeatureFlag } of validationConfig["queries"]) {
3928
if (behindFeatureFlag && !featureFlags[behindFeatureFlag]) continue;

‎src/featureFlags.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const defaultFlags = {
22
subindividuals: false,
3-
showMermaidRuleGraph: true,
4-
bielefunke: true
3+
matchingEnginePerformanceLogging: false
54
};
65

76
const getFeatureFlag = (flag) => {
@@ -11,8 +10,7 @@ const getFeatureFlag = (flag) => {
1110

1211
const featureFlags = {
1312
subindividuals: getFeatureFlag('subindividuals'),
14-
showMermaidRuleGraph: getFeatureFlag('showMermaidRuleGraph'),
15-
bielefunke: getFeatureFlag('bielefunke')
13+
matchingEnginePerformanceLogging: getFeatureFlag('matchingEnginePerformanceLogging')
1614
};
1715

1816
export const setFeatureFlag = (flag, value) => {

‎src/ui/language/useTranslation.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
import { useCallback } from 'react';
22
import { useLanguageStore } from '@/ui/storage/useLanguageStore';
33
import translations from './translations';
4-
import featureFlags from "@/featureFlags";
54

6-
const LANG_OPTIONS_RAW = [
5+
export const LANG_OPTIONS = [
76
{ code: "de", short: "DE", label: "Deutsch", icon: `${process.env.PUBLIC_URL}/assets/images/country-flags/german.svg`},
87
{ code: "de_es", short: "DE+E", label: "Einfache Sprache", icon: `${process.env.PUBLIC_URL}/assets/images/country-flags/german.svg` },
98
// { code: "de_ls", short: "DE+L", label: "Deutsch (Leichte Sprache)" },
109
{ code: "en", short: "EN", label: "English", icon: `${process.env.PUBLIC_URL}/assets/images/country-flags/english.svg`},
1110
];
1211

13-
export const LANG_OPTIONS = featureFlags.bielefunke
14-
? LANG_OPTIONS_RAW
15-
: LANG_OPTIONS_RAW.filter(opt => opt.code !== "de_es");
16-
1712
export const pickLang = (obj, lang, fallback) => {
1813
if (!obj || typeof obj !== "object") return fallback;
1914
if (obj[lang] !== undefined) return obj[lang];

‎src/ui/screens/benefit-page/BenefitPageScreen.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import Layout from "@/ui/shared-components/Layout";
33
import { VBox } from '@/ui/shared-components/LayoutBoxes';
44
import BenefitPageHeader from "./components/BenefitPageHeader";
55
import AppScreenWrapperContainer from '@/ui/shared-components/app-screen-wrapper/AppScreenWrapperContainer';
6-
import featureFlags from "@/featureFlags";
76
import BenefitPageGeneral from './components/BenefitPageGeneral';
87
import BenefitPageApplication from './components/BenefitPageApplication';
98
import BenefitPageRequirements from './components/BenefitPageRequirements';
@@ -43,9 +42,7 @@ const BenefitPageScreen = ({
4342
<BenefitPageLocal t={t} isDesktop={isDesktop} localisedData={localisedData} />
4443
)
4544
}
46-
{featureFlags.showMermaidRuleGraph &&
47-
<BenefitPageRequirements t={t} validatedStatus={validatedStatus} isDesktop={isDesktop} evalGraph={matchingGraph} />
48-
}
45+
<BenefitPageRequirements t={t} validatedStatus={validatedStatus} isDesktop={isDesktop} evalGraph={matchingGraph} />
4946
</VBox>
5047
</VBox>
5148
</AppScreenWrapperContainer>

‎src/ui/screens/eligibilty-overview/EligibilityOverviewScreen.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import EligibilityOverviewHeader from "./components/EligibilityOverviewHeader";
77
import EligibilityOverviewSection from "./components/EligibilityOverviewSection";
88
import EligibilityOverviewFilter from './components/EligibilityOverviewFilter';
99
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
10-
import featureFlags from "@/featureFlags";
1110
import { useSelectedBenefitsStore } from "@/ui/storage/zustand";
1211
import EastIcon from '@mui/icons-material/East';
1312

@@ -49,7 +48,7 @@ const EligibilityOverviewScreen = ({
4948
filters={filters}
5049
onChangeFilters={onChangeFilters}
5150
/>
52-
{featureFlags.bielefunke && atLeastOneWithMissingData() &&
51+
{atLeastOneWithMissingData() &&
5352
<RegularButton
5453
text={"Noch offene Ansprüche prüfen"}
5554
variant={'blackContained'}

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useMemo } from "react";
2-
import featureFlags from "@/featureFlags";
32
import { pickLang } from "@/ui/language/useTranslation";
43

54
const useEligibilityData = (validationReport, metadata, hydrationData, language) => {
@@ -154,16 +153,14 @@ const useEligibilityData = (validationReport, metadata, hydrationData, language)
154153
),
155154
};
156155

157-
if (featureFlags.bielefunke) {
158-
filterOptions.tags = Array.from(
159-
new Map(
160-
allReports
161-
.flatMap(r => r.tags || [])
162-
.filter(Boolean)
163-
.map(cat => [cat.id, cat])
164-
).values()
165-
)
166-
}
156+
filterOptions.tags = Array.from(
157+
new Map(
158+
allReports
159+
.flatMap(r => r.tags || [])
160+
.filter(Boolean)
161+
.map(cat => [cat.id, cat])
162+
).values()
163+
);
167164

168165
const eligibilityData = allReports.reduce((acc, report) => {
169166
const { category, result } = report;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { HBox, VBox } from "@/ui/shared-components/LayoutBoxes";
44
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
55
import LandingPageSectionWrapper from "../../components/LandingPageSectionWrapper";
66
import LandingPageTopSectionShared from "./components/LandingPageTopSectionShared";
7-
import featureFlags from "@/featureFlags";
87
import { Typography } from "@mui/material";
98
import { Link } from 'react-router-dom';
109

@@ -21,7 +20,7 @@ const LandingPageTopSection = ({ runway }) => {
2120
<VBox sx={{ width: "50%", alignItems: "center" }}>
2221
<VBox sx={{ maxWidth: "600px", gap: 4 }}>
2322
<LandingPageTopSectionShared />
24-
{runway === "bielefunke" && featureFlags.bielefunke && (
23+
{runway === "bielefunke" && (
2524
<VBox
2625
sx={(theme) => ({
2726
padding: 4,

0 commit comments

Comments
 (0)