Merge pull request #28 from HDRUK/dev

RDT3-236 - Fixing issue were logging in from CMS would not show the l…
HDRUK · May 26, 2020 · b09ce6d · b09ce6d
2 parents 475e23e + c5d39d9
commit b09ce6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/pages/commonComponents/LoginModal.js b/src/pages/commonComponents/LoginModal.js
@@ -8,8 +8,9 @@ const LoginModal = (props) => {
 
     useEffect(() => {
         var values = queryString.parse(window.location.search);
-        if(!!values.showLogin) {
+        if(!!values.showLoginOnce && values.showLoginOnce === 'true') {
             showLoginModal()
+
         }
 
     });

diff --git a/src/pages/search/SearchPage.js b/src/pages/search/SearchPage.js
@@ -214,6 +214,10 @@ class SearchPage extends React.Component {
         if (this.state.projectIndex > 0) searchURL += '&projectIndex=' + this.state.projectIndex;
         if (this.state.personIndex > 0) searchURL += '&personIndex=' + this.state.personIndex;
 
+        if (queryString.parse(window.location.search).showLogin) {
+            searchURL += '&showLoginOnce=true';
+        }
+
         if (!skipHistory) {
             if (this.state.key) {
                 this.props.history.push(`${window.location.pathname}?search=${this.state.searchString}&tab=${this.state.key}` + searchURL);
@@ -245,6 +249,7 @@ class SearchPage extends React.Component {
     handleSelect = (key) => {
         this.setState({ key: key });
         var values = queryString.parse(window.location.search);
+        if(!!values.showLoginOnce) values.showLoginOnce = false 
         values.tab = key;
         this.props.history.push(window.location.pathname + '?' + queryString.stringify(values))
     }