[arvados] updated: 2.7.0-5853-g6c5c45a126

git repository hosting git at public.arvados.org
Tue Feb 6 19:10:31 UTC 2024


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

       via  6c5c45a126f787ebbcf67624805ea11243f8f63f (commit)
      from  1981f887d7215bba5fa443c78c67d6a1d3e5bcb9 (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 6c5c45a126f787ebbcf67624805ea11243f8f63f
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Tue Feb 6 14:10:24 2024 -0500

    21224: locked size of project card 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 56191cc2b4..c68b816037 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
@@ -31,6 +31,7 @@ import { Dispatch } from 'redux';
 type CssRules =
     | 'root'
     | 'cardHeader'
+    | 'descriptionLabel'
     | 'showMore'
     | 'noDescription'
     | 'nameContainer'
@@ -52,7 +53,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     showMore: {
         color: theme.palette.primary.main,
         cursor: 'pointer',
-        maxWidth: '10rem',
     },
     noDescription: {
         color: theme.palette.grey['600'],
@@ -64,10 +64,16 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     cardHeader: {
         paddingTop: '0.4rem',
     },
+    descriptionLabel: {
+        paddingTop: '1rem',
+        marginBottom: 0,
+        minHeight: '2.5rem',
+    },
     cardContent: {
         display: 'flex',
-        flexDirection: 'column',
-        marginTop: '-1rem',
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        marginTop: '-2rem',
     },
     namePlate: {
         display: 'flex',
@@ -248,43 +254,31 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
             <CardHeader
                 className={classes.cardHeader}
                 title={
-                    <>
-                        <section className={classes.namePlate}>
-                            <Typography
-                                noWrap
-                                variant='h6'
-                                style={{ marginRight: '1rem' }}
+                    <section className={classes.namePlate}>
+                        <Typography
+                            noWrap
+                            variant='h6'
+                            style={{ marginRight: '1rem' }}
+                        >
+                            {name}
+                        </Typography>
+                        <FavoriteStar
+                            className={classes.faveIcon}
+                            resourceUuid={currentResource.uuid}
+                        />
+                        <PublicFavoriteStar
+                            className={classes.faveIcon}
+                            resourceUuid={currentResource.uuid}
+                        />
+                        {!!frozenByFullName && (
+                            <Tooltip
+                                className={classes.frozenIcon}
+                                title={<span>Project was frozen by {frozenByFullName}</span>}
                             >
-                                {name}
-                            </Typography>
-                            <FavoriteStar
-                                className={classes.faveIcon}
-                                resourceUuid={currentResource.uuid}
-                            />
-                            <PublicFavoriteStar
-                                className={classes.faveIcon}
-                                resourceUuid={currentResource.uuid}
-                            />
-                            {!!frozenByFullName && (
-                                <Tooltip
-                                    className={classes.frozenIcon}
-                                    title={<span>Project was frozen by {frozenByFullName}</span>}
-                                >
-                                    <FreezeIcon style={{ fontSize: 'inherit' }} />
-                                </Tooltip>
-                            )}
-                        </section>
-                        <section className={classes.chipSection}>
-                            <Typography component='div'>
-                                {typeof currentResource.properties === 'object' &&
-                                    Object.keys(currentResource.properties).map((k) =>
-                                        Array.isArray(currentResource.properties[k])
-                                            ? currentResource.properties[k].map((v: string) => getPropertyChip(k, v, undefined, classes.tag))
-                                            : getPropertyChip(k, currentResource.properties[k], undefined, classes.tag)
-                                    )}
-                            </Typography>
-                        </section>
-                    </>
+                                <FreezeIcon style={{ fontSize: 'inherit' }} />
+                            </Tooltip>
+                        )}
+                    </section>
                 }
                 action={
                     <Tooltip
@@ -301,8 +295,18 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
                 }
             />
             <CardContent className={classes.cardContent}>
-                {description ? (
-                    <section>
+                <section className={classes.chipSection}>
+                    <Typography component='div'>
+                        {typeof currentResource.properties === 'object' &&
+                            Object.keys(currentResource.properties).map((k) =>
+                                Array.isArray(currentResource.properties[k])
+                                    ? currentResource.properties[k].map((v: string) => getPropertyChip(k, v, undefined, classes.tag))
+                                    : getPropertyChip(k, currentResource.properties[k], undefined, classes.tag)
+                            )}
+                    </Typography>
+                </section>
+                <section className={classes.descriptionLabel}>
+                    {description ? (
                         <div className={classes.showMore}>
                             <RichTextEditorLink
                                 title={`Description of ${name}`}
@@ -310,11 +314,10 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
                                 label='Show full description'
                             />
                         </div>
-                    </section>
-                ) : (
+                    ) : (
                         <Typography className={classes.noDescription}>no description available</Typography>
-                )
-                }
+                    )}
+                </section>
             </CardContent>
         </Card>
     );

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list