Merge branch 'feature/historical-conditions' of https://github.com/nasa/openmct into feature/historical-conditions

mergin master

Author: jvigliotta

e2e/tests/functional/plugins/operatorStatus/operatorStatus.e2e.spec.js

@@ -158,6 +158,20 @@ test.describe('Operator Status', () => {
     expect(updatedRowValuesArr[COLUMN_STATUS_INDEX]).toEqual(UNSET_VALUE_LABEL);
   });
 
+  test('Poll indicator is visible when window is really small', async ({ page }) => {
+    const pollIndicator = page.locator('div[title="Set my operator status"]');
+    //Make window narrow
+    await page.setViewportSize({ width: 640, height: 480 });
+    await page.getByLabel('Display as single line').click();
+    const indicatorsCount = await page.locator('.c-indicator').count();
+    //Assert that multiple indicators are active
+    expect(indicatorsCount).toBeGreaterThanOrEqual(3);
+    //Assert that indicators are expanded
+    await expect(page.locator('.l-shell__head')).toContainClass('l-shell__head--expanded');
+    //Expect poll indicator to be visible
+    await expect(pollIndicator).toBeInViewport({ ratio: 1 });
+  });
+
   test.fixme('iterate through all possible response values', async ({ page }) => {
     // test all possible response values for the poll
   });

src/plugins/operatorStatus/operatorStatus/OperatorStatusIndicator.js

@@ -21,6 +21,7 @@
  *****************************************************************************/
 import mount from 'utils/mount';
 
+import PRIORITIES from '../../../api/priority/PriorityAPI.js';
 import AbstractStatusIndicator from '../AbstractStatusIndicator.js';
 import OperatorStatusComponent from './OperatorStatus.vue';
 
@@ -62,6 +63,7 @@ export default class OperatorStatusIndicator extends AbstractStatusIndicator {
     operatorIndicator.element.classList.add('c-indicator--operator-status');
     operatorIndicator.element.classList.add('no-minify');
     operatorIndicator.on('click', this.showPopup);
+    operatorIndicator.priority = PRIORITIES.HIGHEST;
 
     return operatorIndicator;
   }

src/plugins/timeline/TimelineCompositionPolicy.js

@@ -28,7 +28,9 @@ const ALLOWED_TYPES = [
   'eventGenerator',
   'eventGeneratorWithAcknowledge',
   'yamcs.events',
-  'yamcs.event.specific.severity',
+  'yamcs.events.severity',
+  'yamcs.events.source',
+  'yamcs.events.source.severity',
   'yamcs.commands',
   'yamcs.commands.queue'
 ];
@@ -47,6 +49,12 @@ export default function TimelineCompositionPolicy(openmct) {
       if (parent.type === 'time-strip') {
         const metadata = openmct.telemetry.getMetadata(child);
 
+        if (child.type === 'yamcs.event.specific.severity') {
+          console.warn(
+            'Type yamcs.event.specific.severity is deprecated. Use yamcs.events.source.severity.'
+          );
+        }
+
         if (
           !DISALLOWED_TYPES.includes(child.type) &&
           (openmct.telemetry.hasNumericTelemetry(child) ||