Merge pull request #80 from Integrative-Transcriptomics/dev

Small changes in Image

Author: mwittep

celery/dockerfile

@@ -1,7 +1,7 @@
 
 # first stage build the frontend
 # FROM node:20-alpine3.18 as build
-FROM --platform=linux/x86_64 alpine:latest
+FROM --platform=linux/x86_64 alpine:3.21.2
 
 # Set the working directory in the container to /app
 # Set the working directory in the container to /app

src/components/Result.jsx

@@ -209,6 +209,27 @@ function Result() {
 
             </div>
 
+            <div>
+              <h3 className='header click-param' onClick={() => setShowTable(!showTable)}>
+                {showTable ? "-" : "+"} Master Table
+              </h3>
+              {tableColumns.length > 0 ? (
+                <QueryClientProvider client={queryClient}>
+                  <MasterTable
+                    adaptFilterFromUpset={setFilterPositions}
+                    filterFromUpset={filterPositions}
+                    selectionData={dataMetadataColumns.current}
+                    tableColumns={tableColumns}
+                    tableData={tableData}
+                    showTable={showTable}
+                    gosRef={gosRef}
+                    showGFFViewer={showGenomeViewer} />
+                </QueryClientProvider>
+              ) : (
+                <ClipLoader color='#ffa000' size={30} />
+              )}
+            </div>
+
             <SingleSelectDropdown
               label="Show the following TSS in plots"
               value={filterForPlots}
@@ -219,14 +240,7 @@ function Result() {
               ]}
               style={{ maxWidth: "30vw"}}
             />
-            <GenomeViewerWrapper
-              filePath={filePath}
-              filterSelected={filterForPlots}
-              gosRef={gosRef}
-              showGFFViewer={showGenomeViewer}
-              setGFFViewer={setShowGenomeViewer}
-              nameGenomes={[...allGenomes]}
-            />
+            
             <div className='result-margin-left'>
               <h3 className='header click-param' onClick={() => setShowUpSet(!showUpSet)}>
                 {showUpSet ? "-" : "+"} UpSet Plot: Distribution of TSS across Categories
@@ -244,26 +258,15 @@ function Result() {
                 <ClipLoader color='#ffa000' size={30} />
               )}
             </div>
-            <div>
-              <h3 className='header click-param' onClick={() => setShowTable(!showTable)}>
-                {showTable ? "-" : "+"} Master Table
-              </h3>
-              {tableColumns.length > 0 ? (
-                <QueryClientProvider client={queryClient}>
-                  <MasterTable
-                    adaptFilterFromUpset={setFilterPositions}
-                    filterFromUpset={filterPositions}
-                    selectionData={dataMetadataColumns.current}
-                    tableColumns={tableColumns}
-                    tableData={tableData}
-                    showTable={showTable}
-                    gosRef={gosRef}
-                    showGFFViewer={showGenomeViewer} />
-                </QueryClientProvider>
-              ) : (
-                <ClipLoader color='#ffa000' size={30} />
-              )}
-            </div>
+            <GenomeViewerWrapper
+              filePath={filePath}
+              filterSelected={filterForPlots}
+              gosRef={gosRef}
+              showGFFViewer={showGenomeViewer}
+              setGFFViewer={setShowGenomeViewer}
+              nameGenomes={[...allGenomes]}
+            />
+           
           </div>
       }
     </>

src/components/Result/GenomeViewerWrapper.jsx

@@ -23,7 +23,7 @@ function GenomeViewerWrapper({ filePath, filterSelected, gosRef, setGFFViewer, s
     return (
         <div className='result-margin-left'>
             <h3 className='header click-param' onClick={() => setGFFViewer(!showGFFViewer)}>
-                {showGFFViewer ? "-" : "+"} TSS positions with genome viewer
+                {showGFFViewer ? "-" : "+"} Genome Viewer for TSS data
             </h3>
             {
                 showGFFViewer &&

src/components/Result/MasterTable.jsx

@@ -306,7 +306,7 @@ function FilterCard({ filterFromUpset, adaptFilterFromUpset }) {
             width: "100%",
         }} >
           <div className="filter-card">
-            <span className="filter-text">No global filters selected. Interact with the UpSet plot for complex filters.</span>
+            <span className="filter-text">No global filters selected. Interact with the UpSet plot to include some global filters.</span>
           </div>
           </div>
         )