Skip to content

Commit 88df007

Browse files
committed
use new violations version and set feature flag for written violations to true
1 parent 5f73e8b commit 88df007

File tree

5 files changed

+29
-20
lines changed

5 files changed

+29
-20
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "https://foerderfunke.org/",
66
"dependencies": {
7-
"@foerderfunke/matching-engine": "1.5.2",
7+
"@foerderfunke/matching-engine": "1.5.5",
88
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
99
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
1010
"@emotion/react": "^11.11.4",

src/featureFlags.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const defaultFlags = {
22
subindividuals: false,
33
matchingEnginePerformanceLogging: false,
44
profileUpdates: false,
5-
writtenViolations: false,
5+
writtenViolations: true,
66
customHints: false,
77
};
88

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ const BenefitPageScreen = ({
2222
validatedStatus,
2323
validationResult,
2424
categoryTitles,
25-
matchingGraph
25+
matchingGraph,
26+
violations
2627
}) => {
2728

2829
return (
@@ -50,7 +51,13 @@ const BenefitPageScreen = ({
5051
<BenefitPageLocal t={t} isDesktop={isDesktop} localisedData={localisedData} />
5152
)
5253
}
53-
<BenefitPageRequirements t={t} validatedStatus={validatedStatus} isDesktop={isDesktop} evalGraph={matchingGraph} />
54+
<BenefitPageRequirements
55+
t={t}
56+
validatedStatus={validatedStatus}
57+
isDesktop={isDesktop}
58+
evalGraph={matchingGraph}
59+
violations={violations}
60+
/>
5461
</VBox>
5562
</VBox>
5663
</AppScreenWrapperContainer>

src/ui/screens/benefit-page/BenefitPageScreenContainer.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@ import { useFetchLocaliseData } from './hooks/useFetchLocalisedData';
1313
import { useFetchCustomBenefitPageHints } from "@/ui/screens/benefit-page/hooks/useFetchCustomBenefitPageHints";
1414
import useFetchData from '@/ui/shared-hooks/utility/useFetchResource';
1515
import useFetchTargetClass from './hooks/useFetchTargetClass';
16+
import featureFlags from '@/featureFlags';
17+
1618

1719
const BenefitPageScreenContainer = () => {
1820
const { id } = useParams();
1921
const { t } = useTranslation();
2022
const isDesktop = useStore((state) => state.isDesktop);
2123
const [matchingGraph, setMatchingGraph] = useState(null);
24+
const [violations, setViolations] = useState(null);
2225
const language = useLanguageStore((state) => state.language);
2326

2427
const benefitPageData = useFetchStaticBenefitPageData(id, language);
2528
const categoryTitles = useBuildCategoryTitles(id, language);
26-
const {validatedStatus, validationResult} = useValidatedStatus(id);
29+
const { validatedStatus, validationResult } = useValidatedStatus(id);
2730
const activeUserId = useUserStore((state) => state.activeUserId);
2831
const localisedData = useFetchLocaliseData(benefitPageData); // merge this logic with customHints? TODO
2932
const customHints = useFetchCustomBenefitPageHints(benefitPageData);
@@ -44,6 +47,17 @@ const BenefitPageScreenContainer = () => {
4447
fetchMatchingReport();
4548
}, [id, activeUserId, language]);
4649

50+
useEffect(() => {
51+
async function fetchEvalGraph() {
52+
const violations = await matchingEngineManager.fetchWrittenViolations(matchingGraph)
53+
setViolations(violations);
54+
}
55+
if (validatedStatus && matchingGraph && featureFlags.writtenViolations) {
56+
fetchEvalGraph();
57+
}
58+
}, [validatedStatus, matchingGraph]);
59+
60+
4761
return (
4862
<BenefitPageScreen
4963
t={t}
@@ -58,6 +72,7 @@ const BenefitPageScreenContainer = () => {
5872
targetClass={targetClass}
5973
categoryTitles={categoryTitles}
6074
matchingGraph={matchingGraph}
75+
violations={violations}
6176
/>
6277
);
6378
};

src/ui/screens/benefit-page/components/BenefitPageRequirements.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
1-
import React, { useEffect, useState } from 'react';
1+
import React, { useState } from 'react';
22
import theme from '@/theme';
33
import { HBox, VBox } from '@/ui/shared-components/LayoutBoxes';
44
import { Typography } from "@mui/material";
55
import BenefitPageMarkdownElement from './BenefitPageMarkDownElement';
66
import RegularButton from '@/ui/shared-components/buttons/RegularButton';
77
import FlowChart from '@/ui/shared-components/flow-chart/FlowChart';
8-
import matchingEngineManager from "@/core/managers/matchingEngineManager";
98
import featureFlags from '@/featureFlags';
109
import ClearIcon from '@mui/icons-material/Clear';
1110

1211

13-
const BenefitPageRequirements = ({ t, validatedStatus, isDesktop, evalGraph }) => {
12+
const BenefitPageRequirements = ({ t, validatedStatus, isDesktop, evalGraph, violations }) => {
1413
const [open, setOpen] = useState(validatedStatus);
15-
const [violations, setViolations] = useState(null);
1614
const objectIcon = `${process.env.PUBLIC_URL}/assets/images/benefit-pages/tree.svg`;
1715

18-
useEffect(() => {
19-
async function fetchEvalGraph() {
20-
const violations = await matchingEngineManager.fetchWrittenViolations(evalGraph)
21-
setViolations(violations);
22-
console.log("Fetched written violations:", violations);
23-
}
24-
if (validatedStatus && evalGraph && featureFlags.writtenViolations) {
25-
fetchEvalGraph();
26-
}
27-
}, [validatedStatus, evalGraph]);
28-
2916
return (
3017
<VBox
3118
sx={{

0 commit comments

Comments
 (0)