[arvados] updated: 2.7.0-6283-g7e67490b7e
git repository hosting
git at public.arvados.org
Wed Apr 3 15:26:56 UTC 2024
Summary of changes:
.../multiselect-toolbar/MultiselectToolbar.tsx | 31 +++-------------------
.../context-menu/menu-item-sort.ts | 11 --------
2 files changed, 3 insertions(+), 39 deletions(-)
via 7e67490b7e0808b8838a1823c90565ae162b200b (commit)
from 8f519cc734ecd69df86dffff02f460addfa0c6e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 7e67490b7e0808b8838a1823c90565ae162b200b
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Apr 3 11:26:50 2024 -0400
21448: removed toolbar width transition Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 3301b5dfe1..194950b134 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React, { useEffect, useState } from "react";
+import React from "react";
import { connect } from "react-redux";
import { StyleRulesCallback, withStyles, WithStyles, Toolbar, Tooltip, IconButton } from "@material-ui/core";
import { ArvadosTheme } from "common/custom-theme";
@@ -35,11 +35,8 @@ import { PublicFavoritesState } from "store/public-favorites/public-favorites-re
import { isExactlyOneSelected } from "store/multiselect/multiselect-actions";
import { IntersectionObserverWrapper } from "./ms-toolbar-overflow-wrapper";
import { ContextMenuKind, sortMenuItems, menuDirection } from 'views-components/context-menu/menu-item-sort';
-import { sortByProperty } from "common/array-utils";
-const WIDTH_TRANSITION = 150
-
-type CssRules = "root" | "transition" | "button" | "iconContainer" | "icon" | "divider";
+type CssRules = "root" | "button" | "iconContainer" | "icon" | "divider";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
@@ -49,18 +46,8 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
height: '2.7rem',
padding: 0,
margin: "1rem auto auto 0.3rem",
- transition: `width ${WIDTH_TRANSITION}ms`,
overflow: 'hidden',
},
- transition: {
- display: "flex",
- flexDirection: "row",
- height: '2.7rem',
- padding: 0,
- margin: "1rem auto auto 0.3rem",
- overflow: 'hidden',
- transition: `width ${WIDTH_TRANSITION}ms`,
- },
button: {
width: "2.5rem",
height: "2.5rem ",
@@ -103,18 +90,6 @@ export const MultiselectToolbar = connect(
const singleResourceKind = singleSelectedUuid ? [resourceToMsResourceKind(singleSelectedUuid, iconProps.resources, user)] : null
const currentResourceKinds = singleResourceKind ? singleResourceKind : Array.from(selectedToKindSet(checkedList));
const currentPathIsTrash = window.location.pathname === "/trash";
- const [isTransitioning, setIsTransitioning] = useState(false);
-
- const handleTransition = () => {
- setIsTransitioning(true)
- setTimeout(() => {
- setIsTransitioning(false)
- }, WIDTH_TRANSITION);
- }
-
- useEffect(()=>{
- handleTransition()
- }, [checkedList])
const rawActions =
currentPathIsTrash && selectedToKindSet(checkedList).size
@@ -132,7 +107,7 @@ export const MultiselectToolbar = connect(
return (
<React.Fragment>
<Toolbar
- className={isTransitioning ? classes.transition: classes.root}
+ className={classes.root}
style={{ width: `${(actions.length * 2.5) + 6}rem`}}
data-cy='multiselect-toolbar'
>
diff --git a/services/workbench2/src/views-components/context-menu/menu-item-sort.ts b/services/workbench2/src/views-components/context-menu/menu-item-sort.ts
index 1f7c61fa15..f331c60247 100644
--- a/services/workbench2/src/views-components/context-menu/menu-item-sort.ts
+++ b/services/workbench2/src/views-components/context-menu/menu-item-sort.ts
@@ -120,20 +120,9 @@ const workflowOrder = [
]
const defaultMultiOrder = [
- ContextMenuActionNames.VIEW_DETAILS,
- ContextMenuActionNames.OPEN_IN_NEW_TAB,
- ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
- ContextMenuActionNames.OPEN_WITH_3RD_PARTY_CLIENT,
- ContextMenuActionNames.API_DETAILS,
- ContextMenuActionNames.SHARE,
- ContextMenuActionNames.NEW_PROJECT,
- ContextMenuActionNames.EDIT_PROJECT,
ContextMenuActionNames.MOVE_TO,
ContextMenuActionNames.MAKE_A_COPY,
ContextMenuActionNames.MOVE_TO_TRASH,
- ContextMenuActionNames.FREEZE_PROJECT,
- ContextMenuActionNames.ADD_TO_FAVORITES,
- ContextMenuActionNames.ADD_TO_PUBLIC_FAVORITES,
];
const kindToOrder: Record<string, ContextMenuActionNames[]> = {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list