From d4efd52e7e68c739dad1095267b6c8f0bf4a40fa Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Wed, 27 May 2020 20:57:55 -0300 Subject: [PATCH] 16118: Shows only the readonly icon by the collection's name. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- cypress/integration/collection-panel.spec.js | 3 ++- src/views/collection-panel/collection-panel.tsx | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js index ff55e050..6fc2d565 100644 --- a/cypress/integration/collection-panel.spec.js +++ b/cypress/integration/collection-panel.spec.js @@ -54,8 +54,9 @@ describe('Collection panel tests', function() { // Check that name & uuid are correct. cy.get('[data-cy=collection-info-panel]') .should('contain', this.testCollection.name) - .and(`${isWritable ? 'not.': ''}contain`, 'Read-only') .and('contain', this.testCollection.uuid); + // Check for the read-only icon + cy.get('[data-cy=read-only-icon]').should(`${isWritable ? 'not.' : ''}exist`); // Check that both read and write operations are available on // the 'More options' menu. cy.get('[data-cy=collection-panel-options-btn]') diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx index aac9b300..36625387 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import { StyleRulesCallback, WithStyles, withStyles, Card, - CardHeader, IconButton, CardContent, Grid, Tooltip, Chip + CardHeader, IconButton, CardContent, Grid, Tooltip } from '@material-ui/core'; import { connect, DispatchProp } from "react-redux"; import { RouteComponentProps } from 'react-router'; @@ -29,7 +29,7 @@ import { GroupResource } from '~/models/group'; import { UserResource } from '~/models/user'; import { getUserUuid } from '~/common/getuser'; -type CssRules = 'card' | 'iconHeader' | 'tag' | 'label' | 'value' | 'link' | 'centeredLabel' | 'readOnlyChip'; +type CssRules = 'card' | 'iconHeader' | 'tag' | 'label' | 'value' | 'link' | 'centeredLabel' | 'readOnlyIcon'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { @@ -61,8 +61,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ cursor: 'pointer' } }, - readOnlyChip: { - marginLeft: theme.spacing.unit + readOnlyIcon: { + marginLeft: theme.spacing.unit, + fontSize: 'small', } }); @@ -115,7 +116,11 @@ export const CollectionPanel = withStyles(styles)( {item.name} - {isWritable || } label="Read-only" className={classes.readOnlyChip} />} + {isWritable || + + + + } } titleTypographyProps={this.titleProps} -- 2.30.2