sprint-9 -> staging

deploy/deploy.sh

@@ -43,8 +43,8 @@ export SSO_LOGOUT_URL=https://dev.talentmap.metaphasedev.com/talentmap/login.htm
 
 export ENTITY_ID=https://dev.talentmap.metaphasedev.com/talentmap/
 
-# change to dev BEFORE install
-export NODE_ENV=dev
+# change to development BEFORE install
+export NODE_ENV=development
 
 # install dependencies
 yarn install
@@ -62,9 +62,10 @@ yarn build
 sudo cp -R build /var/www/html
 
 # remove default config.json
-sudo rm /var/www/html/build/config/config.json
+sudo rm /var/www/html/config/config.json 2>/dev/null
+
 # rename config_dev.json to config.json so that it gets used instead
-sudo mv /var/www/html/build/config/config_dev.json /var/www/html/build/config/config.json
+sudo mv /var/www/html/config/config_dev.json /var/www/html/config/config.json
 
 # restart apache
 sudo apachectl restart

package.json

@@ -24,6 +24,7 @@
     "memoize-one": "^5.0.2",
     "numeral": "^2.0.6",
     "prop-types": "^15.6.0",
+    "q": "^1.5.1",
     "query-string": "^5.0.1",
     "rc-steps": "^3.1.0",
     "react": "^15.6.2",
@@ -43,13 +44,16 @@
     "react-router-redux": "^5.0.0-alpha.9",
     "react-router-scroll-4": "^1.0.0-beta.1",
     "react-scroll": "^1.7.5",
+    "react-scroll-up-button": "^1.6.4",
     "react-scrollbar": "^0.5.4",
     "react-select": "^1.1.0",
     "react-simple-dropdown": "^3.2.0",
+    "react-spring": "4.0.0",
     "react-tippy": "^1.2.2",
     "react-toastify": "^4.5.1",
     "redux": "^3.7.1",
     "redux-form": "^7.2.0",
+    "redux-persist": "^5.10.0",
     "redux-saga": "^0.15.6",
     "redux-thunk": "^2.2.0",
     "saml2-js": "2.0.2",
@@ -148,7 +152,9 @@
       "jest-localstorage-mock",
       "mock-local-storage"
     ],
-    "setupFilesAfterEnv": ["<rootDir>/config/jest/setupTests.js"],
+    "setupFilesAfterEnv": [
+      "<rootDir>/config/jest/setupTests.js"
+    ],
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.js?(x)",
       "<rootDir>/src/**/?(*.)(spec|test).js?(x)"

src/Components/BackButton/BackButton.jsx

@@ -1,22 +1,23 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import FontAwesome from 'react-fontawesome';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import { getLastRouteLink } from '../../actions/routerLocations';
 import { ROUTER_LOCATIONS } from '../../Constants/PropTypes';
 
-const BackButton = ({ routerLocations }) => {
-  const goBackLink = getLastRouteLink(routerLocations);
+export const BackButton = ({ routerLocations, location, ignoreCurrentPath }) => {
+  const { text, distance } = getLastRouteLink(routerLocations, location, ignoreCurrentPath);
   return (
-    goBackLink.text ?
+    text ?
       <button
         className="button-back-link usa-button-secondary"
         tabIndex="0"
         role="link"
-        onClick={() => window.history.back()}
+        onClick={() => window.history.go(-(distance))}
       >
         <FontAwesome name="arrow-left" />
-        {goBackLink.text}
+        {text}
       </button>
       :
       null
@@ -25,10 +26,14 @@ const BackButton = ({ routerLocations }) => {
 
 BackButton.propTypes = {
   routerLocations: ROUTER_LOCATIONS,
+  location: PropTypes.shape({}),
+  ignoreCurrentPath: PropTypes.bool,
 };
 
 BackButton.defaultProps = {
   routerLocations: [],
+  location: {},
+  ignoreCurrentPath: false,
 };
 
 const mapStateToProps = state => ({

src/Components/BackButton/BackButton.test.jsx

@@ -1,47 +1,54 @@
 import React from 'react';
 import sinon from 'sinon';
 import { shallow } from 'enzyme';
+import toJSON from 'enzyme-to-json';
 import TestUtils from 'react-dom/test-utils';
 import { Provider } from 'react-redux';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
-import toJSON from 'enzyme-to-json';
-import BackButton from './BackButton';
+import BackButtonContainer, { BackButton } from './BackButton';
 
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
 describe('BackButton', () => {
   const props = {
     routerLocations: [
-      { pathname: '/' },
-      { pathname: '/results' },
+      { pathname: '/results', search: '?q=', hash: '', state: undefined, key: 'dudni5' },
+      { pathname: '/compare/58312870,58312869', search: '', hash: '', state: undefined, key: 't0s36f' },
     ],
+    location: { pathname: '/compare/58312870,58312869', search: '', hash: '', key: 't0s36f' },
+    ignoreCurrentPath: true,
   };
 
   it('is defined', () => {
+    const wrapper = shallow(<BackButton {...props} />);
+    expect(wrapper).toBeDefined();
+  });
+
+  it('is defined when connected', () => {
     const wrapper = TestUtils.renderIntoDocument(<Provider store={mockStore({})}><MemoryRouter>
-      <BackButton {...props} />
+      <BackButtonContainer {...props} />
     </MemoryRouter></Provider>);
     expect(wrapper).toBeDefined();
   });
 
   it('renders the button', () => {
-    const wrapper = shallow(<BackButton.WrappedComponent {...props} />);
+    const wrapper = shallow(<BackButton {...props} />);
     expect(wrapper.find('.button-back-link').exists()).toBe(true);
   });
 
-  it('calls window.history.back on click', () => {
-    const wrapper = shallow(<BackButton.WrappedComponent {...props} />);
+  it('calls window.history.go on click', () => {
+    const wrapper = shallow(<BackButton {...props} />);
     const spy = sinon.spy();
-    window.history.back = spy;
+    window.history.go = spy;
     expect(wrapper.find('button').simulate('click'));
     sinon.assert.calledOnce(spy);
   });
 
   it('matches snapshot', () => {
-    const wrapper = shallow(<BackButton.WrappedComponent {...props} />);
+    const wrapper = shallow(<BackButton {...props} />);
     expect(toJSON(wrapper)).toMatchSnapshot();
   });
 });

src/Components/BackButton/__snapshots__/BackButton.test.jsx.snap

@@ -10,6 +10,6 @@ exports[`BackButton matches snapshot 1`] = `
   <FontAwesome
     name="arrow-left"
   />
-  Back to Home Page
+  Back to Search Results
 </button>
 `;

src/Components/BidListMessages/Success.jsx

@@ -0,0 +1,8 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+const Success = () => (
+  <span>Bid successfully added. <Link to="/profile/bidtracker/">Go to Bid Tracker</Link>.</span>
+);
+
+export default Success;

src/Components/BidListMessages/Success.test.jsx

@@ -0,0 +1,10 @@
+import { shallow } from 'enzyme';
+import React from 'react';
+import Success from './Success';
+
+describe('Success', () => {
+  it('is defined', () => {
+    const wrapper = shallow(<Success />);
+    expect(wrapper).toBeDefined();
+  });
+});

src/Components/BidderPortfolio/BidControls/__snapshots__/BidControls.test.jsx.snap

@@ -37,6 +37,7 @@ exports[`BidControlsComponent matches snapshot when isLoading is false 1`] = `
             },
           ]
         }
+        transformValue={[Function]}
       />
       <ResultsViewBy
         initial="card"
@@ -85,6 +86,7 @@ exports[`BidControlsComponent matches snapshot when isLoading is true 1`] = `
             },
           ]
         }
+        transformValue={[Function]}
       />
       <ResultsViewBy
         initial="card"

src/Components/BidderPortfolio/BidderPortfolioSearch/__snapshots__/BidderPortfolioSearch.test.jsx.snap

@@ -19,6 +19,8 @@ exports[`BidderPortfolioSearchComponent matches snapshot 1`] = `
       onFilterChange={[Function]}
       onUpdate={[Function]}
       placeholder="Search Bidder Last Name, Skill"
+      searchBarDisabled={false}
+      searchBarDisabledPlaceholder="Free text search is unavailable when searching Projected Vacancies"
     />
   </div>
 </div>

src/Components/BidderPortfolio/BidderPortfolioStatCard/BidderPortfolioStatCard.jsx

@@ -1,14 +1,14 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { get, orderBy } from 'lodash';
-import FA from 'react-fontawesome';
 import { BIDDER_OBJECT } from '../../../Constants/PropTypes';
 import BoxShadow from '../../BoxShadow';
 import SkillCodeList from '../../SkillCodeList';
 import { getPostName } from '../../../utilities';
 import { NO_POST, NO_GRADE } from '../../../Constants/SystemMessages';
 import ClientBadgeList from '../ClientBadgeList';
 import StaticDevContent from '../../StaticDevContent';
+import SearchAsClientButton from '../SearchAsClientButton';
+import LinkButton from '../../LinkButton';
 
 const BidderPortfolioStatCard = ({ userProfile }) => {
   const sortedAssignments = orderBy(userProfile.assignments, 'start_date', 'desc');
@@ -19,10 +19,7 @@ const BidderPortfolioStatCard = ({ userProfile }) => {
       <div className="bidder-portfolio-stat-card-top">
         <div>
           <h3>
-            <Link to={`/profile/public/${userProfile.id}`}>
-              {`${userProfile.user.first_name} ${userProfile.user.last_name}`}
-              <FA name="angle-right" />
-            </Link>
+            {`${userProfile.user.first_name} ${userProfile.user.last_name}`}
           </h3>
         </div>
         <div className="stat-card-data-point">
@@ -37,7 +34,7 @@ const BidderPortfolioStatCard = ({ userProfile }) => {
       </div>
       <div className="bidder-portfolio-stat-card-bottom">
         <div>
-          <span>Updates</span>
+          <span className="updates">Updates</span>
           <StaticDevContent>
             <ClientBadgeList
               statuses={{
@@ -49,6 +46,10 @@ const BidderPortfolioStatCard = ({ userProfile }) => {
             />
           </StaticDevContent>
         </div>
+        <div className="button-container" style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
+          <LinkButton toLink={`/profile/public/${userProfile.id}`} className="usa-button-secondary">View Profile</LinkButton>
+          <SearchAsClientButton id={userProfile.id} />
+        </div>
       </div>
     </BoxShadow>
   );

src/Components/BidderPortfolio/BidderPortfolioStatCard/__snapshots__/BidderPortfolioStatCard.test.jsx.snap

@@ -17,15 +17,7 @@ exports[`BidderPortfolioStatCard matches snapshot 1`] = `
   >
     <div>
       <h3>
-        <Link
-          replace={false}
-          to="/profile/public/5"
-        >
-          Kara Batisak
-          <FontAwesome
-            name="angle-right"
-          />
-        </Link>
+        Kara Batisak
       </h3>
     </div>
     <div
@@ -74,7 +66,9 @@ exports[`BidderPortfolioStatCard matches snapshot 1`] = `
     className="bidder-portfolio-stat-card-bottom"
   >
     <div>
-      <span>
+      <span
+        className="updates"
+      >
         Updates
       </span>
       <Connect(StaticDevContent)>
@@ -90,6 +84,28 @@ exports[`BidderPortfolioStatCard matches snapshot 1`] = `
         />
       </Connect(StaticDevContent)>
     </div>
+    <div
+      className="button-container"
+      style={
+        Object {
+          "display": "flex",
+          "flexDirection": "row",
+          "justifyContent": "space-between",
+        }
+      }
+    >
+      <LinkButton
+        className="usa-button-secondary"
+        isExternal={false}
+        toLink="/profile/public/5"
+        useDefaultClass={true}
+      >
+        View Profile
+      </LinkButton>
+      <Connect(withRouter(SearchAsClientButton))
+        id={5}
+      />
+    </div>
   </div>
 </BoxShadow>
 `;

src/Components/BidderPortfolio/BidderPortfolioStatRow/BidderPortfolioStatRow.jsx

@@ -10,6 +10,7 @@ import StaticDevContent from '../../StaticDevContent';
 import LinkButton from '../../LinkButton';
 import Avatar from '../../Avatar';
 import CheckboxList from '../CheckboxList';
+import SearchAsClientButton from '../SearchAsClientButton';
 
 const BidderPortfolioStatRow = ({ userProfile, showEdit }) => {
   const sortedAssignments = orderBy(userProfile.assignments, 'start_date', 'desc');
@@ -57,8 +58,9 @@ const BidderPortfolioStatRow = ({ userProfile, showEdit }) => {
       }
       {
         !showEdit &&
-        <div>
+        <div className="button-container">
           <LinkButton className="usa-button-secondary" toLink={`/profile/public/${userProfile.id}`}>View Details</LinkButton>
+          <SearchAsClientButton id={userProfile.id} />
         </div>
       }
       {

src/Components/BidderPortfolio/BidderPortfolioStatRow/__snapshots__/BidderPortfolioStatRow.test.jsx.snap

@@ -78,7 +78,9 @@ exports[`BidderPortfolioStatRow matches snapshot 1`] = `
       />
     </Connect(StaticDevContent)>
   </div>
-  <div>
+  <div
+    className="button-container"
+  >
     <LinkButton
       className="usa-button-secondary"
       isExternal={false}
@@ -87,6 +89,9 @@ exports[`BidderPortfolioStatRow matches snapshot 1`] = `
     >
       View Details
     </LinkButton>
+    <Connect(withRouter(SearchAsClientButton))
+      id={5}
+    />
   </div>
 </div>
 `;

src/Components/BidderPortfolio/ExportLink/ExportLink.jsx

@@ -5,6 +5,7 @@ import { CSVLink } from 'react-csv';
 import { get } from 'lodash';
 import { bidderPortfolioFetchDataFromLastQuery } from '../../../actions/bidderPortfolio';
 import { EMPTY_FUNCTION } from '../../../Constants/PropTypes';
+import ExportButton from '../../ExportButton';
 
 // Mapping columns to data fields
 const HEADERS = [
@@ -72,10 +73,8 @@ export class ExportLink extends Component {
     const { data, isLoading } = this.state;
     return (
       <div className="export-button-container">
-        <button className="usa-button-secondary" onClick={this.onClick}>
-          {isLoading && <span className="ds-c-spinner spinner-blue" />}<span>Export</span>
-        </button>
-        <CSVLink ref={this.setCsvRef} target="_blank" filename={this.props.filename} data={data} headers={HEADERS} />
+        <ExportButton onClick={this.onClick} isLoading={isLoading} />
+        <CSVLink tabIndex="-1" ref={this.setCsvRef} target="_blank" filename={this.props.filename} data={data} headers={HEADERS} />
       </div>
     );
   }

src/Components/BidderPortfolio/ExportLink/ExportLink.test.jsx

@@ -29,7 +29,7 @@ describe('SearchResultsExportLink', () => {
   it('calls onClick on button click', () => {
     const wrapper = shallow(<ExportLink />);
     expect(wrapper.instance().state.isLoading).toBe(false);
-    wrapper.find('button').simulate('click');
+    wrapper.find('ExportButton').props().onClick();
     expect(wrapper.instance().state.isLoading).toBe(true);
   });