icons, language consistency

This commit is contained in:
Colin Megill
2021-02-10 11:22:36 -08:00
parent fec1736820
commit e8f0a1d2cb
6 changed files with 17 additions and 11 deletions
@@ -89,7 +89,7 @@ class AnnoMenuCategory extends React.PureComponent {
text={editText} text={editText}
/> />
<MenuItem <MenuItem
icon="delete" icon="trash"
intent="danger" intent="danger"
data-testclass="handleDeleteCategory" data-testclass="handleDeleteCategory"
data-testid={`${metadataField}:delete-category`} data-testid={`${metadataField}:delete-category`}
@@ -731,7 +731,7 @@ class CategoryValue extends React.Component {
) : null} ) : null}
{displayString !== globals.unassignedCategoryLabel ? ( {displayString !== globals.unassignedCategoryLabel ? (
<MenuItem <MenuItem
icon="delete" icon="trash"
intent="danger" intent="danger"
data-testclass="handleDeleteValue" data-testclass="handleDeleteValue"
data-testid={`${metadataField}:${displayString}:delete-label`} data-testid={`${metadataField}:${displayString}:delete-label`}
+1 -1
View File
@@ -134,7 +134,7 @@ class Gene extends React.Component {
small small
data-testid={`delete-from-geneset-${gene}`} data-testid={`delete-from-geneset-${gene}`}
onClick={this.handleDeleteGeneFromSet} onClick={this.handleDeleteGeneFromSet}
intent="danger" intent="none"
style={{ fontWeight: 700, marginRight: 2 }} style={{ fontWeight: 700, marginRight: 2 }}
icon={<Icon icon="trash" iconSize={10} />} icon={<Icon icon="trash" iconSize={10} />}
/> />
@@ -52,9 +52,9 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
primaryButtonProps={{ primaryButtonProps={{
"data-testid": `${geneset}:submit-label`, "data-testid": `${geneset}:submit-label`,
}} }}
title="Add genes to geneset" title="Add genes to gene set"
instruction={`Add gene to ${geneset}`} instruction={`Add gene to ${geneset}`}
cancelTooltipContent="Close this dialog without adding genes to geneset." cancelTooltipContent="Close this dialog without adding genes to gene set."
primaryButtonText="Add genes" primaryButtonText="Add genes"
text={genesToAdd} text={genesToAdd}
validationError={false} validationError={false}
@@ -80,9 +80,9 @@ class CreateGenesetDialogue extends React.PureComponent {
"data-testid": `${metadataField}:submit-label`, "data-testid": `${metadataField}:submit-label`,
}} }}
title="Create new gene set" title="Create new gene set"
instruction="Give your geneset a name" /* todo genesets this.instruction(genesetName) */ instruction="Give your gene set a name" /* todo genesets this.instruction(genesetName) */
cancelTooltipContent="Close this dialog without creating a gene set." cancelTooltipContent="Close this dialog without creating a gene set."
primaryButtonText="Create geneset" primaryButtonText="Create gene set"
handleSecondaryButtonSubmit={this.addLabelAndAssignCells} handleSecondaryButtonSubmit={this.addLabelAndAssignCells}
text={genesetName} text={genesetName}
validationError={false} validationError={false}
@@ -95,10 +95,10 @@ class CreateGenesetDialogue extends React.PureComponent {
intent: "none", intent: "none",
autoFocus: true, autoFocus: true,
}} }}
newLabelMessage="New geneset" newLabelMessage="New gene set"
/> />
} }
secondaryInstructions="Optionally add a list of comma separated genes to populate the geneset" secondaryInstructions="Optionally add a list of comma separated genes to populate the gene set"
secondaryInput={ secondaryInput={
<LabelInput <LabelInput
onChange={this.handleGenesetInputChange} onChange={this.handleGenesetInputChange}
@@ -84,12 +84,12 @@ class GenesetMenus extends React.PureComponent {
text="Edit gene set name" text="Edit gene set name"
/> />
<MenuItem <MenuItem
icon="delete" icon="trash"
intent="danger" intent="danger"
data-testclass="handleDeleteCategory" data-testclass="handleDeleteCategory"
data-testid={`${geneset}:delete-category`} data-testid={`${geneset}:delete-category`}
onClick={this.handleDeleteCategory} onClick={this.handleDeleteCategory}
text="Delete this geneset (destructive, will remove set and collection of genes)" text="Delete this gene set (destructive, will remove set and collection of genes)"
/> />
</Menu> </Menu>
} }
@@ -103,6 +103,12 @@ class GenesetMenus extends React.PureComponent {
minimal minimal
/> />
</Popover> </Popover>
<Button
style={{ marginLeft: 0 }}
data-testclass="colorby-entire-geneset"
data-testid={`${geneset}:colorby-entire-geneset`}
icon={<Icon icon="tint" iconSize={16} />}
/>
</> </>
) : null} ) : null}
</> </>