[ARVADOS-WORKBENCH2] updated: 1.1.4-293-gb323a94
Git user
git at public.curoverse.com
Fri Jul 13 06:37:40 EDT 2018
Summary of changes:
src/common/actions.ts | 3 -
src/common/api/common-resource-service.ts | 13 +--
src/common/api/filter-builder.ts | 2 +-
src/common/api/order-builder.ts | 2 +-
src/common/labels.ts | 18 ++++
src/components/attribute/attribute.tsx | 11 +--
.../data-explorer/data-explorer.test.tsx | 11 ++-
src/components/data-explorer/data-explorer.tsx | 8 +-
src/components/data-table/data-table.test.tsx | 49 +++++------
src/components/data-table/data-table.tsx | 11 ++-
.../details-panel-factory.tsx | 5 +-
.../details-panel-factory/items/abstract-item.tsx | 9 +-
.../items/collection-item.tsx | 27 +++---
.../details-panel-factory/items/empty-item.tsx | 8 +-
.../details-panel-factory/items/process-item.tsx | 41 ++++-----
.../details-panel-factory/items/project-item.tsx | 26 +++---
src/components/tree/tree.test.tsx | 64 +++++++--------
src/index.tsx | 12 +++
src/models/collection.ts | 7 +-
src/models/container-request.ts | 3 +-
src/models/empty.ts | 2 +-
src/models/group.ts | 3 +-
src/models/kinds.ts | 12 ---
src/models/project.ts | 4 -
src/models/resource.ts | 34 +++-----
src/models/test-utils.ts | 44 ++++++++++
src/models/workflow.ts | 3 +-
.../collection-service/collection-service.ts | 54 ------------
src/services/groups-service/groups-service.ts | 2 +-
src/services/response.ts | 11 ---
src/services/services.ts | 2 -
src/store/collection/collection-action.ts | 29 -------
src/store/collection/collection-reducer.test.ts | 42 ----------
src/store/collection/collection-reducer.ts | 25 ------
src/store/context-menu/context-menu-actions.ts | 15 ++++
src/store/context-menu/context-menu-reducer.ts | 32 ++++++++
src/store/data-explorer/data-explorer-action.ts | 4 +-
src/store/details-panel/details-panel-action.ts | 5 +-
src/store/details-panel/details-panel-reducer.ts | 2 +-
src/store/navigation/navigation-action.ts | 18 ++--
src/store/project/project-action.ts | 12 +--
src/store/project/project-reducer.test.ts | 81 +++---------------
src/store/project/project-reducer.ts | 8 +-
src/store/store.ts | 3 -
.../data-explorer/data-explorer.tsx | 2 +-
.../details-panel/details-panel.tsx | 9 +-
.../main-app-bar/main-app-bar.test.tsx | 4 +
.../project-tree/project-tree.test.tsx | 96 ++++++++--------------
src/views-components/project-tree/project-tree.tsx | 8 +-
src/views/project-panel/project-panel-item.ts | 6 +-
src/views/project-panel/project-panel.tsx | 33 +++-----
src/views/workbench/workbench.tsx | 6 +-
52 files changed, 361 insertions(+), 580 deletions(-)
delete mode 100644 src/common/actions.ts
create mode 100644 src/common/labels.ts
delete mode 100644 src/models/kinds.ts
create mode 100644 src/models/test-utils.ts
delete mode 100644 src/services/collection-service/collection-service.ts
delete mode 100644 src/services/response.ts
delete mode 100644 src/store/collection/collection-action.ts
delete mode 100644 src/store/collection/collection-reducer.test.ts
delete mode 100644 src/store/collection/collection-reducer.ts
create mode 100644 src/store/context-menu/context-menu-actions.ts
create mode 100644 src/store/context-menu/context-menu-reducer.ts
via b323a94f313671b44a066a2f91dea562e9464d10 (commit)
via 18a8117437056f65e3c9d84b0231c5f64b1346d1 (commit)
via a886877017be6744b38d84d52503d21892704139 (commit)
via a2a93caf3e8c78fc93d47eec249086e26124a0be (commit)
via c85c82198aad38669c509db09f7efc133196eb00 (commit)
via 99baf25913557ccaa4503dd7a7891f33e009e4ac (commit)
via 17bc9c945982acb47f40499a541f4451c3413d0d (commit)
via 975f9b6c2e0f6d5988c01d7dbe6e2a6214d54de6 (commit)
via a19a2cd08f80d39455d245156617a87d72bed3ec (commit)
via 960e872ff250bc89950f33540806ea24bc4819bc (commit)
via 0be34acc576c9552f4c669062defe51c36888866 (commit)
via 0ce21e3487078a53f1b653446b5e615cd6dda709 (commit)
from 5be1434f78d6dbcf2949918f7f042cab994ab0c5 (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 b323a94f313671b44a066a2f91dea562e9464d10
Merge: 5be1434 18a8117
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Jul 13 12:37:30 2018 +0200
merge-conflicts
Feature #13796
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/views-components/main-app-bar/main-app-bar.test.tsx
index 46c281c,f58b26a..ac744b9
--- a/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/workbench/workbench.tsx
index 53392dd,6972b2f..c9b5b67
--- a/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[];
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list