icons, language consistency

client/src/components/categorical/category/annoMenuCategory.js

@@ -89,7 +89,7 @@ class AnnoMenuCategory extends React.PureComponent {
                     text={editText}
                   />
                   <MenuItem
-                    icon="delete"
+                    icon="trash"
                     intent="danger"
                     data-testclass="handleDeleteCategory"
                     data-testid={`${metadataField}:delete-category`}

client/src/components/categorical/value/index.js

@@ -731,7 +731,7 @@ class CategoryValue extends React.Component {
                       ) : null}
                       {displayString !== globals.unassignedCategoryLabel ? (
                         <MenuItem
-                          icon="delete"
+                          icon="trash"
                           intent="danger"
                           data-testclass="handleDeleteValue"
                           data-testid={`${metadataField}:${displayString}:delete-label`}

client/src/components/geneExpression/gene.js

@@ -134,7 +134,7 @@ class Gene extends React.Component {
                 small
                 data-testid={`delete-from-geneset-${gene}`}
                 onClick={this.handleDeleteGeneFromSet}
-                intent="danger"
+                intent="none"
                 style={{ fontWeight: 700, marginRight: 2 }}
                 icon={<Icon icon="trash" iconSize={10} />}
               />

client/src/components/geneExpression/menus/addGeneToGenesetDialogue.js

@@ -52,9 +52,9 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
           primaryButtonProps={{
             "data-testid": `${geneset}:submit-label`,
           }}
-          title="Add genes to geneset"
+          title="Add genes to gene set"
           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"
           text={genesToAdd}
           validationError={false}

client/src/components/geneExpression/menus/createGenesetDialogue.js

@@ -80,9 +80,9 @@ class CreateGenesetDialogue extends React.PureComponent {
             "data-testid": `${metadataField}:submit-label`,
           }}
           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."
-          primaryButtonText="Create geneset"
+          primaryButtonText="Create gene set"
           handleSecondaryButtonSubmit={this.addLabelAndAssignCells}
           text={genesetName}
           validationError={false}
@@ -95,10 +95,10 @@ class CreateGenesetDialogue extends React.PureComponent {
                 intent: "none",
                 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={
             <LabelInput
               onChange={this.handleGenesetInputChange}

client/src/components/geneExpression/menus/genesetMenus.js

@@ -84,12 +84,12 @@ class GenesetMenus extends React.PureComponent {
                     text="Edit gene set name"
                   />
                   <MenuItem
-                    icon="delete"
+                    icon="trash"
                     intent="danger"
                     data-testclass="handleDeleteCategory"
                     data-testid={`${geneset}:delete-category`}
                     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>
               }
@@ -103,6 +103,12 @@ class GenesetMenus extends React.PureComponent {
                 minimal
               />
             </Popover>
+            <Button
+              style={{ marginLeft: 0 }}
+              data-testclass="colorby-entire-geneset"
+              data-testid={`${geneset}:colorby-entire-geneset`}
+              icon={<Icon icon="tint" iconSize={16} />}
+            />
           </>
         ) : null}
       </>