Merge pull request #939 from MetaPhase-Consulting/update/external-obc

Use internal/external OBC URL
MetaPhase-Consulting · Jun 9, 2020 · 6333c27 · 6333c27
2 parents c5671e5 + ebd652e
commit 6333c27
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 25 deletions.
diff --git a/src/Components/CompareList/__snapshots__/CompareList.test.jsx.snap b/src/Components/CompareList/__snapshots__/CompareList.test.jsx.snap
@@ -464,7 +464,7 @@ exports[`CompareListComponent matches snapshot 1`] = `
             >
               <DefinitionList
                 dangerPay={0}
-                obcUrl=""
+                obcUrl={Object {}}
                 postDifferential={30}
               />
             </td>
@@ -473,7 +473,7 @@ exports[`CompareListComponent matches snapshot 1`] = `
             >
               <DefinitionList
                 dangerPay={15}
-                obcUrl=""
+                obcUrl={Object {}}
                 postDifferential={20}
               />
             </td>
@@ -1033,7 +1033,7 @@ exports[`CompareListComponent matches snapshot when there is an obc id 1`] = `
             >
               <DefinitionList
                 dangerPay={0}
-                obcUrl=""
+                obcUrl={Object {}}
                 postDifferential={30}
               />
             </td>
@@ -1042,7 +1042,7 @@ exports[`CompareListComponent matches snapshot when there is an obc id 1`] = `
             >
               <DefinitionList
                 dangerPay={15}
-                obcUrl=""
+                obcUrl={Object {}}
                 postDifferential={20}
               />
             </td>

diff --git a/src/Components/Differentials/Differentials.jsx b/src/Components/Differentials/Differentials.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { isNumeric } from 'utilities';
 import OBCUrl from 'Components/OBCUrl';
+import { OBC_URLS } from 'Constants/PropTypes';
 import { NO_DANGER_PAY, NO_POST_DIFFERENTIAL } from 'Constants/SystemMessages';
 
 const DefinitionList = ({ dangerPay, postDifferential, obcUrl }) => (
@@ -18,13 +19,13 @@ const DefinitionList = ({ dangerPay, postDifferential, obcUrl }) => (
 DefinitionList.propTypes = {
   dangerPay: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   postDifferential: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  obcUrl: PropTypes.string,
+  obcUrl: OBC_URLS,
 };
 
 DefinitionList.defaultProps = {
   dangerPay: NO_DANGER_PAY,
   postDifferential: NO_POST_DIFFERENTIAL,
-  obcUrl: '',
+  obcUrl: {},
 };
 
 export default DefinitionList;
diff --git a/src/Components/Differentials/__snapshots__/Differentials.test.jsx.snap b/src/Components/Differentials/__snapshots__/Differentials.test.jsx.snap
@@ -9,5 +9,21 @@ exports[`DefinitionList matches snapshot 1`] = `
   <span>
     N/A
   </span>
+  <span
+    style={
+      Object {
+        "paddingLeft": 5,
+        "position": "absolute",
+      }
+    }
+  >
+    <OBCUrl
+      altStyle={false}
+      isButton={false}
+      label="OBC Details"
+      type="post-data"
+      url={Object {}}
+    />
+  </span>
 </div>
 `;
diff --git a/src/Components/OBCUrl/OBCUrl.jsx b/src/Components/OBCUrl/OBCUrl.jsx
@@ -1,9 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { get, includes } from 'lodash';
 import LinkButton from '../LinkButton';
 
 const OBCUrl = ({ type, label, isButton, altStyle, url }) => {
   let text; // link text value
+  let url$ = get(url, 'internal');
 
   // define the URL according to the type
   switch (type) {
@@ -22,28 +24,32 @@ const OBCUrl = ({ type, label, isButton, altStyle, url }) => {
 
   text = label || `${text} details`;
 
+  if (includes(get(window, 'location.host'), 'msappproxy')) {
+    url$ = get(url, 'external');
+  }
+
+  const el = isButton ?
+    <LinkButton isExternal className={`post-data-button ${altStyle ? 'usa-button-secondary' : ''}`} toLink={url$} >{text}</LinkButton>
+    :
+    // This always directs to an internal resource, so there is no security risk.
+    // eslint-disable-next-line react/jsx-no-target-blank
+    <a href={url$} rel="noopener" target="_blank">{text}</a>;
+
   return (
-    // This is not an internal react route. It references a route that
-    // should be defined on the same server that is serving the react application.
-    // We open it in a new tab.
-    isButton ?
-      <LinkButton isExternal className={`post-data-button ${altStyle ? 'usa-button-secondary' : ''}`} toLink={url} >{text}</LinkButton>
-      :
-      // This always directs to an internal resource, so there is no security risk.
-      // eslint-disable-next-line react/jsx-no-target-blank
-      <a href={url} rel="noopener" target="_blank">{text}</a>
+    url$ ? el : null
   );
 };
 
 OBCUrl.propTypes = {
-  url: PropTypes.string.isRequired,
+  url: PropTypes.shape({ internal: PropTypes.string, external: PropTypes.string }),
   type: PropTypes.oneOf(['post', 'post-data', 'country']),
   label: PropTypes.node,
   isButton: PropTypes.bool,
   altStyle: PropTypes.bool,
 };
 
 OBCUrl.defaultProps = {
+  url: {},
   type: 'post',
   label: null,
   isButton: false,

diff --git a/src/Components/OBCUrl/OBCUrl.test.jsx b/src/Components/OBCUrl/OBCUrl.test.jsx
@@ -8,7 +8,7 @@ describe('OBCUrlComponent', () => {
     process.env.PUBLIC_URL = '/talentmap/';
   });
 
-  const url = 'https://google.com/1';
+  const url = { internal: 'https://google.com/1', external: 'https://google-proxy.com/1' };
 
   it('is defined', () => {
     const wrapper = shallow(<OBCUrl
@@ -21,7 +21,7 @@ describe('OBCUrlComponent', () => {
     const wrapper = shallow(<OBCUrl
       url={url}
     />);
-    expect(wrapper.find('a').props().href).toBe(url);
+    expect(wrapper.find('a').props().href).toBe(url.internal);
   });
 
   it('is defined when id is a string', () => {

diff --git a/src/Components/PositionDetailsItem/__snapshots__/PositionDetailsItem.test.jsx.snap b/src/Components/PositionDetailsItem/__snapshots__/PositionDetailsItem.test.jsx.snap
@@ -142,7 +142,7 @@ exports[`PositionDetailsItem matches snapshot 1`] = `
           content={
             <DefinitionList
               dangerPay={0}
-              obcUrl=""
+              obcUrl={Object {}}
               postDifferential={30}
             />
           }
@@ -501,7 +501,7 @@ exports[`PositionDetailsItem matches snapshot when there is an obc id 1`] = `
           content={
             <DefinitionList
               dangerPay={0}
-              obcUrl=""
+              obcUrl={Object {}}
               postDifferential={30}
             />
           }
@@ -862,7 +862,7 @@ exports[`PositionDetailsItem matches snapshot when various data is missing from
           content={
             <DefinitionList
               dangerPay={0}
-              obcUrl=""
+              obcUrl={Object {}}
               postDifferential={30}
             />
           }

diff --git a/src/Components/PositionTitle/PositionTitle.test.jsx b/src/Components/PositionTitle/PositionTitle.test.jsx
@@ -33,7 +33,7 @@ describe('PositionTitleComponent', () => {
 
   it('displays the OBC link if post_overview_url exists', () => {
     const newDetailsObject = { ...detailsObject };
-    newDetailsObject.post.post_overview_url = 'url';
+    newDetailsObject.post.post_overview_url = { internal: 'url', external: 'url2' };
     const wrapper = shallow(
       <PositionTitle
         {...props}

diff --git a/src/Components/ViewPostDataButton/ViewPostDataButton.jsx b/src/Components/ViewPostDataButton/ViewPostDataButton.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import FontAwesome from 'react-fontawesome';
+import { OBC_URLS } from 'Constants/PropTypes';
 import OBCUrl from '../OBCUrl';
 
 const ViewPostDataButton = ({ url, type, altStyle }) => (
@@ -14,12 +15,13 @@ const ViewPostDataButton = ({ url, type, altStyle }) => (
 );
 
 ViewPostDataButton.propTypes = {
-  url: PropTypes.string.isRequired,
+  url: OBC_URLS,
   type: PropTypes.oneOf(['post', 'country']),
   altStyle: PropTypes.bool,
 };
 
 ViewPostDataButton.defaultProps = {
+  url: {},
   type: 'post',
   altStyle: false,
 };

diff --git a/src/Components/ViewPostDataButton/ViewPostDataButton.test.jsx b/src/Components/ViewPostDataButton/ViewPostDataButton.test.jsx
@@ -5,7 +5,7 @@ import ViewPostDataButton from './ViewPostDataButton';
 
 describe('ViewPostDataButtonComponent', () => {
   const props = {
-    url: 'https://google.com/1',
+    url: { internal: 'https://google.com/1', external: 'https://google-proxy.com/1' },
     type: 'post',
   };
   it('is defined', () => {

diff --git a/src/Components/ViewPostDataButton/__snapshots__/ViewPostDataButton.test.jsx.snap b/src/Components/ViewPostDataButton/__snapshots__/ViewPostDataButton.test.jsx.snap
@@ -13,6 +13,11 @@ exports[`ViewPostDataButtonComponent matches snapshot 1`] = `
     </span>
   }
   type="post"
-  url="https://google.com/1"
+  url={
+    Object {
+      "external": "https://google-proxy.com/1",
+      "internal": "https://google.com/1",
+    }
+  }
 />
 `;
diff --git a/src/Constants/PropTypes.js b/src/Constants/PropTypes.js
@@ -595,3 +595,8 @@ export const HISTORY_OBJECT = PropTypes.shape({
   push: PropTypes.func,
   listen: PropTypes.func,
 });
+
+export const OBC_URLS = PropTypes.shape({
+  internal: PropTypes.string,
+  external: PropTypes.string,
+});