Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changes variants #35

Merged
merged 1 commit into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions frontend/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,7 @@ html {
}

.buttonVariants:hover {
margin-top: 12px;
margin-right: -2px;
margin-bottom: 20px;
font-weight: 600;
color: rgb(118, 151, 228);
}
Expand Down Expand Up @@ -811,7 +809,7 @@ h5 {

.loader2 {
width: 50vw;
height: 10vh;
height: 30vh;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Cohorts/Cohorts.js
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ function Cohorts (props) {
</>
)}

{trigger && noCollectionEvents && <h10>NO COLLECTION EVENTS FOUND FOR THE SELECTED COHORTS</h10>}
{trigger && noCollectionEvents && <h10>NO GRAPHICS AVAILABLE FOR THE SELECTED COHORTS</h10>}
{showGraphs === true && dataAvailable === false && timeOut === true && (
<div>
<h12>
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/GenomicVariations/VariantsResults.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,10 +483,8 @@ function VariantsResults (props) {
}

setTimeOut(true)
if (
res.data.responseSummary.numTotalResults < 1 ||
res.data.responseSummary.numTotalResults === undefined
) {
if (!res.data.responseSummary.numTotalResults) {
setTimeOut(true)
setError('No results. Please check the query and retry')
setNumberResults(0)
setBoolean(false)
Expand Down Expand Up @@ -634,6 +632,9 @@ function VariantsResults (props) {
></TableResultsVariant>
</div>
)}

{show1 && error && <h3>&nbsp; {error} </h3>}
{show2 && error && <h3>&nbsp; {error} </h3>}
</div>
)}
{timeOut && error === 'Connection error. Please retry' && (
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/Individuals/Individuals.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ h4 {
.results {
flex-wrap: wrap;
justify-content: center;

}

.typeResults {
Expand Down
31 changes: 31 additions & 0 deletions frontend/src/components/Layout/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ function Layout (props) {
setPlaceholder('filtering term comma-separated, ID><=value')
setIsSub(!isSubmitted)
setExampleQ([])
setTimeOut(true)
setResults('Variant')
}

Expand Down Expand Up @@ -1187,6 +1188,36 @@ function Layout (props) {
/>
</div>
)}
{!isSubmitted && results === 'Variant' && !triggerQuery && (
<div>
<VariantsResults
query={query}
resultSets={resultSet}
showResultsVariants={showResultsVariants}
setHideForm={setHideForm}
showBar={showBar}
aminoacid2={aminoacid2}
assemblyId2={assemblyId2}
assemblyId3={assemblyId3}
alternateBases3={alternateBases3}
alternateBases2={alternateBases2}
isSubmitted={isSubmitted}
variantType2={variantType2}
start2={start2}
referenceName2={referenceName2}
referenceName={referenceName}
assemblyId={assemblyId}
start={start}
end={end}
variantType={variantType}
alternateBases={alternateBases}
referenceBases={referenceBases}
referenceBases2={referenceBases2}
aminoacid={aminoacid}
geneID={geneID}
/>
</div>
)}
{isSubmitted && results === 'Biosamples' && triggerQuery && (
<div>
<BiosamplesResults
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Verifier/Verifier.css
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ h11 {

.loader2 {
width: 50vw;
height: 10vh;
height: 30vh;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down