Generalize denormalization of object resources

2 files changed, 5 insertions, 11 deletions

diff --git a/src/containers/auth/Logout.js b/src/containers/auth/Logout.js
index 8d329c1f..ec2b8842 100644
--- a/src/containers/auth/Logout.js
+++ b/src/containers/auth/Logout.js
@@ -2,10 +2,6 @@ import {connect} from "react-redux";
 import {logOut} from "../../actions/auth";
 import LogoutButton from "../../components/navigation/LogoutButton";
 
-const mapStateToProps = state => {
-    return {};
-};
-
 const mapDispatchToProps = dispatch => {
     return {
         onLogout: () => dispatch(logOut()),
@@ -13,7 +9,7 @@ const mapDispatchToProps = dispatch => {
 };
 
 const Logout = connect(
-    mapStateToProps,
+    undefined,
     mapDispatchToProps
 )(LogoutButton);
 
diff --git a/src/containers/simulations/VisibleSimulationAuthList.js b/src/containers/simulations/VisibleSimulationAuthList.js
index 07740435..2a676e73 100644
--- a/src/containers/simulations/VisibleSimulationAuthList.js
+++ b/src/containers/simulations/VisibleSimulationAuthList.js
@@ -1,5 +1,6 @@
 import {connect} from "react-redux";
 import SimulationList from "../../components/simulations/SimulationAuthList";
+import {denormalize} from "../../store/denormalizer";
 
 const getVisibleSimulationAuths = (simulationAuths, filter) => {
     switch (filter) {
@@ -15,12 +16,9 @@ const getVisibleSimulationAuths = (simulationAuths, filter) => {
 };
 
 const mapStateToProps = state => {
-    const denormalizedAuthorizations = state.authorizationsOfCurrentUser.map(authorizationIds => {
-        const authorization = Object.assign({}, state.objects.authorizations[authorizationIds]);
-        authorization.simulation = state.objects.simulations[authorization.simulationId];
-        authorization.user = state.objects.users[authorization.userId];
-        return authorization;
-    });
+    const denormalizedAuthorizations = state.authorizationsOfCurrentUser.map(authorizationIds =>
+        denormalize(state, "authorization", authorizationIds)
+    );
 
     return {
         authorizations: getVisibleSimulationAuths(denormalizedAuthorizations, state.authVisibilityFilter)