Merge pull request #312 from dotkom/feat/302-admin-issue-conclusion-w…

…hen-voting-finished Feature #302 - Display conclusion of issue to admins before users
dotkom · Feb 21, 2018 · c62bd60 · c62bd60
2 parents d483ce9 + 392b5e3
commit c62bd60
Show file tree

Hide file tree

Showing 11 changed files with 895 additions and 200 deletions.
diff --git a/client/src/components/Admin/AdminPanel.js b/client/src/components/Admin/AdminPanel.js
@@ -5,7 +5,7 @@ import { Link, Route, Switch } from 'react-router-dom';
 import * as OfflinePluginRuntime from 'offline-plugin/runtime';
 import { IS_MANAGER } from 'common/auth/permissions';
 import { endGAM, toggleRegistration } from 'features/meeting/actionCreators';
-import AdminHome from './Home';
+import { AdminHomeContainer } from './Home';
 import { IssueFormContainer } from './IssueForm';
 import Users from './Users';
 import Button from '../Button';
@@ -119,7 +119,7 @@ class AdminPanel extends React.Component {
               <Switch>
                 <Route exact path={`${match.path}/question`} component={IssueFormContainer} />
                 <Route exact path={`${match.path}/users`} component={Users} />
-                <Route exact path={match.path} component={AdminHome} />
+                <Route exact path={match.path} component={AdminHomeContainer} />
                 <Route component={NotFound} />
               </Switch>
             </main>

diff --git a/client/src/components/Admin/Home.js b/client/src/components/Admin/Home.js
@@ -1,15 +1,21 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
 import DocumentTitle from 'react-document-title';
+import { VOTING_FINISHED } from 'common/actionTypes/issues';
+import Issue from '../App/Issue';
 import { IssueContainer } from './Issue';
 import Alternatives from './Alternatives';
+import ConcludedIssue from '../ConcludedIssue';
 import LatestConcludedIssue from '../LatestConcludedIssue';
 import { ConcludedIssueListContainer } from '../ConcludedIssueList';
 import UserSettings from '../UserSettings';
 import IssueStatus from '../IssueStatus';
+import { getIssue } from '../../features/issue/selectors';
 import css from '../../css/Home.css';
 
 
-const AdminHome = () => (
+const AdminHome = ({ issue }) => (
   <DocumentTitle title="Generalforsamling adminpanel">
     <div>
       <div className={css.components}>
@@ -19,6 +25,11 @@ const AdminHome = () => (
         </div>
         <IssueStatus />
       </div>
+      {(issue && issue.status === VOTING_FINISHED) && <div className={css.latestIssueRemoveMargin}>
+        <ConcludedIssue
+          {...issue}
+        />
+      </div>}
       <div className={css.components}>
         <div className={css.latestIssue}>
           <LatestConcludedIssue />
@@ -30,4 +41,19 @@ const AdminHome = () => (
   </DocumentTitle>
 );
 
+AdminHome.defaultProps = {
+  issue: Issue.defaultProps,
+};
+
+AdminHome.propTypes = {
+  issue: PropTypes.shape(Issue.propTypes),
+};
+
+const mapStateToProps = state => ({
+  issue: getIssue(state),
+});
+
 export default AdminHome;
+export const AdminHomeContainer = connect(
+  mapStateToProps,
+)(AdminHome);
diff --git a/client/src/components/ConcludedIssue/index.js b/client/src/components/ConcludedIssue/index.js
@@ -6,7 +6,9 @@ import IconText from '../IconText';
 import Card from '../Card';
 import css from './ConcludedIssue.css';
 
-const ConcludedIssue = ({ winner, voteDemand, text, alternatives, votes, qualifiedVoters }) => {
+const ConcludedIssue = ({
+  winner, voteDemand, text, alternatives, concludedVotes, qualifiedVoters,
+  }) => {
   const majority = winner !== null;
   return (<Card
     classes={css.concludedIssue}
@@ -33,7 +35,7 @@ const ConcludedIssue = ({ winner, voteDemand, text, alternatives, votes, qualifi
                 && alternative.id === winner,
             })}
           >
-            {alternative.text}{ Object.keys(votes).length > 0 && `: ${votes[alternative.id]}` }
+            {alternative.text}{ Object.keys(concludedVotes).length > 0 && `: ${concludedVotes[alternative.id]}` }
           </li>
       ))}
     </ul>
@@ -42,7 +44,7 @@ const ConcludedIssue = ({ winner, voteDemand, text, alternatives, votes, qualifi
 
 ConcludedIssue.defaultProps = {
   alternatives: [],
-  votes: {},
+  concludedVotes: {},
   voteDemand: RESOLUTION_TYPES.regular.voteDemand,
   text: 'Denne saken har ingen tittel.',
   winner: null,
@@ -57,7 +59,7 @@ ConcludedIssue.propTypes = {
     text: PropTypes.string.isRequired,
   })).isRequired,
   qualifiedVoters: PropTypes.number.isRequired,
-  votes: PropTypes.objectOf(PropTypes.number),
+  concludedVotes: PropTypes.objectOf(PropTypes.number),
   winner: PropTypes.string,
 };
 

diff --git a/client/src/css/Home.css b/client/src/css/Home.css
@@ -27,3 +27,7 @@
 .latestIssue > * {
   margin: 0;
 }
+
+.latestIssueRemoveMargin {
+  margin: 0 -0.5rem;
+}
diff --git a/client/src/features/issue/reducer.js b/client/src/features/issue/reducer.js
@@ -1,7 +1,7 @@
 import { CLOSE_ISSUE, OPEN_ISSUE, SEND_VOTE, DELETED_ISSUE } from 'common/actionTypes/issues';
 import { RECEIVE_VOTE, USER_VOTE, DISABLE_VOTING, ENABLE_VOTING } from 'common/actionTypes/voting';
 
-const issue = (state = { votes: {} }, action, currentIssue) => {
+const issue = (state = { votes: {}, concludedVotes: {} }, action, currentIssue) => {
   switch (action.type) {
     case CLOSE_ISSUE:
     case OPEN_ISSUE: {
@@ -22,9 +22,10 @@ const issue = (state = { votes: {} }, action, currentIssue) => {
         countingBlankVotes: action.data.countingBlankVotes,
         showOnlyWinner: action.data.showOnlyWinner,
         status: action.data.status,
-        votes: action.data.votes || {},
+        votes: action.data.votes || state.votes,
         winner: action.data.winner,
         userVote: state.userVote || null,
+        concludedVotes: action.data.concludedVotes || {},
       };
     }
     case USER_VOTE: {