From 79343b8ebd001f34df9859ceda812a68b683ba0f Mon Sep 17 00:00:00 2001 From: David Tsay Date: Wed, 11 Oct 2023 15:00:45 -0700 Subject: [PATCH 1/5] rename configuration tab to 'Config' --- .../charts/bar/inspector/BarGraphInspectorViewProvider.js | 2 +- src/plugins/charts/bar/pluginSpec.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js b/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js index 7d36c7e6d3b..db51ba692da 100644 --- a/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js +++ b/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js @@ -6,7 +6,7 @@ import BarGraphOptions from './BarGraphOptions.vue'; export default function BarGraphInspectorViewProvider(openmct) { return { key: BAR_GRAPH_INSPECTOR_KEY, - name: 'Bar Graph Configuration', + name: 'Config', canView: function (selection) { if (selection.length === 0 || selection[0].length === 0) { return false; diff --git a/src/plugins/charts/bar/pluginSpec.js b/src/plugins/charts/bar/pluginSpec.js index 5de463c1ae7..0b31d8f38fb 100644 --- a/src/plugins/charts/bar/pluginSpec.js +++ b/src/plugins/charts/bar/pluginSpec.js @@ -25,7 +25,7 @@ import EventEmitter from 'EventEmitter'; import { createOpenMct, resetApplicationState } from 'utils/testing'; import Vue from 'vue'; -import { BAR_GRAPH_KEY, BAR_GRAPH_VIEW } from './BarGraphConstants'; +import { BAR_GRAPH_KEY, BAR_GRAPH_VIEW, BAR_GRAPH_INSPECTOR_KEY } from './BarGraphConstants'; import BarGraphPlugin from './plugin'; describe('the plugin', function () { @@ -578,9 +578,7 @@ describe('the plugin', function () { child.append(viewContainer); const applicableViews = openmct.inspectorViews.get(selection); - plotInspectorView = applicableViews.filter( - (view) => view.name === 'Bar Graph Configuration' - )[0]; + plotInspectorView = applicableViews.filter((view) => view.key === BAR_GRAPH_INSPECTOR_KEY)[0]; plotInspectorView.show(viewContainer); await Vue.nextTick(); From 978aa9ace6c43f1daec810a1b982ee04abfb6d62 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Wed, 11 Oct 2023 15:04:27 -0700 Subject: [PATCH 2/5] rename configuration tab to 'Config' --- .../plugins/faultManagement/faultManagement.e2e.spec.js | 4 ++-- .../faultManagement/FaultManagementInspectorViewProvider.js | 2 +- src/plugins/faultManagement/pluginSpec.js | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js b/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js index de5e196d57e..fb08968f471 100644 --- a/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js +++ b/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js @@ -40,7 +40,7 @@ test.describe('The Fault Management Plugin using example faults', () => { }) => { await utils.selectFaultItem(page, 1); - await page.getByRole('tab', { name: 'Fault Management Configuration' }).click(); + await page.getByRole('tab', { name: 'Config' }).click(); const selectedFaultName = await page .locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname') .textContent(); @@ -65,7 +65,7 @@ test.describe('The Fault Management Plugin using example faults', () => { ); expect.soft(await selectedRows.count()).toEqual(2); - await page.getByRole('tab', { name: 'Fault Management Configuration' }).click(); + await page.getByRole('tab', { name: 'Config' }).click(); const firstSelectedFaultName = await selectedRows.nth(0).textContent(); const secondSelectedFaultName = await selectedRows.nth(1).textContent(); const firstNameInInspectorCount = await page diff --git a/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js b/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js index 8aafb2f067e..09a6945f28a 100644 --- a/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js +++ b/src/plugins/faultManagement/FaultManagementInspectorViewProvider.js @@ -29,7 +29,7 @@ export default function FaultManagementInspectorViewProvider(openmct) { return { openmct: openmct, key: FAULT_MANAGEMENT_INSPECTOR, - name: 'Fault Management Configuration', + name: 'Config', canView: (selection) => { if (selection.length !== 1 || selection[0].length === 0) { return false; diff --git a/src/plugins/faultManagement/pluginSpec.js b/src/plugins/faultManagement/pluginSpec.js index ce07956580a..026f2788b40 100644 --- a/src/plugins/faultManagement/pluginSpec.js +++ b/src/plugins/faultManagement/pluginSpec.js @@ -24,7 +24,8 @@ import { createOpenMct, resetApplicationState } from '../../utils/testing'; import { FAULT_MANAGEMENT_NAMESPACE, FAULT_MANAGEMENT_TYPE, - FAULT_MANAGEMENT_VIEW + FAULT_MANAGEMENT_VIEW, + FAULT_MANAGEMENT_INSPECTOR } from './constants'; describe('The Fault Management Plugin', () => { @@ -86,7 +87,7 @@ describe('The Fault Management Plugin', () => { ]; const applicableInspectorViews = openmct.inspectorViews.get(faultDomainObjectSelection); const faultManagementInspectorView = applicableInspectorViews.filter( - (view) => view.name === 'Fault Management Configuration' + (view) => view.key === FAULT_MANAGEMENT_INSPECTOR ); expect(faultManagementInspectorView.length).toEqual(1); From 6232a2623bce60224773d424d599753799a4f9eb Mon Sep 17 00:00:00 2001 From: David Tsay Date: Wed, 11 Oct 2023 17:18:22 -0700 Subject: [PATCH 3/5] fix plots inspector view test --- src/plugins/plot/pluginSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/plot/pluginSpec.js b/src/plugins/plot/pluginSpec.js index 868f4ff2812..b876e9d1fe8 100644 --- a/src/plugins/plot/pluginSpec.js +++ b/src/plugins/plot/pluginSpec.js @@ -296,7 +296,7 @@ describe('the plugin', function () { ]; const applicableInspectorViews = openmct.inspectorViews.get(selection); const plotInspectorView = applicableInspectorViews.find( - (view) => (view.name = 'Plots Configuration') + (view) => view.key === 'plots-inspector' ); expect(plotInspectorView).toBeDefined(); From c4ca8fb45a90df14ed51f5bb3894e1e0833fb5be Mon Sep 17 00:00:00 2001 From: David Tsay Date: Thu, 12 Oct 2023 10:39:00 -0700 Subject: [PATCH 4/5] rename Table Configuration tab to 'Config' --- src/plugins/telemetryTable/TableConfigurationViewProvider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/telemetryTable/TableConfigurationViewProvider.js b/src/plugins/telemetryTable/TableConfigurationViewProvider.js index 945b3f6b6a2..f0b86d909e4 100644 --- a/src/plugins/telemetryTable/TableConfigurationViewProvider.js +++ b/src/plugins/telemetryTable/TableConfigurationViewProvider.js @@ -28,7 +28,7 @@ import TelemetryTableConfiguration from './TelemetryTableConfiguration'; export default function TableConfigurationViewProvider(openmct) { return { key: 'table-configuration', - name: 'Configuration', + name: 'Config', canView: function (selection) { if (selection.length !== 1 || selection[0].length === 0) { return false; From 6578b807a482df73dbfc3ebd6e1f758ab12aa505 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Thu, 12 Oct 2023 11:56:55 -0700 Subject: [PATCH 5/5] lint fix: simple-import-sort/imports --- src/plugins/charts/bar/pluginSpec.js | 2 +- src/plugins/faultManagement/pluginSpec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/charts/bar/pluginSpec.js b/src/plugins/charts/bar/pluginSpec.js index 0b31d8f38fb..00ba69319c9 100644 --- a/src/plugins/charts/bar/pluginSpec.js +++ b/src/plugins/charts/bar/pluginSpec.js @@ -25,7 +25,7 @@ import EventEmitter from 'EventEmitter'; import { createOpenMct, resetApplicationState } from 'utils/testing'; import Vue from 'vue'; -import { BAR_GRAPH_KEY, BAR_GRAPH_VIEW, BAR_GRAPH_INSPECTOR_KEY } from './BarGraphConstants'; +import { BAR_GRAPH_INSPECTOR_KEY, BAR_GRAPH_KEY, BAR_GRAPH_VIEW } from './BarGraphConstants'; import BarGraphPlugin from './plugin'; describe('the plugin', function () { diff --git a/src/plugins/faultManagement/pluginSpec.js b/src/plugins/faultManagement/pluginSpec.js index 026f2788b40..9ce0518626e 100644 --- a/src/plugins/faultManagement/pluginSpec.js +++ b/src/plugins/faultManagement/pluginSpec.js @@ -22,10 +22,10 @@ import { createOpenMct, resetApplicationState } from '../../utils/testing'; import { + FAULT_MANAGEMENT_INSPECTOR, FAULT_MANAGEMENT_NAMESPACE, FAULT_MANAGEMENT_TYPE, - FAULT_MANAGEMENT_VIEW, - FAULT_MANAGEMENT_INSPECTOR + FAULT_MANAGEMENT_VIEW } from './constants'; describe('The Fault Management Plugin', () => {