Skip to content

[OGUI-1846] Pass on drawing options from qcdb metadata in layout show #3239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graduta merged 3 commits into from
Dec 16, 2025
Merged

[OGUI-1846] Pass on drawing options from qcdb metadata in layout show #3239

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e2a301
[OGUI-1846] Pass on drawing options from qcdb metadata in layout show
graduta Dec 15, 2025
233b0a3
Improve safety catch on undefined
graduta Dec 16, 2025
42397d2
Merge branch 'dev' into bug/QCG/OGUI-1846/apply-object-metadata-store…
graduta Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions QualityControl/public/layout/view/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,29 @@ function chartView(model, tabObject) {
/**
* Method to generate a component containing a header with actions and a jsroot plot
* @param {Model} model - root model of the application
* @param {object} tabObject - to be drawn with jsroot
* @param {TabObject} tabObject - object with information form QCG own storage
* @returns {vnode} - virtual node element
*/
const drawComponent = (model, tabObject) => {
const { displayTimestamp = false } = model.layout.item;
const { name, options: drawingOptions = [] } = tabObject;

const { name, options: drawingOptions = [], ignoreDefaults } = tabObject;

const objectFromQcdbAsRemoteData = model?.object?.objects?.[name] ?? {};
const { displayHints = [], drawOptions = [] } = objectFromQcdbAsRemoteData?.payload ?? {};

let toUseDrawingOptions = [];
if (ignoreDefaults) {
toUseDrawingOptions = Array.from(new Set(drawingOptions));
} else {
toUseDrawingOptions = Array.from(new Set([...drawingOptions, ...displayHints, ...drawOptions]));
}
const lastModified = model.object.getLastModifiedByName(name);
const runNumber = model.object.getRunNumberByName(name);

return h('', { style: 'height:100%; display: flex; flex-direction: column' }, [
return h('', {
key: `key-chart-component-${name}-${toUseDrawingOptions.join('-')}`,
style: 'height:100%; display: flex; flex-direction: column',
}, [
h('.jsrootdiv', {
style: {
'z-index': 90,
Expand All @@ -211,9 +224,9 @@ const drawComponent = (model, tabObject) => {
'flex-direction': 'column',
},
}, draw(
model.object.objects[tabObject.name],
objectFromQcdbAsRemoteData,
{},
drawingOptions,
toUseDrawingOptions,
(error) => model.object.invalidObject(tabObject.name, error.message),
)),
objectInfoResizePanel(model, tabObject),
Expand Down
Loading