Merge branch 'dev' into feature/projected-vacancy-favoriting, update …

…snapshots * dev: Add role to persona links (#196) Feature flag for notifications (#191) Set uFEFF to false in CSV export to resolve default file format in Excel (#195) Make header color readable (#190) Add posted date to position details
MetaPhase-Consulting · May 13, 2019 · 120675c · 120675c
2 parents b611024 + be798c9
commit 120675c
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 14 deletions.
diff --git a/public/config/config.json b/public/config/config.json
@@ -5,6 +5,7 @@
   "flags": {
     "bidding": true,
     "projected_vacancy": true,
-    "static_content": true
+    "static_content": true,
+    "notifications": false
   }
 }
diff --git a/public/config/config_dev.json b/public/config/config_dev.json
@@ -5,6 +5,7 @@
   "flags": {
     "bidding": false,
     "projected_vacancy": true,
-    "static_content": true
+    "static_content": true,
+    "notifications": true
   }
 }
diff --git a/public/login.html b/public/login.html
@@ -15,16 +15,16 @@ <h2>Personas</h2>
       <a OnClick="login('admin', 'admin');">Administrator</a>
     </li>
     <li>
-      <a OnClick="login('shadtrachl', 'password');">Leah Shadtrach</a>
+      <a OnClick="login('shadtrachl', 'password');">Leah Shadtrach (CDO)</a>
     </li>
     <li>
-      <a OnClick="login('townpostj', 'password');">Jenny Townpost</a>
+      <a OnClick="login('townpostj', 'password');">Jenny Townpost (Bidder)</a>
     </li>
     <li>
-      <a OnClick="login('rehmant', 'password');">Tarek Rehman</a>
+      <a OnClick="login('rehmant', 'password');">Tarek Rehman (Bidder)</a>
     </li>
     <li>
-      <a OnClick="login('woodwardw', 'password');">Wendy Woodward</a>
+      <a OnClick="login('woodwardw', 'password');">Wendy Woodward (AO)</a>
     </li>
   </ul>
 </div>

diff --git a/src/Components/BidderPortfolio/ExportLink/ExportLink.jsx b/src/Components/BidderPortfolio/ExportLink/ExportLink.jsx
@@ -74,7 +74,15 @@ export class ExportLink extends Component {
     return (
       <div className="export-button-container">
         <ExportButton onClick={this.onClick} isLoading={isLoading} />
-        <CSVLink tabIndex="-1" ref={this.setCsvRef} target="_blank" filename={this.props.filename} data={data} headers={HEADERS} />
+        <CSVLink
+          tabIndex="-1"
+          ref={this.setCsvRef}
+          target="_blank"
+          filename={this.props.filename}
+          data={data}
+          headers={HEADERS}
+          uFEFF={false}
+        />
       </div>
     );
   }

diff --git a/src/Components/BidderPortfolio/ExportLink/__snapshots__/ExportLink.test.jsx.snap b/src/Components/BidderPortfolio/ExportLink/__snapshots__/ExportLink.test.jsx.snap
@@ -57,7 +57,7 @@ exports[`SearchResultsExportLink matches snapshot 1`] = `
     separator=","
     tabIndex="-1"
     target="_blank"
-    uFEFF={true}
+    uFEFF={false}
   />
 </div>
 `;
diff --git a/src/Components/Header/DesktopNav/DesktopNav.jsx b/src/Components/Header/DesktopNav/DesktopNav.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import FontAwesome from 'react-fontawesome';
+import { Flag } from 'flag';
 import { USER_PROFILE } from '../../../Constants/PropTypes';
 import Notifications from '../Notifications';
 import GlossaryIcon from '../GlossaryIcon';
@@ -55,7 +56,9 @@ const DesktopNav = ({
           {
             isLoggedIn &&
               <span>
-                <Notifications />
+                <Flag name="flags.notifications">
+                  <Notifications />
+                </Flag>
                 <GlossaryIcon />
               </span>
           }

diff --git a/src/Components/Header/DesktopNav/__snapshots__/DesktopNav.test.jsx.snap b/src/Components/Header/DesktopNav/__snapshots__/DesktopNav.test.jsx.snap
@@ -127,7 +127,11 @@ exports[`DesktopNav matches snapshot when logged in 1`] = `
         className="header-nav-link"
       >
         <span>
-          <Connect(withRouter(Notifications)) />
+          <Flag
+            name="flags.notifications"
+          >
+            <Connect(withRouter(Notifications)) />
+          </Flag>
           <Connect(GlossaryIcon) />
         </span>
       </div>

diff --git a/src/Components/PositionDetailsItem/PositionDetailsItem.jsx b/src/Components/PositionDetailsItem/PositionDetailsItem.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { get } from 'lodash';
 import { Flag } from 'flag';
+import { COMMON_PROPERTIES } from '../../Constants/EndpointParams';
 import LanguageList from '../../Components/LanguageList/LanguageList';
 import CondensedCardDataPoint from '../CondensedCardData/CondensedCardDataPoint';
 import OBCUrl from '../OBCUrl';
@@ -33,6 +34,7 @@ import {
   NO_POST_DIFFERENTIAL,
   NO_DANGER_PAY,
   NO_USER_LISTED,
+  NO_UPDATE_DATE,
 } from '../../Constants/SystemMessages';
 
 export const renderHandshake = stats => (
@@ -76,6 +78,15 @@ const PositionDetailsItem = (props) => {
 
   const incumbent = propOrDefault(details, 'current_assignment.user', NO_USER_LISTED);
 
+  const getPostedDate = () => {
+    const posted = get(details, COMMON_PROPERTIES.posted);
+    if (posted) {
+      return formatDate(posted);
+    }
+    return NO_UPDATE_DATE;
+  };
+  const postedDate = getPostedDate();
+
   const stats = getBidStatisticsObject(details.bid_statistics);
   return (
     <div className="usa-grid-full padded-main-content position-details-outer-container">
@@ -102,6 +113,7 @@ const PositionDetailsItem = (props) => {
             <CondensedCardDataPoint title="Danger pay" content={getFormattedObcData(dangerPay)} />
             <CondensedCardDataPoint title="TED" content={formattedTourEndDate} />
             <CondensedCardDataPoint title="Incumbent" content={incumbent} />
+            <CondensedCardDataPoint title="Posted" content={postedDate} />
           </div>
         </div>
         <div className="usa-width-one-third position-details-contact-container">

diff --git a/src/Components/PositionDetailsItem/__snapshots__/PositionDetailsItem.test.jsx.snap b/src/Components/PositionDetailsItem/__snapshots__/PositionDetailsItem.test.jsx.snap
@@ -111,6 +111,11 @@ exports[`PositionDetailsItem matches snapshot 1`] = `
           hasFixedTitleWidth={false}
           title="Incumbent"
         />
+        <CondensedCardDataPoint
+          content="Unknown"
+          hasFixedTitleWidth={false}
+          title="Posted"
+        />
       </div>
     </div>
     <div
@@ -334,6 +339,11 @@ exports[`PositionDetailsItem matches snapshot when there is an obc id 1`] = `
           hasFixedTitleWidth={false}
           title="Incumbent"
         />
+        <CondensedCardDataPoint
+          content="Unknown"
+          hasFixedTitleWidth={false}
+          title="Posted"
+        />
       </div>
     </div>
     <div
@@ -536,6 +546,11 @@ exports[`PositionDetailsItem matches snapshot when various data is missing from
           hasFixedTitleWidth={false}
           title="Incumbent"
         />
+        <CondensedCardDataPoint
+          content="Unknown"
+          hasFixedTitleWidth={false}
+          title="Posted"
+        />
       </div>
     </div>
     <div

diff --git a/src/Components/ProfileDashboard/ProfileDashboard.jsx b/src/Components/ProfileDashboard/ProfileDashboard.jsx
@@ -57,9 +57,11 @@ const ProfileDashboard = ({
                         columns={columns[1]}
                         className={'user-dashboard-section-container user-dashboard-column-2'}
                       >
-                        <BoxShadow className="usa-width-one-whole user-dashboard-section notifications-section">
-                          <Notifications notifications={notifications} />
-                        </BoxShadow>
+                        <Flag name="flags.notifications">
+                          <BoxShadow className="usa-width-one-whole user-dashboard-section notifications-section">
+                            <Notifications notifications={notifications} />
+                          </BoxShadow>
+                        </Flag>
                         <BoxShadow className="usa-width-one-whole user-dashboard-section favorites-section">
                           <SavedSearches />
                         </BoxShadow>

diff --git a/src/Components/SearchResultsExportLink/SearchResultsExportLink.jsx b/src/Components/SearchResultsExportLink/SearchResultsExportLink.jsx
@@ -93,6 +93,7 @@ class SearchResultsExportLink extends Component {
           filename={this.props.filename}
           data={data}
           headers={HEADERS}
+          uFEFF={false}
         />
       </div>
     );

diff --git a/src/Components/SearchResultsExportLink/__snapshots__/SearchResultsExportLink.test.jsx.snap b/src/Components/SearchResultsExportLink/__snapshots__/SearchResultsExportLink.test.jsx.snap
@@ -73,7 +73,7 @@ exports[`SearchResultsExportLink matches snapshot 1`] = `
     separator=","
     tabIndex="-1"
     target="_blank"
-    uFEFF={true}
+    uFEFF={false}
   />
 </div>
 `;
diff --git a/src/sass/_glossaryEditor.scss b/src/sass/_glossaryEditor.scss
@@ -1,4 +1,8 @@
 .glossary-editor-page {
+  h2 {
+    color: initial;
+  }
+
   .hello-greeting {
     float: left;
   }