X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f8fb6725beec5b2bf0eec7f375d49f9189ff1bc3..ebaede5aff01400db400a3e69bb3bec2b636db3a:/src/views-components/context-menu/context-menu.tsx diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx index db5765ee12..219913cdd1 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -10,6 +10,7 @@ import { createAnchorAt } from "~/components/popover/helpers"; import { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set"; import { Dispatch } from "redux"; import { memoize } from 'lodash'; +import { sortByProperty } from "~/common/array-utils"; type DataProps = Pick & { resource?: ContextMenuResource }; const mapStateToProps = (state: RootState): DataProps => { const { open, position, resource } = state.contextMenu; @@ -53,7 +54,8 @@ export const ContextMenu = connect(mapStateToProps, mapDispatchToProps, mergePro const menuActionSets = new Map(); export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => { - menuActionSets.set(name, itemSet); + const sorted = itemSet.map(items => items.sort(sortByProperty('name'))); + menuActionSets.set(name, sorted); }; const emptyActionSet: ContextMenuActionSet = []; @@ -77,8 +79,8 @@ export enum ContextMenuKind { COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected", COLLECTION = 'Collection', COLLECTION_ADMIN = 'CollectionAdmin', - COLLECTION_RESOURCE = 'CollectionResource', READONLY_COLLECTION = 'ReadOnlyCollection', + OLD_VERSION_COLLECTION = 'OldVersionCollection', TRASHED_COLLECTION = 'TrashedCollection', PROCESS = "Process", PROCESS_ADMIN = 'ProcessAdmin',