Merge pull request #454 from BinaryStudioAcademy/fix/hide-mention

fix: Hide mention on Settings profile
BinaryStudioAcademy · Sep 13, 2019 · 034fc55 · 034fc55
2 parents 1cd0a70 + 8cbe485
commit 034fc55
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 53 deletions.
diff --git a/client/src/components/IssueComments/index.jsx b/client/src/components/IssueComments/index.jsx
@@ -404,8 +404,8 @@ IssueComments.propTypes = {
   repositoryId: PropTypes.string.isRequired,
   userImg: PropTypes.string,
   userName: PropTypes.string.isRequired,
-  owner: PropTypes.string.isRequired, 
-  reponame: PropTypes.string.isRequired, 
+  owner: PropTypes.string.isRequired,
+  reponame: PropTypes.string.isRequired,
   fetchCurrentRepo: PropTypes.func.isRequired,
   history: PropTypes.shape({
     push: PropTypes.func.isRequired
@@ -418,7 +418,11 @@ const mapStateToProps = ({
   },
   currentRepo: {
     repository: {
-      currentRepoInfo: { id: repositoryId, name: reponame, user: { username: owner } }
+      currentRepoInfo: {
+        id: repositoryId,
+        name: reponame,
+        user: { username: owner }
+      }
     }
   }
 }) => ({

diff --git a/client/src/components/IssuesPullsList/index.jsx b/client/src/components/IssuesPullsList/index.jsx
@@ -168,47 +168,47 @@ class IssuesPullsList extends React.Component {
 
   onUserInputChange = async (e, { value }) => {
     switch (e.target.name) {
-      case 'author':
-        await this.setState({ authorDropdownFilter: value });
-        break;
-      case 'assignee':
-        await this.setState({ assigneeDropdownFilter: value });
-        break;
-      default:
-        return;
+    case 'author':
+      await this.setState({ authorDropdownFilter: value });
+      break;
+    case 'assignee':
+      await this.setState({ assigneeDropdownFilter: value });
+      break;
+    default:
+      return;
     }
   };
 
   onUserInputHitEnter = async e => {
     if (e.key === 'Enter') {
       switch (e.target.name) {
-        case 'author':
-          const { authorList, authorDropdownFilter } = this.state;
-          const filteredAuthorList = authorList.filter(author => author.username.includes(authorDropdownFilter));
-          if (filteredAuthorList.length > 0) {
-            await this.setState({
-              authorDropdownFilter: '',
-              filter: { ...this.state.filter, authorId: filteredAuthorList[0].id }
-            });
-            this.fetchData();
-          }
-          break;
-        case 'assignee':
-          const { assigneeList, assigneeDropdownFilter } = this.state;
-          const filteredAssigneeList = assigneeList.filter(
-            assignee => assignee && assignee.username && assignee.username.includes(assigneeDropdownFilter)
-          );
-
-          if (filteredAssigneeList.length > 0) {
-            await this.setState({
-              assigneeDropdownFilter: '',
-              filter: { ...this.state.filter, assigneeId: filteredAssigneeList[0].id }
-            });
-            this.fetchData();
-          }
-          break;
-        default:
-          return;
+      case 'author':
+        const { authorList, authorDropdownFilter } = this.state;
+        const filteredAuthorList = authorList.filter(author => author.username.includes(authorDropdownFilter));
+        if (filteredAuthorList.length > 0) {
+          await this.setState({
+            authorDropdownFilter: '',
+            filter: { ...this.state.filter, authorId: filteredAuthorList[0].id }
+          });
+          this.fetchData();
+        }
+        break;
+      case 'assignee':
+        const { assigneeList, assigneeDropdownFilter } = this.state;
+        const filteredAssigneeList = assigneeList.filter(
+          assignee => assignee && assignee.username && assignee.username.includes(assigneeDropdownFilter)
+        );
+
+        if (filteredAssigneeList.length > 0) {
+          await this.setState({
+            assigneeDropdownFilter: '',
+            filter: { ...this.state.filter, assigneeId: filteredAssigneeList[0].id }
+          });
+          this.fetchData();
+        }
+        break;
+      default:
+        return;
       }
     }
   };

diff --git a/client/src/containers/CreateIssuePage/index.jsx b/client/src/containers/CreateIssuePage/index.jsx
@@ -113,7 +113,11 @@ const mapStateToProps = ({
   issuesData: { issues },
   currentRepo: {
     repository: {
-      currentRepoInfo: { id, name, user: { username: owner } }
+      currentRepoInfo: {
+        id,
+        name,
+        user: { username: owner }
+      }
     }
   }
 }) => ({

diff --git a/client/src/containers/Header/index.jsx b/client/src/containers/Header/index.jsx
@@ -46,7 +46,7 @@ const SearchInp = () => {
         onClick={() => {
           setText('');
           setResults([]);
-          window.location.href = `${window.location.origin}${endpoint}`; 
+          window.location.href = `${window.location.origin}${endpoint}`;
         }}
       >
         <p className={styles.searchItem}>
@@ -55,7 +55,7 @@ const SearchInp = () => {
         </p>
       </div>
     );
-  }; 
+  };
 
   const handleSearchChange = async (e, { value }) => {
     if (!value) {
@@ -325,6 +325,10 @@ HeaderDesktopAuth.propTypes = {
   })
 };
 
+SearchInp.propTypes = {
+  content: PropTypes.array.isRequired
+};
+
 const Header = ({ isAuthorized, username, imgUrl, status, fetchCurrentUser }) => {
   return isAuthorized
     ? WithSidebar(HeaderDesktopAuth, { username, imgUrl, status, fetchCurrentUser })

diff --git a/client/src/containers/SettingsProfile/index.jsx b/client/src/containers/SettingsProfile/index.jsx
@@ -83,16 +83,6 @@ class SettingsProfile extends Component {
       <div>Your name may appear around Depot where you contribute or are mentioned. You can remove it at any time.</div>
     ),
     email: <div>You cannot change your email at this time.</div>,
-    bio: (
-      <div>
-        You can @<strong>mention</strong> other users and organizations to link to them.
-      </div>
-    ),
-    company: (
-      <div>
-        You can @<strong>mention</strong> your company’s Depot organization to link it.
-      </div>
-    ),
     disclaimer: (
       <div>
         All of the fields on this page are optional and can be deleted at any time, and by filling them out, you're
@@ -204,7 +194,6 @@ class SettingsProfile extends Component {
                     <Header as="h4">Bio</Header>
                     <Field name="bio" render={this.renderTextArea} />
                     <InputError name="bio" />
-                    <div className={styles.note}>{this.NOTES.bio}</div>
 
                     <Header as="h4">URL</Header>
                     <Field type="text" name="url" render={this.renderField} />
@@ -213,7 +202,6 @@ class SettingsProfile extends Component {
                     <Header as="h4">Company</Header>
                     <Field type="text" name="company" render={this.renderField} />
                     <InputError name="company" />
-                    <div className={styles.note}>{this.NOTES.company}</div>
 
                     <Divider />