From efd7369a10995fb05676a5375b720e7713b0809d Mon Sep 17 00:00:00 2001 From: Jamie V Date: Fri, 14 Feb 2025 15:06:49 -0800 Subject: [PATCH] WIP --- e2e/tests/functional/ui/inspector.e2e.spec.js | 2 +- .../styles/StylesInspectorViewProvider.js | 28 +++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/e2e/tests/functional/ui/inspector.e2e.spec.js b/e2e/tests/functional/ui/inspector.e2e.spec.js index f0620fc927..59cda89c6c 100644 --- a/e2e/tests/functional/ui/inspector.e2e.spec.js +++ b/e2e/tests/functional/ui/inspector.e2e.spec.js @@ -58,7 +58,7 @@ const viewsTabsMatrix = { Browse: ['Properties', 'Annotations'] }, 'Flexible Layout': { - Browse: ['Properties', 'Elements', 'Styles'], + Browse: ['Properties', 'Elements'], Edit: ['Elements', 'Styles', 'Properties'] }, Folder: { diff --git a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js index 1c61979cb0..333a87ae5e 100644 --- a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js +++ b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js @@ -33,7 +33,10 @@ const NON_STYLABLE_TYPES = [ 'example.imagery', 'folder', 'gantt-chart', + 'generator', 'hyperlink', + 'notebook', + 'restricted-notebook', 'summary-widget', 'webPage' ]; @@ -60,9 +63,8 @@ export default function StylesInspectorViewProvider(openmct) { const objectContext = objectSelection?.[0]?.context; const domainObject = objectContext?.item; const hasStyles = domainObject?.configuration?.objectStyles; - const isFlexibleLayoutContainer = ['flexible-layout', 'fixed-layout'].includes( - domainObject?.type - ); + const isFlexibleLayoutContainer = + domainObject?.type === 'flexible-layout' && objectContext.type === 'container'; const isLayoutItem = objectContext?.layoutItem; if (isLayoutItem || hasStyles) { @@ -82,6 +84,19 @@ export default function StylesInspectorViewProvider(openmct) { }, view: function (selection) { let _destroy = null; + const objectSelection = selection?.[0]; + const objectContext = objectSelection?.[0]?.context; + const domainObject = objectContext?.item; + const onlyEditMode = [ + 'flexible-layout', + 'LadTable', + 'LadTableSet', + 'table', + 'telemetry.plot.bar-graph', + 'telemetry.plot.overlay', + 'telemetry.plot.stacked', + 'telemetry.plot.scatter-plot' + ].includes(domainObject?.type); return { show: function (element) { @@ -105,6 +120,13 @@ export default function StylesInspectorViewProvider(openmct) { ); _destroy = destroy; }, + showTab: function (isEditing) { + if (onlyEditMode && !isEditing) { + return false; + } + + return true; + }, priority: function () { return openmct.editor.isEditing() ? openmct.priority.DEFAULT : openmct.priority.LOW; },