From e10220ae47e99a2e51a5699a4cce06b0783dafb5 Mon Sep 17 00:00:00 2001
From: Matthew Kilgore <tankerkiller125@gmail.com>
Date: Fri, 7 Aug 2020 19:40:07 -0400
Subject: [PATCH] update: Fix Alert on modals

---
 js/src/common/Application.js          | 14 +++++++-------
 js/src/common/components/Alert.js     |  9 +++++----
 js/src/forum/components/LogInModal.js |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/js/src/common/Application.js b/js/src/common/Application.js
index 51e2a480b..b9ebe2e45 100644
--- a/js/src/common/Application.js
+++ b/js/src/common/Application.js
@@ -346,11 +346,11 @@ export default class Application {
     return m.request(options).then(
       (response) => response,
       (error) => {
-        let children;
+        let content;
 
         switch (error.status) {
           case 422:
-            children = error.response.errors
+            content = error.response.errors
               .map((error) => [error.detail, <br />])
               .reduce((a, b) => a.concat(b), [])
               .slice(0, -1);
@@ -358,20 +358,20 @@ export default class Application {
 
           case 401:
           case 403:
-            children = app.translator.trans('core.lib.error.permission_denied_message');
+            content = app.translator.trans('core.lib.error.permission_denied_message');
             break;
 
           case 404:
           case 410:
-            children = app.translator.trans('core.lib.error.not_found_message');
+            content = app.translator.trans('core.lib.error.not_found_message');
             break;
 
           case 429:
-            children = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
+            content = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
             break;
 
           default:
-            children = app.translator.trans('core.lib.error.generic_message');
+            content = app.translator.trans('core.lib.error.generic_message');
         }
 
         const isDebug = app.forum.attribute('debug');
@@ -381,7 +381,7 @@ export default class Application {
 
         error.alert = {
           type: 'error',
-          children,
+          content,
           controls: isDebug && [
             <Button className="Button Button--link" onclick={this.showDebug.bind(this, error, formattedError)}>
               Debug
diff --git a/js/src/common/components/Alert.js b/js/src/common/components/Alert.js
index f26cf4a92..90df6dba7 100644
--- a/js/src/common/components/Alert.js
+++ b/js/src/common/components/Alert.js
@@ -18,13 +18,12 @@ import extract from '../utils/extract';
  * All other props will be assigned as attributes on the alert element.
  */
 export default class Alert extends Component {
-  view() {
-    const attrs = Object.assign({}, this.props);
+  view(vnode) {
+    const attrs = Object.assign({}, this.attrs);
 
     const type = extract(attrs, 'type');
     attrs.className = 'Alert Alert--' + type + ' ' + (attrs.className || '');
 
-    const children = extract(attrs, 'children');
     const controls = extract(attrs, 'controls') || [];
 
     // If the alert is meant to be dismissible (which is the case by default),
@@ -34,13 +33,15 @@ export default class Alert extends Component {
     const ondismiss = extract(attrs, 'ondismiss');
     const dismissControl = [];
 
+    const content = extract(attrs, 'content') || vnode.children;
+
     if (dismissible || dismissible === undefined) {
       dismissControl.push(<Button icon="fas fa-times" className="Button Button--link Button--icon Alert-dismiss" onclick={ondismiss} />);
     }
 
     return (
       <div {...attrs}>
-        <span className="Alert-body">{children}</span>
+        <span className="Alert-body">{content}</span>
         <ul className="Alert-controls">{listItems(controls.concat(dismissControl))}</ul>
       </div>
     );
diff --git a/js/src/forum/components/LogInModal.js b/js/src/forum/components/LogInModal.js
index de589036c..411657337 100644
--- a/js/src/forum/components/LogInModal.js
+++ b/js/src/forum/components/LogInModal.js
@@ -182,7 +182,7 @@ export default class LogInModal extends Modal {
 
   onerror(error) {
     if (error.status === 401) {
-      error.alert.children = app.translator.trans('core.forum.log_in.invalid_login_message');
+      error.alert.content = app.translator.trans('core.forum.log_in.invalid_login_message');
     }
 
     super.onerror(error);