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 bcc661144fe64f0f0aee9faf0499a7d2c3ff06b4..18df96182d636c172370b76baef9a93d973a90d9 100644
(file)
--- a/
src/views/trash-panel/trash-panel.tsx
+++ b/
src/views/trash-panel/trash-panel.tsx
@@
-32,7
+32,10
@@
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 { Dispatch } from "redux";
import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
import { createTree } from '~/models/tree';
-import { getInitialResourceTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
+import {
+ getInitialResourceTypeFilters,
+ getTrashPanelTypeFilters
+} from '~/store/resource-type-filters/resource-type-filters';
type CssRules = "toolbar" | "button";
type CssRules = "toolbar" | "button";
@@
-84,7
+87,7
@@
export const trashPanelColumns: DataColumns<string> = [
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.
ASC
,
+ sortDirection: SortDirection.
NONE
,
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
@@
-93,7
+96,7
@@
export const trashPanelColumns: DataColumns<string> = [
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
- filters: get
InitialResource
TypeFilters(),
+ filters: get
TrashPanel
TypeFilters(),
render: uuid => <ResourceType uuid={uuid} />,
},
{
render: uuid => <ResourceType uuid={uuid} />,
},
{
@@
-108,7
+111,7
@@
export const trashPanelColumns: DataColumns<string> = [
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
- sortDirection: SortDirection.
NONE
,
+ sortDirection: SortDirection.
DESC
,
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},