changes variants

elixir-europe · Jan 8, 2024 · 31622d2 · 31622d2
1 parent 97c1aa0
commit 31622d2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 9 deletions.
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -372,9 +372,7 @@ html {
 }
 
 .buttonVariants:hover {
-  margin-top: 12px;
   margin-right: -2px;
-  margin-bottom: 20px;
   font-weight: 600;
   color: rgb(118, 151, 228);
 }
@@ -811,7 +809,7 @@ h5 {
 
 .loader2 {
   width: 50vw;
-  height: 10vh;
+  height: 30vh;
   display: flex;
   flex-direction: column;
   justify-content: center;

diff --git a/frontend/src/components/Cohorts/Cohorts.js b/frontend/src/components/Cohorts/Cohorts.js
@@ -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>

diff --git a/frontend/src/components/GenomicVariations/VariantsResults.js b/frontend/src/components/GenomicVariations/VariantsResults.js
@@ -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)
@@ -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' && (

diff --git a/frontend/src/components/Individuals/Individuals.css b/frontend/src/components/Individuals/Individuals.css
@@ -113,6 +113,7 @@ h4 {
 .results {
   flex-wrap: wrap;
   justify-content: center;
+
 }
 
 .typeResults {

diff --git a/frontend/src/components/Layout/Layout.js b/frontend/src/components/Layout/Layout.js
@@ -488,6 +488,7 @@ function Layout (props) {
     setPlaceholder('filtering term comma-separated, ID><=value')
     setIsSub(!isSubmitted)
     setExampleQ([])
+    setTimeOut(true)
     setResults('Variant')
   }
 
@@ -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

diff --git a/frontend/src/components/Verifier/Verifier.css b/frontend/src/components/Verifier/Verifier.css
@@ -140,7 +140,7 @@ h11 {
 
 .loader2 {
   width: 50vw;
-  height: 10vh;
+  height: 30vh;
   display: flex;
   flex-direction: column;
   justify-content: center;