//
// SPDX-License-Identifier: AGPL-3.0
-import projectsReducer from "./project-reducer";
+import projectsReducer, { findTreeBranch } from "./project-reducer";
import actions from "./project-action";
- import { TreeItem } from "../../components/tree/tree";
++import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
describe('project-reducer', () => {
it('should add new project to the list', () => {
createdAt: '2018-01-01',
modifiedAt: '2018-01-01',
ownerUuid: 'owner-test123',
- uuid: 'test123'
+ uuid: 'test123',
+ kind: ""
};
const state = projectsReducer(initialState, actions.CREATE_PROJECT(project));
createdAt: '2018-01-01',
modifiedAt: '2018-01-01',
ownerUuid: 'owner-test123',
- uuid: 'test123'
+ uuid: 'test123',
+ kind: ""
};
const projects = [project, project];
- const state = projectsReducer(initialState, actions.PROJECTS_SUCCESS({projects, parentItemId: undefined}));
+ const state = projectsReducer(initialState, actions.PROJECTS_SUCCESS({ projects, parentItemId: undefined }));
expect(state).toEqual([{
- active: false,
- open: false,
- id: "test123",
- items: [],
- data: project
- }, {
- active: false,
- open: false,
- id: "test123",
- items: [],
- data: project
- }
+ active: false,
+ open: false,
+ id: "test123",
+ items: [],
+ data: project,
+ status: 0
+ }, {
+ active: false,
+ open: false,
+ id: "test123",
+ items: [],
+ data: project,
+ status: 0
+ }
]);
});
});
+
+describe("findTreeBranch", () => {
+
+ const createTreeItem = (id: string, items?: Array<TreeItem<string>>): TreeItem<string> => ({
+ id,
+ items,
+ active: false,
+ data: "",
+ open: false,
++ status: TreeItemStatus.Initial
+ });
+
+ it("should return an array that matches path to the given item", () => {
+ const tree: Array<TreeItem<string>> = [
+ createTreeItem("1", [
+ createTreeItem("1.1", [
+ createTreeItem("1.1.1"),
+ createTreeItem("1.1.2")
+ ])
+ ]),
+ createTreeItem("2", [
+ createTreeItem("2.1", [
+ createTreeItem("2.1.1"),
+ createTreeItem("2.1.2")
+ ])
+ ])
+ ];
+ const branch = findTreeBranch(tree, "2.1.1");
+ expect(branch.map(item => item.id)).toEqual(["2", "2.1", "2.1.1"]);
+ });
+
+ it("should return empty array if item is not found", () => {
+ const tree: Array<TreeItem<string>> = [
+ createTreeItem("1", [
+ createTreeItem("1.1", [
+ createTreeItem("1.1.1"),
+ createTreeItem("1.1.2")
+ ])
+ ]),
+ createTreeItem("2", [
+ createTreeItem("2.1", [
+ createTreeItem("2.1.1"),
+ createTreeItem("2.1.2")
+ ])
+ ])
+ ];
+ expect(findTreeBranch(tree, "3")).toHaveLength(0);
+ });
+
+});
import { Project } from "../../models/project";
import actions, { ProjectAction } from "./project-action";
- import { TreeItem } from "../../components/tree/tree";
+ import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
import * as _ from "lodash";
export type ProjectState = Array<TreeItem<Project>>;
- function findTreeItem<T>(tree: Array<TreeItem<T>>, itemId: string): TreeItem<T> | undefined {
+ export function findTreeItem<T>(tree: Array<TreeItem<T>>, itemId: string): TreeItem<T> | undefined {
let item;
for (const t of tree) {
item = t.id === itemId
return item;
}
+export function findTreeBranch<T>(tree: Array<TreeItem<T>>, itemId: string): Array<TreeItem<T>> {
+ for(const item of tree){
+ if(item.id === itemId){
+ return [item];
+ } else {
+ const branch = findTreeBranch(item.items || [], itemId);
+ if(branch.length > 0){
+ return [item, ...branch];
+ }
+ }
+ }
+ return [];
+}
+
function resetTreeActivity<T>(tree: Array<TreeItem<T>>) {
for (const t of tree) {
t.active = false;
let treeItem;
if (parentItemId) {
treeItem = findTreeItem(tree, parentItemId);
+ if (treeItem) {
+ treeItem.status = TreeItemStatus.Loaded;
+ }
}
const items = projects.map((p, idx) => ({
id: p.uuid,
open: false,
active: false,
+ status: TreeItemStatus.Initial,
data: p,
items: []
} as TreeItem<Project>));
return items;
}
-
const projectsReducer = (state: ProjectState = [], action: ProjectAction) => {
return actions.match(action, {
CREATE_PROJECT: project => [...state, project],
REMOVE_PROJECT: () => state,
- PROJECTS_REQUEST: () => state,
+ PROJECTS_REQUEST: itemId => {
+ const tree = _.cloneDeep(state);
+ const item = findTreeItem(tree, itemId);
+ if (item) {
+ item.status = TreeItemStatus.Pending;
+ }
+ return tree;
+ },
PROJECTS_SUCCESS: ({ projects, parentItemId }) => {
return updateProjectTree(state, projects, parentItemId);
},
if (item) {
item.open = !item.open;
item.active = true;
+ item.toggled = true;
}
return tree;
},
import { StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core/styles';
import Drawer from '@material-ui/core/Drawer';
- import AppBar from '@material-ui/core/AppBar';
- import Toolbar from '@material-ui/core/Toolbar';
- import Typography from '@material-ui/core/Typography';
import { connect, DispatchProp } from "react-redux";
- import ProjectList from "../../components/project-list/project-list";
import { Route, Switch } from "react-router";
- import { Link } from "react-router-dom";
- import Button from "@material-ui/core/Button/Button";
import authActions from "../../store/auth/auth-action";
- import IconButton from "@material-ui/core/IconButton/IconButton";
- import Menu from "@material-ui/core/Menu/Menu";
- import MenuItem from "@material-ui/core/MenuItem/MenuItem";
- import { AccountCircle } from "@material-ui/icons";
import { User } from "../../models/user";
- import Grid from "@material-ui/core/Grid/Grid";
import { RootState } from "../../store/store";
- import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItems, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar';
+ import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar';
import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs';
import { push } from 'react-router-redux';
import projectActions from "../../store/project/project-action";
import ProjectTree from '../../components/project-tree/project-tree';
- import { TreeItem } from "../../components/tree/tree";
+ import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
import { Project } from "../../models/project";
import { projectService } from '../../services/services';
+import { findTreeBranch } from '../../store/project/project-reducer';
+ import DataExplorer from '../data-explorer/data-explorer';
const drawerWidth = 240;
type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles<CssRules>;
interface NavBreadcrumb extends Breadcrumb {
- path: string;
+ itemId: string;
++ status: TreeItemStatus;
}
interface NavMenuItem extends MainAppBarMenuItem {
state = {
anchorEl: null,
searchText: "",
- breadcrumbs: [
- {
- label: "Projects",
- path: "/projects"
- }, {
- label: "Project 1",
- path: "/projects/project-1"
- }
- ],
+ breadcrumbs: [],
menuItems: {
accountMenu: [
{
mainAppBarActions: MainAppBarActionProps = {
- onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => {
- this.toggleProjectTreeItem(itemId);
- onBreadcrumbClick: (breadcrumb: NavBreadcrumb) => this.props.dispatch(push(breadcrumb.path)),
++ onBreadcrumbClick: ({ itemId, status }: NavBreadcrumb) => {
++ this.toggleProjectTreeItem(itemId, status);
+ },
onSearch: searchText => {
this.setState({ searchText });
this.props.dispatch(push(`/search?q=${searchText}`));
onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action()
};
- toggleProjectTreeItem = (itemId: string) => {
+ toggleProjectTreeItem = (itemId: string, status: TreeItemStatus) => {
+ if (status === TreeItemStatus.Loaded) {
+ this.openProjectItem(itemId);
+ } else {
+ this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => this.openProjectItem(itemId));
+ }
+ }
+
+ openProjectItem = (itemId: string) => {
+ const branch = findTreeBranch(this.props.projects, itemId);
+ this.setState({
+ breadcrumbs: branch.map(item => ({
+ label: item.data.name,
- itemId: item.data.uuid
++ itemId: item.data.uuid,
++ status: item.status
+ }))
+ });
- this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => {
- this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
- });
+ this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
+ this.props.dispatch(push(`/project/${itemId}`));
}
render() {
<div className={classes.toolbar} />
<div className={classes.toolbar} />
<Switch>
- <Route path="/project/:name" component={ProjectList} />
+ <Route path="/project/:name" component={DataExplorer} />
</Switch>
</main>
</div>
projects / arvados-workbench2.git / commitdiff