interface ProjectExplorerProps {
items: ProjectExplorerItem[];
onRowClick: (item: ProjectExplorerItem) => void;
+ onToggleSort: (toggledColumn: DataColumn<ProjectExplorerItem>) => void;
}
interface ProjectExplorerState {
columns: [{
name: "Name",
selected: true,
- sortDirection: "asc",
+ sortDirection: "desc",
render: renderName,
width: "450px"
}, {
}, {
name: "File size",
selected: true,
- sortDirection: "none",
render: item => renderFileSize(item.fileSize),
width: "50px"
}, {
name: "Last modified",
selected: true,
+ sortDirection: "none",
render: item => renderDate(item.lastModified),
width: "150px"
}]
});
}
- toggleSort = (toggledColumn: DataColumn<ProjectExplorerItem>) => {
- this.setState({
- columns: this.state.columns.map(column =>
- column.name === toggledColumn.name
- ? toggleSortDirection(column)
- : resetSortDirection(column)
- )
- });
+ toggleSort = (column: DataColumn<ProjectExplorerItem>) => {
+ const columns = this.state.columns.map(c =>
+ c.name === column.name
+ ? toggleSortDirection(c)
+ : resetSortDirection(c)
+ );
+ this.setState({ columns });
+ const toggledColumn = columns.find(c => c.name === column.name);
+ if (toggledColumn) {
+ this.props.onToggleSort(toggledColumn);
+ }
}
changeFilters = (filters: DataTableFilterItem[], updatedColumn: DataColumn<ProjectExplorerItem>) => {
const renderIcon = (item: ProjectExplorerItem) => {
switch (item.kind) {
case ResourceKind.LEVEL_UP:
- return <i className="icon-level-up" style={{fontSize: "1rem"}}/>;
+ return <i className="icon-level-up" style={{ fontSize: "1rem" }} />;
case ResourceKind.PROJECT:
- return <i className="fas fa-folder fa-lg"/>;
+ return <i className="fas fa-folder fa-lg" />;
case ResourceKind.COLLECTION:
- return <i className="fas fa-th fa-lg"/>;
+ return <i className="fas fa-th fa-lg" />;
default:
return <i />;
}
import { projectExplorerItems } from "./project-panel-selectors";
import { ProjectExplorerItem } from "../../views-components/project-explorer/project-explorer-item";
import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { DataColumn, SortDirection } from '../../components/data-table/data-column';
interface ProjectPanelDataProps {
projects: ProjectState;
type ProjectPanelProps = ProjectPanelDataProps & RouteComponentProps<{ name: string }> & DispatchProp;
-class ProjectPanel extends React.Component<ProjectPanelProps & WithStyles<CssRules>> {
+interface ProjectPanelState {
+ sort: {
+ columnName: string;
+ direction: SortDirection;
+ };
+}
+
+class ProjectPanel extends React.Component<ProjectPanelProps & WithStyles<CssRules>, ProjectPanelState> {
+ state: ProjectPanelState = {
+ sort: {
+ columnName: "Name",
+ direction: "desc"
+ }
+ };
+
render() {
const items = projectExplorerItems(
this.props.projects.items,
this.props.projects.currentItemId,
this.props.collections
);
+ const [goBackItem, ...otherItems] = items;
+ const sortedItems = sortItems(this.state.sort, otherItems);
return (
<div>
<div className={this.props.classes.toolbar}>
</Button>
</div>
<ProjectExplorer
- items={items}
+ items={goBackItem ? [goBackItem, ...sortedItems] : sortedItems }
onRowClick={this.goToItem}
+ onToggleSort={this.toggleSort}
/>
</div>
);
goToItem = (item: ProjectExplorerItem) => {
this.props.dispatch<any>(setProjectItem(this.props.projects.items, item.uuid, item.kind, ItemMode.BOTH));
}
+
+ toggleSort = (column: DataColumn<ProjectExplorerItem>) => {
+ this.setState({sort: {
+ columnName: column.name,
+ direction: column.sortDirection || "none"
+ }});
+ }
}
+const sortItems = (sort: {columnName: string, direction: SortDirection}, items: ProjectExplorerItem[]) => {
+ const sortedItems = items.slice(0);
+ const direction = sort.direction === "asc" ? -1 : 1;
+ sortedItems.sort((a, b) => {
+ if(sort.columnName === "Last modified") {
+ return ((new Date(a.lastModified)).getTime() - (new Date(b.lastModified)).getTime()) * direction;
+ } else {
+ return a.name.localeCompare(b.name) * direction;
+ }
+ });
+ return sortedItems;
+};
+
type CssRules = "toolbar" | "button";
const styles: StyleRulesCallback<CssRules> = theme => ({