Skip to content

Commit cf6c193

Browse files
authored
Merge pull request #2282 from broadinstitute/jb-hca-suggestion-ux
Making HCA suggestion more prominent (SCP-6024)
2 parents 8e29d91 + e01afef commit cf6c193

File tree

4 files changed

+31
-8
lines changed

4 files changed

+31
-8
lines changed

app/javascript/components/search/results/ResultsPanel.jsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
3-
import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'
3+
import { faInfoCircle, faExclamationCircle } from '@fortawesome/free-solid-svg-icons'
44

55
import StudyResults from './StudyResults'
66
import StudySearchResult from './StudySearchResult'
@@ -18,12 +18,17 @@ import LoadingSpinner from '~/lib/LoadingSpinner'
1818
*/
1919
const ResultsPanel = ({ studySearchState, studyComponent, noResultsDisplay, bookmarks }) => {
2020
const results = studySearchState.results
21-
const hcaMessage = <a
22-
className='hca-link'
23-
onClick={() => studySearchState.updateSearch({ external: 'hca' })}
24-
data-analytics-event='search-hca-empty-results'>
25-
Search HCA Data Portal?
26-
</a>
21+
const hcaMessage = <div className='flexbox alert alert-warning'>
22+
<div className="">
23+
<FontAwesomeIcon icon={faExclamationCircle} className="fa-lg fa-fw icon-left"/>
24+
</div>
25+
<p>Broadening your search to include the <a
26+
className='hca-link'
27+
onClick={() => studySearchState.updateSearch({ external: 'hca' })}
28+
data-analytics-event='search-hca-empty-results'>
29+
Human Cell Atlas Data Portal
30+
</a> may return more results.</p>
31+
</div>
2732

2833
const emptyResultMessage = <div>
2934
No results found. { studySearchState?.params?.external === "" ? hcaMessage : null }

app/javascript/styles/_colors.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
$action-color: #3D5A87;
55

66
/* non-fatal errors -- color palette borrowed from Terra */
7+
$warning-color: #8a6d3b;
8+
$warning-bg: #fcf8e3;
79
$warning-background-color: #feeed8;
810
$warning-icon-color: #C45500;
911

app/javascript/styles/_global.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,20 @@ h6,
518518
font-size: 14px;
519519
}
520520

521+
.alert.alert-warning {
522+
color: $warning-color;
523+
border: none;
524+
border-left: 6px solid $warning-icon-color;
525+
border-radius: 0px;
526+
background: $warning-bg;
527+
a {
528+
text-decoration: underline;
529+
font-weight: bold;
530+
}
531+
margin-top: 1em;
532+
font-size: 14px;
533+
}
534+
521535
/* Slightly override container settings, e.g. for cluster validation errors */
522536
.alert.alert-danger ul {
523537
color: $danger-color;

test/js/resultsPanel.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ describe('<StudyResultsContainer/> rendering>', () => {
5656
expect(container.getElementsByClassName('loading-panel')).toHaveLength(0)
5757
expect(container.getElementsByClassName('error-panel')).toHaveLength(0)
5858
expect(container.getElementsByClassName('results-header')).toHaveLength(0)
59-
expect(container.textContent).toContain('Search HCA Data Portal?')
59+
expect(container.textContent).toContain(
60+
'Broadening your search to include the Human Cell Atlas Data Portal may return more results'
61+
)
6062
})
6163
it('should not render message about HCA if already requested', () => {
6264
const studySearchState = {

0 commit comments

Comments
 (0)