Thank you, your choices have been saved!
{"Want to make a change? "}
- this.setState({ editMode: true })}>
+ this.setState({ enforceEditMode: true })}>
Click Here
{" to edit your team"}
@@ -109,9 +119,9 @@ class ShareableTeamSelector extends Component {
render() {
const { fullTeams, localTeam } = this.props;
- const { editMode, isLoadingTeam, selector, squadNumbers } = this.state;
+ const { isLoadingTeam, isLoadingChoices, selector, squadNumbers } = this.state;
- if (isLoadingTeam) {
+ if (isLoadingTeam || isLoadingChoices) {
return ;
}
@@ -129,7 +139,7 @@ class ShareableTeamSelector extends Component {
//Get current squad
let currentSquad = {};
- if (selector.activeUserChoices) {
+ if (selector.activeUserChoices && selector.activeUserChoices.length) {
currentSquad = _.chain(selector.activeUserChoices)
.map((_player, i) => {
//Get Position
@@ -156,7 +166,7 @@ class ShareableTeamSelector extends Component {
players={players}
requireFullTeam={true}
submitText="Save Choices"
- readOnly={selector.activeUserChoices && !editMode}
+ readOnly={this.selectionIsComplete()}
team={fullTeams[localTeam]}
usesExtraInterchange={selector.usesExtraInterchange}
/>
@@ -175,14 +185,16 @@ ShareableTeamSelector.defaultProps = {
urlFormatter: s => `team-selectors/${s.slug}`
};
-function mapStateToProps({ config, teams }) {
+function mapStateToProps({ config, teams, teamSelectors }) {
const { baseUrl, localTeam, site_social } = config;
const { fullTeams } = teams;
- return { baseUrl, fullTeams, localTeam, site_social };
+ const { selectors } = teamSelectors;
+ return { baseUrl, fullTeams, localTeam, site_social, selectors };
}
export default connect(mapStateToProps, {
fetchPreviewImage,
+ fetchTeamSelectorChoices,
saveTeamSelectorChoices,
shareTeamSelector,
fetchTeam
diff --git a/src/client/reducers/teamSelectorReducer.js b/src/client/reducers/teamSelectorReducer.js
index 2cfa2f41..e12a428d 100644
--- a/src/client/reducers/teamSelectorReducer.js
+++ b/src/client/reducers/teamSelectorReducer.js
@@ -1,9 +1,9 @@
import _ from "lodash";
-import { FETCH_TEAM_SELECTOR, FETCH_TEAM_SELECTOR_LIST, DELETE_TEAM_SELECTOR } from "../actions/types";
+import { FETCH_TEAM_SELECTOR, FETCH_TEAM_SELECTOR_LIST, DELETE_TEAM_SELECTOR, FETCH_TEAM_SELECTOR_CHOICES } from "../actions/types";
import { teamSelectors as listProperties } from "~/constants/listProperties";
-export default function (state = { selectors: {}, haveLoadedAll: false }, action) {
+export default function(state = { selectors: {}, haveLoadedAll: false }, action) {
switch (action.type) {
case FETCH_TEAM_SELECTOR: {
return {
@@ -18,6 +18,18 @@ export default function (state = { selectors: {}, haveLoadedAll: false }, action
}
};
}
+ case FETCH_TEAM_SELECTOR_CHOICES: {
+ return {
+ ...state,
+ selectors: {
+ ...state.selectors,
+ [action.payload.id]: {
+ ...state.selectors[action.payload.id],
+ activeUserChoices: action.payload.choices
+ }
+ }
+ };
+ }
case FETCH_TEAM_SELECTOR_LIST: {
return {
diff --git a/src/controllers/teamSelectorController.js b/src/controllers/teamSelectorController.js
index 71dd6c9f..755dbc09 100644
--- a/src/controllers/teamSelectorController.js
+++ b/src/controllers/teamSelectorController.js
@@ -59,13 +59,7 @@ export async function getTeamSelector(req, res) {
const selector = await fetchTeamSelector(_id, res);
if (selector) {
- //Set choices for active user
- const activeUserChoices = selector.choices.find(({ ip }) => ip == req.ipAddress);
- if (activeUserChoices) {
- selector.activeUserChoices = activeUserChoices.squad;
- }
-
- //Remove other choices for non-admins
+ //Remove choices for non-admins
if (!req.user || !req.user.isAdmin) {
delete selector.choices;
}
@@ -74,6 +68,17 @@ export async function getTeamSelector(req, res) {
}
}
+export async function getTeamSelectorChoicesByIp(req, res) {
+ // We do this separately to the main call as IP detection just doesn't work with SSR.
+ const { _id } = req.params;
+
+ const selector = await fetchTeamSelector(_id, res);
+ if (selector) {
+ const activeUserChoices = selector.choices.find(({ ip }) => ip == req.ipAddress);
+ res.send(activeUserChoices ? activeUserChoices.squad : []);
+ }
+}
+
export async function getPreviewImage(req, res) {
const { _id } = req.params;
const selector = await fetchTeamSelector(_id, res);
@@ -190,10 +195,7 @@ export async function submitUserChoices(req, res) {
const squad = _.values(req.body);
if (currentVote) {
- await TeamSelector.updateOne(
- { _id, "choices._id": currentVote._id },
- { $set: { "choices.$.squad": squad } }
- );
+ await TeamSelector.updateOne({ _id, "choices._id": currentVote._id }, { $set: { "choices.$.squad": squad } });
} else {
selector.choices.push({ ip: ipAddress, squad });
await selector.save();
@@ -243,10 +245,7 @@ export async function generateImage(req, res, selector) {
const { squad } = activeUserChoices;
//Get main player info
- const playerData = await Person.find(
- { _id: { $in: squad } },
- "name images nickname displayNicknameInCanvases squadNameWhenDuplicate gender"
- ).lean();
+ const playerData = await Person.find({ _id: { $in: squad } }, "name images nickname displayNicknameInCanvases squadNameWhenDuplicate gender").lean();
//Get squad numbers
let squadNumbers = [];
diff --git a/src/images/SquadImage.js b/src/images/SquadImage.js
index 8224ebe6..6f641839 100644
--- a/src/images/SquadImage.js
+++ b/src/images/SquadImage.js
@@ -285,7 +285,7 @@ export default class SquadImage extends Canvas {
}
this.textBuilder(bannerText, sideBarWidth * 0.5, bannerY, {
- lineHeight: 2.8
+ lineHeight: 2.9
});
//Interchanges Header, for normal interchange display
diff --git a/src/routes/teamSelectorRoutes.js b/src/routes/teamSelectorRoutes.js
index 39626873..54e56e73 100644
--- a/src/routes/teamSelectorRoutes.js
+++ b/src/routes/teamSelectorRoutes.js
@@ -7,6 +7,7 @@ import requireAdmin from "~/middlewares/requireAdmin";
export default app => {
//Getters
app.get("/api/teamSelectors/game/:_game", teamSelectorController.getTeamSelectorForGame);
+ app.get("/api/teamSelectors/:_id/choices", teamSelectorController.getTeamSelectorChoicesByIp);
app.get("/api/teamSelectors/:_id/previewImage", teamSelectorController.getPreviewImage);
app.get("/api/teamSelectors/:_id", teamSelectorController.getTeamSelector);
app.get("/api/teamSelectors/", teamSelectorController.getAllTeamSelectors);