From 510e9f458d0873871e2175307860980b861d0f2b Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Mon, 29 Apr 2019 20:03:57 -0400
Subject: [PATCH 1/7] MM-15128 - add support for interactive dialogs with no
 elements

---
 components/interactive_dialog/interactive_dialog.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index 94a1750f0718..87a119f3d00c 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -17,7 +17,7 @@ export default class InteractiveDialog extends React.Component {
     static propTypes = {
         url: PropTypes.string.isRequired,
         callbackId: PropTypes.string,
-        elements: PropTypes.arrayOf(PropTypes.object).isRequired,
+        elements: PropTypes.arrayOf(PropTypes.object),
         title: PropTypes.string.isRequired,
         iconUrl: PropTypes.string,
         submitLabel: PropTypes.string,

From ac768aa8b962fd1d3e58009c230dccabc14828bd Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Wed, 1 May 2019 09:26:57 -0400
Subject: [PATCH 2/7] MM-15128 - add check for null elements

---
 components/interactive_dialog/interactive_dialog.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index 87a119f3d00c..2a3ac7892320 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -33,9 +33,11 @@ export default class InteractiveDialog extends React.Component {
         super(props);
 
         const values = {};
-        props.elements.forEach((e) => {
-            values[e.name] = e.default || null;
-        });
+        if (props.elements != null) {
+            props.elements.forEach((e) => {
+                values[e.name] = e.default || null;
+            });
+        }
 
         this.state = {
             show: true,
@@ -163,7 +165,7 @@ export default class InteractiveDialog extends React.Component {
                     </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
-                    {elements.map((e) => {
+                    {elements && elements.map((e) => {
                         return (
                             <DialogElement
                                 key={'dialogelement' + e.name}

From 0ccadc2b58b089ab9cb24468a61b67282d9d59fd Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Wed, 1 May 2019 11:17:29 -0400
Subject: [PATCH 3/7] MM-15128 fix TypeError for null elements, add conditonal
 modal

---
 .../interactive_dialog/interactive_dialog.jsx | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index 2a3ac7892320..019b63ae8b49 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -53,19 +53,21 @@ export default class InteractiveDialog extends React.Component {
         const {elements} = this.props;
         const values = this.state.values;
         const errors = {};
-        elements.forEach((elem) => {
-            const error = checkDialogElementForError(elem, values[elem.name]);
-            if (error) {
-                errors[elem.name] = (
-                    <FormattedMessage
-                        id={error.id}
-                        defaultMessage={error.defaultMessage}
-                        values={error.values}
-                    />
-                );
-            }
-        });
-
+        if (elements != null) {
+            elements.forEach((elem) => {
+                const error = checkDialogElementForError(elem, values[elem.name]);
+                if (error) {
+                    errors[elem.name] = (
+                        <FormattedMessage
+                            id={error.id}
+                            defaultMessage={error.defaultMessage}
+                            values={error.values}
+                        />
+                    );
+                }
+            });    
+        }
+        
         this.setState({errors});
 
         if (Object.keys(errors).length !== 0) {
@@ -164,8 +166,8 @@ export default class InteractiveDialog extends React.Component {
                         {icon}{title}
                     </Modal.Title>
                 </Modal.Header>
-                <Modal.Body>
-                    {elements && elements.map((e) => {
+                {elements && <Modal.Body>
+                    {elements.map((e) => {
                         return (
                             <DialogElement
                                 key={'dialogelement' + e.name}
@@ -186,7 +188,8 @@ export default class InteractiveDialog extends React.Component {
                             />
                         );
                     })}
-                </Modal.Body>
+                </Modal.Body>}
+                
                 <Modal.Footer>
                     <button
                         type='button'

From a8d51bba1b0d1a1353374e73e4f15145bb948fb6 Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Wed, 1 May 2019 15:04:08 -0400
Subject: [PATCH 4/7] delete trailing white space

---
 components/interactive_dialog/interactive_dialog.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index 019b63ae8b49..80c32684d36b 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -65,9 +65,9 @@ export default class InteractiveDialog extends React.Component {
                         />
                     );
                 }
-            });    
+            });
         }
-        
+
         this.setState({errors});
 
         if (Object.keys(errors).length !== 0) {
@@ -189,7 +189,6 @@ export default class InteractiveDialog extends React.Component {
                         );
                     })}
                 </Modal.Body>}
-                
                 <Modal.Footer>
                     <button
                         type='button'

From 6539f74f8fdb8cda975e9624ed9195accb9e47ba Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Sat, 18 May 2019 20:30:40 -0400
Subject: [PATCH 5/7] MM-15128 add conditional styling to Modal.header

---
 components/interactive_dialog/interactive_dialog.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index b789c49cb4ff..24d40e0de0cb 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -164,7 +164,7 @@ export default class InteractiveDialog extends React.Component {
                 role='dialog'
                 aria-labelledby='interactiveDialogModalLabel'
             >
-                <Modal.Header closeButton={true}>
+                <Modal.Header closeButton={true} style={elements == null && {borderBottom: '0px'}}>
                     <Modal.Title
                         componentClass='h1'
                         id='interactiveDialogModalLabel'

From 1b45dd7c0f9ddc267d4e375b84c7fc6c106aee3f Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Sat, 18 May 2019 20:53:19 -0400
Subject: [PATCH 6/7] MM-15128 Add conditional styling in Modal.Header

* Fix in line style so regular dialogs do not crash
* fix linting errors
---
 components/interactive_dialog/interactive_dialog.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index 24d40e0de0cb..2e75cee8fe07 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -164,7 +164,10 @@ export default class InteractiveDialog extends React.Component {
                 role='dialog'
                 aria-labelledby='interactiveDialogModalLabel'
             >
-                <Modal.Header closeButton={true} style={elements == null && {borderBottom: '0px'}}>
+                <Modal.Header
+                    closeButton={true}
+                    style={{borderBottom: elements == null && '0px'}}
+                >
                     <Modal.Title
                         componentClass='h1'
                         id='interactiveDialogModalLabel'

From a4a1a170c2ad732bb0f20fc8c97a1e149ab62c49 Mon Sep 17 00:00:00 2001
From: Andres Orozco <ao15@my.fsu.edu>
Date: Tue, 28 May 2019 21:21:51 -0400
Subject: [PATCH 7/7] MM-15128 add better protection against null and undefined
 types

---
 components/interactive_dialog/interactive_dialog.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/interactive_dialog/interactive_dialog.jsx b/components/interactive_dialog/interactive_dialog.jsx
index 2e75cee8fe07..265bd2d6fb9b 100644
--- a/components/interactive_dialog/interactive_dialog.jsx
+++ b/components/interactive_dialog/interactive_dialog.jsx
@@ -53,7 +53,7 @@ export default class InteractiveDialog extends React.Component {
         const {elements} = this.props;
         const values = this.state.values;
         const errors = {};
-        if (elements != null) {
+        if (elements) {
             elements.forEach((elem) => {
                 const error = checkDialogElementForError(elem, values[elem.name]);
                 if (error) {