projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15768: fixed mstoolbar button ripple Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...
[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 67326829b6ae84763f401baeb3b3e98403cc4fbf..350207510555ac30870e21dd19916e9399c27534 100644
(file)
--- a/
src/views/trash-panel/trash-panel.tsx
+++ b/
src/views/trash-panel/trash-panel.tsx
@@
-34,6
+34,7
@@
import { createTree } from 'models/tree';
import {
getTrashPanelTypeFilters
} from 'store/resource-type-filters/resource-type-filters';
import {
getTrashPanelTypeFilters
} from 'store/resource-type-filters/resource-type-filters';
+import { CollectionResource } from 'models/collection';
type CssRules = "toolbar" | "button" | "root";
type CssRules = "toolbar" | "button" | "root";
@@
-83,12
+84,12
@@
export const ResourceRestore =
</Tooltip>
);
</Tooltip>
);
-export const trashPanelColumns: DataColumns<string> = [
+export const trashPanelColumns: DataColumns<string
, CollectionResource
> = [
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
- sort
Direction: SortDirection.NONE
,
+ sort
: {direction: SortDirection.NONE, field: "name"}
,
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
@@
-96,7
+97,6
@@
export const trashPanelColumns: DataColumns<string> = [
name: TrashPanelColumnNames.TYPE,
selected: true,
configurable: true,
name: TrashPanelColumnNames.TYPE,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: getTrashPanelTypeFilters(),
render: uuid => <ResourceType uuid={uuid} />,
},
filters: getTrashPanelTypeFilters(),
render: uuid => <ResourceType uuid={uuid} />,
},
@@
-104,7
+104,7
@@
export const trashPanelColumns: DataColumns<string> = [
name: TrashPanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
name: TrashPanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
- sort
Direction: SortDirection.NONE
,
+ sort
: {direction: SortDirection.NONE, field: "fileSizeTotal"}
,
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
@@
-112,7
+112,7
@@
export const trashPanelColumns: DataColumns<string> = [
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
- sort
Direction: SortDirection.DESC
,
+ sort
: {direction: SortDirection.DESC, field: "trashAt"}
,
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
@@
-120,7
+120,7
@@
export const trashPanelColumns: DataColumns<string> = [
name: TrashPanelColumnNames.TO_BE_DELETED,
selected: true,
configurable: true,
name: TrashPanelColumnNames.TO_BE_DELETED,
selected: true,
configurable: true,
- sort
Direction: SortDirection.NONE
,
+ sort
: {direction: SortDirection.NONE, field: "deleteAt"}
,
filters: createTree(),
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
@@
-128,7
+128,6
@@
export const trashPanelColumns: DataColumns<string> = [
name: '',
selected: true,
configurable: false,
name: '',
selected: true,
configurable: false,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: uuid => <ResourceRestore uuid={uuid} />
}
filters: createTree(),
render: uuid => <ResourceRestore uuid={uuid} />
}