Ability to open additional menu links in same tab (jaegertracing#275)

Signed-off-by: Vitaliy Zabolotskyy <zablvit@gmail.com>
zablvit · Nov 17, 2018 · 48ad897 · 48ad897
1 parent feeaccd
commit 48ad897
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/packages/jaeger-ui/src/components/App/TopNav.js b/packages/jaeger-ui/src/components/App/TopNav.js
@@ -56,10 +56,11 @@ function CustomNavDropdown({ label, items }: ConfigMenuGroup) {
   const menuItems = (
     <Menu>
       {items.map(item => {
-        const { label: itemLabel, url } = item;
-        return (
+        const { label: itemLabel, url, openInSameTab } = item;
+        const target = openInSameTab ? "_self" : "_blank";
+          return (
           <Menu.Item key={itemLabel}>
-            <a href={url} target="_blank" rel="noopener noreferrer">
+            <a href={url} target={target} rel="noopener noreferrer">
               {itemLabel}
             </a>
           </Menu.Item>
@@ -93,9 +94,10 @@ export function TopNavImpl(props: Props) {
             );
           }
           const item = ((m: any): ConfigMenuItem);
+          const target = item.openInSameTab ? "_self" : "_blank";
           return (
             <Menu.Item key={item.label}>
-              <a href={item.url} target="_blank" rel="noopener noreferrer">
+              <a href={item.url} target={target} rel="noopener noreferrer">
                 {item.label}
               </a>
             </Menu.Item>

diff --git a/packages/jaeger-ui/src/components/App/TopNav.test.js b/packages/jaeger-ui/src/components/App/TopNav.test.js
@@ -30,6 +30,7 @@ describe('<TopNav>', () => {
     {
       label: 'Twitter',
       url: 'https://twitter.com/JaegerTracing',
+      openInSameTab: true,
     },
   ];
 
@@ -39,6 +40,7 @@ describe('<TopNav>', () => {
         {
           label: labelGitHub,
           url: githubUrl,
+          openInSameTab: true,
         },
         {
           label: labelAbout,
@@ -87,5 +89,11 @@ describe('<TopNav>', () => {
       expect(item.prop('label')).toBe(labelAbout);
       expect(item.prop('items')).toBe(dropdownItems);
     });
+
+    it('adds target=_self to top-level item', () => {
+        const item = wrapper.find(`[href="${githubUrl}"]`);
+        expect(item.length).toBe(1);
+        expect(item.find(`[target="_self"]`).length).toBe(1);
+    });
   });
 });
diff --git a/packages/jaeger-ui/src/types/config.js b/packages/jaeger-ui/src/types/config.js
@@ -17,6 +17,7 @@
 export type ConfigMenuItem = {
   label: string,
   url: string,
+  openInSameTab: boolean,
 };
 
 export type ConfigMenuGroup = {