// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { IconButton, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { IconButton, StyleRulesCallback, WithStyles, withStyles, Tooltip } from '@material-ui/core';
import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
import { connect, DispatchProp } from 'react-redux';
import { DataColumns } from '~/components/data-table/data-table';
import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
import { SortDirection } from '~/components/data-table/data-column';
import { ResourceKind, TrashableResource } from '~/models/resource';
-import { resourceLabel } from '~/common/labels';
import { ArvadosTheme } from '~/common/custom-theme';
import { RestoreFromTrashIcon, TrashIcon } from '~/components/icon/icon';
import { TRASH_PANEL_ID } from "~/store/trash-panel/trash-panel-action";
} from "~/views-components/data-explorer/renderers";
import { navigateTo } from "~/store/navigation/navigation-action";
import { loadDetailsPanel } from "~/store/details-panel/details-panel-action";
-import { toggleCollectionTrashed, toggleProjectTrashed, toggleTrashed } from "~/store/trash/trash-actions";
+import { toggleTrashed } from "~/store/trash/trash-actions";
import { ContextMenuKind } from "~/views-components/context-menu/context-menu";
import { Dispatch } from "redux";
+import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
+import { createTree } from '~/models/tree';
+import {
+ getInitialResourceTypeFilters,
+ getTrashPanelTypeFilters
+} from '~/store/resource-type-filters/resource-type-filters';
type CssRules = "toolbar" | "button";
const resource = getResource<TrashableResource>(props.uuid)(state.resources);
return { resource, dispatch: props.dispatch };
})((props: { resource?: TrashableResource, dispatch?: Dispatch<any> }) =>
- <IconButton onClick={() => {
- if (props.resource && props.dispatch) {
- props.dispatch(toggleTrashed(
- props.resource.kind,
- props.resource.uuid,
- props.resource.ownerUuid,
- props.resource.isTrashed
- ));
- }
- }}>
- <RestoreFromTrashIcon/>
- </IconButton>
+ <Tooltip title="Restore">
+ <IconButton style={{ padding: '0' }} onClick={() => {
+ if (props.resource && props.dispatch) {
+ props.dispatch(toggleTrashed(
+ props.resource.kind,
+ props.resource.uuid,
+ props.resource.ownerUuid,
+ props.resource.isTrashed
+ ));
+ }}}
+ >
+ <RestoreFromTrashIcon />
+ </IconButton>
+ </Tooltip>
);
-export const trashPanelColumns: DataColumns<string, TrashPanelFilter> = [
+export const trashPanelColumns: DataColumns<string> = [
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.ASC,
- filters: [],
- render: uuid => <ResourceName uuid={uuid}/>,
- width: "450px"
+ sortDirection: SortDirection.NONE,
+ filters: createTree(),
+ render: uuid => <ResourceName uuid={uuid} />
},
{
name: TrashPanelColumnNames.TYPE,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters: [
- {
- name: resourceLabel(ResourceKind.COLLECTION),
- selected: true,
- type: ResourceKind.COLLECTION
- },
- {
- name: resourceLabel(ResourceKind.PROCESS),
- selected: true,
- type: ResourceKind.PROCESS
- },
- {
- name: resourceLabel(ResourceKind.PROJECT),
- selected: true,
- type: ResourceKind.PROJECT
- }
- ],
- render: uuid => <ResourceType uuid={uuid}/>,
- width: "125px"
+ filters: getTrashPanelTypeFilters(),
+ render: uuid => <ResourceType uuid={uuid} />,
},
{
name: TrashPanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters: [],
- render: uuid => <ResourceFileSize uuid={uuid} />,
- width: "50px"
+ filters: createTree(),
+ render: uuid => <ResourceFileSize uuid={uuid} />
},
{
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
- filters: [],
- render: uuid => <ResourceTrashDate uuid={uuid} />,
- width: "50px"
+ sortDirection: SortDirection.DESC,
+ filters: createTree(),
+ render: uuid => <ResourceTrashDate uuid={uuid} />
},
{
name: TrashPanelColumnNames.TO_BE_DELETED,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters: [],
- render: uuid => <ResourceDeleteDate uuid={uuid} />,
- width: "50px"
+ filters: createTree(),
+ render: uuid => <ResourceDeleteDate uuid={uuid} />
},
{
name: '',
selected: true,
configurable: false,
sortDirection: SortDirection.NONE,
- filters: [],
- render: uuid => <ResourceRestore uuid={uuid}/>,
- width: "50px"
+ filters: createTree(),
+ render: uuid => <ResourceRestore uuid={uuid} />
}
];
onRowClick={this.handleRowClick}
onRowDoubleClick={this.handleRowDoubleClick}
onContextMenu={this.handleContextMenu}
- defaultIcon={TrashIcon}
- defaultMessages={['Your trash list is empty.']}
- contextMenuColumn={false}/>
- ;
+ contextMenuColumn={false}
+ dataTableDefaultView={
+ <DataTableDefaultView
+ icon={TrashIcon}
+ messages={['Your trash list is empty.']}/>
+ } />;
}
handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
menuKind: ContextMenuKind.TRASH
}));
}
+ this.props.dispatch<any>(loadDetailsPanel(resourceUuid));
}
handleRowDoubleClick = (uuid: string) => {