Markdown summary (#794)

* Add markdown in meeting summary * Fix prop type errors * Move markdownCustomComponents to utils fix #728
ParabolInc · Mar 22, 2017 · c00f56f · c00f56f
1 parent 509913c
commit c00f56f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/universal/modules/email/components/Card/Card.js b/src/universal/modules/email/components/Card/Card.js
@@ -4,6 +4,8 @@ import labels from 'universal/styles/theme/labels';
 import ui from 'universal/styles/ui';
 import {trimString} from 'universal/utils';
 import EmptySpace from '../EmptySpace/EmptySpace';
+import ReactMarkdown from 'react-markdown';
+import markdownCustomComponents from 'universal/utils/markdownCustomComponents';
 
 const Card = (props) => {
   const {content, status} = props;
@@ -66,7 +68,12 @@ const Card = (props) => {
         <tr>
           <td style={cellStyle}>
             <div style={contentStyle}>
-              {trimString(content, 52)}
+              <ReactMarkdown
+                renderers={markdownCustomComponents}
+                source={trimString(content, 52)}
+                escapeHtml
+                softBreak="br"
+              />
             </div>
           </td>
         </tr>

diff --git a/src/universal/modules/newTeam/components/NewTeam/NewTeam.js b/src/universal/modules/newTeam/components/NewTeam/NewTeam.js
@@ -19,7 +19,7 @@ const NewTeam = (props) => {
 NewTeam.propTypes = {
   dispatch: PropTypes.func.isRequired,
   params: PropTypes.shape({
-    newOrg: PropTypes.object
+    newOrg: PropTypes.string
   })
 };
 

diff --git a/src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js b/src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js
@@ -136,7 +136,7 @@ class NewTeamFormContainer extends Component {
 
 NewTeamFormContainer.propTypes = {
   dispatch: PropTypes.func.isRequired,
-  initialOrgCount: PropTypes.func.number,
+  initialOrgCount: PropTypes.number,
   initialValues: PropTypes.object,
   isNewOrg: PropTypes.bool,
   organizations: PropTypes.array,

diff --git a/src/universal/modules/outcomeCard/components/OutcomeCardTextarea/OutcomeCardTextarea.js b/src/universal/modules/outcomeCard/components/OutcomeCardTextarea/OutcomeCardTextarea.js
@@ -5,7 +5,8 @@ import appTheme from 'universal/styles/theme/appTheme';
 import ui from 'universal/styles/ui';
 import Textarea from 'react-textarea-autosize';
 import ReactMarkdown from 'react-markdown';
-import LinkNewTab from 'universal/components/LinkNewTab/LinkNewTab';
+import markdownCustomComponents from 'universal/utils/markdownCustomComponents';
+
 
 class OutcomeCardTextArea extends Component {
   static propTypes = {
@@ -123,9 +124,6 @@ class OutcomeCardTextArea extends Component {
       !isProject && cardHasHover && styles.actionContentWhenCardHovered,
       !isProject && styles.descriptionAction
     );
-    const markdownCustomComponents = {
-      Link: LinkNewTab
-    };
     return (
       <div
         onClick={!isArchived && this.setEditing}

diff --git a/src/universal/utils/markdownCustomComponents.js b/src/universal/utils/markdownCustomComponents.js
@@ -0,0 +1,5 @@
+import LinkNewTab from 'universal/components/LinkNewTab/LinkNewTab';
+
+export default {
+  Link: LinkNewTab
+};