import { getProcess } from "store/processes/process";
import { Process } from "store/processes/process";
import { PublicFavoritesState } from "store/public-favorites/public-favorites-reducer";
-import { isExactlyOneSelected } from "store/multiselect/multiselect-actions";
+import { AuthState } from "store/auth/auth-reducer";
import { IntersectionObserverWrapper } from "./ms-toolbar-overflow-wrapper";
const WIDTH_TRANSITION = 150
display: "flex",
flexDirection: "row",
width: 0,
- height: '2.7rem',
+ height: '2.5rem',
padding: 0,
- margin: "1rem auto auto 0.5rem",
transition: `width ${WIDTH_TRANSITION}ms`,
overflow: 'hidden',
},
transition: {
display: "flex",
flexDirection: "row",
- width: 0,
- height: '2.7rem',
+ height: '2.5rem',
padding: 0,
- margin: "1rem auto auto 0.5rem",
overflow: 'hidden',
transition: `width ${WIDTH_TRANSITION}ms`,
},
button: {
width: "2.5rem",
height: "2.5rem ",
- paddingLeft: 0
+ paddingLeft: 0,
+ border: "1px solid transparent",
},
iconContainer: {
height: '100%',
},
icon: {
- marginLeft: '-0.5rem'
+ marginLeft: '-0.5rem',
}
});
export type MultiselectToolbarProps = {
checkedList: TCheckedList;
- singleSelectedUuid: string | null
+ selectedResourceUuid: string | null;
iconProps: IconProps
user: User | null
disabledButtons: Set<string>
- executeMulti: (action: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState) => void;
+ auth: AuthState;
+ location: string;
+ isSubPanel?: boolean;
+ executeMulti: (action: ContextMenuAction | MultiSelectMenuAction, checkedList: TCheckedList, resources: ResourcesState) => void;
};
type IconProps = {
publicFavorites: PublicFavoritesState;
}
+const disallowedPaths = [
+ "/favorites",
+ "/public-favorites",
+ "/trash",
+ "/group",
+]
+
+const isPathDisallowed = (location: string): boolean => {
+ return disallowedPaths.some(path => location.includes(path))
+}
+
export const MultiselectToolbar = connect(
mapStateToProps,
mapDispatchToProps
)(
withStyles(styles)((props: MultiselectToolbarProps & WithStyles<CssRules>) => {
- const { classes, checkedList, singleSelectedUuid, iconProps, user, disabledButtons } = props;
- const singleResourceKind = singleSelectedUuid ? [resourceToMsResourceKind(singleSelectedUuid, iconProps.resources, user)] : null
+ const { classes, checkedList, iconProps, user, disabledButtons, location, isSubPanel } = props;
+ const selectedResourceUuid = isPathDisallowed(location) ? null : props.selectedResourceUuid;
+ const singleResourceKind = selectedResourceUuid && !isSubPanel ? [resourceToMsResourceKind(selectedResourceUuid, iconProps.resources, user)] : null
const currentResourceKinds = singleResourceKind ? singleResourceKind : Array.from(selectedToKindSet(checkedList));
- const currentPathIsTrash = window.location.pathname === "/trash";
+ const currentPathIsTrash = location.includes("/trash");
const [isTransitioning, setIsTransitioning] = useState(false);
+ let transitionTimeout;
const handleTransition = () => {
setIsTransitioning(true)
- setTimeout(() => {
+ transitionTimeout = setTimeout(() => {
setIsTransitioning(false)
}, WIDTH_TRANSITION);
}
useEffect(()=>{
handleTransition()
+ return () => {
+ if(transitionTimeout) clearTimeout(transitionTimeout)
+ };
+ // eslint-disable-next-line
}, [checkedList])
const actions =
currentPathIsTrash && selectedToKindSet(checkedList).size
? [msToggleTrashAction]
: selectActionsByKind(currentResourceKinds as string[], multiselectActionsFilters).filter((action) =>
- singleSelectedUuid === null ? action.isForMulti : true
+ selectedResourceUuid === null ? action.isForMulti : true
);
+ const targetResources = selectedResourceUuid ? {[selectedResourceUuid]: true} as TCheckedList : checkedList
+
return (
<React.Fragment>
<Toolbar
className={isTransitioning ? classes.transition: classes.root}
- style={{ width: `${(actions.length * 2.5) + 8}rem` }}
+ style={{ width: `${(actions.length * 2.5) + 2}rem`}}
data-cy='multiselect-toolbar'
>
{actions.length ? (
return hasAlts ? (
<Tooltip
className={classes.button}
- title={currentPathIsTrash || (useAlts && useAlts(singleSelectedUuid, iconProps)) ? altName : name}
data-targetid={name}
+ title={currentPathIsTrash || (useAlts && useAlts(selectedResourceUuid, iconProps)) ? altName : name}
key={i}
disableFocusListener
- >
+ >
<span className={classes.iconContainer}>
<IconButton
data-cy='multiselect-button'
disabled={disabledButtons.has(name)}
- onClick={() => props.executeMulti(action, checkedList, iconProps.resources)}
+ onClick={() => props.executeMulti(action, targetResources, iconProps.resources)}
className={classes.icon}
>
- {currentPathIsTrash || (useAlts && useAlts(singleSelectedUuid, iconProps)) ? altIcon && altIcon({}) : icon({})}
+ {currentPathIsTrash || (useAlts && useAlts(selectedResourceUuid, iconProps)) ? altIcon && altIcon({}) : icon({})}
</IconButton>
</span>
</Tooltip>
) : (
<Tooltip
className={classes.button}
- title={action.name}
data-targetid={name}
+ title={action.name}
key={i}
disableFocusListener
- >
+ >
<span className={classes.iconContainer}>
<IconButton
data-cy='multiselect-button'
- onClick={() => props.executeMulti(action, checkedList, iconProps.resources)}
+ onClick={() => {
+ props.executeMulti(action, targetResources, iconProps.resources)}}
className={classes.icon}
>
{action.icon({})}
const { isAdmin } = user;
const kind = extractUuidKind(uuid);
- const isFrozen = resourceIsFrozen(resource, resources);
+ const isFrozen = resource?.kind && resource.kind === ResourceKind.PROJECT ? resourceIsFrozen(resource, resources) : false;
const isEditable = (user.isAdmin || (resource || ({} as EditableResource)).isEditable) && !readonly && !isFrozen;
switch (kind) {
? msMenuResourceKind.RUNNING_PROCESS_RESOURCE
: msMenuResourceKind.PROCESS_RESOURCE;
case ResourceKind.USER:
- return msMenuResourceKind.ROOT_PROJECT;
+ return isAdmin ? msMenuResourceKind.ROOT_PROJECT_ADMIN : msMenuResourceKind.ROOT_PROJECT;
case ResourceKind.LINK:
return msMenuResourceKind.LINK;
case ResourceKind.WORKFLOW:
//--------------------------------------------------//
-function mapStateToProps({auth, multiselect, resources, favorites, publicFavorites}: RootState) {
+function mapStateToProps({auth, multiselect, resources, favorites, publicFavorites, selectedResourceUuid}: RootState) {
return {
checkedList: multiselect.checkedList as TCheckedList,
- singleSelectedUuid: isExactlyOneSelected(multiselect.checkedList),
user: auth && auth.user ? auth.user : null,
disabledButtons: new Set<string>(multiselect.disabledButtons),
+ auth,
+ selectedResourceUuid,
+ location: window.location.pathname,
iconProps: {
resources,
favorites,
return {
executeMulti: (selectedAction: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState): void => {
const kindGroups = groupByKind(checkedList, resources);
+ const currentList = selectedToArray(checkedList)
switch (selectedAction.name) {
case MultiSelectMenuActionNames.MOVE_TO:
case MultiSelectMenuActionNames.REMOVE:
- const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as ContainerRequestResource | Resource;
+ const firstResource = getResource(currentList[0])(resources) as ContainerRequestResource | Resource;
const action = findActionByName(selectedAction.name as string, kindToActionSet[firstResource.kind]);
if (action) action.execute(dispatch, kindGroups[firstResource.kind]);
break;
case MultiSelectMenuActionNames.COPY_TO_CLIPBOARD:
- const selectedResources = selectedToArray(checkedList).map(uuid => getResource(uuid)(resources));
+ const selectedResources = currentList.map(uuid => getResource(uuid)(resources));
dispatch<any>(copyToClipboardAction(selectedResources));
break;
default:
projects / arvados.git / blobdiff