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, 15 insertions, 13 deletions

diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx
index 85b4e2bd5..01f38dc21 100644
--- a/webapp/components/admin_console/email_settings.jsx
+++ b/webapp/components/admin_console/email_settings.jsx
@@ -20,19 +20,6 @@ export default class EmailSettings extends AdminSettings {
         this.getConfigFromState = this.getConfigFromState.bind(this);
 
         this.renderSettings = this.renderSettings.bind(this);
-
-        this.state = Object.assign(this.state, {
-            sendEmailNotifications: props.config.EmailSettings.SendEmailNotifications,
-            feedbackName: props.config.EmailSettings.FeedbackName,
-            feedbackEmail: props.config.EmailSettings.FeedbackEmail,
-            feedbackOrganization: props.config.EmailSettings.FeedbackOrganization,
-            smtpUsername: props.config.EmailSettings.SMTPUsername,
-            smtpPassword: props.config.EmailSettings.SMTPPassword,
-            smtpServer: props.config.EmailSettings.SMTPServer,
-            smtpPort: props.config.EmailSettings.SMTPPort,
-            connectionSecurity: props.config.EmailSettings.ConnectionSecurity,
-            enableSecurityFixAlert: props.config.ServiceSettings.EnableSecurityFixAlert
-        });
     }
 
     getConfigFromState(config) {
@@ -50,6 +37,21 @@ export default class EmailSettings extends AdminSettings {
         return config;
     }
 
+    getStateFromConfig(config) {
+        return {
+            sendEmailNotifications: config.EmailSettings.SendEmailNotifications,
+            feedbackName: config.EmailSettings.FeedbackName,
+            feedbackEmail: config.EmailSettings.FeedbackEmail,
+            feedbackOrganization: config.EmailSettings.FeedbackOrganization,
+            smtpUsername: config.EmailSettings.SMTPUsername,
+            smtpPassword: config.EmailSettings.SMTPPassword,
+            smtpServer: config.EmailSettings.SMTPServer,
+            smtpPort: config.EmailSettings.SMTPPort,
+            connectionSecurity: config.EmailSettings.ConnectionSecurity,
+            enableSecurityFixAlert: config.ServiceSettings.EnableSecurityFixAlert
+        };
+    }
+
     renderTitle() {
         return (
             <h3>