#42 - rename jbrowse button (#181)

overture-stack · Sep 15, 2023 · 071b2a9 · 071b2a9
1 parent ff1ecba
commit 071b2a9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/components/pages/explorer/Jbrowse/JbrowseLaunchButton.tsx b/components/pages/explorer/Jbrowse/JbrowseLaunchButton.tsx
@@ -19,10 +19,10 @@
  *
  */
 
-import { css, useTheme } from '@emotion/react';
-import { find } from 'lodash';
 import Button from '@/components/Button';
 import { CustomTooltip } from '@/components/Tooltip';
+import { css, useTheme } from '@emotion/react';
+import { find } from 'lodash';
 import { ButtonWrapper } from '../ActionBar';
 import { RepositoryTabNames } from '../RepositoryContent';
 import { useTabsContext } from '../TabsContext';
@@ -59,10 +59,10 @@ const JbrowseLaunchButton = () => {
           disabled={!jbrowseEnabled}
           onClick={() => {
             // go to jbrowse tab if open, otherwise add jbrowse tab
-            if (find(openTabs, { name: RepositoryTabNames.JBROWSE })) {
-              handleChangeTab(RepositoryTabNames.JBROWSE);
+            if (find(openTabs, { name: RepositoryTabNames.GENOME_VIEWER })) {
+              handleChangeTab(RepositoryTabNames.GENOME_VIEWER);
             } else {
-              handleOpenTab({ name: RepositoryTabNames.JBROWSE, canClose: true });
+              handleOpenTab({ name: RepositoryTabNames.GENOME_VIEWER, canClose: true });
             }
           }}
         >
@@ -72,15 +72,7 @@ const JbrowseLaunchButton = () => {
               align-items: center;
             `}
           >
-            <img
-              src="images/jbrowse-logo.png"
-              alt=""
-              width={16}
-              css={css`
-                margin-right: 0.3rem;
-              `}
-            />
-            <span>JBrowse</span>
+            <span>{RepositoryTabNames.GENOME_VIEWER}</span>
           </div>
         </Button>
       </ButtonWrapper>

diff --git a/components/pages/explorer/MobileWarning.tsx b/components/pages/explorer/MobileWarning.tsx
@@ -22,7 +22,6 @@
 import IconButton from '@/components/IconButton';
 import { css, useTheme } from '@emotion/react';
 import { useState } from 'react';
-import { getConfig } from '../../../global/config';
 import { Dismiss as DismissIcon, Error as ErrorIcon } from '../../theme/icons';
 
 const MobileWarning = () => {
@@ -46,7 +45,7 @@ const MobileWarning = () => {
 				z-index: 100;
 				display: none;
 				@media screen and (max-width: 1024px) {
-					display: block;
+					display: flex;
 				}
 			`}
 		>

diff --git a/components/pages/explorer/RepositoryContent.tsx b/components/pages/explorer/RepositoryContent.tsx
@@ -40,7 +40,7 @@ import { useVisualizationFocusContext } from './VisualizationFocusContext';
 
 export enum RepositoryTabNames {
 	FILES = 'Files',
-	JBROWSE = 'JBrowse',
+	GENOME_VIEWER = 'Genome Viewer',
 }
 
 const getTableConfigs = ({
@@ -161,7 +161,7 @@ const getTableConfigs = ({
 	},
 });
 
-const visualizationTabs = [RepositoryTabNames.JBROWSE];
+const visualizationTabs = [RepositoryTabNames.GENOME_VIEWER];
 
 const ContentDisplay = () => {
 	const { activeTab, handleChangeTab } = useTabsContext();
@@ -183,7 +183,7 @@ const ContentDisplay = () => {
 			);
 		}
 
-		case RepositoryTabNames.JBROWSE: {
+		case RepositoryTabNames.GENOME_VIEWER: {
 			return <JbrowseWrapper />;
 		}
 

diff --git a/components/pages/explorer/Tabs.tsx b/components/pages/explorer/Tabs.tsx
@@ -93,11 +93,13 @@ const TabButton = styled('button')`
 	padding-top: 2px;
 	font-size: 12px;
 	cursor: pointer;
+	${({ withCloseButton }: { withCloseButton?: boolean }) =>
+		`padding-right: ${withCloseButton ? 18 : 0}px`}
 `;
 
 const CloseButton = styled('button')`
 	position: absolute;
-	top: 6px;
+	top: 5px;
 	right: -5px;
 	border: 0;
 	background: transparent;
@@ -116,6 +118,7 @@ const Tabs = () => {
 							onClick={() => {
 								handleChangeTab(tab.name);
 							}}
+							withCloseButton={tab.canClose}
 						>
 							{tab.name}
 						</TabButton>

diff --git a/public/images/jbrowse-logo.png b/public/images/jbrowse-logo.png