Merge branch '261-overview-before-accessions' into 'master'

Overview before Accessions

Closes #261

See merge request genesys-pgr/genesys-ui!270

src/accessions/ui/BrowsePage.tsx

@@ -85,8 +85,8 @@ class BrowsePage extends BrowsePageTemplate<Accession> {
               </ButtonBar>
             }
           >
-            <Tab name="data" to={ `/a/${filterCode || ''}` }>{ t('accessions.tab.data') }</Tab>
             <Tab name="overview" to={ `/a/overview/${filterCode || ''}` }>{ t('accessions.tab.overview') }</Tab>
+            <Tab name="data" to={ `/a/${filterCode || ''}` }>{ t('accessions.tab.data') }</Tab>
             <Tab name="map" to={ `/a/map/${filterCode || '' }` }>{ t('accessions.tab.map') }</Tab>
           </Tabs>
 

src/accessions/ui/MapPage.tsx

@@ -356,8 +356,8 @@ class BrowsePage extends React.Component<IMapPageProps, any> {
                       </ButtonBar>
                     }
                 >
-                  <Tab name="data" to={ `/a/${filterCode || ''}` }>{ t('accessions.tab.data') }</Tab>
                   <Tab name="overview" to={ `/a/overview/${filterCode || ''}` }>{ t('accessions.tab.overview') }</Tab>
+                  <Tab name="data" to={ `/a/${filterCode || ''}` }>{ t('accessions.tab.data') }</Tab>
                   <Tab name="map" to={ `/a/map/${filterCode || '' }` }>{ t('accessions.tab.map') }</Tab>
                 </Tabs>
                 <PrettyFilters

src/accessions/ui/OverviewPage.tsx

@@ -168,8 +168,8 @@ class BrowsePage extends React.Component<IOverviewPageProps, any> {
             </span>
           }
         >
-          <Tab name="data" to={ `/a/${filterCode || ''}` }>{ t('accessions.tab.data') }</Tab>
           <Tab name="overview" to={ `/a/overview/${filterCode || ''}` }>{ t('accessions.tab.overview') }</Tab>
+          <Tab name="data" to={ `/a/${filterCode || ''}` }>{ t('accessions.tab.data') }</Tab>
           <Tab name="map" to={ `/a/map/${filterCode || '' }` }>{ t('accessions.tab.map') }</Tab>
         </Tabs>
           <PrettyFilters

src/ui/layout/PublicLayout.tsx

@@ -43,7 +43,7 @@ const PUBLIC_MENUS = [
     label: 'public.menu.explore',
     subMenus: [
       {
-        to: '/a',
+        to: '/a/overview',
         label: 'public.menu.exploreAccessions',
       },
       {

src/ui/pages/welcome/index.tsx

@@ -349,7 +349,7 @@ class WelcomePage extends React.Component<IWelcomeProps, any> {
                             <Hidden smDown>
                                 <Grid item xs={ 12 } md={ 3 }>
                                     <Stats>
-                                        <Link to="/a/">
+                                        <Link to="/a/overview">
                                             <span className={ classes.amount }><Number value={ serverInfo.accessionCount } /></span>
                                             { t('accessions.common.stats', { count: serverInfo.accessionCount }) }
                                         </Link>
@@ -383,7 +383,7 @@ class WelcomePage extends React.Component<IWelcomeProps, any> {
                             <Hidden mdUp>
                                 <Grid item xs={ 12 } md={ 3 }>
                                     <Stats>
-                                        <Link to="/a/">
+                                        <Link to="/a/overview">
                                             { t('accessions.common.stats', { count: serverInfo.accessionCount }) }
                                         </Link>
                                     </Stats>