Merge pull request #5072 from withspectrum/fallback-to-thread-link

Fallback to thread link in attachment
withspectrum · May 2, 2019 · 6802681 · 6802681
2 parents e10c472 + d0ec639
commit 6802681
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/components/message/threadAttachment/attachment.js b/src/components/message/threadAttachment/attachment.js
@@ -1,5 +1,6 @@
 // @flow
 import React from 'react';
+import { Link } from 'react-router-dom';
 import type { Props } from './';
 import compose from 'recompose/compose';
 import { Loading } from 'src/components/loading';
@@ -12,7 +13,7 @@ import getThreadLink from 'src/helpers/get-thread-link';
 
 class Attachment extends React.Component<Props> {
   render() {
-    const { data, currentUser } = this.props;
+    const { data, currentUser, id } = this.props;
     const { thread, loading, error } = data;
 
     if (loading)
@@ -23,9 +24,11 @@ class Attachment extends React.Component<Props> {
           </Container>
         </div>
       );
-    if (error) return null;
 
-    if (!thread) return null;
+    if (error || !thread)
+      return (
+        <Link to={`/thread/${id}`}>https://spectrum.chat/thread/{id}</Link>
+      );
 
     return (
       <div className="attachment-container">

diff --git a/src/components/message/threadAttachment/index.js b/src/components/message/threadAttachment/index.js
@@ -12,15 +12,16 @@ import Attachment from './attachment';
 export type Props = {
   currentUser: UserInfoType,
   message: MessageInfoType,
+  id: string,
   data: {
     thread: GetThreadType,
     loading: boolean,
     error: ?string,
   },
 };
 
-const Query = ({ data, message, ...rest }: Props) => (
-  <Attachment message={message} data={data} />
+const Query = ({ data, message, id, ...rest }: Props) => (
+  <Attachment message={message} id={id} data={data} />
 );
 
 const ThreadAttachment = compose(getThreadById)(Query);