Merge branch 'master' into telemetry-comps

Author: shefalijoshi

e2e/appActions.js

@@ -747,13 +747,30 @@ async function getNextSineValueFromSWG(page, objectIdentifier, returnOnlyValue =
   return getTelemValuePromise;
 }
 
+async function expandInspectorPane(page) {
+  await page.getByRole('button', { name: 'Inspect' }).click();
+  // eslint-disable-next-line playwright/no-raw-locators
+  await expect(page.locator('.l-shell__pane-inspector > .l-pane__contents')).toHaveCSS(
+    'opacity',
+    '1'
+  );
+}
+
+async function expandTreePane(page) {
+  await page.getByRole('button', { name: 'Browse' }).click();
+  // eslint-disable-next-line playwright/no-raw-locators
+  await expect(page.locator('.l-shell__pane-tree > .l-pane__contents')).toHaveCSS('opacity', '1');
+}
+
 export {
   createDomainObjectWithDefaults,
   createExampleTelemetryObject,
   createNotification,
   createPlanFromJSON,
   createStableStateTelemetry,
   expandEntireTree,
+  expandInspectorPane,
+  expandTreePane,
   getCanvasPixels,
   getNextSineValueFromSWG,
   linkParameterToObject,

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
   });

e2e/tests/visual-a11y/components/inspector.visual.spec.js

@@ -22,6 +22,7 @@
 
 import percySnapshot from '@percy/playwright';
 
+import { expandInspectorPane } from '../../../appActions.js';
 import { scanForA11yViolations, test } from '../../../avpFixtures.js';
 import { MISSION_TIME, VISUAL_FIXED_URL } from '../../../constants.js';
 
@@ -44,8 +45,7 @@ test.describe('Visual - Inspector @ally @clock', () => {
     await page.getByRole('gridcell', { name: 'Overlay Plot with 5s Delay' }).click();
 
     //Expand the Inspector Pane
-    await page.getByRole('button', { name: 'Inspect' }).click();
-
+    await expandInspectorPane(page);
     await percySnapshot(page, `Inspector view of overlayPlot (theme: ${theme})`, {
       scope: inspectorPane
     });

e2e/tests/visual-a11y/components/tree.visual.spec.js

@@ -22,7 +22,7 @@
 
 import percySnapshot from '@percy/playwright';
 
-import { createDomainObjectWithDefaults } from '../../../appActions.js';
+import { createDomainObjectWithDefaults, expandTreePane } from '../../../appActions.js';
 import { test } from '../../../avpFixtures.js';
 import { VISUAL_FIXED_URL } from '../../../constants.js';
 
@@ -34,7 +34,7 @@ test.describe('Visual - Tree Pane', () => {
     await page.goto(VISUAL_FIXED_URL, { waitUntil: 'domcontentloaded' });
 
     //Open Tree
-    await page.getByRole('button', { name: 'Browse' }).click();
+    await expandTreePane(page);
 
     //Create a Folder Structure
     const foo = await createDomainObjectWithDefaults(page, {

e2e/tests/visual-a11y/displayLayout.visual.spec.js

@@ -25,6 +25,7 @@ import percySnapshot from '@percy/playwright';
 import {
   createDomainObjectWithDefaults,
   createStableStateTelemetry,
+  expandInspectorPane,
   linkParameterToObject
 } from '../../appActions.js';
 import { MISSION_TIME, VISUAL_FIXED_URL } from '../../constants.js';
@@ -105,7 +106,7 @@ test.describe('Visual - Display Layout @clock', () => {
       type: 'issue',
       description: 'https://github.com/nasa/openmct/issues/7036'
     });
-    await page.getByLabel('Expand Inspect Pane').click();
+    await expandInspectorPane(page);
     await page.getByLabel('Resize Inspect Pane').dragTo(page.getByLabel('X:'));
     await page.getByRole('tab', { name: 'Elements' }).click();
     await percySnapshot(page, `Toolbar does not overflow into inspector (theme: '${theme}')`);

e2e/tests/visual-a11y/imagery.visual.spec.js

@@ -21,16 +21,18 @@
  *****************************************************************************/
 import percySnapshot from '@percy/playwright';
 
-import { createDomainObjectWithDefaults, setRealTimeMode } from '../../appActions.js';
-import { waitForAnimations } from '../../baseFixtures.js';
-import { VISUAL_FIXED_URL } from '../../constants.js';
+import { createDomainObjectWithDefaults } from '../../appActions.js';
+import { MISSION_TIME, VISUAL_FIXED_URL } from '../../constants.js';
 import { expect, test } from '../../pluginFixtures.js';
+const TEN_MINUTES = 10 * 60 * 1000;
 
 test.describe('Visual - Example Imagery', () => {
   let exampleImagery;
   let parentLayout;
 
   test.beforeEach(async ({ page }) => {
+    //Start at UNIX epoch time while initializing. The clock needs to run so that debounce functions etc. work.
+    await page.clock.install({ time: 0 });
     await page.goto(VISUAL_FIXED_URL, { waitUntil: 'domcontentloaded' });
 
     parentLayout = await createDomainObjectWithDefaults(page, {
@@ -54,6 +56,7 @@ test.describe('Visual - Example Imagery', () => {
         'https://raw.githubusercontent.com/nasa/openmct/554f77c42fec81cf0f63e62b278012cb08d82af9/e2e/test-data/rick.jpg,https://raw.githubusercontent.com/nasa/openmct/554f77c42fec81cf0f63e62b278012cb08d82af9/e2e/test-data/rick.jpg'
       );
     await page.getByRole('button', { name: 'Save' }).click();
+    await page.clock.pauseAt(MISSION_TIME);
     await page.reload({ waitUntil: 'domcontentloaded' });
 
     //Hide the Browse and Inspect panes to make the image more stable
@@ -63,10 +66,10 @@ test.describe('Visual - Example Imagery', () => {
 
   test('Example Imagery in Fixed Time', async ({ page, theme }) => {
     await page.goto(exampleImagery.url, { waitUntil: 'domcontentloaded' });
-
-    // Wait for the thumbnails to finish their scroll animation
-    // (Wait until the rightmost thumbnail is in view)
-    await expect(page.getByLabel('Image Thumbnail from').last()).toBeInViewport();
+    // Scroll the rightmost thumbnail into view
+    const lastImageThumbnail = page.getByLabel('Image Thumbnail from').last();
+    await lastImageThumbnail.scrollIntoViewIfNeeded();
+    await expect(lastImageThumbnail).toBeInViewport();
 
     await expect(page.getByLabel('Image Wrapper')).toBeVisible();
 
@@ -80,22 +83,31 @@ test.describe('Visual - Example Imagery', () => {
   test('Example Imagery in Real Time', async ({ page, theme }) => {
     await page.goto(exampleImagery.url, { waitUntil: 'domcontentloaded' });
 
-    // Wait for the thumbnails to finish their scroll animation
-    // (Wait until the rightmost thumbnail is in view)
-    await expect(page.getByLabel('Image Thumbnail from').last()).toBeInViewport();
-    await setRealTimeMode(page, true);
+    // Scroll the rightmost thumbnail into view
+    await scrollLastThumbnailIntoView(page);
 
-    await expect(page.getByLabel('Image Wrapper')).toBeVisible();
+    await page.getByRole('button', { name: 'Time Conductor Mode', exact: true }).click();
+    await page.getByRole('button', { name: 'Time Conductor Mode Menu' }).click();
+    await page.getByRole('menuitem', { name: /Real-Time/ }).click();
+    //dismiss the time conductor popup
+    await page.getByLabel('Submit time offsets').click();
+    await page.clock.pauseAt(MISSION_TIME + TEN_MINUTES);
+    await page.waitForURL(/tc\.mode=local/);
+    await scrollLastThumbnailIntoView(page);
 
-    await waitForAnimations(page.locator('.animate-scroll'));
     await percySnapshot(page, `Example Imagery in Real Time (theme: ${theme})`);
   });
 
   test('Example Imagery in Display Layout', async ({ page, theme }) => {
     await page.goto(parentLayout.url, { waitUntil: 'domcontentloaded' });
 
     await expect(page.getByLabel('Image Wrapper')).toBeVisible();
-
     await percySnapshot(page, `Example Imagery in Display Layout (theme: ${theme})`);
   });
 });
+
+async function scrollLastThumbnailIntoView(page) {
+  const lastImageThumbnail = page.getByLabel('Image Thumbnail from').last();
+  await lastImageThumbnail.scrollIntoViewIfNeeded();
+  await expect(lastImageThumbnail).toBeInViewport();
+}

e2e/tests/visual-a11y/notebook.visual.spec.js

@@ -22,7 +22,11 @@
 
 import percySnapshot from '@percy/playwright';
 
-import { createDomainObjectWithDefaults } from '../../appActions.js';
+import {
+  createDomainObjectWithDefaults,
+  expandInspectorPane,
+  expandTreePane
+} from '../../appActions.js';
 import { expect, scanForA11yViolations, test } from '../../avpFixtures.js';
 import { VISUAL_FIXED_URL } from '../../constants.js';
 import { enterTextEntry, startAndAddRestrictedNotebookObject } from '../../helper/notebookUtils.js';
@@ -95,8 +99,7 @@ test.describe('Visual - Notebook @a11y', () => {
     });
 
     //Open Tree to perform drag
-    await page.getByRole('button', { name: 'Browse' }).click();
-
+    await expandTreePane(page);
     await page.getByLabel('Expand My Items folder').click();
 
     await page.goto(notebook.url);
@@ -115,7 +118,7 @@ test.describe('Visual - Notebook @a11y', () => {
     await percySnapshot(page, `Notebook Entry (theme: '${theme}')`);
 
     // Open the Inspector
-    await page.getByRole('button', { name: 'Inspect' }).click();
+    await expandInspectorPane(page);
     // Open the Annotations tab
     await page.getByRole('tab', { name: 'Annotations' }).click();
 

e2e/tests/visual-a11y/planning-gantt.visual.spec.js

@@ -23,7 +23,11 @@
 import percySnapshot from '@percy/playwright';
 import fs from 'fs';
 
-import { createDomainObjectWithDefaults, createPlanFromJSON } from '../../appActions.js';
+import {
+  createDomainObjectWithDefaults,
+  createPlanFromJSON,
+  expandInspectorPane
+} from '../../appActions.js';
 import { scanForA11yViolations, test } from '../../avpFixtures.js';
 import { VISUAL_FIXED_URL } from '../../constants.js';
 import {
@@ -60,7 +64,7 @@ test.describe('Visual - Gantt Chart @a11y', () => {
     await percySnapshot(page, `Gantt Chart View (theme: ${theme}) - Clipped Activity Names`);
 
     // Expand the inspect pane and uncheck the 'Clip Activity Names' option
-    await page.getByRole('button', { name: 'Expand Inspect Pane' }).click();
+    await expandInspectorPane(page);
     await page.getByRole('tab', { name: 'Config' }).click();
     await page.getByLabel('Edit Object').click();
     await page.getByLabel('Clip Activity Names').click();
@@ -94,7 +98,7 @@ test.describe('Visual - Gantt Chart @a11y', () => {
     await percySnapshot(page, `Gantt Chart View w/ draft status (theme: ${theme})`);
 
     // Expand the inspect pane and uncheck the 'Clip Activity Names' option
-    await page.getByRole('button', { name: 'Expand Inspect Pane' }).click();
+    await expandInspectorPane(page);
     await page.getByRole('tab', { name: 'Config' }).click();
     await page.getByLabel('Edit Object').click();
     await page.getByLabel('Clip Activity Names').click();

e2e/tests/visual-a11y/styling.visual.spec.js

@@ -201,7 +201,7 @@ test.describe('Stacked Plot styling @a11y', () => {
     // Save Flexible Layout
     await page.getByRole('button', { name: 'Save' }).click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
+    await page.getByRole('tab', { name: 'Styles' }).click();
     await percySnapshot(page, `Saved Styled StackedPlot (theme: '${theme}')`);
   });
   test.afterEach(async ({ page }, testInfo) => {

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -158,6 +158,10 @@ export default class TelemetryCriterion extends EventEmitter {
   }
 
   createNormalizedDatum(telemetryDatum, endpoint) {
+    if (!telemetryDatum) {
+      return;
+    }
+
     const id = this.openmct.objects.makeKeyString(endpoint.identifier);
     const metadata = this.openmct.telemetry.getMetadata(endpoint).valueMetadatas;
     const normalizedDatum = Object.values(metadata).reduce((datum, metadatum) => {