From 7ecf3ef52b5f36ec9e52bf100fa958f5cb0b37b5 Mon Sep 17 00:00:00 2001
From: Emiliano Ciavatta
Date: Tue, 20 Oct 2020 22:04:09 +0200
Subject: Add comment dialog

---
 frontend/src/components/panels/ConnectionsPane.js |  2 +-
 frontend/src/components/panels/StreamsPane.js     | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'frontend/src/components/panels')

diff --git a/frontend/src/components/panels/ConnectionsPane.js b/frontend/src/components/panels/ConnectionsPane.js
index 6418b3e..708fc86 100644
--- a/frontend/src/components/panels/ConnectionsPane.js
+++ b/frontend/src/components/panels/ConnectionsPane.js
@@ -287,7 +287,7 @@ class ConnectionsPane extends Component {
                                 return [<Connection key={c.id} data={c} onSelected={() => this.connectionSelected(c)}
                                                     selected={this.state.selected === c.id}
                                                     onMarked={(marked) => c.marked = marked}
-                                                    onEnabled={(enabled) => c.hidden = !enabled}
+                                                    onCommented={(comment) => c.comment = comment}
                                                     services={this.state.services}/>,
                                     c.matched_rules.length > 0 &&
                                     <ConnectionMatchedRules key={c.id + "_m"} matchedRules={c.matched_rules}
diff --git a/frontend/src/components/panels/StreamsPane.js b/frontend/src/components/panels/StreamsPane.js
index 4c16cf1..29aff71 100644
--- a/frontend/src/components/panels/StreamsPane.js
+++ b/frontend/src/components/panels/StreamsPane.js
@@ -25,7 +25,7 @@ import rules from "../../model/rules";
 import {downloadBlob, getHeaderValue} from "../../utils";
 import ButtonField from "../fields/ButtonField";
 import ChoiceField from "../fields/ChoiceField";
-import MessageAction from "../objects/MessageAction";
+import CopyDialog from "../dialogs/CopyDialog";
 import "./StreamsPane.scss";
 
 const reactStringReplace = require("react-string-replace");
@@ -105,10 +105,11 @@ class StreamsPane extends Component {
                 if (contentType && contentType.includes("application/json")) {
                     try {
                         const json = JSON.parse(m.body);
-                        body = <ReactJson src={json} theme="grayscale" collapsed={false} displayDataTypes={false}/>;
+                        if (typeof json === "object") {
+                            body = <ReactJson src={json} theme="grayscale" collapsed={false} displayDataTypes={false}/>;
+                        }
                     } catch (e) {
                         log.error(e);
-                        body = m.body;
                     }
                 }
 
@@ -157,11 +158,11 @@ class StreamsPane extends Component {
                 if (!connectionMessage.metadata["reproducers"]) {
                     return;
                 }
-                return Object.entries(connectionMessage.metadata["reproducers"]).map(([actionName, actionValue]) =>
-                    <ButtonField small key={actionName + "_button"} name={actionName} onClick={() => {
+                return Object.entries(connectionMessage.metadata["reproducers"]).map(([name, value]) =>
+                    <ButtonField small key={name + "_button"} name={name} onClick={() => {
                         this.setState({
-                            messageActionDialog: <MessageAction actionName={actionName} actionValue={actionValue}
-                                                                onHide={() => this.setState({messageActionDialog: null})}/>
+                            messageActionDialog: <CopyDialog actionName={name} value={value}
+                                                             onHide={() => this.setState({messageActionDialog: null})}/>
                         });
                     }}/>
                 );
-- 
cgit v1.2.3-70-g09d2