import { ContextMenuAction } from '../../components/context-menu/context-menu';
import { DispatchProp, connect } from 'react-redux';
import actions from "../../store/data-explorer/data-explorer-action";
-import { setProjectItem, ItemMode } from "../../store/navigation/navigation-action";
import { DataColumns } from '../../components/data-table/data-table';
import { ResourceKind } from "../../models/resource";
import { RouteComponentProps } from 'react-router';
+import { RootState } from '../../store/store';
export const PROJECT_PANEL_ID = "projectPanel";
-type ProjectPanelProps = { onItemClick: (item: ProjectPanelItem) => void }
+type ProjectPanelProps = {
+ currentItemId: string,
+ onItemClick: (item: ProjectPanelItem) => void,
+ onItemRouteChange: (itemId: string) => void
+}
& DispatchProp
- & WithStyles<CssRules>;
+ & WithStyles<CssRules>
+ & RouteComponentProps<{ id: string }>;
class ProjectPanel extends React.Component<ProjectPanelProps> {
render() {
return <div>
this.props.dispatch(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
}
+ componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) {
+ if (match.params.id !== currentItemId) {
+ this.props.onItemRouteChange(match.params.id);
+ }
+ }
+
toggleColumn = (toggledColumn: DataColumn<ProjectPanelItem>) => {
this.props.dispatch(actions.TOGGLE_COLUMN({ id: PROJECT_PANEL_ID, columnName: toggledColumn.name }));
}
changeRowsPerPage = (rowsPerPage: number) => {
this.props.dispatch(actions.SET_ROWS_PER_PAGE({ id: PROJECT_PANEL_ID, rowsPerPage }));
}
+
}
type CssRules = "toolbar" | "button";
}
]];
-export default withStyles(styles)(connect()(ProjectPanel));
+export default withStyles(styles)(
+ connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(
+ ProjectPanel));
import { StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core/styles';
import Drawer from '@material-ui/core/Drawer';
import { connect, DispatchProp } from "react-redux";
-import { Route, Switch, RouteComponentProps } from "react-router";
+import { Route, Switch, RouteComponentProps, withRouter } from "react-router";
import authActions from "../../store/auth/auth-action";
import dataExplorerActions from "../../store/data-explorer/data-explorer-action";
import { User } from "../../models/user";
import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action";
import projectActions from "../../store/project/project-action";
import ProjectPanel from "../project-panel/project-panel";
+import { sidePanelData } from '../../store/side-panel/side-panel-reducer';
const drawerWidth = 240;
const appBarHeight = 102;
sidePanelItems={this.props.sidePanelItems}>
<ProjectTree
projects={this.props.projects}
- toggleOpen={itemId =>
- this.props.dispatch<any>(
- setProjectItem(itemId, ItemMode.OPEN)
- )}
- toggleActive={itemId =>
- this.props.dispatch<any>(
- setProjectItem(itemId, ItemMode.ACTIVE)
- )}
+ toggleOpen={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.OPEN))}
+ toggleActive={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE))}
/>
</SidePanel>
</Drawer>}
);
}
- renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => {
- if (props.match.params.id !== this.props.currentProjectId) {
- this.props.dispatch<any>(
- setProjectItem(props.match.params.id, ItemMode.ACTIVE)
- );
- }
- return <ProjectPanel
- onItemClick={item => this.props.dispatch<any>(
- setProjectItem(item.uuid, ItemMode.ACTIVE)
- )} />;
+ renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => <ProjectPanel
+ onItemRouteChange={this.handleItemRouteChange}
+ onItemClick={item => this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE))}
+ {...props} />
+
+ handleItemRouteChange = (itemId: string) => {
+ this.props.dispatch<any>(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY());
+ this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_OPEN(sidePanelData[0].id));
+ this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE));
}
}