diff --git a/e2e/tests/functional/plugins/lad/lad.e2e.spec.js b/e2e/tests/functional/plugins/lad/lad.e2e.spec.js index eb5dec56b0..702bfce81a 100644 --- a/e2e/tests/functional/plugins/lad/lad.e2e.spec.js +++ b/e2e/tests/functional/plugins/lad/lad.e2e.spec.js @@ -21,7 +21,7 @@ *****************************************************************************/ const { test, expect } = require('../../../../pluginFixtures'); -const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions'); +const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode, selectInspectorTab } = require('../../../../appActions'); test.describe('Testing LAD table configuration', () => { test.beforeEach(async ({ page }) => { @@ -48,7 +48,7 @@ test.describe('Testing LAD table configuration', () => { // Add the Sine Wave Generator to the LAD table and save changes await page.dragAndDrop('role=treeitem[name=/Test Sine Wave Generator/]', '.c-lad-table-wrapper'); // select configuration tab in inspector - await page.getByRole('tab', { name: 'LAD Table Configuration' }).getByText('LAD Table Configuration').click(); + await selectInspectorTab(page, 'LAD Table Configuration'); // make sure headers are visible initially await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible(); @@ -78,7 +78,7 @@ test.describe('Testing LAD table configuration', () => { // Edit LAD table await page.locator('[title="Edit"]').click(); - await page.getByRole('tab', { name: 'LAD Table Configuration' }).getByText('LAD Table Configuration').click(); + await selectInspectorTab(page, 'LAD Table Configuration'); // show timestamp column await page.getByLabel('Timestamp').check(); @@ -96,7 +96,7 @@ test.describe('Testing LAD table configuration', () => { // Edit LAD table await page.locator('[title="Edit"]').click(); - await page.getByRole('tab', { name: 'LAD Table Configuration' }).getByText('LAD Table Configuration').click(); + await selectInspectorTab(page, 'LAD Table Configuration'); // show units and type columns await page.getByLabel('Units').check(); diff --git a/src/plugins/LADTable/LADTableConfigurationViewProvider.js b/src/plugins/LADTable/LADTableConfigurationViewProvider.js index 1e0c012e22..8eac4a2996 100644 --- a/src/plugins/LADTable/LADTableConfigurationViewProvider.js +++ b/src/plugins/LADTable/LADTableConfigurationViewProvider.js @@ -52,6 +52,9 @@ export default function LADTableConfigurationViewProvider(openmct) { template: '' }); }, + priority() { + return 1; + }, destroy() { if (component) { component.$destroy(); @@ -59,9 +62,6 @@ export default function LADTableConfigurationViewProvider(openmct) { } } }; - }, - priority() { - return 1; } }; } diff --git a/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js b/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js index 61e9245bd2..4bf8f0161b 100644 --- a/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js +++ b/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js @@ -33,6 +33,9 @@ export default function BarGraphInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -40,9 +43,6 @@ export default function BarGraphInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; } diff --git a/src/plugins/charts/scatter/inspector/ScatterPlotInspectorViewProvider.js b/src/plugins/charts/scatter/inspector/ScatterPlotInspectorViewProvider.js index ea7ae6d414..bd3a9ef42f 100644 --- a/src/plugins/charts/scatter/inspector/ScatterPlotInspectorViewProvider.js +++ b/src/plugins/charts/scatter/inspector/ScatterPlotInspectorViewProvider.js @@ -33,6 +33,9 @@ export default function ScatterPlotInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -40,9 +43,6 @@ export default function ScatterPlotInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; } diff --git a/src/plugins/displayLayout/AlphanumericFormatViewProvider.js b/src/plugins/displayLayout/AlphanumericFormatViewProvider.js index ce96df6f0b..7d48254a08 100644 --- a/src/plugins/displayLayout/AlphanumericFormatViewProvider.js +++ b/src/plugins/displayLayout/AlphanumericFormatViewProvider.js @@ -56,6 +56,10 @@ class AlphanumericFormatView { return this.component.$refs.alphanumericFormat.getViewContext(); } + priority() { + return 1; + } + destroy() { this.component.$destroy(); this.component = undefined; @@ -89,9 +93,6 @@ export default function AlphanumericFormatViewProvider(openmct, options) { }, view: function (domainObject, objectPath) { return new AlphanumericFormatView(openmct, domainObject, objectPath); - }, - priority: function () { - return 1; } }; } diff --git a/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js b/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js index 9204b87123..3b5479fbce 100644 --- a/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js +++ b/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js @@ -56,6 +56,9 @@ export default function FaultManagementInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -63,9 +66,6 @@ export default function FaultManagementInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; } diff --git a/src/plugins/filters/FiltersInspectorViewProvider.js b/src/plugins/filters/FiltersInspectorViewProvider.js index 170ee83bd6..6d568cc81b 100644 --- a/src/plugins/filters/FiltersInspectorViewProvider.js +++ b/src/plugins/filters/FiltersInspectorViewProvider.js @@ -61,6 +61,9 @@ define([ return hasPersistedFilters || hasGlobalFilters; }, + priority: function () { + return openmct.priority.DEFAULT; + }, destroy: function () { if (component) { component.$destroy(); @@ -68,9 +71,6 @@ define([ } } }; - }, - priority: function () { - return openmct.priority.DEFAULT; } }; } diff --git a/src/plugins/inspectorViews/annotations/AnnotationsViewProvider.js b/src/plugins/inspectorViews/annotations/AnnotationsViewProvider.js index 2f25acdfe1..97ba47b69b 100644 --- a/src/plugins/inspectorViews/annotations/AnnotationsViewProvider.js +++ b/src/plugins/inspectorViews/annotations/AnnotationsViewProvider.js @@ -49,14 +49,14 @@ export default function ElementsViewProvider(openmct) { template: `` }); }, + priority: function () { + return openmct.priority.DEFAULT; + }, destroy: function () { component.$destroy(); component = undefined; } }; - }, - priority: function () { - return this.openmct.priority.DEFAULT; } }; } diff --git a/src/plugins/inspectorViews/elements/ElementsViewProvider.js b/src/plugins/inspectorViews/elements/ElementsViewProvider.js index 993a700f5d..6e39c575d1 100644 --- a/src/plugins/inspectorViews/elements/ElementsViewProvider.js +++ b/src/plugins/inspectorViews/elements/ElementsViewProvider.js @@ -57,14 +57,14 @@ export default function ElementsViewProvider(openmct) { return hasComposition && isEditing; }, + priority: function () { + return openmct.priority.DEFAULT; + }, destroy: function () { component.$destroy(); component = undefined; } }; - }, - priority: function () { - return this.openmct.priority.DEFAULT; } }; } diff --git a/src/plugins/inspectorViews/elements/PlotElementsViewProvider.js b/src/plugins/inspectorViews/elements/PlotElementsViewProvider.js index 309c35f525..4174029e42 100644 --- a/src/plugins/inspectorViews/elements/PlotElementsViewProvider.js +++ b/src/plugins/inspectorViews/elements/PlotElementsViewProvider.js @@ -54,14 +54,14 @@ export default function PlotElementsViewProvider(openmct) { return hasComposition && isEditing; }, + priority: function () { + return openmct.priority.DEFAULT; + }, destroy: function () { component.$destroy(); component = undefined; } }; - }, - priority: function () { - return this.openmct.priority.DEFAULT; } }; } diff --git a/src/plugins/inspectorViews/properties/PropertiesViewProvider.js b/src/plugins/inspectorViews/properties/PropertiesViewProvider.js index 2d350fc1bf..d90f837a70 100644 --- a/src/plugins/inspectorViews/properties/PropertiesViewProvider.js +++ b/src/plugins/inspectorViews/properties/PropertiesViewProvider.js @@ -47,14 +47,14 @@ export default function PropertiesViewProvider(openmct) { template: `` }); }, + priority: function () { + return openmct.priority.DEFAULT; + }, destroy: function () { component.$destroy(); component = undefined; } }; - }, - priority: function () { - return this.openmct.priority.DEFAULT; } }; } diff --git a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js index a32b23e39b..669ae6c524 100644 --- a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js +++ b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js @@ -76,14 +76,14 @@ export default function StylesInspectorViewProvider(openmct) { template: `` }); }, + priority: function () { + return openmct.priority.DEFAULT; + }, destroy: function () { component.$destroy(); component = undefined; } }; - }, - priority: function () { - return this.openmct.priority.DEFAULT; } }; } diff --git a/src/plugins/plan/inspector/PlanInspectorViewProvider.js b/src/plugins/plan/inspector/PlanInspectorViewProvider.js index cb66f1fc97..019125fb69 100644 --- a/src/plugins/plan/inspector/PlanInspectorViewProvider.js +++ b/src/plugins/plan/inspector/PlanInspectorViewProvider.js @@ -54,6 +54,9 @@ export default function PlanInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -61,9 +64,6 @@ export default function PlanInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; } diff --git a/src/plugins/plot/inspector/PlotsInspectorViewProvider.js b/src/plugins/plot/inspector/PlotsInspectorViewProvider.js index 555ff6a123..0f39c36d9d 100644 --- a/src/plugins/plot/inspector/PlotsInspectorViewProvider.js +++ b/src/plugins/plot/inspector/PlotsInspectorViewProvider.js @@ -44,6 +44,9 @@ export default function PlotsInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -51,9 +54,6 @@ export default function PlotsInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; } diff --git a/src/plugins/plot/inspector/StackedPlotsInspectorViewProvider.js b/src/plugins/plot/inspector/StackedPlotsInspectorViewProvider.js index a0404f1cda..249bb56c6a 100644 --- a/src/plugins/plot/inspector/StackedPlotsInspectorViewProvider.js +++ b/src/plugins/plot/inspector/StackedPlotsInspectorViewProvider.js @@ -42,6 +42,9 @@ export default function StackedPlotsInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -49,9 +52,6 @@ export default function StackedPlotsInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; } diff --git a/src/plugins/telemetryTable/TableConfigurationViewProvider.js b/src/plugins/telemetryTable/TableConfigurationViewProvider.js index 003f378a8a..6da6a4ce50 100644 --- a/src/plugins/telemetryTable/TableConfigurationViewProvider.js +++ b/src/plugins/telemetryTable/TableConfigurationViewProvider.js @@ -64,6 +64,9 @@ define([ template: '' }); }, + priority: function () { + return 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -73,9 +76,6 @@ define([ tableConfiguration = undefined; } }; - }, - priority: function () { - return 1; } }; } diff --git a/src/plugins/timelist/inspector/TimeListInspectorViewProvider.js b/src/plugins/timelist/inspector/TimeListInspectorViewProvider.js index cb438a6a82..e79eb239c0 100644 --- a/src/plugins/timelist/inspector/TimeListInspectorViewProvider.js +++ b/src/plugins/timelist/inspector/TimeListInspectorViewProvider.js @@ -55,6 +55,9 @@ export default function TimeListInspectorViewProvider(openmct) { template: '' }); }, + priority: function () { + return openmct.priority.HIGH + 1; + }, destroy: function () { if (component) { component.$destroy(); @@ -62,9 +65,6 @@ export default function TimeListInspectorViewProvider(openmct) { } } }; - }, - priority: function () { - return openmct.priority.HIGH + 1; } }; }