[ARVADOS-WORKBENCH2] updated: 1.1.4-295-g664fa00

[Git user]

Summary of changes:
 src/common/custom-theme.ts                          |  8 ++++----
 src/components/dropdown-menu/dropdown-menu.test.tsx | 11 ++++++-----
 src/components/dropdown-menu/dropdown-menu.tsx      |  5 +----
 src/store/side-panel/side-panel-reducer.test.ts     |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

       via  664fa00705ba7c1ee63d297afe6cdd0238c370e0 (commit)
      from  ec802abaf641d5c0d6c0fda6893d0c3126e3cb65 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 664fa00705ba7c1ee63d297afe6cdd0238c370e0
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date:   Wed Jul 11 15:15:49 2018 +0200

    fix test
    
    Feature #13764
    
    Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index 0850f88..e81473a 100644
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -17,7 +17,7 @@ export interface ArvadosTheme extends Theme {
     customs: any;
 }
 
-const purple900 = purple["900"];
+const purple800 = purple["800"];
 const grey600 = grey["600"];
 const themeOptions: ArvadosThemeOptions = {
     customs: {
@@ -28,7 +28,7 @@ const themeOptions: ArvadosThemeOptions = {
     overrides: {
         MuiAppBar: {
             colorPrimary: {
-                backgroundColor: purple900
+                backgroundColor: purple800
             }
         },
         MuiTabs: {
@@ -36,13 +36,13 @@ const themeOptions: ArvadosThemeOptions = {
                 color: grey600
             },
             indicator: {
-                backgroundColor: purple900
+                backgroundColor: purple800
             }
         },
         MuiTab: {
             selected: {
                 fontWeight: 700,
-                color: purple900
+                color: purple800
             }
         }
     },
diff --git a/src/components/dropdown-menu/dropdown-menu.test.tsx b/src/components/dropdown-menu/dropdown-menu.test.tsx
index 19924ad..54957f3 100644
--- a/src/components/dropdown-menu/dropdown-menu.test.tsx
+++ b/src/components/dropdown-menu/dropdown-menu.test.tsx
@@ -9,18 +9,19 @@ import ChevronRightIcon from '@material-ui/icons/ChevronRight';
 
 import * as Adapter from 'enzyme-adapter-react-16';
 import { MenuItem, IconButton, Menu } from "@material-ui/core";
+import IconBase, { IconTypes } from "../icon/icon";
 
 configure({ adapter: new Adapter() });
 
 describe("<DropdownMenu />", () => {
     it("renders menu icon", () => {
-        const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={ChevronRightIcon} />);
-        expect(dropdownMenu.find(ChevronRightIcon)).toHaveLength(1);
+        const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={IconTypes.CHEVRON_RIGHT} />);
+        expect(dropdownMenu.find(IconBase)).toHaveLength(1);
     });
 
     it("render menu items", () => {
         const dropdownMenu = shallow(
-            <DropdownMenu id="test-menu" icon={ChevronRightIcon}>
+            <DropdownMenu id="test-menu" icon={IconTypes.CHEVRON_RIGHT}>
                 <MenuItem>Item 1</MenuItem>
                 <MenuItem>Item 2</MenuItem>
             </DropdownMenu>
@@ -29,13 +30,13 @@ describe("<DropdownMenu />", () => {
     });
 
     it("opens on menu icon click", () => {
-        const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={ChevronRightIcon} />);
+        const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={IconTypes.CHEVRON_RIGHT} />);
         dropdownMenu.find(IconButton).simulate("click", {currentTarget: {}});
         expect(dropdownMenu.state().anchorEl).toBeDefined();
     });
     
     it("closes on menu click", () => {
-        const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={ChevronRightIcon} />);
+        const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={IconTypes.CHEVRON_RIGHT} />);
         dropdownMenu.find(Menu).simulate("click", {currentTarget: {}});
         expect(dropdownMenu.state().anchorEl).toBeUndefined();
     });
diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx
index fe285fa..af9e551 100644
--- a/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/src/components/dropdown-menu/dropdown-menu.tsx
@@ -11,7 +11,6 @@ import IconBase, { IconTypes } from '../icon/icon';
 interface DropdownMenuProps {
     id: string;
     icon: IconTypes;
-    // icon: React.ComponentType;
 }
 
 class DropdownMenu extends React.Component<DropdownMenuProps> {
@@ -34,9 +33,7 @@ class DropdownMenu extends React.Component<DropdownMenuProps> {
                     aria-owns={anchorEl ? id : undefined}
                     aria-haspopup="true"
                     color="inherit"
-                    onClick={this.handleOpen}
-
-                >
+                    onClick={this.handleOpen}>
                     <IconBase icon={icon} />
                 </IconButton>
                 <Menu
diff --git a/src/store/side-panel/side-panel-reducer.test.ts b/src/store/side-panel/side-panel-reducer.test.ts
index dc31e89..21c10cc 100644
--- a/src/store/side-panel/side-panel-reducer.test.ts
+++ b/src/store/side-panel/side-panel-reducer.test.ts
@@ -22,7 +22,7 @@ describe('side-panel-reducer', () => {
             {
                 id: "1",
                 name: "Projects",
-                icon: IconTypes.FOLDER,
+                icon: IconTypes.INBOX,
                 open: false,
                 active: true,
             }
@@ -46,7 +46,7 @@ describe('side-panel-reducer', () => {
             {
                 id: "1",
                 name: "Projects",
-                icon: IconTypes.FOLDER,
+                icon: IconTypes.INBOX,
                 open: true,
                 active: false,
             }
@@ -70,7 +70,7 @@ describe('side-panel-reducer', () => {
             {
                 id: "1",
                 name: "Projects",
-                icon: IconTypes.FOLDER,
+                icon: IconTypes.INBOX,
                 open: false,
                 active: false,
             }

-----------------------------------------------------------------------


hooks/post-receive
--