PLT-3237 Update displayed config values in admin console after saving (#3506)

* Reloaded admin console data when settings are saved

* Fixed attempting to save an invalid config setting overwriting the stored config

1 files changed, 11 insertions, 9 deletions

diff --git a/webapp/components/admin_console/users_and_teams_settings.jsx b/webapp/components/admin_console/users_and_teams_settings.jsx
index 5f189708b..d330ecd85 100644
--- a/webapp/components/admin_console/users_and_teams_settings.jsx
+++ b/webapp/components/admin_console/users_and_teams_settings.jsx
@@ -22,15 +22,6 @@ export default class UsersAndTeamsSettings extends AdminSettings {
         this.getConfigFromState = this.getConfigFromState.bind(this);
 
         this.renderSettings = this.renderSettings.bind(this);
-
-        this.state = Object.assign(this.state, {
-            enableUserCreation: props.config.TeamSettings.EnableUserCreation,
-            enableTeamCreation: props.config.TeamSettings.EnableTeamCreation,
-            maxUsersPerTeam: props.config.TeamSettings.MaxUsersPerTeam,
-            restrictCreationToDomains: props.config.TeamSettings.RestrictCreationToDomains,
-            restrictTeamNames: props.config.TeamSettings.RestrictTeamNames,
-            restrictDirectMessage: props.config.TeamSettings.RestrictDirectMessage
-        });
     }
 
     getConfigFromState(config) {
@@ -44,6 +35,17 @@ export default class UsersAndTeamsSettings extends AdminSettings {
         return config;
     }
 
+    getStateFromConfig(config) {
+        return {
+            enableUserCreation: config.TeamSettings.EnableUserCreation,
+            enableTeamCreation: config.TeamSettings.EnableTeamCreation,
+            maxUsersPerTeam: config.TeamSettings.MaxUsersPerTeam,
+            restrictCreationToDomains: config.TeamSettings.RestrictCreationToDomains,
+            restrictTeamNames: config.TeamSettings.RestrictTeamNames,
+            restrictDirectMessage: config.TeamSettings.RestrictDirectMessage
+        };
+    }
+
     renderTitle() {
         return (
             <h3>