fix saving of cell types and many cosmetics

Stuartlab-UCSC · Oct 31, 2019 · 87f38bb · 87f38bb
1 parent 10328ff
commit 87f38bb
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 13 deletions.
diff --git a/src/cellTypeCluster/clusterBarMenu.js b/src/cellTypeCluster/clusterBarMenu.js
@@ -180,10 +180,10 @@ const mapDispatchToProps = (dispatch) => {
             dispatch({
                 type: 'app.snackbar.open',
                 message:
-                    'For a multi-column cell type: ' +
-                    '(1) click on begin cluster, ' +
-                    '(2) shift-click on end cluster, ' +
-                    '(3) select "Make Cell Type".',
+                    'For a multi-cluster cell type: ' +
+                    '(1) click begin cluster, ' +
+                    '(2) shift-click end cluster, ' +
+                    '(3) click "Make Cell Type".',
                 severity: 'fromDirectRequest',
             })
         },

diff --git a/src/cellTypeSheet/sheetList.js b/src/cellTypeSheet/sheetList.js
@@ -117,6 +117,7 @@ const mapStateToProps = (state) => {
     return {
         id: 'cell_type_work_sheet',
         list: state.cellTypeSheet.list,
+        placeholder: 'Open a worksheet...',
         selected: state.cellTypeSheet.selected,
     }
 }

diff --git a/src/cellTypeWork/bubblesPres.js b/src/cellTypeWork/bubblesPres.js
@@ -54,7 +54,7 @@ const Presentation = ({ data, dims, geneCluster, onMouseOver }) => {
                 marginTop: '2rem',
                 color: 'red',
             }}>
-                Add a marker gene from the table below
+                Add marker genes from the table below
             </Typography>
         )
     }

diff --git a/src/cellTypeWork/ctwMenuPres.js b/src/cellTypeWork/ctwMenuPres.js
@@ -1,7 +1,8 @@
 // Presentational component of the Main menu of the cell type worksheet page.
 
 import React from 'react'
-import { Drawer, IconButton, MenuItem, MenuList } from '@material-ui/core'
+import { Drawer, IconButton, MenuItem, MenuList, Typography }
+    from '@material-ui/core'
 import KeyboardArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft';
 import SheetList from 'cellTypeSheet/sheetList'
 
@@ -12,6 +13,9 @@ const Body = ({props}) => {
     return (
         <div style={{width: '20rem'}} >
             <div style={{margin: '1rem', marginTop: 0}} >
+                <Typography style={{fontSize: '1.1rem'}}>
+                    Open
+                </Typography>
                 <SheetList />
             </div>
             <MenuList style={{ padding: 0, }}>
@@ -22,14 +26,14 @@ const Body = ({props}) => {
                     Save
                 </MenuItem>
                 <MenuItem
-                    disabled={!sheetSelected}
+                    disabled={username === null || !sheetSelected}
                     onClick={onSaveAsClick}
                 >
                     Save As
                 </MenuItem>
                 <MenuItem
                     style={{display: 'None'}}
-                    disabled = {(username === null || uploadInProgress)}
+                    disabled = {username === null || uploadInProgress || !sheetSelected}
                     onClick={onUploadClick}
                 >
                     {(uploadInProgress) ? 'Upload In Progress' : 'Upload Data'}

diff --git a/src/cellTypeWork/page.js b/src/cellTypeWork/page.js
@@ -22,7 +22,7 @@ const Header = ({props}) => {
         <React.Fragment>
             <CtwMenu />
             <IconButton
-                style={{marginTop: -12, marginLeft: -50}}
+                style={{marginTop: -2, marginLeft: -50}}
                 onClick={onMenuClick}
             >
                 <MenuIcon color='primary' style={{height: 36, width: 36}}/>
@@ -50,7 +50,7 @@ const Presentation = (props) => {
         width: '100%'
     }
     return (
-        <div style={{marginTop: -20}}>
+        <div style={{marginTop: -30}}>
             <Header props={props} />
             <div style={gridStyle}>
                 <Grid container spacing={8} style={{background: 'transparent'}}>

diff --git a/src/cellTypeWork/transformToChart.js b/src/cellTypeWork/transformToChart.js
@@ -40,7 +40,16 @@ const buildTypeGroups = (cellTypes) => {
 
     // Determine which column should display the label.
     groups.forEach(group => {
-        cellTypes[group[0]].show = true
+
+        try {
+            cellTypes[group[0]].show = true
+        } catch (e) {
+            // Causing: "Uncaught TypeError: Cannot set property 'show' of undefined"
+            console.error('buildTypeGroups(): debug for:', e)
+            console.error('buildTypeGroups(): cellTypes:', cellTypes)
+            console.error('buildTypeGroups(): group:', group)
+            console.error('buildTypeGroups(): group[0]:', group[0])
+        }
     })
 
     return groups

diff --git a/src/cellTypeWork/transformToServerStore.js b/src/cellTypeWork/transformToServerStore.js
@@ -42,7 +42,7 @@ const buildClusters = (data) => {
 
     // The header.
     tsvLines.unshift(
-        ['column\tcluster\tcell_count\tbar_color\tcell_type\thide_cell_type'])
+        ['column\tcluster\tcell_count\tcell_type'])
     // Transform the lines to tsv.
     return tsvLines.join('\n')
 }

diff --git a/src/components/PickList.js b/src/components/PickList.js
@@ -41,7 +41,11 @@ const PickList = ({id, helperText, label, list, placeholder, selected,
     let Placeholder = null
     if (placeholder) {
         Placeholder = (
-            <MenuItem value="none" disabled >
+            <MenuItem
+                value='none'
+                disabled
+                style={{fontStyle: 'italic'}}
+            >
                 {placeholder}
             </MenuItem>
         )