From 6144a286910c32983d3911adfa81b060cf3321bc Mon Sep 17 00:00:00 2001
From: Dhanesh Neela Mana <dhanesh.neelamana@epfl.ch>
Date: Mon, 17 Aug 2020 13:44:29 +0200
Subject: [PATCH] Fix home icon/sub app icons. (#661)

- Remove home icon.
- Side bar icons will always take user to the subapp landing page.
---
 src/shared/containers/ResourceViewContainer.tsx    |  3 ---
 src/shared/layouts/FusionMainLayout.tsx            |  4 ----
 src/subapps/admin/components/HomeIcon/index.tsx    | 13 -------------
 src/subapps/admin/views/ElasticSearchQueryView.tsx |  3 ---
 src/subapps/admin/views/ProjectView.tsx            |  3 ---
 src/subapps/admin/views/SparqlQueryView.tsx        |  3 ---
 6 files changed, 29 deletions(-)
 delete mode 100644 src/subapps/admin/components/HomeIcon/index.tsx

diff --git a/src/shared/containers/ResourceViewContainer.tsx b/src/shared/containers/ResourceViewContainer.tsx
index dcb1d6e97..2f76b417d 100644
--- a/src/shared/containers/ResourceViewContainer.tsx
+++ b/src/shared/containers/ResourceViewContainer.tsx
@@ -12,7 +12,6 @@ import ResourceActionsContainer from '../containers/ResourceActionsContainer';
 import ResourceEditorContainer from '../containers/ResourceEditor';
 import SchemaLinkContainer from '../containers/SchemaLink';
 import GraphContainer from '../containers/GraphContainer';
-import HomeIcon from '../../subapps/admin/components/HomeIcon';
 import ResourceMetadata from '../components/ResourceMetadata';
 import ResourcePlugins from './ResourcePlugins';
 import usePlugins from '../hooks/usePlugins';
@@ -266,8 +265,6 @@ const ResourceViewContainer: React.FunctionComponent<{
           {!!resource && !!latestResource && !error && (
             <>
               <h1 className="name">
-                <HomeIcon />
-                {' | '}
                 <span>
                   <a onClick={() => goToOrg(orgLabel)}>{orgLabel}</a> |{' '}
                   <a onClick={() => goToProject(orgLabel, projectLabel)}>
diff --git a/src/shared/layouts/FusionMainLayout.tsx b/src/shared/layouts/FusionMainLayout.tsx
index 1be2c51ad..3480fda64 100644
--- a/src/shared/layouts/FusionMainLayout.tsx
+++ b/src/shared/layouts/FusionMainLayout.tsx
@@ -104,10 +104,6 @@ const FusionMainLayout: React.FC<FusionMainLayoutProps> = ({
     const item = subApps.find(subApp => subApp.key === data.key);
     setSelectedItem(item as SubAppProps);
     if (item) {
-      if (`/${location.pathname.split('/')[1]}` === item.route) {
-        // already in the subApp, don't change location
-        return;
-      }
       goTo(item.route);
     }
   };
diff --git a/src/subapps/admin/components/HomeIcon/index.tsx b/src/subapps/admin/components/HomeIcon/index.tsx
deleted file mode 100644
index bcb8b95a6..000000000
--- a/src/subapps/admin/components/HomeIcon/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-import { Tooltip, Icon } from 'antd';
-
-const HomeIcon: React.FunctionComponent<{}> = () => (
-  <Link to="/">
-    <Tooltip title="Back to all organizations" placement="right">
-      <Icon type="home" />
-    </Tooltip>
-  </Link>
-);
-
-export default HomeIcon;
diff --git a/src/subapps/admin/views/ElasticSearchQueryView.tsx b/src/subapps/admin/views/ElasticSearchQueryView.tsx
index f9ec7f397..fecafc223 100644
--- a/src/subapps/admin/views/ElasticSearchQueryView.tsx
+++ b/src/subapps/admin/views/ElasticSearchQueryView.tsx
@@ -8,7 +8,6 @@ import { useNexusContext } from '@bbp/react-nexus';
 
 import ViewStatisticsProgress from '../components/Views/ViewStatisticsProgress';
 import ElasticSearchQueryContainer from '../containers/ElasticSearchQuery';
-import HomeIcon from '../components/HomeIcon';
 import { getResourceLabel, labelOf } from '../../../shared/utils';
 import { useAdminSubappContext } from '..';
 
@@ -80,8 +79,6 @@ const ElasticSearchQueryView: React.FunctionComponent = (): JSX.Element => {
         <div className="label">
           <h1 className="name">
             <span>
-              <HomeIcon />
-              {' | '}
               <Link to={`/${namespace}/${orgLabel}`}>{orgLabel}</Link>
               {' | '}
               <Link to={`/${namespace}/${orgLabel}/${projectLabel}`}>
diff --git a/src/subapps/admin/views/ProjectView.tsx b/src/subapps/admin/views/ProjectView.tsx
index 9f791d0bc..c141212d6 100644
--- a/src/subapps/admin/views/ProjectView.tsx
+++ b/src/subapps/admin/views/ProjectView.tsx
@@ -10,7 +10,6 @@ import { Link } from 'react-router-dom';
 
 import ViewStatisticsContainer from '../components/Views/ViewStatisticsProgress';
 import ResourceListBoardContainer from '../../../shared/containers/ResourceListBoardContainer';
-import HomeIcon from '../components/HomeIcon';
 import ProjectTools from '../components/Projects/ProjectTools';
 import { useAdminSubappContext } from '..';
 
@@ -75,8 +74,6 @@ const ProjectView: React.FunctionComponent = () => {
           <div className="project-banner">
             <div className="label">
               <h1 className="name">
-                <HomeIcon />
-                {' | '}
                 <span>
                   <Link to={`/admin/${orgLabel}`}>{orgLabel}</Link>
                   {' | '}
diff --git a/src/subapps/admin/views/SparqlQueryView.tsx b/src/subapps/admin/views/SparqlQueryView.tsx
index dc7492455..d43fd12dd 100644
--- a/src/subapps/admin/views/SparqlQueryView.tsx
+++ b/src/subapps/admin/views/SparqlQueryView.tsx
@@ -8,7 +8,6 @@ import { useNexusContext } from '@bbp/react-nexus';
 
 import ViewStatisticsProgress from '../components/Views/ViewStatisticsProgress';
 import SparqlQueryContainer from '../containers/SparqlQuery';
-import HomeIcon from '../components/HomeIcon';
 import { getResourceLabel, labelOf } from '../../../shared/utils';
 import { useAdminSubappContext } from '..';
 
@@ -75,8 +74,6 @@ const SparqlQueryView: React.FunctionComponent = (): JSX.Element => {
         <div className="label">
           <h1 className="name">
             <span>
-              <HomeIcon />
-              {' | '}
               <Link to={`/${namespace}/${orgLabel}`}>{orgLabel}</Link>
               {' | '}
               <Link to={`/${namespace}/${orgLabel}/${projectLabel}`}>