Skip to content

Commit 27d0e38

Browse files
committed
Bugfix to JBrowse default hidden columns
1 parent d3a9fc7 commit 27d0e38

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

jbrowse/src/client/JBrowse/VariantSearch/components/VariantTableWidget.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ const VariantTableWidget = observer(props => {
216216
const [filterModalOpen, setFilterModalOpen] = useState(false);
217217
const [filters, setFilters] = useState([]);
218218
const [fieldTypeInfo, setFieldTypeInfo] = useState<FieldModel[]>([]);
219-
const [hiddenColumns, setHiddenColumns] = useState([]);
219+
const [hiddenColumns, setHiddenColumns] = useState<String[]>([]);
220220

221221
const [adapter, setAdapter] = useState<EVAdapterClass | undefined>(undefined)
222222

@@ -247,7 +247,8 @@ const VariantTableWidget = observer(props => {
247247
}
248248
})
249249

250-
setColumns(columns);
250+
setColumns(columns)
251+
setHiddenColumns(columns.filter((x) => !x.hide).map((x) => x.field))
251252
const operators = fieldTypeInfoToOperators(res)
252253
setAvailableOperators(operators)
253254
setFieldTypeInfo(res)

jbrowse/src/client/JBrowse/VariantSearch/constants.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
import { GridColumns, GridComparatorFn, getGridNumericColumnOperators, GridFilterOperator, GridFilterItem, GridStateColDef, GridCellParams } from '@mui/x-data-grid';
2-
import { arrayMax } from '../utils'
1+
import {
2+
GridCellParams,
3+
GridComparatorFn,
4+
GridFilterItem,
5+
GridFilterOperator,
6+
GridStateColDef
7+
} from '@mui/x-data-grid';
8+
import { arrayMax } from '../utils';
39

4-
const parseCellValue = (cellValue) => (cellValue.valueOf() as string).split(",").map(str => {
10+
export const parseCellValue = (cellValue) => JSON.stringify(cellValue ?? "").split(",").map(str => {
511
return Number(str);
612
})
713

jbrowse/src/client/JBrowse/VariantTable/constants.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
import { GridColumns, GridComparatorFn, getGridNumericColumnOperators, GridFilterOperator, GridFilterItem, GridStateColDef, GridCellParams } from '@mui/x-data-grid';
2-
import { arrayMax } from '../utils'
1+
import {
2+
getGridNumericColumnOperators,
3+
GridCellParams,
4+
GridColumns,
5+
GridComparatorFn,
6+
GridFilterItem,
7+
GridFilterOperator,
8+
GridStateColDef
9+
} from '@mui/x-data-grid';
10+
import { arrayMax } from '../utils';
11+
import { parseCellValue } from '../VariantSearch/constants';
312

413
// TODO: we need to look into this for all numeric fields. Because some attributes are per-allele,
514
// The value of these attributes is a CSV string. See comments in dataUtils/rawFeatureToRow()
@@ -15,9 +24,6 @@ import { arrayMax } from '../utils'
1524
// val ? Number(val).toLocaleString(navigator.language, {maximumFractionDigits: 6}) : val
1625
// }).join(', ')
1726
// }
18-
const parseCellValue = (cellValue) => (cellValue.valueOf() as string).split(",").map(str => {
19-
return Number(str);
20-
})
2127

2228
const multiValueComparator: GridComparatorFn = (v1, v2) => {
2329
return arrayMax(parseCellValue(v1)) - arrayMax(parseCellValue(v2))

0 commit comments

Comments
 (0)