Merge branch 'master' into user-attribution

Merge'n

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 executors:
   pw-focal-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.0-focal
+      - image: mcr.microsoft.com/playwright:v1.25.2-focal
     environment:
       NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
       PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps

.github/dependabot.yml

@@ -13,17 +13,11 @@ updates:
       - "pr:daveit"
       - "pr:platform"
     ignore:
-      #We have to source the playwright container which is not detected by Dependabot
-      - dependency-name: "@playwright/test"
-      - dependency-name: "playwright-core"
-      #Lots of noise in these type patch releases.
-      - dependency-name: "@babel/eslint-parser"
+      - dependency-name: "@playwright/test" #We have to source the playwright container which is not detected by Dependabot
+      - dependency-name: "playwright-core" #We have to source the playwright container which is not detected by Dependabot
+      - dependency-name: "@babel/eslint-parser" #Lots of noise in these type patch releases.
         update-types: ["version-update:semver-patch"] 
-      - dependency-name: "eslint-plugin-vue"
-        update-types: ["version-update:semver-patch"]
-      - dependency-name: "babel-loader"
-        update-types: ["version-update:semver-patch"]
-      - dependency-name: "sinon"
+      - dependency-name: "eslint-plugin-vue" #Lots of noise in these type patch releases.  
         update-types: ["version-update:semver-patch"]
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/e2e-couchdb.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
-      - run: npx playwright@1.29.0 install
+      - run: npx playwright@1.25.2 install
       - run: npm install
       - run: sh src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
       - run: npm run test:e2e:couchdb

.github/workflows/e2e-pr.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
-      - run: npx playwright@1.29.0 install
+      - run: npx playwright@1.25.2 install
       - run: npx playwright install chrome-beta
       - run: npm install
       - run: npm run test:e2e:full

.github/workflows/npm-prerelease.yml

@@ -16,11 +16,7 @@ jobs:
         with:
           node-version: 16
       - run: npm install
-      - run: |
-          echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
-          npm whoami
-          npm publish --access=public --tag unstable openmct
-      # - run: npm test
+      - run: npm test
 
   publish-npm-prerelease:
     needs: build
@@ -32,6 +28,6 @@ jobs:
           node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm install
-      - run: npm publish --access=public --tag unstable
+      - run: npm publish --access public --tag unstable
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.npmignore

@@ -21,10 +21,4 @@
 !copyright-notice.html
 !index.html
 !openmct.js
-!SECURITY.md
-
-# Add e2e tests to npm package
-!/e2e/**/*
-
-# ... except our test-data folder files.
-/e2e/test-data/*.json
+!SECURITY.md

.webpack/webpack.common.js

@@ -1,176 +0,0 @@
-/* global __dirname module */
-
-/*
-This is the OpenMCT common webpack file. It is imported by the other three webpack configurations:
- - webpack.prod.js - the production configuration for OpenMCT (default)
- - webpack.dev.js - the development configuration for OpenMCT
- - webpack.coverage.js - imports webpack.dev.js and adds code coverage
-There are separate npm scripts to use these configurations, though simply running `npm install`
-will use the default production configuration.
-*/
-const path = require("path");
-const packageDefinition = require("../package.json");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const webpack = require("webpack");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-
-const { VueLoaderPlugin } = require("vue-loader");
-let gitRevision = "error-retrieving-revision";
-let gitBranch = "error-retrieving-branch";
-
-try {
-    gitRevision = require("child_process")
-        .execSync("git rev-parse HEAD")
-        .toString()
-        .trim();
-    gitBranch = require("child_process")
-        .execSync("git rev-parse --abbrev-ref HEAD")
-        .toString()
-        .trim();
-} catch (err) {
-    console.warn(err);
-}
-
-const projectRootDir = path.resolve(__dirname, "..");
-
-/** @type {import('webpack').Configuration} */
-const config = {
-    context: projectRootDir,
-    entry: {
-        openmct: "./openmct.js",
-        generatorWorker: "./example/generator/generatorWorker.js",
-        couchDBChangesFeed:
-            "./src/plugins/persistence/couch/CouchChangesFeed.js",
-        inMemorySearchWorker: "./src/api/objects/InMemorySearchWorker.js",
-        espressoTheme: "./src/plugins/themes/espresso-theme.scss",
-        snowTheme: "./src/plugins/themes/snow-theme.scss"
-    },
-    output: {
-        globalObject: "this",
-        filename: "[name].js",
-        path: path.resolve(projectRootDir, "dist"),
-        library: "openmct",
-        libraryTarget: "umd",
-        publicPath: "",
-        hashFunction: "xxhash64",
-        clean: true
-    },
-    resolve: {
-        alias: {
-            "@": path.join(projectRootDir, "src"),
-            legacyRegistry: path.join(projectRootDir, "src/legacyRegistry"),
-            saveAs: "file-saver/src/FileSaver.js",
-            csv: "comma-separated-values",
-            EventEmitter: "eventemitter3",
-            bourbon: "bourbon.scss",
-            "plotly-basic": "plotly.js-basic-dist",
-            "plotly-gl2d": "plotly.js-gl2d-dist",
-            "d3-scale": path.join(
-                projectRootDir,
-                "node_modules/d3-scale/dist/d3-scale.min.js"
-            ),
-            printj: path.join(
-                projectRootDir,
-                "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"),
-            objectUtils: path.join(
-                projectRootDir,
-                "src/api/objects/object-utils.js"
-            ),
-            "kdbush": path.join(projectRootDir, "node_modules/kdbush/kdbush.min.js"),
-            utils: path.join(projectRootDir, "src/utils")
-        }
-    },
-    plugins: [
-        new webpack.DefinePlugin({
-            __OPENMCT_VERSION__: `'${packageDefinition.version}'`,
-            __OPENMCT_BUILD_DATE__: `'${new Date()}'`,
-            __OPENMCT_REVISION__: `'${gitRevision}'`,
-            __OPENMCT_BUILD_BRANCH__: `'${gitBranch}'`
-        }),
-        new VueLoaderPlugin(),
-        new CopyWebpackPlugin({
-            patterns: [
-                {
-                    from: "src/images/favicons",
-                    to: "favicons"
-                },
-                {
-                    from: "./index.html",
-                    transform: function (content) {
-                        return content.toString().replace(/dist\//g, "");
-                    }
-                },
-                {
-                    from: "src/plugins/imagery/layers",
-                    to: "imagery"
-                }
-            ]
-        }),
-        new MiniCssExtractPlugin({
-            filename: "[name].css",
-            chunkFilename: "[name].css"
-        })
-    ],
-    module: {
-        rules: [
-            {
-                test: /\.(sc|sa|c)ss$/,
-                use: [
-                    MiniCssExtractPlugin.loader,
-                    {
-                        loader: "css-loader"
-                    },
-                    {
-                        loader: "resolve-url-loader"
-                    },
-                    {
-                        loader: "sass-loader",
-                        options: { sourceMap: true }
-                    }
-                ]
-            },
-            {
-                test: /\.vue$/,
-                use: "vue-loader"
-            },
-            {
-                test: /\.html$/,
-                type: "asset/source"
-            },
-            {
-                test: /\.(jpg|jpeg|png|svg)$/,
-                type: "asset/resource",
-                generator: {
-                    filename: "images/[name][ext]"
-                }
-            },
-            {
-                test: /\.ico$/,
-                type: "asset/resource",
-                generator: {
-                    filename: "icons/[name][ext]"
-                }
-            },
-            {
-                test: /\.(woff|woff2?|eot|ttf)$/,
-                type: "asset/resource",
-                generator: {
-                    filename: "fonts/[name][ext]"
-                }
-            }
-        ]
-    },
-    stats: "errors-warnings",
-    performance: {
-        // We should eventually consider chunking to decrease
-        // these values
-        maxEntrypointSize: 27000000,
-        maxAssetSize: 27000000
-    }
-};
-
-module.exports = config;

CONTRIBUTING.md

@@ -10,7 +10,7 @@ accept changes from external contributors.
 
 The short version:
 
-1. Write your contribution or describe your idea in the form of a [GitHub issue](https://github.com/nasa/openmct/issues/new/choose) or [start a GitHub discussion](https://github.com/nasa/openmct/discussions).
+1. Write your contribution or describe your idea in the form of an [GitHub issue](https://github.com/nasa/openmct/issues/new/choose) or [Starting a GitHub Discussion](https://github.com/nasa/openmct/discussions)
 2. Make sure your contribution meets code, test, and commit message
    standards as described below.
 3. Submit a pull request from a topic branch back to `master`. Include a check

README.md

@@ -6,8 +6,10 @@ Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting S
 
 Once you've created something amazing with Open MCT, showcase your work in our GitHub Discussions [Show and Tell](https://github.com/nasa/openmct/discussions/categories/show-and-tell) section. We love seeing unique and wonderful implementations of Open MCT!
 
-![Screen Shot 2022-11-23 at 9 51 36 AM](https://user-images.githubusercontent.com/4215777/203617422-4d912bfc-766f-4074-8324-409d9bbe7c05.png)
+## See Open MCT in Action
 
+Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).
+![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg)
 
 ## Building and Running Open MCT Locally
 

e2e/README.md

@@ -8,7 +8,7 @@ This document is designed to capture on the What, Why, and How's of writing and
 
 1. [Getting Started](#getting-started)
 2. [Types of Testing](#types-of-e2e-testing)
-3. [Architecture](#test-architecture-and-ci)
+3. [Architecture](#architecture)
 
 ## Getting Started
 
@@ -89,7 +89,7 @@ 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
 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
@@ -97,24 +97,9 @@ 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
 
@@ -291,36 +276,14 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p
   - Leverage `await page.goto('./', { waitUntil: 'networkidle' });`
   - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.
 
-### How to write a great test (WIP)
-
-- Use our [App Actions](./appActions.js) for performing common actions whenever applicable.
-- If you create an object outside of using the `createDomainObjectWithDefaults` App Action, make sure to fill in the 'Notes' section of your object with `page.testNotes`:
-
-  ```js
-  // Fill the "Notes" section with information about the
-  // currently running test and its project.
-  const { testNotes } = page;
-  const notesInput = page.locator('form[name="mctForm"] #notes-textarea');
-  await notesInput.fill(testNotes);
-  ```
+### How to write a great test (TODO)
 
 #### How to write a great visual test (TODO)
 
-#### How to write a great network test
-
-- Where possible, it is best to mock out third-party network activity to ensure we are testing application behavior of Open MCT.
-- It is best to be as specific as possible about the expected network request/response structures in creating your mocks.
-- Make sure to only mock requests which are relevant to the specific behavior being tested.
-- Where possible, network requests and responses should be treated in an order-agnostic manner, as the order in which certain requests/responses happen is dynamic and subject to change.
-
-Some examples of mocking network responses in regards to CouchDB can be found in our [couchdb.e2e.spec.js](./tests/functional/couchdb.e2e.spec.js) test file.
-
 ### Best Practices
 
 For now, our best practices exist as self-tested, living documentation in our [exampleTemplate.e2e.spec.js](./tests/framework/exampleTemplate.e2e.spec.js) file.
 
-For best practices with regards to mocking network responses, see our [couchdb.e2e.spec.js](./tests/functional/couchdb.e2e.spec.js) file.
-
 ### Tips & Tricks (TODO)
 
 The following contains a list of tips and tricks which don't exactly fit into a FAQ or Best Practices doc.
@@ -415,23 +378,3 @@ A single e2e test in Open MCT is extended to run:
 - Tests won't start because 'Error: <http://localhost:8080/># is already used...'
 This error will appear when running the tests locally. Sometimes, the webserver is left in an orphaned state and needs to be cleaned up. To clear up the orphaned webserver, execute the following from your Terminal:
 ```lsof -n -i4TCP:8080 | awk '{print$2}' | tail -1 | xargs kill -9```
-
-### Upgrading Playwright
-
-In order to upgrade from one version of Playwright to another, the version should be updated in several places in both `openmct` and `openmct-yamcs` repos. An easy way to identify these locations is to search for the current version in all files and find/replace.
-
-For reference, all of the locations where the version should be updated are listed below:
-
-#### **In `openmct`:**
-
-- `package.json`
-  - Both packages `@playwright/test` and `playwright-core` should be updated to the same target version.
-- `.circleci/config.yml`
-- `.github/workflows/e2e-couchdb.yml`
-- `.github/workflows/e2e-pr.yml`
-
-#### **In `openmct-yamcs`:**
-
-- `package.json`
-  - `@playwright/test` should be updated to the target version.
-- `.github/workflows/yamcs-quickstart-e2e.yml`

e2e/appActions.js

@@ -45,16 +45,7 @@
  * @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;
 
 /**
  * This common function creates a domain object with the default options. It is the preferred way of creating objects
@@ -65,10 +56,6 @@ const genUuid = require('uuid').v4;
  * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
  */
 async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine' }) {
-    if (!name) {
-        name = `${type}:${genUuid()}`;
-    }
-
     const parentUrl = await getHashUrlToDomainObject(page, parent);
 
     // Navigate to the parent object. This is necessary to create the object
@@ -80,18 +67,13 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
     await page.click('button:has-text("Create")');
 
     // Click the object specified by 'type'
-    await page.click(`li[role='menuitem']:text("${type}")`);
+    await page.click(`li:text("${type}")`);
 
     // Modify the name input field of the domain object to accept 'name'
-    const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-    await nameInput.fill("");
-    await nameInput.fill(name);
-
-    if (page.testNotes) {
-        // Fill the "Notes" section with information about the
-        // currently running test and its project.
-        const notesInput = page.locator('form[name="mctForm"] #notes-textarea');
-        await notesInput.fill(page.testNotes);
+    if (name) {
+        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+        await nameInput.fill("");
+        await nameInput.fill(name);
     }
 
     // Click OK button and wait for Navigate event
@@ -114,39 +96,18 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
     }
 
     return {
-        name,
-        uuid,
+        name: name || `Unnamed ${type}`,
+        uuid: uuid,
         url: objectUrl
     };
 }
 
-/**
- * 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 +181,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 +323,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/helper/notebookUtils.js

@@ -20,8 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { createDomainObjectWithDefaults } = require('../appActions');
-
 const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
 
 /**
@@ -40,17 +38,24 @@ async function enterTextEntry(page, text) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-async function dragAndDropEmbed(page, notebookObject) {
-    // Create example telemetry object
-    const swg = await createDomainObjectWithDefaults(page, {
-        type: "Sine Wave Generator"
-    });
-    // Navigate to notebook
-    await page.goto(notebookObject.url);
-    // Expand the tree to reveal the notebook
-    await page.click('button[title="Show selected item in tree"]');
-    // Drag and drop the SWG into the notebook
-    await page.dragAndDrop(`text=${swg.name}`, NOTEBOOK_DROP_AREA);
+async function dragAndDropEmbed(page, myItemsFolderName) {
+    // Click button:has-text("Create")
+    await page.locator('button:has-text("Create")').click();
+    // Click li:has-text("Sine Wave Generator")
+    await page.locator('li:has-text("Sine Wave Generator")').click();
+    // Click form[name="mctForm"] >> text=My Items
+    await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
+    // Click text=OK
+    await page.locator('text=OK').click();
+    // Click text=Open MCT My Items >> span >> nth=3
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+    // Click text=Unnamed CUSTOM_NAME
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('text=Unnamed CUSTOM_NAME').click()
+    ]);
+
+    await page.dragAndDrop('text=UNNAMED SINE WAVE GENERATOR', NOTEBOOK_DROP_AREA);
 }
 
 // eslint-disable-next-line no-undef

e2e/pluginFixtures.js

@@ -126,21 +126,13 @@ exports.test = test.extend({
     // This should follow in the Project's configuration. Can be set to 'snow' in playwright config.js
     theme: [theme, { option: true }],
     // eslint-disable-next-line no-shadow
-    page: async ({ page, theme }, use, testInfo) => {
+    page: async ({ page, theme }, use) => {
         // eslint-disable-next-line playwright/no-conditional-in-test
         if (theme === 'snow') {
             //inject snow theme
             await page.addInitScript({ path: path.join(__dirname, './helper', './useSnowTheme.js') });
         }
 
-        // Attach info about the currently running test and its project.
-        // This will be used by appActions to fill in the created
-        // domain object's notes.
-        page.testNotes = [
-            `${testInfo.titlePath.join('\n')}`,
-            `${testInfo.project.name}`
-        ].join('\n');
-
         await use(page);
     },
     myItemsFolderName: [myItemsFolderName, { option: true }],
@@ -148,5 +140,22 @@ exports.test = test.extend({
     openmctConfig: async ({ myItemsFolderName }, use) => {
         await use({ myItemsFolderName });
     }
+    // objectCreateOptions: [objectCreateOptions, {option: true}],
+    // eslint-disable-next-line no-shadow
+    // domainObject: [async ({ page, objectCreateOptions }, use) => {
+    //     // FIXME: This is a false-positive caused by a bug in the eslint-plugin-playwright rule.
+    //     // eslint-disable-next-line playwright/no-conditional-in-test
+    //     if (objectCreateOptions === null) {
+    //         await use(page);
+
+    //         return;
+    //     }
+
+    //     //Go to baseURL
+    //     await page.goto('./', { waitUntil: 'networkidle' });
+
+    //     const uuid = await getOrCreateDomainObject(page, objectCreateOptions);
+    //     await use({ uuid });
+    // }, { auto: true }]
 });
 exports.expect = expect;

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

@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test, expect } = require('../../pluginFixtures.js');
-const { createDomainObjectWithDefaults, createNotification, expandEntireTree } = require('../../appActions.js');
+const { test, expect } = require('../../baseFixtures.js');
+const { createDomainObjectWithDefaults } = require('../../appActions.js');
 
 test.describe('AppActions', () => {
     test('createDomainObjectsWithDefaults', async ({ page }) => {
@@ -49,12 +49,12 @@ test.describe('AppActions', () => {
                 parent: e2eFolder.uuid
             });
 
-            await page.goto(timer1.url);
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText(timer1.name);
-            await page.goto(timer2.url);
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText(timer2.name);
-            await page.goto(timer3.url);
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText(timer3.name);
+            await page.goto(timer1.url, { waitUntil: 'networkidle' });
+            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Timer Foo');
+            await page.goto(timer2.url, { waitUntil: 'networkidle' });
+            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Timer Bar');
+            await page.goto(timer3.url, { waitUntil: 'networkidle' });
+            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Timer Baz');
         });
 
         await test.step('Create multiple nested objects in a row', async () => {
@@ -73,93 +73,16 @@ test.describe('AppActions', () => {
                 name: 'Folder Baz',
                 parent: folder2.uuid
             });
-            await page.goto(folder1.url);
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText(folder1.name);
-            await page.goto(folder2.url);
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText(folder2.name);
-            await page.goto(folder3.url);
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText(folder3.name);
+            await page.goto(folder1.url, { waitUntil: 'networkidle' });
+            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Folder Foo');
+            await page.goto(folder2.url, { waitUntil: 'networkidle' });
+            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Folder Bar');
+            await page.goto(folder3.url, { waitUntil: 'networkidle' });
+            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Folder Baz');
 
             expect(folder1.url).toBe(`${e2eFolder.url}/${folder1.uuid}`);
             expect(folder2.url).toBe(`${e2eFolder.url}/${folder1.uuid}/${folder2.uuid}`);
             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/framework/exampleTemplate.e2e.spec.js

@@ -45,7 +45,7 @@
 */
 
 // Structure: Some standard Imports. Please update the required pathing.
-const { test, expect } = require('../../pluginFixtures');
+const { test, expect } = require('../../baseFixtures');
 const { createDomainObjectWithDefaults } = require('../../appActions');
 
 /**
@@ -144,5 +144,5 @@ async function renameTimerFrom3DotMenu(page, timerUrl, newNameForTimer) {
     await page.locator('text=Properties Title Notes >> input[type="text"]').fill(newNameForTimer);
 
     // Click Ok button to Save
-    await page.locator('button:has-text("OK")').click();
+    await page.locator('text=OK').click();
 }

e2e/tests/framework/generateVisualTestData.e2e.spec.js

@@ -43,14 +43,14 @@ test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
     await page.locator('button:has-text("Create")').click();
 
     // add sine wave generator with defaults
-    await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
+    await page.locator('li:has-text("Sine Wave Generator")').click();
 
     //Add a 5000 ms Delay
     await page.locator('[aria-label="Loading Delay \\(ms\\)"]').fill('5000');
 
     await Promise.all([
         page.waitForNavigation(),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -58,7 +58,7 @@ test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
     // focus the overlay plot
     await page.goto(overlayPlot.url);
 
-    await expect(page.locator('.l-browse-bar__object-name')).toContainText(overlayPlot.name);
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Overlay Plot');
     //Save localStorage for future test execution
     await context.storageState({ path: './e2e/test-data/VisualTestData_storage.json' });
 });

e2e/tests/functional/couchdb.e2e.spec.js

@@ -25,9 +25,9 @@
 *
 */
 
-const { test, expect } = require('../../pluginFixtures');
+const { test, expect } = require('../../baseFixtures');
 
-test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
+test.describe("CouchDB Status Indicator @couchdb", () => {
     test.use({ failOnConsoleError: false });
     //TODO BeforeAll Verify CouchDB Connectivity with APIContext
     test('Shows green if connected', async ({ page }) => {
@@ -71,41 +71,38 @@ test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
     });
 });
 
-test.describe("CouchDB initialization with mocked responses @couchdb", () => {
+test.describe("CouchDB initialization @couchdb", () => {
     test.use({ failOnConsoleError: false });
     test("'My Items' folder is created if it doesn't exist", async ({ page }) => {
-        const mockedMissingObjectResponsefromCouchDB = {
-            status: 404,
-            contentType: 'application/json',
-            body: JSON.stringify({})
-        };
+        // Store any relevant PUT requests that happen on the page
+        const createMineFolderRequests = [];
+        page.on('request', req => {
+            // eslint-disable-next-line playwright/no-conditional-in-test
+            if (req.method() === 'PUT' && req.url().endsWith('openmct/mine')) {
+                createMineFolderRequests.push(req);
+            }
+        });
 
-        // Override the first request to GET openmct/mine to return a 404.
-        // This simulates the case of starting Open MCT with a fresh database
-        // and no "My Items" folder created yet.
-        await page.route('**/mine', route => {
-            route.fulfill(mockedMissingObjectResponsefromCouchDB);
+        // Override the first request to GET openmct/mine to return a 404
+        await page.route('**/openmct/mine', route => {
+            route.fulfill({
+                status: 404,
+                contentType: 'application/json',
+                body: JSON.stringify({})
+            });
         }, { times: 1 });
 
-        // Set up promise to verify that a PUT request to create "My Items"
-        // folder was made.
-        const putMineFolderRequest = page.waitForRequest(req =>
-            req.url().endsWith('/mine')
-            && req.method() === 'PUT');
-
-        // Set up promise to verify that a GET request to retrieve "My Items"
-        // folder was made.
-        const getMineFolderRequest = page.waitForRequest(req =>
-            req.url().endsWith('/mine')
-            && req.method() === 'GET');
-
-        // Go to baseURL.
+        // Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        // Wait for both requests to resolve.
-        await Promise.all([
-            putMineFolderRequest,
-            getMineFolderRequest
-        ]);
+        // Verify that error banner is displayed
+        const bannerMessage = await page.locator('.c-message-banner__message').innerText();
+        expect(bannerMessage).toEqual('Failed to retrieve object mine');
+
+        // Verify that a PUT request to create "My Items" folder was made
+        await expect.poll(() => createMineFolderRequests.length, {
+            message: 'Verify that PUT request to create "mine" folder was made',
+            timeout: 1000
+        }).toBeGreaterThanOrEqual(1);
     });
 });

e2e/tests/functional/example/eventGenerator.e2e.spec.js

@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding the example event generator.
 */
 
-const { test, expect } = require('../../../pluginFixtures');
+const { test, expect } = require('../../../baseFixtures');
 const { createDomainObjectWithDefaults } = require('../../../appActions');
 
 test.describe('Example Event Generator CRUD Operations', () => {

e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js

@@ -96,7 +96,7 @@ test.describe('Sine Wave Generator', () => {
         //Click text=OK
         await Promise.all([
             page.waitForNavigation(),
-            page.click('button:has-text("OK")')
+            page.click('text=OK')
         ]);
 
         // Verify that the Sine Wave Generator is displayed and correct

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

@@ -24,14 +24,10 @@
 This test suite is dedicated to tests which verify form functionality in isolation
 */
 
-const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-const genUuid = require('uuid').v4;
+const { test, expect } = require('../../baseFixtures');
 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 }) => {
@@ -47,7 +43,7 @@ test.describe('Form Validation Behavior', () => {
         await page.press('text=Properties Title Notes >> input[type="text"]', 'Tab');
 
         //Required Field Form Validation
-        await expect(page.locator('button:has-text("OK")')).toBeDisabled();
+        await expect(page.locator('text=OK')).toBeDisabled();
         await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(/invalid/);
 
         //Correct Form Validation for missing title and trigger validation with 'Tab'
@@ -56,13 +52,13 @@ test.describe('Form Validation Behavior', () => {
         await page.press('text=Properties Title Notes >> input[type="text"]', 'Tab');
 
         //Required Field Form Validation is corrected
-        await expect(page.locator('button:has-text("OK")')).toBeEnabled();
+        await expect(page.locator('text=OK')).toBeEnabled();
         await expect(page.locator('.c-form-row__state-indicator').first()).not.toHaveClass(/invalid/);
 
         //Finish Creating Domain Object
         await Promise.all([
             page.waitForNavigation(),
-            page.click('button:has-text("OK")')
+            page.click('text=OK')
         ]);
 
         //Verify that the Domain Object has been created with the corrected title property
@@ -70,41 +66,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 }) => {
@@ -130,146 +91,6 @@ test.describe('Persistence operations @addInit', () => {
     });
 });
 
-test.describe('Persistence operations @couchdb', () => {
-    test.use({ failOnConsoleError: false });
-    test('Editing object properties should generate a single persistence operation', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5616'
-        });
-
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create a new 'Clock' object with default settings
-        const clock = await createDomainObjectWithDefaults(page, {
-            type: 'Clock'
-        });
-
-        // Count all persistence operations (PUT requests) for this specific object
-        let putRequestCount = 0;
-        page.on('request', req => {
-            if (req.method() === 'PUT' && req.url().endsWith(clock.uuid)) {
-                putRequestCount += 1;
-            }
-        });
-
-        // Open the edit form for the clock object
-        await page.click('button[title="More options"]');
-        await page.click('li[title="Edit properties of this object."]');
-
-        // Modify the display format from default 12hr -> 24hr and click 'Save'
-        await page.locator('select[aria-label="12 or 24 hour clock"]').selectOption({ value: 'clock24' });
-        await page.click('button[aria-label="Save"]');
-
-        await expect.poll(() => putRequestCount, {
-            message: 'Verify a single PUT request was made to persist the object',
-            timeout: 1000
-        }).toEqual(1);
-    });
-    test('Can create an object after a conflict error @couchdb @2p', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5982'
-        });
-
-        const page2 = await page.context().newPage();
-
-        // Both pages: Go to baseURL
-        await Promise.all([
-            page.goto('./', { waitUntil: 'networkidle' }),
-            page2.goto('./', { waitUntil: 'networkidle' })
-        ]);
-
-        // Both pages: Click the Create button
-        await Promise.all([
-            page.click('button:has-text("Create")'),
-            page2.click('button:has-text("Create")')
-        ]);
-
-        // Both pages: Click "Clock" in the Create menu
-        await Promise.all([
-            page.click(`li[role='menuitem']:text("Clock")`),
-            page2.click(`li[role='menuitem']:text("Clock")`)
-        ]);
-
-        // Generate unique names for both objects
-        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-        const nameInput2 = page2.locator('form[name="mctForm"] .first input[type="text"]');
-
-        // Both pages: Fill in the 'Name' form field.
-        await Promise.all([
-            nameInput.fill(""),
-            nameInput.fill(`Clock:${genUuid()}`),
-            nameInput2.fill(""),
-            nameInput2.fill(`Clock:${genUuid()}`)
-        ]);
-
-        // Both pages: Fill the "Notes" section with information about the
-        // currently running test and its project.
-        const testNotes = page.testNotes;
-        const notesInput = page.locator('form[name="mctForm"] #notes-textarea');
-        const notesInput2 = page2.locator('form[name="mctForm"] #notes-textarea');
-        await Promise.all([
-            notesInput.fill(testNotes),
-            notesInput2.fill(testNotes)
-        ]);
-
-        // Page 2: Click "OK" to create the domain object and wait for navigation.
-        // This will update the composition of the parent folder, setting the
-        // conditions for a conflict error from the first page.
-        await Promise.all([
-            page2.waitForLoadState(),
-            page2.click('[aria-label="Save"]'),
-            // Wait for Save Banner to appear
-            page2.waitForSelector('.c-message-banner__message')
-        ]);
-
-        // Close Page 2, we're done with it.
-        await page2.close();
-
-        // Page 1: Click "OK" to create the domain object and wait for navigation.
-        // This will trigger a conflict error upon attempting to update
-        // the composition of the parent folder.
-        await Promise.all([
-            page.waitForLoadState(),
-            page.click('[aria-label="Save"]'),
-            // Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-
-        // Page 1: Verify that the conflict has occurred and an error notification is displayed.
-        await expect(page.locator('.c-message-banner__message', {
-            hasText: "Conflict detected while saving mine"
-        })).toBeVisible();
-
-        // Page 1: Start logging console errors from this point on
-        let errors = [];
-        page.on('console', (msg) => {
-            if (msg.type() === 'error') {
-                errors.push(msg.text());
-            }
-        });
-
-        // Page 1: Try to create a clock with the page that received the conflict.
-        const clockAfterConflict = await createDomainObjectWithDefaults(page, {
-            type: 'Clock'
-        });
-
-        // Page 1: Wait for save progress dialog to appear/disappear
-        await page.locator('.c-message-banner__message', {
-            hasText: 'Do not navigate away from this page or close this browser tab while this message is displayed.',
-            state: 'visible'
-        }).waitFor({ state: 'hidden' });
-
-        // Page 1: Navigate to 'My Items' and verify that the second clock was created
-        await page.goto('./#/browse/mine');
-        await expect(page.locator(`.c-grid-item__name[title="${clockAfterConflict.name}"]`)).toBeVisible();
-
-        // Verify no console errors occurred
-        expect(errors).toHaveLength(0);
-    });
-});
-
 test.describe('Form Correctness by Object Type', () => {
     test.fixme('Verify correct behavior of number object (SWG)', async ({page}) => {});
     test.fixme('Verify correct behavior of number object Timer', 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('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;
@@ -127,11 +95,11 @@ test.describe('Move & link item tests', () => {
         // Create Telemetry Table
         let telemetryTable = 'Test Telemetry Table';
         await page.locator('button:has-text("Create")').click();
-        await page.locator('li[role="menuitem"]:has-text("Telemetry Table")').click();
+        await page.locator('li:has-text("Telemetry Table")').click();
         await page.locator('text=Properties Title Notes >> input[type="text"]').click();
         await page.locator('text=Properties Title Notes >> input[type="text"]').fill(telemetryTable);
 
-        await page.locator('button:has-text("OK")').click();
+        await page.locator('text=OK').click();
 
         // Finish editing and save Telemetry Table
         await page.locator('.c-button--menu.c-button--major.icon-save').click();
@@ -140,19 +108,19 @@ test.describe('Move & link item tests', () => {
         // Create New Folder Basic Domain Object
         let folder = 'Test Folder';
         await page.locator('button:has-text("Create")').click();
-        await page.locator('li[role="menuitem"]:has-text("Folder")').click();
+        await page.locator('li:has-text("Folder")').click();
         await page.locator('text=Properties Title Notes >> input[type="text"]').click();
         await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folder);
 
         // 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();
 
         // Continue test regardless of assertion and create it in My Items
         await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
-        await page.locator('button:has-text("OK")').click();
+        await page.locator('text=OK').click();
 
         // Open My Items
         await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
@@ -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('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,79 +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
-*/
-
-// FIXME: Remove this eslint exception once tests are implemented
-// eslint-disable-next-line no-unused-vars
-const { createDomainObjectWithDefaults } = require('../../appActions');
-const { test, expect } = require('../../pluginFixtures');
-
-test.describe('Notifications List', () => {
-    test.fixme('Notifications can be dismissed individually', async ({ page }) => {
-        // Create some persistent notifications
-        // Verify that they are present in the notifications list
-        // Dismiss one of the notifications
-        // Verify that it is no longer present in the notifications list
-        // Verify that the other notifications are still present in the notifications list
-    });
-});
-
-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

@@ -40,11 +40,11 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
         await page.goto('./', { waitUntil: 'networkidle' });
         await page.click('button:has-text("Create")');
 
-        await page.locator('li[role="menuitem"]:has-text("Condition Set")').click();
+        await page.locator('li:has-text("Condition Set")').click();
 
         await Promise.all([
             page.waitForNavigation(),
-            page.click('button:has-text("OK")')
+            page.click('text=OK')
         ]);
 
         //Save localStorage for future test execution
@@ -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
@@ -163,9 +163,9 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
         // Click hamburger button
         await page.locator('[title="More options"]').click();
 
-        // Click 'Remove' and press OK
-        await page.locator('li[role="menuitem"]:has-text("Remove")').click();
-        await page.locator('button:has-text("OK")').click();
+        // Click text=Remove
+        await page.locator('text=Remove').click();
+        await page.locator('text=OK').click();
 
         //Expect Unnamed Condition Set to be removed in Main View
         const numberOfConditionSetsAtEnd = await page.locator('a:has-text("Unnamed Condition Set Condition Set")').count();

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

@@ -23,8 +23,7 @@
 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions');
 
-test.describe('Display Layout', () => {
-    /** @type {import('../../../../appActions').CreatedObjectInfo} */
+test.describe('Testing Display Layout @unstable', () => {
     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();
 
@@ -62,12 +55,12 @@ test.describe('Display Layout', () => {
         // On getting data, check if the value found in the  Display Layout is the most recent value
         // from the Sine Wave Generator
         const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
-        const formattedTelemetryValue = getTelemValuePromise;
+        const formattedTelemetryValue = await getTelemValuePromise;
         const displayLayoutValuePromise = await page.waitForSelector(`text="${formattedTelemetryValue}"`);
         const displayLayoutValue = await displayLayoutValuePromise.textContent();
         const trimmedDisplayValue = displayLayoutValue.trim();
 
-        expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
+        await expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
     });
     test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({ page }) => {
         // Create a Display Layout
@@ -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();
 
@@ -100,12 +86,12 @@ test.describe('Display Layout', () => {
 
         // On getting data, check if the value found in the Display Layout is the most recent value
         // from the Sine Wave Generator
-        const formattedTelemetryValue = getTelemValuePromise;
+        const formattedTelemetryValue = await getTelemValuePromise;
         const displayLayoutValuePromise = await page.waitForSelector(`text="${formattedTelemetryValue}"`);
         const displayLayoutValue = await displayLayoutValuePromise.textContent();
         const trimmedDisplayValue = displayLayoutValue.trim();
 
-        expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
+        await expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
     });
     test('items in a display layout can be removed with object tree context menu when viewing the display layout', async ({ page }) => {
         // Create a Display Layout
@@ -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,22 +115,19 @@ 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('li[role="menuitem"]:has-text("Remove")').click();
-        await page.locator('button:has-text("OK")').click();
+        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').first().click({ button: 'right' });
+        await page.locator('text=Remove').click();
+        await page.locator('text=OK').click();
 
         // delete
 
-        expect(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
+        expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
     });
     test('items in a display layout can be removed with object tree context menu when viewing another item', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/3117'
-        });
         // Create a Display Layout
-        const displayLayout = await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout'
+        await createDomainObjectWithDefaults(page, {
+            type: 'Display Layout',
+            name: "Test Display Layout"
         });
         // Edit Display Layout
         await page.locator('[title="Edit"]').click();
@@ -159,14 +135,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();
 
@@ -175,18 +144,18 @@ test.describe('Display Layout', () => {
         // Expand the Display Layout so we can remove the sine wave generator
         await page.locator('.c-tree__item.is-navigated-object .c-disclosure-triangle').click();
 
-        // Go to the original Sine Wave Generator to navigate away from the Display Layout
-        await page.goto(sineWaveObject.url);
+        // Click the original Sine Wave Generator to navigate away from the Display Layout
+        await page.locator('.c-tree__item .c-tree__item__name:text("Test Sine Wave Generator")').click();
 
         // Bring up context menu and remove
-        await sineWaveGeneratorTreeItem.first().click({ button: 'right' });
-        await page.locator('li[role="menuitem"]:has-text("Remove")').click();
-        await page.locator('button:has-text("OK")').click();
+        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').click({ button: 'right' });
+        await page.locator('text=Remove').click();
+        await page.locator('text=OK').click();
 
         // navigate back to the display layout to confirm it has been removed
-        await page.goto(displayLayout.url);
+        await page.locator('.c-tree__item .c-tree__item__name:text("Test Display Layout")').click();
 
-        expect(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
+        expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
     });
 });
 

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

@@ -23,35 +23,27 @@
 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
-test.describe('Flexible Layout', () => {
-    let sineWaveObject;
-    let clockObject;
+test.describe('Testing Flexible Layout @unstable', () => {
     test.beforeEach(async ({ page }) => {
         await page.goto('./', { waitUntil: 'networkidle' });
 
         // Create Sine Wave Generator
-        sineWaveObject = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator'
+        await createDomainObjectWithDefaults(page, {
+            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,95 +51,16 @@ 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();
+        let dragWrapper = await page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
         await expect(dragWrapper).toHaveAttribute('draggable', 'true');
         // Save Flexible Layout
         await page.locator('button[title="Save"]').click();
         await page.locator('text=Save and Finish Editing').click();
         // Check that panes are not draggable while Flexible Layout is in Browse mode
-        dragWrapper = page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
+        dragWrapper = await page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
         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'
-        });
-        // Edit Flexible Layout
-        await page.locator('[title="Edit"]').click();
-
-        // 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.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        expect.soft(await page.locator('.c-fl-container__frame').count()).toEqual(1);
-
-        // Expand the Flexible Layout so we can remove the sine wave generator
-        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('li[role="menuitem"]:has-text("Remove")').click();
-        await page.locator('button:has-text("OK")').click();
-
-        // Verify that the item has been removed from the layout
-        expect(await page.locator('.c-fl-container__frame').count()).toEqual(0);
-    });
-    test('items in a flexible layout can be removed with object tree context menu when viewing another item', async ({ page }) => {
-        test.info().annotations.push({
-            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'
-        });
-        // Edit Flexible Layout
-        await page.locator('[title="Edit"]').click();
-
-        // 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.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        expect.soft(await page.locator('.c-fl-container__frame').count()).toEqual(1);
-
-        // Expand the Flexible Layout so we can remove the sine wave generator
-        await page.locator('.c-tree__item.is-navigated-object .c-disclosure-triangle').click();
-
-        // Go to the original Sine Wave Generator to navigate away from the Flexible Layout
-        await page.goto(sineWaveObject.url);
-
-        // Bring up context menu and remove
-        await sineWaveGeneratorTreeItem.first().click({ button: 'right' });
-        await page.locator('li[role="menuitem"]:has-text("Remove")').click();
-        await page.locator('button:has-text("OK")').click();
-
-        // navigate back to the display layout to confirm it has been removed
-        await page.goto(flexibleLayout.url);
-
-        // Verify that the item has been removed from the layout
-        expect(await page.locator('.c-fl-container__frame').count()).toEqual(0);
-    });
 });

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

@@ -1,124 +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 testing the Gauge component.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
-const uuid = require('uuid').v4;
-
-test.describe('Gauge', () => {
-    test.beforeEach(async ({ page }) => {
-        // Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
-    });
-
-    test('Can add and remove telemetry sources @unstable', async ({ page }) => {
-        // Create the gauge with defaults
-        const gauge = await createDomainObjectWithDefaults(page, { type: 'Gauge' });
-        const editButtonLocator = page.locator('button[title="Edit"]');
-        const saveButtonLocator = page.locator('button[title="Save"]');
-
-        // Create a sine wave generator within the gauge
-        const swg1 = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: `swg-${uuid()}`,
-            parent: gauge.uuid
-        });
-
-        // Navigate to the gauge and verify that
-        // the SWG appears in the elements pool
-        await page.goto(gauge.url);
-        await editButtonLocator.click();
-        await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeVisible();
-        await saveButtonLocator.click();
-        await page.locator('li[title="Save and Finish Editing"]').click();
-
-        // Create another sine wave generator within the gauge
-        const swg2 = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: `swg-${uuid()}`,
-            parent: gauge.uuid
-        });
-
-        // Verify that the 'Replace telemetry source' modal appears and accept it
-        await expect.soft(page.locator('text=This action will replace the current telemetry source. Do you want to continue?')).toBeVisible();
-        await page.click('text=Ok');
-
-        // Navigate to the gauge and verify that the new SWG
-        // appears in the elements pool and the old one is gone
-        await page.goto(gauge.url);
-        await editButtonLocator.click();
-        await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeHidden();
-        await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg2.name}`)).toBeVisible();
-        await saveButtonLocator.click();
-
-        // Right click on the new SWG in the elements pool and delete it
-        await page.locator(`#inspector-elements-tree >> text=${swg2.name}`).click({
-            button: 'right'
-        });
-        await page.locator('li[title="Remove this object from its containing object."]').click();
-
-        // Verify that the 'Remove object' confirmation modal appears and accept it
-        await expect.soft(page.locator('text=Warning! This action will remove this object. Are you sure you want to continue?')).toBeVisible();
-        await page.click('text=Ok');
-
-        // Verify that the elements pool shows no elements
-        await expect(page.locator('text="No contained elements"')).toBeVisible();
-    });
-    test('Can create a non-default Gauge', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5356'
-        });
-        //Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click the object specified by 'type'
-        await page.click(`li[role='menuitem']:text("Gauge")`);
-        // FIXME: We need better selectors for these custom form controls
-        const displayCurrentValueSwitch = page.locator('.c-toggle-switch__slider >> nth=0');
-        await displayCurrentValueSwitch.setChecked(false);
-        await page.click('button[aria-label="Save"]');
-
-        // TODO: Verify changes in the UI
-    });
-    test('Can edit a single Gauge-specific property', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5985'
-        });
-
-        // Create the gauge with defaults
-        await createDomainObjectWithDefaults(page, { type: 'Gauge' });
-        await page.click('button[title="More options"]');
-        await page.click('li[role="menuitem"]:has-text("Edit Properties")');
-        // FIXME: We need better selectors for these custom form controls
-        const displayCurrentValueSwitch = page.locator('.c-toggle-switch__slider >> nth=0');
-        await displayCurrentValueSwitch.setChecked(false);
-        await page.click('button[aria-label="Save"]');
-
-        // TODO: Verify changes in the UI
-    });
-});

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', () => {
@@ -40,10 +40,10 @@ test.describe('Example Imagery Object', () => {
         await page.goto('./', { waitUntil: 'networkidle' });
 
         // Create a default 'Example Imagery' object
-        const exampleImagery = await createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
+        await createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
 
         // Verify that the created object is focused
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText(exampleImagery.name);
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
         await page.locator(backgroundImageSelector).hover({trial: true});
     });
 
@@ -188,7 +188,7 @@ test.describe('Example Imagery in Display Layout', () => {
         await page.click('button:has-text("Create")');
 
         // Click text=Example Imagery
-        await page.click('li[role="menuitem"]:has-text("Example Imagery")');
+        await page.click('text=Example Imagery');
 
         // Clear and set Image load delay to minimum value
         await page.locator('input[type="number"]').fill('');
@@ -197,7 +197,7 @@ test.describe('Example Imagery in Display Layout', () => {
         // Click text=OK
         await Promise.all([
             page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('button:has-text("OK")'),
+            page.click('text=OK'),
             //Wait for Save Banner to appear
             page.waitForSelector('.c-message-banner__message')
         ]);
@@ -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',
@@ -327,7 +275,7 @@ test.describe('Example Imagery in Flexible layout', () => {
         await page.click('button:has-text("Create")');
 
         // Click text=Example Imagery
-        await page.click('li[role="menuitem"]:has-text("Example Imagery")');
+        await page.click('text=Example Imagery');
 
         // Clear and set Image load delay to minimum value
         await page.locator('input[type="number"]').fill('');
@@ -336,7 +284,7 @@ test.describe('Example Imagery in Flexible layout', () => {
         // Click text=OK
         await Promise.all([
             page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('button:has-text("OK")'),
+            page.click('text=OK'),
             //Wait for Save Banner to appear
             page.waitForSelector('.c-message-banner__message')
         ]);
@@ -369,7 +317,7 @@ test.describe('Example Imagery in Tabs View', () => {
         await page.click('button:has-text("Create")');
 
         // Click text=Example Imagery
-        await page.click('li[role="menuitem"]:has-text("Example Imagery")');
+        await page.click('text=Example Imagery');
 
         // Clear and set Image load delay to minimum value
         await page.locator('input[type="number"]').fill('');
@@ -378,7 +326,7 @@ test.describe('Example Imagery in Tabs View', () => {
         // Click text=OK
         await Promise.all([
             page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('button:has-text("OK")'),
+            page.click('text=OK'),
             //Wait for Save Banner to appear
             page.waitForSelector('.c-message-banner__message')
         ]);
@@ -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.
 */
 
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
+// FIXME: Remove this eslint exception once tests are implemented
+// eslint-disable-next-line no-unused-vars
+const { test, expect } = require('../../../../baseFixtures');
+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

@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks with CouchDB.
 */
 
-const { test, expect } = require('../../../../pluginFixtures');
+const { test, expect } = require('../../../../baseFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 test.describe('Notebook Tests with CouchDB @couchdb', () => {
@@ -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

@@ -36,27 +36,27 @@ test.describe('Restricted Notebook', () => {
     });
 
     test('Can be renamed @addInit', async ({ page }) => {
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText(`${notebook.name}`);
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText(`Unnamed ${CUSTOM_NAME}`);
     });
 
-    test('Can be deleted if there are no locked pages @addInit', async ({ page }) => {
+    test('Can be deleted if there are no locked pages @addInit', async ({ page, openmctConfig }) => {
         await openObjectTreeContextMenu(page, notebook.url);
 
         const menuOptions = page.locator('.c-menu ul');
         await expect.soft(menuOptions).toContainText('Remove');
 
-        const restrictedNotebookTreeObject = page.locator(`a:has-text("${notebook.name}")`);
+        const restrictedNotebookTreeObject = page.locator(`a:has-text("Unnamed ${CUSTOM_NAME}")`);
 
         // notebook tree object exists
         expect.soft(await restrictedNotebookTreeObject.count()).toEqual(1);
 
         // Click Remove Text
-        await page.locator('li[role="menuitem"]:has-text("Remove")').click();
+        await page.locator('text=Remove').click();
 
         // Click 'OK' on confirmation window and wait for save banner to appear
         await Promise.all([
             page.waitForNavigation(),
-            page.locator('button:has-text("OK")').click(),
+            page.locator('text=OK').click(),
             page.waitForSelector('.c-message-banner__message')
         ]);
 
@@ -134,7 +134,7 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
         // Click text=Ok
         await Promise.all([
             page.waitForNavigation(),
-            page.locator('button:has-text("OK")').click()
+            page.locator('text=Ok').click()
         ]);
 
         // deleted page, should no longer exist
@@ -145,14 +145,15 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
 
 test.describe('Restricted Notebook with a page locked and with an embed @addInit', () => {
 
-    test.beforeEach(async ({ page }) => {
-        const notebook = await startAndAddRestrictedNotebookObject(page);
-        await nbUtils.dragAndDropEmbed(page, notebook);
+    test.beforeEach(async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+        await startAndAddRestrictedNotebookObject(page);
+        await nbUtils.dragAndDropEmbed(page, myItemsFolderName);
     });
 
     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 +162,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

@@ -36,7 +36,7 @@ async function createNotebookAndEntry(page, iterations = 1) {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'networkidle' });
 
-    const notebook = createDomainObjectWithDefaults(page, { type: 'Notebook' });
+    createDomainObjectWithDefaults(page, { type: 'Notebook' });
 
     for (let iteration = 0; iteration < iterations; iteration++) {
         // Create an entry
@@ -44,10 +44,7 @@ async function createNotebookAndEntry(page, iterations = 1) {
         const entryLocator = `[aria-label="Notebook Entry Input"] >> nth = ${iteration}`;
         await page.locator(entryLocator).click();
         await page.locator(entryLocator).fill(`Entry ${iteration}`);
-        await page.locator(entryLocator).press('Enter');
     }
-
-    return notebook;
 }
 
 /**
@@ -56,15 +53,13 @@ async function createNotebookAndEntry(page, iterations = 1) {
   * @param {number} [iterations = 1] - the number of entries (and tags) to create
   */
 async function createNotebookEntryAndTags(page, iterations = 1) {
-    const notebook = await createNotebookAndEntry(page, iterations);
-    await page.locator('text=Annotations').click();
+    await createNotebookAndEntry(page, iterations);
 
     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,23 +68,19 @@ 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
         await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
     }
-
-    return notebook;
 }
 
 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();
@@ -130,12 +121,13 @@ test.describe('Tagging in Notebooks @addInit', () => {
 
     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");
@@ -181,10 +173,10 @@ test.describe('Tagging in Notebooks @addInit', () => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        const clock = await createDomainObjectWithDefaults(page, { type: 'Clock' });
+        await createDomainObjectWithDefaults(page, { type: 'Clock' });
 
         const ITERATIONS = 4;
-        const notebook = await createNotebookEntryAndTags(page, ITERATIONS);
+        await createNotebookEntryAndTags(page, ITERATIONS);
 
         for (let iteration = 0; iteration < ITERATIONS; iteration++) {
             const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
@@ -197,18 +189,11 @@ test.describe('Tagging in Notebooks @addInit', () => {
             page.goto('./#/browse/mine?hideTree=false'),
             page.click('.c-disclosure-triangle')
         ]);
+        // Click Unnamed Clock
+        await page.click('text="Unnamed Clock"');
 
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        // Click Clock
-        await treePane.getByRole('treeitem', {
-            name: clock.name
-        }).click();
-        // Click Notebook
-        await page.getByRole('treeitem', {
-            name: notebook.name
-        }).click();
+        // Click Unnamed Notebook
+        await page.click('text="Unnamed Notebook"');
 
         for (let iteration = 0; iteration < ITERATIONS; iteration++) {
             const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
@@ -222,13 +207,14 @@ test.describe('Tagging in Notebooks @addInit', () => {
             page.waitForLoadState('networkidle')
         ]);
 
-        // Click Notebook
-        await page.click(`text="${notebook.name}"`);
+        // Click Unnamed Notebook
+        await page.click('text="Unnamed Notebook"');
 
         for (let iteration = 0; iteration < ITERATIONS; iteration++) {
             const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
             await expect(page.locator(entryLocator)).toContainText("Science");
             await expect(page.locator(entryLocator)).toContainText("Driving");
         }
+
     });
 });

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' });
     });
 });
 
@@ -127,10 +110,10 @@ async function createSinewaveOverlayPlot(page, myItemsFolderName) {
     await page.locator('button:has-text("Create")').click();
 
     // add overlay plot with defaults
-    await page.locator('li[role="menuitem"]:has-text("Overlay Plot")').click();
+    await page.locator('li:has-text("Overlay Plot")').click();
     await Promise.all([
         page.waitForNavigation(),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear1
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -146,10 +129,10 @@ async function createSinewaveOverlayPlot(page, myItemsFolderName) {
     await page.locator('button:has-text("Create")').click();
 
     // add sine wave generator with defaults
-    await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
+    await page.locator('li:has-text("Sine Wave Generator")').click();
     await Promise.all([
         page.waitForNavigation(),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear1
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -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

@@ -88,10 +88,10 @@ async function makeOverlayPlot(page, myItemsFolderName) {
     // create overlay plot
 
     await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Overlay Plot")').click();
+    await page.locator('li:has-text("Overlay Plot")').click();
     await Promise.all([
         page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -106,7 +106,7 @@ async function makeOverlayPlot(page, myItemsFolderName) {
     // create a sinewave generator
 
     await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
+    await page.locator('li:has-text("Sine Wave Generator")').click();
 
     // set amplitude to 6, offset 4, period 2
 
@@ -123,7 +123,7 @@ async function makeOverlayPlot(page, myItemsFolderName) {
 
     await Promise.all([
         page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -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/missingPlotObj.e2e.spec.js

@@ -88,11 +88,11 @@ async function makeStackedPlot(page, myItemsFolderName) {
 
     // create stacked plot
     await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Stacked Plot")').click();
+    await page.locator('li:has-text("Stacked Plot")').click();
 
     await Promise.all([
         page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -146,11 +146,11 @@ async function saveStackedPlot(page) {
 async function createSineWaveGenerator(page) {
     //Create sine wave generator
     await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
+    await page.locator('li:has-text("Sine Wave Generator")').click();
 
     await Promise.all([
         page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);

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/plotLegendSwatch.e2e.spec.js

@@ -68,10 +68,10 @@ async function makeOverlayPlot(page) {
     // create overlay plot
 
     await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Overlay Plot")').click();
+    await page.locator('li:has-text("Overlay Plot")').click();
     await Promise.all([
         page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);
@@ -86,13 +86,13 @@ async function makeOverlayPlot(page) {
     // create a sinewave generator
 
     await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
+    await page.locator('li:has-text("Sine Wave Generator")').click();
 
     // Click OK to make generator
 
     await Promise.all([
         page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
+        page.locator('text=OK').click(),
         //Wait for Save Banner to appear
         page.waitForSelector('.c-message-banner__message')
     ]);

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

@@ -25,8 +25,8 @@
 *
 */
 
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults} = require('../../../../appActions');
+const { test, expect } = require('../../../../baseFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 test.describe('Plot Integrity Testing @unstable', () => {
     let sineWaveGeneratorObject;
@@ -40,6 +40,7 @@ test.describe('Plot Integrity Testing @unstable', () => {
     test('Plots do not re-request data when a plot is clicked', async ({ page }) => {
         //Navigate to Sine Wave Generator
         await page.goto(sineWaveGeneratorObject.url);
+        //Capture the number of plots points and store as const name numberOfPlotPoints
         //Click on the plot canvas
         await page.locator('canvas').nth(1).click();
         //No request was made to get historical data
@@ -50,90 +51,4 @@ test.describe('Plot Integrity Testing @unstable', () => {
         });
         expect(createMineFolderRequests.length).toEqual(0);
     });
-
-    test('Plot is rendered when infinity values exist', async ({ page }) => {
-        // Edit Plot
-        await editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject);
-
-        //Get pixel data from Canvas
-        const plotPixelSize = await getCanvasPixelsWithData(page);
-        expect(plotPixelSize).toBeGreaterThan(0);
-    });
 });
-
-/**
- * This function edits a sine wave generator with the default options and enables the infinity values option.
- *
- * @param {import('@playwright/test').Page} page
- * @param {import('../../../../appActions').CreateObjectInfo} sineWaveGeneratorObject
- * @returns {Promise<CreatedObjectInfo>} An object containing information about the edited domain object.
- */
-async function editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject) {
-    await page.goto(sineWaveGeneratorObject.url);
-    // Edit LAD table
-    await page.locator('[title="More options"]').click();
-    await page.locator('[title="Edit properties of this object."]').click();
-    // Modify the infinity option to true
-    const infinityInput = page.locator('[aria-label="Include Infinity Values"]');
-    await infinityInput.click();
-
-    // Click OK button and wait for Navigate event
-    await Promise.all([
-        page.waitForLoadState(),
-        page.click('[aria-label="Save"]'),
-        // Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
-
-    // FIXME: Changes to SWG properties should be reflected on save, but they're not?
-    // Thus, navigate away and back to the object.
-    await page.goto('./#/browse/mine');
-    await page.goto(sineWaveGeneratorObject.url);
-
-    await page.locator('c-progress-bar c-telemetry-table__progress-bar').waitFor({
-        state: 'hidden'
-    });
-
-    // FIXME: The progress bar disappears on series data load, not on plot render,
-    // so wait for a half a second before evaluating the canvas.
-    // eslint-disable-next-line playwright/no-wait-for-timeout
-    await page.waitForTimeout(500);
-}
-
-/**
- * @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('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/scatterPlot.e2e.spec.js

@@ -1,93 +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 testing the Scatter Plot component.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
-const uuid = require('uuid').v4;
-
-test.describe('Scatter Plot', () => {
-    let scatterPlot;
-
-    test.beforeEach(async ({ page }) => {
-        // Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create the Scatter Plot
-        scatterPlot = await createDomainObjectWithDefaults(page, { type: 'Scatter Plot' });
-    });
-
-    test('Can add and remove telemetry sources', async ({ page }) => {
-        const editButtonLocator = page.locator('button[title="Edit"]');
-        const saveButtonLocator = page.locator('button[title="Save"]');
-
-        // Create a sine wave generator within the scatter plot
-        const swg1 = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: `swg-${uuid()}`,
-            parent: scatterPlot.uuid
-        });
-
-        // Navigate to the scatter plot and verify that
-        // the SWG appears in the elements pool
-        await page.goto(scatterPlot.url);
-        await editButtonLocator.click();
-        await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeVisible();
-        await saveButtonLocator.click();
-        await page.locator('li[title="Save and Finish Editing"]').click();
-
-        // Create another sine wave generator within the scatter plot
-        const swg2 = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: `swg-${uuid()}`,
-            parent: scatterPlot.uuid
-        });
-
-        // Verify that the 'Replace telemetry source' modal appears and accept it
-        await expect.soft(page.locator('text=This action will replace the current telemetry source. Do you want to continue?')).toBeVisible();
-        await page.click('text=Ok');
-
-        // Navigate to the scatter plot and verify that the new SWG
-        // appears in the elements pool and the old one is gone
-        await page.goto(scatterPlot.url);
-        await editButtonLocator.click();
-        await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeHidden();
-        await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg2.name}`)).toBeVisible();
-        await saveButtonLocator.click();
-
-        // Right click on the new SWG in the elements pool and delete it
-        await page.locator(`#inspector-elements-tree >> text=${swg2.name}`).click({
-            button: 'right'
-        });
-        await page.locator('li[title="Remove this object from its containing object."]').click();
-
-        // Verify that the 'Remove object' confirmation modal appears and accept it
-        await expect.soft(page.locator('text=Warning! This action will remove this object. Are you sure you want to continue?')).toBeVisible();
-        await page.click('text=Ok');
-
-        // Verify that the elements pool shows no elements
-        await expect(page.locator('text="No contained elements"')).toBeVisible();
-    });
-});

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/plugins/timeConductor/timeConductor.e2e.spec.js

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test, expect } = require('../../../../pluginFixtures');
+const { test, expect } = require('../../../../baseFixtures');
 const { setFixedTimeMode, setRealTimeMode, setStartOffset, setEndOffset } = require('../../../../appActions');
 
 test.describe('Time conductor operations', () => {

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

@@ -30,7 +30,7 @@ test.describe('Timer', () => {
         timer = await createDomainObjectWithDefaults(page, { type: 'timer' });
     });
 
-    test('Can perform actions on the Timer', async ({ page }) => {
+    test('Can perform actions on the Timer', async ({ page, openmctConfig }) => {
         test.info().annotations.push({
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/4313'

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

@@ -1,132 +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');
-
-test.describe('Recent Objects', () => {
-    let recentObjectsList;
-    let clock;
-    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('div:nth-child(2) > .l-pane__handle').hover();
-        await page.mouse.down();
-        await page.mouse.move(0, 100);
-        await page.mouse.up();
-    });
-    test('Recent Objects CRUD operations', async ({ page }) => {
-        // Verify that both created objects appear in the list and are in the correct order
-        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();
-
-        // 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} Breadcrumb`
-        }).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} Breadcrumb`
-        }).locator('a').filter({
-            hasText: folderA.name
-        }).click();
-
-        // Verify that the hash URL updates correctly
-        await waitForFolderNavigation;
-        // eslint-disable-next-line no-useless-escape
-        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} Breadcrumb`
-        }).locator('a').filter({
-            hasText: myItemsFolderName
-        }).click();
-
-        // Verify that the hash URL updates correctly
-        await waitForMyItemsNavigation;
-        // eslint-disable-next-line no-useless-escape
-        expect(page.url()).toMatch(new RegExp(`.*mine\?.*`));
-    });
-    test.fixme("Clicking on the 'target button' scrolls the object into view in the tree and highlights it", async ({ page }) => {
-    });
-    test.fixme("Tests for context menu actions from recent objects", async ({ page }) => {
-    });
-});

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

@@ -31,7 +31,7 @@ test.describe('Grand Search', () => {
     test('Can search for objects, and subsequent search dropdown behaves properly', async ({ page, openmctConfig }) => {
         const { myItemsFolderName } = openmctConfig;
 
-        const createdObjects = await createObjectsForSearch(page);
+        await createObjectsForSearch(page, myItemsFolderName);
 
         // Click [aria-label="OpenMCT Search"] input[type="search"]
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
@@ -41,8 +41,8 @@ test.describe('Grand Search', () => {
         await expect(page.locator('[aria-label="Search Result"] >> nth=1')).toContainText(`Clock B ${myItemsFolderName} Red Folder Blue Folder`);
         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`);
-        // Click the Elements pool to dismiss the search menu
-        await page.locator('.l-pane__label:has-text("Elements")').click();
+        // Click text=Elements >> nth=0
+        await page.locator('text=Elements').first().click();
         await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();
 
         await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').click();
@@ -72,12 +72,12 @@ 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();
 
         await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').fill('Disp');
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(createdObjects.displayLayout.name);
+        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText('Unnamed Display Layout');
         await expect(page.locator('[aria-label="Search Result"] >> nth=0')).not.toContainText('Folder');
 
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Clock C');
@@ -185,7 +185,7 @@ async function createFolderObject(page, folderName) {
     await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folderName);
 
     // Create folder object
-    await page.locator('button:has-text("OK")').click();
+    await page.locator('text=OK').click();
 }
 
 async function waitForSearchCompletion(page) {
@@ -197,56 +197,75 @@ async function waitForSearchCompletion(page) {
   * Creates some domain objects for searching
   * @param {import('@playwright/test').Page} page
   */
-async function createObjectsForSearch(page) {
+async function createObjectsForSearch(page, myItemsFolderName) {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'networkidle' });
 
-    const redFolder = await createDomainObjectWithDefaults(page, {
-        type: 'Folder',
-        name: 'Red Folder'
-    });
+    await page.locator('button:has-text("Create")').click();
+    await page.locator('li:has-text("Folder") >> nth=1').click();
+    await Promise.all([
+        page.waitForNavigation(),
+        await page.locator('text=Properties Title Notes >> input[type="text"]').fill('Red Folder'),
+        await page.locator(`text=Save In Open MCT ${myItemsFolderName} >> span`).nth(3).click(),
+        page.locator('button:has-text("OK")').click()
+    ]);
 
-    const blueFolder = await createDomainObjectWithDefaults(page, {
-        type: 'Folder',
-        name: 'Blue Folder',
-        parent: redFolder.uuid
-    });
+    await page.locator('button:has-text("Create")').click();
+    await page.locator('li:has-text("Folder") >> nth=2').click();
+    await Promise.all([
+        page.waitForNavigation(),
+        await page.locator('text=Properties Title Notes >> input[type="text"]').fill('Blue Folder'),
+        await page.locator('form[name="mctForm"] >> text=Red Folder').click(),
+        page.locator('button:has-text("OK")').click()
+    ]);
 
-    const clockA = await createDomainObjectWithDefaults(page, {
-        type: 'Clock',
-        name: 'Clock A',
-        parent: blueFolder.uuid
-    });
-    const clockB = await createDomainObjectWithDefaults(page, {
-        type: 'Clock',
-        name: 'Clock B',
-        parent: blueFolder.uuid
-    });
-    const clockC = await createDomainObjectWithDefaults(page, {
-        type: 'Clock',
-        name: 'Clock C',
-        parent: blueFolder.uuid
-    });
-    const clockD = await createDomainObjectWithDefaults(page, {
-        type: 'Clock',
-        name: 'Clock D',
-        parent: blueFolder.uuid
-    });
+    await page.locator('button:has-text("Create")').click();
+    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await Promise.all([
+        page.waitForNavigation(),
+        await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock A'),
+        await page.locator('form[name="mctForm"] >> text=Blue Folder').click(),
+        page.locator('button:has-text("OK")').click()
+    ]);
 
-    const displayLayout = await createDomainObjectWithDefaults(page, {
-        type: 'Display Layout'
-    });
+    await page.locator('button:has-text("Create")').click();
+    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await Promise.all([
+        page.waitForNavigation(),
+        await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock B'),
+        await page.locator('form[name="mctForm"] >> text=Blue Folder').click(),
+        page.locator('button:has-text("OK")').click()
+    ]);
 
-    // Go back into edit mode for the display layout
-    await page.locator('button[title="Edit"]').click();
+    await page.locator('button:has-text("Create")').click();
+    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await Promise.all([
+        page.waitForNavigation(),
+        await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock C'),
+        await page.locator('form[name="mctForm"] >> text=Blue Folder').click(),
+        page.locator('button:has-text("OK")').click()
+    ]);
 
-    return {
-        redFolder,
-        blueFolder,
-        clockA,
-        clockB,
-        clockC,
-        clockD,
-        displayLayout
-    };
+    await page.locator('button:has-text("Create")').click();
+    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await Promise.all([
+        page.waitForNavigation(),
+        await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock D'),
+        await page.locator('form[name="mctForm"] >> text=Blue Folder').click(),
+        page.locator('button:has-text("OK")').click()
+    ]);
+
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator(`a:has-text("${myItemsFolderName}") >> nth=0`).click()
+    ]);
+    // Click button:has-text("Create")
+    await page.locator('button:has-text("Create")').click();
+    // Click li:has-text("Notebook")
+    await page.locator('li:has-text("Display Layout")').click();
+    // Click button:has-text("OK")
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('button:has-text("OK")').click()
+    ]);
 }

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/performance/imagery.perf.spec.js

@@ -53,7 +53,7 @@ test.describe('Performance tests', () => {
         await page.setInputFiles('#fileElem', filePath);
 
         // Click text=OK
-        await page.locator('button:has-text("OK")').click();
+        await page.locator('text=OK').click();
 
         await expect(page.locator('a:has-text("Performance Display Layout Display Layout")')).toBeVisible();
 

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/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

@@ -33,13 +33,11 @@ define([
         dataRateInHz: 1,
         randomness: 0,
         phase: 0,
-        loadDelay: 0,
-        infinityValues: false
+        loadDelay: 0
     };
 
-    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) {
@@ -58,8 +56,7 @@ define([
             'dataRateInHz',
             'randomness',
             'phase',
-            'loadDelay',
-            'infinityValues'
+            'loadDelay'
         ];
 
         request = request || {};
@@ -82,7 +79,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/generatorWorker.js

@@ -76,10 +76,10 @@
                             name: data.name,
                             utc: nextStep,
                             yesterday: nextStep - 60 * 60 * 24 * 1000,
-                            sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness, data.infinityValues),
+                            sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness),
                             wavelengths: wavelengths(),
                             intensities: intensities(),
-                            cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness, data.infinityValues)
+                            cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness)
                         }
                     });
                     nextStep += step;
@@ -117,7 +117,6 @@
         var phase = request.phase;
         var randomness = request.randomness;
         var loadDelay = Math.max(request.loadDelay, 0);
-        var infinityValues = request.infinityValues;
 
         var step = 1000 / dataRateInHz;
         var nextStep = start - (start % step) + step;
@@ -128,10 +127,10 @@
             data.push({
                 utc: nextStep,
                 yesterday: nextStep - 60 * 60 * 24 * 1000,
-                sin: sin(nextStep, period, amplitude, offset, phase, randomness, infinityValues),
+                sin: sin(nextStep, period, amplitude, offset, phase, randomness),
                 wavelengths: wavelengths(),
                 intensities: intensities(),
-                cos: cos(nextStep, period, amplitude, offset, phase, randomness, infinityValues)
+                cos: cos(nextStep, period, amplitude, offset, phase, randomness)
             });
         }
 
@@ -156,20 +155,12 @@
         });
     }
 
-    function cos(timestamp, period, amplitude, offset, phase, randomness, infinityValues) {
-        if (infinityValues && Math.random() > 0.5) {
-            return Number.POSITIVE_INFINITY;
-        }
-
+    function cos(timestamp, period, amplitude, offset, phase, randomness) {
         return amplitude
             * Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
-    function sin(timestamp, period, amplitude, offset, phase, randomness, infinityValues) {
-        if (infinityValues && Math.random() > 0.5) {
-            return Number.POSITIVE_INFINITY;
-        }
-
+    function sin(timestamp, period, amplitude, offset, phase, randomness) {
         return amplitude
             * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }

example/generator/plugin.js

@@ -20,163 +20,147 @@
  * 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"
+                    ]
+                }
+            ],
+            initialize: function (object) {
+                object.telemetry = {
+                    period: 10,
+                    amplitude: 1,
+                    offset: 0,
+                    dataRateInHz: 1,
+                    phase: 0,
+                    randomness: 0,
+                    loadDelay: 0
+                };
             }
-        ],
-        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
     };
 }

karma.conf.js

@@ -28,12 +28,12 @@ module.exports = (config) => {
     let singleRun;
 
     if (process.env.KARMA_DEBUG) {
-        webpackConfig = require("./.webpack/webpack.dev.js");
-        browsers = ["ChromeDebugging"];
+        webpackConfig = require('./webpack.dev.js');
+        browsers = ['ChromeDebugging'];
         singleRun = false;
     } else {
-        webpackConfig = require("./.webpack/webpack.coverage.js");
-        browsers = ["ChromeHeadless"];
+        webpackConfig = require('./webpack.coverage.js');
+        browsers = ['ChromeHeadless'];
         singleRun = true;
     }
 
@@ -42,28 +42,28 @@ module.exports = (config) => {
     delete webpackConfig.entry;
 
     config.set({
-        basePath: "",
-        frameworks: ["jasmine", "webpack"],
+        basePath: '',
+        frameworks: ['jasmine', 'webpack'],
         files: [
-            "indexTest.js",
+            'indexTest.js',
             // included means: should the files be included in the browser using <script> tag?
             // We don't want them as a <script> because the shared worker source
             // needs loaded remotely by the shared worker process.
             {
-                pattern: "dist/couchDBChangesFeed.js*",
+                pattern: 'dist/couchDBChangesFeed.js*',
                 included: false
             },
             {
-                pattern: "dist/inMemorySearchWorker.js*",
+                pattern: 'dist/inMemorySearchWorker.js*',
                 included: false
             },
             {
-                pattern: "dist/generatorWorker.js*",
+                pattern: 'dist/generatorWorker.js*',
                 included: false
             }
         ],
         port: 9876,
-        reporters: ["spec", "junit", "coverage-istanbul"],
+        reporters: ['spec', 'junit', 'coverage-istanbul'],
         browsers,
         client: {
             jasmine: {
@@ -73,8 +73,8 @@ module.exports = (config) => {
         },
         customLaunchers: {
             ChromeDebugging: {
-                base: "Chrome",
-                flags: ["--remote-debugging-port=9222"],
+                base: 'Chrome',
+                flags: ['--remote-debugging-port=9222'],
                 debug: true
             }
         },
@@ -90,7 +90,7 @@ module.exports = (config) => {
             fixWebpackSourcePaths: true,
             skipFilesWithNoCoverage: true,
             dir: "coverage/unit", //Sets coverage file to be consumed by codecov.io
-            reports: ["lcovonly"]
+            reports: ['lcovonly']
         },
         specReporter: {
             maxLogLines: 5,
@@ -102,11 +102,11 @@ module.exports = (config) => {
             failFast: false
         },
         preprocessors: {
-            "indexTest.js": ["webpack", "sourcemap"]
+            'indexTest.js': ['webpack', 'sourcemap']
         },
         webpack: webpackConfig,
         webpackMiddleware: {
-            stats: "errors-warnings"
+            stats: 'errors-warnings'
         },
         concurrency: 1,
         singleRun,

openmct.js

@@ -30,53 +30,8 @@ if (document.currentScript) {
     }
 }
 
-/**
- * @typedef {object} BuildInfo
- * @property {string} version
- * @property {string} buildDate
- * @property {string} revision
- * @property {string} branch
- */
-
-/**
- * @typedef {object} OpenMCT
- * @property {BuildInfo} buildInfo
- * @property {*} selection
- * @property {import('./src/api/time/TimeAPI').default} time
- * @property {import('./src/api/composition/CompositionAPI').default} composition
- * @property {*} objectViews
- * @property {*} inspectorViews
- * @property {*} propertyEditors
- * @property {*} toolbars
- * @property {*} types
- * @property {import('./src/api/objects/ObjectAPI').default} objects
- * @property {import('./src/api/telemetry/TelemetryAPI').default} telemetry
- * @property {import('./src/api/indicators/IndicatorAPI').default} indicators
- * @property {import('./src/api/user/UserAPI').default} user
- * @property {import('./src/api/notifications/NotificationAPI').default} notifications
- * @property {import('./src/api/Editor').default} editor
- * @property {import('./src/api/overlays/OverlayAPI')} overlays
- * @property {import('./src/api/menu/MenuAPI').default} menus
- * @property {import('./src/api/actions/ActionsAPI').default} actions
- * @property {import('./src/api/status/StatusAPI').default} status
- * @property {*} priority
- * @property {import('./src/ui/router/ApplicationRouter')} router
- * @property {import('./src/api/faultmanagement/FaultManagementAPI').default} faults
- * @property {import('./src/api/forms/FormsAPI').default} forms
- * @property {import('./src/api/Branding').default} branding
- * @property {import('./src/api/annotation/AnnotationAPI').default} annotation
- * @property {{(plugin: OpenMCTPlugin) => void}} install
- * @property {{() => string}} getAssetPath
- * @property {{(domElement: HTMLElement, isHeadlessMode: boolean) => void}} start
- * @property {{() => void}} startHeadless
- * @property {{() => void}} destroy
- * @property {OpenMCTPlugin[]} plugins
- * @property {OpenMCTComponent[]} components
- */
-
 const MCT = require('./src/MCT');
 
-/** @type {OpenMCT} */
 const openmct = new MCT();
 
 module.exports = openmct;

package.json

@@ -1,36 +1,35 @@
 {
   "name": "openmct",
-  "version": "2.1.6",
+  "version": "2.1.2-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",
+    "@braintree/sanitize-url": "6.0.0",
+    "@percy/cli": "1.11.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",
+    "@playwright/test": "1.25.2",
+    "@types/jasmine": "4.3.0",
+    "@types/lodash": "4.14.186",
+    "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
     "comma-separated-values": "3.6.4",
     "copy-webpack-plugin": "11.0.0",
-    "css-loader": "6.7.3",
+    "css-loader": "6.7.1",
     "d3-axis": "3.0.0",
     "d3-scale": "3.3.0",
     "d3-selection": "3.0.0",
-    "eslint": "8.32.0",
+    "eslint": "8.25.0",
     "eslint-plugin-compat": "4.0.2",
-    "eslint-plugin-playwright": "0.12.0",
-    "eslint-plugin-vue": "9.9.0",
+    "eslint-plugin-playwright": "0.11.2",
+    "eslint-plugin-vue": "9.6.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
     "eventemitter3": "1.2.0",
     "file-saver": "2.0.5",
     "git-rev-sync": "3.0.2",
     "html2canvas": "1.4.1",
     "imports-loader": "4.0.1",
-    "jasmine-core": "4.5.0",
+    "jasmine-core": "4.4.0",
     "karma": "6.3.20",
     "karma-chrome-launcher": "3.1.1",
     "karma-cli": "2.0.0",
@@ -39,49 +38,46 @@
     "karma-jasmine": "5.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-sourcemap-loader": "0.3.8",
-    "karma-spec-reporter": "0.0.36",
+    "karma-spec-reporter": "0.0.34",
     "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",
+    "mini-css-extract-plugin": "2.6.1",
     "moment": "2.29.4",
     "moment-duration-format": "2.3.2",
-    "moment-timezone": "0.5.40",
+    "moment-timezone": "0.5.37",
     "nyc": "15.1.0",
     "painterro": "1.2.78",
-    "playwright-core": "1.29.0",
-    "plotly.js-basic-dist": "2.17.0",
-    "plotly.js-gl2d-dist": "2.17.1",
+    "playwright-core": "1.25.2",
+    "plotly.js-basic-dist": "2.14.0",
+    "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",
+    "sass": "1.55.0",
+    "sass-loader": "13.0.2",
+    "sinon": "14.0.0",
     "style-loader": "^3.3.1",
-    "typescript": "4.9.4",
     "uuid": "9.0.0",
     "vue": "2.6.14",
     "vue-eslint-parser": "9.1.0",
     "vue-loader": "15.9.8",
     "vue-template-compiler": "2.6.14",
     "webpack": "5.74.0",
-    "webpack-cli": "5.0.0",
+    "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.11.1",
     "webpack-merge": "5.8.0"
   },
   "scripts": {
     "clean": "rm -rf ./dist ./node_modules ./package-lock.json",
     "clean-test-lint": "npm run clean; npm install; npm run test; npm run lint",
-    "start": "npx webpack serve --config ./.webpack/webpack.dev.js",
-    "start:coverage": "npx webpack serve --config ./.webpack/webpack.coverage.js",
+    "start": "npx webpack serve --config ./webpack.dev.js",
+    "start:coverage": "npx webpack serve --config ./webpack.coverage.js",
     "lint": "eslint example src e2e --ext .js,.vue openmct.js --max-warnings=0",
     "lint:fix": "eslint example src e2e --ext .js,.vue openmct.js --fix",
-    "build:prod": "webpack --config ./.webpack/webpack.prod.js",
-    "build:dev": "webpack --config ./.webpack/webpack.dev.js",
-    "build:coverage": "webpack --config ./.webpack/webpack.coverage.js",
-    "build:watch": "webpack --config ./.webpack/webpack.dev.js --watch",
+    "build:prod": "webpack --config webpack.prod.js",
+    "build:dev": "webpack --config webpack.dev.js",
+    "build:coverage": "webpack --config webpack.coverage.js",
+    "build:watch": "webpack --config webpack.dev.js --watch",
     "info": "npx envinfo --system --browsers --npmPackages --binaries --languages --markdown",
     "test": "karma start",
     "test:debug": "KARMA_DEBUG=true karma start",
@@ -100,7 +96,7 @@
     "cov:e2e:full:publish": "codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-full",
     "cov:e2e:stable:publish": "codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-stable",
     "cov:unit:publish": "codecov --disable=gcov -f ./coverage/unit/lcov.info -F unit",
-    "prepare": "npm run build:prod && npx tsc"
+    "prepare": "npm run build:prod"
   },
   "repository": {
     "type": "git",
@@ -117,5 +113,6 @@
     "ios_saf > 15"
   ],
   "author": "",
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "private": true
 }

src/MCT.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/* eslint-disable no-undef */
+
 define([
     'EventEmitter',
     './api/api',
@@ -81,11 +81,13 @@ define([
     /**
      * The Open MCT application. This may be configured by installing plugins
      * or registering extensions before the application is started.
-     * @constructor
+     * @class MCT
      * @memberof module:openmct
+     * @augments {EventEmitter}
      */
     function MCT() {
         EventEmitter.call(this);
+        /* eslint-disable no-undef */
         this.buildInfo = {
             version: __OPENMCT_VERSION__,
             buildDate: __OPENMCT_BUILD_DATE__,
@@ -99,7 +101,7 @@ define([
             * Tracks current selection state of the application.
             * @private
             */
-            ['selection', () => new Selection.default(this)],
+            ['selection', () => new Selection(this)],
 
             /**
              * MCT's time conductor, which may be used to synchronize view contents
@@ -123,7 +125,7 @@ define([
              * @memberof module:openmct.MCT#
              * @name composition
              */
-            ['composition', () => new api.CompositionAPI.default(this)],
+            ['composition', () => new api.CompositionAPI(this)],
 
             /**
              * Registry for views of domain objects which should appear in the
@@ -256,15 +258,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/Branding.js

@@ -23,7 +23,8 @@
 let brandingOptions = {};
 
 /**
- * @typedef {object} BrandingOptions
+ * @typedef {Object} BrandingOptions
+ * @memberOf openmct/branding
  * @property {string} smallLogoImage URL to the image to use as the applications logo.
  * This logo will appear on every screen and when clicked will launch the about dialog.
  * @property {string} aboutHtml Custom content for the about screen. When defined the

src/api/Editor.js

@@ -56,12 +56,17 @@ export default class Editor extends EventEmitter {
      * Save any unsaved changes from this editing session. This will
      * end the current transaction.
      */
-    async save() {
+    save() {
         const transaction = this.openmct.objects.getActiveTransaction();
-        await transaction.commit();
-        this.editing = false;
-        this.emit('isEditing', false);
-        this.openmct.objects.endTransaction();
+
+        return transaction.commit()
+            .then(() => {
+                this.editing = false;
+                this.emit('isEditing', false);
+                this.openmct.objects.endTransaction();
+            }).catch(error => {
+                throw error;
+            });
     }
 
     /**
@@ -73,10 +78,6 @@ export default class Editor extends EventEmitter {
 
         return new Promise((resolve, reject) => {
             const transaction = this.openmct.objects.getActiveTransaction();
-            if (!transaction) {
-                return resolve();
-            }
-
             transaction.cancel()
                 .then(resolve)
                 .catch(reject)

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 {
 
     /**
@@ -104,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}`);
         }
@@ -132,10 +107,6 @@ 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);
@@ -168,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 {
@@ -178,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());
     }
 
     /**
@@ -200,7 +162,7 @@ export default class AnnotationAPI extends EventEmitter {
 
     /**
     * @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) {
@@ -228,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) {
@@ -256,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) {
@@ -266,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 [];
@@ -317,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,
@@ -367,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"
@@ -416,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

@@ -108,7 +108,6 @@ 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);
@@ -125,39 +124,27 @@ describe("The Annotation API", () => {
     });
 
     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.create(tagCreationArguments);
+            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]);
@@ -165,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/api.js

@@ -37,9 +37,7 @@ define([
     './types/TypeRegistry',
     './user/UserAPI',
     './annotation/AnnotationAPI'
-],
-
-function (
+], function (
     ActionsAPI,
     CompositionAPI,
     EditorAPI,

src/api/composition/CompositionAPI.js

@@ -20,41 +20,34 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import DefaultCompositionProvider from './DefaultCompositionProvider';
-import CompositionCollection from './CompositionCollection';
-
-/**
- * @typedef {import('./CompositionProvider').default} CompositionProvider
- */
-
-/**
- * @typedef {import('../objects/ObjectAPI').DomainObject} DomainObject
- */
-
-/**
- * @typedef {import('../../../openmct').OpenMCT} OpenMCT
- */
-
-/**
- * An interface for interacting with the composition of domain objects.
- * The composition of a domain object is the list of other domain objects
- * it "contains" (for instance, that should be displayed beneath it
- * in the tree.)
- * @constructor
- */
-export default class CompositionAPI {
+define([
+    'lodash',
+    'EventEmitter',
+    './DefaultCompositionProvider',
+    './CompositionCollection'
+], function (
+    _,
+    EventEmitter,
+    DefaultCompositionProvider,
+    CompositionCollection
+) {
     /**
-     * @param {OpenMCT} publicAPI
+     * An interface for interacting with the composition of domain objects.
+     * The composition of a domain object is the list of other domain objects
+     * it "contains" (for instance, that should be displayed beneath it
+     * in the tree.)
+     *
+     * @interface CompositionAPI
+     * @returns {module:openmct.CompositionCollection}
+     * @memberof module:openmct
      */
-    constructor(publicAPI) {
-        /** @type {CompositionProvider[]} */
+    function CompositionAPI(publicAPI) {
         this.registry = [];
-        /** @type {CompositionPolicy[]} */
         this.policies = [];
         this.addProvider(new DefaultCompositionProvider(publicAPI, this));
-        /** @type {OpenMCT} */
         this.publicAPI = publicAPI;
     }
+
     /**
      * Add a composition provider.
      *
@@ -62,19 +55,21 @@ export default class CompositionAPI {
      * behavior for certain domain objects.
      *
      * @method addProvider
-     * @param {CompositionProvider} provider the provider to add
+     * @param {module:openmct.CompositionProvider} provider the provider to add
+     * @memberof module:openmct.CompositionAPI#
      */
-    addProvider(provider) {
+    CompositionAPI.prototype.addProvider = function (provider) {
         this.registry.unshift(provider);
-    }
+    };
+
     /**
      * Retrieve the composition (if any) of this domain object.
      *
      * @method get
-     * @param {DomainObject} domainObject
-     * @returns {CompositionCollection}
+     * @returns {module:openmct.CompositionCollection}
+     * @memberof module:openmct.CompositionAPI#
      */
-    get(domainObject) {
+    CompositionAPI.prototype.get = function (domainObject) {
         const provider = this.registry.find(p => {
             return p.appliesTo(domainObject);
         });
@@ -84,7 +79,8 @@ export default class CompositionAPI {
         }
 
         return new CompositionCollection(domainObject, provider, this.publicAPI);
-    }
+    };
+
     /**
      * A composition policy is a function which either allows or disallows
      * placing one object in another's composition.
@@ -94,51 +90,52 @@ export default class CompositionAPI {
      * generally be written to return true in the default case.
      *
      * @callback CompositionPolicy
-     * @param {DomainObject} containingObject the object which
+     * @memberof module:openmct.CompositionAPI~
+     * @param {module:openmct.DomainObject} containingObject the object which
      *        would act as a container
-     * @param {DomainObject} containedObject the object which
+     * @param {module:openmct.DomainObject} containedObject the object which
      *        would be contained
      * @returns {boolean} false if this composition should be disallowed
      */
+
     /**
      * Add a composition policy. Composition policies may disallow domain
      * objects from containing other domain objects.
      *
      * @method addPolicy
-     * @param {CompositionPolicy} policy
+     * @param {module:openmct.CompositionAPI~CompositionPolicy} policy
      *        the policy to add
+     * @memberof module:openmct.CompositionAPI#
      */
-    addPolicy(policy) {
+    CompositionAPI.prototype.addPolicy = function (policy) {
         this.policies.push(policy);
-    }
+    };
+
     /**
      * Check whether or not a domain object is allowed to contain another
      * domain object.
      *
      * @private
      * @method checkPolicy
-     * @param {DomainObject} container the object which
+     * @param {module:openmct.DomainObject} containingObject the object which
      *        would act as a container
-     * @param {DomainObject} containee the object which
+     * @param {module:openmct.DomainObject} containedObject the object which
      *        would be contained
      * @returns {boolean} false if this composition should be disallowed
-     * @param {CompositionPolicy} policy
+
+     * @param {module:openmct.CompositionAPI~CompositionPolicy} policy
      *        the policy to add
+     * @memberof module:openmct.CompositionAPI#
      */
-    checkPolicy(container, containee) {
+    CompositionAPI.prototype.checkPolicy = function (container, containee) {
         return this.policies.every(function (policy) {
             return policy(container, containee);
         });
-    }
+    };
 
-    /**
-     * Check whether or not a domainObject supports composition
-     *
-     * @param {DomainObject} domainObject
-     * @returns {boolean} true if the domainObject supports composition
-     */
-    supportsComposition(domainObject) {
+    CompositionAPI.prototype.supportsComposition = function (domainObject) {
         return this.get(domainObject) !== undefined;
-    }
-}
+    };
 
+    return CompositionAPI;
+});

src/api/composition/CompositionAPISpec.js

@@ -1,312 +1,325 @@
-import { createOpenMct, resetApplicationState } from '../../utils/testing';
-import CompositionCollection from './CompositionCollection';
+define([
+    './CompositionAPI',
+    './CompositionCollection'
+], function (
+    CompositionAPI,
+    CompositionCollection
+) {
 
-describe('The Composition API', function () {
-    let publicAPI;
-    let compositionAPI;
-
-    beforeEach(function (done) {
-        publicAPI = createOpenMct();
-        compositionAPI = publicAPI.composition;
-
-        const mockObjectProvider = jasmine.createSpyObj("mock provider", [
-            "create",
-            "update",
-            "get"
-        ]);
-
-        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.addProvider('test', mockObjectProvider);
-        publicAPI.objects.addProvider('custom', mockObjectProvider);
-
-        publicAPI.on('start', done);
-        publicAPI.startHeadless();
-    });
-
-    afterEach(() => {
-        return resetApplicationState(publicAPI);
-    });
-
-    it('returns falsy if an object does not support composition', function () {
-        expect(compositionAPI.get({})).toBeFalsy();
-    });
-
-    describe('default composition', function () {
-        let domainObject;
-        let composition;
+    describe('The Composition API', function () {
+        let publicAPI;
+        let compositionAPI;
+        let topicService;
+        let mutationTopic;
 
         beforeEach(function () {
-            domainObject = {
-                name: 'test folder',
-                identifier: {
-                    namespace: 'test',
-                    key: '1'
-                },
-                composition: [
-                    {
-                        namespace: 'test',
-                        key: 'a'
-                    },
-                    {
-                        namespace: 'test',
-                        key: 'b'
-                    },
-                    {
-                        namespace: 'test',
-                        key: 'c'
-                    }
-                ]
-            };
-            composition = compositionAPI.get(domainObject);
+
+            mutationTopic = jasmine.createSpyObj('mutationTopic', [
+                'listen'
+            ]);
+            topicService = jasmine.createSpy('topicService');
+            topicService.and.returnValue(mutationTopic);
+            publicAPI = {};
+            publicAPI.objects = jasmine.createSpyObj('ObjectAPI', [
+                'get',
+                'mutate',
+                'observe',
+                'areIdsEqual'
+            ]);
+
+            publicAPI.objects.areIdsEqual.and.callFake(function (id1, id2) {
+                return id1.namespace === id2.namespace && id1.key === id2.key;
+            });
+
+            publicAPI.composition = jasmine.createSpyObj('CompositionAPI', [
+                'checkPolicy'
+            ]);
+            publicAPI.composition.checkPolicy.and.returnValue(true);
+
+            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 composition collection', function () {
-            expect(composition).toBeDefined();
-            expect(composition).toEqual(jasmine.any(CompositionCollection));
+        it('returns falsy if an object does not support composition', function () {
+            expect(compositionAPI.get({})).toBeFalsy();
         });
 
-        it('correctly reflects composability', function () {
-            expect(compositionAPI.supportsComposition(domainObject)).toBe(true);
-            delete domainObject.composition;
-            expect(compositionAPI.supportsComposition(domainObject)).toBe(false);
-        });
+        describe('default composition', function () {
+            let domainObject;
+            let composition;
 
-        it('loads composition from domain object', function () {
-            const listener = jasmine.createSpy('addListener');
-            composition.on('add', listener);
-
-            return composition.load().then(function () {
-                expect(listener.calls.count()).toBe(3);
-                expect(listener).toHaveBeenCalledWith({
+            beforeEach(function () {
+                domainObject = {
+                    name: 'test folder',
                     identifier: {
                         namespace: 'test',
-                        key: 'a'
-                    }
-                });
-            });
-        });
-        describe('supports reordering of composition', 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();
-            });
-            it('', function () {
-                composition.reorder(1, 0);
-                let newComposition =
-                        publicAPI.objects.mutate.calls.mostRecent().args[2];
-                let reorderPlan = listener.calls.mostRecent().args[0][0];
-
-                expect(reorderPlan.oldIndex).toBe(1);
-                expect(reorderPlan.newIndex).toBe(0);
-                expect(newComposition[0].key).toEqual('b');
-                expect(newComposition[1].key).toEqual('a');
-                expect(newComposition[2].key).toEqual('c');
-            });
-            it('', function () {
-                composition.reorder(0, 2);
-                let newComposition =
-                        publicAPI.objects.mutate.calls.mostRecent().args[2];
-                let reorderPlan = listener.calls.mostRecent().args[0][0];
-
-                expect(reorderPlan.oldIndex).toBe(0);
-                expect(reorderPlan.newIndex).toBe(2);
-                expect(newComposition[0].key).toEqual('b');
-                expect(newComposition[1].key).toEqual('c');
-                expect(newComposition[2].key).toEqual('a');
-            });
-        });
-        it('supports adding an object to composition', function () {
-            let mockChildObject = {
-                identifier: {
-                    key: 'mock-key',
-                    namespace: ''
-                }
-            };
-
-            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);
-            });
-        });
-    });
-
-    describe('static custom composition', function () {
-        let customProvider;
-        let domainObject;
-        let composition;
-
-        beforeEach(function () {
-            // A simple custom provider, returns the same composition for
-            // all objects of a given type.
-            customProvider = {
-                appliesTo: function (object) {
-                    return object.type === 'custom-object-type';
-                },
-                load: function (object) {
-                    return Promise.resolve([
+                        key: '1'
+                    },
+                    composition: [
                         {
-                            namespace: 'custom',
-                            key: 'thing'
+                            namespace: 'test',
+                            key: 'a'
+                        },
+                        {
+                            namespace: 'test',
+                            key: 'b'
+                        },
+                        {
+                            namespace: 'test',
+                            key: 'c'
                         }
-                    ]);
-                },
-                add: jasmine.createSpy('add'),
-                remove: jasmine.createSpy('remove')
-            };
-            domainObject = {
-                identifier: {
-                    namespace: 'test',
-                    key: '1'
-                },
-                type: 'custom-object-type'
-            };
-            compositionAPI.addProvider(customProvider);
-            composition = compositionAPI.get(domainObject);
-        });
+                    ]
+                };
+                composition = compositionAPI.get(domainObject);
+            });
 
-        it('supports listening and loading', function () {
-            const addListener = jasmine.createSpy('addListener');
-            composition.on('add', addListener);
+            it('returns composition collection', function () {
+                expect(composition).toBeDefined();
+                expect(composition).toEqual(jasmine.any(CompositionCollection));
+            });
 
-            return composition.load().then(function (children) {
-                let listenObject;
-                const loadedObject = children[0];
+            it('correctly reflects composability', function () {
+                expect(compositionAPI.supportsComposition(domainObject)).toBe(true);
+                delete domainObject.composition;
+                expect(compositionAPI.supportsComposition(domainObject)).toBe(false);
+            });
 
-                expect(addListener).toHaveBeenCalled();
+            it('loads composition from domain object', function () {
+                const listener = jasmine.createSpy('addListener');
+                composition.on('add', listener);
 
-                listenObject = addListener.calls.mostRecent().args[0];
-                expect(listenObject).toEqual(loadedObject);
-                expect(loadedObject).toEqual({
-                    identifier: {
-                        namespace: 'custom',
-                        key: 'thing'
-                    }
+                return composition.load().then(function () {
+                    expect(listener.calls.count()).toBe(3);
+                    expect(listener).toHaveBeenCalledWith({
+                        identifier: {
+                            namespace: 'test',
+                            key: 'a'
+                        }
+                    });
                 });
             });
-        });
-        describe('Calling add or remove', function () {
-            let mockChildObject;
+            describe('supports reordering of composition', function () {
+                let listener;
+                beforeEach(function () {
+                    listener = jasmine.createSpy('reorderListener');
+                    composition.on('reorder', listener);
 
-            beforeEach(function () {
-                mockChildObject = {
+                    return composition.load();
+                });
+                it('', function () {
+                    composition.reorder(1, 0);
+                    let newComposition =
+                        publicAPI.objects.mutate.calls.mostRecent().args[2];
+                    let reorderPlan = listener.calls.mostRecent().args[0][0];
+
+                    expect(reorderPlan.oldIndex).toBe(1);
+                    expect(reorderPlan.newIndex).toBe(0);
+                    expect(newComposition[0].key).toEqual('b');
+                    expect(newComposition[1].key).toEqual('a');
+                    expect(newComposition[2].key).toEqual('c');
+                });
+                it('', function () {
+                    composition.reorder(0, 2);
+                    let newComposition =
+                        publicAPI.objects.mutate.calls.mostRecent().args[2];
+                    let reorderPlan = listener.calls.mostRecent().args[0][0];
+
+                    expect(reorderPlan.oldIndex).toBe(0);
+                    expect(reorderPlan.newIndex).toBe(2);
+                    expect(newComposition[0].key).toEqual('b');
+                    expect(newComposition[1].key).toEqual('c');
+                    expect(newComposition[2].key).toEqual('a');
+                });
+            });
+            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);
-            });
 
-            it('calls add on the provider', function () {
-                expect(customProvider.add).toHaveBeenCalledWith(domainObject, mockChildObject.identifier);
-            });
-
-            it('calls remove on the provider', function () {
-                composition.remove(mockChildObject);
-                expect(customProvider.remove).toHaveBeenCalledWith(domainObject, mockChildObject.identifier);
+                expect(domainObject.composition.length).toBe(4);
+                expect(domainObject.composition[3]).toEqual(mockChildObject.identifier);
             });
         });
-    });
 
-    describe('dynamic custom composition', function () {
-        let customProvider;
-        let domainObject;
-        let composition;
+        describe('static custom composition', function () {
+            let customProvider;
+            let domainObject;
+            let composition;
 
-        beforeEach(function () {
-            // A dynamic provider, loads an empty composition and exposes
-            // listener functions.
-            customProvider = jasmine.createSpyObj('dynamicProvider', [
-                'appliesTo',
-                'load',
-                'on',
-                'off'
-            ]);
-
-            customProvider.appliesTo.and.returnValue('true');
-            customProvider.load.and.returnValue(Promise.resolve([]));
-
-            domainObject = {
-                identifier: {
-                    namespace: 'test',
-                    key: '1'
-                },
-                type: 'custom-object-type'
-            };
-            compositionAPI.addProvider(customProvider);
-            composition = compositionAPI.get(domainObject);
-        });
-
-        it('supports listening and loading', function () {
-            const addListener = jasmine.createSpy('addListener');
-            const removeListener = jasmine.createSpy('removeListener');
-            const addPromise = new Promise(function (resolve) {
-                addListener.and.callFake(resolve);
-            });
-            const removePromise = new Promise(function (resolve) {
-                removeListener.and.callFake(resolve);
+            beforeEach(function () {
+                // A simple custom provider, returns the same composition for
+                // all objects of a given type.
+                customProvider = {
+                    appliesTo: function (object) {
+                        return object.type === 'custom-object-type';
+                    },
+                    load: function (object) {
+                        return Promise.resolve([
+                            {
+                                namespace: 'custom',
+                                key: 'thing'
+                            }
+                        ]);
+                    },
+                    add: jasmine.createSpy('add'),
+                    remove: jasmine.createSpy('remove')
+                };
+                domainObject = {
+                    identifier: {
+                        namespace: 'test',
+                        key: '1'
+                    },
+                    type: 'custom-object-type'
+                };
+                compositionAPI.addProvider(customProvider);
+                composition = compositionAPI.get(domainObject);
             });
 
-            composition.on('add', addListener);
-            composition.on('remove', removeListener);
+            it('supports listening and loading', function () {
+                const addListener = jasmine.createSpy('addListener');
+                composition.on('add', addListener);
 
-            expect(customProvider.on).toHaveBeenCalledWith(
-                domainObject,
-                'add',
-                jasmine.any(Function),
-                jasmine.any(CompositionCollection)
-            );
-            expect(customProvider.on).toHaveBeenCalledWith(
-                domainObject,
-                'remove',
-                jasmine.any(Function),
-                jasmine.any(CompositionCollection)
-            );
-            const add = customProvider.on.calls.all()[0].args[2];
-            const remove = customProvider.on.calls.all()[1].args[2];
+                return composition.load().then(function (children) {
+                    let listenObject;
+                    const loadedObject = children[0];
 
-            return composition.load()
-                .then(function () {
-                    expect(addListener).not.toHaveBeenCalled();
-                    expect(removeListener).not.toHaveBeenCalled();
-                    add({
-                        namespace: 'custom',
-                        key: 'thing'
-                    });
+                    expect(addListener).toHaveBeenCalled();
 
-                    return addPromise;
-                }).then(function () {
-                    expect(addListener).toHaveBeenCalledWith({
-                        identifier: {
-                            namespace: 'custom',
-                            key: 'thing'
-                        }
-                    });
-                    remove(addListener.calls.mostRecent().args[0]);
-
-                    return removePromise;
-                }).then(function () {
-                    expect(removeListener).toHaveBeenCalledWith({
+                    listenObject = addListener.calls.mostRecent().args[0];
+                    expect(listenObject).toEqual(loadedObject);
+                    expect(loadedObject).toEqual({
                         identifier: {
                             namespace: 'custom',
                             key: 'thing'
                         }
                     });
                 });
+            });
+            describe('Calling add or remove', function () {
+                let mockChildObject;
+
+                beforeEach(function () {
+                    mockChildObject = {
+                        identifier: {
+                            key: 'mock-key',
+                            namespace: ''
+                        }
+                    };
+                    composition.add(mockChildObject);
+                });
+
+                it('calls add on the provider', function () {
+                    expect(customProvider.add).toHaveBeenCalledWith(domainObject, mockChildObject.identifier);
+                });
+
+                it('calls remove on the provider', function () {
+                    composition.remove(mockChildObject);
+                    expect(customProvider.remove).toHaveBeenCalledWith(domainObject, mockChildObject.identifier);
+                });
+            });
+        });
+
+        describe('dynamic custom composition', function () {
+            let customProvider;
+            let domainObject;
+            let composition;
+
+            beforeEach(function () {
+                // A dynamic provider, loads an empty composition and exposes
+                // listener functions.
+                customProvider = jasmine.createSpyObj('dynamicProvider', [
+                    'appliesTo',
+                    'load',
+                    'on',
+                    'off'
+                ]);
+
+                customProvider.appliesTo.and.returnValue('true');
+                customProvider.load.and.returnValue(Promise.resolve([]));
+
+                domainObject = {
+                    identifier: {
+                        namespace: 'test',
+                        key: '1'
+                    },
+                    type: 'custom-object-type'
+                };
+                compositionAPI.addProvider(customProvider);
+                composition = compositionAPI.get(domainObject);
+            });
+
+            it('supports listening and loading', function () {
+                const addListener = jasmine.createSpy('addListener');
+                const removeListener = jasmine.createSpy('removeListener');
+                const addPromise = new Promise(function (resolve) {
+                    addListener.and.callFake(resolve);
+                });
+                const removePromise = new Promise(function (resolve) {
+                    removeListener.and.callFake(resolve);
+                });
+
+                composition.on('add', addListener);
+                composition.on('remove', removeListener);
+
+                expect(customProvider.on).toHaveBeenCalledWith(
+                    domainObject,
+                    'add',
+                    jasmine.any(Function),
+                    jasmine.any(CompositionCollection)
+                );
+                expect(customProvider.on).toHaveBeenCalledWith(
+                    domainObject,
+                    'remove',
+                    jasmine.any(Function),
+                    jasmine.any(CompositionCollection)
+                );
+                const add = customProvider.on.calls.all()[0].args[2];
+                const remove = customProvider.on.calls.all()[1].args[2];
+
+                return composition.load()
+                    .then(function () {
+                        expect(addListener).not.toHaveBeenCalled();
+                        expect(removeListener).not.toHaveBeenCalled();
+                        add({
+                            namespace: 'custom',
+                            key: 'thing'
+                        });
+
+                        return addPromise;
+                    }).then(function () {
+                        expect(addListener).toHaveBeenCalledWith({
+                            identifier: {
+                                namespace: 'custom',
+                                key: 'thing'
+                            }
+                        });
+                        remove(addListener.calls.mostRecent().args[0]);
+
+                        return removePromise;
+                    }).then(function () {
+                        expect(removeListener).toHaveBeenCalledWith({
+                            identifier: {
+                                namespace: 'custom',
+                                key: 'thing'
+                            }
+                        });
+                    });
+            });
         });
     });
 });

src/api/composition/CompositionCollection.js

@@ -20,98 +20,75 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/**
- * @typedef {import('../objects/ObjectAPI').DomainObject} DomainObject
- */
-
-/**
- * @typedef {import('./CompositionAPI').default} CompositionAPI
- */
-
-/**
- * @typedef {import('../../../openmct').OpenMCT} OpenMCT
- */
-
-/**
- * @typedef {object} ListenerMap
- * @property {Array.<any>} add
- * @property {Array.<any>} remove
- * @property {Array.<any>} load
- * @property {Array.<any>} reorder
- */
-
-/**
- * A CompositionCollection represents the list of domain objects contained
- * by another domain object. It provides methods for loading this
- * list asynchronously, modifying this list, and listening for changes to
- * this list.
- *
- * Usage:
- * ```javascript
- *  var myViewComposition = MCT.composition.get(myViewObject);
- *  myViewComposition.on('add', addObjectToView);
- *  myViewComposition.on('remove', removeObjectFromView);
- *  myViewComposition.load(); // will trigger `add` for all loaded objects.
- *  ```
- */
-export default class CompositionCollection {
-    domainObject;
-    #provider;
-    #publicAPI;
-    #listeners;
-    #mutables;
+define([
+    'lodash'
+], function (
+    _
+) {
     /**
-     * @constructor
-     * @param {DomainObject} domainObject the domain object
+     * A CompositionCollection represents the list of domain objects contained
+     * by another domain object. It provides methods for loading this
+     * list asynchronously, modifying this list, and listening for changes to
+     * this list.
+     *
+     * Usage:
+     * ```javascript
+     *  var myViewComposition = MCT.composition.get(myViewObject);
+     *  myViewComposition.on('add', addObjectToView);
+     *  myViewComposition.on('remove', removeObjectFromView);
+     *  myViewComposition.load(); // will trigger `add` for all loaded objects.
+     *  ```
+     *
+     * @interface CompositionCollection
+     * @param {module:openmct.DomainObject} domainObject the domain object
      *        whose composition will be contained
-     * @param {import('./CompositionProvider').default} provider the provider
+     * @param {module:openmct.CompositionProvider} provider the provider
      *        to use to retrieve other domain objects
-     * @param {OpenMCT} publicAPI the composition API, for
+     * @param {module:openmct.CompositionAPI} api the composition API, for
      *        policy checks
+     * @memberof module:openmct
      */
-    constructor(domainObject, provider, publicAPI) {
+    function CompositionCollection(domainObject, provider, publicAPI) {
         this.domainObject = domainObject;
-        /** @type {import('./CompositionProvider').default} */
-        this.#provider = provider;
-        /** @type {OpenMCT} */
-        this.#publicAPI = publicAPI;
-        /** @type {ListenerMap} */
-        this.#listeners = {
+        this.provider = provider;
+        this.publicAPI = publicAPI;
+        this.listeners = {
             add: [],
             remove: [],
             load: [],
             reorder: []
         };
-        this.onProviderAdd = this.#onProviderAdd.bind(this);
-        this.onProviderRemove = this.#onProviderRemove.bind(this);
-        this.#mutables = {};
+        this.onProviderAdd = this.onProviderAdd.bind(this);
+        this.onProviderRemove = this.onProviderRemove.bind(this);
+        this.mutables = {};
 
         if (this.domainObject.isMutable) {
             this.returnMutables = true;
             let unobserve = this.domainObject.$on('$_destroy', () => {
-                Object.values(this.#mutables).forEach(mutable => {
-                    this.#publicAPI.objects.destroyMutable(mutable);
+                Object.values(this.mutables).forEach(mutable => {
+                    this.publicAPI.objects.destroyMutable(mutable);
                 });
                 unobserve();
             });
         }
     }
+
     /**
      * Listen for changes to this composition.  Supports 'add', 'remove', and
      * 'load' events.
      *
-     * @param {string} event event to listen for, either 'add', 'remove' or 'load'.
-     * @param {(...args: any[]) => void} callback to trigger when event occurs.
-     * @param {any} [context] to use when invoking callback, optional.
+     * @param event event to listen for, either 'add', 'remove' or 'load'.
+     * @param callback to trigger when event occurs.
+     * @param [context] context to use when invoking callback, optional.
      */
-    on(event, callback, context) {
-        if (!this.#listeners[event]) {
+    CompositionCollection.prototype.on = function (event, callback, context) {
+        if (!this.listeners[event]) {
             throw new Error('Event not supported by composition: ' + event);
         }
 
-        if (this.#provider.on && this.#provider.off) {
+        if (this.provider.on && this.provider.off) {
             if (event === 'add') {
-                this.#provider.on(
+                this.provider.on(
                     this.domainObject,
                     'add',
                     this.onProviderAdd,
@@ -120,7 +97,7 @@ export default class CompositionCollection {
             }
 
             if (event === 'remove') {
-                this.#provider.on(
+                this.provider.on(
                     this.domainObject,
                     'remove',
                     this.onProviderRemove,
@@ -129,34 +106,36 @@ export default class CompositionCollection {
             }
 
             if (event === 'reorder') {
-                this.#provider.on(
+                this.provider.on(
                     this.domainObject,
                     'reorder',
-                    this.#onProviderReorder,
+                    this.onProviderReorder,
                     this
                 );
             }
         }
 
-        this.#listeners[event].push({
+        this.listeners[event].push({
             callback: callback,
             context: context
         });
-    }
+    };
+
     /**
      * Remove a listener.  Must be called with same exact parameters as
      * `off`.
      *
-     * @param {string} event
-     * @param {(...args: any[]) => void} callback
-     * @param {any} [context]
+     * @param event
+     * @param callback
+     * @param [context]
      */
-    off(event, callback, context) {
-        if (!this.#listeners[event]) {
+
+    CompositionCollection.prototype.off = function (event, callback, context) {
+        if (!this.listeners[event]) {
             throw new Error('Event not supported by composition: ' + event);
         }
 
-        const index = this.#listeners[event].findIndex(l => {
+        const index = this.listeners[event].findIndex(l => {
             return l.callback === callback && l.context === context;
         });
 
@@ -164,116 +143,125 @@ export default class CompositionCollection {
             throw new Error('Tried to remove a listener that does not exist');
         }
 
-        this.#listeners[event].splice(index, 1);
-        if (this.#listeners[event].length === 0) {
+        this.listeners[event].splice(index, 1);
+        if (this.listeners[event].length === 0) {
             this._destroy();
 
             // Remove provider listener if this is the last callback to
             // be removed.
-            if (this.#provider.off && this.#provider.on) {
+            if (this.provider.off && this.provider.on) {
                 if (event === 'add') {
-                    this.#provider.off(
+                    this.provider.off(
                         this.domainObject,
                         'add',
                         this.onProviderAdd,
                         this
                     );
                 } else if (event === 'remove') {
-                    this.#provider.off(
+                    this.provider.off(
                         this.domainObject,
                         'remove',
                         this.onProviderRemove,
                         this
                     );
                 } else if (event === 'reorder') {
-                    this.#provider.off(
+                    this.provider.off(
                         this.domainObject,
                         'reorder',
-                        this.#onProviderReorder,
+                        this.onProviderReorder,
                         this
                     );
                 }
             }
         }
-    }
+    };
+
     /**
      * Add a domain object to this composition.
      *
      * A call to [load]{@link module:openmct.CompositionCollection#load}
      * must have resolved before using this method.
      *
-     * **TODO:** Remove `skipMutate` parameter.
-     *
-     * @param {DomainObject} child the domain object to add
-     * @param {boolean} skipMutate
-     * **Intended for internal use ONLY.**
-     * true if the underlying provider should not be updated.
+     * @param {module:openmct.DomainObject} child the domain object to add
+     * @param {boolean} skipMutate true if the underlying provider should
+     *        not be updated
+     * @memberof module:openmct.CompositionCollection#
+     * @name add
      */
-    add(child, skipMutate) {
+    CompositionCollection.prototype.add = function (child, skipMutate) {
         if (!skipMutate) {
-            if (!this.#publicAPI.composition.checkPolicy(this.domainObject, child)) {
+            if (!this.publicAPI.composition.checkPolicy(this.domainObject, child)) {
                 throw `Object of type ${child.type} cannot be added to object of type ${this.domainObject.type}`;
             }
 
-            this.#provider.add(this.domainObject, child.identifier);
+            this.provider.add(this.domainObject, child.identifier);
         } else {
-            if (this.returnMutables && this.#publicAPI.objects.supportsMutation(child.identifier)) {
-                let keyString = this.#publicAPI.objects.makeKeyString(child.identifier);
+            if (this.returnMutables && this.publicAPI.objects.supportsMutation(child.identifier)) {
+                let keyString = this.publicAPI.objects.makeKeyString(child.identifier);
 
-                child = this.#publicAPI.objects.toMutable(child);
-                this.#mutables[keyString] = child;
+                child = this.publicAPI.objects.toMutable(child);
+                this.mutables[keyString] = child;
             }
 
-            this.#emit('add', child);
+            this.emit('add', child);
         }
-    }
+    };
+
     /**
      * Load the domain objects in this composition.
      *
-     * @param {AbortSignal} abortSignal
-     * @returns {Promise.<Array.<DomainObject>>} a promise for
+     * @returns {Promise.<Array.<module:openmct.DomainObject>>} a promise for
      *          the domain objects in this composition
      * @memberof {module:openmct.CompositionCollection#}
      * @name load
      */
-    async load(abortSignal) {
-        this.#cleanUpMutables();
-        const children = await this.#provider.load(this.domainObject);
-        const childObjects = await Promise.all(children.map((c) => this.#publicAPI.objects.get(c, abortSignal)));
-        childObjects.forEach(c => this.add(c, true));
-        this.#emit('load');
+    CompositionCollection.prototype.load = function (abortSignal) {
+        this.cleanUpMutables();
+
+        return this.provider.load(this.domainObject)
+            .then(function (children) {
+                return Promise.all(children.map((c) => this.publicAPI.objects.get(c, abortSignal)));
+            }.bind(this))
+            .then(function (childObjects) {
+                childObjects.forEach(c => this.add(c, true));
+
+                return childObjects;
+            }.bind(this))
+            .then(function (children) {
+                this.emit('load');
+
+                return children;
+            }.bind(this));
+    };
 
-        return childObjects;
-    }
     /**
      * Remove a domain object from this composition.
      *
      * A call to [load]{@link module:openmct.CompositionCollection#load}
      * must have resolved before using this method.
      *
-     * **TODO:** Remove `skipMutate` parameter.
-     *
-     * @param {DomainObject} child the domain object to remove
-     * @param {boolean} skipMutate
-     * **Intended for internal use ONLY.**
-     * true if the underlying provider should not be updated.
+     * @param {module:openmct.DomainObject} child the domain object to remove
+     * @param {boolean} skipMutate true if the underlying provider should
+     *        not be updated
+     * @memberof module:openmct.CompositionCollection#
      * @name remove
      */
-    remove(child, skipMutate) {
+    CompositionCollection.prototype.remove = function (child, skipMutate) {
         if (!skipMutate) {
-            this.#provider.remove(this.domainObject, child.identifier);
+            this.provider.remove(this.domainObject, child.identifier);
         } else {
             if (this.returnMutables) {
-                let keyString = this.#publicAPI.objects.makeKeyString(child);
-                if (this.#mutables[keyString] !== undefined && this.#mutables[keyString].isMutable) {
-                    this.#publicAPI.objects.destroyMutable(this.#mutables[keyString]);
-                    delete this.#mutables[keyString];
+                let keyString = this.publicAPI.objects.makeKeyString(child);
+                if (this.mutables[keyString] !== undefined && this.mutables[keyString].isMutable) {
+                    this.publicAPI.objects.destroyMutable(this.mutables[keyString]);
+                    delete this.mutables[keyString];
                 }
             }
 
-            this.#emit('remove', child);
+            this.emit('remove', child);
         }
-    }
+    };
+
     /**
      * Reorder the domain objects in this composition.
      *
@@ -282,75 +270,67 @@ export default class CompositionCollection {
      *
      * @param {number} oldIndex
      * @param {number} newIndex
+     * @memberof module:openmct.CompositionCollection#
      * @name remove
      */
-    reorder(oldIndex, newIndex, _skipMutate) {
-        this.#provider.reorder(this.domainObject, oldIndex, newIndex);
-    }
-    /**
-     * Destroy mutationListener
-     */
-    _destroy() {
-        if (this.mutationListener) {
-            this.mutationListener();
-            delete this.mutationListener;
-        }
-    }
+    CompositionCollection.prototype.reorder = function (oldIndex, newIndex, skipMutate) {
+        this.provider.reorder(this.domainObject, oldIndex, newIndex);
+    };
+
     /**
      * Handle reorder from provider.
      * @private
-     * @param {object} reorderMap
      */
-    #onProviderReorder(reorderMap) {
-        this.#emit('reorder', reorderMap);
-    }
+    CompositionCollection.prototype.onProviderReorder = function (reorderMap) {
+        this.emit('reorder', reorderMap);
+    };
 
     /**
      * Handle adds from provider.
      * @private
-     * @param {import('../objects/ObjectAPI').Identifier} childId
-     * @returns {DomainObject}
      */
-    #onProviderAdd(childId) {
-        return this.#publicAPI.objects.get(childId).then(function (child) {
+    CompositionCollection.prototype.onProviderAdd = function (childId) {
+        return this.publicAPI.objects.get(childId).then(function (child) {
             this.add(child, true);
 
             return child;
         }.bind(this));
-    }
+    };
 
     /**
      * Handle removal from provider.
-     * @param {DomainObject} child
+     * @private
      */
-    #onProviderRemove(child) {
+    CompositionCollection.prototype.onProviderRemove = function (child) {
         this.remove(child, true);
-    }
+    };
+
+    CompositionCollection.prototype._destroy = function () {
+        if (this.mutationListener) {
+            this.mutationListener();
+            delete this.mutationListener;
+        }
+    };
 
     /**
      * Emit events.
-     *
      * @private
-     * @param {string} event
-     * @param {...args.<any>} payload
      */
-    #emit(event, ...payload) {
-        this.#listeners[event].forEach(function (l) {
+    CompositionCollection.prototype.emit = function (event, ...payload) {
+        this.listeners[event].forEach(function (l) {
             if (l.context) {
                 l.callback.apply(l.context, payload);
             } else {
                 l.callback(...payload);
             }
         });
-    }
+    };
 
-    /**
-     * Destroy all mutables.
-     * @private
-     */
-    #cleanUpMutables() {
-        Object.values(this.#mutables).forEach(mutable => {
-            this.#publicAPI.objects.destroyMutable(mutable);
+    CompositionCollection.prototype.cleanUpMutables = function () {
+        Object.values(this.mutables).forEach(mutable => {
+            this.publicAPI.objects.destroyMutable(mutable);
         });
-    }
-}
+    };
+
+    return CompositionCollection;
+});

src/api/composition/CompositionProvider.js

@@ -1,260 +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 _ from 'lodash';
-import objectUtils from "../objects/object-utils";
-
-/**
-  * @typedef {import('../objects/ObjectAPI').DomainObject} DomainObject
-  */
-
-/**
-  * @typedef {import('../objects/ObjectAPI').Identifier} Identifier
-  */
-
-/**
-  * @typedef {import('./CompositionAPI').default} CompositionAPI
-  */
-
-/**
-  * @typedef {import('../../../openmct').OpenMCT} OpenMCT
-  */
-
-/**
-  * A CompositionProvider provides the underlying implementation of
-  * composition-related behavior for certain types of domain object.
-  *
-  * By default, a composition provider will not support composition
-  * modification.  You can add support for mutation of composition by
-  * defining `add` and/or `remove` methods.
-  *
-  * If the composition of an object can change over time-- perhaps via
-  * server updates or mutation via the add/remove methods, then one must
-  * trigger events as necessary.
-  *
-  */
-export default class CompositionProvider {
-    #publicAPI;
-    #listeningTo;
-
-    /**
-      * @param {OpenMCT} publicAPI
-      * @param {CompositionAPI} compositionAPI
-      */
-    constructor(publicAPI, compositionAPI) {
-        this.#publicAPI = publicAPI;
-        this.#listeningTo = {};
-
-        compositionAPI.addPolicy(this.#cannotContainItself.bind(this));
-        compositionAPI.addPolicy(this.#supportsComposition.bind(this));
-    }
-
-    get listeningTo() {
-        return this.#listeningTo;
-    }
-
-    get establishTopicListener() {
-        return this.#establishTopicListener.bind(this);
-    }
-
-    get publicAPI() {
-        return this.#publicAPI;
-    }
-
-    /**
-      * Check if this provider should be used to load composition for a
-      * particular domain object.
-      * @method appliesTo
-      * @param {import('../objects/ObjectAPI').DomainObject} domainObject the domain object
-      *        to check
-      * @returns {boolean} true if this provider can provide composition for a given domain object
-      */
-    appliesTo(domainObject) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-    /**
-      * Load any domain objects contained in the composition of this domain
-      * object.
-      * @param {DomainObject} domainObject the domain object
-      *        for which to load composition
-      * @returns {Promise<Identifier[]>} a promise for
-      *          the Identifiers in this composition
-      * @method load
-      */
-    load(domainObject) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-    /**
-      * Attach listeners for changes to the composition of a given domain object.
-      * Supports `add` and `remove` events.
-      *
-      * @param {DomainObject} domainObject to listen to
-      * @param {string} event the event to bind to, either `add` or `remove`.
-      * @param {Function} callback callback to invoke when event is triggered.
-      * @param {any} [context] to use when invoking callback.
-      */
-    on(domainObject,
-        event,
-        callback,
-        context) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-    /**
-      * Remove a listener that was previously added for a given domain object.
-      * event name, callback, and context must be the same as when the listener
-      * was originally attached.
-      *
-      * @param {DomainObject} domainObject to remove listener for
-      * @param {string} event event to stop listening to: `add` or `remove`.
-      * @param {Function} callback callback to remove.
-      * @param {any} context of callback to remove.
-      */
-    off(domainObject,
-        event,
-        callback,
-        context) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-    /**
-      * Remove a domain object from another domain object's composition.
-      *
-      * This method is optional; if not present, adding to a domain object's
-      * composition using this provider will be disallowed.
-      *
-      * @param {DomainObject} domainObject the domain object
-      *        which should have its composition modified
-      * @param {Identifier} childId the domain object to remove
-      * @method remove
-      */
-    remove(domainObject, childId) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-    /**
-      * Add a domain object to another domain object's composition.
-      *
-      * This method is optional; if not present, adding to a domain object's
-      * composition using this provider will be disallowed.
-      *
-      * @param {DomainObject} parent the domain object
-      *        which should have its composition modified
-      * @param {Identifier} childId the domain object to add
-      * @method add
-      */
-    add(parent, childId) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-
-    /**
-      * @param {DomainObject} parent
-      * @param {Identifier} childId
-      * @returns {boolean}
-      */
-    includes(parent, childId) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-
-    /**
-      * @param {DomainObject} domainObject
-      * @param {number} oldIndex
-      * @param {number} newIndex
-      * @returns
-      */
-    reorder(domainObject, oldIndex, newIndex) {
-        throw new Error("This method must be implemented by a subclass.");
-    }
-
-    /**
-      * Listens on general mutation topic, using injector to fetch to avoid
-      * circular dependencies.
-      * @private
-      */
-    #establishTopicListener() {
-        if (this.topicListener) {
-            return;
-        }
-
-        this.#publicAPI.objects.eventEmitter.on('mutation', this.#onMutation.bind(this));
-        this.topicListener = () => {
-            this.#publicAPI.objects.eventEmitter.off('mutation', this.#onMutation.bind(this));
-        };
-    }
-
-    /**
-      * @private
-      * @param {DomainObject} parent
-      * @param {DomainObject} child
-      * @returns {boolean}
-      */
-    #cannotContainItself(parent, child) {
-        return !(parent.identifier.namespace === child.identifier.namespace
-               && parent.identifier.key === child.identifier.key);
-    }
-
-    /**
-      * @private
-      * @param {DomainObject} parent
-      * @returns {boolean}
-      */
-    #supportsComposition(parent, _child) {
-        return this.#publicAPI.composition.supportsComposition(parent);
-    }
-
-    /**
-      * Handles mutation events.  If there are active listeners for the mutated
-      * object, detects changes to composition and triggers necessary events.
-      *
-      * @private
-      * @param {DomainObject} oldDomainObject
-      */
-    #onMutation(newDomainObject, oldDomainObject) {
-        const id = objectUtils.makeKeyString(oldDomainObject.identifier);
-        const listeners = this.#listeningTo[id];
-
-        if (!listeners) {
-            return;
-        }
-
-        const oldComposition = oldDomainObject.composition.map(objectUtils.makeKeyString);
-        const newComposition = newDomainObject.composition.map(objectUtils.makeKeyString);
-
-        const added = _.difference(newComposition, oldComposition).map(objectUtils.parseKeyString);
-        const removed = _.difference(oldComposition, newComposition).map(objectUtils.parseKeyString);
-
-        function notify(value) {
-            return function (listener) {
-                if (listener.context) {
-                    listener.callback.call(listener.context, value);
-                } else {
-                    listener.callback(value);
-                }
-            };
-        }
-
-        added.forEach(function (addedChild) {
-            listeners.add.forEach(notify(addedChild));
-        });
-
-        removed.forEach(function (removedChild) {
-            listeners.remove.forEach(notify(removedChild));
-        });
-    }
-}
-

src/api/composition/DefaultCompositionProvider.js

@@ -19,79 +19,102 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import objectUtils from "../objects/object-utils";
-import CompositionProvider from './CompositionProvider';
 
-/**
- * @typedef {import('../objects/ObjectAPI').DomainObject} DomainObject
- */
+define([
+    'lodash',
+    'objectUtils'
+], function (
+    _,
+    objectUtils
+) {
+    /**
+     * A CompositionProvider provides the underlying implementation of
+     * composition-related behavior for certain types of domain object.
+     *
+     * By default, a composition provider will not support composition
+     * modification.  You can add support for mutation of composition by
+     * defining `add` and/or `remove` methods.
+     *
+     * If the composition of an object can change over time-- perhaps via
+     * server updates or mutation via the add/remove methods, then one must
+     * trigger events as necessary.
+     *
+     * @interface CompositionProvider
+     * @memberof module:openmct
+     */
 
-/**
- * @typedef {import('../objects/ObjectAPI').Identifier} Identifier
- */
+    function DefaultCompositionProvider(publicAPI, compositionAPI) {
+        this.publicAPI = publicAPI;
+        this.listeningTo = {};
+        this.onMutation = this.onMutation.bind(this);
 
-/**
- * @typedef {import('./CompositionAPI').default} CompositionAPI
- */
+        this.cannotContainItself = this.cannotContainItself.bind(this);
+        this.supportsComposition = this.supportsComposition.bind(this);
 
-/**
- * @typedef {import('../../../openmct').OpenMCT} OpenMCT
- */
+        compositionAPI.addPolicy(this.cannotContainItself);
+        compositionAPI.addPolicy(this.supportsComposition);
+    }
+
+    /**
+     * @private
+     */
+    DefaultCompositionProvider.prototype.cannotContainItself = function (parent, child) {
+        return !(parent.identifier.namespace === child.identifier.namespace
+            && parent.identifier.key === child.identifier.key);
+    };
+
+    /**
+     * @private
+     */
+    DefaultCompositionProvider.prototype.supportsComposition = function (parent, child) {
+        return this.publicAPI.composition.supportsComposition(parent);
+    };
 
-/**
- * A CompositionProvider provides the underlying implementation of
- * composition-related behavior for certain types of domain object.
- *
- * By default, a composition provider will not support composition
- * modification.  You can add support for mutation of composition by
- * defining `add` and/or `remove` methods.
- *
- * If the composition of an object can change over time-- perhaps via
- * server updates or mutation via the add/remove methods, then one must
- * trigger events as necessary.
- * @extends CompositionProvider
- */
-export default class DefaultCompositionProvider extends CompositionProvider {
     /**
      * Check if this provider should be used to load composition for a
      * particular domain object.
-     * @override
-     * @param {DomainObject} domainObject the domain object
+     * @param {module:openmct.DomainObject} domainObject the domain object
      *        to check
-     * @returns {boolean} true if this provider can provide composition for a given domain object
+     * @returns {boolean} true if this provider can provide
+     *          composition for a given domain object
+     * @memberof module:openmct.CompositionProvider#
+     * @method appliesTo
      */
-    appliesTo(domainObject) {
+    DefaultCompositionProvider.prototype.appliesTo = function (domainObject) {
         return Boolean(domainObject.composition);
-    }
+    };
+
     /**
      * Load any domain objects contained in the composition of this domain
      * object.
-     * @override
-     * @param {DomainObject} domainObject the domain object
+     * @param {module:openmct.DomainObject} domainObject the domain object
      *        for which to load composition
-     * @returns {Promise<Identifier[]>} a promise for
+     * @returns {Promise.<Array.<module:openmct.Identifier>>} a promise for
      *          the Identifiers in this composition
+     * @memberof module:openmct.CompositionProvider#
+     * @method load
      */
-    load(domainObject) {
+    DefaultCompositionProvider.prototype.load = function (domainObject) {
         return Promise.all(domainObject.composition);
-    }
+    };
+
     /**
      * Attach listeners for changes to the composition of a given domain object.
      * Supports `add` and `remove` events.
      *
-     * @override
-     * @param {DomainObject} domainObject to listen to
-     * @param {string} event the event to bind to, either `add` or `remove`.
-     * @param {Function} callback callback to invoke when event is triggered.
-     * @param {any} [context] to use when invoking callback.
+     * @param {module:openmct.DomainObject} domainObject to listen to
+     * @param String event the event to bind to, either `add` or `remove`.
+     * @param Function callback callback to invoke when event is triggered.
+     * @param [context] context to use when invoking callback.
      */
-    on(domainObject,
+    DefaultCompositionProvider.prototype.on = function (
+        domainObject,
         event,
         callback,
-        context) {
+        context
+    ) {
         this.establishTopicListener();
 
-        /** @type {string} */
         const keyString = objectUtils.makeKeyString(domainObject.identifier);
         let objectListeners = this.listeningTo[keyString];
 
@@ -99,7 +122,8 @@ export default class DefaultCompositionProvider extends CompositionProvider {
             objectListeners = this.listeningTo[keyString] = {
                 add: [],
                 remove: [],
-                reorder: []
+                reorder: [],
+                composition: [].slice.apply(domainObject.composition)
             };
         }
 
@@ -107,24 +131,24 @@ export default class DefaultCompositionProvider extends CompositionProvider {
             callback: callback,
             context: context
         });
-    }
+    };
+
     /**
      * Remove a listener that was previously added for a given domain object.
      * event name, callback, and context must be the same as when the listener
      * was originally attached.
      *
-     * @override
-     * @param {DomainObject} domainObject to remove listener for
-     * @param {string} event event to stop listening to: `add` or `remove`.
-     * @param {Function} callback callback to remove.
-     * @param {any} context of callback to remove.
+     * @param {module:openmct.DomainObject} domainObject to remove listener for
+     * @param String event event to stop listening to: `add` or `remove`.
+     * @param Function callback callback to remove.
+     * @param [context] context of callback to remove.
      */
-    off(domainObject,
+    DefaultCompositionProvider.prototype.off = function (
+        domainObject,
         event,
         callback,
-        context) {
-
-        /** @type {string} */
+        context
+    ) {
         const keyString = objectUtils.makeKeyString(domainObject.identifier);
         const objectListeners = this.listeningTo[keyString];
 
@@ -136,65 +160,57 @@ export default class DefaultCompositionProvider extends CompositionProvider {
         if (!objectListeners.add.length && !objectListeners.remove.length && !objectListeners.reorder.length) {
             delete this.listeningTo[keyString];
         }
-    }
+    };
+
     /**
      * Remove a domain object from another domain object's composition.
      *
      * This method is optional; if not present, adding to a domain object's
      * composition using this provider will be disallowed.
      *
-     * @override
-     * @param {DomainObject} domainObject the domain object
+     * @param {module:openmct.DomainObject} domainObject the domain object
      *        which should have its composition modified
-     * @param {Identifier} childId the domain object to remove
+     * @param {module:openmct.DomainObject} child the domain object to remove
+     * @memberof module:openmct.CompositionProvider#
      * @method remove
      */
-    remove(domainObject, childId) {
+    DefaultCompositionProvider.prototype.remove = function (domainObject, childId) {
         let composition = domainObject.composition.filter(function (child) {
             return !(childId.namespace === child.namespace
-                      && childId.key === child.key);
+                && childId.key === child.key);
         });
 
         this.publicAPI.objects.mutate(domainObject, 'composition', composition);
-    }
+    };
+
     /**
      * Add a domain object to another domain object's composition.
      *
      * This method is optional; if not present, adding to a domain object's
      * composition using this provider will be disallowed.
      *
-     * @override
-     * @param {DomainObject} parent the domain object
+     * @param {module:openmct.DomainObject} domainObject the domain object
      *        which should have its composition modified
-     * @param {Identifier} childId the domain object to add
+     * @param {module:openmct.DomainObject} child the domain object to add
+     * @memberof module:openmct.CompositionProvider#
      * @method add
      */
-    add(parent, childId) {
+    DefaultCompositionProvider.prototype.add = function (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);
         }
-    }
+    };
 
     /**
-     * @override
-     * @param {DomainObject} parent
-     * @param {Identifier} childId
-     * @returns {boolean}
+     * @private
      */
-    includes(parent, childId) {
-        return parent.composition.some(composee => this.publicAPI.objects.areIdsEqual(composee, childId));
-    }
+    DefaultCompositionProvider.prototype.includes = function (parent, childId) {
+        return parent.composition.some(composee =>
+            this.publicAPI.objects.areIdsEqual(composee, childId));
+    };
 
-    /**
-     * @override
-     * @param {DomainObject} domainObject
-     * @param {number} oldIndex
-     * @param {number} newIndex
-     * @returns
-     */
-    reorder(domainObject, oldIndex, newIndex) {
+    DefaultCompositionProvider.prototype.reorder = function (domainObject, oldIndex, newIndex) {
         let newComposition = domainObject.composition.slice();
         let removeId = oldIndex > newIndex ? oldIndex + 1 : oldIndex;
         let insertPosition = oldIndex < newIndex ? newIndex + 1 : newIndex;
@@ -225,7 +241,6 @@ export default class DefaultCompositionProvider extends CompositionProvider {
 
         this.publicAPI.objects.mutate(domainObject, 'composition', newComposition);
 
-        /** @type {string} */
         let id = objectUtils.makeKeyString(domainObject.identifier);
         const listeners = this.listeningTo[id];
 
@@ -242,5 +257,66 @@ export default class DefaultCompositionProvider extends CompositionProvider {
                 listener.callback(reorderPlan);
             }
         }
-    }
-}
+    };
+
+    /**
+     * Listens on general mutation topic, using injector to fetch to avoid
+     * circular dependencies.
+     *
+     * @private
+     */
+    DefaultCompositionProvider.prototype.establishTopicListener = function () {
+        if (this.topicListener) {
+            return;
+        }
+
+        this.publicAPI.objects.eventEmitter.on('mutation', this.onMutation);
+        this.topicListener = () => {
+            this.publicAPI.objects.eventEmitter.off('mutation', this.onMutation);
+        };
+    };
+
+    /**
+     * Handles mutation events.  If there are active listeners for the mutated
+     * object, detects changes to composition and triggers necessary events.
+     *
+     * @private
+     */
+    DefaultCompositionProvider.prototype.onMutation = function (oldDomainObject) {
+        const id = objectUtils.makeKeyString(oldDomainObject.identifier);
+        const listeners = this.listeningTo[id];
+
+        if (!listeners) {
+            return;
+        }
+
+        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);
+
+        function notify(value) {
+            return function (listener) {
+                if (listener.context) {
+                    listener.callback.call(listener.context, value);
+                } else {
+                    listener.callback(value);
+                }
+            };
+        }
+
+        listeners.composition = newComposition.map(objectUtils.parseKeyString);
+
+        added.forEach(function (addedChild) {
+            listeners.add.forEach(notify(addedChild));
+        });
+
+        removed.forEach(function (removedChild) {
+            listeners.remove.forEach(notify(removedChild));
+        });
+
+    };
+
+    return DefaultCompositionProvider;
+});

src/api/forms/FormsAPI.js

@@ -23,11 +23,13 @@
 import FormController from './FormController';
 import FormProperties from './components/FormProperties.vue';
 
+import EventEmitter from 'EventEmitter';
 import Vue from 'vue';
-import _ from 'lodash';
 
-export default class FormsAPI {
+export default class FormsAPI extends EventEmitter {
     constructor(openmct) {
+        super();
+
         this.openmct = openmct;
         this.formController = new FormController(openmct);
     }
@@ -90,75 +92,29 @@ export default class FormsAPI {
 
     /**
      * Show form inside an Overlay dialog with given form structure
-     * @public
-     * @param {Array<Section>} formStructure a form structure, array of section
-     * @param {Object} options
-     *      @property {function} onChange a callback function when any changes detected
-     */
-    showForm(formStructure, {
-        onChange
-    } = {}) {
-        let overlay;
-
-        const self = this;
-
-        const overlayEl = document.createElement('div');
-        overlayEl.classList.add('u-contents');
-
-        overlay = self.openmct.overlays.overlay({
-            element: overlayEl,
-            size: 'dialog'
-        });
-
-        let formSave;
-        let formCancel;
-        const promise = new Promise((resolve, reject) => {
-            formSave = resolve;
-            formCancel = reject;
-        });
-
-        this.showCustomForm(formStructure, {
-            element: overlayEl,
-            onChange
-        })
-            .then((response) => {
-                overlay.dismiss();
-                formSave(response);
-            })
-            .catch((response) => {
-                overlay.dismiss();
-                formCancel(response);
-            });
-
-        return promise;
-    }
-
-    /**
-     * Show form as a child of the element provided with given form structure
      *
      * @public
      * @param {Array<Section>} formStructure a form structure, array of section
      * @param {Object} options
      *      @property {HTMLElement} element Parent Element to render a Form
      *      @property {function} onChange a callback function when any changes detected
+     *      @property {function} onSave a callback function when form is submitted
+     *      @property {function} onDismiss a callback function when form is dismissed
      */
-    showCustomForm(formStructure, {
+    showForm(formStructure, {
         element,
         onChange
     } = {}) {
-        if (element === undefined) {
-            throw Error('Required element parameter not provided');
-        }
+        const changes = {};
+        let overlay;
+        let onDismiss;
+        let onSave;
 
         const self = this;
 
-        const changes = {};
-        let formSave;
-        let formCancel;
-
         const promise = new Promise((resolve, reject) => {
-            formSave = onFormAction(resolve);
-            formCancel = onFormAction(reject);
+            onSave = onFormAction(resolve);
+            onDismiss = onFormAction(reject);
         });
 
         const vm = new Vue({
@@ -170,17 +126,26 @@ export default class FormsAPI {
                 return {
                     formStructure,
                     onChange: onFormPropertyChange,
-                    onCancel: formCancel,
-                    onSave: formSave
+                    onDismiss,
+                    onSave
                 };
             },
-            template: '<FormProperties :model="formStructure" @onChange="onChange" @onCancel="onCancel" @onSave="onSave"></FormProperties>'
+            template: '<FormProperties :model="formStructure" @onChange="onChange" @onDismiss="onDismiss" @onSave="onSave"></FormProperties>'
         }).$mount();
 
         const formElement = vm.$el;
-        element.append(formElement);
+        if (element) {
+            element.append(formElement);
+        } else {
+            overlay = self.openmct.overlays.overlay({
+                element: vm.$el,
+                size: 'dialog',
+                onDestroy: () => vm.$destroy()
+            });
+        }
 
         function onFormPropertyChange(data) {
+            self.emit('onFormPropertyChange', data);
             if (onChange) {
                 onChange(data);
             }
@@ -193,14 +158,17 @@ export default class FormsAPI {
                     key = property.join('.');
                 }
 
-                _.set(changes, key, data.value);
+                changes[key] = data.value;
             }
         }
 
         function onFormAction(callback) {
             return () => {
-                formElement.remove();
-                vm.$destroy();
+                if (element) {
+                    formElement.remove();
+                } else {
+                    overlay.dismiss();
+                }
 
                 if (callback) {
                     callback(changes);

src/api/forms/FormsAPISpec.js

@@ -133,7 +133,7 @@ describe('The Forms API', () => {
         });
 
         it('when container element is provided', (done) => {
-            openmct.forms.showCustomForm(formStructure, { element }).catch(() => {
+            openmct.forms.showForm(formStructure, { element }).catch(() => {
                 done();
             });
             const titleElement = element.querySelector('.c-overlay__dialog-title');

src/api/forms/components/FormProperties.vue

@@ -73,7 +73,7 @@
             tabindex="0"
             class="c-button js-cancel-button"
             aria-label="Cancel"
-            @click="onCancel"
+            @click="onDismiss"
         >
             {{ cancelLabel }}
         </button>
@@ -164,8 +164,8 @@ export default {
 
             this.$emit('onChange', data);
         },
-        onCancel() {
-            this.$emit('onCancel');
+        onDismiss() {
+            this.$emit('onDismiss');
         },
         onSave() {
             this.$emit('onSave');

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/forms/components/controls/SelectField.vue

@@ -26,7 +26,6 @@
         v-model="selected"
         required="model.required"
         name="mctControl"
-        :aria-label="model.ariaLabel || model.name"
         @change="onChange($event)"
     >
         <option

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

@@ -27,7 +27,6 @@
         :class="model.cssClass"
     >
         <textarea
-            :id="`${model.key}-textarea`"
             v-model="field"
             type="text"
             :size="model.size"

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

@@ -29,7 +29,6 @@
         <ToggleSwitch
             id="switchId"
             :checked="isChecked"
-            :name="model.name"
             @change="toggleCheckBox"
         />
     </span>

src/api/menu/components/Menu.vue

@@ -3,52 +3,39 @@
     class="c-menu"
     :class="options.menuClass"
 >
-    <ul
-        v-if="options.actions.length && options.actions[0].length"
-        role="menu"
-    >
+    <ul v-if="options.actions.length && options.actions[0].length">
         <template
             v-for="(actionGroups, index) in options.actions"
         >
-            <div
-                :key="index"
-                role="group"
+            <li
+                v-for="action in actionGroups"
+                :key="action.name"
+                :class="[action.cssClass, action.isDisabled ? 'disabled' : '']"
+                :title="action.description"
+                :data-testid="action.testId || false"
+                @click="action.onItemClicked"
             >
-                <li
-                    v-for="action in actionGroups"
-                    :key="action.name"
-                    role="menuitem"
-                    :class="[action.cssClass, action.isDisabled ? 'disabled' : '']"
-                    :title="action.description"
-                    :data-testid="action.testId || false"
-                    @click="action.onItemClicked"
-                >
-                    {{ action.name }}
-                </li>
-                <div
-                    v-if="index !== options.actions.length - 1"
-                    :key="index"
-                    role="separator"
-                    class="c-menu__section-separator"
-                >
-                </div>
-                <li
-                    v-if="actionGroups.length === 0"
-                    :key="index"
-                >
-                    No actions defined.
-                </li>
-            </div></template>
+                {{ action.name }}
+            </li>
+            <div
+                v-if="index !== options.actions.length - 1"
+                :key="index"
+                class="c-menu__section-separator"
+            >
+            </div>
+            <li
+                v-if="actionGroups.length === 0"
+                :key="index"
+            >
+                No actions defined.
+            </li>
+        </template>
     </ul>
 
-    <ul
-        v-else
-        role="menu"
-    >
+    <ul v-else>
         <li
             v-for="action in options.actions"
             :key="action.name"
-            role="menuitem"
             :class="[action.cssClass, action.isDisabled ? 'disabled' : '']"
             :title="action.description"
             :data-testid="action.testId || false"

src/api/menu/components/SuperMenu.vue

@@ -5,54 +5,45 @@
 >
     <ul
         v-if="options.actions.length && options.actions[0].length"
-        role="menu"
         class="c-super-menu__menu"
     >
         <template
             v-for="(actionGroups, index) in options.actions"
         >
-            <div
-                :key="index"
-                role="group"
+            <li
+                v-for="action in actionGroups"
+                :key="action.name"
+                :class="[action.cssClass, action.isDisabled ? 'disabled' : '']"
+                :title="action.description"
+                :data-testid="action.testId || false"
+                @click="action.onItemClicked"
+                @mouseover="toggleItemDescription(action)"
+                @mouseleave="toggleItemDescription()"
             >
-                <li
-                    v-for="action in actionGroups"
-                    :key="action.name"
-                    role="menuitem"
-                    :class="[action.cssClass, action.isDisabled ? 'disabled' : '']"
-                    :title="action.description"
-                    :data-testid="action.testId || false"
-                    @click="action.onItemClicked"
-                    @mouseover="toggleItemDescription(action)"
-                    @mouseleave="toggleItemDescription()"
-                >
-                    {{ action.name }}
-                </li>
-                <div
-                    v-if="index !== options.actions.length - 1"
-                    :key="index"
-                    role="separator"
-                    class="c-menu__section-separator"
-                >
-                </div>
-                <li
-                    v-if="actionGroups.length === 0"
-                    :key="index"
-                >
-                    No actions defined.
-                </li>
-            </div></template>
+                {{ action.name }}
+            </li>
+            <div
+                v-if="index !== options.actions.length - 1"
+                :key="index"
+                class="c-menu__section-separator"
+            >
+            </div>
+            <li
+                v-if="actionGroups.length === 0"
+                :key="index"
+            >
+                No actions defined.
+            </li>
+        </template>
     </ul>
 
     <ul
         v-else
         class="c-super-menu__menu"
-        role="menu"
     >
         <li
             v-for="action in options.actions"
             :key="action.name"
-            role="menuitem"
             :class="action.cssClass"
             :title="action.description"
             :data-testid="action.testId || false"

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/InterceptorRegistry.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-const DEFAULT_INTERCEPTOR_PRIORITY = 0;
 export default class InterceptorRegistry {
     /**
      * A InterceptorRegistry maintains the definitions for different interceptors that may be invoked on domain objects.
@@ -46,6 +45,7 @@ export default class InterceptorRegistry {
      * @memberof module:openmct.InterceptorRegistry#
      */
     addInterceptor(interceptorDef) {
+        //TODO: sort by priority
         this.interceptors.push(interceptorDef);
     }
 
@@ -56,18 +56,10 @@ export default class InterceptorRegistry {
      * @memberof module:openmct.InterceptorRegistry#
      */
     getInterceptors(identifier, object) {
-
-        function byPriority(interceptorA, interceptorB) {
-            let priorityA = interceptorA.priority ?? DEFAULT_INTERCEPTOR_PRIORITY;
-            let priorityB = interceptorB.priority ?? DEFAULT_INTERCEPTOR_PRIORITY;
-
-            return priorityB - priorityA;
-        }
-
         return this.interceptors.filter(interceptor => {
             return typeof interceptor.appliesTo === 'function'
                 && interceptor.appliesTo(identifier, object);
-        }).sort(byPriority);
+        });
     }
 
 }

src/api/objects/MutableDomainObject.js

@@ -75,23 +75,25 @@ class MutableDomainObject {
         return eventOff;
     }
     $set(path, value) {
-        const oldModel = JSON.parse(JSON.stringify(this));
-        const oldValue = _.get(oldModel, path);
-        MutableDomainObject.mutateObject(this, path, value);
+        _.set(this, path, value);
+
+        if (path !== 'persisted' && path !== 'modified') {
+            _.set(this, 'modified', Date.now());
+        }
 
         //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.
@@ -134,11 +136,8 @@ class MutableDomainObject {
     }
 
     static mutateObject(object, path, value) {
-        if (path !== 'persisted') {
-            _.set(object, 'modified', Date.now());
-        }
-
         _.set(object, path, value);
+        _.set(object, 'modified', Date.now());
     }
 }
 

src/api/objects/ObjectAPI.js

@@ -33,7 +33,7 @@ import InMemorySearchProvider from './InMemorySearchProvider';
 /**
  * Uniquely identifies a domain object.
  *
- * @typedef {object} Identifier
+ * @typedef Identifier
  * @property {string} namespace the namespace to/from which this domain
  *           object should be loaded/stored.
  * @property {string} key a unique identifier for the domain object
@@ -50,8 +50,8 @@ import InMemorySearchProvider from './InMemorySearchProvider';
  * A few common properties are defined for domain objects. Beyond these,
  * individual types of domain objects may add more as they see fit.
  *
- * @typedef {object} DomainObject
- * @property {Identifier} identifier a key/namespace pair which
+ * @typedef DomainObject
+ * @property {module:openmct.ObjectAPI~Identifier} identifier a key/namespace pair which
  *           uniquely identifies this domain object
  * @property {string} type the type of domain object
  * @property {string} name the human-readable name for this domain object
@@ -59,19 +59,19 @@ import InMemorySearchProvider from './InMemorySearchProvider';
  *           object
  * @property {number} [modified] the time, in milliseconds since the UNIX
  *           epoch, at which this domain object was last modified
- * @property {Identifier[]} [composition] if
+ * @property {module:openmct.ObjectAPI~Identifier[]} [composition] if
  *           present, this will be used by the default composition provider
  *           to load domain objects
- * @memberof module:openmct.ObjectAPI~
+ * @memberof module:openmct
  */
 
 /**
-  * @readonly
-  * @enum {string} SEARCH_TYPES
-  * @property {string} OBJECTS Search for objects
-  * @property {string} ANNOTATIONS Search for annotations
-  * @property {string} TAGS Search for tags
-  */
+    * @readonly
+    * @enum {String} SEARCH_TYPES
+    * @property {String} OBJECTS Search for objects
+    * @property {String} ANNOTATIONS Search for annotations
+    * @property {String} TAGS Search for tags
+*/
 
 /**
  * Utilities for loading, saving, and manipulating domain objects.
@@ -189,57 +189,58 @@ 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
-     *          dirty/in-transaction objects use and the provider.get method
-     * @returns {Promise<DomainObject>} a promise which will resolve when the domain object
+     * @param {AbortController.signal} abortSignal (optional) signal to abort fetch requests
+     * @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) {
+    get(identifier, abortSignal) {
         let keystring = this.makeKeyString(identifier);
 
-        if (!forceRemote) {
-            if (this.cache[keystring] !== undefined) {
-                return this.cache[keystring];
-            }
+        if (this.cache[keystring] !== undefined) {
+            return this.cache[keystring];
+        }
 
-            identifier = utils.parseKeyString(identifier);
+        identifier = utils.parseKeyString(identifier);
 
-            if (this.isTransactionActive()) {
-                let dirtyObject = this.transaction.getDirtyObject(identifier);
+        if (this.isTransactionActive()) {
+            let dirtyObject = this.transaction.getDirtyObject(identifier);
 
-                if (dirtyObject) {
-                    return Promise.resolve(dirtyObject);
-                }
+            if (dirtyObject) {
+                return Promise.resolve(dirtyObject);
             }
         }
 
         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;
         });
@@ -356,13 +357,13 @@ export default class ObjectAPI {
     async save(domainObject) {
         const provider = this.getProvider(domainObject.identifier);
         let result;
-        let lastPersistedTime;
 
         if (!this.isPersistable(domainObject.identifier)) {
             result = Promise.reject('Object provider does not support saving');
         } else if (this.#hasAlreadyBeenPersisted(domainObject)) {
             result = Promise.resolve(true);
         } else {
+            const persistedTime = Date.now();
             const username = await this.#getCurrentUsername();
             const isNewObject = domainObject.persisted === undefined;
             let savedResolve;
@@ -374,22 +375,15 @@ export default class ObjectAPI {
                 savedReject = reject;
             });
 
+            this.#mutate(domainObject, 'persisted', persistedTime);
             this.#mutate(domainObject, 'modifiedBy', username);
 
             if (isNewObject) {
+                this.#mutate(domainObject, 'created', persistedTime);
                 this.#mutate(domainObject, 'createdBy', username);
 
-                const createdTime = Date.now();
-                this.#mutate(domainObject, 'created', createdTime);
-
-                const persistedTime = Date.now();
-                this.#mutate(domainObject, 'persisted', persistedTime);
-
                 savedObjectPromise = provider.create(domainObject);
             } else {
-                lastPersistedTime = domainObject.persisted;
-                const persistedTime = Date.now();
-                this.#mutate(domainObject, 'persisted', persistedTime);
                 savedObjectPromise = provider.update(domainObject);
             }
 
@@ -397,10 +391,6 @@ export default class ObjectAPI {
                 savedObjectPromise.then(response => {
                     savedResolve(response);
                 }).catch((error) => {
-                    if (!isNewObject) {
-                        this.#mutate(domainObject, 'persisted', lastPersistedTime);
-                    }
-
                     savedReject(error);
                 });
             } else {
@@ -408,20 +398,9 @@ export default class ObjectAPI {
             }
         }
 
-        return result.catch(async (error) => {
+        return result.catch((error) => {
             if (error instanceof this.errors.Conflict) {
-                // Synchronized objects will resolve their own conflicts
-                if (this.SYNCHRONIZED_OBJECT_TYPES.includes(domainObject.type)) {
-                    this.openmct.notifications.info(`Conflict detected while saving "${this.makeKeyString(domainObject.name)}", attempting to resolve`);
-                } else {
-                    this.openmct.notifications.error(`Conflict detected while saving ${this.makeKeyString(domainObject.identifier)}`);
-
-                    if (this.isTransactionActive()) {
-                        this.endTransaction();
-                    }
-
-                    await this.refresh(domainObject);
-                }
+                this.openmct.notifications.error(`Conflict detected while saving ${this.makeKeyString(domainObject.identifier)}`);
             }
 
             throw error;
@@ -645,7 +624,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 +714,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

@@ -94,35 +94,6 @@ describe("The Object API", () => {
                 expect(mockProvider.create).not.toHaveBeenCalled();
                 expect(mockProvider.update).toHaveBeenCalled();
             });
-            describe("the persisted timestamp for existing objects", () => {
-                let persistedTimestamp;
-                beforeEach(() => {
-                    persistedTimestamp = Date.now() - FIFTEEN_MINUTES;
-                    mockDomainObject.persisted = persistedTimestamp;
-                    mockDomainObject.modified = Date.now();
-                });
-
-                it("is updated", async () => {
-                    await objectAPI.save(mockDomainObject);
-                    expect(mockDomainObject.persisted).toBeDefined();
-                    expect(mockDomainObject.persisted > persistedTimestamp).toBe(true);
-                });
-                it("is >= modified timestamp", async () => {
-                    await objectAPI.save(mockDomainObject);
-                    expect(mockDomainObject.persisted >= mockDomainObject.modified).toBe(true);
-                });
-            });
-            describe("the persisted timestamp for new objects", () => {
-                it("is updated", async () => {
-                    await objectAPI.save(mockDomainObject);
-                    expect(mockDomainObject.persisted).toBeDefined();
-                });
-                it("is >= modified timestamp", async () => {
-                    await objectAPI.save(mockDomainObject);
-                    expect(mockDomainObject.persisted >= mockDomainObject.modified).toBe(true);
-                });
-            });
-
             it("Sets the current user for 'createdBy' on new objects", async () => {
                 await objectAPI.save(mockDomainObject);
                 expect(mockDomainObject.createdBy).toBe(USERNAME);
@@ -399,7 +370,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 +390,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/Overlay.js

@@ -17,7 +17,6 @@ class Overlay extends EventEmitter {
         dismissable = true,
         element,
         onDestroy,
-        onDismiss,
         size
     } = {}) {
         super();
@@ -33,7 +32,7 @@ class Overlay extends EventEmitter {
                 OverlayComponent: OverlayComponent
             },
             provide: {
-                dismiss: this.notifyAndDismiss.bind(this),
+                dismiss: this.dismiss.bind(this),
                 element,
                 buttons,
                 dismissable: this.dismissable
@@ -44,10 +43,6 @@ class Overlay extends EventEmitter {
         if (onDestroy) {
             this.once('destroy', onDestroy);
         }
-
-        if (onDismiss) {
-            this.once('dismiss', onDismiss);
-        }
     }
 
     dismiss() {
@@ -56,12 +51,6 @@ class Overlay extends EventEmitter {
         this.component.$destroy();
     }
 
-    //Ensures that any callers are notified that the overlay is dismissed
-    notifyAndDismiss() {
-        this.emit('dismiss');
-        this.dismiss();
-    }
-
     /**
      * @private
      **/

src/api/overlays/OverlayAPI.js

@@ -55,7 +55,7 @@ class OverlayAPI {
     dismissLastOverlay() {
         let lastOverlay = this.activeOverlays[this.activeOverlays.length - 1];
         if (lastOverlay && lastOverlay.dismissable) {
-            lastOverlay.notifyAndDismiss();
+            lastOverlay.dismiss();
         }
     }
 

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.