X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/099468843d687fdc8c6fbb0f0e3dc54f59d0de15..1d5fd6f8997bb6f06c8ed62dc01905566cbe135e:/src/components/multiselect-toolbar/MultiselectToolbar.tsx
diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 3d8ae0c3d3..a8a3f7a823 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -13,7 +13,7 @@ import { ContextMenuResource } from "store/context-menu/context-menu-actions";
import { Resource, extractUuidKind } from "models/resource";
import { getResource } from "store/resources/resources";
import { ResourcesState } from "store/resources/resources";
-import { ContextMenuAction, ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuAction, ContextMenuActionSet, DynamicContextMenuAction } from "views-components/context-menu/context-menu-action-set";
import { RestoreFromTrashIcon, TrashIcon } from "components/icon/icon";
import { multiselectActionsFilters, TMultiselectActionsFilters, contextMenuActionConsts } from "./ms-toolbar-action-filters";
import { kindToActionSet, findActionByName } from "./ms-kind-action-differentiator";
@@ -67,10 +67,10 @@ export const MultiselectToolbar = connect(
>
{buttons.length ? (
buttons.map((btn, i) =>
- btn.name === "ToggleTrashAction" ? (
+ btn.defaultText ? (
@@ -85,9 +85,7 @@ export const MultiselectToolbar = connect(
key={i}
disableFocusListener
>
- props.executeMulti(btn, checkedList, props.resources)}>
- {btn.icon ? btn.icon({}) : <>>}
-
+ props.executeMulti(btn, checkedList, props.resources)}>{btn.icon ? btn.icon({}) : <>>}
)
)
@@ -96,7 +94,7 @@ export const MultiselectToolbar = connect(
)}
- );
+ )
})
);
@@ -135,9 +133,9 @@ function filterActions(actionArray: ContextMenuActionSet, filters: Set):
}
function selectActionsByKind(currentResourceKinds: Array, filterSet: TMultiselectActionsFilters) {
- const rawResult: Set = new Set();
+ const rawResult: Set = new Set();
const resultNames = new Set();
- const allFiltersArray: ContextMenuAction[][] = [];
+ const allFiltersArray: DynamicContextMenuAction[][] = []
currentResourceKinds.forEach(kind => {
if (filterSet[kind]) {
const actions = filterActions(...filterSet[kind]);