From c915c9155cf097d2b0fc3d73e0e75774c7eeca19 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@macadmins-MBP-4.fios-router.home>
Date: Sat, 25 Apr 2020 23:41:19 -0400
Subject: [PATCH 1/6] change link to fec search

---
 fec/legal/templates/macros/legal.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fec/legal/templates/macros/legal.jinja b/fec/legal/templates/macros/legal.jinja
index 30c728dff8..fbb9c90000 100644
--- a/fec/legal/templates/macros/legal.jinja
+++ b/fec/legal/templates/macros/legal.jinja
@@ -108,7 +108,7 @@
     <p>Think this was a mistake?</p>
     <ul class="list--buttons">
       {% if query %}
-      <li><a class="button button--standard" href="http://search04.fec.gov/vivisimo/cgi-bin/query-meta?v%3Asources={{ '%2C'.join(fec_resources or []) }}&query={{ query }}&x=0&y=0&v%3aproject=fec_search_02_prj&v%3aframe=form&form=advanced-fec&">Try FEC.gov</a></li>
+       <li><a class="button button--standard" href="https://www.fec.gov/search/?query={{ query }}">Try FEC.gov</a></li>
       {% endif %}
       <li><a class="button button--standard" href="mailto:{{ WEBMANAGER_EMAIL }}">Email our team</a></li>
       <li><a class="button button--standard" href="https://github.com/fecgov/fec/issues">File an issue</a></li>

From 9a72225941f2cf5feb33f37d4bba2de2da9a175e Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@macadmins-MBP-4.fios-router.home>
Date: Mon, 27 Apr 2020 13:00:59 -0400
Subject: [PATCH 2/6] make path relative

---
 fec/legal/templates/macros/legal.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fec/legal/templates/macros/legal.jinja b/fec/legal/templates/macros/legal.jinja
index fbb9c90000..c07238ebd1 100644
--- a/fec/legal/templates/macros/legal.jinja
+++ b/fec/legal/templates/macros/legal.jinja
@@ -108,7 +108,7 @@
     <p>Think this was a mistake?</p>
     <ul class="list--buttons">
       {% if query %}
-       <li><a class="button button--standard" href="https://www.fec.gov/search/?query={{ query }}">Try FEC.gov</a></li>
+       <li><a class="button button--standard" href="/search/?query={{ query }}">Try FEC.gov</a></li>
       {% endif %}
       <li><a class="button button--standard" href="mailto:{{ WEBMANAGER_EMAIL }}">Email our team</a></li>
       <li><a class="button button--standard" href="https://github.com/fecgov/fec/issues">File an issue</a></li>

From 199ab8aeb192e348949e438f64b65eac25df1f60 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@macadmins-MBP-4.fios-router.home>
Date: Fri, 1 May 2020 06:04:17 -0400
Subject: [PATCH 3/6] show try fec link for AOs, remove query from message

---
 fec/fec/static/js/legal/SearchResults.js               | 10 +++++-----
 .../templates/layouts/legal-doc-search-results.jinja   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fec/fec/static/js/legal/SearchResults.js b/fec/fec/static/js/legal/SearchResults.js
index e8f734d44e..d1ca8a78ca 100644
--- a/fec/fec/static/js/legal/SearchResults.js
+++ b/fec/fec/static/js/legal/SearchResults.js
@@ -124,16 +124,16 @@ function SearchResults(props) {
         <div className="message message--no-icon">
           <h2 className="message__title">No results</h2>
           <p>
-            Sorry, we didn&rsquo;t find any documents matching {props.query}.
+            Sorry, we didn&rsquo;t find any documents matching your search {props.q}.
           </p>
           <div className="message--alert__bottom">
             <p>Think this was a mistake?</p>
             <ul className="list--buttons">
-              {props.query && (
+              {props.q && (
                 <li>
                   <a
                     className="button button--standard"
-                    href="http://search04.fec.gov/vivisimo/cgi-bin/query-meta?v%3Asources=Administrative_Fine%2CAdvisory_Opinion%2CAlternative_Dispute_Resolution%2CAudit_Reports%2CMatters_Under_Review%2CMatters_Under_Review_Archived%2CRulemaster%2CCandidate_Summary%2CCommittee_Summary%2Cfec.gov&query={{ query }}&x=0&y=0&v%3aproject=fec_search_02_prj&v%3aframe=form&form=advanced-fec&"
+                    href={'/search/?query='+ props.q}
                   >
                     Try FEC.gov
                   </a>
@@ -165,8 +165,8 @@ function SearchResults(props) {
 
 SearchResults.propTypes = {
   advisory_opinion: PropTypes.array,
-  loading: PropTypes.string,
-  query: PropTypes.string
+  loading: PropTypes.bool,
+  query: PropTypes.object
 };
 
 module.exports = SearchResults;
diff --git a/fec/legal/templates/layouts/legal-doc-search-results.jinja b/fec/legal/templates/layouts/legal-doc-search-results.jinja
index 57c6877c78..9d54605fcb 100644
--- a/fec/legal/templates/layouts/legal-doc-search-results.jinja
+++ b/fec/legal/templates/layouts/legal-doc-search-results.jinja
@@ -65,7 +65,7 @@
           <p>Think this was a mistake?</p>
           <ul class="list--buttons">
             {% if query %}
-            <li><a class="button button--standard" href="http://search04.fec.gov/vivisimo/cgi-bin/query-meta?v%3Asources=Administrative_Fine%2CAdvisory_Opinion%2CAlternative_Dispute_Resolution%2CAudit_Reports%2CMatters_Under_Review%2CMatters_Under_Review_Archived%2CRulemaster%2CCandidate_Summary%2CCommittee_Summary%2Cfec.gov&query={{ query }}&x=0&y=0&v%3aproject=fec_search_02_prj&v%3aframe=form&form=advanced-fec&">Try FEC.gov</a></li>
+            <li><a class="button button--standard" href="/search/?query={{ query }}">Try FEC.gov</a></li>
             {% endif %}
             <li><a class="button button--standard" href="mailto:{{ WEBMANAGER_EMAIL }}">Email our team</a></li>
             <li><a class="button button--standard" href="https://github.com/fecgov/fec/issues">File an issue</a></li>

From e13ffe532389962fe87b4a4ae060848b7c6cfa27 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@macadmins-MBP-4.fios-router.home>
Date: Fri, 1 May 2020 06:27:20 -0400
Subject: [PATCH 4/6] lint fixes

---
 fec/fec/static/js/legal/SearchResults.js       | 5 +++--
 fec/fec/static/js/legal/filters/TooltipHelp.js | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fec/fec/static/js/legal/SearchResults.js b/fec/fec/static/js/legal/SearchResults.js
index d1ca8a78ca..abf38b39f0 100644
--- a/fec/fec/static/js/legal/SearchResults.js
+++ b/fec/fec/static/js/legal/SearchResults.js
@@ -124,7 +124,8 @@ function SearchResults(props) {
         <div className="message message--no-icon">
           <h2 className="message__title">No results</h2>
           <p>
-            Sorry, we didn&rsquo;t find any documents matching your search {props.q}.
+            Sorry, we didn&rsquo;t find any documents matching your search{' '}
+            {props.q}.
           </p>
           <div className="message--alert__bottom">
             <p>Think this was a mistake?</p>
@@ -133,7 +134,7 @@ function SearchResults(props) {
                 <li>
                   <a
                     className="button button--standard"
-                    href={'/search/?query='+ props.q}
+                    href={'/search/?query=' + props.q}
                   >
                     Try FEC.gov
                   </a>
diff --git a/fec/fec/static/js/legal/filters/TooltipHelp.js b/fec/fec/static/js/legal/filters/TooltipHelp.js
index 2fddec4929..3a5b2d3aed 100644
--- a/fec/fec/static/js/legal/filters/TooltipHelp.js
+++ b/fec/fec/static/js/legal/filters/TooltipHelp.js
@@ -9,9 +9,7 @@ class TooltipHelp extends React.Component {
           <span className="u-visually-hidden">Learn more</span>
         </button>
         <div
-          className={`tooltip tooltip--${
-            this.props.verticalPosition
-          } tooltip--${this.props.horizontalPosition}`}
+          className={`tooltip tooltip--${this.props.verticalPosition} tooltip--${this.props.horizontalPosition}`}
         >
           <p className="tooltip__content tooltip__content">
             {this.props.message}

From 3a25a57bcc415d320dbe5aa58895516e22de0178 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@macadmins-MBP-4.fios-router.home>
Date: Fri, 1 May 2020 12:19:44 -0400
Subject: [PATCH 5/6] remove search result in message for AOs

---
 fec/fec/static/js/legal/SearchResults.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fec/fec/static/js/legal/SearchResults.js b/fec/fec/static/js/legal/SearchResults.js
index abf38b39f0..1c6a207a1d 100644
--- a/fec/fec/static/js/legal/SearchResults.js
+++ b/fec/fec/static/js/legal/SearchResults.js
@@ -124,8 +124,7 @@ function SearchResults(props) {
         <div className="message message--no-icon">
           <h2 className="message__title">No results</h2>
           <p>
-            Sorry, we didn&rsquo;t find any documents matching your search{' '}
-            {props.q}.
+            Sorry, we didn&rsquo;t find any documents matching your search.
           </p>
           <div className="message--alert__bottom">
             <p>Think this was a mistake?</p>

From 062c625fd1d8dad541f67b1838524bebfb766bba Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@macadmins-MBP-4.fios-router.home>
Date: Fri, 1 May 2020 12:23:29 -0400
Subject: [PATCH 6/6] lint fixes

---
 fec/fec/static/js/legal/SearchResults.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fec/fec/static/js/legal/SearchResults.js b/fec/fec/static/js/legal/SearchResults.js
index 1c6a207a1d..e894fcbacd 100644
--- a/fec/fec/static/js/legal/SearchResults.js
+++ b/fec/fec/static/js/legal/SearchResults.js
@@ -123,9 +123,7 @@ function SearchResults(props) {
       return (
         <div className="message message--no-icon">
           <h2 className="message__title">No results</h2>
-          <p>
-            Sorry, we didn&rsquo;t find any documents matching your search.
-          </p>
+          <p>Sorry, we didn&rsquo;t find any documents matching your search.</p>
           <div className="message--alert__bottom">
             <p>Think this was a mistake?</p>
             <ul className="list--buttons">