Use extra property to determine the content type

Author: jmattheis

ui/src/message/Message.tsx

@@ -8,6 +8,7 @@ import Container from '../common/Container';
 import * as config from '../config';
 import {StyleRulesCallback} from '@material-ui/core/styles/withStyles';
 import ReactMarkdown from 'react-markdown';
+import {RenderMode, contentType} from './extras';
 
 const styles: StyleRulesCallback = () => ({
     header: {
@@ -53,6 +54,7 @@ interface IProps {
     date: string;
     content: string;
     fDelete: VoidFunction;
+    extras?: IMessageExtras;
     height: (height: number) => void;
 }
 
@@ -62,8 +64,20 @@ class Message extends React.PureComponent<IProps & WithStyles<typeof styles>> {
     public componentDidMount = () =>
         this.props.height(this.node ? this.node.getBoundingClientRect().height : 0);
 
+    private renderContent = () => {
+        const content = this.props.content;
+        switch (contentType(this.props.extras)) {
+            case RenderMode.Markdown:
+                return <ReactMarkdown source={content} escapeHtml={true} />;
+            case RenderMode.Plain:
+            default:
+                return content;
+        }
+    };
+
     public render(): React.ReactNode {
-        const {fDelete, classes, title, date, content, image} = this.props;
+        const {fDelete, classes, title, date, image} = this.props;
+
         return (
             <div className={`${classes.wrapperPadding} message`} ref={(ref) => (this.node = ref)}>
                 <Container style={{display: 'flex'}}>
@@ -93,7 +107,7 @@ class Message extends React.PureComponent<IProps & WithStyles<typeof styles>> {
                             </IconButton>
                         </div>
                         <Typography component="div" className={`${classes.content} content`}>
-                            <ReactMarkdown source={content} escapeHtml={true} />
+                            {this.renderContent()}
                         </Typography>
                     </div>
                 </Container>

ui/src/message/Messages.tsx

@@ -116,6 +116,7 @@ class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>,
                 date={message.date}
                 content={message.message}
                 image={message.image}
+                extras={message.extras}
             />
         );
     };

ui/src/message/extras.ts

@@ -0,0 +1,29 @@
+export enum RenderMode {
+    Markdown = 'text/markdown',
+    Plain = 'text/plain',
+}
+
+export const contentType = (extras?: IMessageExtras): RenderMode => {
+    const type = extract(extras, 'client::display', 'contentType');
+    const valid = Object.keys(RenderMode)
+        .map((k) => RenderMode[k])
+        .some((mode) => mode === type);
+    return valid ? type : RenderMode.Plain;
+};
+
+// tslint:disable-next-line:no-any
+const extract = (extras: IMessageExtras | undefined, key: string, path: string): any => {
+    if (!extras) {
+        return null;
+    }
+
+    if (!extras[key]) {
+        return null;
+    }
+
+    if (!extras[key][path]) {
+        return null;
+    }
+
+    return extras[key][path];
+};