From 310bd1780055ea94bb2c88f32bb92b4bb245ab76 Mon Sep 17 00:00:00 2001 From: Jamie V Date: Wed, 12 Feb 2025 13:37:39 -0800 Subject: [PATCH] stopping point --- e2e/tests/functional/ui/inspector.e2e.spec.js | 2 +- .../inspectorViews/elements/ElementsViewProvider.js | 3 ++- .../styles/StylesInspectorViewProvider.js | 12 ++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/e2e/tests/functional/ui/inspector.e2e.spec.js b/e2e/tests/functional/ui/inspector.e2e.spec.js index 59cda89c6c..f0620fc927 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'], + Browse: ['Properties', 'Elements', 'Styles'], Edit: ['Elements', 'Styles', 'Properties'] }, Folder: { diff --git a/src/plugins/inspectorViews/elements/ElementsViewProvider.js b/src/plugins/inspectorViews/elements/ElementsViewProvider.js index a0b0d8b321..14a7f7949a 100644 --- a/src/plugins/inspectorViews/elements/ElementsViewProvider.js +++ b/src/plugins/inspectorViews/elements/ElementsViewProvider.js @@ -31,8 +31,9 @@ export default function ElementsViewProvider(openmct) { canView: function (selection) { const hasValidSelection = selection?.length; const isOverlayPlot = selection?.[0]?.[0]?.context?.item?.type === 'telemetry.plot.overlay'; + const isFolder = selection?.[0]?.[0]?.context?.item?.type === 'folder'; - return hasValidSelection && !isOverlayPlot; + return hasValidSelection && !isOverlayPlot && !isFolder; }, view: function (selection) { let _destroy = null; diff --git a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js index f81066e7dc..1c61979cb0 100644 --- a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js +++ b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js @@ -26,12 +26,16 @@ import StylesInspectorView from './StylesInspectorView.vue'; import stylesManager from './StylesManager.js'; const NON_STYLABLE_TYPES = [ - 'folder', - 'webPage', + 'clock', 'conditionSet', - 'summary-widget', + 'eventGenerator', + 'eventGeneratorWithAcknowledge', + 'example.imagery', + 'folder', + 'gantt-chart', 'hyperlink', - 'clock' + 'summary-widget', + 'webPage' ]; function isLayoutObject(selection, objectType) {