cr changes

Feature #14125

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/views-components/main-app-bar/help-menu.tsx b/src/views-components/main-app-bar/help-menu.tsx
index a4779fad40b8c4ef335d9ce33c77d8b7405a20c1..3980e5690a078dad8d3d7b1437557a6e96375544 100644 (file)
--- a/src/views-components/main-app-bar/help-menu.tsx
+++ b/src/views-components/main-app-bar/help-menu.tsx
@@ -37,6 +37,32 @@ enum helpMenuLinks {
     SDK_REFERENCE = "http://doc.arvados.org/sdk/"
 }
 
+enum helpMenuTitles {
+    PIPELINES_DATASETS = "Public Pipelines and Data sets",
+    TUTORIALS = "Tutorials and User guide",
+    API_REFERENCE = "API Reference",
+    SDK_REFERENCE = "SDK Reference"
+}
+
+const links = [
+    {
+        title: helpMenuTitles.PIPELINES_DATASETS,
+        link: helpMenuLinks.PIPELINES_DATASETS
+    },
+    {
+        title: helpMenuTitles.TUTORIALS,
+        link: helpMenuLinks.TUTORIALS
+    },
+    {
+        title: helpMenuTitles.API_REFERENCE,
+        link: helpMenuLinks.API_REFERENCE
+    },
+    {
+        title: helpMenuTitles.SDK_REFERENCE,
+        link: helpMenuLinks.SDK_REFERENCE
+    },
+];
+
 export const HelpMenu = withStyles(styles)(
     ({ classes }: WithStyles<CssRules>) =>
         <DropdownMenu
@@ -44,18 +70,14 @@ export const HelpMenu = withStyles(styles)(
             id="help-menu"
             title="Help">
             <Typography variant="body1" className={classes.title}>Help</Typography>
-            {menuItem("Public Pipelines and Data sets", helpMenuLinks.PIPELINES_DATASETS, classes)}
-            {menuItem("Tutorials and User guide", helpMenuLinks.TUTORIALS, classes)}
-            {menuItem("API Reference", helpMenuLinks.API_REFERENCE, classes)}
-            {menuItem("SDK Reference", helpMenuLinks.SDK_REFERENCE, classes)}
+            {
+                links.map(link =>
+                <a key={link.title} href={link.link} target="_blank" className={classes.link}>
+                    <MenuItem>
+                        <HelpIcon className={classes.icon} />
+                        <Typography variant="body1" className={classes.linkTitle}>{link.title}</Typography>
+                    </MenuItem>
+                </a>)
+            }
         </DropdownMenu>
 );
-
-    // Todo: change help icon
-const menuItem = (title: string, link: string, classes: Record<CssRules, string>) =>
-    <a href={link} target="_blank" className={classes.link}>
-        <MenuItem>
-            <HelpIcon className={classes.icon} />
-            <Typography variant="body1" className={classes.linkTitle}>{title}</Typography>
-        </MenuItem>
-    </a>;

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 3c281087c2addf20ad8f3f6e7e31500673a28782..a92054f3fea05983a1d51922b0f60ba88fc2a5a1 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -38,6 +38,7 @@ import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-
 import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
 import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog';
 import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
+import { HelpMenu } from '~/views-components/main-app-bar/help-menu';
 
 import { TrashPanel } from "~/views/trash-panel/trash-panel";
 
@@ -153,6 +154,7 @@ export const Workbench = withStyles(styles)(
                 return (
                     <div className={classes.root}>
                         <div className={classes.appBar}>
+                        <HelpMenu/>
                             <MainAppBar
                                 breadcrumbs={Breadcrumbs}
                                 searchText={this.state.searchText}