Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-04-24 01:18:01 +02:00
Code Issues Projects Releases Wiki Activity

fix: sync (#334)

Browse Source
This commit is contained in:
Fredrik Strand Oseberg 2021-09-01 13:22:53 +02:00 committed by GitHub
parent 4acf897494
commit 44ff61ab99
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/component/archive/archive-list-container.js
View File

@ -11,6 +11,9 @@ const mapDispatchToProps = {
updateSetting: updateSettingForGroup('feature'), updateSetting: updateSettingForGroup('feature'),
}; };
const ArchiveListContainer = connect(mapStateToProps, mapDispatchToProps)(FeatureListComponent); const ArchiveListContainer = connect(
mapStateToProps,
mapDispatchToProps
)(FeatureListComponent);
export default ArchiveListContainer; export default ArchiveListContainer;

3
frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.styles.ts
View File

@ -5,9 +5,8 @@ export const useStyles = makeStyles(theme => ({
position: 'absolute', position: 'absolute',
top: '4px', top: '4px',
}, },
breadcrumbNavParagraph: { textTransform: 'capitalize', color: 'inherit' }, breadcrumbNavParagraph: { color: 'inherit' },
breadcrumbLink: { breadcrumbLink: {
textTransform: 'capitalize',
textDecoration: 'none', textDecoration: 'none',
}, },
})); }));

16
frontend/src/component/feature/FeatureToggleList/index.jsx
View File

@ -32,12 +32,19 @@ export const mapStateToPropsConfigurable = isFeature => state => {
f => f.project === settings.currentProjectId f => f.project === settings.currentProjectId
); );
} }
if (settings.filter) { if (settings.filter) {
try { try {
const regex = new RegExp(settings.filter, 'i'); const regex = new RegExp(settings.filter, 'i');
features = features.filter( features = features.filter(feature => {
feature => if (!isFeature) {
return (
regex.test(feature.name) ||
regex.test(feature.description) ||
(settings.filter.length > 1 &&
regex.test(JSON.stringify(feature)))
);
}
return (
feature.strategies.some(s => checkConstraints(s, regex)) || feature.strategies.some(s => checkConstraints(s, regex)) ||
regex.test(feature.name) || regex.test(feature.name) ||
regex.test(feature.description) || regex.test(feature.description) ||
@ -46,7 +53,8 @@ export const mapStateToPropsConfigurable = isFeature => state => {
) || ) ||
(settings.filter.length > 1 && (settings.filter.length > 1 &&
regex.test(JSON.stringify(feature))) regex.test(JSON.stringify(feature)))
); );
});
} catch (e) { } catch (e) {
// Invalid filter regex // Invalid filter regex
} }

10
frontend/src/component/feature/FeatureView/FeatureView.jsx
View File

@ -76,12 +76,10 @@ const FeatureView = ({
}, []); }, []);
useLayoutEffect(() => { useLayoutEffect(() => {
if (features.length === 0) { if (isFeatureView) {
if (isFeatureView) { fetchFeatureToggles();
fetchFeatureToggles(); } else {
} else { fetchArchive();
fetchArchive();
}
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, []); }, []);