fix: add report user button back to profile pages (#36926)

* fix: add report user button back to profile pages

* fix: make local redirect to signin work

* fix: redirect to learn instead of homepage

* fix: change from gatsby Link to the helper component Link

* feat: add tests for profile report and settings buttons

* Update client/src/client-only-routes/ShowUser.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/client-only-routes/ShowUser.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/client-only-routes/ShowUser.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/client-only-routes/ShowUser.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/client-only-routes/ShowUser.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

client/src/client-only-routes/ShowUser.js

@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
-import { Link, navigate } from 'gatsby';
+import { navigate } from '@reach/router';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import {
@@ -14,6 +14,8 @@ import {
 } from '@freecodecamp/react-bootstrap';
 import Helmet from 'react-helmet';
 
+import { apiLocation } from '../../config/env.json';
+
 import {
   isSignedInSelector,
   userFetchStateSelector,
@@ -25,6 +27,7 @@ import { Spacer, Loader, FullWidthRow } from '../components/helpers';
 const propTypes = {
   email: PropTypes.string,
   isSignedIn: PropTypes.bool,
+  navigate: PropTypes.func.isRequired,
   reportUser: PropTypes.func.isRequired,
   userFetchState: PropTypes.shape({
     pending: PropTypes.bool,
@@ -46,7 +49,13 @@ const mapStateToProps = createSelector(
 );
 
 const mapDispatchToProps = dispatch =>
-  bindActionCreators({ reportUser }, dispatch);
+  bindActionCreators(
+    {
+      navigate,
+      reportUser
+    },
+    dispatch
+  );
 
 class ShowUser extends Component {
   constructor(props) {
@@ -79,9 +88,10 @@ class ShowUser extends Component {
     const { username, reportUser } = this.props;
     return reportUser({ username, reportDescription });
   }
-  setNavigationTimer() {
+
+  setNavigationTimer(navigate) {
     if (!this.timer) {
-      this.timer = setTimeout(() => navigate('/signin'), 5000);
+      this.timer = setTimeout(() => navigate(`${apiLocation}/signin`), 5000);
     }
   }
 
@@ -93,7 +103,8 @@ class ShowUser extends Component {
     }
 
     if ((complete || errored) && !isSignedIn) {
-      this.setNavigationTimer();
+      const { navigate } = this.props;
+      this.setNavigationTimer(navigate);
       return (
         <main>
           <FullWidthRow>
@@ -111,9 +122,16 @@ class ShowUser extends Component {
                   automatically in 5 seconds
                 </p>
                 <p>
-                  <Link to='/signin'>
+                  <Button
-                    Or you can here if you do not want to wait
+                    bsStyle='default'
-                  </Link>
+                    href='/signin'
+                    onClick={e => {
+                      e.preventDefault();
+                      return navigate(`${apiLocation}/signin`);
+                    }}
+                  >
+                    Or click here if you do not want to wait
+                  </Button>
                 </p>
                 <Spacer />
               </Panel.Body>

client/src/components/profile/Profile.js

@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Row, Col } from '@freecodecamp/react-bootstrap';
 import Helmet from 'react-helmet';
-import { Link } from 'gatsby';
+import Link from '../helpers/Link';
 
 import { CurrentChallengeLink, FullWidthRow, Spacer } from '../helpers';
 import Camper from './components/Camper';
@@ -62,7 +62,9 @@ function renderIsLocked(username, isSessionUser) {
       </Helmet>
       <Spacer size={2} />
       <Grid>
-        {isSessionUser ? renderSettingsButton() : null}
+        {isSessionUser
+          ? renderSettingsButton()
+          : renderReportUserButton(username)}
         <FullWidthRow>
           <h2 className='text-center'>
             {username} has not made their profile public.
@@ -98,6 +100,24 @@ function renderSettingsButton() {
   );
 }
 
+function renderReportUserButton(username) {
+  return (
+    <Fragment>
+      <Row>
+        <Col sm={4} smOffset={4}>
+          <Link
+            className='btn btn-lg btn-primary btn-block'
+            to={`/user/${username}/report-user`}
+          >
+            Report This User
+          </Link>
+        </Col>
+      </Row>
+      <Spacer size={2} />
+    </Fragment>
+  );
+}
+
 function Profile({ user, isSessionUser }) {
   const {
     profileUI: {
@@ -142,7 +162,9 @@ function Profile({ user, isSessionUser }) {
       </Helmet>
       <Spacer size={2} />
       <Grid>
-        {isSessionUser ? renderSettingsButton() : null}
+        {isSessionUser
+          ? renderSettingsButton()
+          : renderReportUserButton(username)}
         <Camper
           about={showAbout ? about : null}
           githubProfile={githubProfile}

client/src/components/profile/Profile.test.js

@@ -0,0 +1,88 @@
+/* global expect */
+
+import React from 'react';
+import Enzyme, { shallow } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import Link from '../helpers/Link';
+import renderer from 'react-test-renderer';
+
+import Profile from './Profile';
+
+Enzyme.configure({ adapter: new Adapter() });
+
+const userProps = {
+  user: {
+    profileUI: {
+      isLocked: false,
+      showAbout: false,
+      showCerts: false,
+      showHeatMap: false,
+      showLocation: false,
+      showName: false,
+      showPoints: false,
+      showPortfolio: false,
+      showTimeLine: false
+    },
+    calendar: {},
+    streak: {
+      current: 1,
+      longest: 1
+    },
+    completedChallenges: [],
+    portfolio: [],
+    about: 'string',
+    githubProfile: 'string',
+    isGithub: true,
+    isLinkedIn: true,
+    isTwitter: true,
+    isWebsite: true,
+    linkedin: 'string',
+    location: 'string',
+    name: 'string',
+    picture: 'string',
+    points: 1,
+    twitter: 'string',
+    username: 'string',
+    website: 'string',
+    yearsTopContributor: []
+  }
+};
+
+const myProfileProps = {
+  isSessionUser: true,
+  ...userProps
+};
+
+const notMyProfileProps = {
+  isSessionUser: false,
+  ...userProps
+};
+
+describe('<Profile/>', () => {
+  it('renders the settings button on your own profile', () => {
+    const profileToRender = <Profile {...myProfileProps} />;
+    const profile = shallow(profileToRender);
+    expect(
+      profile
+        .find(Link)
+        .first()
+        .prop('to')
+    ).toBe('/settings');
+  });
+
+  it('renders the report button on another persons profile', () => {
+    const profileToRender = <Profile {...notMyProfileProps} />;
+    const profile = shallow(profileToRender);
+    expect(
+      profile
+        .find(Link)
+        .first()
+        .prop('to')
+    ).toBe('/user/string/report-user');
+  });
+
+  it('renders correctly', () => {
+    const tree = renderer.create(<Profile {...notMyProfileProps} />).toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+});

client/src/components/profile/__snapshots__/Profile.test.js.snap

@@ -0,0 +1,187 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<Profile/> renders correctly 1`] = `
+Array [
+  <div
+    className="spacer"
+    style={
+      Object {
+        "height": "1px",
+        "padding": "15px 0",
+      }
+    }
+  />,
+  <div
+    className="spacer"
+    style={
+      Object {
+        "height": "1px",
+        "padding": "15px 0",
+      }
+    }
+  />,
+  <div
+    className="container"
+  >
+    <div
+      className="row"
+    >
+      <div
+        className="col-sm-4 col-sm-offset-4"
+      >
+        <a
+          className="btn btn-lg btn-primary btn-block"
+          href="/user/string/report-user"
+        >
+          Report This User
+        </a>
+      </div>
+    </div>
+    <div
+      className="spacer"
+      style={
+        Object {
+          "height": "1px",
+          "padding": "15px 0",
+        }
+      }
+    />
+    <div
+      className="spacer"
+      style={
+        Object {
+          "height": "1px",
+          "padding": "15px 0",
+        }
+      }
+    />
+    <div>
+      <div
+        className="row"
+      >
+        <div
+          className="avatar-container col-xs-12"
+        >
+          <img
+            alt="string's avatar"
+            className="avatar img-responsive"
+            src="string"
+          />
+        </div>
+      </div>
+      <div
+        className="row"
+      >
+        <div
+          className="text-center social-media-icons col-sm-6 col-sm-offset-3"
+        >
+          <a
+            aria-label="Link to string's LinkedIn"
+            href="string"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-linkedin fa-w-14 fa-2x "
+              data-icon="linkedin"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 448 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M416 32H31.9C14.3 32 0 46.5 0 64.3v383.4C0 465.5 14.3 480 31.9 480H416c17.6 0 32-14.5 32-32.3V64.3c0-17.8-14.4-32.3-32-32.3zM135.4 416H69V202.2h66.5V416zm-33.2-243c-21.3 0-38.5-17.3-38.5-38.5S80.9 96 102.2 96c21.2 0 38.5 17.3 38.5 38.5 0 21.3-17.2 38.5-38.5 38.5zm282.1 243h-66.4V312c0-24.8-.5-56.7-34.5-56.7-34.6 0-39.9 27-39.9 54.9V416h-66.4V202.2h63.7v29.2h.9c8.9-16.8 30.6-34.5 62.9-34.5 67.2 0 79.7 44.3 79.7 101.9V416z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+          </a>
+          <a
+            aria-label="Link to string's Github"
+            href="string"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-github fa-w-16 fa-2x "
+              data-icon="github"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 496 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+          </a>
+          <a
+            aria-label="Link to string's website"
+            href="string"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-link fa-w-16 fa-2x "
+              data-icon="link"
+              data-prefix="fas"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 512 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+          </a>
+          <a
+            aria-label="Link to string's Twitter"
+            href="string"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-twitter fa-w-16 fa-2x "
+              data-icon="twitter"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 512 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+          </a>
+        </div>
+      </div>
+      <br />
+      <h2
+        className="text-center username"
+      >
+        @
+        string
+      </h2>
+      <br />
+    </div>
+  </div>,
+]
+`;

client/src/redux/report-user-saga.js

@@ -18,7 +18,7 @@ function* reportUserSaga({ payload }) {
 }
 
 function* acceptCompleteSaga() {
-  yield call(navigate, '/');
+  yield call(navigate, '/learn');
 }
 
 export function createReportUserSaga(types) {