Merge pull request #2173 from Thorium-Sim/develop

Release
Thorium-Sim · May 11, 2019 · 76cb780 · 76cb780
2 parents 54271ca + 2ef61a1
commit 76cb780
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 14 deletions.
diff --git a/client/src/components/views/CommDecoding/convoCore.js b/client/src/components/views/CommDecoding/convoCore.js
@@ -53,6 +53,11 @@ const SUBSCRIPTION = gql`
   }
   ${fragment}
 `;
+const DELETE_MUTATION = gql`
+  mutation DeleteMessage($id: ID!, $message: ID!) {
+    deleteLongRangeMessage(id: $id, message: $message)
+  }
+`;
 
 class ConvoCore extends Component {
   state = { selectedMessage: null };
@@ -123,11 +128,33 @@ class ConvoCore extends Component {
                   return <DecodingCore {...this.props} />;
                 const message = messages.find(m => m.id === selectedMessage);
                 if (!message) return null;
-                return `${processTime(message.timestamp)}${
-                  message.encrypted ? ` - Encrypted` : ""
-                }${message.approved ? ` - Approved` : ""}
+                return (
+                  <div
+                    style={{
+                      display: "flex",
+                      flexDirection: "column",
+                      height: "100%"
+                    }}
+                  >
+                    <div style={{ flex: 1 }}>{`${processTime(
+                      message.timestamp
+                    )}${message.encrypted ? ` - Encrypted` : ""}${
+                      message.approved ? ` - Approved` : ""
+                    }
 From: ${message.sender}
-${message.message}`;
+${message.message}`}</div>
+                    <Mutation
+                      mutation={DELETE_MUTATION}
+                      variables={{ id, message: message.id }}
+                    >
+                      {action => (
+                        <Button color="danger" onClick={action} size="sm">
+                          Delete Message
+                        </Button>
+                      )}
+                    </Mutation>
+                  </div>
+                );
               })()}
             </div>
           </div>

diff --git a/client/src/components/views/CommDecoding/index.js b/client/src/components/views/CommDecoding/index.js
@@ -37,6 +37,7 @@ const DECODING_SUB = gql`
         message
         decodedMessage
         datestamp
+        deleted
       }
     }
   }
@@ -221,7 +222,7 @@ class Decoding extends Component {
     let selectedMessage = { a: 10, f: 10 };
     if (this.state.selectedMessage) {
       selectedMessage = sys.messages.find(
-        m => m.id === this.state.selectedMessage
+        m => m.id === this.state.selectedMessage && !m.deleted
       );
     }
     return (
@@ -332,15 +333,17 @@ class Decoding extends Component {
               style={{ minHeight: "40px" }}
               className="flex-max auto-scroll"
             >
-              {sys.messages.map(m => (
-                <ListGroupItem
-                  key={m.id}
-                  onClick={this._selectMessage.bind(this, m)}
-                  active={m.id === this.state.selectedMessage}
-                >
-                  {m.datestamp} - {m.sender}
-                </ListGroupItem>
-              ))}
+              {sys.messages
+                .filter(m => !m.deleted)
+                .map(m => (
+                  <ListGroupItem
+                    key={m.id}
+                    onClick={this._selectMessage.bind(this, m)}
+                    active={m.id === this.state.selectedMessage}
+                  >
+                    {m.datestamp} - {m.sender}
+                  </ListGroupItem>
+                ))}
             </ListGroup>
           </Col>
         </Row>
@@ -366,6 +369,7 @@ const DECODING_QUERY = gql`
         message
         decodedMessage
         datestamp
+        deleted
       }
     }
   }