21224: user card admin menu up Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox...

[arvados.git] / services / workbench2 / src / components / multiselect-toolbar / MultiselectToolbar.tsx

diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index cebf3cf2595e6b7515c0aa474c899d2934ded399..d10a6ba6158705eb26066d314701983c035595e8 100644 (file)
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -109,16 +109,21 @@ export const MultiselectToolbar = connect(
         const currentResourceKinds = singleResourceKind ? singleResourceKind : Array.from(selectedToKindSet(checkedList));
         const currentPathIsTrash = window.location.pathname === "/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 =
@@ -267,7 +272,7 @@ const resourceToMsResourceKind = (uuid: string, resources: ResourcesState, user:
                 ? 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: