projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15230-fed-collection-crash' refs #15230
[arvados-workbench2.git]
/
src
/
views
/
trash-panel
/
trash-panel.tsx
diff --git
a/src/views/trash-panel/trash-panel.tsx
b/src/views/trash-panel/trash-panel.tsx
index 4d5df5cdbc3a304ca9573f8bb56a92e612d91bba..18df96182d636c172370b76baef9a93d973a90d9 100644
(file)
--- a/
src/views/trash-panel/trash-panel.tsx
+++ b/
src/views/trash-panel/trash-panel.tsx
@@
-11,7
+11,6
@@
import { RootState } from '~/store/store';
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 { 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";
import { ArvadosTheme } from '~/common/custom-theme';
import { RestoreFromTrashIcon, TrashIcon } from '~/components/icon/icon';
import { TRASH_PANEL_ID } from "~/store/trash-panel/trash-panel-action";
@@
-31,8
+30,12
@@
import { loadDetailsPanel } from "~/store/details-panel/details-panel-action";
import { toggleTrashed } from "~/store/trash/trash-actions";
import { ContextMenuKind } from "~/views-components/context-menu/context-menu";
import { Dispatch } from "redux";
import { toggleTrashed } from "~/store/trash/trash-actions";
import { ContextMenuKind } from "~/views-components/context-menu/context-menu";
import { Dispatch } from "redux";
-import { PanelDefaultView } from '~/components/panel-default-view/panel-default-view';
import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
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";
type CssRules = "toolbar" | "button";
@@
-64,7
+67,7
@@
export const ResourceRestore =
return { resource, dispatch: props.dispatch };
})((props: { resource?: TrashableResource, dispatch?: Dispatch<any> }) =>
<Tooltip title="Restore">
return { resource, dispatch: props.dispatch };
})((props: { resource?: TrashableResource, dispatch?: Dispatch<any> }) =>
<Tooltip title="Restore">
- <IconButton onClick={() => {
+ <IconButton
style={{ padding: '0' }}
onClick={() => {
if (props.resource && props.dispatch) {
props.dispatch(toggleTrashed(
props.resource.kind,
if (props.resource && props.dispatch) {
props.dispatch(toggleTrashed(
props.resource.kind,
@@
-72,20
+75,20
@@
export const ResourceRestore =
props.resource.ownerUuid,
props.resource.isTrashed
));
props.resource.ownerUuid,
props.resource.isTrashed
));
- }
-
}}
>
+ }
}}
+ >
<RestoreFromTrashIcon />
</IconButton>
</Tooltip>
);
<RestoreFromTrashIcon />
</IconButton>
</Tooltip>
);
-export const trashPanelColumns: DataColumns<string
, TrashPanelFilter
> = [
+export const trashPanelColumns: DataColumns<string> = [
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.
ASC
,
- filters:
[]
,
+ sortDirection: SortDirection.
NONE
,
+ filters:
createTree()
,
render: uuid => <ResourceName uuid={uuid} />
},
{
render: uuid => <ResourceName uuid={uuid} />
},
{
@@
-93,18
+96,7
@@
export const trashPanelColumns: DataColumns<string, TrashPanelFilter> = [
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters: [
- {
- name: resourceLabel(ResourceKind.COLLECTION),
- selected: true,
- type: ResourceKind.COLLECTION
- },
- {
- name: resourceLabel(ResourceKind.PROJECT),
- selected: true,
- type: ResourceKind.PROJECT
- }
- ],
+ filters: getTrashPanelTypeFilters(),
render: uuid => <ResourceType uuid={uuid} />,
},
{
render: uuid => <ResourceType uuid={uuid} />,
},
{
@@
-112,15
+104,15
@@
export const trashPanelColumns: DataColumns<string, TrashPanelFilter> = [
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters:
[]
,
+ filters:
createTree()
,
render: uuid => <ResourceFileSize uuid={uuid} />
},
{
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
render: uuid => <ResourceFileSize uuid={uuid} />
},
{
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
- sortDirection: SortDirection.
NONE
,
- filters:
[]
,
+ sortDirection: SortDirection.
DESC
,
+ filters:
createTree()
,
render: uuid => <ResourceTrashDate uuid={uuid} />
},
{
render: uuid => <ResourceTrashDate uuid={uuid} />
},
{
@@
-128,7
+120,7
@@
export const trashPanelColumns: DataColumns<string, TrashPanelFilter> = [
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters:
[]
,
+ filters:
createTree()
,
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
{
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
{
@@
-136,7
+128,7
@@
export const trashPanelColumns: DataColumns<string, TrashPanelFilter> = [
selected: true,
configurable: false,
sortDirection: SortDirection.NONE,
selected: true,
configurable: false,
sortDirection: SortDirection.NONE,
- filters:
[]
,
+ filters:
createTree()
,
render: uuid => <ResourceRestore uuid={uuid} />
}
];
render: uuid => <ResourceRestore uuid={uuid} />
}
];