merge-commit

Feature #13694

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

diff --cc src/components/side-panel/side-panel.tsx
Simple merge

diff --cc src/views/project-panel/project-panel.tsx
index 3d7d89492c0a87e978f12d37d40b8ecc05985554,c1d66603405d9de7774c0aaca8056fd3f8e855bf..099263d9599f44616ccc4301ee349d142352b109
--- 1/src/views/project-panel/project-panel.tsx
--- 2/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@@ -7,16 -7,15 +7,16 @@@ import { ProjectPanelItem } from './pro
  import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
  import { formatDate, formatFileSize } from '../../common/formatters';
  import DataExplorer from "../../views-components/data-explorer/data-explorer";
- import { DataColumn, toggleSortDirection } from '../../components/data-table/data-column';
- import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
  import { ContextMenuAction } from '../../components/context-menu/context-menu';
  import { DispatchProp, connect } from 'react-redux';
- import actions from "../../store/data-explorer/data-explorer-action";
  import { DataColumns } from '../../components/data-table/data-table';
- import { ResourceKind } from "../../models/resource";
  import { RouteComponentProps } from 'react-router';
  import { RootState } from '../../store/store';
+ import { ResourceKind } from '../../models/kinds';
+ import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
+ import { ContainerRequestState } from '../../models/container-request';
+ import { SortDirection } from '../../components/data-table/data-column';
 +import DialogProjectCreate from '../../components/dialog-create/dialog-project-create';
  
  export const PROJECT_PANEL_ID = "projectPanel";
  
@@@ -45,10 -41,9 +49,10 @@@ class ProjectPanel extends React.Compon
                  <Button color="primary" variant="raised" className={this.props.classes.button}>
                      Run a process
                  </Button>
 -                <Button color="primary" variant="raised" className={this.props.classes.button}>
 -                    Create a project
 +                <Button color="primary" onClick={this.props.handleCreationDialogOpen} variant="raised" className={this.props.classes.button}>
-                     Create a project
++                    New project
                  </Button>
 +                <DialogProjectCreate open={this.props.isCreationDialogOpen} handleClose={this.props.handleCreationDialogClose}/>
              </div>
              <DataExplorer
                  id={PROJECT_PANEL_ID}

diff --cc src/views/workbench/workbench.tsx
Simple merge