Merge remote-tracking branch 'origin/staging' into integration

Zander1983 · Sep 14, 2021 · be3c8ad · be3c8ad
2 parents 1d87533 + 1def8eb
commit be3c8ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Components/home/LandingPage.tsx b/src/Components/home/LandingPage.tsx
@@ -203,7 +203,7 @@ const AppLandingPage = () => {
               <p style={{ color: "#eee", marginTop: -15 }}>
                 Analysing FCS files has never been easier
               </p>
-              <NavLink
+              {/* <NavLink
                 to={
                   "/" +
                   (process.env.REACT_APP_NO_WORKSPACES === "true"
@@ -221,7 +221,7 @@ const AppLandingPage = () => {
                     ? "Start Analysing"
                     : "Test Red Matter"}
                 </Button>
-              </NavLink>{" "}
+              </NavLink>{" "} */}
               {!isLoggedIn ? (
                 <div>
                   <div>

diff --git a/src/Components/users/Register.tsx b/src/Components/users/Register.tsx
@@ -274,7 +274,7 @@ const Register = (props: any) => {
             </div>
           )}
 
-          <Grid
+          {/* <Grid
             container
             justify="center"
             alignItems="center"
@@ -294,7 +294,7 @@ const Register = (props: any) => {
                 });
               }}
             />
-          </Grid>
+          </Grid> */}
 
           <Grid
             justify="center"

diff --git a/src/services/FlowJoParser.ts b/src/services/FlowJoParser.ts
@@ -84,7 +84,7 @@ const ParseFlowJoJson = async (flowJoJson: any, downloadedFiles: any) => {
       let plot: Plot;
       let sampleUri = samples[i]["DataSet"]["_attributes"]["uri"];
       let sampleUrlArray = sampleUri.split("/");
-      let sampleName = sampleUri[sampleUrlArray.length - 1];
+      let sampleName = sampleUrlArray[sampleUrlArray.length - 1];
       sampleName = sampleName.replace("%20", "");
       let transformations = samples[i]["Transformations"];
       let channelsInfo: any = [];