Skip to content

Commit

Permalink
Session wide about detail formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
cmdcolin committed Sep 29, 2022
1 parent 8f2d63d commit fc0119d
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 5 deletions.
14 changes: 11 additions & 3 deletions packages/core/ui/AboutDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import {
} from '@mui/material'
import CloseIcon from '@mui/icons-material/Close'
import { makeStyles } from 'tss-react/mui'
import { readConfObject, AnyConfigurationModel } from '../configuration'
import {
getConf,
readConfObject,
AnyConfigurationModel,
} from '../configuration'
import { getSession } from '../util'
import { getTrackName } from '../util/tracks'
import { BaseCard, Attributes } from '../BaseFeatureWidget/BaseFeatureDetail'
Expand Down Expand Up @@ -43,10 +47,14 @@ export default function AboutDialog({
const session = getSession(config)
const { rpcManager } = session
const conf = readConfObject(config)
const hideUris = readConfObject(config, ['formatAbout', 'hideUris'])
const hideUris =
readConfObject(config, ['formatAbout', 'hideUris']) ||
getConf(session, ['formatAbout', 'hideUris'])

const confPost = {
...conf,
...readConfObject(config, ['formatAbout', 'conf'], { conf }),
...getConf(session, ['formatAbout', 'conf'], { conf }),
}

useEffect(() => {
Expand Down Expand Up @@ -102,7 +110,7 @@ export default function AboutDialog({
</DialogTitle>
<DialogContent className={classes.content}>
<BaseCard title="Configuration">
{hideUris ? (
{!hideUris ? (
<Button
variant="contained"
style={{ float: 'right' }}
Expand Down
31 changes: 31 additions & 0 deletions products/jbrowse-web/src/jbrowseModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,37 @@ export default function JBrowseWeb(
defaultValue: ['mRNA', 'transcript'],
},
}),
formatDetails: ConfigurationSchema('FormatDetails', {
feature: {
type: 'frozen',
description: 'adds extra fields to the feature details',
defaultValue: {},
contextVariable: ['feature'],
},
subfeatures: {
type: 'frozen',
description: 'adds extra fields to the subfeatures of a feature',
defaultValue: {},
contextVariable: ['feature'],
},
depth: {
type: 'number',
defaultValue: 2,
description: 'depth to iterate on subfeatures',
},
}),
formatAbout: ConfigurationSchema('FormatAbout', {
conf: {
type: 'frozen',
description: 'formats configuration object in about dialog',
defaultValue: {},
contextVariable: ['conf'],
},
hideUris: {
type: 'boolean',
defaultValue: false,
},
}),
disableAnalytics: {
type: 'boolean',
defaultValue: false,
Expand Down
6 changes: 4 additions & 2 deletions products/jbrowse-web/src/sessionModelFactory.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { lazy } from 'react'
import clone from 'clone'
import { AnyConfigurationModel } from '@jbrowse/core/configuration/configurationSchema'
import shortid from 'shortid'
import { PluginDefinition } from '@jbrowse/core/PluginLoader'
import {
readConfObject,
getConf,
isConfigurationModel,
AnyConfigurationModel,
} from '@jbrowse/core/configuration'
import {
Region,
Expand Down Expand Up @@ -38,11 +39,12 @@ import {
import PluginManager from '@jbrowse/core/PluginManager'
import TextSearchManager from '@jbrowse/core/TextSearch/TextSearchManager'
import RpcManager from '@jbrowse/core/rpc/RpcManager'

// icons
import SettingsIcon from '@mui/icons-material/Settings'
import CopyIcon from '@mui/icons-material/FileCopy'
import DeleteIcon from '@mui/icons-material/Delete'
import InfoIcon from '@mui/icons-material/Info'
import shortid from 'shortid'

const AboutDialog = lazy(() => import('@jbrowse/core/ui/AboutDialog'))

Expand Down
4 changes: 4 additions & 0 deletions test_data/volvox/config_main_thread.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"configuration": {
"rpc": {
"defaultDriver": "MainThreadRpcDriver"
},
"formatAbout": {
"hideUris": true,
"conf": "jexl:{extraField:'important data'}"
}
},
"assemblies": [
Expand Down

0 comments on commit fc0119d

Please sign in to comment.