Skip to content

Commit 1342ce1

Browse files
David-YuWeiDavid-YuWei
authored
Merge pull request #53 from CBIIT/develop
Merge from develop
2 parents cab2f96 + 7f06ca5 commit 1342ce1

File tree

5 files changed

+37
-15
lines changed

5 files changed

+37
-15
lines changed

‎src/components/Pagination/Pagination.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@
7777
background-color: #FFFFFF;
7878
}
7979

80+
.dropdown-item.active-top {
81+
border-bottom: 1px solid #7CACCF;
82+
background-color: #FFFFFF;
83+
}
84+
85+
.dropdown-item.active-bottom {
86+
border-top: 1px solid #7CACCF;
87+
background-color: #FFFFFF;
88+
}
89+
8090
.dropdown-menus {
8191
border: 1px solid #7CACCF;
8292
}

‎src/components/Pagination/index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ const ResultsPerPage = styled.div`
2323
2424
button{
2525
display: inline-block;
26-
margin: -2px 0 0 -3px;
26+
margin: -3px 0 0 -3px;
2727
color: #004187;
2828
background-color: white;
2929
border: none;
30+
font-size: 15px;
3031
}
3132
3233
ul{
@@ -36,6 +37,7 @@ const ResultsPerPage = styled.div`
3637
border: 1px solid #7CACCF;
3738
background-color: #DFEEF9;
3839
// background-color: red;
40+
font-size: 15px;
3941
}
4042
4143
div.dropdown li a{
@@ -88,10 +90,10 @@ const Pagination = ({
8890
{pageInfo.pageSize}
8991
</button>
9092
<ul className="dropdown-menu" aria-labelledby="dropdownMenuButton1">
91-
<li><a className={`dropdown-item ${pageInfo.pageSize === 10 ? "active" : ""}`} aria-hidden="true" onClick={() => handleSizeClick(10)}>10</a></li>
93+
<li><a className={`dropdown-item ${pageInfo.pageSize === 10 ? "active-top" : ""}`} aria-hidden="true" onClick={() => handleSizeClick(10)}>10</a></li>
9294
<li><a className={`dropdown-item ${pageInfo.pageSize === 20 ? "active" : ""}`} aria-hidden="true" onClick={() => handleSizeClick(20)}>20</a></li>
9395
<li><a className={`dropdown-item ${pageInfo.pageSize === 50 ? "active" : ""}`} aria-hidden="true" onClick={() => handleSizeClick(50)}>50</a></li>
94-
<li><a className={`dropdown-item ${pageInfo.pageSize === 100 ? "active" : ""}`} aria-hidden="true" onClick={() => handleSizeClick(100)}>100</a></li>
96+
<li><a className={`dropdown-item ${pageInfo.pageSize === 100 ? "active-bottom" : ""}`} aria-hidden="true" onClick={() => handleSizeClick(100)}>100</a></li>
9597
</ul>
9698
</div>
9799
</ResultsPerPage>

‎src/pages/datasetDetailPage/DatasetDetail.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ const DatasetDetail = ({
8080
additionalDict[adt.attr_name.toLowerCase()] = adt.attr_set;
8181
});
8282
}
83+
let pocLinks = !content || content.poc_email === undefined || content.poc_email === null ? "" : content.poc_email;
84+
if (pocLinks) { pocLinks = pocLinks.split(';'); }
8385
const sortedAdditonals = sortingAdditionalElement(content);
8486

8587
useEffect(() => {
@@ -118,7 +120,12 @@ const DatasetDetail = ({
118120
{content.poc ? content.poc : null}
119121
{content.poc ? ', ' : null}
120122
&nbsp;
121-
{content.poc_email ? <a href={`mailto:${content.poc_email}`} className="datasetDetailHeaderLink" target="_blank" rel="noreferrer noopener">{content.poc_email}</a> : null}
123+
{/* {content.poc_email ? <a href={`mailto:${content.poc_email}`} className="datasetDetailHeaderLink" target="_blank" rel="noreferrer noopener">{content.poc_email}</a> : null} */}
124+
{pocLinks[0] && pocLinks[0].includes("@") ? <a className="datasetDetailHeaderLink" href={`mailto:${pocLinks[0]}`}>{pocLinks[0]}</a> : <a className="datasetDetailHeaderLink" href={pocLinks[0]} target="_blank" rel="noreferrer noopener">{pocLinks[0]}</a>}
125+
{pocLinks[1] ? ', ' : null}
126+
{pocLinks[1] && pocLinks[1].includes("@") ? <a className="datasetDetailHeaderLink" href={`mailto:${pocLinks[1]}`}>{pocLinks[1]}</a> : <a className="datasetDetailHeaderLink" href={pocLinks[1]} target="_blank" rel="noreferrer noopener">{pocLinks[1]}</a>}
127+
{pocLinks[2] ? ', ' : null}
128+
{pocLinks[2] && pocLinks[2].includes("@") ? <a className="datasetDetailHeaderLink" href={`mailto:${pocLinks[2]}`}>{pocLinks[2]}</a> : <a className="datasetDetailHeaderLink" href={pocLinks[2]} target="_blank" rel="noreferrer noopener">{pocLinks[2]}</a>}
122129
</span>
123130
</div>
124131
<ResourceType>

‎src/pages/participatingResourceDetailPage/ParticipatingResourceDetail.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ const ParticipatingResourceDetail = ({
206206
dataContentTypes = dataContentTypes.replace(/,(?=[^\s])/g, ", ");
207207
let resourseLinks = detail.resource_uri === undefined || detail.resource_uri === null ? "" : detail.resource_uri;
208208
if (detail.resource_uri) { resourseLinks = resourseLinks.split(';'); }
209+
let pocLinks = detail.poc_email === undefined || detail.poc_email === null ? "" : detail.poc_email;
210+
if (detail.poc_email) { pocLinks = pocLinks.split(';'); }
209211
const defaultCollapsed = "show";
210212
useEffect(() => {
211213
if (!detail.data_resource_id || detail.data_resource_id !== id) {
@@ -240,8 +242,6 @@ const ParticipatingResourceDetail = ({
240242
<span className="badge"><i className="far fa-file-alt" /></span>
241243
<span className="badgeCount">{detail.datasets_total}</span>
242244
<div className="prDetailHeaderContent">
243-
{/* <Link to={content.resource_uri} className="prDetailHeaderLink">{content.resource_uri}</Link> */}
244-
{/* <DataLink><a className="prDetailHeaderLink" href={detail.resource_uri}>{detail.resource_uri}</a></DataLink> */}
245245
<SiteIcon />
246246
{resourseLinks[0] ? <ExternalLink><a className="prDetailExternalLink" href={resourseLinks[0]} target="_blank" rel="noreferrer noopener">{resourseLinks[0]}</a></ExternalLink> : null}
247247
{resourseLinks[1] ? <ExternalLink><a className="prDetailExternalLink" href={resourseLinks[1]} target="_blank" rel="noreferrer noopener">{resourseLinks[1]}</a></ExternalLink> : null}
@@ -253,17 +253,18 @@ const ParticipatingResourceDetail = ({
253253
{detail.poc ? detail.poc : null}
254254
{detail.poc ? ', ' : null}
255255
&nbsp;
256-
{/* <Link to={content.poc_email} className="prDetailHeaderLink">{content.poc_email}</Link> */}
257-
{detail.poc_email ? <DataLink><a className="prDetailHeaderLink" href={`mailto:${detail.poc_email}`}>{detail.poc_email}</a></DataLink> : null}
258-
{/* <li><a className="prDetailHeaderLink" href={content.poc_email}>{content.poc_email}</a></li> */}
259-
{/* <a href={`mailto:${content.poc_email}`}>{content.poc_email}</a> */}
256+
{/* {detail.poc_email ? <DataLink><a className="prDetailHeaderLink" href={`mailto:${detail.poc_email}`}>{detail.poc_email}</a></DataLink> : null} */}
257+
{pocLinks[0] && pocLinks[0].includes("@") ? <DataLink><a className="prDetailHeaderLink" href={`mailto:${pocLinks[0]}`}>{pocLinks[0]}</a></DataLink> : <DataLink><a className="prDetailHeaderLink" href={pocLinks[0]} target="_blank" rel="noreferrer noopener">{pocLinks[0]}</a></DataLink>}
258+
{pocLinks[1] ? ', ' : null}
259+
{pocLinks[1] && pocLinks[1].includes("@") ? <DataLink><a className="prDetailHeaderLink" href={`mailto:${pocLinks[1]}`}>{pocLinks[1]}</a></DataLink> : <DataLink><a className="prDetailHeaderLink" href={pocLinks[1]} target="_blank" rel="noreferrer noopener">{pocLinks[1]}</a></DataLink>}
260+
{pocLinks[2] ? ', ' : null}
261+
{pocLinks[2] && pocLinks[2].includes("@") ? <DataLink><a className="prDetailHeaderLink" href={`mailto:${pocLinks[2]}`}>{pocLinks[2]}</a></DataLink> : <DataLink><a className="prDetailHeaderLink" href={pocLinks[2]} target="_blank" rel="noreferrer noopener">{pocLinks[2]}</a></DataLink>}
260262
</span>
261263
</div>
262264
<DatasetType>
263265
<span
264266
data-bs-toggle="tooltip"
265267
data-bs-placement="bottom"
266-
// title={detail.resource_type === 'Program' ? `asdfasdfasdfasdf` : "resource type"}
267268
title={tooltips[detail.resource_type]}
268269
>
269270
{detail.resource_type}
@@ -284,9 +285,9 @@ const ParticipatingResourceDetail = ({
284285
<div className="prAboutResourceContainer">
285286
<div className="accordion-item-pr">
286287
<h2 className="accordion-header-pr">
287-
<buttons className={`accordion-button-pr accordion-button-ccdc-pr ${defaultCollapsed ? "" : "collapsed"}`} type="button" data-bs-toggle="collapse" data-bs-target="#collapse1" aria-expanded={defaultCollapsed ? "true" : "false"} aria-controls="collapse1">
288+
<div className={`accordion-button-pr accordion-button-ccdc-pr ${defaultCollapsed ? "" : "collapsed"}`} type="button" data-bs-toggle="collapse" data-bs-target="#collapse1" aria-expanded={defaultCollapsed ? "true" : "false"} aria-controls="collapse1">
288289
<span>About This Resource</span>
289-
</buttons>
290+
</div>
290291
</h2>
291292
<div id="collapse1" className={`collapse ${defaultCollapsed ? "show" : ""}`}>
292293
<div className="prAboutResourceContent">

‎src/pages/participatingResourceDetailPage/participatingResourceDetailPage.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,16 @@
185185
margin-left: 20px;
186186
/* width: 1.2rem; */
187187
/* height: 1.2rem; */
188+
width: auto;
189+
height: auto;
188190
display: inline-block;
189-
vertical-align: .1em;
191+
vertical-align: .08em;
190192
content: "";
191193
border-top: .6em solid;
192194
border-right: .5em solid transparent;
193195
border-bottom: 0;
194196
border-left: .5em solid transparent;
195-
font-size: 1.5rem;
197+
/* font-size: 1.5rem; */
196198
background-image: none;
197199
transition: transform .2s ease-in-out;
198200
color: #7397b0;

0 commit comments

Comments
 (0)