Changes for tabs visibility and priority

- Priorities set for Graph, Lad Table, Scatter Plot, Telem Tables and Time List views. - Changed several Inspector tab names to 'Config'; tests and other code changed to target `key` instead of `name`: - LAD Table - Time List - will need regression testing for change noted re. `key` above. - Created browse mode read-only Inspector views: - LAD Table, Lad Table set. - Telemetry Table. and `showTab` functions; `showTab` has just been set to true for now. to prevent it from displaying when no filters can be set. - Changed AnnotationsViewProvider.js canView to return false if editor.isEditing. - Plot plugin.js now adds configuration.objectStyles {} for overlay and stacked plots on initialize. - FiltersView now displays a message for telem sources that don't have filter criteria available. - Code cleanup in FiltersInspectorViewProvider.js to remove metadata checks that never evaluated. - Annotations tab now set to never display when a view is being edited.
nasa · Jan 17, 2025 · 3527e4e · 3527e4e
1 parent f4f010a
commit 3527e4e
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 97 deletions.
diff --git a/e2e/helper/planningUtils.js b/e2e/helper/planningUtils.js
@@ -224,7 +224,7 @@ export async function createTimelistWithPlanAndSetActivityInProgress(page, planJ
   await page.getByRole('button', { name: 'Edit Object' }).click();
 
   // Find the display properties section in the inspector
-  await page.getByRole('tab', { name: 'View Properties' }).click();
+  await page.getByRole('tab', { name: 'Config' }).click();
   // Switch to expanded view and save the setting
   await page.getByLabel('Display Style').selectOption({ label: 'Expanded' });
 

diff --git a/e2e/tests/functional/planning/timelist.e2e.spec.js b/e2e/tests/functional/planning/timelist.e2e.spec.js
@@ -132,7 +132,7 @@ test("View a timelist in expanded view, verify all the activities are displayed
     await page.getByRole('button', { name: 'Edit Object' }).click();
 
     // Find the display properties section in the inspector
-    await page.getByRole('tab', { name: 'View Properties' }).click();
+    await page.getByRole('tab', { name: 'Config' }).click();
     // Switch to expanded view and save the setting
     await page.getByLabel('Display Style').selectOption({ label: 'Expanded' });
 

diff --git a/e2e/tests/functional/plugins/lad/lad.e2e.spec.js b/e2e/tests/functional/plugins/lad/lad.e2e.spec.js
@@ -53,7 +53,7 @@ test.describe('Testing LAD table configuration', () => {
   test('in edit mode, LAD Tables provide ability to hide columns', async ({ page }) => {
     // Edit LAD table
     await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
+    await page.getByRole('tab', { name: 'Config' }).click();
 
     // make sure headers are visible initially
     await expect(page.getByRole('columnheader', { name: 'Timestamp', exact: true })).toBeVisible();
@@ -114,7 +114,7 @@ test.describe('Testing LAD table configuration', () => {
 
     // Edit LAD table
     await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
+    await page.getByRole('tab', { key: 'lad-table-configuration' }).click();
 
     // show timestamp column
     await page.getByLabel('Timestamp', { exact: true }).check();
@@ -142,7 +142,7 @@ test.describe('Testing LAD table configuration', () => {
 
     // Edit LAD table
     await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
+    await page.getByRole('tab', { key: 'lad-table-configuration' }).click();
 
     // show units, type, and WATCH columns
     await page.getByLabel('Units').check();
@@ -182,7 +182,7 @@ test.describe('Testing LAD table configuration', () => {
 
     // Edit LAD table
     await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'LAD Table Configuration' }).click();
+    await page.getByRole('tab', { key: 'lad-table-configuration' }).click();
 
     // make sure Sine Wave headers are visible initially too
     await expect(page.getByRole('columnheader', { name: 'Timestamp', exact: true })).toBeVisible();

diff --git a/src/plugins/LADTable/LADTableConfigurationViewProvider.js b/src/plugins/LADTable/LADTableConfigurationViewProvider.js
@@ -27,7 +27,7 @@ import LadTableConfiguration from './components/LadTableConfiguration.vue';
 export default function LADTableConfigurationViewProvider(openmct) {
   return {
     key: 'lad-table-configuration',
-    name: 'LAD Table Configuration',
+    name: 'Config',
     canView(selection) {
       if (selection.length !== 1 || selection[0].length === 0) {
         return false;
@@ -61,7 +61,7 @@ export default function LADTableConfigurationViewProvider(openmct) {
           _destroy = destroy;
         },
         priority() {
-          return 1;
+          return openmct.editor.isEditing() ? openmct.priority.HIGH + 1 : openmct.priority.DEFAULT;
         },
         destroy() {
           if (_destroy) {

diff --git a/src/plugins/LADTable/components/LadTableConfiguration.vue b/src/plugins/LADTable/components/LadTableConfiguration.vue
@@ -22,28 +22,24 @@
 
 <template>
   <div class="c-inspect-properties">
-    <template v-if="isEditing">
-      <div class="c-inspect-properties__header">Table Column Visibility</div>
-      <ul class="c-inspect-properties__section">
-        <li v-for="(title, key) in headers" :key="key" class="c-inspect-properties__row">
-          <div class="c-inspect-properties__label" title="Show or hide column">
-            <label :for="key + 'ColumnControl'">{{ title }}</label>
-          </div>
-          <div class="c-inspect-properties__value">
-            <input
-              :id="key + 'ColumnControl'"
-              type="checkbox"
-              :checked="configuration.hiddenColumns[key] !== true"
-              @change="toggleColumn(key)"
-            />
-          </div>
-        </li>
-      </ul>
-    </template>
-    <template v-else>
-      <div class="c-inspect-properties__header">LAD Table Configuration</div>
-      <div class="c-inspect-properties__row--span-all">Only available in edit mode.</div>
-    </template>
+    <div class="c-inspect-properties__header">Table Column Visibility</div>
+    <ul class="c-inspect-properties__section">
+      <li v-for="(title, key) in headers" :key="key" class="c-inspect-properties__row">
+        <div class="c-inspect-properties__label" title="Show or hide column">
+          <label :for="key + 'ColumnControl'">{{ title }}</label>
+        </div>
+        <div class="c-inspect-properties__value">
+          <input
+            :id="key + 'ColumnControl'"
+            type="checkbox"
+            v-if="isEditing"
+            :checked="configuration.hiddenColumns[key] !== true"
+            @change="toggleColumn(key)"
+          />
+          <span v-if="!isEditing && configuration.hiddenColumns[key] !== true">Visible</span>
+        </div>
+      </li>
+    </ul>
   </div>
 </template>
 

diff --git a/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js b/src/plugins/charts/bar/inspector/BarGraphInspectorViewProvider.js
@@ -41,7 +41,7 @@ export default function BarGraphInspectorViewProvider(openmct) {
           _destroy = destroy;
         },
         priority: function () {
-          return openmct.priority.HIGH + 1;
+          return openmct.editor.isEditing() ? openmct.priority.HIGH + 1 : openmct.priority.DEFAULT;
         },
         destroy: function () {
           if (_destroy) {

diff --git a/src/plugins/charts/scatter/inspector/ScatterPlotInspectorViewProvider.js b/src/plugins/charts/scatter/inspector/ScatterPlotInspectorViewProvider.js
@@ -40,7 +40,7 @@ export default function ScatterPlotInspectorViewProvider(openmct) {
           _destroy = destroy;
         },
         priority: function () {
-          return openmct.priority.HIGH + 1;
+          return openmct.editor.isEditing() ? openmct.priority.HIGH + 1 : openmct.priority.DEFAULT;
         },
         destroy: function () {
           if (_destroy) {

diff --git a/src/plugins/filters/FiltersInspectorViewProvider.js b/src/plugins/filters/FiltersInspectorViewProvider.js
@@ -43,8 +43,6 @@ export default class FiltersInspectorViewProvider {
     let openmct = this.openmct;
     let _destroy = null;
 
-    const domainObject = selection?.[0]?.[0]?.context?.item;
-
     return {
       show: function (element) {
         const { destroy } = mount(
@@ -69,13 +67,6 @@ export default class FiltersInspectorViewProvider {
         if (isEditing) {
           return true;
         }
-
-        const metadata = openmct.telemetry.getMetadata(domainObject);
-        const metadataWithFilters = metadata
-          ? metadata.valueMetadatas.filter((value) => value.filters)
-          : [];
-
-        return metadataWithFilters.length;
       },
       priority: function () {
         return openmct.priority.DEFAULT;

diff --git a/src/plugins/filters/components/FiltersView.vue b/src/plugins/filters/components/FiltersView.vue
@@ -38,6 +38,9 @@
       @update-filters="persistFilters"
     />
   </ul>
+  <span v-else>
+    This view doesn't include any parameters that have configured filter criteria.
+  </span>
 </template>
 
 <script>

diff --git a/src/plugins/inspectorViews/annotations/AnnotationsViewProvider.js b/src/plugins/inspectorViews/annotations/AnnotationsViewProvider.js
@@ -34,7 +34,7 @@ export default function AnnotationsViewProvider(openmct) {
       const domainObject = selectionContext?.item;
       const isLayoutItem = selectionContext?.layoutItem;
 
-      if (availableTags.length < 1 || isLayoutItem || !domainObject) {
+      if (availableTags.length < 1 || isLayoutItem || !domainObject || openmct.editor.isEditing()) {
         return false;
       }
 

diff --git a/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js b/src/plugins/inspectorViews/styles/StylesInspectorViewProvider.js
@@ -97,7 +97,7 @@ export default function StylesInspectorViewProvider(openmct) {
           _destroy = destroy;
         },
         priority: function () {
-          return openmct.priority.DEFAULT;
+          return openmct.editor.isEditing() ? openmct.priority.DEFAULT : openmct.priority.LOW;
         },
         destroy: function () {
           if (_destroy) {

diff --git a/src/plugins/plot/inspector/StackedPlotsInspectorViewProvider.js b/src/plugins/plot/inspector/StackedPlotsInspectorViewProvider.js
@@ -50,7 +50,7 @@ export default function StackedPlotsInspectorViewProvider(openmct) {
           _destroy = destroy;
         },
         priority: function () {
-          return openmct.priority.HIGH + 1;
+          return openmct.editor.isEditing() ? openmct.priority.HIGH + 1 : openmct.priority.DEFAULT;
         },
         destroy: function () {
           if (_destroy) {

diff --git a/src/plugins/plot/plugin.js b/src/plugins/plot/plugin.js
@@ -42,7 +42,8 @@ export default function () {
         domainObject.composition = [];
         domainObject.configuration = {
           //series is an array of objects of type: {identifier, series: {color...}, yAxis:{}}
-          series: []
+          series: [],
+          objectStyles: {}
         };
       },
       priority: 891
@@ -60,7 +61,8 @@ export default function () {
         domainObject.configuration = {
           series: [],
           yAxis: {},
-          xAxis: {}
+          xAxis: {},
+          objectStyles: {}
         };
       },
       priority: 890

diff --git a/src/plugins/telemetryTable/TableConfigurationViewProvider.js b/src/plugins/telemetryTable/TableConfigurationViewProvider.js
@@ -66,10 +66,10 @@ export default function TableConfigurationViewProvider(openmct, options) {
           _destroy = destroy;
         },
         showTab: function (isEditing) {
-          return isEditing;
+          return true;
         },
         priority: function () {
-          return 1;
+          return openmct.editor.isEditing() ? openmct.priority.HIGH + 1 : openmct.priority.DEFAULT;
         },
         destroy: function () {
           if (_destroy) {

diff --git a/src/plugins/telemetryTable/components/TableConfiguration.vue b/src/plugins/telemetryTable/components/TableConfiguration.vue
@@ -21,53 +21,57 @@
 -->
 <template>
   <div class="c-inspect-properties">
-    <template v-if="isEditing">
-      <div class="c-inspect-properties__header">Layout</div>
-      <ul class="c-inspect-properties__section">
-        <li class="c-inspect-properties__row">
-          <div class="c-inspect-properties__label" title="Auto-size table">
-            <label for="AutoSizeControl">Auto-size</label>
-          </div>
-          <div class="c-inspect-properties__value">
-            <input
-              id="AutoSizeControl"
-              type="checkbox"
-              :checked="configuration.autosize !== false"
-              @change="toggleAutosize()"
-            />
-          </div>
-        </li>
-        <li class="c-inspect-properties__row">
-          <div class="c-inspect-properties__label" title="Show or hide headers">
-            <label for="header-visibility">Hide Header</label>
-          </div>
-          <div class="c-inspect-properties__value">
-            <input
-              id="header-visibility"
-              type="checkbox"
-              :checked="configuration.hideHeaders === true"
-              @change="toggleHeaderVisibility"
-            />
-          </div>
-        </li>
-      </ul>
-      <div class="c-inspect-properties__header">Columns</div>
-      <ul class="c-inspect-properties__section">
-        <li v-for="(title, key) in headers" :key="key" class="c-inspect-properties__row">
-          <div class="c-inspect-properties__label" title="Show or hide column">
-            <label :for="key + 'ColumnControl'">{{ title }}</label>
-          </div>
-          <div class="c-inspect-properties__value">
-            <input
-              :id="key + 'ColumnControl'"
-              type="checkbox"
-              :checked="configuration.hiddenColumns[key] !== true"
-              @change="toggleColumn(key)"
-            />
-          </div>
-        </li>
-      </ul>
-    </template>
+    <div class="c-inspect-properties__header">Layout</div>
+    <ul class="c-inspect-properties__section">
+      <li class="c-inspect-properties__row">
+        <div class="c-inspect-properties__label" title="Auto-size table">
+          <label for="AutoSizeControl">Auto-size</label>
+        </div>
+        <div class="c-inspect-properties__value">
+          <input
+            v-if="isEditing"
+            id="AutoSizeControl"
+            type="checkbox"
+            :checked="configuration.autosize !== false"
+            @change="toggleAutosize()"
+          />
+          <span v-if="!isEditing && configuration.autosize !== false">Enabled</span>
+        </div>
+      </li>
+      <li class="c-inspect-properties__row">
+        <div class="c-inspect-properties__label" title="Show or hide headers">
+          <label for="header-visibility">Hide Header</label>
+        </div>
+        <div class="c-inspect-properties__value">
+          <input
+            v-if="isEditing"
+            id="header-visibility"
+            type="checkbox"
+            :checked="configuration.hideHeaders === true"
+            @change="toggleHeaderVisibility"
+          />
+          <span v-if="!isEditing && configuration.hideHeaders === true">True</span>
+        </div>
+      </li>
+    </ul>
+    <div class="c-inspect-properties__header">Columns</div>
+    <ul class="c-inspect-properties__section">
+      <li v-for="(title, key) in headers" :key="key" class="c-inspect-properties__row">
+        <div class="c-inspect-properties__label" title="Show or hide column">
+          <label :for="key + 'ColumnControl'">{{ title }}</label>
+        </div>
+        <div class="c-inspect-properties__value">
+          <input
+            v-if="isEditing"
+            :id="key + 'ColumnControl'"
+            type="checkbox"
+            :checked="configuration.hiddenColumns[key] !== true"
+            @change="toggleColumn(key)"
+          />
+          <span v-if="!isEditing && configuration.hiddenColumns[key] !== true">Visible</span>
+        </div>
+      </li>
+    </ul>
   </div>
 </template>
 

diff --git a/src/plugins/timelist/inspector/TimeListInspectorViewProvider.js b/src/plugins/timelist/inspector/TimeListInspectorViewProvider.js
@@ -28,7 +28,7 @@ import TimelistPropertiesView from './TimelistPropertiesView.vue';
 export default function TimeListInspectorViewProvider(openmct) {
   return {
     key: 'timelist-inspector',
-    name: 'View Properties',
+    name: 'Config',
     canView: function (selection) {
       if (selection.length === 0 || selection[0].length === 0) {
         return false;
@@ -63,7 +63,7 @@ export default function TimeListInspectorViewProvider(openmct) {
           _destroy = destroy;
         },
         priority: function () {
-          return openmct.priority.HIGH + 1;
+          return openmct.editor.isEditing() ? openmct.priority.HIGH + 1 : openmct.priority.DEFAULT;
         },
         destroy: function () {
           if (_destroy) {