Revert tunkki solution for getting study guidance group population instead of generic population from redux

This commit is contained in:
Otto Ahoniemi
2021-11-11 12:52:27 +02:00
parent 6937f72c53
commit 46c4dae639
@@ -466,7 +466,6 @@ GeneralTab.propTypes = {
const mapStateToProps = state => {
const {
api,
populations,
auth: {
token: { roles },
@@ -475,10 +474,7 @@ const mapStateToProps = state => {
return {
isAdmin: getUserIsAdmin(roles),
populationStatistics:
Object.keys(populations.data) > 0
? populations.data
: api.queries[Object.keys(api.queries).find(key => key.startsWith('getStudyGuidanceGroupPopulation'))]?.data,
populationStatistics: populations.data,
queryStudyrights: populations.query ? Object.values(populations.query.studyRights) : [],
queryYear: populations?.query?.year,
}