Merge branch 'release-3.2' into 'master'

webapp/components/admin_console/file_upload_setting.jsx

@@ -18,7 +18,8 @@ export default class FileUploadSetting extends Setting {
             uploadingText: React.PropTypes.node,
             onSubmit: React.PropTypes.func.isRequired,
             disabled: React.PropTypes.bool,
-            fileType: React.PropTypes.string.isRequired
+            fileType: React.PropTypes.string.isRequired,
+            error: React.PropTypes.string
         };
     }
 
@@ -29,7 +30,8 @@ export default class FileUploadSetting extends Setting {
         this.handleSubmit = this.handleSubmit.bind(this);
 
         this.state = {
-            fileName: null
+            fileName: null,
+            serverError: props.error
         };
     }
 

webapp/components/admin_console/remove_file_setting.jsx

@@ -23,28 +23,18 @@ export default class RemoveFileSetting extends Setting {
     constructor(props) {
         super(props);
         this.handleRemove = this.handleRemove.bind(this);
-
-        this.state = {
-            serverError: null
-        };
     }
 
     handleRemove(e) {
         e.preventDefault();
 
         $(this.refs.remove_button).button('loading');
-        this.props.onSubmit(this.props.id, (error) => {
+        this.props.onSubmit(this.props.id, () => {
             $(this.refs.remove_button).button('reset');
-            this.setState({serverError: error});
         });
     }
 
     render() {
-        let serverError;
-        if (this.state.serverError) {
-            serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
-        }
-
         return (
             <Setting
                 label={this.props.label}
@@ -64,7 +54,6 @@ export default class RemoveFileSetting extends Setting {
                     >
                         {this.props.removeButtonText}
                     </button>
-                    {serverError}
                 </div>
             </Setting>
         );

webapp/components/admin_console/saml_settings.jsx

@@ -76,7 +76,7 @@ export default class SamlSettings extends AdminSettings {
             () => {
                 const fileName = file.name;
                 this.handleChange(id, fileName);
-                this.setState({[id]: fileName});
+                this.setState({[id]: fileName, [`${id}Error`]: null});
                 if (callback && typeof callback === 'function') {
                     callback();
                 }
@@ -94,12 +94,13 @@ export default class SamlSettings extends AdminSettings {
             this.state[id],
             () => {
                 this.handleChange(id, '');
-                this.setState({[id]: null});
+                this.setState({[id]: null, [`${id}Error`]: null});
             },
             (error) => {
                 if (callback && typeof callback === 'function') {
-                    callback(error.message);
+                    callback();
                 }
+                this.setState({[id]: null, [`${id}Error`]: error.message});
             }
         );
     }
@@ -168,6 +169,7 @@ export default class SamlSettings extends AdminSettings {
                     disabled={!this.state.enable}
                     fileType='.crt,.cer'
                     onSubmit={this.uploadCertificate}
+                    error={this.state.idpCertificateFileError}
                 />
             );
         }
@@ -215,6 +217,7 @@ export default class SamlSettings extends AdminSettings {
                     disabled={!this.state.enable || !this.state.encrypt}
                     fileType='.key'
                     onSubmit={this.uploadCertificate}
+                    error={this.state.privateKeyFileError}
                 />
             );
         }
@@ -262,6 +265,7 @@ export default class SamlSettings extends AdminSettings {
                     disabled={!this.state.enable || !this.state.encrypt}
                     fileType='.crt,.cer'
                     onSubmit={this.uploadCertificate}
+                    error={this.state.publicCertificateFileError}
                 />
             );
         }

webapp/components/post_view/post_view_controller.jsx

@@ -260,6 +260,10 @@ export default class PostViewController extends React.Component {
             return true;
         }
 
+        if (nextState.emojis !== this.state.emojis) {
+            return true;
+        }
+
         return false;
     }
 

webapp/stores/emoji_store.jsx

@@ -54,12 +54,13 @@ class EmojiStore extends EventEmitter {
             this.addCustomEmoji(emoji);
         }
 
-        // add custom emojis to the map first so that they can't override system ones
-        this.emojis = new Map([...this.customEmojis, ...this.systemEmojis]);
+        this.updateEmojiMap();
     }
 
     addCustomEmoji(emoji) {
         this.customEmojis.set(emoji.name, emoji);
+
+        // this doesn't update this.emojis, but it's only called by setCustomEmojis which does that afterwards
     }
 
     removeCustomEmoji(id) {
@@ -69,6 +70,13 @@ class EmojiStore extends EventEmitter {
                 break;
             }
         }
+
+        this.updateEmojiMap();
+    }
+
+    updateEmojiMap() {
+        // add custom emojis to the map first so that they can't override system ones
+        this.emojis = new Map([...this.customEmojis, ...this.systemEmojis]);
     }
 
     getSystemEmojis() {