make affiliation optional, off by default

wanliqun · May 16, 2019 · acafc17 · acafc17
1 parent dd73e5f
commit acafc17
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/app/components/cards/Comment.jsx b/src/app/components/cards/Comment.jsx
@@ -444,6 +444,7 @@ class CommentImpl extends React.Component {
                             <Author
                                 author={comment.author}
                                 authorRepLog10={authorRepLog10}
+                                showAffiliation
                             />
                         </span>
                         &nbsp; &middot; &nbsp;

diff --git a/src/app/components/cards/PostFull.jsx b/src/app/components/cards/PostFull.jsx
@@ -34,7 +34,11 @@ function TimeAuthorCategory({ content, authorRepLog10, showTags }) {
             <Icon name="clock" className="space-right" />
             <TimeAgoWrapper date={content.created} className="updated" />
             {} {tt('g.by')}{' '}
-            <Author author={content.author} authorRepLog10={authorRepLog10} />
+            <Author
+                author={content.author}
+                authorRepLog10={authorRepLog10}
+                showAffiliation
+            />
             {showTags && (
                 <span>
                     {' '}
@@ -53,6 +57,7 @@ function TimeAuthorCategoryLarge({ content, authorRepLog10 }) {
                 <Author
                     author={content.author}
                     authorRepLog10={authorRepLog10}
+                    showAffiliation
                 />
                 <span>
                     {' '}

diff --git a/src/app/components/elements/Author/index.jsx b/src/app/components/elements/Author/index.jsx
@@ -31,10 +31,12 @@ class Author extends React.Component {
         follow: bool,
         mute: bool,
         authorRepLog10: number,
+        showAffiliation: bool,
     };
     static defaultProps = {
         follow: true,
         mute: true,
+        showAffiliation: false,
     };
 
     constructor(...args) {
@@ -89,7 +91,13 @@ class Author extends React.Component {
 
     shouldComponentUpdate = shouldComponentUpdate(this, 'Author');
     render() {
-        const { author, follow, mute, authorRepLog10 } = this.props; // html
+        const {
+            author,
+            follow,
+            mute,
+            authorRepLog10,
+            showAffiliation,
+        } = this.props; // html
         const { username } = this.props; // redux
         const { name, about } = this.props.account
             ? normalizeProfile(this.props.account.toJS())
@@ -107,7 +115,7 @@ class Author extends React.Component {
                         <Link to={'/@' + author}>{author}</Link>
                     </strong>{' '}
                     <Reputation value={authorRepLog10} />
-                    {AffiliationMap[author] ? (
+                    {showAffiliation && AffiliationMap[author] ? (
                         <span className="affiliation">
                             {tt('g.affiliation_' + AffiliationMap[author])}
                         </span>
@@ -132,7 +140,7 @@ class Author extends React.Component {
                             to={'/@' + author}
                         >
                             {author} <Reputation value={authorRepLog10} />
-                            {AffiliationMap[author] ? (
+                            {showAffiliation && AffiliationMap[author] ? (
                                 <span className="affiliation">
                                     {tt(
                                         'g.affiliation_' +