Merge pull request #98 from Integrative-Transcriptomics/dev

Dev

Author: mwittep

src/components/Main/ReplicateColumn.jsx

@@ -61,11 +61,11 @@ function ReplicateColumn({ handleRemove, handleFiles, handleAddEF, handleAddER,
                                 handleAdd={(e) => handleAddER(e, i)} handleRemove={(e, s, i) => handleRemove(e, s, i)} handleFiles={(e) => handleFiles(e)} 
                                 tooltip="Graph file containing the RNA-seq expression graph for the reverse strand from the 5' enrichment library. tagRNA-seq: Use the TSS reads here."/>
 
-                            <DragDropField label='normal forward file' currentFiles={[currentNF[i]]} state='normalF' index={i}
+                            <DragDropField label='non-enriched (control) forward file' currentFiles={[currentNF[i]]} state='normalF' index={i}
                                 handleAdd={(e) => handleAddNF(e, i)} handleRemove={(e, s, i) => handleRemove(e, s, i)} handleFiles={(e) => handleFiles(e)}
                                 tooltip="Graph file containing the RNA-seq expression graph for the forward strand from library without 5' enrichment. tagRNA-seq: Use the PSS reads here." />
 
-                            <DragDropField label='normal reverse file' currentFiles={[currentNR[i]]} state='normalR' index={i}
+                            <DragDropField label='non-enriched (control) reverse file' currentFiles={[currentNR[i]]} state='normalR' index={i}
                                 handleAdd={(e) => handleAddNR(e, i)} handleRemove={(e, s, i) => handleRemove(e, s, i)} handleFiles={(e) => handleFiles(e)} 
                                 tooltip="Graph file containing the RNA-seq expression graph for the reverse strand from library without 5' enrichment. tagRNA-seq: Use the PSS reads here."/>
 

src/components/Main/UploadFile.jsx

@@ -19,7 +19,12 @@ function UploadFile({ file, id, studyType, genomes, saveIndividualFile, show, sa
     disabled = true;
   }
 
-  const label = (file.name).toLowerCase().replace(' ', '');
+  let label = (file.name).toLowerCase().replace(' ', '');
+  // if label contains normal forward or normal reverse, change normal to non-enriched (control)
+  // if (label.includes('normal')) {
+  //   console.log(label);
+  //   label = label.replace('normal', 'nonenriched');
+  // }
 
   let fileName;
   let gIdx;
@@ -104,7 +109,7 @@ function UploadFile({ file, id, studyType, genomes, saveIndividualFile, show, sa
           gap: "12px",
           width: "50vw",
         }} >
-        <p className='file-row'>{file.name}</p>
+        <p className='file-row'>{file.name.includes("normal") ? file.name.replace("normal", "non-enriched (control)") : file.name}</p>
         <label className='element-row file-row element-text'>
 
           <input disabled={disabled} className='element' type="file" name={label} id={id + 'file'} style={{ display: 'none' }}