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

@@ -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)}>

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);
     }
   };

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}`}>

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>
                   {' | '}

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}`}>