merge-conflicts

Feature #13796

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

diff --cc src/views-components/main-app-bar/main-app-bar.test.tsx
index 46c281cb3c95da92a0e80907dc750ca4d0d43220,f58b26a0f1c27c0415844f852511a868c581cc8d..ac744b9e63d6f37b5809645b543fc63955a6b539
--- 1/src/views-components/main-app-bar/main-app-bar.test.tsx
--- 2/src/views-components/main-app-bar/main-app-bar.test.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.test.tsx
@@@ -28,8 -28,8 +28,9 @@@ describe("<MainAppBar />", () => 
          const mainAppBar = mount(
              <MainAppBar
                  user={user}
 +                onContextMenu={jest.fn()}
                  onDetailsPanelToggle={jest.fn()}
+                 onContextMenu={jest.fn()}
                  {...{ searchText: "", breadcrumbs: [], menuItems: { accountMenu: [], helpMenu: [], anonymousMenu: [] }, onSearch: jest.fn(), onBreadcrumbClick: jest.fn(), onMenuItemClick: jest.fn() }}
              />
          );
@@@ -60,8 -60,8 +61,9 @@@
              <MainAppBar
                  searchText="search text"
                  searchDebounce={2000}
 +                onContextMenu={jest.fn()}
                  onSearch={onSearch}
+                 onContextMenu={jest.fn()}
                  onDetailsPanelToggle={jest.fn()}
                  {...{ user, breadcrumbs: [], menuItems: { accountMenu: [], helpMenu: [], anonymousMenu: [] }, onBreadcrumbClick: jest.fn(), onMenuItemClick: jest.fn() }}
              />
@@@ -79,8 -79,8 +81,9 @@@
          const mainAppBar = mount(
              <MainAppBar
                  breadcrumbs={items}
 +                onContextMenu={jest.fn()}
                  onBreadcrumbClick={onBreadcrumbClick}
+                 onContextMenu={jest.fn()}
                  onDetailsPanelToggle={jest.fn()}
                  {...{ user, searchText: "", menuItems: { accountMenu: [], helpMenu: [], anonymousMenu: [] }, onSearch: jest.fn(), onMenuItemClick: jest.fn() }}
              />
@@@ -97,8 -97,8 +100,9 @@@
          const mainAppBar = mount(
              <MainAppBar
                  menuItems={menuItems}
 +                onContextMenu={jest.fn()}
                  onMenuItemClick={onMenuItemClick}
+                 onContextMenu={jest.fn()}
                  onDetailsPanelToggle={jest.fn()}
                  {...{ user, searchText: "", breadcrumbs: [], onSearch: jest.fn(), onBreadcrumbClick: jest.fn() }}
              />

diff --cc src/views/project-panel/project-panel.tsx
Simple merge

diff --cc src/views/workbench/workbench.tsx
index 53392dd9192f137af8496437cccc91c67a62feb1,6972b2f8acb92ec7e0b4a257fa05799895bf437d..c9b5b6718bbb2edfa41f30027019737acbf0f3b0
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -33,11 -32,53 +32,12 @@@ import CreateProjectDialog from "../../
  import { authService } from '../../services/services';
  
  import detailsPanelActions, { loadDetails } from "../../store/details-panel/details-panel-action";
- import { ResourceKind } from '../../models/kinds';
  import { SidePanelIdentifiers } from '../../store/side-panel/side-panel-reducer';
+ import { ProjectResource } from '../../models/project';
+ import { ResourceKind } from '../../models/resource';
  
 -const drawerWidth = 240;
 -const appBarHeight = 100;
 -
 -type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar';
 -
 -const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 -    root: {
 -        flexGrow: 1,
 -        zIndex: 1,
 -        overflow: 'hidden',
 -        position: 'relative',
 -        display: 'flex',
 -        width: '100vw',
 -        height: '100vh'
 -    },
 -    appBar: {
 -        zIndex: theme.zIndex.drawer + 1,
 -        position: "absolute",
 -        width: "100%"
 -    },
 -    drawerPaper: {
 -        position: 'relative',
 -        width: drawerWidth,
 -        display: 'flex',
 -        flexDirection: 'column',
 -    },
 -    contentWrapper: {
 -        backgroundColor: theme.palette.background.default,
 -        display: "flex",
 -        flexGrow: 1,
 -        minWidth: 0,
 -        paddingTop: appBarHeight
 -    },
 -    content: {
 -        padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`,
 -        overflowY: "auto",
 -        flexGrow: 1
 -    },
 -    toolbar: theme.mixins.toolbar
 -});
 -
  interface WorkbenchDataProps {
-     projects: Array<TreeItem<Project>>;
+     projects: Array<TreeItem<ProjectResource>>;
      currentProjectId: string;
      user?: User;
      sidePanelItems: SidePanelItem[];