[arvados] updated: 2.7.0-5856-gf6b20392ac

git repository hosting git at public.arvados.org
Wed Feb 7 15:34:35 UTC 2024


Summary of changes:
 .../project-details-card/project-details-card.tsx  | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

       via  f6b20392acf0cd3727e71775c25c29a4dba99988 (commit)
       via  38e2fa447f9fc76676868356948b2b9319ff498d (commit)
      from  555a3dfb69e41e4dc129e7d9e9523b130c5776ee (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 f6b20392acf0cd3727e71775c25c29a4dba99988
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Feb 7 10:34:29 2024 -0500

    21224: cleanup and css tweaks Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
index a78efb898f..a850046a11 100644
--- a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
+++ b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
@@ -3,8 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import React from 'react';
-import { Card, CardHeader, WithStyles, withStyles, Typography, CardContent, Tooltip, Collapse } from '@material-ui/core';
-import { StyleRulesCallback } from '@material-ui/core';
+import { StyleRulesCallback, Card, CardHeader, WithStyles, withStyles, Typography, CardContent, Tooltip, Collapse } from '@material-ui/core';
 import { ArvadosTheme } from 'common/custom-theme';
 import { RootState } from 'store/store';
 import { connect } from 'react-redux';
@@ -15,13 +14,11 @@ import { ResourceKind } from 'models/resource';
 import { UserResource } from 'models/user';
 import { UserResourceAccountStatus } from 'views-components/data-explorer/renderers';
 import { FavoriteStar, PublicFavoriteStar } from 'views-components/favorite-star/favorite-star';
-import { FreezeIcon } from 'components/icon/icon';
+import { MoreVerticalIcon, FreezeIcon } from 'components/icon/icon';
 import { Resource } from 'models/resource';
-import { MoreVerticalIcon } from 'components/icon/icon';
 import { IconButton } from '@material-ui/core';
 import { ContextMenuResource, openUserContextMenu } from 'store/context-menu/context-menu-actions';
-import { resourceUuidToContextMenuKind } from 'store/context-menu/context-menu-actions';
-import { openContextMenu } from 'store/context-menu/context-menu-actions';
+import { openContextMenu, resourceUuidToContextMenuKind } from 'store/context-menu/context-menu-actions';
 import { CollectionResource } from 'models/collection';
 import { ContextMenuKind } from 'views-components/context-menu/context-menu';
 import { Dispatch } from 'redux';
@@ -295,17 +292,19 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
                     </section>
                 }
                 action={
-                    <Tooltip
-                        title='More options'
-                        disableFocusListener
-                    >
-                        <IconButton
-                            aria-label='More options'
-                            onClick={(ev) => handleContextMenu(ev, currentResource as any, isAdmin)}
+                    <section className={classes.contextMenuSection}>
+                        <Tooltip
+                            title='More options'
+                            disableFocusListener
                         >
-                            <MoreVerticalIcon />
-                        </IconButton>
-                    </Tooltip>
+                            <IconButton
+                                aria-label='More options'
+                                onClick={(ev) => handleContextMenu(ev, currentResource as any, isAdmin)}
+                            >
+                                <MoreVerticalIcon />
+                            </IconButton>
+                        </Tooltip>
+                    </section>
                 }
             />
             <CardContent className={classes.cardContent}>

commit 38e2fa447f9fc76676868356948b2b9319ff498d
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Feb 7 09:49:34 2024 -0500

    21224: description actually transitions Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
index 7e78f407b5..a78efb898f 100644
--- a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
+++ b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import React from 'react';
-import { Card, CardHeader, WithStyles, withStyles, Typography, CardContent, Tooltip } from '@material-ui/core';
+import { Card, CardHeader, WithStyles, withStyles, Typography, CardContent, Tooltip, Collapse } from '@material-ui/core';
 import { StyleRulesCallback } from '@material-ui/core';
 import { ArvadosTheme } from 'common/custom-theme';
 import { RootState } from 'store/store';
@@ -73,6 +73,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     cardContent: {
         display: 'flex',
         flexDirection: 'column',
+        transition: 'height 0.3s ease',
     },
     subHeader: {
         display: 'flex',
@@ -258,8 +259,7 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
     const { name, description } = currentResource as ProjectResource;
     const [showDescription, setShowDescription] = React.useState(false);
 
-    const toggleDescription = (resource: ProjectResource) => {
-        console.log('toggleDescription', resource);
+    const toggleDescription = () => {
         setShowDescription(!showDescription);
     };
 
@@ -324,21 +324,22 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
                         {description ? (
                             <Typography
                                 className={classes.showMore}
-                                onClick={() => toggleDescription(currentResource)}
+                                onClick={toggleDescription}
                             >
-                                Show full description
+                                {!showDescription ? "Show full description" : "Hide full description"}
                             </Typography>
                         ) : (
                             <Typography className={classes.noDescription}>no description available</Typography>
                         )}
                     </section>
                 </section>
-                <section>
-                    {showDescription && 
+                <Collapse in={showDescription} timeout='auto'>
+                    <section>
                         <Typography className={classes.description}>
-                            {currentResource.description}
-                        </Typography>}
-                </section>
+                            {description}
+                        </Typography>
+                    </section>
+                </Collapse>
             </CardContent>
         </Card>
     );

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list