From fc0119d09ebb1dad90a23086dd8c90b354e3cc82 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 29 Sep 2022 08:14:26 -0600 Subject: [PATCH] Session wide about detail formatter --- packages/core/ui/AboutDialog.tsx | 14 +++++++-- products/jbrowse-web/src/jbrowseModel.ts | 31 +++++++++++++++++++ .../jbrowse-web/src/sessionModelFactory.ts | 6 ++-- test_data/volvox/config_main_thread.json | 4 +++ 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/packages/core/ui/AboutDialog.tsx b/packages/core/ui/AboutDialog.tsx index b125c04ed2..ba69fe9700 100644 --- a/packages/core/ui/AboutDialog.tsx +++ b/packages/core/ui/AboutDialog.tsx @@ -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' @@ -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(() => { @@ -102,7 +110,7 @@ export default function AboutDialog({ - {hideUris ? ( + {!hideUris ? (