Example code for image thumbnail formatter

.webpack/webpack.common.js

@@ -31,11 +31,9 @@ try {
     console.warn(err);
 }
 
-const projectRootDir = path.resolve(__dirname, "..");
-
 /** @type {import('webpack').Configuration} */
 const config = {
-    context: projectRootDir,
+    context: path.join(__dirname, ".."),
     entry: {
         openmct: "./openmct.js",
         generatorWorker: "./example/generator/generatorWorker.js",
@@ -48,7 +46,7 @@ const config = {
     output: {
         globalObject: "this",
         filename: "[name].js",
-        path: path.resolve(projectRootDir, "dist"),
+        path: path.resolve(__dirname, "..", "dist"),
         library: "openmct",
         libraryTarget: "umd",
         publicPath: "",
@@ -57,8 +55,8 @@ const config = {
     },
     resolve: {
         alias: {
-            "@": path.join(projectRootDir, "src"),
-            legacyRegistry: path.join(projectRootDir, "src/legacyRegistry"),
+            "@": path.join(__dirname, "..", "src"),
+            legacyRegistry: path.join(__dirname, "..", "src/legacyRegistry"),
             saveAs: "file-saver/src/FileSaver.js",
             csv: "comma-separated-values",
             EventEmitter: "eventemitter3",
@@ -66,22 +64,24 @@ const config = {
             "plotly-basic": "plotly.js-basic-dist",
             "plotly-gl2d": "plotly.js-gl2d-dist",
             "d3-scale": path.join(
-                projectRootDir,
+                __dirname,
+                "..",
                 "node_modules/d3-scale/dist/d3-scale.min.js"
             ),
             printj: path.join(
-                projectRootDir,
+                __dirname,
+                "..",
                 "node_modules/printj/dist/printj.min.js"
             ),
-            styles: path.join(projectRootDir, "src/styles"),
-            MCT: path.join(projectRootDir, "src/MCT"),
-            testUtils: path.join(projectRootDir, "src/utils/testUtils.js"),
+            styles: path.join(__dirname, "..", "src/styles"),
+            MCT: path.join(__dirname, "..", "src/MCT"),
+            testUtils: path.join(__dirname, "..", "src/utils/testUtils.js"),
             objectUtils: path.join(
-                projectRootDir,
+                __dirname,
+                "..",
                 "src/api/objects/object-utils.js"
             ),
-            "kdbush": path.join(projectRootDir, "node_modules/kdbush/kdbush.min.js"),
-            utils: path.join(projectRootDir, "src/utils")
+            utils: path.join(__dirname, "..", "src/utils")
         }
     },
     plugins: [
@@ -168,8 +168,8 @@ const config = {
     performance: {
         // We should eventually consider chunking to decrease
         // these values
-        maxEntrypointSize: 27000000,
-        maxAssetSize: 27000000
+        maxEntrypointSize: 25000000,
+        maxAssetSize: 25000000
     }
 };
 

.webpack/webpack.dev.js

@@ -5,12 +5,11 @@ This configuration should be used for development purposes. It contains full sou
 devServer (which be invoked using by `npm start`), and a non-minified Vue.js distribution.
 If OpenMCT is to be used for a production server, use webpack.prod.js instead.
 */
+const { merge } = require("webpack-merge");
+const common = require("./webpack.common");
+
 const path = require("path");
 const webpack = require("webpack");
-const { merge } = require("webpack-merge");
-
-const common = require("./webpack.common");
-const projectRootDir = path.resolve(__dirname, "..");
 
 module.exports = merge(common, {
     mode: "development",
@@ -27,7 +26,7 @@ module.exports = merge(common, {
     },
     resolve: {
         alias: {
-            vue: path.join(projectRootDir, "node_modules/vue/dist/vue.js")
+            vue: path.join(__dirname, "..", "node_modules/vue/dist/vue.js")
         }
     },
     plugins: [

.webpack/webpack.prod.js

@@ -4,18 +4,17 @@
 This configuration should be used for production installs.
 It is the default webpack configuration.
 */
+const { merge } = require("webpack-merge");
+const common = require("./webpack.common");
+
 const path = require("path");
 const webpack = require("webpack");
-const { merge } = require("webpack-merge");
-
-const common = require("./webpack.common");
-const projectRootDir = path.resolve(__dirname, "..");
 
 module.exports = merge(common, {
     mode: "production",
     resolve: {
         alias: {
-            vue: path.join(projectRootDir, "node_modules/vue/dist/vue.min.js")
+            vue: path.join(__dirname, "..", "node_modules/vue/dist/vue.min.js")
         }
     },
     plugins: [

README.md

@@ -1,4 +1,4 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) 
+# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/nasa/openmct.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/openmct/context:javascript) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) 
 
 Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
 
@@ -98,7 +98,7 @@ To run the performance tests:
 The test suite is configured to all tests localed in `e2e/tests/` ending in `*.e2e.spec.js`. For more about the e2e test suite, please see the [README](./e2e/README.md)
 
 ### Security Tests
-Each commit is analyzed for known security vulnerabilities using [CodeQL](https://codeql.github.com/docs/codeql-language-guides/codeql-library-for-javascript/). The list of CWE coverage items is avaiable in the [CodeQL docs](https://codeql.github.com/codeql-query-help/javascript-cwe/). The CodeQL workflow is specified in the [CodeQL analysis file](./.github/workflows/codeql-analysis.yml) and the custom [CodeQL config](./.github/codeql/codeql-config.yml).
+Each commit is analyzed for known security vulnerabilities using [CodeQL](https://codeql.github.com/docs/codeql-language-guides/codeql-library-for-javascript/) and our overall security report is available on [LGTM](https://lgtm.com/projects/g/nasa/openmct/). The list of CWE coverage items is avaiable in the [CodeQL docs](https://codeql.github.com/codeql-query-help/javascript-cwe/). The CodeQL workflow is specified in the [CodeQL analysis file](./.github/workflows/codeql-analysis.yml) and the custom [CodeQL config](./.github/codeql/codeql-config.yml).
 
 ### Test Reporting and Code Coverage
 

e2e/README.md

@@ -89,37 +89,17 @@ Read more about [Playwright Snapshots](https://playwright.dev/docs/test-snapshot
 #### Open MCT's implementation
 
 - Our Snapshot tests receive a `@snapshot` tag.
-- Snapshots need to be executed within the official Playwright container to ensure we're using the exact rendering platform in CI and locally. To do a valid comparison locally:
+- Snapshots need to be executed within the official Playwright container to ensure we're using the exact rendering platform in CI and locally.
 
 ```sh
-// Replace {X.X.X} with the current Playwright version 
-// from our package.json or circleCI configuration file
-docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
+docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:[GET THIS VERSION FROM OUR CIRCLECI CONFIG FILE]-focal /bin/bash
 npm install
 npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
 ```
 
-### Updating Snapshots
+### (WIP) Updating Snapshots
 
-When the `@snapshot` tests fail, they will need to be evaluated to determine if the failure is an acceptable and desireable or an unintended regression.
-
-To compare a snapshot, run a test and open the html report with the 'Expected' vs 'Actual' screenshot. If the actual screenshot is preferred, then the source-controlled 'Expected' snapshots will need to be updated with the following scripts.
-
-MacOS
-
-```
-npm run test:e2e:updatesnapshots
-```
-
-Linux/CI
-
-```sh
-// Replace {X.X.X} with the current Playwright version 
-// from our package.json or circleCI configuration file
-docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
-npm install
-npm run test:e2e:updatesnapshots
-```
+When the `@snapshot` tests fail, they will need to be evaluated to see if the failure is an acceptable change or
 
 ## Performance Testing
 

e2e/appActions.js

@@ -45,14 +45,6 @@
  * @property {string} url the relative url to the object (for use with `page.goto()`)
  */
 
-/**
- * Defines parameters to be used in the creation of a notification.
- * @typedef {Object} CreateNotificationOptions
- * @property {string} message the message
- * @property {'info' | 'alert' | 'error'} severity the severity
- * @property {import('../src/api/notifications/NotificationAPI').NotificationOptions} [notificationOptions] additional options
- */
-
 const Buffer = require('buffer').Buffer;
 const genUuid = require('uuid').v4;
 
@@ -120,33 +112,12 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
     };
 }
 
-/**
- * Generate a notification with the given options.
- * @param {import('@playwright/test').Page} page
- * @param {CreateNotificationOptions} createNotificationOptions
- */
-async function createNotification(page, createNotificationOptions) {
-    await page.evaluate((_createNotificationOptions) => {
-        const { message, severity, options } = _createNotificationOptions;
-        const notificationApi = window.openmct.notifications;
-        if (severity === 'info') {
-            notificationApi.info(message, options);
-        } else if (severity === 'alert') {
-            notificationApi.alert(message, options);
-        } else {
-            notificationApi.error(message, options);
-        }
-    }, createNotificationOptions);
-}
-
 /**
  * @param {import('@playwright/test').Page} page
  * @param {string} name
  */
 async function expandTreePaneItemByName(page, name) {
-    const treePane = page.getByRole('tree', {
-        name: 'Main Tree'
-    });
+    const treePane = page.locator('#tree-pane');
     const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
     const expandTriangle = treeItem.locator('.c-disclosure-triangle');
     await expandTriangle.click();
@@ -220,30 +191,6 @@ async function openObjectTreeContextMenu(page, url) {
     });
 }
 
-/**
- * Expands the entire object tree (every expandable tree item).
- * @param {import('@playwright/test').Page} page
- * @param {"Main Tree" | "Create Modal Tree"} [treeName="Main Tree"]
- */
-async function expandEntireTree(page, treeName = "Main Tree") {
-    const treeLocator = page.getByRole('tree', {
-        name: treeName
-    });
-    const collapsedTreeItems = treeLocator.getByRole('treeitem', {
-        expanded: false
-    }).locator('span.c-disclosure-triangle.is-enabled');
-
-    while (await collapsedTreeItems.count() > 0) {
-        await collapsedTreeItems.nth(0).click();
-
-        // FIXME: Replace hard wait with something event-driven.
-        // Without the wait, this fails periodically due to a race condition
-        // with Vue rendering (loop exits prematurely).
-        // eslint-disable-next-line playwright/no-wait-for-timeout
-        await page.waitForTimeout(200);
-    }
-}
-
 /**
  * Gets the UUID of the currently focused object by parsing the current URL
  * and returning the last UUID in the path.
@@ -386,9 +333,7 @@ async function setEndOffset(page, offset) {
 // eslint-disable-next-line no-undef
 module.exports = {
     createDomainObjectWithDefaults,
-    createNotification,
     expandTreePaneItemByName,
-    expandEntireTree,
     createPlanFromJSON,
     openObjectTreeContextMenu,
     getHashUrlToDomainObject,

e2e/helper/addInitExampleUser.js

@@ -1,27 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-// This should be used to install the Example User
-document.addEventListener('DOMContentLoaded', () => {
-    const openmct = window.openmct;
-    openmct.install(openmct.plugins.example.ExampleUser());
-});

e2e/helper/addInitFileInputObject.js

@@ -1,76 +0,0 @@
-class DomainObjectViewProvider {
-    constructor(openmct) {
-        this.key = 'doViewProvider';
-        this.name = 'Domain Object View Provider';
-        this.openmct = openmct;
-    }
-
-    canView(domainObject) {
-        return domainObject.type === 'imageFileInput'
-            || domainObject.type === 'jsonFileInput';
-    }
-
-    view(domainObject, objectPath) {
-        let content;
-
-        return {
-            show: function (element) {
-                const body = domainObject.selectFile.body;
-                const type = typeof body;
-
-                content = document.createElement('div');
-                content.id = 'file-input-type';
-                content.textContent = JSON.stringify(type);
-                element.appendChild(content);
-            },
-            destroy: function (element) {
-                element.removeChild(content);
-                content = undefined;
-            }
-        };
-    }
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-    const openmct = window.openmct;
-
-    openmct.types.addType('jsonFileInput', {
-        key: 'jsonFileInput',
-        name: "JSON File Input Object",
-        creatable: true,
-        form: [
-            {
-                name: 'Upload File',
-                key: 'selectFile',
-                control: 'file-input',
-                required: true,
-                text: 'Select File...',
-                type: 'application/json',
-                property: [
-                    "selectFile"
-                ]
-            }
-        ]
-    });
-
-    openmct.types.addType('imageFileInput', {
-        key: 'imageFileInput',
-        name: "Image File Input Object",
-        creatable: true,
-        form: [
-            {
-                name: 'Upload File',
-                key: 'selectFile',
-                control: 'file-input',
-                required: true,
-                text: 'Select File...',
-                type: 'image/*',
-                property: [
-                    "selectFile"
-                ]
-            }
-        ]
-    });
-
-    openmct.objectViews.addProvider(new DomainObjectViewProvider(openmct));
-});

e2e/helper/addInitNotebookWithUrls.js

@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-// This should be used to install the re-instal default Notebook plugin with a simple url whitelist.
-// e.g.
-// await page.addInitScript({ path: path.join(__dirname, 'addInitNotebookWithUrls.js') });
-const NOTEBOOK_NAME = 'Notebook';
-const URL_WHITELIST = ['google.com'];
-
-document.addEventListener('DOMContentLoaded', () => {
-    const openmct = window.openmct;
-    openmct.install(openmct.plugins.Notebook(NOTEBOOK_NAME, URL_WHITELIST));
-});

e2e/helper/addInitOperatorStatus.js

@@ -1,27 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-// This should be used to install the Operator Status
-document.addEventListener('DOMContentLoaded', () => {
-    const openmct = window.openmct;
-    openmct.install(openmct.plugins.OperatorStatus());
-});

e2e/playwright-ci.config.js

@@ -73,7 +73,7 @@ const config = {
             open: 'never',
             outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
         }],
-        ['junit', { outputFile: '../test-results/results.xml' }],
+        ['junit', { outputFile: 'test-results/results.xml' }],
         ['github']
     ]
 };

e2e/playwright-performance.config.js

@@ -35,8 +35,8 @@ const config = {
     ],
     reporter: [
         ['list'],
-        ['junit', { outputFile: '../test-results/results.xml' }],
-        ['json', { outputFile: '../test-results/results.json' }]
+        ['junit', { outputFile: 'test-results/results.xml' }],
+        ['json', { outputFile: 'test-results/results.json' }]
     ]
 };
 

e2e/playwright-visual.config.js

@@ -40,7 +40,7 @@ const config = {
     ],
     reporter: [
         ['list'],
-        ['junit', { outputFile: '../test-results/results.xml' }],
+        ['junit', { outputFile: 'test-results/results.xml' }],
         ['html', {
             open: 'on-failure',
             outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840

e2e/tests/framework/appActions.e2e.spec.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 const { test, expect } = require('../../pluginFixtures.js');
-const { createDomainObjectWithDefaults, createNotification, expandEntireTree } = require('../../appActions.js');
+const { createDomainObjectWithDefaults } = require('../../appActions.js');
 
 test.describe('AppActions', () => {
     test('createDomainObjectsWithDefaults', async ({ page }) => {
@@ -49,11 +49,11 @@ test.describe('AppActions', () => {
                 parent: e2eFolder.uuid
             });
 
-            await page.goto(timer1.url);
+            await page.goto(timer1.url, { waitUntil: 'networkidle' });
             await expect(page.locator('.l-browse-bar__object-name')).toHaveText(timer1.name);
-            await page.goto(timer2.url);
+            await page.goto(timer2.url, { waitUntil: 'networkidle' });
             await expect(page.locator('.l-browse-bar__object-name')).toHaveText(timer2.name);
-            await page.goto(timer3.url);
+            await page.goto(timer3.url, { waitUntil: 'networkidle' });
             await expect(page.locator('.l-browse-bar__object-name')).toHaveText(timer3.name);
         });
 
@@ -73,11 +73,11 @@ test.describe('AppActions', () => {
                 name: 'Folder Baz',
                 parent: folder2.uuid
             });
-            await page.goto(folder1.url);
+            await page.goto(folder1.url, { waitUntil: 'networkidle' });
             await expect(page.locator('.l-browse-bar__object-name')).toHaveText(folder1.name);
-            await page.goto(folder2.url);
+            await page.goto(folder2.url, { waitUntil: 'networkidle' });
             await expect(page.locator('.l-browse-bar__object-name')).toHaveText(folder2.name);
-            await page.goto(folder3.url);
+            await page.goto(folder3.url, { waitUntil: 'networkidle' });
             await expect(page.locator('.l-browse-bar__object-name')).toHaveText(folder3.name);
 
             expect(folder1.url).toBe(`${e2eFolder.url}/${folder1.uuid}`);
@@ -85,81 +85,4 @@ test.describe('AppActions', () => {
             expect(folder3.url).toBe(`${e2eFolder.url}/${folder1.uuid}/${folder2.uuid}/${folder3.uuid}`);
         });
     });
-    test("createNotification", async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-        await createNotification(page, {
-            message: 'Test info notification',
-            severity: 'info'
-        });
-        await expect(page.locator('.c-message-banner__message')).toHaveText('Test info notification');
-        await expect(page.locator('.c-message-banner')).toHaveClass(/info/);
-        await page.locator('[aria-label="Dismiss"]').click();
-        await createNotification(page, {
-            message: 'Test alert notification',
-            severity: 'alert'
-        });
-        await expect(page.locator('.c-message-banner__message')).toHaveText('Test alert notification');
-        await expect(page.locator('.c-message-banner')).toHaveClass(/alert/);
-        await page.locator('[aria-label="Dismiss"]').click();
-        await createNotification(page, {
-            message: 'Test error notification',
-            severity: 'error'
-        });
-        await expect(page.locator('.c-message-banner__message')).toHaveText('Test error notification');
-        await expect(page.locator('.c-message-banner')).toHaveClass(/error/);
-        await page.locator('[aria-label="Dismiss"]').click();
-    });
-    test('expandEntireTree', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        const rootFolder = await createDomainObjectWithDefaults(page, {
-            type: 'Folder'
-        });
-        const folder1 = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            parent: rootFolder.uuid
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            parent: folder1.uuid
-        });
-        const folder2 = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            parent: folder1.uuid
-        });
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            parent: folder1.uuid
-        });
-        await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout',
-            parent: folder2.uuid
-        });
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            parent: folder2.uuid
-        });
-
-        await page.goto('./#/browse/mine');
-        await expandEntireTree(page);
-        const treePane = page.getByRole('tree', {
-            name: "Main Tree"
-        });
-        const treePaneCollapsedItems = treePane.getByRole('treeitem', { expanded: false });
-        expect(await treePaneCollapsedItems.count()).toBe(0);
-
-        await page.goto('./#/browse/mine');
-        //Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click the object specified by 'type'
-        await page.click(`li[role='menuitem']:text("Clock")`);
-        await expandEntireTree(page, "Create Modal Tree");
-        const locatorTree = page.getByRole("tree", {
-            name: "Create Modal Tree"
-        });
-        const locatorTreeCollapsedItems = locatorTree.locator('role=treeitem[expanded=false]');
-        expect(await locatorTreeCollapsedItems.count()).toBe(0);
-    });
 });

e2e/tests/functional/forms.e2e.spec.js

@@ -30,8 +30,6 @@ const genUuid = require('uuid').v4;
 const path = require('path');
 
 const TEST_FOLDER = 'test folder';
-const jsonFilePath = 'e2e/test-data/ExampleLayouts.json';
-const imageFilePath = 'e2e/test-data/rick.jpg';
 
 test.describe('Form Validation Behavior', () => {
     test('Required Field indicators appear if title is empty and can be corrected', async ({ page }) => {
@@ -70,41 +68,6 @@ test.describe('Form Validation Behavior', () => {
     });
 });
 
-test.describe('Form File Input Behavior', () => {
-    test.beforeEach(async ({ page }) => {
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../helper', 'addInitFileInputObject.js') });
-    });
-
-    test('Can select a JSON file type', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        await page.getByRole('button', { name: ' Create ' }).click();
-        await page.getByRole('menuitem', { name: 'JSON File Input Object' }).click();
-
-        await page.setInputFiles('#fileElem', jsonFilePath);
-
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        const type = await page.locator('#file-input-type').textContent();
-        await expect(type).toBe(`"string"`);
-    });
-
-    test('Can select an image file type', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        await page.getByRole('button', { name: ' Create ' }).click();
-        await page.getByRole('menuitem', { name: 'Image File Input Object' }).click();
-
-        await page.setInputFiles('#fileElem', imageFilePath);
-
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        const type = await page.locator('#file-input-type').textContent();
-        await expect(type).toBe(`"object"`);
-    });
-});
-
 test.describe('Persistence operations @addInit', () => {
     // add non persistable root item
     test.beforeEach(async ({ page }) => {

e2e/tests/functional/moveAndLinkObjects.e2e.spec.js

@@ -43,80 +43,48 @@ test.describe('Move & link item tests', () => {
             name: 'Child Folder',
             parent: parentFolder.uuid
         });
-        const grandchildFolder = await createDomainObjectWithDefaults(page, {
+        await createDomainObjectWithDefaults(page, {
             type: 'Folder',
             name: 'Grandchild Folder',
             parent: childFolder.uuid
         });
 
         // Attempt to move parent to its own grandparent
-        await page.locator('button[title="Show selected item in tree"]').click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+        await page.locator('.c-disclosure-triangle >> nth=0').click();
 
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        await treePane.getByRole('treeitem', {
-            name: 'Parent Folder'
-        }).click({
+        await page.locator(`a:has-text("Parent Folder") >> nth=0`).click({
             button: 'right'
         });
 
-        await page.getByRole('menuitem', {
-            name: /Move/
-        }).click();
-
-        const createModalTree = page.getByRole('tree', {
-            name: "Create Modal Tree"
-        });
-        const myItemsLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: myItemsFolderName
-        });
-        await myItemsLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await myItemsLocatorTreeItem.click();
-
-        const parentFolderLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: parentFolder.name
-        });
-        await parentFolderLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await parentFolderLocatorTreeItem.click();
+        await page.locator('li.icon-move').click();
+        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=0').click();
+        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-
-        const childFolderLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: new RegExp(childFolder.name)
-        });
-        await childFolderLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await childFolderLocatorTreeItem.click();
+        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=1').click();
+        await page.locator('form[name="mctForm"] >> text=Child Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-
-        const grandchildFolderLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: grandchildFolder.name
-        });
-        await grandchildFolderLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await grandchildFolderLocatorTreeItem.click();
+        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=2').click();
+        await page.locator('form[name="mctForm"] >> text=Grandchild Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-
-        await parentFolderLocatorTreeItem.click();
+        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
         await page.locator('[aria-label="Cancel"]').click();
 
         // Move Child Folder from Parent Folder to My Items
-        await treePane.getByRole('treeitem', {
-            name: new RegExp(childFolder.name)
-        }).click({
+        await page.locator('.c-disclosure-triangle >> nth=0').click();
+        await page.locator('.c-disclosure-triangle >> nth=1').click();
+
+        await page.locator(`a:has-text("Child Folder") >> nth=0`).click({
             button: 'right'
         });
-        await page.getByRole('menuitem', {
-            name: /Move/
-        }).click();
-        await myItemsLocatorTreeItem.click();
+        await page.locator('li.icon-move').click();
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
 
-        await page.locator('[aria-label="Save"]').click();
-        const myItemsPaneTreeItem = treePane.getByRole('treeitem', {
-            name: myItemsFolderName
-        });
+        await page.locator('button:has-text("OK")').click();
 
         // Expect that Child Folder is in My Items, the root folder
-        expect(myItemsPaneTreeItem.locator('nth=0:has(text=Child Folder)')).toBeTruthy();
+        expect(page.locator(`text=${myItemsFolderName} >> nth=0:has(text=Child Folder)`)).toBeTruthy();
     });
     test('Create a basic object and verify that it cannot be moved to telemetry object without Composition Provider', async ({ page, openmctConfig }) => {
         const { myItemsFolderName } = openmctConfig;
@@ -146,7 +114,7 @@ test.describe('Move & link item tests', () => {
 
         // See if it's possible to put the folder in the Telemetry object during creation (Soft Assert)
         await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
-        let okButton = page.locator('button.c-button.c-button--major:has-text("OK")');
+        let okButton = await page.locator('button.c-button.c-button--major:has-text("OK")');
         let okButtonStateDisabled = await okButton.isDisabled();
         expect.soft(okButtonStateDisabled).toBeTruthy();
 
@@ -170,7 +138,7 @@ test.describe('Move & link item tests', () => {
         // See if it's possible to put the folder in the Telemetry object after creation
         await page.locator(`text=Location Open MCT ${myItemsFolderName} >> span`).nth(3).click();
         await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
-        let okButton2 = page.locator('button.c-button.c-button--major:has-text("OK")');
+        let okButton2 = await page.locator('button.c-button.c-button--major:has-text("OK")');
         let okButtonStateDisabled2 = await okButton2.isDisabled();
         expect(okButtonStateDisabled2).toBeTruthy();
     });
@@ -190,80 +158,48 @@ test.describe('Move & link item tests', () => {
             name: 'Child Folder',
             parent: parentFolder.uuid
         });
-        const grandchildFolder = await createDomainObjectWithDefaults(page, {
+        await createDomainObjectWithDefaults(page, {
             type: 'Folder',
             name: 'Grandchild Folder',
             parent: childFolder.uuid
         });
 
-        // Attempt to move parent to its own grandparent
-        await page.locator('button[title="Show selected item in tree"]').click();
+        // Attempt to link parent to its own grandparent
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+        await page.locator('.c-disclosure-triangle >> nth=0').click();
 
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        await treePane.getByRole('treeitem', {
-            name: 'Parent Folder'
-        }).click({
+        await page.locator(`a:has-text("Parent Folder") >> nth=0`).click({
             button: 'right'
         });
 
-        await page.getByRole('menuitem', {
-            name: /Move/
-        }).click();
-
-        const createModalTree = page.getByRole('tree', {
-            name: "Create Modal Tree"
-        });
-        const myItemsLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: myItemsFolderName
-        });
-        await myItemsLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await myItemsLocatorTreeItem.click();
-
-        const parentFolderLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: parentFolder.name
-        });
-        await parentFolderLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await parentFolderLocatorTreeItem.click();
+        await page.locator('li.icon-link').click();
+        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=0').click();
+        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-
-        const childFolderLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: new RegExp(childFolder.name)
-        });
-        await childFolderLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await childFolderLocatorTreeItem.click();
+        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=1').click();
+        await page.locator('form[name="mctForm"] >> text=Child Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-
-        const grandchildFolderLocatorTreeItem = createModalTree.getByRole('treeitem', {
-            name: grandchildFolder.name
-        });
-        await grandchildFolderLocatorTreeItem.locator('.c-disclosure-triangle').click();
-        await grandchildFolderLocatorTreeItem.click();
+        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=2').click();
+        await page.locator('form[name="mctForm"] >> text=Grandchild Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-
-        await parentFolderLocatorTreeItem.click();
+        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
         await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
         await page.locator('[aria-label="Cancel"]').click();
 
-        // Move Child Folder from Parent Folder to My Items
-        await treePane.getByRole('treeitem', {
-            name: new RegExp(childFolder.name)
-        }).click({
+        // Link Child Folder from Parent Folder to My Items
+        await page.locator('.c-disclosure-triangle >> nth=0').click();
+        await page.locator('.c-disclosure-triangle >> nth=1').click();
+
+        await page.locator(`a:has-text("Child Folder") >> nth=0`).click({
             button: 'right'
         });
-        await page.getByRole('menuitem', {
-            name: /Link/
-        }).click();
-        await myItemsLocatorTreeItem.click();
+        await page.locator('li.icon-link').click();
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
 
-        await page.locator('[aria-label="Save"]').click();
-        const myItemsPaneTreeItem = treePane.getByRole('treeitem', {
-            name: myItemsFolderName
-        });
+        await page.locator('button:has-text("OK")').click();
 
         // Expect that Child Folder is in My Items, the root folder
-        expect(myItemsPaneTreeItem.locator('nth=0:has(text=Child Folder)')).toBeTruthy();
+        expect(page.locator(`text=${myItemsFolderName} >> nth=0:has(text=Child Folder)`)).toBeTruthy();
     });
 });
 

e2e/tests/functional/notification.e2e.spec.js

@@ -1,112 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which verify Open MCT's Notification functionality
-*/
-
-const { createDomainObjectWithDefaults, createNotification } = require('../../appActions');
-const { test, expect } = require('../../pluginFixtures');
-
-test.describe('Notifications List', () => {
-    test('Notifications can be dismissed individually', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/6122'
-        });
-
-        // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create an error notification with the message "Error message"
-        await createNotification(page, {
-            severity: 'error',
-            message: 'Error message'
-        });
-
-        // Create an alert notification with the message "Alert message"
-        await createNotification(page, {
-            severity: 'alert',
-            message: 'Alert message'
-        });
-
-        // Verify that there is a button with aria-label "Review 2 Notifications"
-        expect(await page.locator('button[aria-label="Review 2 Notifications"]').count()).toBe(1);
-
-        // Click on button with aria-label "Review 2 Notifications"
-        await page.click('button[aria-label="Review 2 Notifications"]');
-
-        // Click on button with aria-label="Dismiss notification of Error message"
-        await page.click('button[aria-label="Dismiss notification of Error message"]');
-
-        // Verify there is no a notification (listitem) with the text "Error message" since it was dismissed
-        expect(await page.locator('div[role="dialog"] div[role="listitem"]').innerText()).not.toContain('Error message');
-
-        // Verify there is still a notification (listitem) with the text "Alert message"
-        expect(await page.locator('div[role="dialog"] div[role="listitem"]').innerText()).toContain('Alert message');
-
-        // Click on button with aria-label="Dismiss notification of Alert message"
-        await page.click('button[aria-label="Dismiss notification of Alert message"]');
-
-        // Verify that there is no dialog since the notification overlay was closed automatically after all notifications were dismissed
-        expect(await page.locator('div[role="dialog"]').count()).toBe(0);
-    });
-});
-
-test.describe('Notification Overlay', () => {
-    test('Closing notification list after notification banner disappeared does not cause it to open automatically', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/6130'
-        });
-
-        // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create a new Display Layout object
-        await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
-
-        // Click on the button "Review 1 Notification"
-        await page.click('button[aria-label="Review 1 Notification"]');
-
-        // Verify that Notification List is open
-        expect(await page.locator('div[role="dialog"]').isVisible()).toBe(true);
-
-        // Wait until there is no Notification Banner
-        await page.waitForSelector('div[role="alert"]', { state: 'detached'});
-
-        // Click on the "Close" button of the Notification List
-        await page.click('button[aria-label="Close"]');
-
-        // On the Display Layout object, click on the "Edit" button
-        await page.click('button[title="Edit"]');
-
-        // Click on the "Save" button
-        await page.click('button[title="Save"]');
-
-        // Click on the "Save and Finish Editing" option
-        await page.click('li[title="Save and Finish Editing"]');
-
-        // Verify that Notification List is NOT open
-        expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
-    });
-});

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

@@ -98,8 +98,8 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
         await page.locator('text=Conditions View Snapshot >> button').nth(3).click();
 
         //Edit Condition Set Name from main view
-        await page.locator('.l-browse-bar__object-name').filter({ hasText: 'Unnamed Condition Set' }).first().fill('Renamed Condition Set');
-        await page.locator('.l-browse-bar__object-name').filter({ hasText: 'Renamed Condition Set' }).first().press('Enter');
+        await page.locator('text=Unnamed Condition Set').first().fill('Renamed Condition Set');
+        await page.locator('text=Renamed Condition Set').first().press('Enter');
         // Click Save Button
         await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
         // Click Save and Finish Editing Option

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

@@ -24,7 +24,6 @@ const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions');
 
 test.describe('Display Layout', () => {
-    /** @type {import('../../../../appActions').CreatedObjectInfo} */
     let sineWaveObject;
     test.beforeEach(async ({ page }) => {
         await page.goto('./', { waitUntil: 'networkidle' });
@@ -32,7 +31,8 @@ test.describe('Display Layout', () => {
 
         // Create Sine Wave Generator
         sineWaveObject = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator'
+            type: 'Sine Wave Generator',
+            name: "Test Sine Wave Generator"
         });
     });
     test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in real time', async ({ page }) => {
@@ -47,14 +47,7 @@ test.describe('Display Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
         // Add the Sine Wave Generator to the Display Layout and save changes
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
-        const layoutGridHolder = page.locator('.l-layout__grid-holder');
-        await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
 
@@ -81,14 +74,7 @@ test.describe('Display Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
         // Add the Sine Wave Generator to the Display Layout and save changes
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
-        const layoutGridHolder = page.locator('.l-layout__grid-holder');
-        await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
 
@@ -119,14 +105,7 @@ test.describe('Display Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
         // Add the Sine Wave Generator to the Display Layout and save changes
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
-        const layoutGridHolder = page.locator('.l-layout__grid-holder');
-        await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
 
@@ -136,7 +115,7 @@ test.describe('Display Layout', () => {
         await page.locator('.c-tree__item.is-navigated-object .c-disclosure-triangle').click();
 
         // Bring up context menu and remove
-        await sineWaveGeneratorTreeItem.nth(1).click({ button: 'right' });
+        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').first().click({ button: 'right' });
         await page.locator('li[role="menuitem"]:has-text("Remove")').click();
         await page.locator('button:has-text("OK")').click();
 
@@ -151,7 +130,8 @@ test.describe('Display Layout', () => {
         });
         // Create a Display Layout
         const displayLayout = await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout'
+            type: 'Display Layout',
+            name: "Test Display Layout"
         });
         // Edit Display Layout
         await page.locator('[title="Edit"]').click();
@@ -159,14 +139,7 @@ test.describe('Display Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
         // Add the Sine Wave Generator to the Display Layout and save changes
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
-        const layoutGridHolder = page.locator('.l-layout__grid-holder');
-        await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
 
@@ -179,7 +152,7 @@ test.describe('Display Layout', () => {
         await page.goto(sineWaveObject.url);
 
         // Bring up context menu and remove
-        await sineWaveGeneratorTreeItem.first().click({ button: 'right' });
+        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').click({ button: 'right' });
         await page.locator('li[role="menuitem"]:has-text("Remove")').click();
         await page.locator('button:has-text("OK")').click();
 

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

@@ -25,33 +25,26 @@ const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 test.describe('Flexible Layout', () => {
     let sineWaveObject;
-    let clockObject;
     test.beforeEach(async ({ page }) => {
         await page.goto('./', { waitUntil: 'networkidle' });
 
         // Create Sine Wave Generator
         sineWaveObject = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator'
+            type: 'Sine Wave Generator',
+            name: "Test Sine Wave Generator"
         });
 
         // Create Clock Object
-        clockObject = await createDomainObjectWithDefaults(page, {
-            type: 'Clock'
+        await createDomainObjectWithDefaults(page, {
+            type: 'Clock',
+            name: "Test Clock"
         });
     });
     test('panes have the appropriate draggable attribute while in Edit and Browse modes', async ({ page }) => {
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
-        const clockTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(clockObject.name)
-        });
         // Create a Flexible Layout
         await createDomainObjectWithDefaults(page, {
-            type: 'Flexible Layout'
+            type: 'Flexible Layout',
+            name: "Test Flexible Layout"
         });
         // Edit Flexible Layout
         await page.locator('[title="Edit"]').click();
@@ -59,8 +52,8 @@ test.describe('Flexible Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
         // Add the Sine Wave Generator and Clock to the Flexible Layout
-        await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
-        await clockTreeItem.dragTo(page.locator('.c-fl__container.is-empty'));
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.c-fl__container.is-empty');
+        await page.dragAndDrop('text=Test Clock', '.c-fl__container.is-empty');
         // Check that panes can be dragged while Flexible Layout is in Edit mode
         let dragWrapper = page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
         await expect(dragWrapper).toHaveAttribute('draggable', 'true');
@@ -72,15 +65,10 @@ test.describe('Flexible Layout', () => {
         await expect(dragWrapper).toHaveAttribute('draggable', 'false');
     });
     test('items in a flexible layout can be removed with object tree context menu when viewing the flexible layout', async ({ page }) => {
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
         // Create a Display Layout
         await createDomainObjectWithDefaults(page, {
-            type: 'Flexible Layout'
+            type: 'Flexible Layout',
+            name: "Test Flexible Layout"
         });
         // Edit Flexible Layout
         await page.locator('[title="Edit"]').click();
@@ -88,7 +76,7 @@ test.describe('Flexible Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
         // Add the Sine Wave Generator to the Flexible Layout and save changes
-        await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.c-fl__container.is-empty');
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
 
@@ -98,7 +86,7 @@ test.describe('Flexible Layout', () => {
         await page.locator('.c-tree__item.is-navigated-object .c-disclosure-triangle').click();
 
         // Bring up context menu and remove
-        await sineWaveGeneratorTreeItem.first().click({ button: 'right' });
+        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').first().click({ button: 'right' });
         await page.locator('li[role="menuitem"]:has-text("Remove")').click();
         await page.locator('button:has-text("OK")').click();
 
@@ -110,16 +98,10 @@ test.describe('Flexible Layout', () => {
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/3117'
         });
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-            name: new RegExp(sineWaveObject.name)
-        });
-
         // Create a Flexible Layout
         const flexibleLayout = await createDomainObjectWithDefaults(page, {
-            type: 'Flexible Layout'
+            type: 'Flexible Layout',
+            name: "Test Flexible Layout"
         });
         // Edit Flexible Layout
         await page.locator('[title="Edit"]').click();
@@ -127,7 +109,7 @@ test.describe('Flexible Layout', () => {
         // Expand the 'My Items' folder in the left tree
         await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
         // Add the Sine Wave Generator to the Flexible Layout and save changes
-        await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
+        await page.dragAndDrop('text=Test Sine Wave Generator', '.c-fl__container.is-empty');
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
 
@@ -140,7 +122,7 @@ test.describe('Flexible Layout', () => {
         await page.goto(sineWaveObject.url);
 
         // Bring up context menu and remove
-        await sineWaveGeneratorTreeItem.first().click({ button: 'right' });
+        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').click({ button: 'right' });
         await page.locator('li[role="menuitem"]:has-text("Remove")').click();
         await page.locator('button:has-text("OK")').click();
 

e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js

@@ -25,13 +25,13 @@ This test suite is dedicated to tests which verify the basic operations surround
 but only assume that example imagery is present.
 */
 /* globals process */
+const { v4: uuid } = require('uuid');
 const { waitForAnimations } = require('../../../../baseFixtures');
 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
 const backgroundImageSelector = '.c-imagery__main-image__background-image';
 const panHotkey = process.platform === 'linux' ? ['Control', 'Alt'] : ['Alt'];
 const expectedAltText = process.platform === 'linux' ? 'Ctrl+Alt drag to pan' : 'Alt drag to pan';
-const thumbnailUrlParamsRegexp = /\?w=100&h=100/;
 
 //The following block of tests verifies the basic functionality of example imagery and serves as a template for Imagery objects embedded in other objects.
 test.describe('Example Imagery Object', () => {
@@ -207,58 +207,6 @@ test.describe('Example Imagery in Display Layout', () => {
         await page.goto(displayLayout.url);
     });
 
-    test('View Large action pauses imagery when in realtime and returns to realtime', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/3647'
-        });
-
-        // Click time conductor mode button
-        await page.locator('.c-mode-button').click();
-
-        // set realtime mode
-        await page.locator('[data-testid="conductor-modeOption-realtime"]').click();
-
-        // pause/play button
-        const pausePlayButton = await page.locator('.c-button.pause-play');
-
-        await expect.soft(pausePlayButton).not.toHaveClass(/is-paused/);
-
-        // Open context menu and click view large menu item
-        await page.locator('button[title="View menu items"]').click();
-        await page.locator('li[title="View Large"]').click();
-        await expect(pausePlayButton).toHaveClass(/is-paused/);
-
-        await page.locator('[aria-label="Close"]').click();
-        await expect.soft(pausePlayButton).not.toHaveClass(/is-paused/);
-    });
-
-    test('View Large action leaves keeps realtime mode paused', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/3647'
-        });
-
-        // Click time conductor mode button
-        await page.locator('.c-mode-button').click();
-
-        // set realtime mode
-        await page.locator('[data-testid="conductor-modeOption-realtime"]').click();
-
-        // pause/play button
-        const pausePlayButton = await page.locator('.c-button.pause-play');
-        await pausePlayButton.click();
-        await expect.soft(pausePlayButton).toHaveClass(/is-paused/);
-
-        // Open context menu and click view large menu item
-        await page.locator('button[title="View menu items"]').click();
-        await page.locator('li[title="View Large"]').click();
-        await expect(pausePlayButton).toHaveClass(/is-paused/);
-
-        await page.locator('[aria-label="Close"]').click();
-        await expect.soft(pausePlayButton).toHaveClass(/is-paused/);
-    });
-
     test('Imagery View operations @unstable', async ({ page }) => {
         test.info().annotations.push({
             type: 'issue',
@@ -397,11 +345,13 @@ test.describe('Example Imagery in Time Strip', () => {
     test.beforeEach(async ({ page }) => {
         await page.goto('./', { waitUntil: 'networkidle' });
         timeStripObject = await createDomainObjectWithDefaults(page, {
-            type: 'Time Strip'
+            type: 'Time Strip',
+            name: 'Time Strip'.concat(' ', uuid())
         });
 
         await createDomainObjectWithDefaults(page, {
             type: 'Example Imagery',
+            name: 'Example Imagery'.concat(' ', uuid()),
             parent: timeStripObject.uuid
         });
         // Navigate to timestrip
@@ -412,28 +362,17 @@ test.describe('Example Imagery in Time Strip', () => {
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/5632'
         });
-
-        // Hover over the timestrip to reveal a thumbnail image
         await page.locator('.c-imagery-tsv-container').hover();
-
-        // Get the img src of the hovered image thumbnail
-        const hoveredThumbnailImg = page.locator('.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img');
-        const hoveredThumbnailImgSrc = await hoveredThumbnailImg.getAttribute('src');
-
-        // Verify that imagery timestrip view uses the thumbnailUrl as img src for thumbnails
-        expect(hoveredThumbnailImgSrc).toBeTruthy();
-        expect(hoveredThumbnailImgSrc).toMatch(thumbnailUrlParamsRegexp);
-
-        // Click on the hovered thumbnail to open "View Large" view
+        // get url of the hovered image
+        const hoveredImg = page.locator('.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img');
+        const hoveredImgSrc = await hoveredImg.getAttribute('src');
+        expect(hoveredImgSrc).toBeTruthy();
         await page.locator('.c-imagery-tsv-container').click();
-
-        // Get the img src of the large view image
+        // get image of view large container
         const viewLargeImg = page.locator('img.c-imagery__main-image__image');
         const viewLargeImgSrc = await viewLargeImg.getAttribute('src');
         expect(viewLargeImgSrc).toBeTruthy();
-
-        // Verify that the image in the large view is the same as the hovered thumbnail
-        expect(viewLargeImgSrc).toEqual(hoveredThumbnailImgSrc.split('?')[0]);
+        expect(viewLargeImgSrc).toEqual(hoveredImgSrc);
     });
 });
 
@@ -450,12 +389,6 @@ test.describe('Example Imagery in Time Strip', () => {
  * @param {import('@playwright/test').Page} page
  */
 async function performImageryViewOperationsAndAssert(page) {
-    // Verify that imagery thumbnails use a thumbnail url
-    const thumbnailImages = page.locator('.c-thumb__image');
-    const mainImage = page.locator('.c-imagery__main-image__image');
-    await expect(thumbnailImages.first()).toHaveAttribute('src', thumbnailUrlParamsRegexp);
-    await expect(mainImage).not.toHaveAttribute('src', thumbnailUrlParamsRegexp);
-
     // Click previous image button
     const previousImageButton = page.locator('.c-nav--prev');
     await previousImageButton.click();

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

@@ -24,12 +24,11 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
 */
 
+// FIXME: Remove this eslint exception once tests are implemented
+// eslint-disable-next-line no-unused-vars
 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const { expandTreePaneItemByName, createDomainObjectWithDefaults } = require('../../../../appActions');
 const nbUtils = require('../../../../helper/notebookUtils');
-const path = require('path');
-
-const NOTEBOOK_NAME = 'Notebook';
 
 test.describe('Notebook CRUD Operations', () => {
     test.fixme('Can create a Notebook Object', async ({ page }) => {
@@ -76,7 +75,8 @@ test.describe('Notebook section tests', () => {
 
         // Create Notebook
         await createDomainObjectWithDefaults(page, {
-            type: NOTEBOOK_NAME
+            type: 'Notebook',
+            name: "Test Notebook"
         });
     });
     test('Default and new sections are automatically named Unnamed Section with Unnamed Page', async ({ page }) => {
@@ -137,7 +137,8 @@ test.describe('Notebook page tests', () => {
 
         // Create Notebook
         await createDomainObjectWithDefaults(page, {
-            type: NOTEBOOK_NAME
+            type: 'Notebook',
+            name: "Test Notebook"
         });
     });
     //Test will need to be implemented after a refactor in #5713
@@ -208,30 +209,24 @@ test.describe('Notebook search tests', () => {
 });
 
 test.describe('Notebook entry tests', () => {
-    // Create Notebook with URL Whitelist
-    let notebookObject;
-    test.beforeEach(async ({ page }) => {
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitNotebookWithUrls.js') });
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        notebookObject = await createDomainObjectWithDefaults(page, {
-            type: NOTEBOOK_NAME
-        });
-    });
     test.fixme('When a new entry is created, it should be focused', async ({ page }) => {});
     test('When an object is dropped into a notebook, a new entry is created and it should be focused @unstable', async ({ page }) => {
+        await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
+
+        // Create Notebook
+        const notebook = await createDomainObjectWithDefaults(page, {
+            type: 'Notebook',
+            name: "Embed Test Notebook"
+        });
         // Create Overlay Plot
         await createDomainObjectWithDefaults(page, {
-            type: 'Overlay Plot'
+            type: 'Overlay Plot',
+            name: "Dropped Overlay Plot"
         });
 
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
+        await expandTreePaneItemByName(page, 'My Items');
 
+        await page.goto(notebook.url);
         await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', '.c-notebook__drag-area');
 
         const embed = page.locator('.c-ne__embed__link');
@@ -241,16 +236,22 @@ test.describe('Notebook entry tests', () => {
         expect(embedName).toBe('Dropped Overlay Plot');
     });
     test('When an object is dropped into a notebooks existing entry, it should be focused @unstable', async ({ page }) => {
+        await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
+
+        // Create Notebook
+        const notebook = await createDomainObjectWithDefaults(page, {
+            type: 'Notebook',
+            name: "Embed Test Notebook"
+        });
         // Create Overlay Plot
         await createDomainObjectWithDefaults(page, {
-            type: 'Overlay Plot'
+            type: 'Overlay Plot',
+            name: "Dropped Overlay Plot"
         });
 
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
+        await expandTreePaneItemByName(page, 'My Items');
 
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
+        await page.goto(notebook.url);
 
         await nbUtils.enterTextEntry(page, 'Entry to drop into');
         await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', 'text=Entry to drop into');
@@ -264,117 +265,71 @@ test.describe('Notebook entry tests', () => {
     });
     test.fixme('new entries persist through navigation events without save', async ({ page }) => {});
     test.fixme('previous and new entries can be deleted', async ({ page }) => {});
-    test('when a valid link is entered into a notebook entry, it becomes clickable when viewing', async ({ page }) => {
-        const TEST_LINK = 'http://www.google.com';
+});
 
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
-
-        await nbUtils.enterTextEntry(page, `This should be a link: ${TEST_LINK} is it?`);
-
-        const validLink = page.locator(`a[href="${TEST_LINK}"]`);
-
-        // Start waiting for popup before clicking. Note no await.
-        const popupPromise = page.waitForEvent('popup');
-
-        await validLink.click();
-        const popup = await popupPromise;
-
-        // Wait for the popup to load.
-        await popup.waitForLoadState();
-        expect.soft(popup.url()).toContain('www.google.com');
-
-        expect(await validLink.count()).toBe(1);
+test.describe('Snapshot Menu tests', () => {
+    test.fixme('When no default notebook is selected, Snapshot Menu dropdown should only have a single option', async ({ page }) => {
+        // There should be no default notebook
+        // Clear default notebook if exists using `localStorage.setItem('notebook-storage', null);`
+        // refresh page
+        // Click on 'Notebook Snaphot Menu'
+        // 'save to Notebook Snapshots' should be only option there
     });
-    test('when an invalid link is entered into a notebook entry, it does not become clickable when viewing', async ({ page }) => {
-        const TEST_LINK = 'www.google.com';
-
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
-
-        await nbUtils.enterTextEntry(page, `This should NOT be a link: ${TEST_LINK} is it?`);
-
-        const invalidLink = page.locator(`a[href="${TEST_LINK}"]`);
-
-        expect(await invalidLink.count()).toBe(0);
+    test.fixme('When default notebook is updated selected, Snapshot Menu dropdown should list it as the newest option', async ({ page }) => {
+        // Create 2a notebooks
+        // Set Notebook A as Default
+        // Open Snapshot Menu and note that Notebook A is listed
+        // Close Snapshot Menu
+        // Set Default Notebook to Notebook B
+        // Open Snapshot Notebook and note that Notebook B is listed
+        // Select Default Notebook Option and verify that Snapshot is added to Notebook B
     });
-    test('when a link is entered, but it is not in the whitelisted urls, it does not become clickable when viewing', async ({ page }) => {
-        const TEST_LINK = 'http://www.bing.com';
-
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
-
-        await nbUtils.enterTextEntry(page, `This should NOT be a link: ${TEST_LINK} is it?`);
-
-        const invalidLink = page.locator(`a[href="${TEST_LINK}"]`);
-
-        expect(await invalidLink.count()).toBe(0);
+    test.fixme('Can add Snapshots via Snapshot Menu and details are correct', async ({ page }) => {
+        //Note this should be a visual test, too
+        // Create Telemetry object
+        // Create A notebook with many pages and sections.
+        // Set page and section defaults to be between first and last of many. i.e. 3 of 5
+        // Navigate to Telemetry object
+        // Select Default Notebook Option and verify that Snapshot is added to Notebook A
+        // Verify Snapshot Details appear correctly
     });
-    test('when a valid link with a subdomain and a valid domain in the whitelisted urls is entered into a notebook entry, it becomes clickable when viewing', async ({ page }) => {
-        const INVALID_TEST_LINK = 'http://bing.google.com';
-
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
-
-        await nbUtils.enterTextEntry(page, `This should be a link: ${INVALID_TEST_LINK} is it?`);
-
-        const validLink = page.locator(`a[href="${INVALID_TEST_LINK}"]`);
-
-        expect(await validLink.count()).toBe(1);
-    });
-    test('when a valid secure link is entered into a notebook entry, it becomes clickable when viewing', async ({ page }) => {
-        const TEST_LINK = 'https://www.google.com';
-
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
-
-        await nbUtils.enterTextEntry(page, `This should be a link: ${TEST_LINK} is it?`);
-
-        const validLink = page.locator(`a[href="${TEST_LINK}"]`);
-
-        // Start waiting for popup before clicking. Note no await.
-        const popupPromise = page.waitForEvent('popup');
-
-        await validLink.click();
-        const popup = await popupPromise;
-
-        // Wait for the popup to load.
-        await popup.waitForLoadState();
-        expect.soft(popup.url()).toContain('www.google.com');
-
-        expect(await validLink.count()).toBe(1);
-    });
-    test('when a nefarious link is entered into a notebook entry, it is sanitized when viewing', async ({ page }) => {
-        const TEST_LINK = 'http://www.google.com?bad=';
-        const TEST_LINK_BAD = `http://www.google.com?bad=<script>alert('gimme your cookies')</script>`;
-
-        // Navigate to the notebook object
-        await page.goto(notebookObject.url);
-
-        // Reveal the notebook in the tree
-        await page.getByTitle('Show selected item in tree').click();
-
-        await nbUtils.enterTextEntry(page, `This should be a link, BUT not a bad link: ${TEST_LINK_BAD} is it?`);
-
-        const sanitizedLink = page.locator(`a[href="${TEST_LINK}"]`);
-        const unsanitizedLink = page.locator(`a[href="${TEST_LINK_BAD}"]`);
-
-        expect.soft(await sanitizedLink.count()).toBe(1);
-        expect(await unsanitizedLink.count()).toBe(0);
+    test.fixme('Snapshots adjust time conductor', async ({ page }) => {
+        // Create Telemetry object
+        // Set Telemetry object's timeconductor to Fixed time with Start and Endtimes are recorded
+        // Embed Telemetry object into notebook
+        // Set Time Conductor to Local clock
+        // Click into embedded telemetry object and verify object appears with same fixed time from record
+    });
+});
+
+test.describe('Snapshot Container tests', () => {
+    test.fixme('5 Snapshots can be added to a container', async ({ page }) => {});
+    test.fixme('5 Snapshots can be added to a container and Deleted with Delete All action', async ({ page }) => {});
+    test.fixme('A snapshot can be Deleted from Container', async ({ page }) => {});
+    test.fixme('A snapshot can be Previewed from Container', async ({ page }) => {});
+    test.fixme('A snapshot Container can be open and closed', async ({ page }) => {});
+    test.fixme('Can add object to Snapshot container and pull into notebook and create a new entry', async ({ page }) => {
+        //Create Notebook
+        //Create Telemetry Object
+        //From Telemetry Object, use 'save to Notebook Snapshots'
+        //Snapshots indicator should blink, click on it to view snapshots
+        //Navigate to Notebook
+        //Drag and Drop onto droppable area for new entry
+        //New Entry created with given snapshot added
+        //Snapshot removed from container?
+    });
+    test.fixme('Can add object to Snapshot container and pull into notebook and existing entry', async ({ page }) => {
+        //Create Notebook
+        //Create Telemetry Object
+        //From Telemetry Object, use 'save to Notebook Snapshots'
+        //Snapshots indicator should blink, click on it to view snapshots
+        //Navigate to Notebook
+        //Drag and Drop into exiting entry
+        //Existing Entry updated with given snapshot
+        //Snapshot removed from container?
+    });
+    test.fixme('Verify Embedded options for PNG, JPG, and Annotate work correctly', async ({ page }) => {
+        //Add snapshot to container
+        //Verify PNG, JPG, and Annotate buttons work correctly
     });
 });

e2e/tests/functional/plugins/notebook/notebookSnapshots.e2e.spec.js

@@ -1,134 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-// const { expandTreePaneItemByName, createDomainObjectWithDefaults } = require('../../../../appActions');
-// const nbUtils = require('../../../../helper/notebookUtils');
-
-test.describe('Snapshot Menu tests', () => {
-    test.fixme('When no default notebook is selected, Snapshot Menu dropdown should only have a single option', async ({ page }) => {
-        // There should be no default notebook
-        // Clear default notebook if exists using `localStorage.setItem('notebook-storage', null);`
-        // refresh page
-        // Click on 'Notebook Snaphot Menu'
-        // 'save to Notebook Snapshots' should be only option there
-    });
-    test.fixme('When default notebook is updated selected, Snapshot Menu dropdown should list it as the newest option', async ({ page }) => {
-        // Create 2a notebooks
-        // Set Notebook A as Default
-        // Open Snapshot Menu and note that Notebook A is listed
-        // Close Snapshot Menu
-        // Set Default Notebook to Notebook B
-        // Open Snapshot Notebook and note that Notebook B is listed
-        // Select Default Notebook Option and verify that Snapshot is added to Notebook B
-    });
-    test.fixme('Can add Snapshots via Snapshot Menu and details are correct', async ({ page }) => {
-        //Note this should be a visual test, too
-        // Create Telemetry object
-        // Create A notebook with many pages and sections.
-        // Set page and section defaults to be between first and last of many. i.e. 3 of 5
-        // Navigate to Telemetry object
-        // Select Default Notebook Option and verify that Snapshot is added to Notebook A
-        // Verify Snapshot Details appear correctly
-    });
-    test.fixme('Snapshots adjust time conductor', async ({ page }) => {
-        // Create Telemetry object
-        // Set Telemetry object's timeconductor to Fixed time with Start and Endtimes are recorded
-        // Embed Telemetry object into notebook
-        // Set Time Conductor to Local clock
-        // Click into embedded telemetry object and verify object appears with same fixed time from record
-    });
-});
-
-test.describe('Snapshot Container tests', () => {
-    test.beforeEach(async ({ page }) => {
-        //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create Notebook
-        // const notebook = await createDomainObjectWithDefaults(page, {
-        //     type: 'Notebook',
-        //     name: "Test Notebook"
-        // });
-        // // Create Overlay Plot
-        // const snapShotObject = await createDomainObjectWithDefaults(page, {
-        //     type: 'Overlay Plot',
-        //     name: "Dropped Overlay Plot"
-        // });
-
-        await page.getByRole('button', { name: ' Snapshot ' }).click();
-        await page.getByRole('menuitem', { name: ' Save to Notebook Snapshots' }).click();
-        await page.getByRole('button', { name: 'Show' }).click();
-
-    });
-    test.fixme('5 Snapshots can be added to a container', async ({ page }) => {});
-    test.fixme('5 Snapshots can be added to a container and Deleted with Delete All action', async ({ page }) => {});
-    test.fixme('A snapshot can be Deleted from Container with 3 dot action menu', async ({ page }) => {});
-    test.fixme('A snapshot can be Viewed, Annotated, display deleted, and saved from Container with 3 dot action menu', async ({ page }) => {
-        await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
-        await page.getByRole('menuitem', { name: ' View Snapshot' }).click();
-        await expect(page.locator('.c-overlay__outer')).toBeVisible();
-        await page.getByTitle('Annotate').click();
-        await expect(page.locator('#snap-annotation-canvas')).toBeVisible();
-        await page.getByRole('button', { name: '' }).click();
-        // await expect(page.locator('#snap-annotation-canvas')).not.toBeVisible();
-        await page.getByRole('button', { name: 'Save' }).click();
-        await page.getByRole('button', { name: 'Done' }).click();
-        //await expect(await page.locator)
-    });
-    test('A snapshot can be Quick Viewed from Container with 3 dot action menu', async ({ page }) => {
-        await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
-        await page.getByRole('menuitem', { name: 'Quick View' }).click();
-        await expect(page.locator('.c-overlay__outer')).toBeVisible();
-    });
-    test.fixme('A snapshot can be Navigated To from Container with 3 dot action menu', async ({ page }) => {});
-    test.fixme('A snapshot can be Navigated To Item in Time from Container with 3 dot action menu', async ({ page }) => {});
-    test.fixme('A snapshot Container can be open and closed', async ({ page }) => {});
-    test.fixme('Can add object to Snapshot container and pull into notebook and create a new entry', async ({ page }) => {
-        //Create Notebook
-        //Create Telemetry Object
-        //From Telemetry Object, use 'save to Notebook Snapshots'
-        //Snapshots indicator should blink, click on it to view snapshots
-        //Navigate to Notebook
-        //Drag and Drop onto droppable area for new entry
-        //New Entry created with given snapshot added
-        //Snapshot removed from container?
-    });
-    test.fixme('Can add object to Snapshot container and pull into notebook and existing entry', async ({ page }) => {
-        //Create Notebook
-        //Create Telemetry Object
-        //From Telemetry Object, use 'save to Notebook Snapshots'
-        //Snapshots indicator should blink, click on it to view snapshots
-        //Navigate to Notebook
-        //Drag and Drop into exiting entry
-        //Existing Entry updated with given snapshot
-        //Snapshot removed from container?
-    });
-    test.fixme('Verify Embedded options for PNG, JPG, and Annotate work correctly', async ({ page }) => {
-        //Add snapshot to container
-        //Verify PNG, JPG, and Annotate buttons work correctly
-    });
-});

e2e/tests/functional/plugins/notebook/notebookWithCouchDB.e2e.spec.js

@@ -41,7 +41,6 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
     });
 
     test('Inspect Notebook Entry Network Requests', async ({ page }) => {
-        await page.getByText('Annotations').click();
         // Expand sidebar
         await page.locator('.c-notebook__toggle-nav-button').click();
 
@@ -77,7 +76,6 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
         await page.locator('text=To start a new entry, click here or drag and drop any object').click();
         await page.locator('[aria-label="Notebook Entry Input"]').click();
         await page.locator('[aria-label="Notebook Entry Input"]').fill(`First Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"]').press('Enter');
         await page.waitForLoadState('networkidle');
         expect(addingNotebookElementsRequests.length).toBeLessThanOrEqual(2);
 
@@ -150,33 +148,30 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
         await page.locator('text=To start a new entry, click here or drag and drop any object').click();
         await page.locator('[aria-label="Notebook Entry Input"]').click();
         await page.locator('[aria-label="Notebook Entry Input"]').fill(`First Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"]').press('Enter');
 
         await page.locator('text=To start a new entry, click here or drag and drop any object').click();
         await page.locator('[aria-label="Notebook Entry Input"] >> nth=1').click();
         await page.locator('[aria-label="Notebook Entry Input"] >> nth=1').fill(`Second Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=1').press('Enter');
 
         await page.locator('text=To start a new entry, click here or drag and drop any object').click();
         await page.locator('[aria-label="Notebook Entry Input"] >> nth=2').click();
         await page.locator('[aria-label="Notebook Entry Input"] >> nth=2').fill(`Third Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=2').press('Enter');
 
         // Add three tags
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
+        await page.hover(`button:has-text("Add Tag") >> nth=2`);
+        await page.locator(`button:has-text("Add Tag") >> nth=2`).click();
         await page.locator('[placeholder="Type to select tag"]').click();
         await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
         await page.waitForSelector('[aria-label="Tag"]:has-text("Science")');
 
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
+        await page.hover(`button:has-text("Add Tag") >> nth=2`);
+        await page.locator(`button:has-text("Add Tag") >> nth=2`).click();
         await page.locator('[placeholder="Type to select tag"]').click();
         await page.locator('[aria-label="Autocomplete Options"] >> text=Drilling').click();
         await page.waitForSelector('[aria-label="Tag"]:has-text("Drilling")');
 
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
+        await page.hover(`button:has-text("Add Tag") >> nth=2`);
+        await page.locator(`button:has-text("Add Tag") >> nth=2`).click();
         await page.locator('[placeholder="Type to select tag"]').click();
         await page.locator('[aria-label="Autocomplete Options"] >> text=Driving').click();
         await page.waitForSelector('[aria-label="Tag"]:has-text("Driving")');
@@ -232,7 +227,6 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
             type: 'issue',
             description: 'https://github.com/akhenry/openmct-yamcs/issues/69'
         });
-        await page.getByText('Annotations').click();
         await page.locator('text=To start a new entry, click here or drag and drop any object').click();
         await page.locator('[aria-label="Notebook Entry Input"]').click();
         await page.locator('[aria-label="Notebook Entry Input"]').fill(`First Entry`);

e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js

@@ -152,7 +152,7 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit
 
     test('Allows embeds to be deleted if page unlocked @addInit', async ({ page }) => {
         // Click .c-ne__embed__name .c-popup-menu-button
-        await page.locator('.c-ne__embed__name .c-icon-button').click(); // embed popup menu
+        await page.locator('.c-ne__embed__name .c-popup-menu-button').click(); // embed popup menu
 
         const embedMenu = page.locator('body >> .c-menu');
         await expect(embedMenu).toContainText('Remove This Embed');
@@ -161,7 +161,7 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit
     test('Disallows embeds to be deleted if page locked @addInit', async ({ page }) => {
         await lockPage(page);
         // Click .c-ne__embed__name .c-popup-menu-button
-        await page.locator('.c-ne__embed__name .c-icon-button').click(); // embed popup menu
+        await page.locator('.c-ne__embed__name .c-popup-menu-button').click(); // embed popup menu
 
         const embedMenu = page.locator('body >> .c-menu');
         await expect(embedMenu).not.toContainText('Remove This Embed');

e2e/tests/functional/plugins/notebook/tags.e2e.spec.js

@@ -57,14 +57,12 @@ async function createNotebookAndEntry(page, iterations = 1) {
   */
 async function createNotebookEntryAndTags(page, iterations = 1) {
     const notebook = await createNotebookAndEntry(page, iterations);
-    await page.locator('text=Annotations').click();
 
     for (let iteration = 0; iteration < iterations; iteration++) {
         // Hover and click "Add Tag" button
         // Hover is needed here to "slow down" the actions while running in headless mode
-        await page.locator(`[aria-label="Notebook Entry"] >> nth = ${iteration}`).click();
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
+        await page.hover(`button:has-text("Add Tag") >> nth = ${iteration}`);
+        await page.locator(`button:has-text("Add Tag") >> nth = ${iteration}`).click();
 
         // Click inside the tag search input
         await page.locator('[placeholder="Type to select tag"]').click();
@@ -73,8 +71,8 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
 
         // Hover and click "Add Tag" button
         // Hover is needed here to "slow down" the actions while running in headless mode
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
+        await page.hover(`button:has-text("Add Tag") >> nth = ${iteration}`);
+        await page.locator(`button:has-text("Add Tag") >> nth = ${iteration}`).click();
         // Click inside the tag search input
         await page.locator('[placeholder="Type to select tag"]').click();
         // Select the "Science" tag
@@ -86,10 +84,8 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
 
 test.describe('Tagging in Notebooks @addInit', () => {
     test('Can load tags', async ({ page }) => {
+
         await createNotebookAndEntry(page);
-
-        await page.locator('text=Annotations').click();
-
         await page.locator('button:has-text("Add Tag")').click();
 
         await page.locator('[placeholder="Type to select tag"]').click();
@@ -111,7 +107,7 @@ test.describe('Tagging in Notebooks @addInit', () => {
         await expect(page.locator('[aria-label="Autocomplete Options"]')).not.toContainText("Driving");
         await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Drilling");
     });
-    test('Can search for tags and preview works properly', async ({ page }) => {
+    test('Can search for tags', async ({ page }) => {
         await createNotebookEntryAndTags(page);
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
@@ -126,29 +122,17 @@ test.describe('Tagging in Notebooks @addInit', () => {
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Xq');
         await expect(page.locator('text=No results found')).toBeVisible();
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout'
-        });
-
-        // Go back into edit mode for the display layout
-        await page.locator('button[title="Edit"]').click();
-
-        await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-        await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
-        await expect(page.locator('[aria-label="Search Result"]')).toContainText("Science");
-        await page.getByText('Entry 0').click();
-        await expect(page.locator('.js-preview-window')).toBeVisible();
     });
 
     test('Can delete tags', async ({ page }) => {
         await createNotebookEntryAndTags(page);
+        await page.locator('[aria-label="Notebook Entries"]').click();
         // Delete Driving
         await page.hover('[aria-label="Tag"]:has-text("Driving")');
         await page.locator('[aria-label="Tag"]:has-text("Driving") ~ .c-completed-tag-deletion').click();
 
-        await expect(page.locator('[aria-label="Tags Inspector"]')).toContainText("Science");
-        await expect(page.locator('[aria-label="Tags Inspector"]')).not.toContainText("Driving");
+        await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText("Science");
+        await expect(page.locator('[aria-label="Notebook Entry"]')).not.toContainText("Driving");
 
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
         await expect(page.locator('[aria-label="Search Result"]')).not.toContainText("Driving");
@@ -210,18 +194,11 @@ test.describe('Tagging in Notebooks @addInit', () => {
             page.goto('./#/browse/mine?hideTree=false'),
             page.click('.c-disclosure-triangle')
         ]);
-
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
         // Click Clock
-        await treePane.getByRole('treeitem', {
-            name: clock.name
-        }).click();
+        await page.click(`text=${clock.name}`);
+
         // Click Notebook
-        await page.getByRole('treeitem', {
-            name: notebook.name
-        }).click();
+        await page.click(`text=${notebook.name}`);
 
         for (let iteration = 0; iteration < ITERATIONS; iteration++) {
             const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
@@ -244,25 +221,4 @@ test.describe('Tagging in Notebooks @addInit', () => {
             await expect(page.locator(entryLocator)).toContainText("Driving");
         }
     });
-    test('Can cancel adding a tag', async ({ page }) => {
-        await createNotebookAndEntry(page);
-
-        // Click on Annotations tab
-        await page.locator('.c-inspector__tab', { hasText: "Annotations" }).click();
-
-        // Click on the "Add Tag" button
-        await page.locator('button:has-text("Add Tag")').click();
-
-        // Click inside the AutoComplete field
-        await page.locator('[placeholder="Type to select tag"]').click();
-
-        // Click on the "Tags" header (simulating a click outside the autocomplete)
-        await page.locator('div.c-inspect-properties__header:has-text("Tags")').click();
-
-        // Verify there is a button with text "Add Tag"
-        await expect(page.locator('button:has-text("Add Tag")')).toBeVisible();
-
-        // Verify the AutoComplete field is hidden
-        await expect(page.locator('[placeholder="Type to select tag"]')).toBeHidden();
-    });
 });

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

@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-* This test suite is dedicated to testing the operator status plugin.
-*/
-
-const path = require('path');
-const { test, expect } = require('../../../../pluginFixtures');
-
-/*
-
-Precondition: Inject Example User, Operator Status Plugins
-Verify that user 1 sees updates from user/role 2 (Not possible without openmct-yamcs implementation)
-
-Clear Role Status of single user test
-STUB (test.fixme) Rolling through each
-
-*/
-
-test.describe('Operator Status', () => {
-    test.beforeEach(async ({ page }) => {
-        // FIXME: determine if plugins will be added to index.html or need to be injected
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitExampleUser.js')});
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitOperatorStatus.js')});
-        await page.goto('./', { waitUntil: 'networkidle' });
-    });
-
-    // verify that operator status is visible
-    test('operator status is visible and expands when clicked', async ({ page }) => {
-        await expect(page.locator('div[title="Set my operator status"]')).toBeVisible();
-        await page.locator('div[title="Set my operator status"]').click();
-
-        // expect default status to be 'GO'
-        await expect(page.locator('.c-status-poll-panel')).toBeVisible();
-    });
-
-    test('poll question indicator remains when blank poll set', async ({ page }) => {
-        await expect(page.locator('div[title="Set the current poll question"]')).toBeVisible();
-        await page.locator('div[title="Set the current poll question"]').click();
-        // set to blank
-        await page.getByRole('button', { name: 'Update' }).click();
-
-        // should still be visible
-        await expect(page.locator('div[title="Set the current poll question"]')).toBeVisible();
-    });
-
-    // Verify that user 1 sees updates from user/role 2 (Not possible without openmct-yamcs implementation)
-    test('operator status table reflects answered values', async ({ page }) => {
-        // user navigates to operator status poll
-        const statusPollIndicator = page.locator('div[title="Set my operator status"]');
-        await statusPollIndicator.click();
-
-        // get user role value
-        const userRole = page.locator('.c-status-poll-panel__user-role');
-        const userRoleText = await userRole.innerText();
-
-        // get selected status value
-        const selectStatus = page.locator('select[name="setStatus"]');
-        await selectStatus.selectOption({ index: 1});
-        const initialStatusValue = await selectStatus.inputValue();
-
-        // open manage status poll
-        const manageStatusPollIndicator = page.locator('div[title="Set the current poll question"]');
-        await manageStatusPollIndicator.click();
-        // parse the table row values
-        const row = page.locator(`tr:has-text("${userRoleText}")`);
-        const rowValues = await row.innerText();
-        const rowValuesArr = rowValues.split('\t');
-        const COLUMN_STATUS_INDEX = 1;
-        // check initial set value matches status table
-        expect(rowValuesArr[COLUMN_STATUS_INDEX].toLowerCase())
-            .toEqual(initialStatusValue.toLowerCase());
-
-        // change user status
-        await statusPollIndicator.click();
-        // FIXME: might want to grab a dynamic option instead of arbitrary
-        await page.locator('select[name="setStatus"]').selectOption({ index: 2});
-        const updatedStatusValue = await selectStatus.inputValue();
-        // verify user status is reflected in table
-        await manageStatusPollIndicator.click();
-
-        const updatedRow = page.locator(`tr:has-text("${userRoleText}")`);
-        const updatedRowValues = await updatedRow.innerText();
-        const updatedRowValuesArr = updatedRowValues.split('\t');
-
-        expect(updatedRowValuesArr[COLUMN_STATUS_INDEX].toLowerCase())
-            .toEqual(updatedStatusValue.toLowerCase());
-
-    });
-
-    test('clear poll button removes poll responses', async ({ page }) => {
-        // user navigates to operator status poll
-        const statusPollIndicator = page.locator('div[title="Set my operator status"]');
-        await statusPollIndicator.click();
-
-        // get user role value
-        const userRole = page.locator('.c-status-poll-panel__user-role');
-        const userRoleText = await userRole.innerText();
-
-        // get selected status value
-        const selectStatus = page.locator('select[name="setStatus"]');
-        // FIXME: might want to grab a dynamic option instead of arbitrary
-        await selectStatus.selectOption({ index: 1});
-        const initialStatusValue = await selectStatus.inputValue();
-
-        // open manage status poll
-        const manageStatusPollIndicator = page.locator('div[title="Set the current poll question"]');
-        await manageStatusPollIndicator.click();
-        // parse the table row values
-        const row = page.locator(`tr:has-text("${userRoleText}")`);
-        const rowValues = await row.innerText();
-        const rowValuesArr = rowValues.split('\t');
-        const COLUMN_STATUS_INDEX = 1;
-        // check initial set value matches status table
-        expect(rowValuesArr[COLUMN_STATUS_INDEX].toLowerCase())
-            .toEqual(initialStatusValue.toLowerCase());
-
-        // clear the poll
-        await page.locator('button[title="Clear the previous poll question"]').click();
-
-        const updatedRow = page.locator(`tr:has-text("${userRoleText}")`);
-        const updatedRowValues = await updatedRow.innerText();
-        const updatedRowValuesArr = updatedRowValues.split('\t');
-        const UNSET_VALUE_LABEL = 'Not set';
-        expect(updatedRowValuesArr[COLUMN_STATUS_INDEX])
-            .toEqual(UNSET_VALUE_LABEL);
-
-    });
-
-    test.fixme('iterate through all possible response values', async ({ page }) => {
-        // test all possible respone values for the poll
-    });
-
-});

e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js

@@ -32,7 +32,7 @@ test.use({
     }
 });
 
-test.describe('Autoscale', () => {
+test.describe('ExportAsJSON', () => {
     test('User can set autoscale with a valid range @snapshot', async ({ page, openmctConfig }) => {
         const { myItemsFolderName } = openmctConfig;
 
@@ -47,32 +47,16 @@ test.describe('Autoscale', () => {
 
         await testYTicks(page, ['-1.00', '-0.50', '0.00', '0.50', '1.00']);
 
-        // enter edit mode
-        await page.click('button[title="Edit"]');
-
         await turnOffAutoscale(page);
 
-        await setUserDefinedMinAndMax(page, '-2', '2');
-
-        // save
-        await page.click('button[title="Save"]');
-        await Promise.all([
-            page.locator('li[title = "Save and Finish Editing"]').click(),
-            //Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-        //Wait until Save Banner is gone
-        await page.locator('.c-message-banner__close-button').click();
-        await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
-
-        // Make sure that after turning off autoscale, the user entered range values are reflexted in the ticks.
-        await testYTicks(page, ['-2.00', '-1.50', '-1.00', '-0.50', '0.00', '0.50', '1.00', '1.50', '2.00']);
+        // Make sure that after turning off autoscale, the user selected range values start at the same values the plot had prior.
+        await testYTicks(page, ['-1.00', '-0.50', '0.00', '0.50', '1.00']);
 
         const canvas = page.locator('canvas').nth(1);
 
         await canvas.hover({trial: true});
 
-        expect.soft(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-prepan.png', { animations: 'disabled' });
+        expect(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-prepan.png', { animations: 'disabled' });
 
         //Alt Drag Start
         await page.keyboard.down('Alt');
@@ -92,12 +76,11 @@ test.describe('Autoscale', () => {
         await page.keyboard.up('Alt');
 
         // Ensure the drag worked.
-        await testYTicks(page, ['0.00', '0.50', '1.00', '1.50', '2.00', '2.50', '3.00', '3.50']);
+        await testYTicks(page, ['0.00', '0.50', '1.00', '1.50', '2.00']);
 
-        //Wait for canvas to stablize.
         await canvas.hover({trial: true});
 
-        expect.soft(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-panned.png', { animations: 'disabled' });
+        expect(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-panned.png', { animations: 'disabled' });
     });
 });
 
@@ -169,25 +152,22 @@ async function createSinewaveOverlayPlot(page, myItemsFolderName) {
  * @param {import('@playwright/test').Page} page
  */
 async function turnOffAutoscale(page) {
+    // enter edit mode
+    await page.locator('text=Unnamed Overlay Plot Snapshot >> button').nth(3).click();
+
     // uncheck autoscale
-    await page.getByRole('listitem').filter({ hasText: 'Auto scale' }).getByRole('checkbox').uncheck();
-}
+    await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"] >> nth=1').uncheck();
 
-/**
- * @param {import('@playwright/test').Page} page
- * @param {string} min
- * @param {string} max
- */
-async function setUserDefinedMinAndMax(page, min, max) {
-    // set minimum value
-    const minRangeInput = page.getByRole('listitem').filter({ hasText: 'Minimum Value' }).locator('input[type="number"]');
-    await minRangeInput.click();
-    await minRangeInput.fill(min);
-
-    // set maximum value
-    const maxRangeInput = page.getByRole('listitem').filter({ hasText: 'Maximum Value' }).locator('input[type="number"]');
-    await maxRangeInput.click();
-    await maxRangeInput.fill(max);
+    // save
+    await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+    await Promise.all([
+        page.locator('text=Save and Finish Editing').click(),
+        //Wait for Save Banner to appear
+        page.waitForSelector('.c-message-banner__message')
+    ]);
+    //Wait until Save Banner is gone
+    await page.locator('.c-message-banner__close-button').click();
+    await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
 }
 
 /**
@@ -199,7 +179,7 @@ async function testYTicks(page, values) {
     let promises = [yTicks.count().then(c => expect(c).toBe(values.length))];
 
     for (let i = 0, l = values.length; i < l; i += 1) {
-        promises.push(expect.soft(yTicks.nth(i)).toHaveText(values[i])); // eslint-disable-line
+        promises.push(expect(yTicks.nth(i)).toHaveText(values[i])); // eslint-disable-line
     }
 
     await Promise.all(promises);

e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js

@@ -160,16 +160,35 @@ async function testRegularTicks(page) {
  */
 async function testLogTicks(page) {
     const yTicks = await page.locator('.gl-plot-y-tick-label');
-    expect(await yTicks.count()).toBe(9);
+    expect(await yTicks.count()).toBe(28);
     await expect(yTicks.nth(0)).toHaveText('-2.98');
-    await expect(yTicks.nth(1)).toHaveText('-1.51');
-    await expect(yTicks.nth(2)).toHaveText('-0.58');
-    await expect(yTicks.nth(3)).toHaveText('-0.00');
-    await expect(yTicks.nth(4)).toHaveText('0.58');
-    await expect(yTicks.nth(5)).toHaveText('1.51');
-    await expect(yTicks.nth(6)).toHaveText('2.98');
-    await expect(yTicks.nth(7)).toHaveText('5.31');
-    await expect(yTicks.nth(8)).toHaveText('9.00');
+    await expect(yTicks.nth(1)).toHaveText('-2.50');
+    await expect(yTicks.nth(2)).toHaveText('-2.00');
+    await expect(yTicks.nth(3)).toHaveText('-1.51');
+    await expect(yTicks.nth(4)).toHaveText('-1.20');
+    await expect(yTicks.nth(5)).toHaveText('-1.00');
+    await expect(yTicks.nth(6)).toHaveText('-0.80');
+    await expect(yTicks.nth(7)).toHaveText('-0.58');
+    await expect(yTicks.nth(8)).toHaveText('-0.40');
+    await expect(yTicks.nth(9)).toHaveText('-0.20');
+    await expect(yTicks.nth(10)).toHaveText('-0.00');
+    await expect(yTicks.nth(11)).toHaveText('0.20');
+    await expect(yTicks.nth(12)).toHaveText('0.40');
+    await expect(yTicks.nth(13)).toHaveText('0.58');
+    await expect(yTicks.nth(14)).toHaveText('0.80');
+    await expect(yTicks.nth(15)).toHaveText('1.00');
+    await expect(yTicks.nth(16)).toHaveText('1.20');
+    await expect(yTicks.nth(17)).toHaveText('1.51');
+    await expect(yTicks.nth(18)).toHaveText('2.00');
+    await expect(yTicks.nth(19)).toHaveText('2.50');
+    await expect(yTicks.nth(20)).toHaveText('2.98');
+    await expect(yTicks.nth(21)).toHaveText('3.50');
+    await expect(yTicks.nth(22)).toHaveText('4.00');
+    await expect(yTicks.nth(23)).toHaveText('4.50');
+    await expect(yTicks.nth(24)).toHaveText('5.31');
+    await expect(yTicks.nth(25)).toHaveText('7.00');
+    await expect(yTicks.nth(26)).toHaveText('8.00');
+    await expect(yTicks.nth(27)).toHaveText('9.00');
 }
 
 /**
@@ -186,8 +205,7 @@ async function enableEditMode(page) {
  */
 async function enableLogMode(page) {
     // turn on log mode
-    await page.getByRole('listitem').filter({ hasText: 'Log mode' }).getByRole('checkbox').check();
-    // await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"]').first().check();
+    await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"]').first().check();
 }
 
 /**
@@ -195,7 +213,7 @@ async function enableLogMode(page) {
  */
 async function disableLogMode(page) {
     // turn off log mode
-    await page.getByRole('listitem').filter({ hasText: 'Log mode' }).getByRole('checkbox').uncheck();
+    await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"]').first().uncheck();
 }
 
 /**

e2e/tests/functional/plugins/plot/overlayPlot.e2e.spec.js

@@ -1,200 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-Tests to verify log plot functionality. Note this test suite if very much under active development and should not
-necessarily be used for reference when writing new tests in this area.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
-
-test.describe('Overlay Plot', () => {
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-    });
-
-    test('Plot legend color is in sync with plot series color', async ({ page }) => {
-        const overlayPlot = await createDomainObjectWithDefaults(page, {
-            type: "Overlay Plot"
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-
-        await page.goto(overlayPlot.url);
-
-        // navigate to plot series color palette
-        await page.click('.l-browse-bar__actions__edit');
-        await page.locator('li.c-tree__item.menus-to-left .c-disclosure-triangle').click();
-        await page.locator('.c-click-swatch--menu').click();
-        await page.locator('.c-palette__item[style="background: rgb(255, 166, 61);"]').click();
-
-        // gets color for swatch located in legend
-        const element = await page.waitForSelector('.plot-series-color-swatch');
-        const color = await element.evaluate((el) => {
-            return window.getComputedStyle(el).getPropertyValue('background-color');
-        });
-
-        expect(color).toBe('rgb(255, 166, 61)');
-    });
-
-    test('The elements pool supports dragging series into multiple y-axis buckets', async ({ page }) => {
-        const overlayPlot = await createDomainObjectWithDefaults(page, {
-            type: "Overlay Plot"
-        });
-
-        const swgA = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-        const swgB = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-        const swgC = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-        const swgD = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-        const swgE = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-
-        await page.goto(overlayPlot.url);
-        await page.click('button[title="Edit"]');
-
-        // Expand the elements pool vertically
-        await page.locator('.l-pane.l-pane--vertical-handle-before', {
-            hasText: 'Elements'
-        }).locator('.l-pane__handle').hover();
-        await page.mouse.down();
-        await page.mouse.move(0, 100);
-        await page.mouse.up();
-
-        const yAxis1PropertyGroup = page.locator('[aria-label="Y Axis Properties"]');
-        const yAxis2PropertyGroup = page.locator('[aria-label="Y Axis 2 Properties"]');
-        const yAxis3PropertyGroup = page.locator('[aria-label="Y Axis 3 Properties"]');
-
-        // Assert that Y Axis 1 property group is visible only
-        await expect(yAxis1PropertyGroup).toBeVisible();
-        await expect(yAxis2PropertyGroup).toBeHidden();
-        await expect(yAxis3PropertyGroup).toBeHidden();
-
-        // Drag swg a, c, e into Y Axis 2
-        await page.locator(`#inspector-elements-tree >> text=${swgA.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
-        await page.locator(`#inspector-elements-tree >> text=${swgC.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
-        await page.locator(`#inspector-elements-tree >> text=${swgE.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
-
-        // Assert that Y Axis 1 and Y Axis 2 property groups are visible only
-        await expect(yAxis1PropertyGroup).toBeVisible();
-        await expect(yAxis2PropertyGroup).toBeVisible();
-        await expect(yAxis3PropertyGroup).toBeHidden();
-
-        const yAxis1Group = page.getByLabel("Y Axis 1");
-        const yAxis2Group = page.getByLabel("Y Axis 2");
-        const yAxis3Group = page.getByLabel("Y Axis 3");
-
-        // Drag swg b into Y Axis 3
-        await page.locator(`#inspector-elements-tree >> text=${swgB.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 3"]'));
-
-        // Assert that all Y Axis property groups are visible
-        await expect(yAxis1PropertyGroup).toBeVisible();
-        await expect(yAxis2PropertyGroup).toBeVisible();
-        await expect(yAxis3PropertyGroup).toBeVisible();
-
-        // Verify that the elements are in the correct buckets and in the correct order
-        expect(yAxis1Group.getByRole('listitem', { name: swgD.name })).toBeTruthy();
-        expect(yAxis1Group.getByRole('listitem').nth(0).getByText(swgD.name)).toBeTruthy();
-        expect(yAxis2Group.getByRole('listitem', { name: swgE.name })).toBeTruthy();
-        expect(yAxis2Group.getByRole('listitem').nth(0).getByText(swgE.name)).toBeTruthy();
-        expect(yAxis2Group.getByRole('listitem', { name: swgC.name })).toBeTruthy();
-        expect(yAxis2Group.getByRole('listitem').nth(1).getByText(swgC.name)).toBeTruthy();
-        expect(yAxis2Group.getByRole('listitem', { name: swgA.name })).toBeTruthy();
-        expect(yAxis2Group.getByRole('listitem').nth(2).getByText(swgA.name)).toBeTruthy();
-        expect(yAxis3Group.getByRole('listitem', { name: swgB.name })).toBeTruthy();
-        expect(yAxis3Group.getByRole('listitem').nth(0).getByText(swgB.name)).toBeTruthy();
-    });
-
-    test('Clicking on an item in the elements pool brings up the plot preview with data points', async ({ page }) => {
-        const overlayPlot = await createDomainObjectWithDefaults(page, {
-            type: "Overlay Plot"
-        });
-
-        const swgA = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: overlayPlot.uuid
-        });
-
-        await page.goto(overlayPlot.url);
-        await page.click('button[title="Edit"]');
-
-        await page.locator(`#inspector-elements-tree >> text=${swgA.name}`).click();
-        await page.locator('.js-overlay canvas').nth(1);
-        const plotPixelSize = await getCanvasPixelsWithData(page);
-        expect(plotPixelSize).toBeGreaterThan(0);
-    });
-});
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getCanvasPixelsWithData(page) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getCanvasValue', resolve));
-
-    await page.evaluate(() => {
-        // The document canvas is where the plot points and lines are drawn.
-        // The only way to access the canvas is using document (using page.evaluate)
-        let data;
-        let canvas;
-        let ctx;
-        canvas = document.querySelector('.js-overlay canvas');
-        ctx = canvas.getContext('2d');
-        data = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
-        const imageDataValues = Object.values(data);
-        let plotPixels = [];
-        // Each pixel consists of four values within the ImageData.data array. The for loop iterates by multiples of four.
-        // The values associated with each pixel are R (red), G (green), B (blue), and A (alpha), in that order.
-        for (let i = 0; i < imageDataValues.length;) {
-            if (imageDataValues[i] > 0) {
-                plotPixels.push({
-                    startIndex: i,
-                    endIndex: i + 3,
-                    value: `rgb(${imageDataValues[i]}, ${imageDataValues[i + 1]}, ${imageDataValues[i + 2]}, ${imageDataValues[i + 3]})`
-                });
-            }
-
-            i = i + 4;
-
-        }
-
-        window.getCanvasValue(plotPixels.length);
-    });
-
-    return getTelemValuePromise;
-}

e2e/tests/functional/plugins/plot/stackedPlot.e2e.spec.js

@@ -1,139 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-Tests to verify log plot functionality. Note this test suite if very much under active development and should not
-necessarily be used for reference when writing new tests in this area.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
-
-test.describe('Stacked Plot', () => {
-    let stackedPlot;
-    let swgA;
-    let swgB;
-    let swgC;
-
-    test.beforeEach(async ({ page }) => {
-        //Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('/', { waitUntil: 'networkidle' });
-        stackedPlot = await createDomainObjectWithDefaults(page, {
-            type: "Stacked Plot"
-        });
-
-        swgA = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: stackedPlot.uuid
-        });
-        swgB = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: stackedPlot.uuid
-        });
-        swgC = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
-            parent: stackedPlot.uuid
-        });
-    });
-
-    test('Using the remove action removes the correct plot', async ({ page }) => {
-        const swgAElementsPoolItem = page.locator('#inspector-elements-tree').locator('.c-object-label', { hasText: swgA.name });
-        const swgBElementsPoolItem = page.locator('#inspector-elements-tree').locator('.c-object-label', { hasText: swgB.name });
-        const swgCElementsPoolItem = page.locator('#inspector-elements-tree').locator('.c-object-label', { hasText: swgC.name });
-
-        await page.goto(stackedPlot.url);
-
-        await page.click('button[title="Edit"]');
-
-        // Expand the elements pool vertically
-        await page.locator('.l-pane__handle').nth(2).hover({ trial: true });
-        await page.mouse.down();
-        await page.mouse.move(0, 100);
-        await page.mouse.up();
-
-        await swgBElementsPoolItem.click({ button: 'right' });
-        await page.getByRole('menuitem').filter({ hasText: /Remove/ }).click();
-        await page.getByRole('button').filter({ hasText: "OK" }).click();
-
-        await expect(page.locator('#inspector-elements-tree .js-elements-pool__item')).toHaveCount(2);
-
-        // Confirm that the elements pool contains the items we expect
-        await expect(swgAElementsPoolItem).toHaveCount(1);
-        await expect(swgBElementsPoolItem).toHaveCount(0);
-        await expect(swgCElementsPoolItem).toHaveCount(1);
-    });
-
-    test('Selecting a child plot while in browse and edit modes shows its properties in the inspector', async ({ page }) => {
-        await page.goto(stackedPlot.url);
-
-        // Click on the 1st plot
-        await page.locator(`[aria-label="Stacked Plot Item ${swgA.name}"] canvas`).nth(1).click();
-
-        // Assert that the inspector shows the Y Axis properties for swgA
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgA.name);
-
-        // Click on the 2nd plot
-        await page.locator(`[aria-label="Stacked Plot Item ${swgB.name}"] canvas`).nth(1).click();
-
-        // Assert that the inspector shows the Y Axis properties for swgB
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgB.name);
-
-        // Click on the 3rd plot
-        await page.locator(`[aria-label="Stacked Plot Item ${swgC.name}"] canvas`).nth(1).click();
-
-        // Assert that the inspector shows the Y Axis properties for swgC
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgC.name);
-
-        // Go into edit mode
-        await page.click('button[title="Edit"]');
-
-        // Click on canvas for the 1st plot
-        await page.locator(`[aria-label="Stacked Plot Item ${swgA.name}"]`).click();
-
-        // Assert that the inspector shows the Y Axis properties for swgA
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgA.name);
-
-        //Click on canvas for the 2nd plot
-        await page.locator(`[aria-label="Stacked Plot Item ${swgB.name}"]`).click();
-
-        // Assert that the inspector shows the Y Axis properties for swgB
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgB.name);
-
-        //Click on canvas for the 3rd plot
-        await page.locator(`[aria-label="Stacked Plot Item ${swgC.name}"]`).click();
-
-        // Assert that the inspector shows the Y Axis properties for swgC
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgC.name);
-    });
-});

e2e/tests/functional/recentObjects.e2e.spec.js

@@ -1,255 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../pluginFixtures.js');
-const { createDomainObjectWithDefaults } = require('../../appActions.js');
-const { waitForAnimations } = require('../../baseFixtures.js');
-
-test.describe('Recent Objects', () => {
-    /** @type {import('@playwright/test').Locator} */
-    let recentObjectsList;
-    /** @type {import('@playwright/test').Locator} */
-    let clock;
-    /** @type {import('@playwright/test').Locator} */
-    let folderA;
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Set Recent Objects List locator for subsequent tests
-        recentObjectsList = page.getByRole('list', {
-            name: 'Recent Objects'
-        });
-
-        // Create a folder and nest a Clock within it
-        folderA = await createDomainObjectWithDefaults(page, {
-            type: 'Folder'
-        });
-        clock = await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            parent: folderA.uuid
-        });
-
-        // Drag the Recent Objects panel up a bit
-        await page.locator('.l-pane.l-pane--vertical-handle-before', {
-            hasText: 'Recently Viewed'
-        }).locator('.l-pane__handle').hover();
-        await page.mouse.down();
-        await page.mouse.move(0, 100);
-        await page.mouse.up();
-    });
-    test('Navigated objects show up in recents, object renames and deletions are reflected', async ({ page }) => {
-        // Verify that both created objects appear in the list and are in the correct order
-        assertInitialRecentObjectsListState();
-
-        // Navigate to the folder by clicking on the main object name in the recent objects list item
-        await page.getByRole('listitem', { name: folderA.name }).getByText(folderA.name).click();
-        await page.waitForURL(`**/${folderA.uuid}?*`);
-        expect(recentObjectsList.getByRole('listitem').nth(0).getByText(folderA.name)).toBeTruthy();
-
-        // Rename
-        folderA.name = `${folderA.name}-NEW!`;
-        await page.locator('.l-browse-bar__object-name').fill("");
-        await page.locator('.l-browse-bar__object-name').fill(folderA.name);
-        await page.keyboard.press('Enter');
-
-        // Verify rename has been applied in recent objects list item and objects paths
-        expect(await page.getByRole('navigation', {
-            name: clock.name
-        }).locator('a').filter({
-            hasText: folderA.name
-        }).count()).toBeGreaterThan(0);
-        expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeTruthy();
-
-        // Delete
-        await page.click('button[title="Show selected item in tree"]');
-        // Delete the folder via the left tree pane treeitem context menu
-        await page.getByRole('treeitem', { name: new RegExp(folderA.name) }).locator('a').click({
-            button: 'right'
-        });
-        await page.getByRole('menuitem', { name: /Remove/ }).click();
-        await page.getByRole('button', { name: 'OK' }).click();
-
-        // Verify that the folder and clock are no longer in the recent objects list
-        await expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeHidden();
-        await expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeHidden();
-    });
-    test("Clicking on an object in the path of a recent object navigates to the object", async ({ page, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/6151'
-        });
-        await page.goto('./#/browse/mine');
-
-        // Navigate to the folder by clicking on its entry in the Clock's breadcrumb
-        const waitForFolderNavigation = page.waitForURL(`**/${folderA.uuid}?*`);
-        await page.getByRole('navigation', {
-            name: clock.name
-        }).locator('a').filter({
-            hasText: folderA.name
-        }).click();
-
-        // Verify that the hash URL updates correctly
-        await waitForFolderNavigation;
-        expect(page.url()).toMatch(new RegExp(`.*${folderA.uuid}?.*`));
-
-        // Navigate to My Items by clicking on its entry in the Clock's breadcrumb
-        const waitForMyItemsNavigation = page.waitForURL(`**/mine?*`);
-        await page.getByRole('navigation', {
-            name: clock.name
-        }).locator('a').filter({
-            hasText: myItemsFolderName
-        }).click();
-
-        // Verify that the hash URL updates correctly
-        await waitForMyItemsNavigation;
-        expect(page.url()).toMatch(new RegExp(`.*mine?.*`));
-    });
-    test("Clicking on the 'target button' scrolls the object into view in the tree and highlights it", async ({ page }) => {
-        const clockTreeItem = page.getByRole('tree', { name: 'Main Tree'}).getByRole('treeitem', { name: clock.name });
-        const folderTreeItem = page.getByRole('tree', { name: 'Main Tree'})
-            .getByRole('treeitem', {
-                name: folderA.name,
-                expanded: true
-            });
-
-        // Click the "Target" button for the Clock which is nested in a folder
-        await page.getByRole('button', { name: `Open and scroll to ${clock.name}`}).click();
-
-        // Assert that the Clock parent folder has expanded and the Clock is visible)
-        await expect(folderTreeItem.locator('.c-disclosure-triangle')).toHaveClass(/--expanded/);
-        await expect(clockTreeItem).toBeVisible();
-
-        // Assert that the Clock treeitem is highlighted
-        await expect(clockTreeItem.locator('.c-tree__item')).toHaveClass(/is-targeted-item/);
-
-        // Wait for highlight animation to end
-        await waitForAnimations(clockTreeItem.locator('.c-tree__item'));
-
-        // Assert that the Clock treeitem is no longer highlighted
-        await expect(clockTreeItem.locator('.c-tree__item')).not.toHaveClass(/is-targeted-item/);
-    });
-    test("Persists on refresh", async ({ page }) => {
-        assertInitialRecentObjectsListState();
-        await page.reload();
-        assertInitialRecentObjectsListState();
-    });
-    test("Displays objects and aliases uniquely", async ({ page }) => {
-        const mainTree = page.getByRole('tree', { name: 'Main Tree'});
-
-        // Navigate to the clock and reveal it in the tree
-        await page.goto(clock.url);
-        await page.getByTitle('Show selected item in tree').click();
-
-        // Right click the clock and create an alias using the "link" context menu action
-        const clockTreeItem = page.getByRole('tree', {
-            name: 'Main Tree'
-        }).getByRole('treeitem', {
-            name: clock.name
-        });
-        await clockTreeItem.click({
-            button: 'right'
-        });
-        await page.getByRole('menuitem', {
-            name: /Create Link/
-        }).click();
-        await page.getByRole('tree', { name: 'Create Modal Tree'}).getByRole('treeitem').first().click();
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        // Click the newly created object alias in the tree
-        await mainTree.getByRole('treeitem', {
-            name: new RegExp(clock.name)
-        }).filter({
-            has: page.locator('.is-alias')
-        }).click();
-
-        // Assert that two recent objects are displayed and one of them is an alias
-        expect(await recentObjectsList.getByRole('listitem', { name: clock.name }).count()).toBe(2);
-        expect(await recentObjectsList.locator('.is-alias').count()).toBe(1);
-
-        // Assert that the alias and the original's breadcrumbs are different
-        const clockBreadcrumbs = recentObjectsList.getByRole('listitem', {name: clock.name}).getByRole('navigation');
-        expect(await clockBreadcrumbs.count()).toBe(2);
-        expect(await clockBreadcrumbs.nth(0).innerText()).not.toEqual(await clockBreadcrumbs.nth(1).innerText());
-    });
-    test("Enforces a limit of 20 recent objects", async ({ page }) => {
-        // Creating 21 objects takes a while, so increase the timeout
-        test.slow();
-
-        // Assert that the list initially contains 3 objects (clock, folder, my items)
-        expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(3);
-
-        let lastFolder;
-        let lastClock;
-        // Create 19 more objects (3 in beforeEach() + 18 new = 21 total)
-        for (let i = 0; i < 9; i++) {
-            lastFolder = await createDomainObjectWithDefaults(page, {
-                type: "Folder",
-                parent: lastFolder?.uuid
-            });
-            lastClock = await createDomainObjectWithDefaults(page, {
-                type: "Clock",
-                parent: lastFolder?.uuid
-            });
-        }
-
-        // Assert that the list contains 20 objects
-        expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(20);
-
-        // Collapse the tree
-        await page.getByTitle("Collapse all tree items").click();
-        const lastFolderTreeItem = page.getByRole('tree', { name: 'Main Tree'})
-            .getByRole('treeitem', {
-                name: lastFolder.name,
-                expanded: true
-            });
-        const lastClockTreeItem = page.getByRole('tree', { name: 'Main Tree'})
-            .getByRole('treeitem', {
-                name: lastClock.name
-            });
-
-        // Test "Open and Scroll To" in a deeply nested tree, while we're here
-        await page.getByRole('button', { name: `Open and scroll to ${lastClock.name}`}).click();
-
-        // Assert that the Clock parent folder has expanded and the Clock is visible)
-        await expect(lastFolderTreeItem.locator('.c-disclosure-triangle')).toHaveClass(/--expanded/);
-        await expect(lastClockTreeItem).toBeVisible();
-
-        // Assert that the Clock treeitem is highlighted
-        await expect(lastClockTreeItem.locator('.c-tree__item')).toHaveClass(/is-targeted-item/);
-
-        // Wait for highlight animation to end
-        await waitForAnimations(lastClockTreeItem.locator('.c-tree__item'));
-
-        // Assert that the Clock treeitem is no longer highlighted
-        await expect(lastClockTreeItem.locator('.c-tree__item')).not.toHaveClass(/is-targeted-item/);
-    });
-
-    function assertInitialRecentObjectsListState() {
-        expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem', { name: clock.name }).locator('a').getByText(folderA.name)).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem').nth(0).getByText(clock.name)).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem', { name: clock.name }).locator('a').getByText(folderA.name)).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem').nth(1).getByText(folderA.name)).toBeTruthy();
-    }
-});

e2e/tests/functional/search.e2e.spec.js

@@ -28,14 +28,6 @@ const { createDomainObjectWithDefaults } = require('../../appActions');
 const { v4: uuid } = require('uuid');
 
 test.describe('Grand Search', () => {
-    const searchResultSelector = '.c-gsearch-result__title';
-    const searchResultDropDownSelector = '.c-gsearch__results';
-
-    test.beforeEach(async ({ page }) => {
-        // Go to baseURL
-        await page.goto("./", { waitUntil: "networkidle" });
-    });
-
     test('Can search for objects, and subsequent search dropdown behaves properly', async ({ page, openmctConfig }) => {
         const { myItemsFolderName } = openmctConfig;
 
@@ -80,7 +72,7 @@ test.describe('Grand Search', () => {
         await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').fill('Cl');
         await Promise.all([
             page.waitForNavigation(),
-            page.locator('[aria-label="Clock A clock result"] >> text=Clock A').click()
+            page.locator('text=Clock A').click()
         ]);
         await expect(page.locator('.is-object-type-clock')).toBeVisible();
 
@@ -97,8 +89,15 @@ test.describe('Grand Search', () => {
         await expect(page.locator('[aria-label="Search Result"] >> nth=2')).toContainText(`Clock C ${myItemsFolderName} Red Folder Blue Folder`);
         await expect(page.locator('[aria-label="Search Result"] >> nth=3')).toContainText(`Clock D ${myItemsFolderName} Red Folder Blue Folder`);
     });
+});
+
+test.describe("Search Tests @unstable", () => {
+    const searchResultSelector = '.c-gsearch-result__title';
 
     test('Validate empty search result', async ({ page }) => {
+        // Go to baseURL
+        await page.goto("./", { waitUntil: "networkidle" });
+
         // Invalid search for objects
         await page.type("input[type=search]", 'not found');
 
@@ -106,7 +105,7 @@ test.describe('Grand Search', () => {
         await waitForSearchCompletion(page);
 
         // Get the search results
-        const searchResults = page.locator(searchResultSelector);
+        const searchResults = await page.locator(searchResultSelector);
 
         // Verify that no results are found
         expect(await searchResults.count()).toBe(0);
@@ -116,6 +115,9 @@ test.describe('Grand Search', () => {
     });
 
     test('Validate single object in search result @couchdb', async ({ page }) => {
+        //Go to baseURL
+        await page.goto("./", { waitUntil: "networkidle" });
+
         // Create a folder object
         const folderName = uuid();
         await createDomainObjectWithDefaults(page, {
@@ -137,56 +139,21 @@ test.describe('Grand Search', () => {
         await expect(searchResults).toHaveText(folderName);
     });
 
-    test('Search results are debounced @couchdb', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/6179'
-        });
-        await createObjectsForSearch(page);
-
-        let networkRequests = [];
-        page.on('request', (request) => {
-            const searchRequest = request.url().endsWith('_find');
-            const fetchRequest = request.resourceType() === 'fetch';
-            if (searchRequest && fetchRequest) {
-                networkRequests.push(request);
-            }
-        });
-
-        // Full search for object
-        await page.type("input[type=search]", 'Clock', { delay: 100 });
-
-        // Wait for search to finish
-        await waitForSearchCompletion(page);
-
-        // Network requests for the composite telemetry with multiple items should be:
-        // 1.  batched request for latest telemetry using the bulk API
-        expect(networkRequests.length).toBe(1);
-
-        const searchResultDropDown = await page.locator(searchResultDropDownSelector);
-
-        await expect(searchResultDropDown).toContainText('Clock A');
-    });
-
     test("Validate multiple objects in search results return partial matches", async ({ page }) => {
         test.info().annotations.push({
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/4667'
         });
 
+        // Go to baseURL
+        await page.goto("/", { waitUntil: "networkidle" });
+
         // Create folder objects
-        const folderName1 = "e928a26e-e924-4ea0";
+        const folderName = "e928a26e-e924-4ea0";
         const folderName2 = "e928a26e-e924-4001";
 
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: folderName1
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: folderName2
-        });
+        await createFolderObject(page, folderName);
+        await createFolderObject(page, folderName2);
 
         // Partial search for objects
         await page.type("input[type=search]", 'e928a26e');
@@ -194,22 +161,36 @@ test.describe('Grand Search', () => {
         // Wait for search to finish
         await waitForSearchCompletion(page);
 
-        const searchResultDropDown = await page.locator(searchResultDropDownSelector);
+        // Get the search results
+        const searchResults = await page.locator(searchResultSelector);
 
         // Verify that the search result/s correctly match the search query
-        await expect(searchResultDropDown).toContainText(folderName1);
-        await expect(searchResultDropDown).toContainText(folderName2);
-
-        // Get the search results
-        const searchResults = page.locator(searchResultSelector);
-        // Verify that two results are found
         expect(await searchResults.count()).toBe(2);
+        await expect(await searchResults.first()).toHaveText(folderName);
+        await expect(await searchResults.last()).toHaveText(folderName2);
     });
 });
 
+async function createFolderObject(page, folderName) {
+    // Open Create menu
+    await page.locator('button:has-text("Create")').click();
+
+    // Select Folder object
+    await page.locator('text=Folder').nth(1).click();
+
+    // Click folder title to enter edit mode
+    await page.locator('text=Properties Title Notes >> input[type="text"]').click();
+
+    // Enter folder name
+    await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folderName);
+
+    // Create folder object
+    await page.locator('button:has-text("OK")').click();
+}
+
 async function waitForSearchCompletion(page) {
     // Wait loading spinner to disappear
-    await page.waitForSelector('.search-finished');
+    await page.waitForSelector('.c-tree-and-search__loading', { state: 'detached' });
 }
 
 /**
@@ -217,6 +198,9 @@ async function waitForSearchCompletion(page) {
   * @param {import('@playwright/test').Page} page
   */
 async function createObjectsForSearch(page) {
+    //Go to baseURL
+    await page.goto('./', { waitUntil: 'networkidle' });
+
     const redFolder = await createDomainObjectWithDefaults(page, {
         type: 'Folder',
         name: 'Red Folder'

e2e/tests/functional/tree.e2e.spec.js

@@ -116,9 +116,7 @@ async function getAndAssertTreeItems(page, expected) {
  * @param {string} name
  */
 async function expandTreePaneItemByName(page, name) {
-    const treePane = page.getByRole('tree', {
-        name: 'Main Tree'
-    });
+    const treePane = page.locator('#tree-pane');
     const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
     const expandTriangle = treeItem.locator('.c-disclosure-triangle');
     await expandTriangle.click();

e2e/tests/visual/addTag.visual.spec.js

@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * This test is dedicated to test the blur behavior of the add tag button.
- */
-
-const { test } = require("../../pluginFixtures");
-const percySnapshot = require('@percy/playwright');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-
-test.describe("Visual - Check blur of Add Tag button", () => {
-
-    test.beforeEach(async ({ page }) => {
-        // Open a browser, navigate to the main page, and wait until all network events to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
-    });
-
-    test("Blur 'Add tag'", async ({ page, theme }) => {
-        createDomainObjectWithDefaults(page, { type: 'Notebook' });
-
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        const entryLocator = `[aria-label="Notebook Entry Input"] >> nth = 0`;
-        await page.locator(entryLocator).click();
-        await page.locator(entryLocator).fill(`Entry 0`);
-        await page.locator(entryLocator).press('Enter');
-
-        // Click on Annotations tab
-        await page.locator('.c-inspector__tab', { hasText: "Annotations" }).click();
-
-        // Take snapshot of the notebook with the Annotations tab opened
-        await percySnapshot(page, `Notebook Annotation (theme: '${theme}')`);
-
-        // Click on the "Add Tag" button
-        await page.locator('button:has-text("Add Tag")').click();
-
-        // Take snapshot of the notebook with the AutoComplete field visible
-        await percySnapshot(page, `Notebook Add Tag (theme: '${theme}')`);
-
-        // Click inside the AutoComplete field
-        await page.locator('[placeholder="Type to select tag"]').click();
-
-        // Click on the "Tags" header (simulating a click outside the autocomplete field)
-        await page.locator('div.c-inspect-properties__header:has-text("Tags")').click();
-
-        // Take snapshot of the notebook with the AutoComplete field hidden and with the "Add Tag" button visible
-        await percySnapshot(page, `Notebook Annotation de-select blur (theme: '${theme}')`);
-    });
-});

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

@@ -57,7 +57,7 @@ test.describe('Visual - Tree Pane', () => {
             name: 'Z Clock'
         });
 
-        const treePane = "[role=tree][aria-label='Main Tree']";
+        const treePane = "#tree-pane";
 
         await percySnapshot(page, `Tree Pane w/ collapsed tree (theme: ${theme})`, {
             scope: treePane
@@ -94,7 +94,7 @@ test.describe('Visual - Tree Pane', () => {
  * @param {string} name
  */
 async function expandTreePaneItemByName(page, name) {
-    const treePane = page.getByTestId('tree-pane');
+    const treePane = page.locator('#tree-pane');
     const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
     const expandTriangle = treeItem.locator('.c-disclosure-triangle');
     await expandTriangle.click();

e2e/tests/visual/notification.visual.spec.js

@@ -1,58 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * This test is dedicated to test notification banner functionality and its accessibility attributes.
- */
-
-const { test, expect } = require('../../pluginFixtures');
-const percySnapshot = require('@percy/playwright');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-
-test.describe('Visual - Check Notification Info Banner of \'Save successful\'', () => {
-    test.beforeEach(async ({ page }) => {
-        // Go to baseURL and Hide Tree
-        await page.goto('./', { waitUntil: 'networkidle' });
-    });
-
-    test('Create a clock, click on \'Save successful\' banner and dismiss it', async ({ page }) => {
-        // Create a clock domain object
-        await createDomainObjectWithDefaults(page, { type: 'Clock' });
-        // Verify there is a button with aria-label="Review 1 Notification"
-        expect(await page.locator('button[aria-label="Review 1 Notification"]').isVisible()).toBe(true);
-        // Verify there is a button with aria-label="Clear all notifications"
-        expect(await page.locator('button[aria-label="Clear all notifications"]').isVisible()).toBe(true);
-        // Click on the div with role="alert" that has "Save successful" text
-        await page.locator('div[role="alert"]:has-text("Save successful")').click();
-        // Verify there is a div with role="dialog"
-        expect(await page.locator('div[role="dialog"]').isVisible()).toBe(true);
-        // Verify the div with role="dialog" contains text "Save successful"
-        expect(await page.locator('div[role="dialog"]').innerText()).toContain('Save successful');
-        await percySnapshot(page, 'Notification banner');
-        // Verify there is a button with text "Dismiss"
-        expect(await page.locator('button:has-text("Dismiss")').isVisible()).toBe(true);
-        // Click on button with text "Dismiss"
-        await page.locator('button:has-text("Dismiss")').click();
-        // Verify there is no div with role="dialog"
-        expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
-    });
-});

example/exampleTags/plugin.js

@@ -20,23 +20,11 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 import availableTags from './tags.json';
-
 /**
-@typedef {{
-    namespaceToSaveAnnotations: string
-}} TagsPluginOptions
-*/
-
-/**
- * @typedef {TagsPluginOptions} options
  * @returns {function} The plugin install function
  */
-export default function exampleTagsPlugin(options) {
+export default function exampleTagsPlugin() {
     return function install(openmct) {
-        if (options?.namespaceToSaveAnnotations) {
-            openmct.annotation.setNamespaceToSaveAnnotations(options?.namespaceToSaveAnnotations);
-        }
-
         Object.keys(availableTags.tags).forEach(tagKey => {
             const tagDefinition = availableTags.tags[tagKey];
             openmct.annotation.defineTag(tagKey, tagDefinition);

example/exampleUser/ExampleUserProvider.js

@@ -65,7 +65,7 @@ export default class ExampleUserProvider extends EventEmitter {
         this.user = undefined;
         this.loggedIn = false;
         this.autoLoginUser = undefined;
-        this.status = STATUSES[0];
+        this.status = STATUSES[1];
         this.pollQuestion = undefined;
         this.defaultStatusRole = defaultStatusRole;
 
@@ -124,7 +124,6 @@ export default class ExampleUserProvider extends EventEmitter {
     }
 
     setStatusForRole(role, status) {
-        status.timestamp = Date.now();
         this.status = status;
         this.emit('statusChange', {
             role,
@@ -134,23 +133,14 @@ export default class ExampleUserProvider extends EventEmitter {
         return true;
     }
 
-    // eslint-disable-next-line require-await
-    async getPollQuestion() {
-        if (this.pollQuestion) {
-            return this.pollQuestion;
-        } else {
-            return undefined;
-        }
+    getPollQuestion() {
+        return Promise.resolve({
+            question: 'Set "GO" if your position is ready for a boarding action on the Klingon cruiser',
+            timestamp: Date.now()
+        });
     }
 
     setPollQuestion(pollQuestion) {
-        if (!pollQuestion) {
-            // If the poll question is undefined, set it to a blank string.
-            // This behavior better reflects how other telemetry systems
-            // deal with undefined poll questions.
-            pollQuestion = '';
-        }
-
         this.pollQuestion = {
             question: pollQuestion,
             timestamp: Date.now()

example/generator/GeneratorProvider.js

@@ -37,9 +37,8 @@ define([
         infinityValues: false
     };
 
-    function GeneratorProvider(openmct, StalenessProvider) {
-        this.openmct = openmct;
-        this.workerInterface = new WorkerInterface(openmct, StalenessProvider);
+    function GeneratorProvider(openmct) {
+        this.workerInterface = new WorkerInterface(openmct);
     }
 
     GeneratorProvider.prototype.canProvideTelemetry = function (domainObject) {
@@ -82,7 +81,6 @@ define([
             workerRequest[prop] = Number(workerRequest[prop]);
         });
 
-        workerRequest.id = this.openmct.objects.makeKeyString(domainObject.identifier);
         workerRequest.name = domainObject.name;
 
         return workerRequest;

example/generator/SinewaveStalenessProvider.js

@@ -1,157 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import EventEmitter from 'EventEmitter';
-
-export default class SinewaveLimitProvider extends EventEmitter {
-    #openmct;
-    #observingStaleness;
-    #watchingTheClock;
-    #isRealTime;
-
-    constructor(openmct) {
-        super();
-
-        this.#openmct = openmct;
-        this.#observingStaleness = {};
-        this.#watchingTheClock = false;
-        this.#isRealTime = undefined;
-    }
-
-    supportsStaleness(domainObject) {
-        return domainObject.type === 'generator';
-    }
-
-    isStale(domainObject, options) {
-        if (!this.#providingStaleness(domainObject)) {
-            return;
-        }
-
-        const id = this.#getObjectKeyString(domainObject);
-
-        if (!this.#observerExists(id)) {
-            this.#createObserver(id);
-        }
-
-        return Promise.resolve({
-            isStale: this.#observingStaleness[id].isStale,
-            utc: Date.now()
-        });
-    }
-
-    subscribeToStaleness(domainObject, callback) {
-        const id = this.#getObjectKeyString(domainObject);
-
-        if (this.#isRealTime === undefined) {
-            this.#updateRealTime(this.#openmct.time.clock());
-        }
-
-        this.#handleClockUpdate();
-
-        if (this.#observerExists(id)) {
-            this.#addCallbackToObserver(id, callback);
-        } else {
-            this.#createObserver(id, callback);
-        }
-
-        const intervalId = setInterval(() => {
-            if (this.#providingStaleness(domainObject)) {
-                this.#updateStaleness(id, !this.#observingStaleness[id].isStale);
-            }
-        }, 10000);
-
-        return () => {
-            clearInterval(intervalId);
-            this.#updateStaleness(id, false);
-            this.#handleClockUpdate();
-            this.#destroyObserver(id);
-        };
-    }
-
-    #handleClockUpdate() {
-        let observers = Object.values(this.#observingStaleness).length > 0;
-
-        if (observers && !this.#watchingTheClock) {
-            this.#watchingTheClock = true;
-            this.#openmct.time.on('clock', this.#updateRealTime, this);
-        } else if (!observers && this.#watchingTheClock) {
-            this.#watchingTheClock = false;
-            this.#openmct.time.off('clock', this.#updateRealTime, this);
-        }
-    }
-
-    #updateRealTime(clock) {
-        this.#isRealTime = clock !== undefined;
-
-        if (!this.#isRealTime) {
-            Object.keys(this.#observingStaleness).forEach((id) => {
-                this.#updateStaleness(id, false);
-            });
-        }
-    }
-
-    #updateStaleness(id, isStale) {
-        this.#observingStaleness[id].isStale = isStale;
-        this.#observingStaleness[id].utc = Date.now();
-        this.#observingStaleness[id].callback({
-            isStale: this.#observingStaleness[id].isStale,
-            utc: this.#observingStaleness[id].utc
-        });
-        this.emit('stalenessEvent', {
-            id,
-            isStale: this.#observingStaleness[id].isStale
-        });
-    }
-
-    #createObserver(id, callback) {
-        this.#observingStaleness[id] = {
-            isStale: false,
-            utc: Date.now()
-        };
-
-        if (typeof callback === 'function') {
-            this.#addCallbackToObserver(id, callback);
-        }
-    }
-
-    #destroyObserver(id) {
-        if (this.#observingStaleness[id]) {
-            delete this.#observingStaleness[id];
-        }
-    }
-
-    #providingStaleness(domainObject) {
-        return domainObject.telemetry?.staleness === true && this.#isRealTime;
-    }
-
-    #getObjectKeyString(object) {
-        return this.#openmct.objects.makeKeyString(object.identifier);
-    }
-
-    #addCallbackToObserver(id, callback) {
-        this.#observingStaleness[id].callback = callback;
-    }
-
-    #observerExists(id) {
-        return this.#observingStaleness?.[id];
-    }
-}

example/generator/WorkerInterface.js

@@ -25,24 +25,14 @@ define([
 ], function (
     { v4: uuid }
 ) {
-    function WorkerInterface(openmct, StalenessProvider) {
+    function WorkerInterface(openmct) {
         // eslint-disable-next-line no-undef
         const workerUrl = `${openmct.getAssetPath()}${__OPENMCT_ROOT_RELATIVE__}generatorWorker.js`;
-        this.StalenessProvider = StalenessProvider;
         this.worker = new Worker(workerUrl);
         this.worker.onmessage = this.onMessage.bind(this);
         this.callbacks = {};
-        this.staleTelemetryIds = {};
-
-        this.watchStaleness();
     }
 
-    WorkerInterface.prototype.watchStaleness = function () {
-        this.StalenessProvider.on('stalenessEvent', ({ id, isStale}) => {
-            this.staleTelemetryIds[id] = isStale;
-        });
-    };
-
     WorkerInterface.prototype.onMessage = function (message) {
         message = message.data;
         var callback = this.callbacks[message.id];
@@ -93,12 +83,11 @@ define([
     };
 
     WorkerInterface.prototype.subscribe = function (request, cb) {
-        const id = request.id;
-        const messageId = this.dispatch('subscribe', request, (message) => {
-            if (!this.staleTelemetryIds[id]) {
-                cb(message.data);
-            }
-        });
+        function callback(message) {
+            cb(message.data);
+        }
+
+        var messageId = this.dispatch('subscribe', request, callback);
 
         return function () {
             this.dispatch('unsubscribe', {

example/generator/plugin.js

@@ -20,163 +20,158 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import GeneratorProvider from "./GeneratorProvider";
-import SinewaveLimitProvider from "./SinewaveLimitProvider";
-import SinewaveStalenessProvider from "./SinewaveStalenessProvider";
-import StateGeneratorProvider from "./StateGeneratorProvider";
-import GeneratorMetadataProvider from "./GeneratorMetadataProvider";
+define([
+    "./GeneratorProvider",
+    "./SinewaveLimitProvider",
+    "./StateGeneratorProvider",
+    "./GeneratorMetadataProvider"
+], function (
+    GeneratorProvider,
+    SinewaveLimitProvider,
+    StateGeneratorProvider,
+    GeneratorMetadataProvider
+) {
 
-export default function (openmct) {
+    return function (openmct) {
 
-    openmct.types.addType("example.state-generator", {
-        name: "State Generator",
-        description: "For development use. Generates example enumerated telemetry by cycling through a given set of states.",
-        cssClass: "icon-generator-telemetry",
-        creatable: true,
-        form: [
-            {
-                name: "State Duration (seconds)",
-                control: "numberfield",
-                cssClass: "l-input-sm l-numeric",
-                key: "duration",
-                required: true,
-                property: [
-                    "telemetry",
-                    "duration"
-                ]
+        openmct.types.addType("example.state-generator", {
+            name: "State Generator",
+            description: "For development use. Generates example enumerated telemetry by cycling through a given set of states.",
+            cssClass: "icon-generator-telemetry",
+            creatable: true,
+            form: [
+                {
+                    name: "State Duration (seconds)",
+                    control: "numberfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "duration",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "duration"
+                    ]
+                }
+            ],
+            initialize: function (object) {
+                object.telemetry = {
+                    duration: 5
+                };
             }
-        ],
-        initialize: function (object) {
-            object.telemetry = {
-                duration: 5
-            };
-        }
-    });
+        });
 
-    openmct.telemetry.addProvider(new StateGeneratorProvider());
+        openmct.telemetry.addProvider(new StateGeneratorProvider());
 
-    openmct.types.addType("generator", {
-        name: "Sine Wave Generator",
-        description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-        cssClass: "icon-generator-telemetry",
-        creatable: true,
-        form: [
-            {
-                name: "Period",
-                control: "numberfield",
-                cssClass: "l-input-sm l-numeric",
-                key: "period",
-                required: true,
-                property: [
-                    "telemetry",
-                    "period"
-                ]
-            },
-            {
-                name: "Amplitude",
-                control: "numberfield",
-                cssClass: "l-numeric",
-                key: "amplitude",
-                required: true,
-                property: [
-                    "telemetry",
-                    "amplitude"
-                ]
-            },
-            {
-                name: "Offset",
-                control: "numberfield",
-                cssClass: "l-numeric",
-                key: "offset",
-                required: true,
-                property: [
-                    "telemetry",
-                    "offset"
-                ]
-            },
-            {
-                name: "Data Rate (hz)",
-                control: "numberfield",
-                cssClass: "l-input-sm l-numeric",
-                key: "dataRateInHz",
-                required: true,
-                property: [
-                    "telemetry",
-                    "dataRateInHz"
-                ]
-            },
-            {
-                name: "Phase (radians)",
-                control: "numberfield",
-                cssClass: "l-input-sm l-numeric",
-                key: "phase",
-                required: true,
-                property: [
-                    "telemetry",
-                    "phase"
-                ]
-            },
-            {
-                name: "Randomness",
-                control: "numberfield",
-                cssClass: "l-input-sm l-numeric",
-                key: "randomness",
-                required: true,
-                property: [
-                    "telemetry",
-                    "randomness"
-                ]
-            },
-            {
-                name: "Loading Delay (ms)",
-                control: "numberfield",
-                cssClass: "l-input-sm l-numeric",
-                key: "loadDelay",
-                required: true,
-                property: [
-                    "telemetry",
-                    "loadDelay"
-                ]
-            },
-            {
-                name: "Include Infinity Values",
-                control: "toggleSwitch",
-                cssClass: "l-input",
-                key: "infinityValues",
-                property: [
-                    "telemetry",
-                    "infinityValues"
-                ]
-            },
-            {
-                name: "Provide Staleness Updates",
-                control: "toggleSwitch",
-                cssClass: "l-input",
-                key: "staleness",
-                property: [
-                    "telemetry",
-                    "staleness"
-                ]
+        openmct.types.addType("generator", {
+            name: "Sine Wave Generator",
+            description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+            cssClass: "icon-generator-telemetry",
+            creatable: true,
+            form: [
+                {
+                    name: "Period",
+                    control: "numberfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "period",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "period"
+                    ]
+                },
+                {
+                    name: "Amplitude",
+                    control: "numberfield",
+                    cssClass: "l-numeric",
+                    key: "amplitude",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "amplitude"
+                    ]
+                },
+                {
+                    name: "Offset",
+                    control: "numberfield",
+                    cssClass: "l-numeric",
+                    key: "offset",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "offset"
+                    ]
+                },
+                {
+                    name: "Data Rate (hz)",
+                    control: "numberfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "dataRateInHz",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "dataRateInHz"
+                    ]
+                },
+                {
+                    name: "Phase (radians)",
+                    control: "numberfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "phase",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "phase"
+                    ]
+                },
+                {
+                    name: "Randomness",
+                    control: "numberfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "randomness",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "randomness"
+                    ]
+                },
+                {
+                    name: "Loading Delay (ms)",
+                    control: "numberfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "loadDelay",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "loadDelay"
+                    ]
+                },
+                {
+                    name: "Include Infinity Values",
+                    control: "toggleSwitch",
+                    cssClass: "l-input",
+                    key: "infinityValues",
+                    property: [
+                        "telemetry",
+                        "infinityValues"
+                    ]
+                }
+            ],
+            initialize: function (object) {
+                object.telemetry = {
+                    period: 10,
+                    amplitude: 1,
+                    offset: 0,
+                    dataRateInHz: 1,
+                    phase: 0,
+                    randomness: 0,
+                    loadDelay: 0,
+                    infinityValues: false
+                };
             }
-        ],
-        initialize: function (object) {
-            object.telemetry = {
-                period: 10,
-                amplitude: 1,
-                offset: 0,
-                dataRateInHz: 1,
-                phase: 0,
-                randomness: 0,
-                loadDelay: 0,
-                infinityValues: false,
-                staleness: false
-            };
-        }
-    });
-    const stalenessProvider = new SinewaveStalenessProvider(openmct);
+        });
 
-    openmct.telemetry.addProvider(new GeneratorProvider(openmct, stalenessProvider));
-    openmct.telemetry.addProvider(new GeneratorMetadataProvider());
-    openmct.telemetry.addProvider(new SinewaveLimitProvider());
-    openmct.telemetry.addProvider(stalenessProvider);
-}
+        openmct.telemetry.addProvider(new GeneratorProvider(openmct));
+        openmct.telemetry.addProvider(new GeneratorMetadataProvider());
+        openmct.telemetry.addProvider(new SinewaveLimitProvider());
+    };
+
+});

example/imagery/plugin.js

@@ -107,15 +107,6 @@ export default function () {
                                 }
                             ]
                         },
-                        {
-                            name: 'Image Thumbnail',
-                            key: 'thumbnail-url',
-                            format: 'thumbnail',
-                            hints: {
-                                thumbnail: 1
-                            },
-                            source: 'url'
-                        },
                         {
                             name: 'Image Download Name',
                             key: 'imageDownloadName',
@@ -152,16 +143,6 @@ export default function () {
             ]
         });
 
-        const formatThumbnail = {
-            format: function (url) {
-                return `${url}?w=100&h=100`;
-            }
-        };
-
-        openmct.telemetry.addFormat({
-            key: 'thumbnail',
-            ...formatThumbnail
-        });
         openmct.telemetry.addProvider(getRealtimeProvider());
         openmct.telemetry.addProvider(getHistoricalProvider());
         openmct.telemetry.addProvider(getLadProvider());
@@ -261,13 +242,6 @@ function pointForTimestamp(timestamp, name, imageSamples, delay) {
     const url = imageSamples[Math.floor(timestamp / delay) % imageSamples.length];
     const urlItems = url.split('/');
     const imageDownloadName = `example.imagery.${urlItems[urlItems.length - 1]}`;
-    const navCamTransformations = {
-        "translateX": 0,
-        "translateY": 18,
-        "rotation": 0,
-        "scale": 0.3,
-        "cameraAngleOfView": 70
-    };
 
     return {
         name,
@@ -275,9 +249,8 @@ function pointForTimestamp(timestamp, name, imageSamples, delay) {
         local: Math.floor(timestamp / delay) * delay,
         url,
         sunOrientation: getCompassValues(0, 360),
-        cameraAzimuth: getCompassValues(0, 360),
+        cameraPan: getCompassValues(0, 360),
         heading: getCompassValues(0, 360),
-        transformations: navCamTransformations,
         imageDownloadName
     };
 }

package.json

@@ -1,14 +1,13 @@
 {
   "name": "openmct",
-  "version": "2.2.0-SNAPSHOT",
+  "version": "2.1.6-SNAPSHOT",
   "description": "The Open MCT core platform",
   "devDependencies": {
     "@babel/eslint-parser": "7.18.9",
     "@braintree/sanitize-url": "6.0.2",
-    "@percy/cli": "1.17.0",
+    "@percy/cli": "1.16.0",
     "@percy/playwright": "1.0.4",
     "@playwright/test": "1.29.0",
-    "@types/eventemitter3": "1.2.0",
     "@types/jasmine": "4.3.1",
     "@types/lodash": "4.14.191",
     "babel-loader": "9.1.0",
@@ -20,10 +19,10 @@
     "d3-axis": "3.0.0",
     "d3-scale": "3.3.0",
     "d3-selection": "3.0.0",
-    "eslint": "8.34.0",
-    "eslint-plugin-compat": "4.1.1",
-    "eslint-plugin-playwright": "0.12.0",
-    "eslint-plugin-vue": "9.9.0",
+    "eslint": "8.31.0",
+    "eslint-plugin-compat": "4.0.2",
+    "eslint-plugin-playwright": "0.11.2",
+    "eslint-plugin-vue": "9.8.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
     "eventemitter3": "1.2.0",
     "file-saver": "2.0.5",
@@ -41,7 +40,6 @@
     "karma-sourcemap-loader": "0.3.8",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "5.0.0",
-    "kdbush": "^3.0.0",
     "location-bar": "3.0.1",
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.7.2",
@@ -52,15 +50,14 @@
     "painterro": "1.2.78",
     "playwright-core": "1.29.0",
     "plotly.js-basic-dist": "2.17.0",
-    "plotly.js-gl2d-dist": "2.17.1",
+    "plotly.js-gl2d-dist": "2.14.0",
     "printj": "1.3.1",
     "resolve-url-loader": "5.0.0",
-    "sanitize-html": "2.8.1",
     "sass": "1.57.1",
     "sass-loader": "13.2.0",
     "sinon": "15.0.1",
     "style-loader": "^3.3.1",
-    "typescript": "4.9.5",
+    "typescript": "4.9.4",
     "uuid": "9.0.0",
     "vue": "2.6.14",
     "vue-eslint-parser": "9.1.0",

src/MCT.js

@@ -256,15 +256,6 @@ define([
             });
         });
 
-        /**
-         * MCT's annotation API that enables
-         * human-created comments and categorization linked to data products
-         * @type {module:openmct.AnnotationAPI}
-         * @memberof module:openmct.MCT#
-         * @name annotation
-         */
-        this.annotation = new api.AnnotationAPI(this);
-
         // Plugins that are installed by default
         this.install(this.plugins.Plot());
         this.install(this.plugins.TelemetryTable.default());

src/api/annotation/AnnotationAPI.js

@@ -52,29 +52,6 @@ const ANNOTATION_LAST_CREATED = 'annotationLastCreated';
  * @property {String} foregroundColor eg. "#ffffff"
  */
 
-/**
- * @typedef {import('../objects/ObjectAPI').DomainObject} DomainObject
- */
-
-/**
- * @typedef {import('../objects/ObjectAPI').Identifier} Identifier
- */
-
-/**
- * @typedef {import('../../../openmct').OpenMCT} OpenMCT
- */
-
-/**
- * An interface for interacting with annotations of domain objects.
- * An annotation of a domain object is an operator created object for the purposes
- * of further describing data in plots, notebooks, maps, etc. For example, an annotation
- * could be a tag on a plot notating an interesting set of points labeled SCIENCE. It could
- * also be set of notebook entries the operator has tagged DRIVING when a robot monitored by OpenMCT
- * about rationals behind why the robot has taken a certain path.
- * Annotations are discoverable using search, and are typically rendered in OpenMCT views to bring attention
- * to other users.
- * @constructor
- */
 export default class AnnotationAPI extends EventEmitter {
 
     /**
@@ -84,7 +61,6 @@ export default class AnnotationAPI extends EventEmitter {
         super();
         this.openmct = openmct;
         this.availableTags = {};
-        this.namespaceToSaveAnnotations = '';
 
         this.ANNOTATION_TYPES = ANNOTATION_TYPES;
         this.ANNOTATION_TYPE = ANNOTATION_TYPE;
@@ -105,26 +81,24 @@ export default class AnnotationAPI extends EventEmitter {
             }
         });
     }
+
     /**
-    * Creates an annotation on a given domain object (e.g., a plot) and a set of targets (e.g., telemetry objects)
+    * Create the a generic annotation
     * @typedef {Object} CreateAnnotationOptions
-    * @property {String} name a name for the new annotation (e.g., "Plot annnotation")
-    * @property {DomainObject} domainObject the domain object this annotation was created with
-    * @property {ANNOTATION_TYPES} annotationType the type of annotation to create (e.g., PLOT_SPATIAL)
-    * @property {Tag[]} tags tags to add to the annotation, e.g., SCIENCE for science related annotations
-    * @property {String} contentText Some text to add to the annotation, e.g. ("This annotation is about science")
-    * @property {Object<string, Object>} targets The targets ID keystrings and their specific properties.
-    * For plots, this will be a bounding box, e.g.: {maxY: 100, minY: 0, maxX: 100, minX: 0}
-    * For notebooks, this will be an entry ID, e.g.: {entryId: "entry-ecb158f5-d23c-45e1-a704-649b382622ba"}
-    * @property {DomainObject>} targetDomainObjects the targets ID keystrings and the domain objects this annotation points to (e.g., telemetry objects for a plot)
+    * @property {String} name a name for the new parameter
+    * @property {import('../objects/ObjectAPI').DomainObject} domainObject the domain object to create
+    * @property {ANNOTATION_TYPES} annotationType the type of annotation to create
+    * @property {Tag[]} tags
+    * @property {String} contentText
+    * @property {import('../objects/ObjectAPI').Identifier[]} targets
     */
     /**
     * @method create
     * @param {CreateAnnotationOptions} options
-    * @returns {Promise<DomainObject>} a promise which will resolve when the domain object
+    * @returns {Promise<import('../objects/ObjectAPI').DomainObject>} a promise which will resolve when the domain object
     *          has been created, or be rejected if it cannot be saved
     */
-    async create({name, domainObject, annotationType, tags, contentText, targets, targetDomainObjects}) {
+    async create({name, domainObject, annotationType, tags, contentText, targets}) {
         if (!Object.keys(this.ANNOTATION_TYPES).includes(annotationType)) {
             throw new Error(`Unknown annotation type: ${annotationType}`);
         }
@@ -133,14 +107,10 @@ export default class AnnotationAPI extends EventEmitter {
             throw new Error(`At least one target is required to create an annotation`);
         }
 
-        if (!Object.keys(targetDomainObjects).length) {
-            throw new Error(`At least one targetDomainObject is required to create an annotation`);
-        }
-
         const domainObjectKeyString = this.openmct.objects.makeKeyString(domainObject.identifier);
         const originalPathObjects = await this.openmct.objects.getOriginalPath(domainObjectKeyString);
         const originalContextPath = this.openmct.objects.getRelativePath(originalPathObjects);
-        const namespace = this.namespaceToSaveAnnotations;
+        const namespace = domainObject.identifier.namespace;
         const type = 'annotation';
         const typeDefinition = this.openmct.types.get(type);
         const definition = typeDefinition.definition;
@@ -169,9 +139,7 @@ export default class AnnotationAPI extends EventEmitter {
         const success = await this.openmct.objects.save(createdObject);
         if (success) {
             this.emit('annotationCreated', createdObject);
-            Object.values(targetDomainObjects).forEach(targetDomainObject => {
-                this.#updateAnnotationModified(targetDomainObject);
-            });
+            this.#updateAnnotationModified(domainObject);
 
             return createdObject;
         } else {
@@ -179,15 +147,8 @@ export default class AnnotationAPI extends EventEmitter {
         }
     }
 
-    #updateAnnotationModified(targetDomainObject) {
-        // As certain telemetry objects are immutable, we'll need to check here first
-        // to see if we can add the annotation last created property.
-        // TODO: This should be removed once we have a better way to handle immutable telemetry objects
-        if (targetDomainObject.isMutable) {
-            this.openmct.objects.mutate(targetDomainObject, this.ANNOTATION_LAST_CREATED, Date.now());
-        } else {
-            this.emit('targetDomainObjectAnnotated', targetDomainObject);
-        }
+    #updateAnnotationModified(domainObject) {
+        this.openmct.objects.mutate(domainObject, this.ANNOTATION_LAST_CREATED, Date.now());
     }
 
     /**
@@ -199,17 +160,9 @@ export default class AnnotationAPI extends EventEmitter {
         this.availableTags[tagKey] = tagsDefinition;
     }
 
-    /**
-    * @method setNamespaceToSaveAnnotations
-    * @param {String} namespace the namespace to save new annotations to
-    */
-    setNamespaceToSaveAnnotations(namespace) {
-        this.namespaceToSaveAnnotations = namespace;
-    }
-
     /**
     * @method isAnnotation
-    * @param {DomainObject} domainObject the domainObject in question
+    * @param {import('../objects/ObjectAPI').DomainObject} domainObject domainObject the domainObject in question
     * @returns {Boolean} Returns true if the domain object is an annotation
     */
     isAnnotation(domainObject) {
@@ -237,19 +190,56 @@ export default class AnnotationAPI extends EventEmitter {
 
     /**
     * @method getAnnotations
-    * @param {Identifier} domainObjectIdentifier - The domain object identifier to use to search for annotations. For example, a telemetry object identifier.
-    * @returns {DomainObject[]} Returns an array of annotations that match the search query
+    * @param {String} query - The keystring of the domain object to search for annotations for
+    * @returns {import('../objects/ObjectAPI').DomainObject[]} Returns an array of domain objects that match the search query
     */
-    async getAnnotations(domainObjectIdentifier) {
-        const keyStringQuery = this.openmct.objects.makeKeyString(domainObjectIdentifier);
-        const searchResults = (await Promise.all(this.openmct.objects.search(keyStringQuery, null, this.openmct.objects.SEARCH_TYPES.ANNOTATIONS))).flat();
+    async getAnnotations(query) {
+        const searchResults = (await Promise.all(this.openmct.objects.search(query, null, this.openmct.objects.SEARCH_TYPES.ANNOTATIONS))).flat();
 
         return searchResults;
     }
 
+    /**
+    * @method addSingleAnnotationTag
+    * @param {import('../objects/ObjectAPI').DomainObject=} existingAnnotation - An optional annotation to add the tag to. If not specified, we will create an annotation.
+    * @param {import('../objects/ObjectAPI').DomainObject} targetDomainObject - The domain object the annotation will point to.
+    * @param {Object=} targetSpecificDetails - Optional object to add to the target object. E.g., for notebooks this would be an entryID
+    * @param {AnnotationType} annotationType - The type of annotation this is for.
+    * @returns {import('../objects/ObjectAPI').DomainObject[]} Returns the annotation that was either created or passed as an existingAnnotation
+    */
+    async addSingleAnnotationTag(existingAnnotation, targetDomainObject, targetSpecificDetails, annotationType, tag) {
+        if (!existingAnnotation) {
+            const targets = {};
+            const targetKeyString = this.openmct.objects.makeKeyString(targetDomainObject.identifier);
+            targets[targetKeyString] = targetSpecificDetails;
+            const contentText = `${annotationType} tag`;
+            const annotationCreationArguments = {
+                name: contentText,
+                domainObject: targetDomainObject,
+                annotationType,
+                tags: [tag],
+                contentText,
+                targets
+            };
+            const newAnnotation = await this.create(annotationCreationArguments);
+
+            return newAnnotation;
+        } else {
+            if (!existingAnnotation.tags.includes(tag)) {
+                throw new Error(`Existing annotation did not contain tag ${tag}`);
+            }
+
+            if (existingAnnotation._deleted) {
+                this.unDeleteAnnotation(existingAnnotation);
+            }
+
+            return existingAnnotation;
+        }
+    }
+
     /**
     * @method deleteAnnotations
-    * @param {DomainObject[]} existingAnnotation - An array of annotations to delete (set _deleted to true)
+    * @param {import('../objects/ObjectAPI').DomainObject[]} existingAnnotation - An array of annotations to delete (set _deleted to true)
     */
     deleteAnnotations(annotations) {
         if (!annotations) {
@@ -265,7 +255,7 @@ export default class AnnotationAPI extends EventEmitter {
 
     /**
     * @method deleteAnnotations
-    * @param {DomainObject} annotation - An annotation to undelete (set _deleted to false)
+    * @param {import('../objects/ObjectAPI').DomainObject} existingAnnotation - An annotations to undelete (set _deleted to false)
     */
     unDeleteAnnotation(annotation) {
         if (!annotation) {
@@ -275,39 +265,6 @@ export default class AnnotationAPI extends EventEmitter {
         this.openmct.objects.mutate(annotation, '_deleted', false);
     }
 
-    getTagsFromAnnotations(annotations, filterDuplicates = true) {
-        if (!annotations) {
-            return [];
-        }
-
-        let tagsFromAnnotations = annotations.flatMap((annotation) => {
-            if (annotation._deleted) {
-                return [];
-            } else {
-                return annotation.tags;
-            }
-        });
-
-        if (filterDuplicates) {
-            tagsFromAnnotations = tagsFromAnnotations.filter((tag, index, tagArray) => {
-                return tagArray.indexOf(tag) === index;
-            });
-        }
-
-        const fullTagModels = this.#addTagMetaInformationToTags(tagsFromAnnotations);
-
-        return fullTagModels;
-    }
-
-    #addTagMetaInformationToTags(tags) {
-        return tags.map(tagKey => {
-            const tagModel = this.availableTags[tagKey];
-            tagModel.tagID = tagKey;
-
-            return tagModel;
-        });
-    }
-
     #getMatchingTags(query) {
         if (!query) {
             return [];
@@ -326,7 +283,12 @@ export default class AnnotationAPI extends EventEmitter {
 
     #addTagMetaInformationToResults(results, matchingTagKeys) {
         const tagsAddedToResults = results.map(result => {
-            const fullTagModels = this.#addTagMetaInformationToTags(result.tags);
+            const fullTagModels = result.tags.map(tagKey => {
+                const tagModel = this.availableTags[tagKey];
+                tagModel.tagID = tagKey;
+
+                return tagModel;
+            });
 
             return {
                 fullTagModels,
@@ -376,33 +338,6 @@ export default class AnnotationAPI extends EventEmitter {
         return combinedResults;
     }
 
-    /**
-    * @method #breakApartSeparateTargets
-    * @param {Array} results A set of search results that could have the multiple targets for the same result
-    * @returns {Array} The same set of results, but with each target separated out into its own result
-    */
-    #breakApartSeparateTargets(results) {
-        const separateResults = [];
-        results.forEach(result => {
-            Object.keys(result.targets).forEach(targetID => {
-                const separatedResult = {
-                    ...result
-                };
-                separatedResult.targets = {
-                    [targetID]: result.targets[targetID]
-                };
-                separatedResult.targetModels = result.targetModels.filter(targetModel => {
-                    const targetKeyString = this.openmct.objects.makeKeyString(targetModel.identifier);
-
-                    return targetKeyString === targetID;
-                });
-                separateResults.push(separatedResult);
-            });
-        });
-
-        return separateResults;
-    }
-
     /**
     * @method searchForTags
     * @param {String} query A query to match against tags. E.g., "dr" will match the tags "drilling" and "driving"
@@ -425,8 +360,7 @@ export default class AnnotationAPI extends EventEmitter {
         const resultsWithValidPath = appliedTargetsModels.filter(result => {
             return this.openmct.objects.isReachable(result.targetModels?.[0]?.originalPath);
         });
-        const breakApartSeparateTargets = this.#breakApartSeparateTargets(resultsWithValidPath);
 
-        return breakApartSeparateTargets;
+        return resultsWithValidPath;
     }
 }

src/api/annotation/AnnotationAPISpec.js

@@ -26,7 +26,6 @@ import ExampleTagsPlugin from "../../../example/exampleTags/plugin";
 describe("The Annotation API", () => {
     let openmct;
     let mockObjectProvider;
-    let mockImmutableObjectProvider;
     let mockDomainObject;
     let mockFolderObject;
     let mockAnnotationObject;
@@ -90,23 +89,6 @@ describe("The Annotation API", () => {
         mockObjectProvider.create.and.returnValue(Promise.resolve(true));
         mockObjectProvider.update.and.returnValue(Promise.resolve(true));
 
-        mockImmutableObjectProvider = jasmine.createSpyObj("mock immutable provider", [
-            "get"
-        ]);
-        // eslint-disable-next-line require-await
-        mockImmutableObjectProvider.get = async (identifier) => {
-            if (identifier.key === mockDomainObject.identifier.key) {
-                return mockDomainObject;
-            } else if (identifier.key === mockAnnotationObject.identifier.key) {
-                return mockAnnotationObject;
-            } else if (identifier.key === mockFolderObject.identifier.key) {
-                return mockFolderObject;
-            } else {
-                return null;
-            }
-        };
-
-        openmct.objects.addProvider('immutableProvider', mockImmutableObjectProvider);
         openmct.objects.addProvider('fooNameSpace', mockObjectProvider);
         openmct.on('start', done);
         openmct.startHeadless();
@@ -126,29 +108,12 @@ describe("The Annotation API", () => {
                 annotationType: openmct.annotation.ANNOTATION_TYPES.NOTEBOOK,
                 tags: ['sometag'],
                 contentText: "fooContext",
-                targetDomainObjects: [mockDomainObject],
                 targets: {'fooTarget': {}}
             };
             const annotationObject = await openmct.annotation.create(annotationCreationArguments);
             expect(annotationObject).toBeDefined();
             expect(annotationObject.type).toEqual('annotation');
         });
-        it("can create annotations if domain object is immutable", async () => {
-            mockDomainObject.identifier.namespace = 'immutableProvider';
-            const annotationCreationArguments = {
-                name: 'Test Annotation',
-                domainObject: mockDomainObject,
-                annotationType: openmct.annotation.ANNOTATION_TYPES.NOTEBOOK,
-                tags: ['sometag'],
-                contentText: "fooContext",
-                targetDomainObjects: [mockDomainObject],
-                targets: {'fooTarget': {}}
-            };
-            openmct.annotation.setNamespaceToSaveAnnotations('fooNameSpace');
-            const annotationObject = await openmct.annotation.create(annotationCreationArguments);
-            expect(annotationObject).toBeDefined();
-            expect(annotationObject.type).toEqual('annotation');
-        });
         it("fails if annotation is an unknown type", async () => {
             try {
                 await openmct.annotation.create('Garbage Annotation', mockDomainObject, 'garbageAnnotation', ['sometag'], "fooContext", {'fooTarget': {}});
@@ -156,69 +121,30 @@ describe("The Annotation API", () => {
                 expect(error).toBeDefined();
             }
         });
-        it("fails if annotation if given an immutable namespace to save to", async () => {
-            try {
-                const annotationCreationArguments = {
-                    name: 'Test Annotation',
-                    domainObject: mockDomainObject,
-                    annotationType: openmct.annotation.ANNOTATION_TYPES.NOTEBOOK,
-                    tags: ['sometag'],
-                    contentText: "fooContext",
-                    targetDomainObjects: [mockDomainObject],
-                    targets: {'fooTarget': {}}
-                };
-                openmct.annotation.setNamespaceToSaveAnnotations('nameespaceThatDoesNotExist');
-                await openmct.annotation.create(annotationCreationArguments);
-            } catch (error) {
-                expect(error).toBeDefined();
-            }
-        });
-        it("fails if annotation if given an undefined namespace to save to", async () => {
-            try {
-                const annotationCreationArguments = {
-                    name: 'Test Annotation',
-                    domainObject: mockDomainObject,
-                    annotationType: openmct.annotation.ANNOTATION_TYPES.NOTEBOOK,
-                    tags: ['sometag'],
-                    contentText: "fooContext",
-                    targetDomainObjects: [mockDomainObject],
-                    targets: {'fooTarget': {}}
-                };
-                openmct.annotation.setNamespaceToSaveAnnotations('immutableProvider');
-                await openmct.annotation.create(annotationCreationArguments);
-            } catch (error) {
-                expect(error).toBeDefined();
-            }
-        });
     });
 
     describe("Tagging", () => {
-        let tagCreationArguments;
-        beforeEach(() => {
-            tagCreationArguments = {
-                name: 'Test Annotation',
-                domainObject: mockDomainObject,
-                annotationType: openmct.annotation.ANNOTATION_TYPES.NOTEBOOK,
-                tags: ['aWonderfulTag'],
-                contentText: 'fooContext',
-                targets: {'fooNameSpace:some-object': {entryId: 'fooBarEntry'}},
-                targetDomainObjects: [mockDomainObject]
-            };
-        });
         it("can create a tag", async () => {
-            const annotationObject = await openmct.annotation.create(tagCreationArguments);
+            const annotationObject = await openmct.annotation.addSingleAnnotationTag(null, mockDomainObject, {entryId: 'foo'}, openmct.annotation.ANNOTATION_TYPES.NOTEBOOK, 'aWonderfulTag');
             expect(annotationObject).toBeDefined();
             expect(annotationObject.type).toEqual('annotation');
             expect(annotationObject.tags).toContain('aWonderfulTag');
         });
         it("can delete a tag", async () => {
-            const annotationObject = await openmct.annotation.create(tagCreationArguments);
+            const annotationObject = await openmct.annotation.addSingleAnnotationTag(null, mockDomainObject, {entryId: 'foo'}, openmct.annotation.ANNOTATION_TYPES.NOTEBOOK, 'aWonderfulTag');
             expect(annotationObject).toBeDefined();
             openmct.annotation.deleteAnnotations([annotationObject]);
             expect(annotationObject._deleted).toBeTrue();
         });
+        it("throws an error if deleting non-existent tag", async () => {
+            const annotationObject = await openmct.annotation.addSingleAnnotationTag(null, mockDomainObject, {entryId: 'foo'}, openmct.annotation.ANNOTATION_TYPES.NOTEBOOK, 'aWonderfulTag');
+            expect(annotationObject).toBeDefined();
+            expect(() => {
+                openmct.annotation.removeAnnotationTag(annotationObject, 'ThisTagShouldNotExist');
+            }).toThrow();
+        });
         it("can remove all tags", async () => {
-            const annotationObject = await openmct.annotation.create(tagCreationArguments);
+            const annotationObject = await openmct.annotation.addSingleAnnotationTag(null, mockDomainObject, {entryId: 'foo'}, openmct.annotation.ANNOTATION_TYPES.NOTEBOOK, 'aWonderfulTag');
             expect(annotationObject).toBeDefined();
             expect(() => {
                 openmct.annotation.deleteAnnotations([annotationObject]);
@@ -226,13 +152,13 @@ describe("The Annotation API", () => {
             expect(annotationObject._deleted).toBeTrue();
         });
         it("can add/delete/add a tag", async () => {
-            let annotationObject = await openmct.annotation.create(tagCreationArguments);
+            let annotationObject = await openmct.annotation.addSingleAnnotationTag(null, mockDomainObject, {entryId: 'foo'}, openmct.annotation.ANNOTATION_TYPES.NOTEBOOK, 'aWonderfulTag');
             expect(annotationObject).toBeDefined();
             expect(annotationObject.type).toEqual('annotation');
             expect(annotationObject.tags).toContain('aWonderfulTag');
             openmct.annotation.deleteAnnotations([annotationObject]);
             expect(annotationObject._deleted).toBeTrue();
-            annotationObject = await openmct.annotation.create(tagCreationArguments);
+            annotationObject = await openmct.annotation.addSingleAnnotationTag(null, mockDomainObject, {entryId: 'foo'}, openmct.annotation.ANNOTATION_TYPES.NOTEBOOK, 'aWonderfulTag');
             expect(annotationObject).toBeDefined();
             expect(annotationObject.type).toEqual('annotation');
             expect(annotationObject.tags).toContain('aWonderfulTag');

src/api/composition/CompositionAPISpec.js

@@ -1,35 +1,47 @@
-import { createOpenMct, resetApplicationState } from '../../utils/testing';
+import CompositionAPI from './CompositionAPI';
 import CompositionCollection from './CompositionCollection';
 
 describe('The Composition API', function () {
     let publicAPI;
     let compositionAPI;
+    let topicService;
+    let mutationTopic;
 
-    beforeEach(function (done) {
-        publicAPI = createOpenMct();
-        compositionAPI = publicAPI.composition;
+    beforeEach(function () {
 
-        const mockObjectProvider = jasmine.createSpyObj("mock provider", [
-            "create",
-            "update",
-            "get"
+        mutationTopic = jasmine.createSpyObj('mutationTopic', [
+            'listen'
+        ]);
+        topicService = jasmine.createSpy('topicService');
+        topicService.and.returnValue(mutationTopic);
+        publicAPI = {};
+        publicAPI.objects = jasmine.createSpyObj('ObjectAPI', [
+            'get',
+            'mutate',
+            'observe',
+            'areIdsEqual'
         ]);
 
-        mockObjectProvider.create.and.returnValue(Promise.resolve(true));
-        mockObjectProvider.update.and.returnValue(Promise.resolve(true));
-        mockObjectProvider.get.and.callFake((identifier) => {
-            return Promise.resolve({identifier});
+        publicAPI.objects.areIdsEqual.and.callFake(function (id1, id2) {
+            return id1.namespace === id2.namespace && id1.key === id2.key;
         });
 
-        publicAPI.objects.addProvider('test', mockObjectProvider);
-        publicAPI.objects.addProvider('custom', mockObjectProvider);
+        publicAPI.composition = jasmine.createSpyObj('CompositionAPI', [
+            'checkPolicy'
+        ]);
+        publicAPI.composition.checkPolicy.and.returnValue(true);
 
-        publicAPI.on('start', done);
-        publicAPI.startHeadless();
-    });
-
-    afterEach(() => {
-        return resetApplicationState(publicAPI);
+        publicAPI.objects.eventEmitter = jasmine.createSpyObj('eventemitter', [
+            'on'
+        ]);
+        publicAPI.objects.get.and.callFake(function (identifier) {
+            return Promise.resolve({identifier: identifier});
+        });
+        publicAPI.$injector = jasmine.createSpyObj('$injector', [
+            'get'
+        ]);
+        publicAPI.$injector.get.and.returnValue(topicService);
+        compositionAPI = new CompositionAPI(publicAPI);
     });
 
     it('returns falsy if an object does not support composition', function () {
@@ -94,9 +106,6 @@ describe('The Composition API', function () {
             let listener;
             beforeEach(function () {
                 listener = jasmine.createSpy('reorderListener');
-                spyOn(publicAPI.objects, 'mutate');
-                publicAPI.objects.mutate.and.callThrough();
-
                 composition.on('reorder', listener);
 
                 return composition.load();
@@ -127,20 +136,18 @@ describe('The Composition API', function () {
             });
         });
         it('supports adding an object to composition', function () {
+            let addListener = jasmine.createSpy('addListener');
             let mockChildObject = {
                 identifier: {
                     key: 'mock-key',
                     namespace: ''
                 }
             };
+            composition.on('add', addListener);
+            composition.add(mockChildObject);
 
-            return new Promise((resolve) => {
-                composition.on('add', resolve);
-                composition.add(mockChildObject);
-            }).then(() => {
-                expect(domainObject.composition.length).toBe(4);
-                expect(domainObject.composition[3]).toEqual(mockChildObject.identifier);
-            });
+            expect(domainObject.composition.length).toBe(4);
+            expect(domainObject.composition[3]).toEqual(mockChildObject.identifier);
         });
     });
 

src/api/composition/CompositionProvider.js

@@ -224,7 +224,7 @@ export default class CompositionProvider {
       * @private
       * @param {DomainObject} oldDomainObject
       */
-    #onMutation(newDomainObject, oldDomainObject) {
+    #onMutation(oldDomainObject) {
         const id = objectUtils.makeKeyString(oldDomainObject.identifier);
         const listeners = this.#listeningTo[id];
 
@@ -232,8 +232,8 @@ export default class CompositionProvider {
             return;
         }
 
-        const oldComposition = oldDomainObject.composition.map(objectUtils.makeKeyString);
-        const newComposition = newDomainObject.composition.map(objectUtils.makeKeyString);
+        const oldComposition = listeners.composition.map(objectUtils.makeKeyString);
+        const newComposition = oldDomainObject.composition.map(objectUtils.makeKeyString);
 
         const added = _.difference(newComposition, oldComposition).map(objectUtils.parseKeyString);
         const removed = _.difference(oldComposition, newComposition).map(objectUtils.parseKeyString);
@@ -248,6 +248,8 @@ export default class CompositionProvider {
             };
         }
 
+        listeners.composition = newComposition.map(objectUtils.parseKeyString);
+
         added.forEach(function (addedChild) {
             listeners.add.forEach(notify(addedChild));
         });

src/api/composition/DefaultCompositionProvider.js

@@ -99,7 +99,8 @@ export default class DefaultCompositionProvider extends CompositionProvider {
             objectListeners = this.listeningTo[keyString] = {
                 add: [],
                 remove: [],
-                reorder: []
+                reorder: [],
+                composition: [].slice.apply(domainObject.composition)
             };
         }
 
@@ -171,9 +172,8 @@ export default class DefaultCompositionProvider extends CompositionProvider {
      */
     add(parent, childId) {
         if (!this.includes(parent, childId)) {
-            const composition = structuredClone(parent.composition);
-            composition.push(childId);
-            this.publicAPI.objects.mutate(parent, 'composition', composition);
+            parent.composition.push(childId);
+            this.publicAPI.objects.mutate(parent, 'composition', parent.composition);
         }
     }
 

src/api/forms/components/controls/AutoCompleteField.vue

@@ -42,7 +42,7 @@
         ></div>
     </div>
     <div
-        v-if="!hideOptions && filteredOptions.length > 0"
+        v-if="!hideOptions"
         class="c-menu c-input--autocomplete__options"
         aria-label="Autocomplete Options"
         @blur="hideOptions = true"
@@ -230,10 +230,10 @@ export default {
             this.showFilteredOptions = false;
             this.autocompleteInputElement.select();
 
-            if (!this.hideOptions && this.filteredOptions.length > 0) {
-                this.hideOptions = true;
-            } else {
+            if (this.hideOptions) {
                 this.showOptions();
+            } else {
+                this.hideOptions = true;
             }
 
         },
@@ -242,7 +242,6 @@ export default {
             // dropdown is visible, this will collapse the dropdown.
             const clickedInsideAutocomplete = this.autocompleteInputAndArrow.contains(event.target);
             if (!clickedInsideAutocomplete && !this.hideOptions) {
-                this.$emit('autoCompleteBlur');
                 this.hideOptions = true;
             }
         },

src/api/forms/components/controls/FileInput.vue

@@ -30,7 +30,7 @@
             id="fileElem"
             ref="fileInput"
             type="file"
-            :accept="acceptableFileTypes"
+            accept=".json"
             style="display:none"
         >
         <button
@@ -72,13 +72,6 @@ export default {
         },
         removable() {
             return (this.fileInfo || this.model.value) && this.model.removable;
-        },
-        acceptableFileTypes() {
-            if (this.model.type) {
-                return this.model.type;
-            }
-
-            return 'application/json';
         }
     },
     mounted() {
@@ -87,13 +80,7 @@ export default {
     methods: {
         handleFiles() {
             const fileList = this.$refs.fileInput.files;
-            const file = fileList[0];
-
-            if (this.acceptableFileTypes === 'application/json') {
-                this.readFile(file);
-            } else {
-                this.handleRawFile(file);
-            }
+            this.readFile(fileList[0]);
         },
         readFile(file) {
             const self = this;
@@ -117,21 +104,6 @@ export default {
 
             fileReader.readAsText(file);
         },
-        handleRawFile(file) {
-            const fileInfo = {
-                name: file.name,
-                body: file
-            };
-
-            this.fileInfo = Object.assign({}, fileInfo);
-
-            const data = {
-                model: this.model,
-                value: fileInfo
-            };
-
-            this.$emit('onChange', data);
-        },
         selectFile() {
             this.$refs.fileInput.click();
         },

src/api/notifications/NotificationAPI.js

@@ -31,31 +31,7 @@
  * @namespace platform/api/notifications
  */
 import moment from 'moment';
-import EventEmitter from 'eventemitter3';
-
-/**
- * @typedef {object} NotificationProperties
- * @property {function} dismiss Dismiss the notification
- * @property {NotificationModel} model The Notification model
- * @property {(progressPerc: number, progressText: string) => void} [progress] Update the progress of the notification
- */
-
-/**
- * @typedef {EventEmitter & NotificationProperties} Notification
- */
-
-/**
- * @typedef {object} NotificationLink
- * @property {function} onClick The function to be called when the link is clicked
- * @property {string} cssClass A CSS class name to style the link
- * @property {string} text The text to be displayed for the link
- */
-
-/**
- * @typedef {object} NotificationOptions
- * @property {number} [autoDismissTimeout] Milliseconds to wait before automatically dismissing the notification
- * @property {NotificationLink} [link] A link for the notification
- */
+import EventEmitter from 'EventEmitter';
 
 /**
  * A representation of a banner notification. Banner notifications
@@ -64,17 +40,13 @@ import EventEmitter from 'eventemitter3';
  * dialogs so that the same information can be provided in a dialog
  * and then minimized to a banner notification if needed, or vice-versa.
  *
- * @see DialogModel
  * @typedef {object} NotificationModel
  * @property {string} message The message to be displayed by the notification
  * @property {number | 'unknown'} [progress] The progress of some ongoing task. Should be a number between 0 and 100, or
  * with the string literal 'unknown'.
  * @property {string} [progressText] A message conveying progress of some ongoing task.
- * @property {string} [severity] The severity of the notification. Should be one of 'info', 'alert', or 'error'.
- * @property {string} [timestamp] The time at which the notification was created. Should be a string in ISO 8601 format.
- * @property {boolean} [minimized] Whether or not the notification has been minimized
- * @property {boolean} [autoDismiss] Whether the notification should be automatically dismissed after a short period of time.
- * @property {NotificationOptions} options The notification options
+
+ * @see DialogModel
  */
 
 const DEFAULT_AUTO_DISMISS_TIMEOUT = 3000;
@@ -83,19 +55,18 @@ const MINIMIZE_ANIMATION_TIMEOUT = 300;
 /**
  * The notification service is responsible for informing the user of
  * events via the use of banner notifications.
-*/
+ * @memberof ui/notification
+ * @constructor */
+
 export default class NotificationAPI extends EventEmitter {
     constructor() {
         super();
-        /** @type {Notification[]} */
         this.notifications = [];
-        /** @type {{severity: "info" | "alert" | "error"}} */
         this.highest = { severity: "info" };
 
-        /**
+        /*
         * A context in which to hold the active notification and a
         * handle to its timeout.
-        * @type {Notification | undefined}
         */
         this.activeNotification = undefined;
     }
@@ -104,12 +75,16 @@ export default class NotificationAPI extends EventEmitter {
      * Info notifications are low priority informational messages for the user. They will be auto-destroy after a brief
      * period of time.
      * @param {string} message The message to display to the user
-     * @param {NotificationOptions} [options] The notification options
-     * @returns {Notification}
+     * @param {Object} [options] object with following properties
+     *      autoDismissTimeout: {number} in miliseconds to automatically dismisses notification
+     *      link: {Object} Add a link to notifications for navigation
+     *              onClick: callback function
+     *              cssClass: css class name to add style on link
+     *              text: text to display for link
+     * @returns {InfoNotification}
      */
     info(message, options = {}) {
-        /** @type {NotificationModel} */
-        const notificationModel = {
+        let notificationModel = {
             message: message,
             autoDismiss: true,
             severity: "info",
@@ -122,7 +97,7 @@ export default class NotificationAPI extends EventEmitter {
     /**
      * Present an alert to the user.
      * @param {string} message The message to display to the user.
-     * @param {NotificationOptions} [options] object with following properties
+     * @param {Object} [options] object with following properties
      *      autoDismissTimeout: {number} in milliseconds to automatically dismisses notification
      *      link: {Object} Add a link to notifications for navigation
      *              onClick: callback function
@@ -131,7 +106,7 @@ export default class NotificationAPI extends EventEmitter {
      * @returns {Notification}
      */
     alert(message, options = {}) {
-        const notificationModel = {
+        let notificationModel = {
             message: message,
             severity: "alert",
             options
@@ -172,8 +147,7 @@ export default class NotificationAPI extends EventEmitter {
             message: message,
             progressPerc: progressPerc,
             progressText: progressText,
-            severity: "info",
-            options: {}
+            severity: "info"
         };
 
         return this._notify(notificationModel);
@@ -191,13 +165,8 @@ export default class NotificationAPI extends EventEmitter {
      * dismissed.
      *
      * @private
-     * @param {Notification | undefined} notification
      */
     _minimize(notification) {
-        if (!notification) {
-            return;
-        }
-
         //Check this is a known notification
         let index = this.notifications.indexOf(notification);
 
@@ -235,13 +204,8 @@ export default class NotificationAPI extends EventEmitter {
      * dismiss
      *
      * @private
-     * @param {Notification | undefined} notification
      */
     _dismiss(notification) {
-        if (!notification) {
-            return;
-        }
-
         //Check this is a known notification
         let index = this.notifications.indexOf(notification);
 
@@ -272,11 +236,10 @@ export default class NotificationAPI extends EventEmitter {
      * dismiss or minimize where appropriate.
      *
      * @private
-     * @param {Notification | undefined} notification
      */
     _dismissOrMinimize(notification) {
-        let model = notification?.model;
-        if (model?.severity === "info") {
+        let model = notification.model;
+        if (model.severity === "info") {
             this._dismiss(notification);
         } else {
             this._minimize(notification);
@@ -288,11 +251,10 @@ export default class NotificationAPI extends EventEmitter {
      */
     _setHighestSeverity() {
         let severity = {
-            info: 1,
-            alert: 2,
-            error: 3
+            "info": 1,
+            "alert": 2,
+            "error": 3
         };
-
         this.highest.severity = this.notifications.reduce((previous, notification) => {
             if (severity[notification.model.severity] > severity[previous]) {
                 return notification.model.severity;
@@ -350,11 +312,8 @@ export default class NotificationAPI extends EventEmitter {
 
     /**
      * @private
-     * @param {NotificationModel} notificationModel
-     * @returns {Notification}
      */
     _createNotification(notificationModel) {
-        /** @type {Notification} */
         let notification = new EventEmitter();
         notification.model = notificationModel;
         notification.dismiss = () => {
@@ -374,7 +333,6 @@ export default class NotificationAPI extends EventEmitter {
 
     /**
      * @private
-     * @param {Notification | undefined} notification
      */
     _setActiveNotification(notification) {
         this.activeNotification = notification;

src/api/objects/MutableDomainObject.js

@@ -75,23 +75,21 @@ class MutableDomainObject {
         return eventOff;
     }
     $set(path, value) {
-        const oldModel = JSON.parse(JSON.stringify(this));
-        const oldValue = _.get(oldModel, path);
         MutableDomainObject.mutateObject(this, path, value);
 
         //Emit secret synchronization event first, so that all objects are in sync before subsequent events fired.
         this._globalEventEmitter.emit(qualifiedEventName(this, '$_synchronize_model'), this);
 
         //Emit a general "any object" event
-        this._globalEventEmitter.emit(ANY_OBJECT_EVENT, this, oldModel);
+        this._globalEventEmitter.emit(ANY_OBJECT_EVENT, this);
         //Emit wildcard event, with path so that callback knows what changed
-        this._globalEventEmitter.emit(qualifiedEventName(this, '*'), this, path, value, oldModel, oldValue);
+        this._globalEventEmitter.emit(qualifiedEventName(this, '*'), this, path, value);
 
         //Emit events specific to properties affected
         let parentPropertiesList = path.split('.');
         for (let index = parentPropertiesList.length; index > 0; index--) {
             let parentPropertyPath = parentPropertiesList.slice(0, index).join('.');
-            this._globalEventEmitter.emit(qualifiedEventName(this, parentPropertyPath), _.get(this, parentPropertyPath), _.get(oldModel, parentPropertyPath));
+            this._globalEventEmitter.emit(qualifiedEventName(this, parentPropertyPath), _.get(this, parentPropertyPath));
         }
 
         //TODO: Emit events for listeners of child properties when parent changes.

src/api/objects/ObjectAPI.js

@@ -189,11 +189,13 @@ export default class ObjectAPI {
     /**
      * Get a domain object.
      *
+     * @method get
+     * @memberof module:openmct.ObjectProvider#
      * @param {string} key the key for the domain object to load
-     * @param {AbortSignal} abortSignal (optional) signal to abort fetch requests
-     * @param {boolean} [forceRemote=false] defaults to false. If true, will skip cached and
+     * @param {AbortController.signal} abortSignal (optional) signal to abort fetch requests
+     * @param {boolean} forceRemote defaults to false. If true, will skip cached and
      *          dirty/in-transaction objects use and the provider.get method
-     * @returns {Promise<DomainObject>} a promise which will resolve when the domain object
+     * @returns {Promise} a promise which will resolve when the domain object
      *          has been saved, or be rejected if it cannot be saved
      */
     get(identifier, abortSignal, forceRemote = false) {
@@ -218,28 +220,31 @@ export default class ObjectAPI {
         const provider = this.getProvider(identifier);
 
         if (!provider) {
-            throw new Error(`No Provider Matched for keyString "${this.makeKeyString(identifier)}}"`);
+            throw new Error('No Provider Matched');
         }
 
         if (!provider.get) {
             throw new Error('Provider does not support get!');
         }
 
-        let objectPromise = provider.get(identifier, abortSignal).then(domainObject => {
+        let objectPromise = provider.get(identifier, abortSignal).then(result => {
             delete this.cache[keystring];
-            domainObject = this.applyGetInterceptors(identifier, domainObject);
 
-            if (this.supportsMutation(identifier)) {
-                const mutableDomainObject = this.toMutable(domainObject);
-                mutableDomainObject.$refresh(domainObject);
-                this.destroyMutable(mutableDomainObject);
+            result = this.applyGetInterceptors(identifier, result);
+            if (result.isMutable) {
+                result.$refresh(result);
+            } else {
+                let mutableDomainObject = this.toMutable(result);
+                mutableDomainObject.$refresh(result);
             }
 
-            return domainObject;
-        }).catch((error) => {
-            console.warn(`Failed to retrieve ${keystring}:`, error);
+            return result;
+        }).catch((result) => {
+            console.warn(`Failed to retrieve ${keystring}:`, result);
+
             delete this.cache[keystring];
-            const result = this.applyGetInterceptors(identifier);
+
+            result = this.applyGetInterceptors(identifier);
 
             return result;
         });
@@ -645,7 +650,7 @@ export default class ObjectAPI {
      * @param {module:openmct.DomainObject} object the object to observe
      * @param {string} path the property to observe
      * @param {Function} callback a callback to invoke when new values for
-     *        this property are observed.
+     *        this property are observed
      * @method observe
      * @memberof module:openmct.ObjectAPI#
      */
@@ -735,46 +740,6 @@ export default class ObjectAPI {
         }
     }
 
-    /**
-     * Parse and construct an `objectPath` from a `navigationPath`.
-     *
-     * A `navigationPath` is a string of the form `"/browse/<keyString>/<keyString>/..."` that is used
-     * by the Open MCT router to navigate to a specific object.
-     *
-     * Throws an error if the `navigationPath` is malformed.
-     *
-     * @param {string} navigationPath
-     * @returns {DomainObject[]} objectPath
-     */
-    async getRelativeObjectPath(navigationPath) {
-        if (!navigationPath.startsWith('/browse/')) {
-            throw new Error(`Malformed navigation path: "${navigationPath}"`);
-        }
-
-        navigationPath = navigationPath.replace('/browse/', '');
-
-        if (!navigationPath || navigationPath === '/') {
-            return [];
-        }
-
-        // Remove any query params and split on '/'
-        const keyStrings = navigationPath.split('?')?.[0].split('/');
-
-        if (keyStrings[0] !== 'ROOT') {
-            keyStrings.unshift('ROOT');
-        }
-
-        const objectPath = (await Promise.all(
-            keyStrings.map(
-                keyString => this.supportsMutation(keyString)
-                    ? this.getMutable(utils.parseKeyString(keyString))
-                    : this.get(utils.parseKeyString(keyString))
-            )
-        )).reverse();
-
-        return objectPath;
-    }
-
     isObjectPathToALink(domainObject, objectPath) {
         return objectPath !== undefined
             && objectPath.length > 1

src/api/objects/ObjectAPISpec.js

@@ -399,7 +399,7 @@ describe("The Object API", () => {
                     unlisten = objectAPI.observe(mutableSecondInstance, 'otherAttribute', mutationCallback);
                     objectAPI.mutate(mutable, 'otherAttribute', 'some-new-value');
                 }).then(function () {
-                    expect(mutationCallback).toHaveBeenCalledWith('some-new-value', 'other-attribute-value');
+                    expect(mutationCallback).toHaveBeenCalledWith('some-new-value');
                     unlisten();
                 });
             });
@@ -419,20 +419,14 @@ describe("The Object API", () => {
 
                     objectAPI.mutate(mutable, 'objectAttribute.embeddedObject.embeddedKey', 'updated-embedded-value');
                 }).then(function () {
-                    expect(embeddedKeyCallback).toHaveBeenCalledWith('updated-embedded-value', 'embedded-value');
+                    expect(embeddedKeyCallback).toHaveBeenCalledWith('updated-embedded-value');
                     expect(embeddedObjectCallback).toHaveBeenCalledWith({
                         embeddedKey: 'updated-embedded-value'
-                    }, {
-                        embeddedKey: 'embedded-value'
                     });
                     expect(objectAttributeCallback).toHaveBeenCalledWith({
                         embeddedObject: {
                             embeddedKey: 'updated-embedded-value'
                         }
-                    }, {
-                        embeddedObject: {
-                            embeddedKey: 'embedded-value'
-                        }
                     });
 
                     listeners.forEach(listener => listener());

src/api/overlays/components/OverlayComponent.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="c-overlay js-overlay">
+<div class="c-overlay">
     <div
         class="c-overlay__blocker"
         @click="destroy"
@@ -15,8 +15,6 @@
             ref="element"
             class="c-overlay__contents js-notebook-snapshot-item-wrapper"
             tabindex="0"
-            aria-modal="true"
-            role="dialog"
         ></div>
         <div
             v-if="buttons"
@@ -26,7 +24,7 @@
                 v-for="(button, index) in buttons"
                 ref="buttons"
                 :key="index"
-                class="c-button js-overlay__button"
+                class="c-button"
                 tabindex="0"
                 :class="{'c-button--major': focusIndex===index}"
                 @focus="focusIndex=index"

src/api/telemetry/TelemetryAPI.js

@@ -36,7 +36,6 @@ export default class TelemetryAPI {
         this.formatMapCache = new WeakMap();
         this.formatters = new Map();
         this.limitProviders = [];
-        this.stalenessProviders = [];
         this.metadataCache = new WeakMap();
         this.metadataProviders = [new DefaultMetadataProvider(this.openmct)];
         this.noRequestProviderForAllObjects = false;
@@ -115,10 +114,6 @@ export default class TelemetryAPI {
         if (provider.supportsLimits) {
             this.limitProviders.unshift(provider);
         }
-
-        if (provider.supportsStaleness) {
-            this.stalenessProviders.unshift(provider);
-        }
     }
 
     /**
@@ -130,7 +125,7 @@ export default class TelemetryAPI {
             return provider.supportsSubscribe.apply(provider, args);
         }
 
-        return this.subscriptionProviders.find(supportsDomainObject);
+        return this.subscriptionProviders.filter(supportsDomainObject)[0];
     }
 
     /**
@@ -143,25 +138,25 @@ export default class TelemetryAPI {
             return provider.supportsRequest.apply(provider, args);
         }
 
-        return this.requestProviders.find(supportsDomainObject);
+        return this.requestProviders.filter(supportsDomainObject)[0];
     }
 
     /**
      * @private
      */
     #findMetadataProvider(domainObject) {
-        return this.metadataProviders.find((provider) => {
-            return provider.supportsMetadata(domainObject);
-        });
+        return this.metadataProviders.filter(function (p) {
+            return p.supportsMetadata(domainObject);
+        })[0];
     }
 
     /**
      * @private
      */
     #findLimitEvaluator(domainObject) {
-        return this.limitProviders.find((provider) => {
-            return provider.supportsLimits(domainObject);
-        });
+        return this.limitProviders.filter(function (p) {
+            return p.supportsLimits(domainObject);
+        })[0];
     }
 
     /**
@@ -356,101 +351,6 @@ export default class TelemetryAPI {
         }.bind(this);
     }
 
-    /**
-     * Subscribe to staleness updates for a specific domain object.
-     * The callback will be called whenever staleness changes.
-     *
-     * @method subscribeToStaleness
-     * @memberof module:openmct.TelemetryAPI~StalenessProvider#
-     * @param {module:openmct.DomainObject} domainObject the object
-     *          to watch for staleness updates
-     * @param {Function} callback the callback to invoke with staleness data,
-     *  as it is received: ex.
-     *  {
-     *      isStale: <Boolean>,
-     *      timestamp: <timestamp>
-     *  }
-     * @returns {Function} a function which may be called to terminate
-     *          the subscription to staleness updates
-     */
-    subscribeToStaleness(domainObject, callback) {
-        const provider = this.#findStalenessProvider(domainObject);
-
-        if (!this.stalenessSubscriberCache) {
-            this.stalenessSubscriberCache = {};
-        }
-
-        const keyString = objectUtils.makeKeyString(domainObject.identifier);
-        let stalenessSubscriber = this.stalenessSubscriberCache[keyString];
-
-        if (!stalenessSubscriber) {
-            stalenessSubscriber = this.stalenessSubscriberCache[keyString] = {
-                callbacks: [callback]
-            };
-            if (provider) {
-                stalenessSubscriber.unsubscribe = provider
-                    .subscribeToStaleness(domainObject, (stalenessResponse) => {
-                        stalenessSubscriber.callbacks.forEach((cb) => {
-                            cb(stalenessResponse);
-                        });
-                    });
-            } else {
-                stalenessSubscriber.unsubscribe = () => {};
-            }
-        } else {
-            stalenessSubscriber.callbacks.push(callback);
-        }
-
-        return function unsubscribe() {
-            stalenessSubscriber.callbacks = stalenessSubscriber.callbacks.filter((cb) => {
-                return cb !== callback;
-            });
-            if (stalenessSubscriber.callbacks.length === 0) {
-                stalenessSubscriber.unsubscribe();
-                delete this.stalenessSubscriberCache[keyString];
-            }
-        }.bind(this);
-    }
-
-    /**
-     * Request telemetry staleness for a domain object.
-     *
-     * @method isStale
-     * @memberof module:openmct.TelemetryAPI~StalenessProvider#
-     * @param {module:openmct.DomainObject} domainObject the object
-     *        which has associated telemetry staleness
-     * @returns {Promise.<StalenessResponseObject>} a promise for a StalenessResponseObject
-     *        or undefined if no provider exists
-     */
-    async isStale(domainObject) {
-        const provider = this.#findStalenessProvider(domainObject);
-
-        if (!provider) {
-            return;
-        }
-
-        const abortController = new AbortController();
-        const options = { signal: abortController.signal };
-        this.requestAbortControllers.add(abortController);
-
-        try {
-            const staleness = await provider.isStale(domainObject, options);
-
-            return staleness;
-        } finally {
-            this.requestAbortControllers.delete(abortController);
-        }
-    }
-
-    /**
-     * @private
-     */
-    #findStalenessProvider(domainObject) {
-        return this.stalenessProviders.find((provider) => {
-            return provider.supportsStaleness(domainObject);
-        });
-    }
-
     /**
      * Get telemetry metadata for a given domain object.  Returns a telemetry
      * metadata manager which provides methods for interrogating telemetry
@@ -761,29 +661,6 @@ export default class TelemetryAPI {
  * @memberof module:openmct.TelemetryAPI~
  */
 
-/**
- * Provides telemetry staleness data. To subscribe to telemetry stalenes,
- * new StalenessProvider implementations should be
- * [registered]{@link module:openmct.TelemetryAPI#addProvider}.
- *
- * @interface StalenessProvider
- * @property {function} supportsStaleness receieves a domainObject and
- *           returns a boolean to indicate it will provide staleness
- * @property {function} subscribeToStaleness receieves a domainObject to
- *           be subscribed to and a callback to invoke with a StalenessResponseObject
- * @property {function} isStale an asynchronous method called with a domainObject
- *           and an options object which currently has an abort signal, ex.
- *           { signal: <AbortController.signal> }
- *           this method should return a current StalenessResponseObject
- * @memberof module:openmct.TelemetryAPI~
- */
-
-/**
- * @typedef {object} StalenessResponseObject
- * @property {Boolean} isStale boolean representing the staleness state
- * @property {Number} timestamp Unix timestamp in milliseconds
- */
-
 /**
  * An interface for retrieving telemetry data associated with a domain
  * object.

src/api/telemetry/TelemetryCollection.js

@@ -180,7 +180,6 @@ export default class TelemetryCollection extends EventEmitter {
         let beforeStartOfBounds;
         let afterEndOfBounds;
         let added = [];
-        let addedIndices = [];
 
         // loop through, sort and dedupe
         for (let datum of data) {
@@ -213,7 +212,6 @@ export default class TelemetryCollection extends EventEmitter {
                     let index = endIndex || startIndex;
 
                     this.boundedTelemetry.splice(index, 0, datum);
-                    addedIndices.push(index);
                     added.push(datum);
                 }
 
@@ -232,7 +230,7 @@ export default class TelemetryCollection extends EventEmitter {
                     this.emit('add', this.boundedTelemetry);
                 }
             } else {
-                this.emit('add', added, addedIndices);
+                this.emit('add', added);
             }
         }
     }
@@ -332,8 +330,7 @@ export default class TelemetryCollection extends EventEmitter {
                     this.boundedTelemetry = added;
                 }
 
-                // Assumption is that added will be of length 1 here, so just send the last index of the boundedTelemetry in the add event
-                this.emit('add', added, [this.boundedTelemetry.length]);
+                this.emit('add', added);
             }
         } else {
             // user bounds change, reset

src/api/time/IndependentTimeContext.js

@@ -32,18 +32,14 @@ class IndependentTimeContext extends TimeContext {
         this.openmct = openmct;
         this.unlisteners = [];
         this.globalTimeContext = globalTimeContext;
-        // We always start with the global time context.
-        // This upstream context will be undefined when an independent time context is added later.
-        this.upstreamTimeContext = this.globalTimeContext;
+        this.upstreamTimeContext = undefined;
         this.objectPath = objectPath;
         this.refreshContext = this.refreshContext.bind(this);
         this.resetContext = this.resetContext.bind(this);
-        this.removeIndependentContext = this.removeIndependentContext.bind(this);
 
         this.refreshContext();
 
         this.globalTimeContext.on('refreshContext', this.refreshContext);
-        this.globalTimeContext.on('removeOwnContext', this.removeIndependentContext);
     }
 
     bounds(newBounds) {
@@ -206,16 +202,16 @@ class IndependentTimeContext extends TimeContext {
     }
 
     getUpstreamContext() {
-        // If a view has an independent context, don't return an upstream context
-        // Be aware that when a new independent time context is created, we assign the global context as default
-        if (this.hasOwnContext()) {
+        const objectKey = this.openmct.objects.makeKeyString(this.objectPath[this.objectPath.length - 1].identifier);
+        const doesObjectHaveTimeContext = this.globalTimeContext.independentContexts.get(objectKey);
+        if (doesObjectHaveTimeContext) {
             return undefined;
         }
 
         let timeContext = this.globalTimeContext;
         this.objectPath.some((item, index) => {
             const key = this.openmct.objects.makeKeyString(item.identifier);
-            // we're only interested in parents, not self, so index > 0
+            //last index is the view object itself
             const itemContext = this.globalTimeContext.independentContexts.get(key);
             if (index > 0 && itemContext && itemContext.hasOwnContext()) {
                 //upstream time context
@@ -229,43 +225,6 @@ class IndependentTimeContext extends TimeContext {
 
         return timeContext;
     }
-
-    /**
-     * Set the time context of a view to follow any upstream time contexts as necessary (defaulting to the global context)
-     * This needs to be separate from refreshContext
-     */
-    removeIndependentContext(viewKey) {
-        const key = this.openmct.objects.makeKeyString(this.objectPath[0].identifier);
-        if (viewKey && key === viewKey) {
-            //this is necessary as the upstream context gets reassigned after this
-            this.stopFollowingTimeContext();
-
-            let timeContext = this.globalTimeContext;
-
-            this.objectPath.some((item, index) => {
-                const objectKey = this.openmct.objects.makeKeyString(item.identifier);
-                // we're only interested in any parents, not self, so index > 0
-                const itemContext = this.globalTimeContext.independentContexts.get(objectKey);
-                if (index > 0 && itemContext && itemContext.hasOwnContext()) {
-                    //upstream time context
-                    timeContext = itemContext;
-
-                    return true;
-                }
-
-                return false;
-            });
-
-            this.upstreamTimeContext = timeContext;
-
-            this.followTimeContext();
-
-            // Emit bounds so that views that are changing context get the upstream bounds
-            this.emit('bounds', this.bounds());
-            // now that the view's context is set, tell others to check theirs in case they were following this view's context.
-            this.globalTimeContext.emit('refreshContext', viewKey);
-        }
-    }
 }
 
 export default IndependentTimeContext;

src/api/time/TimeAPI.js

@@ -149,7 +149,7 @@ class TimeAPI extends GlobalTimeContext {
 
         return () => {
             //follow any upstream time context
-            this.emit('removeOwnContext', key);
+            this.emit('refreshContext');
         };
     }
 

src/api/time/independentTimeAPISpec.js

@@ -93,82 +93,21 @@ describe("The Independent Time API", function () {
     });
 
     it("follows a parent time context given the objectPath", () => {
-        api.getContextForView([{
-            identifier: {
-                namespace: '',
-                key: 'blah'
-            }
-        }]);
-        let destroyTimeContext = api.addIndependentContext('blah', independentBounds);
         let timeContext = api.getContextForView([{
             identifier: {
                 namespace: '',
-                key: domainObjectKey
+                key: 'blah'
             }
         }, {
-            identifier: {
-                namespace: '',
-                key: 'blah'
-            }
-        }]);
-        expect(timeContext.bounds()).toEqual(independentBounds);
-        destroyTimeContext();
-        expect(timeContext.bounds()).toEqual(bounds);
-    });
-
-    it("uses an object's independent time context if the parent doesn't have one", () => {
-        const domainObjectKey2 = `${domainObjectKey}-2`;
-        const domainObjectKey3 = `${domainObjectKey}-3`;
-        let timeContext = api.getContextForView([{
             identifier: {
                 namespace: '',
                 key: domainObjectKey
             }
         }]);
-        let timeContext2 = api.getContextForView([{
-            identifier: {
-                namespace: '',
-                key: domainObjectKey2
-            }
-        }]);
-        let timeContext3 = api.getContextForView([{
-            identifier: {
-                namespace: '',
-                key: domainObjectKey3
-            }
-        }]);
-        // all bounds follow global time context
-        expect(timeContext.bounds()).toEqual(bounds);
-        expect(timeContext2.bounds()).toEqual(bounds);
-        expect(timeContext3.bounds()).toEqual(bounds);
-        // only first item has own context
-        let destroyTimeContext = api.addIndependentContext(domainObjectKey, independentBounds);
+        let destroyTimeContext = api.addIndependentContext('blah', independentBounds);
         expect(timeContext.bounds()).toEqual(independentBounds);
-        expect(timeContext2.bounds()).toEqual(bounds);
-        expect(timeContext3.bounds()).toEqual(bounds);
-        // first and second item have own context
-        let destroyTimeContext2 = api.addIndependentContext(domainObjectKey2, independentBounds);
-        expect(timeContext.bounds()).toEqual(independentBounds);
-        expect(timeContext2.bounds()).toEqual(independentBounds);
-        expect(timeContext3.bounds()).toEqual(bounds);
-        // all items have own time context
-        let destroyTimeContext3 = api.addIndependentContext(domainObjectKey3, independentBounds);
-        expect(timeContext.bounds()).toEqual(independentBounds);
-        expect(timeContext2.bounds()).toEqual(independentBounds);
-        expect(timeContext3.bounds()).toEqual(independentBounds);
-        //remove own contexts one at a time - should revert to global time context
         destroyTimeContext();
         expect(timeContext.bounds()).toEqual(bounds);
-        expect(timeContext2.bounds()).toEqual(independentBounds);
-        expect(timeContext3.bounds()).toEqual(independentBounds);
-        destroyTimeContext2();
-        expect(timeContext.bounds()).toEqual(bounds);
-        expect(timeContext2.bounds()).toEqual(bounds);
-        expect(timeContext3.bounds()).toEqual(independentBounds);
-        destroyTimeContext3();
-        expect(timeContext.bounds()).toEqual(bounds);
-        expect(timeContext2.bounds()).toEqual(bounds);
-        expect(timeContext3.bounds()).toEqual(bounds);
     });
 
     it("Allows setting of valid bounds", function () {

src/api/user/StatusAPI.js

@@ -291,6 +291,5 @@ export default class StatusAPI extends EventEmitter {
  * The Status type
  * @typedef {Object} Status
  * @property {String} key - A unique identifier for this status
- * @property {String} label - A human readable label for this status
- * @property {Number} timestamp - The time that the status was set.
+ * @property {Number} label - A human readable label for this status
  */

src/plugins/LADTable/components/LADRow.vue

@@ -29,7 +29,7 @@
     <td class="js-second-data">{{ formattedTimestamp }}</td>
     <td
         class="js-third-data"
-        :class="valueClasses"
+        :class="valueClass"
     >{{ value }}</td>
     <td
         v-if="hasUnits"
@@ -63,12 +63,6 @@ export default {
         hasUnits: {
             type: Boolean,
             requred: true
-        },
-        isStale: {
-            type: Boolean,
-            default() {
-                return false;
-            }
         }
     },
     data() {
@@ -87,22 +81,14 @@ export default {
 
             return this.formats[this.valueKey].format(this.datum);
         },
-        valueClasses() {
-            let classes = [];
-
-            if (this.isStale) {
-                classes.push('is-stale');
+        valueClass() {
+            if (!this.datum) {
+                return '';
             }
 
-            if (this.datum) {
-                const limit = this.limitEvaluator.evaluate(this.datum, this.valueMetadata);
+            const limit = this.limitEvaluator.evaluate(this.datum, this.valueMetadata);
 
-                if (limit) {
-                    classes.push(limit.cssClass);
-                }
-            }
-
-            return classes;
+            return limit ? limit.cssClass : '';
 
         },
         formattedTimestamp() {

src/plugins/LADTable/components/LADTable.vue

@@ -21,10 +21,7 @@
  *****************************************************************************/
 
 <template>
-<div
-    class="c-lad-table-wrapper u-style-receiver js-style-receiver"
-    :class="staleClass"
->
+<div class="c-lad-table-wrapper u-style-receiver js-style-receiver">
     <table class="c-table c-lad-table">
         <thead>
             <tr>
@@ -41,7 +38,6 @@
                 :domain-object="ladRow.domainObject"
                 :path-to-table="objectPath"
                 :has-units="hasUnits"
-                :is-stale="staleObjects.includes(ladRow.key)"
                 @rowContextClick="updateViewContext"
             />
         </tbody>
@@ -50,9 +46,7 @@
 </template>
 
 <script>
-
 import LadRow from './LADRow.vue';
-import StalenessUtils from '@/utils/staleness';
 
 export default {
     components: {
@@ -72,8 +66,7 @@ export default {
     data() {
         return {
             items: [],
-            viewContext: {},
-            staleObjects: []
+            viewContext: {}
         };
     },
     computed: {
@@ -87,13 +80,6 @@ export default {
             });
 
             return itemsWithUnits.length !== 0;
-        },
-        staleClass() {
-            if (this.staleObjects.length !== 0) {
-                return 'is-stale';
-            }
-
-            return '';
         }
     },
     mounted() {
@@ -102,17 +88,11 @@ export default {
         this.composition.on('remove', this.removeItem);
         this.composition.on('reorder', this.reorder);
         this.composition.load();
-        this.stalenessSubscription = {};
     },
     destroyed() {
         this.composition.off('add', this.addItem);
         this.composition.off('remove', this.removeItem);
         this.composition.off('reorder', this.reorder);
-
-        Object.values(this.stalenessSubscription).forEach(stalenessSubscription => {
-            stalenessSubscription.unsubscribe();
-            stalenessSubscription.stalenessUtils.destroy();
-        });
     },
     methods: {
         addItem(domainObject) {
@@ -121,55 +101,23 @@ export default {
             item.key = this.openmct.objects.makeKeyString(domainObject.identifier);
 
             this.items.push(item);
-
-            this.stalenessSubscription[item.key] = {};
-            this.stalenessSubscription[item.key].stalenessUtils = new StalenessUtils(this.openmct, domainObject);
-            this.openmct.telemetry.isStale(domainObject).then((stalenessResponse) => {
-                if (stalenessResponse !== undefined) {
-                    this.handleStaleness(item.key, stalenessResponse);
-                }
-            });
-            const stalenessSubscription = this.openmct.telemetry.subscribeToStaleness(domainObject, (stalenessResponse) => {
-                this.handleStaleness(item.key, stalenessResponse);
-            });
-
-            this.stalenessSubscription[item.key].unsubscribe = stalenessSubscription;
         },
         removeItem(identifier) {
-            const SKIP_CHECK = true;
-            const keystring = this.openmct.objects.makeKeyString(identifier);
-            const index = this.items.findIndex(item => keystring === item.key);
+            let index = this.items.findIndex(item => this.openmct.objects.makeKeyString(identifier) === item.key);
 
             this.items.splice(index, 1);
-
-            this.stalenessSubscription[keystring].unsubscribe();
-            this.handleStaleness(keystring, { isStale: false }, SKIP_CHECK);
         },
         reorder(reorderPlan) {
-            const oldItems = this.items.slice();
+            let oldItems = this.items.slice();
             reorderPlan.forEach((reorderEvent) => {
                 this.$set(this.items, reorderEvent.newIndex, oldItems[reorderEvent.oldIndex]);
             });
         },
         metadataHasUnits(valueMetadatas) {
-            const metadataWithUnits = valueMetadatas.filter(metadatum => metadatum.unit);
+            let metadataWithUnits = valueMetadatas.filter(metadatum => metadatum.unit);
 
             return metadataWithUnits.length > 0;
         },
-        handleStaleness(id, stalenessResponse, skipCheck = false) {
-            if (skipCheck || this.stalenessSubscription[id].stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
-                const index = this.staleObjects.indexOf(id);
-                if (stalenessResponse.isStale) {
-                    if (index === -1) {
-                        this.staleObjects.push(id);
-                    }
-                } else {
-                    if (index !== -1) {
-                        this.staleObjects.splice(index, 1);
-                    }
-                }
-            }
-        },
         updateViewContext(rowContext) {
             this.viewContext.row = rowContext;
         },

src/plugins/LADTable/components/LadTableSet.vue

@@ -21,50 +21,42 @@
  *****************************************************************************/
 
 <template>
-<div
-    class="c-lad-table-wrapper u-style-receiver js-style-receiver"
-    :class="staleClass"
->
-    <table class="c-table c-lad-table">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th>Timestamp</th>
-                <th>Value</th>
-                <th v-if="hasUnits">Unit</th>
-            </tr>
-        </thead>
-        <tbody>
-            <template
-                v-for="ladTable in ladTableObjects"
+<table class="c-table c-lad-table">
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Timestamp</th>
+            <th>Value</th>
+            <th v-if="hasUnits">Unit</th>
+        </tr>
+    </thead>
+    <tbody>
+        <template
+            v-for="ladTable in ladTableObjects"
+        >
+            <tr
+                :key="ladTable.key"
+                class="c-table__group-header js-lad-table-set__table-headers"
             >
-                <tr
-                    :key="ladTable.key"
-                    class="c-table__group-header js-lad-table-set__table-headers"
-                >
-                    <td colspan="10">
-                        {{ ladTable.domainObject.name }}
-                    </td>
-                </tr>
-                <lad-row
-                    v-for="ladRow in ladTelemetryObjects[ladTable.key]"
-                    :key="combineKeys(ladTable.key, ladRow.key)"
-                    :domain-object="ladRow.domainObject"
-                    :path-to-table="ladTable.objectPath"
-                    :has-units="hasUnits"
-                    :is-stale="staleObjects.includes(combineKeys(ladTable.key, ladRow.key))"
-                    @rowContextClick="updateViewContext"
-                />
-            </template>
-        </tbody>
-    </table>
-</div>
+                <td colspan="10">
+                    {{ ladTable.domainObject.name }}
+                </td>
+            </tr>
+            <lad-row
+                v-for="ladRow in ladTelemetryObjects[ladTable.key]"
+                :key="ladRow.key"
+                :domain-object="ladRow.domainObject"
+                :path-to-table="ladTable.objectPath"
+                :has-units="hasUnits"
+                @rowContextClick="updateViewContext"
+            />
+        </template>
+    </tbody>
+</table>
 </template>
 
 <script>
-
 import LadRow from './LADRow.vue';
-import StalenessUtils from '@/utils/staleness';
 
 export default {
     components: {
@@ -82,8 +74,7 @@ export default {
             ladTableObjects: [],
             ladTelemetryObjects: {},
             compositions: [],
-            viewContext: {},
-            staleObjects: []
+            viewContext: {}
         };
     },
     computed: {
@@ -104,13 +95,6 @@ export default {
             }
 
             return false;
-        },
-        staleClass() {
-            if (this.staleObjects.length !== 0) {
-                return 'is-stale';
-            }
-
-            return '';
         }
     },
     mounted() {
@@ -119,8 +103,6 @@ export default {
         this.composition.on('remove', this.removeLadTable);
         this.composition.on('reorder', this.reorderLadTables);
         this.composition.load();
-
-        this.stalenessSubscription = {};
     },
     destroyed() {
         this.composition.off('add', this.addLadTable);
@@ -130,11 +112,6 @@ export default {
             c.composition.off('add', c.addCallback);
             c.composition.off('remove', c.removeCallback);
         });
-
-        Object.values(this.stalenessSubscription).forEach(stalenessSubscription => {
-            stalenessSubscription.unsubscribe();
-            stalenessSubscription.stalenessUtils.destroy();
-        });
     },
     methods: {
         addLadTable(domainObject) {
@@ -160,18 +137,10 @@ export default {
                 removeCallback
             });
         },
-        combineKeys(ladKey, telemetryObjectKey) {
-            return `${ladKey}-${telemetryObjectKey}`;
-        },
         removeLadTable(identifier) {
             let index = this.ladTableObjects.findIndex(ladTable => this.openmct.objects.makeKeyString(identifier) === ladTable.key);
             let ladTable = this.ladTableObjects[index];
 
-            this.ladTelemetryObjects[ladTable.key].forEach(telemetryObject => {
-                let combinedKey = this.combineKeys(ladTable.key, telemetryObject.key);
-                this.unwatchStaleness(combinedKey);
-            });
-
             this.$delete(this.ladTelemetryObjects, ladTable.key);
             this.ladTableObjects.splice(index, 1);
         },
@@ -186,61 +155,23 @@ export default {
                 let telemetryObject = {};
                 telemetryObject.key = this.openmct.objects.makeKeyString(domainObject.identifier);
                 telemetryObject.domainObject = domainObject;
-                const combinedKey = this.combineKeys(ladTable.key, telemetryObject.key);
 
-                const telemetryObjects = this.ladTelemetryObjects[ladTable.key];
+                let telemetryObjects = this.ladTelemetryObjects[ladTable.key];
                 telemetryObjects.push(telemetryObject);
 
                 this.$set(this.ladTelemetryObjects, ladTable.key, telemetryObjects);
-
-                this.stalenessSubscription[combinedKey] = {};
-                this.stalenessSubscription[combinedKey].stalenessUtils = new StalenessUtils(this.openmct, domainObject);
-
-                this.openmct.telemetry.isStale(domainObject).then((stalenessResponse) => {
-                    if (stalenessResponse !== undefined) {
-                        this.handleStaleness(combinedKey, stalenessResponse);
-                    }
-                });
-                const stalenessSubscription = this.openmct.telemetry.subscribeToStaleness(domainObject, (stalenessResponse) => {
-                    this.handleStaleness(combinedKey, stalenessResponse);
-                });
-
-                this.stalenessSubscription[combinedKey].unsubscribe = stalenessSubscription;
             };
         },
         removeTelemetryObject(ladTable) {
             return (identifier) => {
-                const keystring = this.openmct.objects.makeKeyString(identifier);
-                const telemetryObjects = this.ladTelemetryObjects[ladTable.key];
-                const combinedKey = this.combineKeys(ladTable.key, keystring);
-                let index = telemetryObjects.findIndex(telemetryObject => keystring === telemetryObject.key);
-
-                this.unwatchStaleness(combinedKey);
+                let telemetryObjects = this.ladTelemetryObjects[ladTable.key];
+                let index = telemetryObjects.findIndex(telemetryObject => this.openmct.objects.makeKeyString(identifier) === telemetryObject.key);
 
                 telemetryObjects.splice(index, 1);
+
                 this.$set(this.ladTelemetryObjects, ladTable.key, telemetryObjects);
             };
         },
-        unwatchStaleness(combinedKey) {
-            const SKIP_CHECK = true;
-
-            this.stalenessSubscription[combinedKey].unsubscribe();
-            this.stalenessSubscription[combinedKey].stalenessUtils.destroy();
-            this.handleStaleness(combinedKey, { isStale: false }, SKIP_CHECK);
-
-            delete this.stalenessSubscription[combinedKey];
-        },
-        handleStaleness(combinedKey, stalenessResponse, skipCheck = false) {
-            if (skipCheck || this.stalenessSubscription[combinedKey].stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
-                const index = this.staleObjects.indexOf(combinedKey);
-                const foundStaleObject = index > -1;
-                if (stalenessResponse.isStale && !foundStaleObject) {
-                    this.staleObjects.push(combinedKey);
-                } else if (!stalenessResponse.isStale && foundStaleObject) {
-                    this.staleObjects.splice(index, 1);
-                }
-            }
-        },
         updateViewContext(rowContext) {
             this.viewContext.row = rowContext;
         },

src/plugins/URLTimeSettingsSynchronizer/pluginSpec.js

@@ -121,8 +121,7 @@ describe("The URLTimeSettingsSynchronizer", () => {
         openmct.router.on('change:hash', resolveFunction);
     });
 
-    // disabling due to test flakiness
-    xit("reset hash", (done) => {
+    it("reset hash", (done) => {
         window.location.hash = oldHash;
         resolveFunction = () => {
             expect(window.location.hash).toBe(oldHash);

src/plugins/condition/Condition.js

@@ -26,7 +26,7 @@ import TelemetryCriterion from "./criterion/TelemetryCriterion";
 import { evaluateResults } from './utils/evaluator';
 import { getLatestTimestamp } from './utils/time';
 import AllTelemetryCriterion from "./criterion/AllTelemetryCriterion";
-import { TRIGGER_CONJUNCTION, TRIGGER_LABEL } from "./utils/constants";
+import {TRIGGER_CONJUNCTION, TRIGGER_LABEL} from "./utils/constants";
 
 /*
 * conditionConfiguration = {
@@ -160,8 +160,7 @@ export default class Condition extends EventEmitter {
         }
 
         criterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-        criterion.on('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-        criterion.on('telemetryStaleness', () => this.handleTelemetryStaleness());
+        criterion.on('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
         if (!this.criteria) {
             this.criteria = [];
         }
@@ -192,14 +191,12 @@ export default class Condition extends EventEmitter {
             const newCriterionConfiguration = this.generateCriterion(criterionConfiguration);
             let newCriterion = new TelemetryCriterion(newCriterionConfiguration, this.openmct);
             newCriterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-            newCriterion.on('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-            newCriterion.on('telemetryStaleness', () => this.handleTelemetryStaleness());
+            newCriterion.on('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
 
             let criterion = found.item;
             criterion.unsubscribe();
             criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-            criterion.off('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-            newCriterion.off('telemetryStaleness', () => this.handleTelemetryStaleness());
+            criterion.off('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
             this.criteria.splice(found.index, 1, newCriterion);
         }
     }
@@ -208,9 +205,12 @@ export default class Condition extends EventEmitter {
         let found = this.findCriterion(id);
         if (found) {
             let criterion = found.item;
-            criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-            criterion.off('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-            criterion.off('telemetryStaleness', () => this.handleTelemetryStaleness());
+            criterion.off('criterionUpdated', (obj) => {
+                this.handleCriterionUpdated(obj);
+            });
+            criterion.off('telemetryIsStale', (obj) => {
+                this.handleStaleCriterion(obj);
+            });
             criterion.destroy();
             this.criteria.splice(found.index, 1);
 
@@ -227,7 +227,7 @@ export default class Condition extends EventEmitter {
         }
     }
 
-    handleOldTelemetryCriterion(updatedCriterion) {
+    handleStaleCriterion(updatedCriterion) {
         this.result = evaluateResults(this.criteria.map(criterion => criterion.result), this.trigger);
         let latestTimestamp = {};
         latestTimestamp = getLatestTimestamp(
@@ -239,11 +239,6 @@ export default class Condition extends EventEmitter {
         this.conditionManager.updateCurrentCondition(latestTimestamp);
     }
 
-    handleTelemetryStaleness() {
-        this.result = evaluateResults(this.criteria.map(criterion => criterion.result), this.trigger);
-        this.conditionManager.updateCurrentCondition();
-    }
-
     updateDescription() {
         const triggerDescription = this.getTriggerDescription();
         let description = '';

src/plugins/condition/components/ConditionCollection.vue

@@ -82,10 +82,8 @@
 </template>
 
 <script>
-
 import Condition from './Condition.vue';
 import ConditionManager from '../ConditionManager';
-import StalenessUtils from '@/utils/staleness';
 
 export default {
     components: {
@@ -141,13 +139,6 @@ export default {
         if (this.stopObservingForChanges) {
             this.stopObservingForChanges();
         }
-
-        if (this.stalenessSubscription) {
-            Object.values(this.stalenessSubscription).forEach(stalenessSubscription => {
-                stalenessSubscription.unsubscribe();
-                stalenessSubscription.stalenessUtils.destroy();
-            });
-        }
     },
     mounted() {
         this.composition = this.openmct.composition.get(this.domainObject);
@@ -159,7 +150,6 @@ export default {
         this.conditionManager = new ConditionManager(this.domainObject, this.openmct);
         this.conditionManager.on('conditionSetResultUpdated', this.handleConditionSetResultUpdated);
         this.updateDefaultCondition();
-        this.stalenessSubscription = {};
     },
     methods: {
         handleConditionSetResultUpdated(data) {
@@ -220,60 +210,19 @@ export default {
             return arr;
         },
         addTelemetryObject(domainObject) {
-            const keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
-
             this.telemetryObjs.push(domainObject);
             this.$emit('telemetryUpdated', this.telemetryObjs);
-
-            if (!this.stalenessSubscription[keyString]) {
-                this.stalenessSubscription[keyString] = {};
-            }
-
-            this.stalenessSubscription[keyString].stalenessUtils = new StalenessUtils(this.openmct, domainObject);
-
-            this.openmct.telemetry.isStale(domainObject).then((stalenessResponse) => {
-                if (stalenessResponse !== undefined) {
-                    this.handleStaleness(keyString, stalenessResponse);
-                }
-            });
-            const stalenessSubscription = this.openmct.telemetry.subscribeToStaleness(domainObject, (stalenessResponse) => {
-                this.handleStaleness(keyString, stalenessResponse);
-            });
-
-            this.stalenessSubscription[keyString].unsubscribe = stalenessSubscription;
         },
         removeTelemetryObject(identifier) {
-            const keyString = this.openmct.objects.makeKeyString(identifier);
-            const index = this.telemetryObjs.findIndex(obj => {
+            let index = this.telemetryObjs.findIndex(obj => {
                 let objId = this.openmct.objects.makeKeyString(obj.identifier);
+                let id = this.openmct.objects.makeKeyString(identifier);
 
-                return objId === keyString;
+                return objId === id;
             });
-
             if (index > -1) {
                 this.telemetryObjs.splice(index, 1);
             }
-
-            if (this.stalenessSubscription[keyString]) {
-                this.stalenessSubscription[keyString].unsubscribe();
-                this.stalenessSubscription[keyString].stalenessUtils.destroy();
-                this.emitStaleness({
-                    keyString,
-                    isStale: false
-                });
-                delete this.stalenessSubscription[keyString];
-            }
-        },
-        handleStaleness(keyString, stalenessResponse) {
-            if (this.stalenessSubscription[keyString].stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
-                this.emitStaleness({
-                    keyString,
-                    isStale: stalenessResponse.isStale
-                });
-            }
-        },
-        emitStaleness(stalenessObject) {
-            this.$emit('telemetryStaleness', stalenessObject);
         },
         addCondition() {
             this.conditionManager.addCondition();

src/plugins/condition/components/ConditionSet.vue

@@ -21,10 +21,7 @@
  *****************************************************************************/
 
 <template>
-<div
-    class="c-cs"
-    :class="{'is-stale': isStale }"
->
+<div class="c-cs">
     <section class="c-cs__current-output c-section">
         <div class="c-cs__content c-cs__current-output-value">
             <span class="c-cs__current-output-value__label">Current Output</span>
@@ -53,7 +50,6 @@
             @conditionSetResultUpdated="updateCurrentOutput"
             @updateDefaultOutput="updateDefaultOutput"
             @telemetryUpdated="updateTelemetry"
-            @telemetryStaleness="handleStaleness"
         />
     </div>
 </div>
@@ -77,15 +73,9 @@ export default {
             currentConditionOutput: '',
             defaultConditionOutput: '',
             telemetryObjs: [],
-            testData: {},
-            staleObjects: []
+            testData: {}
         };
     },
-    computed: {
-        isStale() {
-            return this.staleObjects.length !== 0;
-        }
-    },
     mounted() {
         this.conditionSetIdentifier = this.openmct.objects.makeKeyString(this.domainObject.identifier);
         this.testData = {
@@ -105,18 +95,6 @@ export default {
         },
         updateTestData(testData) {
             this.testData = testData;
-        },
-        handleStaleness({ keyString, isStale }) {
-            const index = this.staleObjects.indexOf(keyString);
-            if (isStale) {
-                if (index === -1) {
-                    this.staleObjects.push(keyString);
-                }
-            } else {
-                if (index !== -1) {
-                    this.staleObjects.splice(index, 1);
-                }
-            }
         }
     }
 };

src/plugins/condition/components/Criterion.vue

@@ -94,7 +94,7 @@
                     >
                     <span v-if="inputIndex < inputCount-1">and</span>
                 </span>
-                <span v-if="criterion.metadata === 'dataReceived' && criterion.operation.name === IS_OLD_KEY">seconds</span>
+                <span v-if="criterion.metadata === 'dataReceived'">seconds</span>
             </template>
             <span v-else>
                 <span
@@ -122,7 +122,7 @@
 
 <script>
 import { OPERATIONS, INPUT_TYPES } from '../utils/operations';
-import { TRIGGER_CONJUNCTION, IS_OLD_KEY, IS_STALE_KEY } from "../utils/constants";
+import {TRIGGER_CONJUNCTION} from "../utils/constants";
 
 export default {
     inject: ['openmct'],
@@ -153,8 +153,7 @@ export default {
             rowLabel: '',
             operationFormat: '',
             enumerations: [],
-            inputTypes: INPUT_TYPES,
-            IS_OLD_KEY
+            inputTypes: INPUT_TYPES
         };
     },
     computed: {
@@ -165,7 +164,7 @@ export default {
         },
         filteredOps: function () {
             if (this.criterion.metadata === 'dataReceived') {
-                return this.operations.filter(op => op.name === IS_OLD_KEY || op.name === IS_STALE_KEY);
+                return this.operations.filter(op => op.name === 'isStale');
             } else {
                 return this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1);
             }

src/plugins/condition/components/conditionals.scss

@@ -54,10 +54,6 @@
     height: 100%;
     overflow: hidden;
 
-    &.is-stale {
-        @include isStaleHolder();
-    }
-
     /************************** CONDITION SET LAYOUT */
     &__current-output {
         flex: 0 0 auto;

src/plugins/condition/criterion/AllTelemetryCriterion.js

@@ -21,9 +21,8 @@
  *****************************************************************************/
 
 import TelemetryCriterion from './TelemetryCriterion';
-import StalenessUtils from '@/utils/staleness';
 import { evaluateResults } from "../utils/evaluator";
-import { getLatestTimestamp, checkIfOld } from '../utils/time';
+import {getLatestTimestamp, subscribeForStaleness} from '../utils/time';
 import { getOperatorText } from "@/plugins/condition/utils/operations";
 
 export default class AllTelemetryCriterion extends TelemetryCriterion {
@@ -39,41 +38,13 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
     initialize() {
         this.telemetryObjects = { ...this.telemetryDomainObjectDefinition.telemetryObjects };
         this.telemetryDataCache = {};
-
-        if (this.isValid() && this.isOldCheck() && this.isValidInput()) {
-            this.checkForOldData(this.telemetryObjects || {});
-        }
-
-        if (this.isValid() && this.isStalenessCheck()) {
-            this.subscribeToStaleness(this.telemetryObjects || {});
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData(this.telemetryObjects || {});
         }
     }
 
-    checkForOldData(telemetryObjects) {
-        if (!this.ageCheck) {
-            this.ageCheck = {};
-        }
+    subscribeForStaleData(telemetryObjects) {
 
-        Object.values(telemetryObjects).forEach((telemetryObject) => {
-            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
-            if (!this.ageCheck[id]) {
-                this.ageCheck[id] = checkIfOld((data) => {
-                    this.handleOldTelemetry(id, data);
-                }, this.input[0] * 1000);
-            }
-        });
-    }
-
-    handleOldTelemetry(id, data) {
-        if (this.telemetryDataCache) {
-            this.telemetryDataCache[id] = true;
-            this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
-        }
-
-        this.emitEvent('telemetryIsOld', data);
-    }
-
-    subscribeToStaleness(telemetryObjects) {
         if (!this.stalenessSubscription) {
             this.stalenessSubscription = {};
         }
@@ -81,32 +52,20 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         Object.values(telemetryObjects).forEach((telemetryObject) => {
             const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
             if (!this.stalenessSubscription[id]) {
-                this.stalenessSubscription[id] = {};
-                this.stalenessSubscription[id].stalenessUtils = new StalenessUtils(this.openmct, telemetryObject);
-                this.openmct.telemetry.isStale(telemetryObject).then((stalenessResponse) => {
-                    if (stalenessResponse !== undefined) {
-                        this.handleStaleTelemetry(id, stalenessResponse);
-                    }
-                });
-                this.stalenessSubscription[id].unsubscribe = this.openmct.telemetry.subscribeToStaleness(
-                    telemetryObject,
-                    (stalenessResponse) => {
-                        this.handleStaleTelemetry(id, stalenessResponse);
-                    }
-                );
+                this.stalenessSubscription[id] = subscribeForStaleness((data) => {
+                    this.handleStaleTelemetry(id, data);
+                }, this.input[0] * 1000);
             }
         });
     }
 
-    handleStaleTelemetry(id, stalenessResponse) {
+    handleStaleTelemetry(id, data) {
         if (this.telemetryDataCache) {
-            if (this.stalenessSubscription[id].stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
-                this.telemetryDataCache[id] = stalenessResponse.isStale;
-                this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
-
-                this.emitEvent('telemetryStaleness');
-            }
+            this.telemetryDataCache[id] = true;
+            this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
         }
+
+        this.emitEvent('telemetryIsStale', data);
     }
 
     isValid() {
@@ -116,13 +75,8 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
     updateTelemetryObjects(telemetryObjects) {
         this.telemetryObjects = { ...telemetryObjects };
         this.removeTelemetryDataCache();
-
-        if (this.isValid() && this.isOldCheck() && this.isValidInput()) {
-            this.checkForOldData(this.telemetryObjects || {});
-        }
-
-        if (this.isValid() && this.isStalenessCheck()) {
-            this.subscribeToStaleness(this.telemetryObjects || {});
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData(this.telemetryObjects || {});
         }
     }
 
@@ -137,9 +91,6 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         });
         telemetryCacheIds.forEach(id => {
             delete (this.telemetryDataCache[id]);
-            delete (this.ageCheck[id]);
-            this.stalenessSubscription[id].unsubscribe();
-            this.stalenessSubscription[id].stalenessUtils.destroy();
             delete (this.stalenessSubscription[id]);
         });
     }
@@ -174,10 +125,10 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
     updateResult(data, telemetryObjects) {
         const validatedData = this.isValid() ? data : {};
 
-        if (validatedData && !this.isStalenessCheck()) {
-            if (this.isOldCheck()) {
-                if (this.ageCheck?.[validatedData.id]) {
-                    this.ageCheck[validatedData.id].update(validatedData);
+        if (validatedData) {
+            if (this.isStalenessCheck()) {
+                if (this.stalenessSubscription && this.stalenessSubscription[validatedData.id]) {
+                    this.stalenessSubscription[validatedData.id].update(validatedData);
                 }
 
                 this.telemetryDataCache[validatedData.id] = false;
@@ -275,17 +226,9 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
     destroy() {
         delete this.telemetryObjects;
         delete this.telemetryDataCache;
-
-        if (this.ageCheck) {
-            Object.values(this.ageCheck).forEach((subscription) => subscription.clear);
-            delete this.ageCheck;
-        }
-
         if (this.stalenessSubscription) {
-            Object.values(this.stalenessSubscription).forEach(subscription => {
-                subscription.unsubscribe();
-                subscription.stalenessUtils.destroy();
-            });
+            Object.values(this.stalenessSubscription).forEach((subscription) => subscription.clear);
+            delete this.stalenessSubscription;
         }
     }
 }

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -21,10 +21,8 @@
  *****************************************************************************/
 
 import EventEmitter from 'EventEmitter';
-import StalenessUtils from '@/utils/staleness';
-import { IS_OLD_KEY, IS_STALE_KEY } from '../utils/constants';
 import { OPERATIONS, getOperatorText } from '../utils/operations';
-import { checkIfOld } from "../utils/time";
+import { subscribeForStaleness } from "../utils/time";
 
 export default class TelemetryCriterion extends EventEmitter {
 
@@ -46,8 +44,7 @@ export default class TelemetryCriterion extends EventEmitter {
         this.input = telemetryDomainObjectDefinition.input;
         this.metadata = telemetryDomainObjectDefinition.metadata;
         this.result = undefined;
-        this.ageCheck = undefined;
-        this.unsubscribeFromStaleness = undefined;
+        this.stalenessSubscription = undefined;
 
         this.initialize();
         this.emitEvent('criterionUpdated', this);
@@ -60,13 +57,8 @@ export default class TelemetryCriterion extends EventEmitter {
         }
 
         this.updateTelemetryObjects(this.telemetryDomainObjectDefinition.telemetryObjects);
-
-        if (this.isValid() && this.isOldCheck() && this.isValidInput()) {
-            this.checkForOldData();
-        }
-
-        if (this.isValid() && this.isStalenessCheck()) {
-            this.subscribeToStaleness();
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData();
         }
     }
 
@@ -74,52 +66,25 @@ export default class TelemetryCriterion extends EventEmitter {
         return this.telemetryObjectIdAsString && (this.telemetryObjectIdAsString === id);
     }
 
-    checkForOldData() {
-        if (this.ageCheck) {
-            this.ageCheck.clear();
+    subscribeForStaleData() {
+        if (this.stalenessSubscription) {
+            this.stalenessSubscription.clear();
         }
 
-        this.ageCheck = checkIfOld(this.handleOldTelemetry.bind(this), this.input[0] * 1000);
+        this.stalenessSubscription = subscribeForStaleness(this.handleStaleTelemetry.bind(this), this.input[0] * 1000);
     }
 
-    handleOldTelemetry(data) {
+    handleStaleTelemetry(data) {
         this.result = true;
-        this.emitEvent('telemetryIsOld', data);
-    }
-
-    subscribeToStaleness() {
-        if (this.unsubscribeFromStaleness) {
-            this.unsubscribeFromStaleness();
-        }
-
-        if (!this.stalenessUtils) {
-            this.stalenessUtils = new StalenessUtils(this.openmct, this.telemetryObject);
-        }
-
-        this.openmct.telemetry.isStale(this.telemetryObject).then(this.handleStaleTelemetry.bind(this));
-        this.unsubscribeFromStaleness = this.openmct.telemetry.subscribeToStaleness(
-            this.telemetryObject,
-            this.handleStaleTelemetry.bind(this)
-        );
-    }
-
-    handleStaleTelemetry(stalenessResponse) {
-        if (stalenessResponse !== undefined && this.stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
-            this.result = stalenessResponse.isStale;
-            this.emitEvent('telemetryStaleness');
-        }
+        this.emitEvent('telemetryIsStale', data);
     }
 
     isValid() {
         return this.telemetryObject && this.metadata && this.operation;
     }
 
-    isOldCheck() {
-        return this.metadata && this.metadata === 'dataReceived' && this.operation === IS_OLD_KEY;
-    }
-
     isStalenessCheck() {
-        return this.metadata && this.metadata === 'dataReceived' && this.operation === IS_STALE_KEY;
+        return this.metadata && this.metadata === 'dataReceived';
     }
 
     isValidInput() {
@@ -128,13 +93,8 @@ export default class TelemetryCriterion extends EventEmitter {
 
     updateTelemetryObjects(telemetryObjects) {
         this.telemetryObject = telemetryObjects[this.telemetryObjectIdAsString];
-
-        if (this.isValid() && this.isOldCheck() && this.isValidInput()) {
-            this.checkForOldData();
-        }
-
-        if (this.isValid() && this.isStalenessCheck()) {
-            this.subscribeToStaleness();
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData();
         }
     }
 
@@ -170,17 +130,14 @@ export default class TelemetryCriterion extends EventEmitter {
 
     updateResult(data) {
         const validatedData = this.isValid() ? data : {};
-
-        if (!this.isStalenessCheck()) {
-            if (this.isOldCheck()) {
-                if (this.ageCheck) {
-                    this.ageCheck.update(validatedData);
-                }
-
-                this.result = false;
-            } else {
-                this.result = this.computeResult(validatedData);
+        if (this.isStalenessCheck()) {
+            if (this.stalenessSubscription) {
+                this.stalenessSubscription.update(validatedData);
             }
+
+            this.result = false;
+        } else {
+            this.result = this.computeResult(validatedData);
         }
     }
 
@@ -311,17 +268,8 @@ export default class TelemetryCriterion extends EventEmitter {
     destroy() {
         delete this.telemetryObject;
         delete this.telemetryObjectIdAsString;
-
-        if (this.ageCheck) {
-            delete this.ageCheck;
-        }
-
-        if (this.stalenessUtils) {
-            this.stalenessUtils.destroy();
-        }
-
-        if (this.unsubscribeFromStaleness) {
-            this.unsubscribeFromStaleness();
+        if (this.stalenessSubscription) {
+            delete this.stalenessSubscription;
         }
     }
 }

src/plugins/condition/pluginSpec.js

@@ -28,7 +28,6 @@ import Vue from 'vue';
 import {getApplicableStylesForItem} from "./utils/styleUtils";
 import ConditionManager from "@/plugins/condition/ConditionManager";
 import StyleRuleManager from "./StyleRuleManager";
-import { IS_OLD_KEY } from "./utils/constants";
 
 describe('the plugin', function () {
     let conditionSetDefinition;
@@ -643,7 +642,7 @@ describe('the plugin', function () {
 
     });
 
-    describe('the condition check if old', () => {
+    describe('the condition check for staleness', () => {
         let conditionSetDomainObject;
 
         beforeEach(() => {
@@ -661,13 +660,13 @@ describe('the plugin', function () {
                             "id": "39584410-cbf9-499e-96dc-76f27e69885d",
                             "configuration": {
                                 "name": "Unnamed Condition",
-                                "output": "Any old telemetry",
+                                "output": "Any stale telemetry",
                                 "trigger": "all",
                                 "criteria": [
                                     {
                                         "id": "35400132-63b0-425c-ac30-8197df7d5862",
                                         "telemetry": "any",
-                                        "operation": IS_OLD_KEY,
+                                        "operation": "isStale",
                                         "input": [
                                             "0.2"
                                         ],
@@ -675,7 +674,7 @@ describe('the plugin', function () {
                                     }
                                 ]
                             },
-                            "summary": "Match if all criteria are met: Any telemetry is old after 5 seconds"
+                            "summary": "Match if all criteria are met: Any telemetry is stale after 5 seconds"
                         },
                         {
                             "isDefault": true,
@@ -709,7 +708,7 @@ describe('the plugin', function () {
             };
         });
 
-        it('should evaluate as old when telemetry is not received in the allotted time', (done) => {
+        it('should evaluate as stale when telemetry is not received in the allotted time', (done) => {
             let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
             conditionMgr.on('conditionSetResultUpdated', mockListener);
             conditionMgr.telemetryObjects = {
@@ -718,7 +717,7 @@ describe('the plugin', function () {
             conditionMgr.updateConditionTelemetryObjects();
             setTimeout(() => {
                 expect(mockListener).toHaveBeenCalledWith({
-                    output: 'Any old telemetry',
+                    output: 'Any stale telemetry',
                     id: {
                         namespace: '',
                         key: 'cf4456a9-296a-4e6b-b182-62ed29cd15b9'
@@ -730,7 +729,7 @@ describe('the plugin', function () {
             }, 400);
         });
 
-        it('should not evaluate as old when telemetry is received in the allotted time', (done) => {
+        it('should not evaluate as stale when telemetry is received in the allotted time', (done) => {
             const date = 1;
             conditionSetDomainObject.configuration.conditionCollection[0].configuration.criteria[0].input = ["0.4"];
             let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);

src/plugins/condition/utils/constants.js

@@ -59,6 +59,3 @@ export const ERROR = {
         errorText: 'Condition not found'
     }
 };
-
-export const IS_OLD_KEY = 'isStale';
-export const IS_STALE_KEY = 'isStale.new';

src/plugins/condition/utils/operations.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { IS_OLD_KEY, IS_STALE_KEY } from "./constants";
-
 function convertToNumbers(input) {
     let numberInputs = [];
     input.forEach(inputValue => numberInputs.push(Number(inputValue)));
@@ -297,7 +295,7 @@ export const OPERATIONS = [
         }
     },
     {
-        name: IS_OLD_KEY,
+        name: 'isStale',
         operation: function () {
             return false;
         },
@@ -307,18 +305,6 @@ export const OPERATIONS = [
         getDescription: function (values) {
             return ` is older than ${values[0] || ''} seconds`;
         }
-    },
-    {
-        name: IS_STALE_KEY,
-        operation: function () {
-            return false;
-        },
-        text: 'is stale',
-        appliesTo: ["number"],
-        inputCount: 0,
-        getDescription: function () {
-            return ' is stale';
-        }
     }
 ];
 
@@ -330,5 +316,5 @@ export const INPUT_TYPES = {
 export function getOperatorText(operationName, values) {
     const found = OPERATIONS.find((operation) => operation.name === operationName);
 
-    return found?.getDescription(values) ?? '';
+    return found ? found.getDescription(values) : '';
 }

src/plugins/condition/utils/time.js

@@ -51,26 +51,26 @@ export function getLatestTimestamp(
     return latest;
 }
 
-export function checkIfOld(callback, timeout) {
-    let oldCheckTimer = setTimeout(() => {
-        clearTimeout(oldCheckTimer);
+export function subscribeForStaleness(callback, timeout) {
+    let stalenessTimer = setTimeout(() => {
+        clearTimeout(stalenessTimer);
         callback();
     }, timeout);
 
     return {
         update: (data) => {
-            if (oldCheckTimer) {
-                clearTimeout(oldCheckTimer);
+            if (stalenessTimer) {
+                clearTimeout(stalenessTimer);
             }
 
-            oldCheckTimer = setTimeout(() => {
-                clearTimeout(oldCheckTimer);
+            stalenessTimer = setTimeout(() => {
+                clearTimeout(stalenessTimer);
                 callback(data);
             }, timeout);
         },
         clear: () => {
-            if (oldCheckTimer) {
-                clearTimeout(oldCheckTimer);
+            if (stalenessTimer) {
+                clearTimeout(stalenessTimer);
             }
         }
     };

src/plugins/condition/utils/timeSpec.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import { checkIfOld } from "./time";
+import { subscribeForStaleness } from "./time";
 
 describe('time related utils', () => {
     let subscription;
@@ -27,11 +27,11 @@ describe('time related utils', () => {
 
     beforeEach(() => {
         mockListener = jasmine.createSpy('listener');
-        subscription = checkIfOld(mockListener, 100);
+        subscription = subscribeForStaleness(mockListener, 100);
     });
 
-    describe('check if old', () => {
-        it('should call listeners when old', (done) => {
+    describe('subscribe for staleness', () => {
+        it('should call listeners when stale', (done) => {
             setTimeout(() => {
                 expect(mockListener).toHaveBeenCalled();
                 done();

src/plugins/displayLayout/components/TelemetryView.vue

@@ -31,7 +31,7 @@
     <div
         v-if="domainObject"
         class="c-telemetry-view u-style-receiver"
-        :class="[itemClasses]"
+        :class="[statusClass]"
         :style="styleObject"
         :data-font-size="item.fontSize"
         :data-font="item.font"
@@ -73,7 +73,6 @@
 <script>
 import LayoutFrame from './LayoutFrame.vue';
 import conditionalStylesMixin from "../mixins/objectStyles-mixin";
-import stalenessMixin from '@/ui/mixins/staleness-mixin';
 import { getDefaultNotebook, getNotebookSectionAndPage } from '@/plugins/notebook/utils/notebook-storage.js';
 
 const DEFAULT_TELEMETRY_DIMENSIONS = [10, 5];
@@ -103,7 +102,7 @@ export default {
     components: {
         LayoutFrame
     },
-    mixins: [conditionalStylesMixin, stalenessMixin],
+    mixins: [conditionalStylesMixin],
     inject: ['openmct', 'objectPath', 'currentView'],
     props: {
         item: {
@@ -138,18 +137,8 @@ export default {
         };
     },
     computed: {
-        itemClasses() {
-            let classes = [];
-
-            if (this.status) {
-                classes.push(`is-status--${this.status}`);
-            }
-
-            if (this.isStale) {
-                classes.push('is-stale');
-            }
-
-            return classes;
+        statusClass() {
+            return (this.status) ? `is-status--${this.status}` : '';
         },
         showLabel() {
             let displayMode = this.item.displayMode;
@@ -321,7 +310,6 @@ export default {
             this.removeSelectable = this.openmct.selection.selectable(
                 this.$el, this.context, this.immediatelySelect || this.initSelect);
             delete this.immediatelySelect;
-            this.subscribeToStaleness(this.domainObject);
         },
         updateTelemetryFormat(format) {
             this.customStringformatter.setFormat(format);

src/plugins/displayLayout/components/telemetry-view.scss

@@ -25,12 +25,6 @@
         margin-right: $interiorMargin;
     }
 
-    &.is-stale {
-        .c-telemetry-view__value {
-            @include isStaleElement();
-        }
-    }
-
     .c-frame & {
         @include abs();
         border: 1px solid transparent;

src/plugins/duplicate/DuplicateAction.js

@@ -31,7 +31,6 @@ export default class DuplicateAction {
         this.priority = 7;
 
         this.openmct = openmct;
-        this.transaction = null;
     }
 
     invoke(objectPath) {
@@ -46,9 +45,7 @@ export default class DuplicateAction {
             .some(objectInPath => this.openmct.objects.areIdsEqual(objectInPath.identifier, this.object.identifier));
     }
 
-    async onSave(changes) {
-        this.startTransaction();
-
+    onSave(changes) {
         let inNavigationPath = this.inNavigationPath();
         if (inNavigationPath && this.openmct.editor.isEditing()) {
             this.openmct.editor.save();
@@ -62,9 +59,7 @@ export default class DuplicateAction {
         const parentDomainObjectpath = changes.location || [this.parent];
         const parent = parentDomainObjectpath[0];
 
-        await duplicationTask.duplicate(this.object, parent);
-
-        return this.saveTransaction();
+        return duplicationTask.duplicate(this.object, parent);
     }
 
     showForm(domainObject, parentDomainObject) {
@@ -147,20 +142,4 @@ export default class DuplicateAction {
             && parentType.definition.creatable
             && Array.isArray(parent.composition);
     }
-
-    startTransaction() {
-        if (!this.openmct.objects.isTransactionActive()) {
-            this.transaction = this.openmct.objects.startTransaction();
-        }
-    }
-
-    async saveTransaction() {
-        if (!this.transaction) {
-            return;
-        }
-
-        await this.transaction.commit();
-        this.openmct.objects.endTransaction();
-        this.transaction = null;
-    }
 }

src/plugins/formActions/CreateAction.js

@@ -59,7 +59,7 @@ export default class CreateAction extends PropertiesAction {
             _.set(this.domainObject, key, value);
         });
 
-        const parentDomainObject = this.openmct.objects.toMutable(parentDomainObjectPath[0]);
+        const parentDomainObject = parentDomainObjectPath[0];
 
         this.domainObject.modified = Date.now();
         this.domainObject.location = this.openmct.objects.makeKeyString(parentDomainObject.identifier);
@@ -85,7 +85,6 @@ export default class CreateAction extends PropertiesAction {
             console.error(err);
             this.openmct.notifications.error(`Error saving objects: ${err}`);
         } finally {
-            this.openmct.objects.destroyMutable(parentDomainObject);
             dialog.dismiss();
         }
 
@@ -143,21 +142,18 @@ export default class CreateAction extends PropertiesAction {
             }
         };
 
-        this.domainObject = this.openmct.objects.toMutable(domainObject);
+        this.domainObject = domainObject;
 
         if (definition.initialize) {
-            definition.initialize(this.domainObject);
+            definition.initialize(domainObject);
         }
 
-        const createWizard = new CreateWizard(this.openmct, this.domainObject, this.parentDomainObject);
+        const createWizard = new CreateWizard(this.openmct, domainObject, this.parentDomainObject);
         const formStructure = createWizard.getFormStructure(true);
         formStructure.title = 'Create a New ' + definition.name;
 
         this.openmct.forms.showForm(formStructure)
             .then(this._onSave.bind(this))
-            .catch(this._onCancel.bind(this))
-            .finally(() => {
-                this.openmct.objects.destroyMutable(this.domainObject);
-            });
+            .catch(this._onCancel.bind(this));
     }
 }

src/plugins/gauge/components/Gauge.vue

@@ -22,7 +22,7 @@
 <template>
 <div
     class="c-gauge__wrapper js-gauge-wrapper"
-    :class="gaugeClasses"
+    :class="`c-gauge--${gaugeType}`"
     :title="gaugeTitle"
 >
     <template v-if="typeDial">
@@ -347,14 +347,12 @@
 
 <script>
 import { DIAL_VALUE_DEG_OFFSET, getLimitDegree } from '../gauge-limit-util';
-import stalenessMixin from '@/ui/mixins/staleness-mixin';
 
 const LIMIT_PADDING_IN_PERCENT = 10;
 const DEFAULT_CURRENT_VALUE = '--';
 
 export default {
     name: 'Gauge',
-    mixins: [stalenessMixin],
     inject: ['openmct', 'domainObject', 'composition'],
     data() {
         let gaugeController = this.domainObject.configuration.gaugeController;
@@ -405,15 +403,6 @@ export default {
 
             return VIEWBOX_STR.replace('X', this.digits * DIGITS_RATIO);
         },
-        gaugeClasses() {
-            let classes = [`c-gauge--${this.gaugeType}`];
-
-            if (this.isStale) {
-                classes.push('is-stale');
-            }
-
-            return classes;
-        },
         rangeFontSize() {
             const CHAR_THRESHOLD = 3;
             const START_PERC = 8.5;
@@ -564,8 +553,6 @@ export default {
             this.telemetryObject = domainObject;
             this.request();
             this.subscribe();
-
-            this.subscribeToStaleness(domainObject);
         },
         addedToComposition(domainObject) {
             if (this.telemetryObject) {
@@ -624,8 +611,6 @@ export default {
                 this.unsubscribe = null;
             }
 
-            this.triggerUnsubscribeFromStaleness();
-
             this.curVal = DEFAULT_CURRENT_VALUE;
             this.formats = null;
             this.limitHigh = '';

src/plugins/gauge/gauge.scss

@@ -32,15 +32,6 @@ $meterNeedleBorderRadius: 5px;
   &__wrapper {
     @include abs();
     overflow: hidden;
-
-    &.is-stale {
-      @include isStaleHolder();
-
-      [class*=__current-value-text] {
-        fill: $colorTelemStale;
-        font-style: italic;
-      }
-    }
   }
 
   &__current-value-text-wrapper {

src/plugins/imagery/ImageryView.js

@@ -45,35 +45,6 @@ export default class ImageryView {
         });
     }
 
-    getViewContext() {
-        if (!this.component) {
-            return {};
-        }
-
-        return this.component.$refs.ImageryContainer;
-    }
-
-    pause() {
-        const imageContext = this.getViewContext();
-        // persist previous pause value to return to after unpausing
-        this.previouslyPaused = imageContext.isPaused;
-        imageContext.thumbnailClicked(imageContext.focusedImageIndex);
-    }
-    unpause() {
-        const pausedStateBefore = this.previouslyPaused;
-        this.previouslyPaused = undefined; // clear value
-        const imageContext = this.getViewContext();
-        imageContext.paused(pausedStateBefore);
-    }
-
-    onPreviewModeChange({ isPreviewing } = {}) {
-        if (isPreviewing) {
-            this.pause();
-        } else {
-            this.unpause();
-        }
-    }
-
     destroy() {
         this.component.$destroy();
         this.component = undefined;

src/plugins/imagery/components/Compass/Compass.vue

@@ -26,23 +26,19 @@
     :style="`width: 100%; height: 100%`"
 >
     <CompassHUD
-        :camera-angle-of-view="cameraAngleOfView"
-        :heading="heading"
-        :camera-azimuth="cameraAzimuth"
-        :transformations="transformations"
-        :has-gimble="hasGimble"
-        :normalized-camera-azimuth="normalizedCameraAzimuth"
+        v-if="hasCameraFieldOfView"
         :sun-heading="sunHeading"
+        :camera-angle-of-view="cameraAngleOfView"
+        :camera-pan="cameraPan"
     />
     <CompassRose
+        v-if="hasCameraFieldOfView"
         :camera-angle-of-view="cameraAngleOfView"
+        :camera-pan="cameraPan"
+        :compass-rose-sizing-classes="compassRoseSizingClasses"
         :heading="heading"
-        :camera-azimuth="cameraAzimuth"
-        :transformations="transformations"
-        :has-gimble="hasGimble"
-        :normalized-camera-azimuth="normalizedCameraAzimuth"
-        :sun-heading="sunHeading"
         :sized-image-dimensions="sizedImageDimensions"
+        :sun-heading="sunHeading"
     />
 </div>
 </template>
@@ -50,7 +46,8 @@
 <script>
 import CompassHUD from './CompassHUD.vue';
 import CompassRose from './CompassRose.vue';
-import { rotate } from './utils';
+
+const CAMERA_ANGLE_OF_VIEW = 70;
 
 export default {
     components: {
@@ -58,6 +55,10 @@ export default {
         CompassRose
     },
     props: {
+        compassRoseSizingClasses: {
+            type: String,
+            required: true
+        },
         image: {
             type: Object,
             required: true
@@ -68,35 +69,23 @@ export default {
         }
     },
     computed: {
-        hasGimble() {
-            return this.cameraAzimuth !== undefined;
-        },
-        // compass ordinal orientation of camera
-        normalizedCameraAzimuth() {
-            return this.hasGimble
-                ? rotate(this.cameraAzimuth)
-                : rotate(this.heading, -this.transformations.rotation || 0);
+        hasCameraFieldOfView() {
+            return this.cameraPan !== undefined && this.cameraAngleOfView > 0;
         },
         // horizontal rotation from north in degrees
         heading() {
             return this.image.heading;
         },
-        hasHeading() {
-            return this.heading !== undefined;
-        },
         // horizontal rotation from north in degrees
         sunHeading() {
             return this.image.sunOrientation;
         },
         // horizontal rotation from north in degrees
-        cameraAzimuth() {
+        cameraPan() {
             return this.image.cameraPan;
         },
         cameraAngleOfView() {
-            return this.transformations.cameraAngleOfView;
-        },
-        transformations() {
-            return this.image.transformations;
+            return CAMERA_ANGLE_OF_VIEW;
         }
     },
     methods: {

src/plugins/imagery/components/Compass/CompassHUD.vue

@@ -94,33 +94,17 @@ const COMPASS_POINTS = [
 
 export default {
     props: {
-        cameraAngleOfView: {
-            type: Number,
-            required: true
-        },
-        heading: {
-            type: Number,
-            required: true
-        },
-        cameraAzimuth: {
-            type: Number,
-            default: undefined
-        },
-        transformations: {
-            type: Object,
-            required: true
-        },
-        hasGimble: {
-            type: Boolean,
-            required: true
-        },
-        normalizedCameraAzimuth: {
-            type: Number,
-            required: true
-        },
         sunHeading: {
             type: Number,
             default: undefined
+        },
+        cameraAngleOfView: {
+            type: Number,
+            default: undefined
+        },
+        cameraPan: {
+            type: Number,
+            required: true
         }
     },
     computed: {
@@ -146,13 +130,10 @@ export default {
                 left: `${ percentage * 100 }%`
             };
         },
-        cameraRotation() {
-            return this.transformations?.rotation;
-        },
         visibleRange() {
             return [
-                rotate(this.normalizedCameraAzimuth, -this.cameraAngleOfView / 2),
-                rotate(this.normalizedCameraAzimuth, this.cameraAngleOfView / 2)
+                rotate(this.cameraPan, -this.cameraAngleOfView / 2),
+                rotate(this.cameraPan, this.cameraAngleOfView / 2)
             ];
         }
     }

src/plugins/imagery/components/Compass/CompassRose.vue

@@ -64,17 +64,18 @@
                     class="c-cr__edge"
                     width="100"
                     height="100"
-                    fill="url(#gradient_edge)"
+                    fill="url(#paint0_radial)"
                 />
                 <rect
                     v-if="hasSunHeading"
                     class="c-cr__sun"
                     width="100"
                     height="100"
-                    fill="url(#gradient_sun)"
+                    fill="url(#paint1_radial)"
                     :style="sunHeadingStyle"
                 />
 
+                <!-- Camera FOV -->
                 <mask
                     id="mask2"
                     class="c-cr__cam-fov-l-mask"
@@ -107,60 +108,43 @@
                     />
                 </mask>
                 <g
-                    class="c-cr-cam-and-body"
-                    :style="cameraHeadingStyle"
+                    class="c-cr__cam-fov"
+                    :style="cameraPanStyle"
                 >
-                    <!-- Equipment (spacecraft) body holder. Transforms relative to the camera position. -->
-                    <g
-                        v-if="hasHeading"
-                        class="cr-vrover"
-                        :style="camAngleAndPositionStyle"
-                    >
-                        <!-- Equipment body. Rotates relative to the camera pan value for cameras that gimble. -->
-                        <path
-                            class="cr-vrover__body"
-                            :style="gimbledCameraPanStyle"
-                            x
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            d="M5 0C2.23858 0 0 2.23858 0 5V95C0 97.7614 2.23858 100 5 100H95C97.7614 100 100 97.7614 100 95V5C100 2.23858 97.7614 0 95 0H5ZM85 59L50 24L15 59H33V75H67.0455V59H85Z"
+                    <g mask="url(#mask2)">
+                        <rect
+                            class="c-cr__cam-fov-r"
+                            x="49"
+                            width="51"
+                            height="100"
+                            :style="cameraFOVStyleRightHalf"
                         />
                     </g>
-
-                    <!-- Camera FOV -->
-                    <g
-                        class="c-cr__cam-fov"
-                    >
-                        <g mask="url(#mask2)">
-                            <rect
-                                class="c-cr__cam-fov-r"
-                                x="49"
-                                width="51"
-                                height="100"
-                                :style="cameraFOVStyleRightHalf"
-                            />
-                        </g>
-                        <g mask="url(#mask1)">
-                            <rect
-                                class="c-cr__cam-fov-l"
-                                width="51"
-                                height="100"
-                                :style="cameraFOVStyleLeftHalf"
-                            />
-                        </g>
-                        <polygon
-                            class="c-cr__cam"
-                            points="0,0 100,0 70,40 70,100 30,100 30,40"
+                    <g mask="url(#mask1)">
+                        <rect
+                            class="c-cr__cam-fov-l"
+                            width="51"
+                            height="100"
+                            :style="cameraFOVStyleLeftHalf"
                         />
                     </g>
-
                 </g>
             </g>
 
+            <!-- Spacecraft body -->
+            <path
+                v-if="hasHeading"
+                class="c-cr__spacecraft-body"
+                fill-rule="evenodd"
+                clip-rule="evenodd"
+                d="M37 49C35.3431 49 34 50.3431 34 52V82C34 83.6569 35.3431 85 37 85H63C64.6569 85 66 83.6569 66 82V52C66 50.3431 64.6569 49 63 49H37ZM50 52L58 60H55V67H45V60H42L50 52Z"
+                :style="headingStyle"
+            />
+
             <!-- NSEW and ticks -->
             <g
                 class="c-cr__nsew"
-                :style="compassDialStyle"
+                :style="compassRoseStyle"
             >
                 <g class="c-cr__ticks-major">
                     <path d="M50 3L43 10H57L50 3Z" />
@@ -209,7 +193,7 @@
         </g>
         <defs>
             <radialGradient
-                id="gradient_edge"
+                id="paint0_radial"
                 cx="0"
                 cy="0"
                 r="1"
@@ -217,7 +201,7 @@
                 gradientTransform="translate(50 50) rotate(90) scale(50)"
             >
                 <stop
-                    offset="0.6"
+                    offset="0.751387"
                     stop-opacity="0"
                 />
                 <stop
@@ -226,7 +210,7 @@
                 />
             </radialGradient>
             <radialGradient
-                id="gradient_sun"
+                id="paint1_radial"
                 cx="0"
                 cy="0"
                 r="1"
@@ -234,17 +218,12 @@
                 gradientTransform="translate(50 -7) rotate(-90) scale(18.5)"
             >
                 <stop
-                    offset="0.7"
+                    offset="0.716377"
                     stop-color="#FFCC00"
                 />
-                <stop
-                    offset="0.7"
-                    stop-color="#FFCC00"
-                    stop-opacity="0.6"
-                />
                 <stop
                     offset="1"
-                    stop-color="#FF6600"
+                    stop-color="#FF9900"
                     stop-opacity="0"
                 />
             </radialGradient>
@@ -259,34 +238,32 @@ import { throttle } from 'lodash';
 
 export default {
     props: {
-        cameraAngleOfView: {
-            type: Number,
+        compassRoseSizingClasses: {
+            type: String,
             required: true
         },
         heading: {
             type: Number,
-            required: true
-        },
-        cameraAzimuth: {
-            type: Number,
-            default: undefined
-        },
-        transformations: {
-            type: Object,
-            required: true
-        },
-        hasGimble: {
-            type: Boolean,
-            required: true
-        },
-        normalizedCameraAzimuth: {
-            type: Number,
-            required: true
+            required: true,
+            default() {
+                return 0;
+            }
         },
         sunHeading: {
             type: Number,
             default: undefined
         },
+        cameraAngleOfView: {
+            type: Number,
+            default: undefined
+        },
+        cameraPan: {
+            type: Number,
+            required: true,
+            default() {
+                return 0;
+            }
+        },
         sizedImageDimensions: {
             type: Object,
             required: true
@@ -298,30 +275,11 @@ export default {
         };
     },
     computed: {
-        camAngleAndPositionStyle() {
-            const translateX = this.transformations?.translateX;
-            const translateY = this.transformations?.translateY;
-            const rotation = this.transformations?.rotation;
-            const scale = this.transformations?.scale;
-
-            return { transform: `translate(${translateX}%, ${translateY}%) rotate(${rotation}deg) scale(${scale})` };
-        },
-        gimbledCameraPanStyle() {
-            if (!this.hasGimble) {
-                return;
-            }
-
-            const gimbledCameraPan = rotate(this.normalizedCameraAzimuth, -this.heading);
-
-            return {
-                transform: `rotate(${ -gimbledCameraPan }deg)`
-            };
-        },
-        compassDialStyle() {
+        compassRoseStyle() {
             return { transform: `rotate(${ this.north }deg)` };
         },
         north() {
-            return this.lockCompass ? rotate(-this.normalizedCameraAzimuth) : 0;
+            return this.lockCompass ? rotate(-this.cameraPan) : 0;
         },
         cardinalTextRotateN() {
             return { transform: `translateY(-27%) rotate(${ -this.north }deg)` };
@@ -338,6 +296,13 @@ export default {
         hasHeading() {
             return this.heading !== undefined;
         },
+        headingStyle() {
+            const rotation = rotate(this.north, this.heading);
+
+            return {
+                transform: `rotate(${ rotation }deg)`
+            };
+        },
         hasSunHeading() {
             return this.sunHeading !== undefined;
         },
@@ -348,8 +313,8 @@ export default {
                 transform: `rotate(${ rotation }deg)`
             };
         },
-        cameraHeadingStyle() {
-            const rotation = rotate(this.north, this.normalizedCameraAzimuth);
+        cameraPanStyle() {
+            const rotation = rotate(this.north, this.cameraPan);
 
             return {
                 transform: `rotate(${ rotation }deg)`
@@ -368,24 +333,6 @@ export default {
             return {
                 transform: `rotate(${ -this.cameraAngleOfView / 2 }deg)`
             };
-        },
-        compassRoseSizingClasses() {
-            let compassRoseSizingClasses = '';
-            if (this.sizedImageWidth < 300) {
-                compassRoseSizingClasses = '--rose-small --rose-min';
-            } else if (this.sizedImageWidth < 500) {
-                compassRoseSizingClasses = '--rose-small';
-            } else if (this.sizedImageWidth > 1000) {
-                compassRoseSizingClasses = '--rose-max';
-            }
-
-            return compassRoseSizingClasses;
-        },
-        sizedImageWidth() {
-            return this.sizedImageDimensions.width;
-        },
-        sizedImageHeight() {
-            return this.sizedImageDimensions.height;
         }
     },
     watch: {

src/plugins/imagery/components/Compass/compass.scss

@@ -1,5 +1,5 @@
 /***************************** THEME/UI CONSTANTS AND MIXINS */
-$interfaceKeyColor: #fff;
+$interfaceKeyColor: #00B9C5;
 $elemBg: rgba(black, 0.7);
 
 @mixin sun($position: 'circle closest-side') {
@@ -100,19 +100,13 @@ $elemBg: rgba(black, 0.7);
         }
 
         &__edge {
-            opacity: 0.2;
+            opacity: 0.1;
         }
 
         &__sun {
             opacity: 0.7;
         }
 
-        &__cam {
-            fill: $interfaceKeyColor;
-            transform-origin: center;
-            transform: scale(0.15);
-        }
-
         &__cam-fov-l,
         &__cam-fov-r {
             // Cam FOV indication
@@ -121,6 +115,7 @@ $elemBg: rgba(black, 0.7);
         }
 
         &__nsew-text,
+        &__spacecraft-body,
         &__ticks-major,
         &__ticks-minor {
             fill: $color;
@@ -171,15 +166,3 @@ $elemBg: rgba(black, 0.7);
         padding-top: $s;
     }
 }
-
-/************************** ROVER */
-.cr-vrover {
-    $scale: 0.4;
-    transform-origin: center;
-
-    &__body {
-        fill: $interfaceKeyColor;
-        opacity: 0.3;
-        transform-origin: center 7% !important; // Places rotation center at mast position
-    }
-}

src/plugins/imagery/components/Compass/pluginSpec.js

@@ -35,15 +35,8 @@ describe("The Compass component", () => {
             roll: 90,
             pitch: 90,
             cameraTilt: 100,
-            cameraAzimuth: 90,
-            sunAngle: 30,
-            transformations: {
-                translateX: 0,
-                translateY: 18,
-                rotation: 0,
-                scale: 0.3,
-                cameraAngleOfView: 70
-            }
+            cameraPan: 90,
+            sunAngle: 30
         };
         let propsData = {
             naturalAspectRatio: 0.9,
@@ -51,7 +44,8 @@ describe("The Compass component", () => {
             sizedImageDimensions: {
                 width: 100,
                 height: 100
-            }
+            },
+            compassRoseSizingClasses: '--rose-small --rose-min'
         };
 
         app = new Vue({
@@ -60,6 +54,7 @@ describe("The Compass component", () => {
                 return propsData;
             },
             template: `<Compass
+                :compass-rose-sizing-classes="compassRoseSizingClasses"
                 :image="image"
                 :natural-aspect-ratio="naturalAspectRatio"
                 :sized-image-dimensions="sizedImageDimensions"
@@ -72,7 +67,7 @@ describe("The Compass component", () => {
         app.$destroy();
     });
 
-    describe("when a heading value and cameraAngleOfView exists on the image", () => {
+    describe("when a heading value exists on the image", () => {
 
         it("should display a compass rose", () => {
             let compassRoseElement = instance.$el.querySelector(COMPASS_ROSE_CLASS

src/plugins/imagery/components/ImageThumbnail.vue

@@ -39,7 +39,7 @@
         <img
             ref="img"
             class="c-thumb__image"
-            :src="`${image.thumbnailUrl || image.url}`"
+            :src="image.url"
             fetchpriority="low"
             @load="imageLoadCompleted"
         >

src/plugins/imagery/components/ImageryTimeView.vue

@@ -186,17 +186,17 @@ export default {
                 item.remove();
             });
             let imagery = this.$el.querySelectorAll(`.${IMAGE_WRAPPER_CLASS}`);
-            imagery.forEach(imageElm => {
+            imagery.forEach(item => {
                 if (clearAllImagery) {
-                    imageElm.remove();
+                    item.remove();
                 } else {
-                    const id = imageElm.getAttributeNS(null, 'id');
+                    const id = item.getAttributeNS(null, 'id');
                     if (id) {
                         const timestamp = id.replace(ID_PREFIX, '');
                         if (!this.isImageryInBounds({
                             time: timestamp
                         })) {
-                            imageElm.remove();
+                            item.remove();
                         }
                     }
                 }
@@ -343,25 +343,25 @@ export default {
                 imageElement.style.display = 'block';
             }
         },
-        updateExistingImageWrapper(existingImageWrapper, image, showImagePlaceholders) {
+        updateExistingImageWrapper(existingImageWrapper, item, showImagePlaceholders) {
             //Update the x co-ordinates of the image wrapper and the url of image
             //this is to avoid tearing down all elements completely and re-drawing them
             this.setNSAttributesForElement(existingImageWrapper, {
                 'data-show-image-placeholders': showImagePlaceholders
             });
-            existingImageWrapper.style.left = `${this.xScale(image.time)}px`;
+            existingImageWrapper.style.left = `${this.xScale(item.time)}px`;
 
             let imageElement = existingImageWrapper.querySelector('img');
             this.setNSAttributesForElement(imageElement, {
-                src: image.thumbnailUrl || image.url
+                src: item.url
             });
             this.setImageDisplay(imageElement, showImagePlaceholders);
         },
-        createImageWrapper(index, image, showImagePlaceholders) {
-            const id = `${ID_PREFIX}${image.time}`;
+        createImageWrapper(index, item, showImagePlaceholders) {
+            const id = `${ID_PREFIX}${item.time}`;
             let imageWrapper = document.createElement('div');
             imageWrapper.classList.add(IMAGE_WRAPPER_CLASS);
-            imageWrapper.style.left = `${this.xScale(image.time)}px`;
+            imageWrapper.style.left = `${this.xScale(item.time)}px`;
             this.setNSAttributesForElement(imageWrapper, {
                 id,
                 'data-show-image-placeholders': showImagePlaceholders
@@ -383,7 +383,7 @@ export default {
             //create image element
             let imageElement = document.createElement('img');
             this.setNSAttributesForElement(imageElement, {
-                src: image.thumbnailUrl || image.url
+                src: item.url
             });
             imageElement.style.width = `${IMAGE_SIZE}px`;
             imageElement.style.height = `${IMAGE_SIZE}px`;
@@ -392,7 +392,7 @@ export default {
             //handle mousedown event to show the image in a large view
             imageWrapper.addEventListener('mousedown', (e) => {
                 if (e.button === 0) {
-                    this.expand(image.time);
+                    this.expand(item.time);
                 }
             });
 

src/plugins/imagery/components/ImageryView.vue

@@ -93,7 +93,9 @@
                 ></div>
                 <Compass
                     v-if="shouldDisplayCompass"
+                    :compass-rose-sizing-classes="compassRoseSizingClasses"
                     :image="focusedImage"
+                    :natural-aspect-ratio="focusedImageNaturalAspectRatio"
                     :sized-image-dimensions="sizedImageDimensions"
                 />
             </div>
@@ -170,7 +172,7 @@
         >
             <ImageThumbnail
                 v-for="(image, index) in imageHistory"
-                :key="`${image.thumbnailUrl || image.url}-${image.time}-${index}`"
+                :key="image.url + image.time"
                 :image="image"
                 :active="focusedImageIndex === index"
                 :selected="focusedImageIndex === index && isPaused"
@@ -224,9 +226,6 @@ const SHOW_THUMBS_FULLSIZE_THRESHOLD_HEIGHT = 600;
 
 const IMAGE_CONTAINER_BORDER_WIDTH = 1;
 
-const DEFAULT_IMAGE_PAN_ALT_TEXT = "Alt drag to pan";
-const LINUX_IMAGE_PAN_ALT_TEXT = `Ctrl+${DEFAULT_IMAGE_PAN_ALT_TEXT}`;
-
 export default {
     name: 'ImageryView',
     components: {
@@ -299,6 +298,18 @@ export default {
         };
     },
     computed: {
+        compassRoseSizingClasses() {
+            let compassRoseSizingClasses = '';
+            if (this.sizedImageWidth < 300) {
+                compassRoseSizingClasses = '--rose-small --rose-min';
+            } else if (this.sizedImageWidth < 500) {
+                compassRoseSizingClasses = '--rose-small';
+            } else if (this.sizedImageWidth > 1000) {
+                compassRoseSizingClasses = '--rose-max';
+            }
+
+            return compassRoseSizingClasses;
+        },
         displayThumbnails() {
             return (
                 this.forceShowThumbnails
@@ -310,8 +321,8 @@ export default {
         },
         focusImageStyles() {
             return {
-                filter: `brightness(${this.filters.brightness}%) contrast(${this.filters.contrast}%)`,
-                backgroundImage:
+                'filter': `brightness(${this.filters.brightness}%) contrast(${this.filters.contrast}%)`,
+                'background-image':
                     `${this.imageUrl ? (
                         `url(${this.imageUrl}),
                             repeating-linear-gradient(
@@ -322,10 +333,10 @@ export default {
                                 rgba(125,125,125,.2) 8px
                             )`
                     ) : ''}`,
-                transform: `scale(${this.zoomFactor}) translate(${this.imageTranslateX}px, ${this.imageTranslateY}px)`,
-                transition: `${!this.pan && this.animateZoom ? 'transform 250ms ease-in' : 'initial'}`,
-                width: `${this.sizedImageWidth}px`,
-                height: `${this.sizedImageHeight}px`
+                'transform': `scale(${this.zoomFactor}) translate(${this.imageTranslateX}px, ${this.imageTranslateY}px)`,
+                'transition': `${!this.pan && this.animateZoom ? 'transform 250ms ease-in' : 'initial'}`,
+                'width': `${this.sizedImageWidth}px`,
+                'height': `${this.sizedImageHeight}px`
             };
         },
         time() {
@@ -336,12 +347,11 @@ export default {
         },
         imageWrapperStyle() {
             return {
-                cursorZoomIn: this.cursorStates.showCursorZoomIn,
-                cursorZoomOut: this.cursorStates.showCursorZoomOut,
-                pannable: this.cursorStates.isPannable,
-                paused: this.isPaused && !this.isFixed,
-                unsynced: this.isPaused && !this.isFixed,
-                stale: false
+                'cursor-zoom-in': this.cursorStates.showCursorZoomIn,
+                'cursor-zoom-out': this.cursorStates.showCursorZoomOut,
+                'pannable': this.cursorStates.isPannable,
+                'paused unnsynced': this.isPaused && !this.isFixed,
+                'stale': false
             };
         },
         isImageNew() {
@@ -422,6 +432,7 @@ export default {
         shouldDisplayCompass() {
             const imageHeightAndWidth = this.sizedImageHeight !== 0
                 && this.sizedImageWidth !== 0;
+
             const display = this.focusedImage !== undefined
                 && this.focusedImageNaturalAspectRatio !== undefined
                 && this.imageContainerWidth !== undefined
@@ -429,12 +440,8 @@ export default {
                 && imageHeightAndWidth
                 && this.zoomFactor === 1
                 && this.imagePanned !== true;
-            const hasHeading = this.focusedImage?.heading !== undefined;
-            const hasCameraAngleOfView = this.focusedImage?.transformations?.cameraAngleOfView > 0;
 
-            return display
-                && hasCameraAngleOfView
-                && hasHeading;
+            return display;
         },
         isSpacecraftPositionFresh() {
             let isFresh = undefined;
@@ -521,10 +528,10 @@ export default {
             const navigator = window.navigator.userAgent;
 
             if (regexLinux.test(navigator)) {
-                return LINUX_IMAGE_PAN_ALT_TEXT;
+                return 'Ctrl+Alt drag to pan';
             }
 
-            return DEFAULT_IMAGE_PAN_ALT_TEXT;
+            return 'Alt drag to pan';
         },
         viewableArea() {
             if (this.zoomFactor === 1) {
@@ -584,34 +591,11 @@ export default {
             },
             deep: true
         },
-        focusedImage: {
-            handler(newImage, oldImage) {
-                const newTime = newImage?.time;
-                const oldTime = oldImage?.time;
-                const newUrl = newImage?.url;
-                const oldUrl = oldImage?.url;
-
-                // Skip if it's all falsy
-                if (!newTime && !oldTime && !newUrl && !oldUrl) {
-                    return;
-                }
-
-                // Skip if it's the same image
-                if (newTime === oldTime && newUrl === oldUrl) {
-                    return;
-                }
-
-                // Update image duration and reset age CSS
-                this.trackDuration();
-                this.resetAgeCSS();
-
-                // Reset image dimensions and calculate new dimensions
-                // on new image load
-                this.getImageNaturalDimensions();
-
-                // Get the related telemetry for the new image
-                this.updateRelatedTelemetryForFocusedImage();
-            }
+        focusedImageIndex() {
+            this.trackDuration();
+            this.resetAgeCSS();
+            this.updateRelatedTelemetryForFocusedImage();
+            this.getImageNaturalDimensions();
         },
         bounds() {
             this.scrollHandler();
@@ -642,7 +626,6 @@ export default {
         this.spacecraftOrientationKeys = ['heading'];
         this.cameraKeys = ['cameraPan', 'cameraTilt'];
         this.sunKeys = ['sunOrientation'];
-        this.transformationsKeys = ['transformations'];
 
         // related telemetry
         await this.initializeRelatedTelemetry();
@@ -708,9 +691,9 @@ export default {
         },
         getVisibleLayerStyles(layer) {
             return {
-                backgroundImage: `url(${layer.source})`,
-                transform: `scale(${this.zoomFactor}) translate(${this.imageTranslateX}px, ${this.imageTranslateY}px)`,
-                transition: `${!this.pan && this.animateZoom ? 'transform 250ms ease-in' : 'initial'}`
+                'background-image': `url(${layer.source})`,
+                'transform': `scale(${this.zoomFactor}) translate(${this.imageTranslateX}px, ${this.imageTranslateY}px)`,
+                'transition': `${!this.pan && this.animateZoom ? 'transform 250ms ease-in' : 'initial'}`
             };
         },
         setTimeContext() {
@@ -738,20 +721,14 @@ export default {
                 && visibleActions.find(action => action.key === 'large.view');
 
             if (viewLargeAction && viewLargeAction.appliesTo(this.objectPath, this.currentView)) {
-                viewLargeAction.invoke(this.objectPath, this.currentView);
+                viewLargeAction.onItemClicked();
             }
         },
         async initializeRelatedTelemetry() {
             this.relatedTelemetry = new RelatedTelemetry(
                 this.openmct,
                 this.domainObject,
-                [
-                    ...this.spacecraftPositionKeys,
-                    ...this.spacecraftOrientationKeys,
-                    ...this.cameraKeys,
-                    ...this.sunKeys,
-                    ...this.transformationsKeys
-                ]
+                [...this.spacecraftPositionKeys, ...this.spacecraftOrientationKeys, ...this.cameraKeys, ...this.sunKeys]
             );
 
             if (this.relatedTelemetry.hasRelatedTelemetry) {
@@ -788,30 +765,26 @@ export default {
             return mostRecent[valueKey];
         },
         loadVisibleLayers() {
-            const layersMetadata = this.imageMetadataValue.layers;
-            if (!layersMetadata) {
-                return;
-            }
-
-            this.layers = layersMetadata;
-            if (this.domainObject.configuration) {
-                const persistedLayers = this.domainObject.configuration.layers;
-                if (!persistedLayers) {
-                    return;
+            const metaDataValues = this.metadata.valuesForHints(['image'])[0];
+            this.imageFormat = this.openmct.telemetry.getValueFormatter(metaDataValues);
+            let layersMetadata = metaDataValues.layers;
+            if (layersMetadata) {
+                this.layers = layersMetadata;
+                if (this.domainObject.configuration) {
+                    let persistedLayers = this.domainObject.configuration.layers;
+                    layersMetadata.forEach((layer) => {
+                        const persistedLayer = persistedLayers.find(object => object.name === layer.name);
+                        if (persistedLayer) {
+                            layer.visible = persistedLayer.visible === true;
+                        }
+                    });
+                    this.visibleLayers = this.layers.filter(layer => layer.visible);
+                } else {
+                    this.visibleLayers = [];
+                    this.layers.forEach((layer) => {
+                        layer.visible = false;
+                    });
                 }
-
-                layersMetadata.forEach((layer) => {
-                    const persistedLayer = persistedLayers.find(object => object.name === layer.name);
-                    if (persistedLayer) {
-                        layer.visible = persistedLayer.visible === true;
-                    }
-                });
-                this.visibleLayers = this.layers.filter(layer => layer.visible);
-            } else {
-                this.visibleLayers = [];
-                this.layers.forEach((layer) => {
-                    layer.visible = false;
-                });
             }
         },
         persistVisibleLayers() {
@@ -864,15 +837,6 @@ export default {
                     this.$set(this.focusedImageRelatedTelemetry, key, value);
                 }
             }
-
-            // set configuration for compass
-            this.transformationsKeys.forEach(key => {
-                const transformations = this.relatedTelemetry[key];
-
-                if (transformations !== undefined) {
-                    this.$set(this.imageHistory[this.focusedImageIndex], key, transformations);
-                }
-            });
         },
         trackLatestRelatedTelemetry() {
             [...this.spacecraftPositionKeys, ...this.spacecraftOrientationKeys, ...this.cameraKeys, ...this.sunKeys].forEach(key => {