From 5f975332374e4f10001bd23a6995980613e9caa5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 11 Sep 2018 12:25:41 +0200 Subject: [PATCH] All fields being repopulated at form --- client/src/components/LoggedInUser.js | 17 ++++++++++++++++- client/src/components/UserUpdate.js | 12 ++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js index 7fff914ee..ced648832 100644 --- a/client/src/components/LoggedInUser.js +++ b/client/src/components/LoggedInUser.js @@ -43,9 +43,24 @@ class LoggedInUser extends Component { } } + componentDidMount() { + + } + render() { - localStorage.setItem('loggedInUser', JSON.stringify(this.props.data.userByAuthId)); + console.log("botton render"); + + if (this.loggedInUserStored !== true) { + + let user = this.props.data.userByAuthId; + + if (user !== undefined) { + localStorage.setItem('loggedInUser', JSON.stringify(this.props.data.userByAuthId)); + console.log("setting loggedInUser from the button", this.props.data.userByAuthId); + this.loggedInUserStored = true; + } + } return (
diff --git a/client/src/components/UserUpdate.js b/client/src/components/UserUpdate.js index 8898cfe51..0cd9e7fbe 100644 --- a/client/src/components/UserUpdate.js +++ b/client/src/components/UserUpdate.js @@ -58,6 +58,7 @@ class UserUpdate extends Component { /* Before we are done, we need to update the state of the local storage. */ let user = JSON.parse(localStorage.getItem("loggedInUser")); + user.firstName = this.state.firstName; user.middleName = this.state.middleName; user.lastName = this.state.lastName; @@ -150,7 +151,11 @@ console.log("component will UNmount"); console.log("state", this.state); if (this.defaultValuesSet === false) { - let user = JSON.parse(localStorage.getItem("loggedInUser")); + let userData = localStorage.getItem("loggedInUser"); + + if (userData === "undefined") { return;} + + let user = JSON.parse(userData); console.log("user", user); this.defaultValuesSet= true; @@ -164,6 +169,8 @@ console.log("component will UNmount"); this.refs.isDeveloper.checked = user.isDeveloper; this.refs.isTrader.checked = user.isTrader; this.refs.isDataAnalyst.checked = user.isDataAnalyst; + this.refs.select.value = user.role.id; + this.setState({ id: user.id, firstName: user.firstName, @@ -171,7 +178,8 @@ console.log("component will UNmount"); lastName: user.lastName, isDeveloper: user.isDeveloper, isTrader: user.isTrader, - isDataAnalyst: user.isDataAnalyst + isDataAnalyst: user.isDataAnalyst, + roleId: user.role.id }); console.log("setting defaults"); }