form no work

* feat: full amd -> es6 conversion

* fix: move MCT to ES6 class

* fix: default drop, correct imports

* fix: correct all imports

* fix: property typo

* fix: avoid anonymous functions

* fix: correct typo

scarily small - can see why this e2e coverage issue is high priority

* fix: use proper uuid format

* style: fmt

* fix: import vue correctly, get correct layout

* fix: createApp without JSON

fixes template issues

* fix: don't use default on InspectorDataVisualization

* fix: remove more .default calls

* Update src/api/api.js

Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>

* Update src/plugins/plugins.js

Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>

* Update src/plugins/plugins.js

Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>

* fix: suggestions

* fix: drop unnecessary this.annotation initialization

* fix: move all initialization calls to constructor

* refactor: move vue dist import to webpack alias

---------

Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>

.circleci/config.yml

@@ -120,15 +120,13 @@ jobs:
             - generate_and_store_version_and_filesystem_artifacts
   e2e-test:
     parameters:
-      node-version:
-        type: string
       suite: #stable or full
         type: string
     executor: pw-focal-development
-    parallelism: 4
+    parallelism: 6
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - when: #Only install chrome-beta when running the 'full' suite to save $$$
           condition:
             equal: ['full', <<parameters.suite>>]
@@ -155,13 +153,10 @@ jobs:
           steps:
             - generate_and_store_version_and_filesystem_artifacts
   e2e-couchdb:
-    parameters:
-      node-version:
-        type: string
     executor: ubuntu
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - run: npx playwright@1.39.0 install #Necessary for bare ubuntu machine
       - run: |
           export $(cat src/plugins/persistence/couch/.env.ci | xargs)
@@ -189,15 +184,28 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  perf-test:
-    parameters:
-      node-version:
-        type: string
+  mem-test:
     executor: pw-focal-development
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - run: npm run test:perf:memory
+      - store_test_results:
+          path: test-results/results.xml
+      - store_artifacts:
+          path: test-results
+      - store_artifacts:
+          path: html-test-results
+      - when:
+          condition:
+            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
+            - generate_and_store_version_and_filesystem_artifacts
+  perf-test:
+    executor: pw-focal-development
+    steps:
+      - build_and_install:
+          node-version: lts/hydrogen
       - run: npm run test:perf:localhost
       - run: npm run test:perf:contract
       - store_test_results:
@@ -211,16 +219,14 @@ jobs:
             equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  visual-test:
+  visual-a11y-tests:
     parameters:
-      node-version:
-        type: string
       suite:
         type: string # ci or full
     executor: pw-focal-development
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - run: npm run test:e2e:visual:<<parameters.suite>>
       - store_test_results:
           path: test-results/results.xml
@@ -244,14 +250,12 @@ workflows:
           node-version: lts/hydrogen
       - e2e-test:
           name: e2e-stable
-          node-version: lts/hydrogen
           suite: stable
-      - perf-test:
-          node-version: lts/hydrogen
-      - visual-test:
+      - mem-test
+      - perf-test
+      - visual-a11y-tests:
           name: visual-test-ci
           suite: ci
-          node-version: lts/hydrogen
 
   the-nightly: #These jobs do not run on PRs, but against master at night
     jobs:
@@ -265,16 +269,13 @@ workflows:
           node-version: lts/hydrogen
       - e2e-test:
           name: e2e-full-nightly
-          node-version: lts/hydrogen
           suite: full
-      - perf-test:
-          node-version: lts/hydrogen
-      - visual-test:
+      - mem-test
+      - perf-test
+      - visual-a11y-tests:
           name: visual-test-nightly
           suite: full
-          node-version: lts/hydrogen
-      - e2e-couchdb:
-          node-version: lts/hydrogen
+      - e2e-couchdb
     triggers:
       - schedule:
           cron: '0 0 * * *'

.cspell.json

@@ -490,7 +490,8 @@
     "Blockquotes",
     "oger",
     "lcovonly",
-    "gcov"
+    "gcov",
+    "WCAG"
   ],
   "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US"],
   "ignorePaths": [

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,8 +14,10 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 
 * [ ] Changes address original issue?
 * [ ] Tests included and/or updated with changes?
-* [ ] Command line build passes?
 * [ ] Has this been smoke tested?
+* [ ] Have you associated this PR with a `type:` label? Note: this is not necessarily the same as the original issue.
+* [ ] Have you associated a milestone with this PR? Note: leave blank if unsure.
+* [ ] Is this a breaking change to be called out in the release notes?
 * [ ] Testing instructions included in associated issue OR is this a dependency/testcase change?
 
 ### Reviewer Checklist
@@ -25,5 +27,3 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 * [ ] Changes appear not to be breaking changes?
 * [ ] Appropriate automated tests included?
 * [ ] Code style and in-line documentation are appropriate?
-* [ ] Has associated issue been labelled unverified? (only applicable if this PR closes the issue)
-* [ ] Has associated issue been labelled bug? (only applicable if this PR is for a bug fix)

.github/workflows/codeql-analysis.yml

@@ -31,14 +31,14 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           config-file: ./.github/codeql/codeql-config.yml
           languages: javascript
           queries: security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/prcop.yml

@@ -3,17 +3,17 @@ name: PRCop
 on:
   pull_request:
     types:
+      - labeled
+      - unlabeled
       - opened
       - reopened
-      - edited
       - synchronize
-      - ready_for_review
-      - review_requested
-      - review_request_removed
+      - edited
   pull_request_review_comment:
     types:
       - created
-
+env:
+  LABELS: ${{ join( github.event.pull_request.labels.*.name, ' ' ) }}
 jobs:
   prcop:
     runs-on: ubuntu-latest
@@ -24,3 +24,15 @@ jobs:
         with:
           config-file: '.github/workflows/prcop-config.json'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  check-type-label:
+    name: Check type Label
+    runs-on: ubuntu-latest
+    steps:
+      - if: contains( env.LABELS, 'type:' ) == false
+        run: exit 1
+  check-milestone:
+    name: Check Milestone
+    runs-on: ubuntu-latest
+    steps:
+      - if: github.event.pull_request.milestone == null && contains( env.LABELS, 'no milestone' ) == false
+        run: exit 1

.webpack/webpack.common.js

@@ -69,14 +69,15 @@ const config = {
       csv: 'comma-separated-values',
       EventEmitter: 'eventemitter3',
       bourbon: 'bourbon.scss',
-      'plotly-basic': 'plotly.js-basic-dist',
-      'plotly-gl2d': 'plotly.js-gl2d-dist',
-      printj: path.join(projectRootDir, 'node_modules/printj/dist/printj.min.js'),
+      'plotly-basic': 'plotly.js-basic-dist-min',
+      'plotly-gl2d': 'plotly.js-gl2d-dist-min',
+      printj: 'printj/printj.mjs',
       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'),
-      utils: path.join(projectRootDir, 'src/utils')
+      utils: path.join(projectRootDir, 'src/utils'),
+      vue: 'vue/dist/vue.esm-bundler'
     }
   },
   plugins: [

API.md

@@ -1304,3 +1304,61 @@ View provider Example:
     }
 }
 ```
+
+## Visibility-Based Rendering in View Providers
+
+To enhance performance and resource efficiency in OpenMCT, a visibility-based rendering feature has been added. This feature is designed to defer the execution of rendering logic for views that are not currently visible. It ensures that views are only updated when they are in the viewport, similar to how modern browsers handle rendering of inactive tabs but optimized for the OpenMCT tabbed display. It also works when views are scrolled outside the viewport (e.g., in a Display Layout).
+
+### Overview
+
+The show function is responsible for the rendering of a view. An [Intersection Observer](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API) is used internally to determine whether the view is visible. This observer drives the visibility-based rendering feature, accessed via the `renderWhenVisible` function provided in the `viewOptions` parameter.
+
+### Implementing Visibility-Based Rendering
+
+The `renderWhenVisible` function is passed to the show function as part of the `viewOptions` object. This function can be used for all rendering logic that would otherwise be executed within a `requestAnimationFrame` call. When called, `renderWhenVisible` will either execute the provided function immediately (via `requestAnimationFrame`) if the view is currently visible, or defer its execution until the view becomes visible.
+
+Additionally, `renderWhenVisible` returns a boolean value indicating whether the provided function was executed immediately (`true`) or deferred (`false`).
+
+Monitoring of visibility begins after the first call to `renderWhenVisible` is made.
+
+Here’s the signature for the show function:
+
+`show(element, isEditing, viewOptions)`
+
+  * `element` (HTMLElement) - The DOM element where the view should be rendered.
+  * `isEditing` (boolean) - Indicates whether the view is in editing mode.
+  * `viewOptions` (Object) - An object with configuration options for the view, including:
+    * `renderWhenVisible` (Function) - This function wraps the `requestAnimationFrame` and only triggers the provided render logic when the view is visible in the viewport.
+
+### Example
+
+An OpenMCT view provider might implement the show function as follows:
+
+```js
+// Define your view provider
+const myViewProvider = {
+  // ... other properties and methods ...
+  show: function (element, isEditing, viewOptions) {
+    // Callback for rendering view content
+    const renderCallback = () => {
+      // Your view rendering logic goes here
+    };
+    
+    // Use the renderWhenVisible function to ensure rendering only happens when view is visible
+    const wasRenderedImmediately = viewOptions.renderWhenVisible(renderCallback);
+
+    // Optionally handle the immediate rendering return value
+    if (wasRenderedImmediately) {
+      console.debug('🪞 Rendering triggered immediately as the view is visible.');
+    } else {
+      console.debug('🛑 Rendering has been deferred until the view becomes visible.');
+    }
+  }
+};
+```
+
+
+Note that `renderWhenVisible` defers rendering while the view is not visible and caters to the latest execution call. This provides responsiveness for dynamic content while ensuring performance optimizations.
+
+Ensure your view logic is prepared to handle potentially multiple deferrals if using this API, as only the last call to renderWhenVisible will be queued for execution upon the view becoming visible.
+

README.md

@@ -1,4 +1,4 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) 
+# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) ![CodeQL](https://github.com/nasa/openmct/workflows/CodeQL/badge.svg)
 
 Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
 

e2e/.eslintrc.js

@@ -2,13 +2,16 @@
 module.exports = {
   extends: ['plugin:playwright/playwright-test'],
   rules: {
-    'playwright/max-nested-describe': ['error', { max: 1 }]
+    'playwright/max-nested-describe': ['error', { max: 1 }],
+    'playwright/no-nth-methods': 'error',
+    'playwright/no-raw-locators': 'error'
   },
   overrides: [
     {
-      files: ['tests/visual/*.spec.js'],
+      files: ['tests/visual-a11y/*.spec.js'],
       rules: {
-        'playwright/no-wait-for-timeout': 'off'
+        'playwright/no-wait-for-timeout': 'off',
+        'playwright/expect-expect': 'off'
       }
     }
   ]

e2e/.percy.ci.yml

@@ -21,4 +21,8 @@ snapshot:
     /* Embedded timestamp in notebooks */
     .c-ne__embed__time{
       opacity: 0 !important;
+    }
+    /* Time Conductor Start Time */
+    .c-compact-tc__setting-value{
+      opacity: 0 !important;
     }

e2e/.percy.nightly.yml

@@ -21,4 +21,8 @@ snapshot:
     /* Embedded timestamp in notebooks */
     .c-ne__embed__time{
       opacity: 0 !important;
+    }
+    /* Time Conductor Start Time */
+    .c-compact-tc__setting-value{
+      opacity: 0 !important;
     }

e2e/README.md

@@ -51,11 +51,13 @@ Next, you should walk through our implementation of Playwright in Open MCT:
 
 ## Types of e2e Testing
 
-e2e testing describes the layer at which a test is performed without prescribing the assertions which are made. Generally, when writing an e2e test, we have three choices to make on an assertion strategy:
+e2e testing describes the layer at which a test is performed without prescribing the assertions which are made. Generally, when writing an e2e test, we have five choices to make on an assertion strategy:
 
 1. Functional - Verifies the functional correctness of the application. Sometimes interchanged with e2e or regression testing.
 2. Visual - Verifies the "look and feel" of the application and can only detect _undesirable changes when compared to a previous baseline_.
 3. Snapshot - Similar to Visual in that it captures the "look" of the application and can only detect _undesirable changes when compared to a previous baseline_. **Generally not preferred due to advanced setup necessary.**
+4. Accessibility - Verifies that the application meets the accessibility standards defined by the [WCAG organization](https://www.w3.org/WAI/standards-guidelines/wcag/).
+5. Performance - Verifies that application provides a performant experience. Like Snapshot testing, these tests are generally not recommended due to their difficulty in providing a consistent result.
 
 When choosing between the different testing strategies, think only about the assertion that is made at the end of the series of test steps. "I want to verify that the Timer plugin functions correctly" vs "I want to verify that the Timer plugin does not look different than originally designed".
 
@@ -132,6 +134,35 @@ npm install
 npm run test:e2e:updatesnapshots
 ```
 
+## Automated Accessibility (a11y) Testing
+
+Open MCT incorporates accessibility testing through two primary methods to ensure its compliance with accessibility standards:
+
+1. **Usage of Playwright's Locator Strategy**: Open MCT utilizes Playwright's locator strategy, specifically the [page.getByRole('') function](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role), to ensure that web elements are accessible via assistive technologies. This approach focuses on the accessibility of elements rather than full adherence to a11y guidelines, which is covered in the second method.
+
+2. **Enforcing a11y Guidelines with Playwright Axe Plugin**: To rigorously enforce a11y guideline compliance, Open MCT employs the [playwright axe plugin](https://playwright.dev/docs/accessibility-testing). This is achieved through the `scanForA11yViolations` function within the visual testing suite. This method not only benefits from the existing coverage of the visual tests but also targets specific a11y issues, such as `color-contrast` violations, which are particularly pertinent in the context of visual testing.
+
+### a11y Standards (WCAG and Section 508)
+
+Playwright axe supports a wide range of [WCAG Standards](https://playwright.dev/docs/accessibility-testing#scanning-for-wcag-violations) to test against. Open MCT is testing against the [Section 508](https://www.section508.gov/test/testing-overview/) accessibility guidelines with the intent to support higher standards over time. As of 2024, Section508 requirements now map completely to WCAG 2.0 AA. In the future, Section 508 requirements may map to WCAG 2.1 AA.
+
+### Reading an a11y test failure
+
+When an a11y test fails, the result must be interpreted in the html test report or the a11y report json artifact stored in the `/test-results/` folder. The json structure should be parsed for `"violations"` by `"id"` and identified `"target"`. Example provided for the 'color-contrast-enhanced' violation.
+
+```json
+  "violations": 
+    {
+      "id": "color-contrast-enhanced",
+      "impact": "serious",
+      "html": "<span class=\"label c-indicator__label\">0 Snapshots <button aria-label=\"Show Snapshots\">Show</button></span>",
+        "target": [
+          ".s-status-off > .label.c-indicator__label"
+        ],
+        "failureSummary": "Fix any of the following:\n  Element has insufficient color contrast of 6.51 (foreground color: #aaaaaa, background color: #262626, font size: 8.1pt (10.8px), font weight: normal). Expected contrast ratio of 7:1"
+      }
+```
+
 ## Performance Testing
 
 The open source performance tests function in three ways which match their naming and folder structure:
@@ -142,6 +173,8 @@ The open source performance tests function in three ways which match their namin
 
 These tests are expected to become blocking and gating with assertions as we extend the capabilities of Playwright.
 
+In addition to the explicit definition of performance tests, we also ensure that our test timeout timing is "tight" to catch performance regressions detectable by action timeouts. i.e. [Notebooks load much slower than they used to #6459](https://github.com/nasa/openmct/issues/6459)
+
 ## Test Architecture and CI
 
 ### Architecture
@@ -161,8 +194,8 @@ Our file structure follows the type of type of testing being excercised at the e
 |`./tests/performance/`        | Performance tests which should be run on every commit.|
 |`./tests/performance/contract/` | A subset of performance tests which are designed to provide a contract between the open source tests which are run on every commit and the downstream tests which are run post merge and with other frameworks.|
 |`./tests/performance/memory`  | A subset of performance tests which are designed to test for memory leaks.|
-|`./tests/visual/`             | Visual tests.|
-|`./tests/visual/component/`             | Visual tests which are only run against a single component.|
+|`./tests/visual-a11y/`             | Visual tests and accessibility tests.|
+|`./tests/visual-a11y/component/`             | Visual and accessibility tests which are only run against a single component.|
 |`./appActions.js`             | Contains common methods which can be leveraged by test case authors to quickly move through the application when writing new tests.|
 |`./baseFixture.js`            | Contains base fixtures which only extend default `@playwright/test` functionality. The expectation is that these fixtures will be removed as the native Playwright API improves|
 
@@ -180,7 +213,7 @@ Open MCT is leveraging the [config file](https://playwright.dev/docs/test-config
 |`./playwright-local.config.js` | Used when running locally|
 |`./playwright-performance.config.js` | Used when running performance tests in CI or locally|
 |`./playwright-performance-devmode.config.js` | Used when running performance tests in CI or locally|
-|`./playwright-visual.config.js` | Used to run the visual tests in CI or locally|
+|`./playwright-visual-a11y.config.js` | Used to run the visual and a11y tests in CI or locally|
 
 #### Test Tags
 
@@ -191,6 +224,7 @@ Current list of test tags:
 |Test Tag|Description|
 |:-:|-|
 |`@ipad` | Test case or test suite is compatible with Playwright's iPad support and Open MCT's read-only mobile view (i.e. no create button).|
+|`@a11y` | Test case or test suite to execute playwright-axe accessibility checks and generate a11y reports.|
 |`@gds` | Denotes a GDS Test Case used in the VIPER Mission.|
 |`@addInit` | Initializes the browser with an injected and artificial state. Useful for loading non-default plugins. Likely will not work outside of `npm start`.|
 |`@localStorage` | Captures or generates session storage to manipulate browser state. Useful for excluding in tests which require a persistent backend (i.e. CouchDB). See [note](#utilizing-localstorage)|
@@ -216,7 +250,7 @@ CircleCI
 - Stable e2e tests against ubuntu and chrome
 - Performance tests against ubuntu and chrome
 - e2e tests are linted
-- Visual tests are run in a single resolution on the default `espresso` theme
+- Visual and a11y tests are run in a single resolution on the default `espresso` theme
 
 #### 2. Per-Merge Testing
 
@@ -232,7 +266,7 @@ Nightly Testing in Circle CI
 - Full e2e suite against ubuntu and chrome, firefox, and an MMOC resolution profile
 - Performance tests against ubuntu and chrome
 - CouchDB suite
-- Visual Tests are run in the full profile
+- Visual and a11y Tests are run in the full profile
 
 Github Actions / Workflow
 
@@ -405,7 +439,7 @@ By adhering to this principle, we can create tests that are both robust and refl
 5. **Hide the Tree and Inspector**: Generally, your test will not require comparisons involving the tree and inspector. These aspects are covered in component-specific tests (explained below). To exclude them from the comparison by default, navigate to the root of the main view with the tree and inspector hidden:
     - `await page.goto('./#/browse/mine?hideTree=true&hideInspector=true')`
 
-6. **Component-Specific Tests**: If you wish to focus on a particular component, use the `/visual/component/` folder and limit the scope of the comparison to that component. For instance:
+6. **Component-Specific Tests**: If you wish to focus on a particular component, use the `/visual-a11y/component/` folder and limit the scope of the comparison to that component. For instance:
     ```js
     await percySnapshot(page, `Tree Pane w/ single level expanded (theme: ${theme})`, {
         scope: treePane
@@ -540,6 +574,15 @@ A single e2e test in Open MCT is extended to run:
 - How is Open MCT extending default Playwright functionality?
 - What about Component Testing?
 
+### Writing Tests
+
+Playwright provides 3 supported methods of debugging and authoring tests:
+- A 'watch mode' for running tests locally and debugging on the fly
+- A 'debug mode' for debugging tests and writing assertions against tests
+- A 'VSCode plugin' for debugging tests within the VSCode IDE.
+
+Generally, we encourage folks to use the watch mode and provide a script `npm run test:e2e:watch` which launches the launch mode ui and enables hot reloading on the dev server.
+
 ### e2e Troubleshooting
 
 Please follow the general guide troubleshooting in [the general troubleshooting doc](../TESTING.md#troubleshooting-ci)

e2e/appActions.js

@@ -84,12 +84,10 @@ async function createDomainObjectWithDefaults(
   await page.getByRole('button', { name: 'Create' }).click();
 
   // Click the object specified by 'type'
-  await page.click(`li[role='menuitem']:text("${type}")`);
+  await page.getByRole('menuitem', { name: new RegExp(`${type}`) }).click();
 
   // 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);
+  await page.getByLabel('Title', { exact: true }).fill(name);
 
   if (page.testNotes) {
     // Fill the "Notes" section with information about the

e2e/fixtures/avpFixtures.js

@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * avpFixtures.js
+ *
+ * @file This module provides custom fixtures specifically tailored for Accessibility, Visual, and Performance (AVP) tests.
+ * These fixtures extend the base functionality of the Playwright fixtures and appActions, and are designed to be
+ * generalized across all plugins. They offer functionalities like scanning for accessibility violations, integrating
+ * with axe-core, and more.
+ *
+ * IMPORTANT NOTE: This fixture file is not intended to be extended further by other fixtures. If you find yourself
+ * needing to do so, please consult the documentation and consider creating a specialized fixture or modifying the
+ * existing ones.
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { test, expect } = require('../pluginFixtures');
+const AxeBuilder = require('@axe-core/playwright').default;
+
+// Constants for repeated values
+const TEST_RESULTS_DIR = './test-results';
+
+/**
+ * Scans for accessibility violations on a page and writes a report to disk if violations are found.
+ * Automatically asserts that no violations should be present.
+ *
+ * @typedef {object} GenerateReportOptions
+ * @property {string} [reportName] - The name for the report file.
+ *
+ * @param {import('playwright').Page} page - The page object from Playwright.
+ * @param {string} testCaseName - The name of the test case.
+ * @param {GenerateReportOptions} [options={}] - The options for the report generation.
+ *
+ * @returns {Promise<object|null>} Returns the accessibility scan results if violations are found,
+ *                                  otherwise returns null.
+ */
+/* eslint-disable no-undef */
+exports.scanForA11yViolations = async function (page, testCaseName, options = {}) {
+  const builder = new AxeBuilder({ page });
+  builder.withTags(['wcag2aa']);
+  // https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
+  builder.disableRules(['color-contrast']);
+  const accessibilityScanResults = await builder.analyze();
+
+  // Assert that no violations should be present
+  expect(
+    accessibilityScanResults.violations,
+    `Accessibility violations found in test case: ${testCaseName}`
+  ).toEqual([]);
+
+  // Check if there are any violations
+  if (accessibilityScanResults.violations.length > 0) {
+    let reportName = options.reportName || testCaseName;
+    let sanitizedReportName = reportName.replace(/\//g, '_');
+    const reportPath = path.join(TEST_RESULTS_DIR, `${sanitizedReportName}.json`);
+
+    try {
+      if (!fs.existsSync(TEST_RESULTS_DIR)) {
+        fs.mkdirSync(TEST_RESULTS_DIR);
+      }
+
+      fs.writeFileSync(reportPath, JSON.stringify(accessibilityScanResults, null, 2));
+      console.log(`Accessibility report with violations saved successfully as ${reportPath}`);
+      return accessibilityScanResults;
+    } catch (err) {
+      console.error(`Error writing the accessibility report to file ${reportPath}:`, err);
+      throw err;
+    }
+  } else {
+    console.log('No accessibility violations found, no report generated.');
+    return null;
+  }
+};
+
+exports.expect = expect;
+exports.test = test;

e2e/helper/addInitDataVisualization.js

@@ -0,0 +1,30 @@
+/*****************************************************************************
+ * 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.ExampleDataVisualizationSourcePlugin());
+  openmct.install(
+    openmct.plugins.InspectorDataVisualization({ type: 'exampleDataVisualizationSource' })
+  );
+});

e2e/helper/planningUtils.js

@@ -81,6 +81,30 @@ function activitiesWithinTimeBounds(start1, end1, start2, end2) {
   );
 }
 
+/**
+ * Asserts that the swim lanes / groups in the plan view matches the order of
+ * groups in the plan data.
+ * @param {import('@playwright/test').Page} page the page
+ * @param {object} plan The raw plan json to assert against
+ * @param {string} objectUrl The URL of the object to assert against (plan or gantt chart)
+ */
+export async function assertPlanOrderedSwimLanes(page, plan, objectUrl) {
+  // Switch to the plan view
+  await page.goto(`${objectUrl}?view=plan.view`);
+  const planGroups = await page
+    .locator('.c-plan__contents > div > .c-swimlane__lane-label .c-object-label__name')
+    .all();
+
+  const groups = plan.Groups;
+
+  for (let i = 0; i < groups.length; i++) {
+    // Assert that the order of groups in the plan view matches the order of
+    // groups in the plan data
+    const groupName = await planGroups[i].innerText();
+    expect(groupName).toEqual(groups[i].name);
+  }
+}
+
 /**
  * Navigate to the plan view, switch to fixed time mode,
  * and set the bounds to span all activities.
@@ -110,3 +134,23 @@ export async function setDraftStatusForPlan(page, plan) {
     await window.openmct.status.set(planObject.uuid, 'draft');
   }, plan);
 }
+
+export async function addPlanGetInterceptor(page) {
+  await page.waitForLoadState('load');
+  await page.evaluate(async () => {
+    await window.openmct.objects.addGetInterceptor({
+      appliesTo: (identifier, domainObject) => {
+        return domainObject && domainObject.type === 'plan';
+      },
+      invoke: (identifier, object) => {
+        if (object) {
+          object.sourceMap = {
+            orderedGroups: 'Groups'
+          };
+        }
+
+        return object;
+      }
+    });
+  });
+}

e2e/helper/plotTagsUtils.js

@@ -0,0 +1,189 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+import { expect } from '../pluginFixtures';
+const { waitForPlotsToRender } = require('../appActions');
+
+/**
+ * Given a canvas and a set of points, tags the points on the canvas.
+ * @param {import('@playwright/test').Page} page
+ * @param {HTMLCanvasElement} canvas a telemetry item with a plot
+ * @param {Number} xEnd a telemetry item with a plot
+ * @param {Number} yEnd a telemetry item with a plot
+ * @returns {Promise}
+ */
+export async function createTags({ page, canvas, xEnd = 700, yEnd = 520 }) {
+  await canvas.hover({ trial: true });
+
+  //Alt+Shift Drag Start to select some points to tag
+  await page.keyboard.down('Alt');
+  await page.keyboard.down('Shift');
+
+  await canvas.dragTo(canvas, {
+    sourcePosition: {
+      x: 1,
+      y: 1
+    },
+    targetPosition: {
+      x: xEnd,
+      y: yEnd
+    }
+  });
+
+  //Alt Drag End
+  await page.keyboard.up('Alt');
+  await page.keyboard.up('Shift');
+
+  //Wait for canvas to stabilize.
+  await canvas.hover({ trial: true });
+
+  // add some tags
+  await page.getByText('Annotations').click();
+  await page.getByRole('button', { name: /Add Tag/ }).click();
+  await page.getByPlaceholder('Type to select tag').click();
+  await page.getByText('Driving').click();
+
+  await page.getByRole('button', { name: /Add Tag/ }).click();
+  await page.getByPlaceholder('Type to select tag').click();
+  await page.getByText('Science').click();
+}
+
+/**
+ * Given a telemetry item (e.g., a Sine Wave Generator) with a plot, tests that the plot can be tagged.
+ * @param {import('@playwright/test').Page} page
+ * @param {import('../../../../appActions').CreatedObjectInfo} telemetryItem a telemetry item with a plot
+ * @returns {Promise}
+ */
+export async function testTelemetryItem(page, telemetryItem) {
+  // Check that telemetry item also received the tag
+  await page.goto(telemetryItem.url);
+
+  await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+  const canvas = page.locator('canvas').nth(1);
+  //Wait for canvas to stabilize.
+  await waitForPlotsToRender(page);
+
+  await expect(canvas).toBeInViewport();
+  await canvas.hover({ trial: true });
+
+  // click on the tagged plot point
+  await canvas.click({
+    position: {
+      x: 100,
+      y: 100
+    }
+  });
+
+  await expect(page.getByText('Science')).toBeVisible();
+  await expect(page.getByText('Driving')).toBeHidden();
+}
+
+/**
+ * Given a page, tests that tags are searchable, deletable, and persist across reloads.
+ * @param {import('@playwright/test').Page} page
+ * @returns {Promise}
+ */
+export async function basicTagsTests(page) {
+  // Search for Driving
+  await page.getByRole('searchbox', { name: 'Search Input' }).click();
+
+  // Clicking elsewhere should cause annotation selection to be cleared
+  await expect(page.getByText('No tags to display for this item')).toBeVisible();
+  //
+  await page.getByRole('searchbox', { name: 'Search Input' }).fill('driv');
+
+  // Always click on the first Sine Wave result
+  await page
+    .getByLabel('Search Result')
+    .getByText(/Sine Wave/)
+    .first()
+    .click();
+
+  // Delete Driving Tag
+  await page.hover('[aria-label="Tag"]:has-text("Driving")');
+  await page.locator('[aria-label="Remove tag Driving"]').click();
+
+  // Search for Science Tag
+  await page.getByRole('searchbox', { name: 'Search Input' }).click();
+  await page.getByRole('searchbox', { name: 'Search Input' }).fill('sc');
+
+  //Expect Science Tag to be present and and Driving Tags to be deleted
+  await expect(page.getByLabel('Search Result').first()).toContainText('Science');
+  await expect(page.getByLabel('Search Result').first()).not.toContainText('Driving');
+
+  // Search for Driving Tag and expect nothing found
+  await page.getByRole('searchbox', { name: 'Search Input' }).click();
+  await page.getByRole('searchbox', { name: 'Search Input' }).fill('driv');
+  await expect(page.getByText('No results found')).toBeVisible();
+
+  await page.reload({ waitUntil: 'domcontentloaded' });
+
+  await waitForPlotsToRender(page);
+
+  //Navigate to the Inspector and check that all tags have been removed
+  await expect(page.getByRole('tab', { name: 'Annotations' })).not.toHaveClass(/is-current/);
+  await page.getByRole('tab', { name: 'Annotations' }).click();
+  await expect(page.getByRole('tab', { name: 'Annotations' })).toHaveClass(/is-current/);
+  await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+  const canvas = page.locator('canvas').nth(1);
+  // click on the tagged plot point
+  await canvas.click({
+    position: {
+      x: 100,
+      y: 100
+    }
+  });
+
+  //Expect Science to be visible but Driving to be hidden
+  await expect(page.getByText('Science')).toBeVisible();
+  await expect(page.getByText('Driving')).toBeHidden();
+
+  //Click elsewhere
+  await page.locator('body').click();
+  //Click on tagged plot point again
+  await canvas.click({
+    position: {
+      x: 100,
+      y: 100
+    }
+  });
+
+  // Add Driving Tag again
+  await page.getByText('Annotations').click();
+  await page.getByRole('button', { name: /Add Tag/ }).click();
+  await page.getByPlaceholder('Type to select tag').click();
+  await page.getByText('Driving').click();
+
+  //Science and Driving Tags should be visible
+  await expect(page.getByText('Science')).toBeVisible();
+  await expect(page.getByText('Driving')).toBeVisible();
+
+  // Delete Driving Tag again
+  await page.hover('[aria-label="Tag"]:has-text("Driving")');
+  await page.locator('[aria-label="Remove tag Driving"]').click();
+
+  //Science Tag should be visible and Driving Tag should be hidden
+  await expect(page.getByText('Science')).toBeVisible();
+  await expect(page.getByText('Driving')).toBeHidden();
+}

e2e/playwright-ci.config.js

@@ -17,7 +17,7 @@ const config = {
     command: 'npm run start:coverage',
     url: 'http://localhost:8080/#',
     timeout: 200 * 1000,
-    reuseExistingServer: false
+    reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
   },
   maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
   workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
@@ -76,8 +76,7 @@ const config = {
         outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
       }
     ],
-    ['junit', { outputFile: '../test-results/results.xml' }],
-    ['@deploysentinel/playwright']
+    ['junit', { outputFile: '../test-results/results.xml' }]
   ]
 };
 

e2e/playwright-visual-a11y.config.js

@@ -5,7 +5,7 @@
 /** @type {import('@playwright/test').PlaywrightTestConfig<{ theme: string }>} */
 const config = {
   retries: 0, // Visual tests should never retry due to snapshot comparison errors. Leaving as a shim
-  testDir: 'tests/visual',
+  testDir: 'tests/visual-a11y',
   testMatch: '**/*.visual.spec.js', // only run visual tests
   timeout: 60 * 1000,
   workers: 1, //Lower stress on Circle CI Agent for Visual tests https://github.com/percy/cli/discussions/1067

e2e/playwright-watch.config.js

@@ -0,0 +1,54 @@
+/* eslint-disable no-undef */
+// playwright.config.js
+// @ts-check
+
+// eslint-disable-next-line no-unused-vars
+const { devices } = require('@playwright/test');
+const MAX_FAILURES = 5;
+const NUM_WORKERS = 2;
+
+/** @type {import('@playwright/test').PlaywrightTestConfig} */
+const config = {
+  retries: 0, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=5, this should ensure that flake is managed without failing the full suite
+  testDir: 'tests',
+  timeout: 60 * 1000,
+  webServer: {
+    command: 'npm run start', //Start in dev mode for hot reloading
+    url: 'http://localhost:8080/#',
+    timeout: 200 * 1000,
+    reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
+  },
+  maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
+  workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
+  use: {
+    baseURL: 'http://localhost:8080/',
+    headless: true,
+    ignoreHTTPSErrors: true,
+    screenshot: 'only-on-failure',
+    trace: 'on-first-retry',
+    video: 'off'
+  },
+  projects: [
+    {
+      name: 'chrome',
+      testMatch: '**/*.spec.js', // run all tests
+      use: {
+        browserName: 'chromium'
+      }
+    }
+  ],
+  reporter: [
+    ['list'],
+    [
+      'html',
+      {
+        open: 'never',
+        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
+      }
+    ],
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    ['@deploysentinel/playwright']
+  ]
+};
+
+module.exports = config;

e2e/test-data/examplePlans/ExamplePlanWithOrderedLanes.json

@@ -0,0 +1,54 @@
+{
+  "Groups": [
+    {
+      "name": "Group 1"
+    },
+    {
+      "name": "Group 2"
+    }
+  ],
+  "Group 2": [
+    {
+      "name": "Past event 3",
+      "start": 1660493208000,
+      "end": 1660503981000,
+      "type": "Group 2",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 4",
+      "start": 1660579608000,
+      "end": 1660624108000,
+      "type": "Group 2",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 5",
+      "start": 1660666008000,
+      "end": 1660681529000,
+      "type": "Group 2",
+      "color": "orange",
+      "textColor": "white"
+    }
+  ],
+  "Group 1": [
+    {
+      "name": "Past event 1",
+      "start": 1660320408000,
+      "end": 1660343797000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 2",
+      "start": 1660406808000,
+      "end": 1660429160000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    }
+  ]
+}

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

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test, expect } = require('../../pluginFixtures.js');
+const { test, expect } = require('../../fixtures/pluginFixtures');
 const {
   createDomainObjectWithDefaults,
   createNotification,

e2e/tests/functional/features/branding.e2e.spec.js

@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify branding related components.
 */
 
-const { test, expect } = require('../../baseFixtures.js');
+const { test, expect } = require('../../../baseFixtures.js');
 
 test.describe('Branding tests', () => {
   test('About Modal launches with basic branding properties', async ({ page }) => {

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

@@ -247,6 +247,14 @@ test.describe('Example Imagery Object', () => {
     await page.mouse.click(canvasCenterX - 50, canvasCenterY - 50);
     await expect(page.getByText('Driving')).toBeVisible();
     await expect(page.getByText('Science')).toBeVisible();
+
+    // add another tag and expect it to appear without changing selection
+    await page.getByRole('button', { name: /Add Tag/ }).click();
+    await page.getByPlaceholder('Type to select tag').click();
+    await page.getByText('Drilling').click();
+    await expect(page.getByText('Driving')).toBeVisible();
+    await expect(page.getByText('Science')).toBeVisible();
+    await expect(page.getByText('Drilling')).toBeVisible();
   });
 
   test('Can use + - buttons to zoom on the image @unstable', async ({ page }) => {

e2e/tests/functional/features/inspectorDataVisualization/numericData.e2e.spec.js

@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/* global __dirname */
+
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const path = require('path');
+
+test.describe('Testing numeric data with inspector data visualization (i.e., data pivoting)', () => {
+  test.beforeEach(async ({ page }) => {
+    // eslint-disable-next-line no-undef
+    await page.addInitScript({
+      path: path.join(__dirname, '../../../../helper/', 'addInitDataVisualization.js')
+    });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+
+  test('Can click on telemetry and see data in inspector', async ({ page }) => {
+    const exampleDataVisualizationSource = await createDomainObjectWithDefaults(page, {
+      type: 'Example Data Visualization Source'
+    });
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'First Sine Wave Generator',
+      parent: exampleDataVisualizationSource.uuid
+    });
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Second Sine Wave Generator',
+      parent: exampleDataVisualizationSource.uuid
+    });
+
+    await page.goto(exampleDataVisualizationSource.url);
+
+    await page.getByRole('tab', { name: 'Data Visualization' }).click();
+    await page.getByRole('cell', { name: /First Sine Wave Generator/ }).click();
+    await expect(page.getByText('Numeric Data')).toBeVisible();
+    await expect(
+      page.locator('span.plot-series-name', { hasText: 'First Sine Wave Generator Hz' })
+    ).toBeVisible();
+    await expect(page.locator('.js-series-data-loaded')).toBeVisible();
+
+    await page.getByRole('cell', { name: /Second Sine Wave Generator/ }).click();
+    await expect(page.getByText('Numeric Data')).toBeVisible();
+    await expect(
+      page.locator('span.plot-series-name', { hasText: 'Second Sine Wave Generator Hz' })
+    ).toBeVisible();
+    await expect(page.locator('.js-series-data-loaded')).toBeVisible();
+  });
+});

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

@@ -32,12 +32,25 @@ const path = require('path');
 const NOTEBOOK_NAME = 'Notebook';
 
 test.describe('Notebook CRUD Operations', () => {
-  test.fixme('Can create a Notebook Object', async ({ page }) => {
+  test.beforeEach(async ({ page }) => {
+    //Navigate to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+  test('Can create a Notebook Object', async ({ page }) => {
     //Create domain object
+    await createDomainObjectWithDefaults(page, {
+      type: NOTEBOOK_NAME
+    });
     //Newly created notebook should have one Section and one page, 'Unnamed Section'/'Unnamed Page'
+    const notebookSectionNames = page.locator('.c-notebook__sections .c-list__item__name');
+    const notebookPageNames = page.locator('.c-notebook__pages .c-list__item__name');
+    await expect(notebookSectionNames).toBeHidden();
+    await expect(notebookPageNames).toBeHidden();
+    await expect(notebookSectionNames).toHaveText('Unnamed Section');
+    await expect(notebookPageNames).toHaveText('Unnamed Page');
   });
   test.fixme('Can update a Notebook Object', async ({ page }) => {});
-  test.fixme('Can view a perviously created Notebook Object', async ({ page }) => {});
+  test.fixme('Can view a previously created Notebook Object', async ({ page }) => {});
   test.fixme('Can Delete a Notebook Object', async ({ page }) => {
     // Other than non-persistable objects
   });

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

@@ -19,12 +19,13 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
 */
 
 const fs = require('fs').promises;
+const path = require('path');
 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
@@ -176,7 +177,9 @@ test.describe('Snapshot image tests', () => {
   });
 
   test('Can drop an image onto a notebook and create a new entry', async ({ page }) => {
-    const imageData = await fs.readFile('src/images/favicons/favicon-96x96.png');
+    const imageData = await fs.readFile(
+      path.resolve(__dirname, '../../../../../src/images/favicons/favicon-96x96.png')
+    );
     const imageArray = new Uint8Array(imageData);
     const fileData = Array.from(imageArray);
 
@@ -201,14 +204,17 @@ test.describe('Snapshot image tests', () => {
     // drop another image onto the entry
     await page.dispatchEvent('.c-snapshots', 'drop', { dataTransfer: dropTransfer });
 
+    const secondThumbnail = page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).nth(1);
+    await secondThumbnail.waitFor({ state: 'attached' });
     // expect two embedded images now
     expect(await page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).count()).toBe(2);
 
     await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
 
     await page.getByRole('menuitem', { name: /Remove This Embed/ }).click();
-
     await page.getByRole('button', { name: 'Ok', exact: true }).click();
+    // Ensure that the thumbnail is removed before we assert
+    await secondThumbnail.waitFor({ state: 'detached' });
 
     // expect one embedded image now as we deleted the other
     expect(await page.getByRole('img', { name: 'favicon-96x96.png thumbnail' }).count()).toBe(1);

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

@@ -224,4 +224,22 @@ test.describe('Tagging in Notebooks @addInit', () => {
     // Verify the AutoComplete field is hidden
     await expect(page.locator('[placeholder="Type to select tag"]')).toBeHidden();
   });
+  test('Can start to add a tag, click away, and add a tag', async ({ page }) => {
+    await createNotebookEntryAndTags(page);
+
+    await page.getByRole('tab', { name: 'Annotations' }).click();
+
+    // Click on the body simulating a click outside the autocomplete)
+    await page.locator('body').click();
+    await page.locator(`[aria-label="Notebook Entry"]`).click();
+
+    await page.hover(`button:has-text("Add Tag")`);
+    await page.locator(`button:has-text("Add Tag")`).click();
+
+    // Click inside the tag search input
+    await page.locator('[placeholder="Type to select tag"]').click();
+    // Select the "Driving" tag
+    await page.locator('[aria-label="Autocomplete Options"] >> text=Drilling').click();
+    await expect(page.getByLabel('Notebook Entries').getByText('Drilling')).toBeVisible();
+  });
 });

e2e/tests/functional/features/plot/tagging.e2e.spec.js

@@ -0,0 +1,161 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/*
+Tests to verify plot tagging functionality.
+*/
+
+const { test, expect } = require('../../../../pluginFixtures');
+const {
+  basicTagsTests,
+  createTags,
+  testTelemetryItem
+} = require('../../../../helper/plotTagsUtils');
+const {
+  createDomainObjectWithDefaults,
+  setRealTimeMode,
+  setFixedTimeMode,
+  waitForPlotsToRender
+} = require('../../../../appActions');
+
+test.describe('Plot Tagging', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+
+  test('Tags work with Overlay Plots', async ({ page }) => {
+    test.slow();
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6822'
+    });
+
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: overlayPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.01'
+      }
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: overlayPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.02'
+      }
+    });
+
+    await page.goto(overlayPlot.url);
+
+    let canvas = page.locator('canvas').nth(1);
+
+    // Switch to real-time mode
+    // Adding tags should pause the plot
+    await setRealTimeMode(page);
+
+    await createTags({
+      page,
+      canvas
+    });
+
+    await setFixedTimeMode(page);
+
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+
+    // set to real time mode
+    await setRealTimeMode(page);
+
+    // Search for Science Tag
+    await page.getByRole('searchbox', { name: 'Search Input' });
+    await page.getByRole('searchbox', { name: 'Search Input' }).fill('sc');
+
+    // Click on the search object result
+    await page.getByLabel('OpenMCT Search').getByText('Alpha Sine Wave').first().click();
+
+    await waitForPlotsToRender(page);
+
+    // expect plot to be paused
+    await expect(page.getByTitle('Resume displaying real-time data')).toBeVisible();
+
+    await setFixedTimeMode(page);
+  });
+
+  test('Tags work with Plot View of telemetry items', async ({ page }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.01'
+      }
+    });
+    const canvas = page.locator('canvas').nth(1);
+    await createTags({
+      page,
+      canvas
+    });
+    await basicTagsTests(page);
+  });
+
+  test('Tags work with Stacked Plots', async ({ page }) => {
+    const stackedPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Stacked Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: stackedPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.01'
+      }
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: stackedPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.02'
+      }
+    });
+
+    await page.goto(stackedPlot.url);
+
+    const canvas = page.locator('canvas').nth(1);
+
+    await createTags({
+      page,
+      canvas,
+      xEnd: 700,
+      yEnd: 240
+    });
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+  });
+});

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

@@ -198,6 +198,32 @@ test.describe('Grand Search', () => {
     await expect(searchResultDropDown).toContainText('Clock A');
   });
 
+  test('Slowly typing after search debounce will abort requests @couchdb', async ({ page }) => {
+    let requestWasAborted = false;
+    await createObjectsForSearch(page);
+    page.on('requestfailed', (request) => {
+      // check if the request was aborted
+      if (request.failure().errorText === 'net::ERR_ABORTED') {
+        requestWasAborted = true;
+      }
+    });
+
+    // Intercept and delay request
+    const delayInMs = 100;
+
+    await page.route('**', async (route, request) => {
+      await new Promise((resolve) => setTimeout(resolve, delayInMs));
+      route.continue();
+    });
+
+    // Slowly type after search delay
+    const searchInput = page.getByRole('searchbox', { name: 'Search Input' });
+    await searchInput.pressSequentially('Clock', { delay: 200 });
+    await expect(page.getByText('Clock B').first()).toBeVisible();
+
+    expect(requestWasAborted).toBe(true);
+  });
+
   test('Validate multiple objects in search results return partial matches', async ({ page }) => {
     test.info().annotations.push({
       type: 'issue',

e2e/tests/functional/features/tabs/tabs.e2e.spec.js

@@ -54,21 +54,35 @@ test.describe('Tabs View', () => {
     // ensure table header visible
     await expect(page.getByRole('searchbox', { name: 'message filter input' })).toBeVisible();
 
+    // no canvas (i.e., sine wave generator) in the document should be visible
+    await expect(page.locator('canvas')).toBeHidden();
+
     // select second tab
     await page.getByLabel(`${notebook.name} tab`).click();
 
     // ensure notebook visible
     await expect(page.locator('.c-notebook__drag-area')).toBeVisible();
 
+    // no canvas (i.e., sine wave generator) in the document should be visible
+    await expect(page.locator('canvas')).toBeHidden();
+
     // select third tab
     await page.getByLabel(`${sineWaveGenerator.name} tab`).click();
 
     // expect sine wave generator visible
-    expect(await page.locator('.c-plot').isVisible()).toBe(true);
+    await expect(page.locator('.c-plot')).toBeVisible();
+
+    // expect two canvases (i.e., overlay & main canvas for sine wave generator) to be visible
+    await expect(page.locator('canvas')).toHaveCount(2);
+    await expect(page.locator('canvas').nth(0)).toBeVisible();
+    await expect(page.locator('canvas').nth(1)).toBeVisible();
 
     // now try to select the first tab again
     await page.getByLabel(`${table.name} tab`).click();
     // ensure table header visible
     await expect(page.getByRole('searchbox', { name: 'message filter input' })).toBeVisible();
+
+    // no canvas (i.e., sine wave generator) in the document should be visible
+    await expect(page.locator('canvas')).toBeHidden();
   });
 });

e2e/tests/functional/features/tooltips.e2e.spec.js

@@ -33,8 +33,8 @@ comfortable running this test during a live mission?" Avoid creating or deleting
 Make no assumptions about the order that elements appear in the DOM.
 */
 
-const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults, expandEntireTree } = require('../../appActions');
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults, expandEntireTree } = require('../../../appActions');
 
 test.describe('Verify tooltips', () => {
   let folder1;

e2e/tests/functional/planning/plan.e2e.spec.js

@@ -21,8 +21,13 @@
  *****************************************************************************/
 const { test } = require('../../../pluginFixtures');
 const { createPlanFromJSON } = require('../../../appActions');
+const { addPlanGetInterceptor } = require('../../../helper/planningUtils.js');
 const testPlan1 = require('../../../test-data/examplePlans/ExamplePlan_Small1.json');
-const { assertPlanActivities } = require('../../../helper/planningUtils');
+const testPlanWithOrderedLanes = require('../../../test-data/examplePlans/ExamplePlanWithOrderedLanes.json');
+const {
+  assertPlanActivities,
+  assertPlanOrderedSwimLanes
+} = require('../../../helper/planningUtils');
 
 test.describe('Plan', () => {
   let plan;
@@ -36,4 +41,14 @@ test.describe('Plan', () => {
   test('Displays all plan events', async ({ page }) => {
     await assertPlanActivities(page, testPlan1, plan.url);
   });
+
+  test('Displays plans with ordered swim lanes configuration', async ({ page }) => {
+    // Add configuration for swim lanes
+    await addPlanGetInterceptor(page);
+    // Create the plan
+    const planWithSwimLanes = await createPlanFromJSON(page, {
+      json: testPlanWithOrderedLanes
+    });
+    await assertPlanOrderedSwimLanes(page, testPlanWithOrderedLanes, planWithSwimLanes.url);
+  });
 });

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

@@ -1,292 +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.
- *****************************************************************************/
-
-/*
-Tests to verify plot tagging functionality.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const {
-  createDomainObjectWithDefaults,
-  setRealTimeMode,
-  setFixedTimeMode,
-  waitForPlotsToRender
-} = require('../../../../appActions');
-
-test.describe('Plot Tagging', () => {
-  /**
-   * Given a canvas and a set of points, tags the points on the canvas.
-   * @param {import('@playwright/test').Page} page
-   * @param {HTMLCanvasElement} canvas a telemetry item with a plot
-   * @param {Number} xEnd a telemetry item with a plot
-   * @param {Number} yEnd a telemetry item with a plot
-   * @returns {Promise}
-   */
-  async function createTags({ page, canvas, xEnd = 700, yEnd = 520 }) {
-    await canvas.hover({ trial: true });
-
-    //Alt+Shift Drag Start to select some points to tag
-    await page.keyboard.down('Alt');
-    await page.keyboard.down('Shift');
-
-    await canvas.dragTo(canvas, {
-      sourcePosition: {
-        x: 1,
-        y: 1
-      },
-      targetPosition: {
-        x: xEnd,
-        y: yEnd
-      }
-    });
-
-    //Alt Drag End
-    await page.keyboard.up('Alt');
-    await page.keyboard.up('Shift');
-
-    //Wait for canvas to stabilize.
-    await canvas.hover({ trial: true });
-
-    // add some tags
-    await page.getByText('Annotations').click();
-    await page.getByRole('button', { name: /Add Tag/ }).click();
-    await page.getByPlaceholder('Type to select tag').click();
-    await page.getByText('Driving').click();
-
-    await page.getByRole('button', { name: /Add Tag/ }).click();
-    await page.getByPlaceholder('Type to select tag').click();
-    await page.getByText('Science').click();
-  }
-
-  /**
-   * Given a telemetry item (e.g., a Sine Wave Generator) with a plot, tests that the plot can be tagged.
-   * @param {import('@playwright/test').Page} page
-   * @param {import('../../../../appActions').CreatedObjectInfo} telemetryItem a telemetry item with a plot
-   * @returns {Promise}
-   */
-  async function testTelemetryItem(page, telemetryItem) {
-    // Check that telemetry item also received the tag
-    await page.goto(telemetryItem.url);
-
-    await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-    const canvas = page.locator('canvas').nth(1);
-    //Wait for canvas to stabilize.
-    await waitForPlotsToRender(page);
-
-    await expect(canvas).toBeInViewport();
-    await canvas.hover({ trial: true });
-
-    // click on the tagged plot point
-    await canvas.click({
-      position: {
-        x: 100,
-        y: 100
-      }
-    });
-
-    await expect(page.getByText('Science')).toBeVisible();
-    await expect(page.getByText('Driving')).toBeHidden();
-  }
-
-  /**
-   * Given a page, tests that tags are searchable, deletable, and persist across reloads.
-   * @param {import('@playwright/test').Page} page
-   * @returns {Promise}
-   */
-  async function basicTagsTests(page) {
-    // Search for Driving
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-
-    // Clicking elsewhere should cause annotation selection to be cleared
-    await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
-    // click on the search result
-    await page
-      .getByRole('searchbox', { name: 'OpenMCT Search' })
-      .getByText(/Sine Wave/)
-      .first()
-      .click();
-
-    // Delete Driving
-    await page.hover('[aria-label="Tag"]:has-text("Driving")');
-    await page.locator('[aria-label="Remove tag Driving"]').click();
-
-    // Search for Science
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
-    await expect(page.locator('[aria-label="Search Result"]').nth(0)).toContainText('Science');
-    await expect(page.locator('[aria-label="Search Result"]').nth(0)).not.toContainText('Drilling');
-
-    // Search for Driving
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
-    await expect(page.getByText('No results found')).toBeVisible();
-
-    //Reload Page
-    await page.reload({ waitUntil: 'domcontentloaded' });
-    // wait for plots to load
-    await waitForPlotsToRender(page);
-
-    await expect(page.getByRole('tab', { name: 'Annotations' })).not.toHaveClass(/is-current/);
-    await page.getByRole('tab', { name: 'Annotations' }).click();
-    await expect(page.getByRole('tab', { name: 'Annotations' })).toHaveClass(/is-current/);
-
-    await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-    const canvas = page.locator('canvas').nth(1);
-    // click on the tagged plot point
-    await canvas.click({
-      position: {
-        x: 100,
-        y: 100
-      }
-    });
-
-    await expect(page.getByText('Science')).toBeVisible();
-    await expect(page.getByText('Driving')).toBeHidden();
-  }
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-
-  test('Tags work with Overlay Plots', async ({ page }) => {
-    test.slow();
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/6822'
-    });
-
-    const overlayPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Overlay Plot'
-    });
-
-    const alphaSineWave = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Alpha Sine Wave',
-      parent: overlayPlot.uuid,
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.01'
-      }
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Beta Sine Wave',
-      parent: overlayPlot.uuid,
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.02'
-      }
-    });
-
-    await page.goto(overlayPlot.url);
-
-    let canvas = page.locator('canvas').nth(1);
-
-    // Switch to real-time mode
-    // Adding tags should pause the plot
-    await setRealTimeMode(page);
-
-    await createTags({
-      page,
-      canvas
-    });
-
-    await setFixedTimeMode(page);
-
-    await basicTagsTests(page);
-    await testTelemetryItem(page, alphaSineWave);
-
-    // set to real time mode
-    await setRealTimeMode(page);
-
-    // Search for Science
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
-    // click on the search result
-    await page
-      .getByRole('searchbox', { name: 'OpenMCT Search' })
-      .getByText('Alpha Sine Wave')
-      .first()
-      .click();
-    // wait for plots to load
-    await expect(page.locator('.js-series-data-loaded')).toBeVisible();
-    // expect plot to be paused
-    await expect(page.locator('[title="Resume displaying real-time data"]')).toBeVisible();
-
-    await setFixedTimeMode(page);
-  });
-
-  test('Tags work with Plot View of telemetry items', async ({ page }) => {
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.01'
-      }
-    });
-    const canvas = page.locator('canvas').nth(1);
-    await createTags({
-      page,
-      canvas
-    });
-    await basicTagsTests(page);
-  });
-
-  test('Tags work with Stacked Plots', async ({ page }) => {
-    const stackedPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Stacked Plot'
-    });
-
-    const alphaSineWave = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Alpha Sine Wave',
-      parent: stackedPlot.uuid,
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.01'
-      }
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Beta Sine Wave',
-      parent: stackedPlot.uuid,
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.02'
-      }
-    });
-
-    await page.goto(stackedPlot.url);
-
-    const canvas = page.locator('canvas').nth(1);
-
-    await createTags({
-      page,
-      canvas,
-      xEnd: 700,
-      yEnd: 240
-    });
-    await basicTagsTests(page);
-    await testTelemetryItem(page, alphaSineWave);
-  });
-});

e2e/tests/performance/features/tabs.e2e.spec.js

@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { createDomainObjectWithDefaults, waitForPlotsToRender } = require('../../appActions');
-const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults, waitForPlotsToRender } = require('../../../appActions');
+const { test, expect } = require('../../../pluginFixtures');
 
 test.describe('Tabs View', () => {
   test('Renders tabbed elements nicely', async ({ page }) => {

e2e/tests/performance/features/tagging.perf.spec.js

@@ -0,0 +1,142 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/*
+Tests to verify plot tagging performance.
+*/
+
+const { test, expect } = require('../../pluginFixtures');
+const { basicTagsTests, createTags, testTelemetryItem } = require('../../helper/plotTagsUtils');
+const {
+  createDomainObjectWithDefaults,
+  setRealTimeMode,
+  setFixedTimeMode,
+  waitForPlotsToRender
+} = require('../../appActions');
+
+test.describe('Plot Tagging Performance', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+
+  test('Tags work with Overlay Plots', async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6822'
+    });
+    //Test.slow decorator is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
+    test.slow();
+
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: overlayPlot.uuid
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: overlayPlot.uuid
+    });
+
+    await page.goto(overlayPlot.url);
+
+    let canvas = page.locator('canvas').nth(1);
+
+    // Switch to real-time mode
+    // Adding tags should pause the plot
+    await setRealTimeMode(page);
+
+    await createTags({
+      page,
+      canvas
+    });
+
+    await setFixedTimeMode(page);
+
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+
+    // set to real time mode
+    await setRealTimeMode(page);
+
+    // Search for Science
+    await page.getByRole('searchbox', { name: 'Search Input' });
+    await page.getByRole('searchbox', { name: 'Search Input' }).fill('sc');
+
+    // click on the search result
+    await page.getByLabel('Search Result').getByText('Alpha Sine Wave').first().click();
+
+    await waitForPlotsToRender(page);
+    // expect plot to be paused
+    await expect(page.getByTitle('Resume displaying real-time data')).toBeVisible();
+
+    await setFixedTimeMode(page);
+  });
+
+  test('Tags work with Plot View of telemetry items', async ({ page }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator'
+    });
+    const canvas = page.locator('canvas').nth(1);
+    await createTags({
+      page,
+      canvas
+    });
+    await basicTagsTests(page);
+  });
+
+  test('Tags work with Stacked Plots', async ({ page }) => {
+    const stackedPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Stacked Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: stackedPlot.uuid
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: stackedPlot.uuid
+    });
+
+    await page.goto(stackedPlot.url);
+
+    const canvas = page.locator('canvas').nth(1);
+
+    await createTags({
+      page,
+      canvas,
+      xEnd: 700,
+      yEnd: 240
+    });
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+  });
+});

e2e/tests/performance/memory/navigation.memory.perf.spec.js

@@ -19,10 +19,15 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/* global __dirname */
 
 const { test, expect } = require('@playwright/test');
+const path = require('path');
 
-const memoryLeakFilePath = 'e2e/test-data/memory-leak-detection.json';
+const memoryLeakFilePath = path.resolve(
+  __dirname,
+  '../../../../e2e/test-data/memory-leak-detection.json'
+);
 /**
  * Executes tests to verify that views are not leaking memory on navigation away. This sort of
  * memory leak is generally caused by a failure to clean up registered listeners.
@@ -40,54 +45,127 @@ const memoryLeakFilePath = 'e2e/test-data/memory-leak-detection.json';
  *
  */
 
-const NAV_LEAK_TIMEOUT = 10 * 1000; // 10s
 test.describe('Navigation memory leak is not detected in', () => {
   test.beforeEach(async ({ page }) => {
     // Go to baseURL
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.locator('a:has-text("My Items")').click({
-      button: 'right'
-    });
+    await page
+      .getByRole('treeitem', {
+        name: /My Items/
+      })
+      .click({
+        button: 'right'
+      });
 
-    await page.locator('text=Import from JSON').click();
+    await page
+      .getByRole('menuitem', {
+        name: /Import from JSON/
+      })
+      .click();
 
     // Upload memory-leak-detection.json
     await page.setInputFiles('#fileElem', memoryLeakFilePath);
 
-    await page.locator('text=OK').click();
+    await page
+      .getByRole('button', {
+        name: 'Save'
+      })
+      .click();
 
     await expect(page.locator('a:has-text("Memory Leak Detection")')).toBeVisible();
   });
 
+  test('gauge', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'gauge-single-1hz-swg');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('plan', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'plan-generated');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('time list', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'time-list');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('scatter', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'scatter-plot-single-1hz-swg');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('graph', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'graph-single-1hz-swg');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('gantt chart', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'gantt-chart');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('clock', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'clock');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('timer', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'timer-far-future');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('web page (nasa.gov)', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'web-page');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('Complex Display Layout', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'complex-display-layout');
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
   test('plot view', async ({ page }) => {
-    const result = await navigateToObjectAndDetectMemoryLeak(page, 'overlay-plot-single-1hz-swg', {
-      timeout: NAV_LEAK_TIMEOUT
-    });
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'overlay-plot-single-1hz-swg');
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
     expect(result).toBe(true);
   });
 
   test('stacked plot view', async ({ page }) => {
-    const result = await navigateToObjectAndDetectMemoryLeak(page, 'stacked-plot-single-1hz-swg', {
-      timeout: NAV_LEAK_TIMEOUT
-    });
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'stacked-plot-single-1hz-swg');
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
     expect(result).toBe(true);
   });
 
   test('LAD table view', async ({ page }) => {
-    const result = await navigateToObjectAndDetectMemoryLeak(page, 'lad-table-single-1hz-swg', {
-      timeout: NAV_LEAK_TIMEOUT
-    });
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'lad-table-single-1hz-swg');
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
     expect(result).toBe(true);
   });
 
   test('LAD table set', async ({ page }) => {
-    const result = await navigateToObjectAndDetectMemoryLeak(page, 'lad-table-set-single-1hz-swg', {
-      timeout: NAV_LEAK_TIMEOUT
-    });
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'lad-table-set-single-1hz-swg');
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
     expect(result).toBe(true);
   });
@@ -96,10 +174,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('telemetry table view', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'telemetry-table-single-1hz-swg',
-      {
-        timeout: NAV_LEAK_TIMEOUT
-      }
+      'telemetry-table-single-1hz-swg'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -110,10 +185,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('notebook view', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'notebook-memory-leak-detection-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT
-      }
+      'notebook-memory-leak-detection-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -121,13 +193,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   });
 
   test('display layout of a single SWG alphanumeric', async ({ page }) => {
-    const result = await navigateToObjectAndDetectMemoryLeak(
-      page,
-      'display-layout-single-1hz-swg',
-      {
-        timeout: NAV_LEAK_TIMEOUT
-      }
-    );
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'display-layout-single-1hz-swg');
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
     expect(result).toBe(true);
@@ -136,10 +202,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('display layout of a single SWG plot', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'display-layout-single-overlay-plot',
-      {
-        timeout: NAV_LEAK_TIMEOUT
-      }
+      'display-layout-single-overlay-plot'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -150,10 +213,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('example imagery view', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'example-imagery-memory-leak-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
-      }
+      'example-imagery-memory-leak-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -163,10 +223,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('display layout of example imagery views', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'display-layout-images-memory-leak-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
-      }
+      'display-layout-images-memory-leak-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -178,10 +235,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'display-layout-simple-telemetry',
-      {
-        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
-      }
+      'display-layout-simple-telemetry'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -191,10 +245,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('flexible layout with plots of swgs', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'flexible-layout-plots-memory-leak-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT
-      }
+      'flexible-layout-plots-memory-leak-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -204,10 +255,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('flexible layout of example imagery views', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'flexible-layout-images-memory-leak-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
-      }
+      'flexible-layout-images-memory-leak-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -217,10 +265,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('tabbed view of display layouts and time strips', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'tab-view-simple-memory-leak-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT * 6 * 2 // 2 min
-      }
+      'tab-view-simple-memory-leak-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -230,10 +275,7 @@ test.describe('Navigation memory leak is not detected in', () => {
   test('time strip view of telemetry', async ({ page }) => {
     const result = await navigateToObjectAndDetectMemoryLeak(
       page,
-      'time-strip-telemetry-memory-leak-test',
-      {
-        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
-      }
+      'time-strip-telemetry-memory-leak-test'
     );
 
     // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
@@ -247,15 +289,12 @@ test.describe('Navigation memory leak is not detected in', () => {
    * @returns
    */
   async function navigateToObjectAndDetectMemoryLeak(page, objectName) {
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.getByRole('searchbox', { name: 'Search Input' }).click();
     // Fill Search input
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill(objectName);
+    await page.getByRole('searchbox', { name: 'Search Input' }).fill(objectName);
 
     //Search Result Appears and is clicked
-    await Promise.all([
-      page.locator(`div.c-gsearch-result__title:has-text("${objectName}")`).first().click(),
-      page.waitForNavigation()
-    ]);
+    await page.getByText(objectName, { exact: true }).click();
 
     // Register a finalization listener on the root node for the view. This tends to be the last thing to be
     // garbage collected since it has either direct or indirect references to all resources used by the view. Therefore it's a pretty good proxy
@@ -273,8 +312,7 @@ test.describe('Navigation memory leak is not detected in', () => {
     });
 
     // Nav back to folder
-    await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-    await page.waitForNavigation();
+    await page.goto('./#/browse/mine');
 
     // This next code block blocks until the finalization listener is called and the gcPromise resolved. This means that the root node for the view has been garbage collected.
     // In the event that the root node is not garbage collected, the gcPromise will never resolve and the test will time out.

e2e/tests/performance/tagging.perf.spec.js

@@ -1,273 +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.
- *****************************************************************************/
-
-/*
-Tests to verify plot tagging performance.
-*/
-
-const { test, expect } = require('../../pluginFixtures');
-const {
-  createDomainObjectWithDefaults,
-  setRealTimeMode,
-  setFixedTimeMode,
-  waitForPlotsToRender
-} = require('../../appActions');
-
-test.describe('Plot Tagging Performance', () => {
-  /**
-   * Given a canvas and a set of points, tags the points on the canvas.
-   * @param {import('@playwright/test').Page} page
-   * @param {HTMLCanvasElement} canvas a telemetry item with a plot
-   * @param {Number} xEnd a telemetry item with a plot
-   * @param {Number} yEnd a telemetry item with a plot
-   * @returns {Promise}
-   */
-  async function createTags({ page, canvas, xEnd = 700, yEnd = 520 }) {
-    await canvas.hover({ trial: true });
-
-    //Alt+Shift Drag Start to select some points to tag
-    await page.keyboard.down('Alt');
-    await page.keyboard.down('Shift');
-
-    await canvas.dragTo(canvas, {
-      sourcePosition: {
-        x: 1,
-        y: 1
-      },
-      targetPosition: {
-        x: xEnd,
-        y: yEnd
-      }
-    });
-
-    //Alt Drag End
-    await page.keyboard.up('Alt');
-    await page.keyboard.up('Shift');
-
-    //Wait for canvas to stabilize.
-    await canvas.hover({ trial: true });
-
-    // add some tags
-    await page.getByText('Annotations').click();
-    await page.getByRole('button', { name: /Add Tag/ }).click();
-    await page.getByPlaceholder('Type to select tag').click();
-    await page.getByText('Driving').click();
-
-    await page.getByRole('button', { name: /Add Tag/ }).click();
-    await page.getByPlaceholder('Type to select tag').click();
-    await page.getByText('Science').click();
-  }
-
-  /**
-   * Given a telemetry item (e.g., a Sine Wave Generator) with a plot, tests that the plot can be tagged.
-   * @param {import('@playwright/test').Page} page
-   * @param {import('../../../../appActions').CreatedObjectInfo} telemetryItem a telemetry item with a plot
-   * @returns {Promise}
-   */
-  async function testTelemetryItem(page, telemetryItem) {
-    // Check that telemetry item also received the tag
-    await page.goto(telemetryItem.url);
-
-    await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-    const canvas = page.locator('canvas').nth(1);
-
-    //Wait for canvas to stabilize.
-    await canvas.hover({ trial: true });
-
-    // click on the tagged plot point
-    await canvas.click({
-      position: {
-        x: 100,
-        y: 100
-      }
-    });
-
-    await expect(page.getByText('Science')).toBeVisible();
-    await expect(page.getByText('Driving')).toBeHidden();
-  }
-
-  /**
-   * Given a page, tests that tags are searchable, deletable, and persist across reloads.
-   * @param {import('@playwright/test').Page} page
-   * @returns {Promise}
-   */
-  async function basicTagsTests(page) {
-    // Search for Driving
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-
-    // Clicking elsewhere should cause annotation selection to be cleared
-    await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
-    // click on the search result
-    await page
-      .getByRole('searchbox', { name: 'OpenMCT Search' })
-      .getByText(/Sine Wave/)
-      .first()
-      .click();
-
-    // Delete Driving
-    await page.hover('[aria-label="Tag"]:has-text("Driving")');
-    await page.locator('[aria-label="Remove tag Driving"]').click();
-
-    // Search for Science
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
-    await expect(page.locator('[aria-label="Search Result"]').nth(0)).toContainText('Science');
-    await expect(page.locator('[aria-label="Search Result"]').nth(0)).not.toContainText('Drilling');
-
-    // Search for Driving
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
-    await expect(page.getByText('No results found')).toBeVisible();
-
-    //Reload Page
-    await page.reload({ waitUntil: 'domcontentloaded' });
-    // wait for plots to load
-    await waitForPlotsToRender(page);
-
-    await page.getByText('Annotations').click();
-    await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-    const canvas = page.locator('canvas').nth(1);
-    // click on the tagged plot point
-    await canvas.click({
-      position: {
-        x: 100,
-        y: 100
-      }
-    });
-
-    await expect(page.getByText('Science')).toBeVisible();
-    await expect(page.getByText('Driving')).toBeHidden();
-  }
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-
-  test('Tags work with Overlay Plots', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/6822'
-    });
-    //Test.slow decorator is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
-    test.slow();
-
-    const overlayPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Overlay Plot'
-    });
-
-    const alphaSineWave = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Alpha Sine Wave',
-      parent: overlayPlot.uuid
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Beta Sine Wave',
-      parent: overlayPlot.uuid
-    });
-
-    await page.goto(overlayPlot.url);
-
-    let canvas = page.locator('canvas').nth(1);
-
-    // Switch to real-time mode
-    // Adding tags should pause the plot
-    await setRealTimeMode(page);
-
-    await createTags({
-      page,
-      canvas
-    });
-
-    await setFixedTimeMode(page);
-
-    await basicTagsTests(page);
-    await testTelemetryItem(page, alphaSineWave);
-
-    // set to real time mode
-    await setRealTimeMode(page);
-
-    // Search for Science
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
-    // click on the search result
-    await page
-      .getByRole('searchbox', { name: 'OpenMCT Search' })
-      .getByText('Alpha Sine Wave')
-      .first()
-      .click();
-    // wait for plots to load
-    await expect(page.locator('.js-series-data-loaded')).toBeVisible();
-    // expect plot to be paused
-    await expect(page.locator('[title="Resume displaying real-time data"]')).toBeVisible();
-
-    await setFixedTimeMode(page);
-  });
-
-  test('Tags work with Plot View of telemetry items', async ({ page }) => {
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator'
-    });
-    const canvas = page.locator('canvas').nth(1);
-    await createTags({
-      page,
-      canvas
-    });
-    await basicTagsTests(page);
-  });
-
-  test('Tags work with Stacked Plots', async ({ page }) => {
-    const stackedPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Stacked Plot'
-    });
-
-    const alphaSineWave = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Alpha Sine Wave',
-      parent: stackedPlot.uuid
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Beta Sine Wave',
-      parent: stackedPlot.uuid
-    });
-
-    await page.goto(stackedPlot.url);
-
-    const canvas = page.locator('canvas').nth(1);
-
-    await createTags({
-      page,
-      canvas,
-      xEnd: 700,
-      yEnd: 240
-    });
-    await basicTagsTests(page);
-    await testTelemetryItem(page, alphaSineWave);
-  });
-});

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

@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * 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, scanForA11yViolations } = require('../../avpFixtures');
+const VISUAL_URL = require('../../constants').VISUAL_URL;
+
+test.describe('a11y - Default @a11y', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto(VISUAL_URL, { waitUntil: 'domcontentloaded' });
+  });
+  test('main view @a11y', async ({ page }, testInfo) => {
+    await scanForA11yViolations(page, testInfo.title);
+  });
+});

e2e/tests/visual-a11y/features/controlledClock.visual.spec.js

@@ -25,8 +25,8 @@ Collection of Visual Tests set to run with browser clock manipulate made possibl
 clockOptions plugin fixture.
 */
 
-const { VISUAL_URL, MISSION_TIME } = require('../../constants');
-const { test, expect } = require('../../pluginFixtures');
+const { VISUAL_URL, MISSION_TIME } = require('../../../constants');
+const { test, expect } = require('../../../pluginFixtures');
 const percySnapshot = require('@percy/playwright');
 
 test.describe('Visual - Controlled Clock', () => {

e2e/tests/visual-a11y/features/defaultPlugins.visual.spec.js

@@ -26,12 +26,12 @@ are only meant to run against openmct's app.js started by `npm run start` within
 `./e2e/playwright-visual.config.js` file.
 */
 
-const { test, expect } = require('../../pluginFixtures');
+const { test, expect, scanForA11yViolations } = require('../../avpFixtures');
 const percySnapshot = require('@percy/playwright');
 const { createDomainObjectWithDefaults } = require('../../appActions');
 const { VISUAL_URL } = require('../../constants');
 
-test.describe('Visual - Default', () => {
+test.describe('Visual - Default @a11y', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto(VISUAL_URL, { waitUntil: 'domcontentloaded' });
   });
@@ -98,4 +98,8 @@ test.describe('Visual - Default', () => {
     // Take a snapshot of the newly created Gauge object
     await percySnapshot(page, `Default Gauge (theme: '${theme}')`);
   });
+
+  test.afterEach(async ({ page }, testInfo) => {
+    await scanForA11yViolations(page, testInfo.title);
+  });
 });

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

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../pluginFixtures');
+const { test, scanForA11yViolations } = require('../../avpFixtures');
 const percySnapshot = require('@percy/playwright');
 const { expandTreePaneItemByName, createDomainObjectWithDefaults } = require('../../appActions');
 const {
@@ -31,7 +31,8 @@ const { VISUAL_URL } = require('../../constants');
 
 test.describe('Visual - Restricted Notebook', () => {
   test.beforeEach(async ({ page }) => {
-    await startAndAddRestrictedNotebookObject(page);
+    const restrictedNotebook = await startAndAddRestrictedNotebookObject(page);
+    await page.goto(restrictedNotebook.url + '?hideTree=true&hideInspector=true');
   });
 
   test('Restricted Notebook is visually correct @addInit', async ({ page, theme }) => {
@@ -58,7 +59,7 @@ test.describe('Visual - Notebook', () => {
       name: 'Dropped Overlay Plot'
     });
 
-    //Open Tree
+    //Open Tree to perform drag
     await page.getByRole('button', { name: 'Browse' }).click();
 
     await expandTreePaneItemByName(page, myItemsFolderName);
@@ -97,4 +98,36 @@ test.describe('Visual - Notebook', () => {
     // Take snapshot of the notebook with the AutoComplete field hidden and with the "Add Tag" button visible
     await percySnapshot(page, `Notebook Annotation de-select blur (theme: '${theme}')`);
   });
+  test('Visual check of entry hover and selection', async ({ page, theme }) => {
+    // Make two entries so we can test an unselected entry
+    await enterTextEntry(page, 'Entry 0');
+    await enterTextEntry(page, 'Entry 1');
+
+    // Hover the first entry
+    await page.getByText('Entry 0').hover();
+
+    // Take a snapshot
+    await percySnapshot(page, `Notebook Non-selected Entry Hover (theme: '${theme}')`);
+
+    // Click the first entry
+    await page.getByText('Entry 0').click();
+
+    // Take a snapshot
+    await percySnapshot(page, `Notebook Selected Entry Hover (theme: '${theme}')`);
+
+    // Hover the text entry area
+    await page.getByText('Entry 0').hover();
+
+    // Take a snapshot
+    await percySnapshot(page, `Notebook Selected Entry Text Area Hover (theme: '${theme}')`);
+
+    // Click the text entry area
+    await page.getByText('Entry 0').click();
+
+    // Take a snapshot
+    await percySnapshot(page, `Notebook Selected Entry Text Area Active (theme: '${theme}')`);
+  });
+  test.afterEach(async ({ page }, testInfo) => {
+    await scanForA11yViolations(page, testInfo.title);
+  });
 });

e2e/tests/visual-a11y/features/notification.visual.spec.js

@@ -24,24 +24,24 @@
  * This test is dedicated to test notification banner functionality and its accessibility attributes.
  */
 
-const { test, expect } = require('../../pluginFixtures');
+const { test, expect, scanForA11yViolations } = require('../../avpFixtures');
 const percySnapshot = require('@percy/playwright');
 const { createDomainObjectWithDefaults } = require('../../appActions');
 const VISUAL_URL = require('../../constants').VISUAL_URL;
 
-test.describe("Visual - Check Notification Info Banner of 'Save successful'", () => {
+test.describe("Visual - Check Notification Info Banner of 'Save successful' @a11y", () => {
   test.beforeEach(async ({ page }) => {
     await page.goto(VISUAL_URL, { waitUntil: 'domcontentloaded' });
   });
 
-  test("Create a clock, click on 'Save successful' banner and dismiss it", async ({
+  test("Create a folder, click on 'Save successful' banner and dismiss it", async ({
     page,
     theme
   }) => {
     // Create a clock domain object
     await createDomainObjectWithDefaults(page, {
-      type: 'Clock',
-      name: 'Default Clock'
+      type: 'Condition Widget',
+      name: 'Visual Condition Widget'
     });
     // Click on the div with role="alert" that has "Save successful" text
     await page.locator('div[role="alert"]:has-text("Save successful")').click();
@@ -59,4 +59,7 @@ test.describe("Visual - Check Notification Info Banner of 'Save successful'", ()
     expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
     await percySnapshot(page, `Notification banner dismissed (theme: '${theme}')`);
   });
+  test.afterEach(async ({ page }, testInfo) => {
+    await scanForA11yViolations(page, testInfo.title);
+  });
 });

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

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../pluginFixtures');
+const { test, scanForA11yViolations } = require('../../avpFixtures');
 const {
   setBoundsToSpanAllActivities,
   setDraftStatusForPlan
@@ -32,7 +32,7 @@ const examplePlanSmall = require('../../test-data/examplePlans/ExamplePlan_Small
 
 const snapshotScope = '.l-shell__pane-main .l-pane__contents';
 
-test.describe('Visual - Planning', () => {
+test.describe('Visual - Planning @a11y', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto(VISUAL_URL, { waitUntil: 'domcontentloaded' });
   });
@@ -97,4 +97,7 @@ test.describe('Visual - Planning', () => {
       scope: snapshotScope
     });
   });
+  test.afterEach(async ({ page }, testInfo) => {
+    await scanForA11yViolations(page, testInfo.title);
+  });
 });

e2e/tests/visual-a11y/features/search.visual.spec.js

@@ -24,14 +24,14 @@
 This test suite is dedicated to tests which verify search functionality.
 */
 
-const { test, expect } = require('../../pluginFixtures');
+const { test, expect, scanForA11yViolations } = require('../../avpFixtures');
 const { createDomainObjectWithDefaults } = require('../../appActions');
 const { VISUAL_URL } = require('../../constants');
 
 const percySnapshot = require('@percy/playwright');
 
-test.describe('Grand Search', () => {
-  let clock;
+test.describe('Grand Search @a11y', () => {
+  let conditionWidget;
   let displayLayout;
   test.beforeEach(async ({ page }) => {
     await page.goto(VISUAL_URL, { waitUntil: 'domcontentloaded' });
@@ -41,9 +41,9 @@ test.describe('Grand Search', () => {
       name: 'Visual Test Display Layout'
     });
 
-    clock = await createDomainObjectWithDefaults(page, {
-      type: 'Clock',
-      name: 'Visual Test Clock',
+    conditionWidget = await createDomainObjectWithDefaults(page, {
+      type: 'Condition Widget',
+      name: 'Visual Condition Widget',
       parent: displayLayout.uuid
     });
   });
@@ -52,29 +52,27 @@ test.describe('Grand Search', () => {
     page,
     theme
   }) => {
-    const searchInput = page.getByRole('searchbox', { name: 'Search Input' });
-    const searchResults = page.getByRole('searchbox', { name: 'OpenMCT Search' });
     // Navigate to display layout
     await page.goto(displayLayout.url);
 
-    // Search for the clock object
-    await searchInput.click();
-    await searchInput.fill(clock.name);
-    await expect(searchResults.getByText('Visual Test Clock')).toBeVisible();
+    // Search for the object
+    await page.getByRole('searchbox', { name: 'Search Input' }).click();
+    await page.getByRole('searchbox', { name: 'Search Input' }).fill(conditionWidget.name);
+    await expect(page.getByLabel('Search Result').getByText(conditionWidget.name)).toBeVisible();
 
     //Searching for an object returns that object in the grandsearch
-    await percySnapshot(page, `Searching for Clock Object (theme: '${theme}')`);
+    await percySnapshot(page, `Searching for Object (theme: '${theme}')`);
 
     // Enter Edit mode on the Display Layout
     await page.getByRole('button', { name: 'Edit' }).click();
 
-    // Navigate to the clock object while in edit mode on the display layout
-    await searchInput.click();
-    await searchResults.getByText('Visual Test Clock').click();
+    // Navigate to the object while in edit mode on the display layout
+    await page.getByRole('searchbox', { name: 'Search Input' }).click();
+    await page.getByLabel('Search Result').getByText(conditionWidget.name).click();
 
     await percySnapshot(
       page,
-      `Preview for clock should display when editing enabled and search item clicked (theme: '${theme}')`
+      `Preview should display when editing enabled and search item clicked (theme: '${theme}')`
     );
 
     // Close the preview
@@ -88,17 +86,20 @@ test.describe('Grand Search', () => {
     await page.getByRole('button', { name: 'Save' }).click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
-    // Search for the clock object
-    await searchInput.click();
-    await searchInput.fill(clock.name);
-    await expect(searchResults.getByText('Visual Test Clock')).toBeVisible();
+    // Search for the object
+    await page.getByRole('searchbox', { name: 'Search Input' }).click();
+    await page.getByRole('searchbox', { name: 'Search Input' }).fill(conditionWidget.name);
+    await expect(page.getByLabel('Search Result').getByText(conditionWidget.name)).toBeVisible();
 
-    // Navigate to the clock object while not in edit mode on the display layout
-    await searchResults.getByText('Visual Test Clock').click();
+    // Navigate to the object while not in edit mode on the display layout
+    await page.getByLabel('Search Result').getByText(conditionWidget.name).click();
 
     await percySnapshot(
       page,
       `Clicking on search results should navigate to them if not editing (theme: '${theme}')`
     );
   });
+  test.afterEach(async ({ page }, testInfo) => {
+    await scanForA11yViolations(page, testInfo.title);
+  });
 });

example/dataVisualization/ExampleDataVisualizationSourceViewProvider.js

@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+import mount from 'utils/mount';
+
+import ExampleDataVisualizationSource from './components/ExampleDataVisualizationSource.vue';
+
+export default function ExampleDataVisualizationSourceViewProvider(openmct) {
+  return {
+    key: 'exampleDataVisualizationSource',
+    name: 'Example Data Visualization Source',
+    cssClass: 'icon-telemetry',
+    canView: function (domainObject) {
+      return domainObject.type === 'exampleDataVisualizationSource';
+    },
+    canEdit: function (domainObject) {
+      if (domainObject.type === 'exampleDataVisualizationSource') {
+        return true;
+      }
+    },
+    view: function (domainObject) {
+      let _destroy = null;
+
+      return {
+        show: function (element, isEditing) {
+          const { destroy } = mount(
+            {
+              el: element,
+              components: {
+                ExampleDataVisualizationSource
+              },
+              provide: {
+                openmct,
+                domainObject
+              },
+              template: '<example-data-visualization-source></example-data-visualization-source>'
+            },
+            {
+              app: openmct.app,
+              element
+            }
+          );
+          _destroy = destroy;
+        },
+        destroy: function () {
+          if (_destroy) {
+            _destroy();
+          }
+        }
+      };
+    },
+    priority: function () {
+      return 1;
+    }
+  };
+}

example/dataVisualization/components/ExampleDataVisualizationSource.vue

@@ -0,0 +1,128 @@
+<!--
+ 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.
+-->
+
+<template>
+  <div class="c-table c-list-view c-list-view--selectable">
+    <table class="c-table__body">
+      <thead class="c-table__header">
+        <tr>
+          <th>Name</th>
+          <th>Type</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          v-for="item in items"
+          :key="item.keyString"
+          class="c-list-item js-folder-child"
+          @click="selectItem(item, $event)"
+        >
+          <td class="c-list-item__name">
+            <a ref="objectLink" class="c-object-label">
+              <div
+                class="c-object-label__type-icon c-list-item__name__type-icon"
+                :class="item.type.cssClass"
+              ></div>
+              <div class="c-object-label__name c-list-item__name__name">{{ item.model.name }}</div>
+            </a>
+          </td>
+          <td class="c-list-item__type">
+            {{ item.type.name }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  inject: ['openmct', 'domainObject'],
+  data() {
+    return {
+      items: []
+    };
+  },
+  mounted() {
+    this.composition = this.openmct.composition.get(this.domainObject);
+    this.keystring = this.openmct.objects.makeKeyString(this.domainObject.identifier);
+    this.composition.on('add', this.addedTelemetry);
+    this.composition.on('remove', this.removedTelemetry);
+    this.composition.load();
+  },
+  unmounted() {
+    this.composition.off('add', this.addedTelemetry);
+    this.composition.off('remove', this.removedTelemetry);
+  },
+  methods: {
+    selectItem(item, event) {
+      event.stopPropagation();
+      const bounds = this.openmct.time.getBounds();
+      const selection = [
+        {
+          element: this.$el,
+          context: {
+            dataVisualization: {
+              telemetryKeys: [item.objectKeyString],
+              description: {
+                text: item.model.name,
+                icon: item.type.cssClass
+              },
+              dataRanges: [
+                {
+                  bounds
+                }
+              ],
+              loading: false
+            },
+            item: this.domainObject
+          }
+        }
+      ];
+      this.openmct.selection.select(selection, false);
+    },
+    addedTelemetry(child) {
+      const type = this.openmct.types.get(child.type) || {
+        definition: {
+          cssClass: 'icon-object-unknown',
+          name: 'Unknown Type'
+        }
+      };
+      this.items.push({
+        model: child,
+        type: type.definition,
+        isAlias: this.keystring !== child.location,
+        objectPath: [child].concat(this.openmct.router.path),
+        objectKeyString: this.openmct.objects.makeKeyString(child.identifier)
+      });
+    },
+    removedTelemetry(identifier) {
+      this.items = this.items.filter((i) => {
+        return (
+          i.model.identifier.key !== identifier.key ||
+          i.model.identifier.namespace !== identifier.namespace
+        );
+      });
+    }
+  }
+};
+</script>

example/dataVisualization/plugin.js

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+import ExampleDataVisualizationSourceViewProvider from './ExampleDataVisualizationSourceViewProvider';
+
+export default function () {
+  return function install(openmct) {
+    openmct.objectViews.addProvider(new ExampleDataVisualizationSourceViewProvider(openmct));
+
+    openmct.types.addType('exampleDataVisualizationSource', {
+      name: 'Example Data Visualization Source',
+      creatable: true,
+      description: 'An example data visualization source to be used with an inspector.',
+      cssClass: 'icon-telemetry',
+      initialize(domainObject) {
+        domainObject.composition = [];
+      }
+    });
+
+    openmct.composition.addPolicy((parent, child) => {
+      if (parent.type === 'exampleDataVisualizationSource') {
+        return Object.prototype.hasOwnProperty.call(child, 'telemetry');
+      } else {
+        return true;
+      }
+    });
+  };
+}

example/generator/GeneratorMetadataProvider.js

@@ -1,138 +1,134 @@
-define(['lodash'], function (_) {
-  var METADATA_BY_TYPE = {
-    generator: {
-      values: [
-        {
-          key: 'name',
-          name: 'Name',
-          format: 'string'
-        },
-        {
-          key: 'utc',
-          name: 'Time',
-          format: 'utc',
-          hints: {
-            domain: 1
-          }
-        },
-        {
-          key: 'yesterday',
-          name: 'Yesterday',
-          format: 'utc',
-          hints: {
-            domain: 2
-          }
-        },
-        {
-          key: 'wavelengths',
-          name: 'Wavelength',
-          unit: 'nm',
-          format: 'string[]',
-          hints: {
-            range: 4
-          }
-        },
-        // Need to enable "LocalTimeSystem" plugin to make use of this
-        // {
-        //     key: "local",
-        //     name: "Time",
-        //     format: "local-format",
-        //     source: "utc",
-        //     hints: {
-        //         domain: 3
-        //     }
-        // },
-        {
-          key: 'sin',
-          name: 'Sine',
-          unit: 'Hz',
-          formatString: '%0.2f',
-          hints: {
-            range: 1
-          }
-        },
-        {
-          key: 'cos',
-          name: 'Cosine',
-          unit: 'deg',
-          formatString: '%0.2f',
-          hints: {
-            range: 2
-          }
-        },
-        {
-          key: 'intensities',
-          name: 'Intensities',
-          format: 'number[]',
-          hints: {
-            range: 3
-          }
+const METADATA_BY_TYPE = {
+  generator: {
+    values: [
+      {
+        key: 'name',
+        name: 'Name',
+        format: 'string'
+      },
+      {
+        key: 'utc',
+        name: 'Time',
+        format: 'utc',
+        hints: {
+          domain: 1
         }
-      ]
-    },
-    'example.state-generator': {
-      values: [
-        {
-          key: 'name',
-          name: 'Name',
-          format: 'string'
-        },
-        {
-          key: 'utc',
-          name: 'Time',
-          format: 'utc',
-          hints: {
-            domain: 1
-          }
-        },
-        {
-          key: 'local',
-          name: 'Time',
-          format: 'utc',
-          source: 'utc',
-          hints: {
-            domain: 2
-          }
-        },
-        {
-          key: 'state',
-          source: 'value',
-          name: 'State',
-          format: 'enum',
-          enumerations: [
-            {
-              value: 0,
-              string: 'OFF'
-            },
-            {
-              value: 1,
-              string: 'ON'
-            }
-          ],
-          hints: {
-            range: 1
-          }
-        },
-        {
-          key: 'value',
-          name: 'Value',
-          hints: {
-            range: 2
-          }
+      },
+      {
+        key: 'yesterday',
+        name: 'Yesterday',
+        format: 'utc',
+        hints: {
+          domain: 2
         }
-      ]
-    }
-  };
+      },
+      {
+        key: 'wavelengths',
+        name: 'Wavelength',
+        unit: 'nm',
+        format: 'string[]',
+        hints: {
+          range: 4
+        }
+      },
+      // Need to enable "LocalTimeSystem" plugin to make use of this
+      // {
+      //     key: "local",
+      //     name: "Time",
+      //     format: "local-format",
+      //     source: "utc",
+      //     hints: {
+      //         domain: 3
+      //     }
+      // },
+      {
+        key: 'sin',
+        name: 'Sine',
+        unit: 'Hz',
+        formatString: '%0.2f',
+        hints: {
+          range: 1
+        }
+      },
+      {
+        key: 'cos',
+        name: 'Cosine',
+        unit: 'deg',
+        formatString: '%0.2f',
+        hints: {
+          range: 2
+        }
+      },
+      {
+        key: 'intensities',
+        name: 'Intensities',
+        format: 'number[]',
+        hints: {
+          range: 3
+        }
+      }
+    ]
+  },
+  'example.state-generator': {
+    values: [
+      {
+        key: 'name',
+        name: 'Name',
+        format: 'string'
+      },
+      {
+        key: 'utc',
+        name: 'Time',
+        format: 'utc',
+        hints: {
+          domain: 1
+        }
+      },
+      {
+        key: 'local',
+        name: 'Time',
+        format: 'utc',
+        source: 'utc',
+        hints: {
+          domain: 2
+        }
+      },
+      {
+        key: 'state',
+        source: 'value',
+        name: 'State',
+        format: 'enum',
+        enumerations: [
+          {
+            value: 0,
+            string: 'OFF'
+          },
+          {
+            value: 1,
+            string: 'ON'
+          }
+        ],
+        hints: {
+          range: 1
+        }
+      },
+      {
+        key: 'value',
+        name: 'Value',
+        hints: {
+          range: 2
+        }
+      }
+    ]
+  }
+};
 
-  function GeneratorMetadataProvider() {}
+export default function GeneratorMetadataProvider() {}
 
-  GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-    return Object.prototype.hasOwnProperty.call(METADATA_BY_TYPE, domainObject.type);
-  };
+GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
+  return Object.prototype.hasOwnProperty.call(METADATA_BY_TYPE, domainObject.type);
+};
 
-  GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
-    return Object.assign({}, domainObject.telemetry, METADATA_BY_TYPE[domainObject.type]);
-  };
-
-  return GeneratorMetadataProvider;
-});
+GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
+  return Object.assign({}, domainObject.telemetry, METADATA_BY_TYPE[domainObject.type]);
+};

example/generator/GeneratorProvider.js

@@ -20,86 +20,84 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(['./WorkerInterface'], function (WorkerInterface) {
-  var REQUEST_DEFAULTS = {
-    amplitude: 1,
-    period: 10,
-    offset: 0,
-    dataRateInHz: 1,
-    randomness: 0,
-    phase: 0,
-    loadDelay: 0,
-    infinityValues: false,
-    exceedFloat32: false
-  };
+import WorkerInterface from './WorkerInterface';
 
-  function GeneratorProvider(openmct, StalenessProvider) {
-    this.openmct = openmct;
-    this.workerInterface = new WorkerInterface(openmct, StalenessProvider);
-  }
+const REQUEST_DEFAULTS = {
+  amplitude: 1,
+  period: 10,
+  offset: 0,
+  dataRateInHz: 1,
+  randomness: 0,
+  phase: 0,
+  loadDelay: 0,
+  infinityValues: false,
+  exceedFloat32: false
+};
 
-  GeneratorProvider.prototype.canProvideTelemetry = function (domainObject) {
-    return domainObject.type === 'generator';
-  };
+export default function GeneratorProvider(openmct, StalenessProvider) {
+  this.openmct = openmct;
+  this.workerInterface = new WorkerInterface(openmct, StalenessProvider);
+}
 
-  GeneratorProvider.prototype.supportsRequest = GeneratorProvider.prototype.supportsSubscribe =
-    GeneratorProvider.prototype.canProvideTelemetry;
+GeneratorProvider.prototype.canProvideTelemetry = function (domainObject) {
+  return domainObject.type === 'generator';
+};
 
-  GeneratorProvider.prototype.makeWorkerRequest = function (domainObject, request) {
-    var props = [
-      'amplitude',
-      'period',
-      'offset',
-      'dataRateInHz',
-      'randomness',
-      'phase',
-      'loadDelay',
-      'infinityValues',
-      'exceedFloat32'
-    ];
+GeneratorProvider.prototype.supportsRequest = GeneratorProvider.prototype.supportsSubscribe =
+  GeneratorProvider.prototype.canProvideTelemetry;
 
-    request = request || {};
+GeneratorProvider.prototype.makeWorkerRequest = function (domainObject, request) {
+  var props = [
+    'amplitude',
+    'period',
+    'offset',
+    'dataRateInHz',
+    'randomness',
+    'phase',
+    'loadDelay',
+    'infinityValues',
+    'exceedFloat32'
+  ];
 
-    var workerRequest = {};
+  request = request || {};
 
-    props.forEach(function (prop) {
-      if (
-        domainObject.telemetry &&
-        Object.prototype.hasOwnProperty.call(domainObject.telemetry, prop)
-      ) {
-        workerRequest[prop] = domainObject.telemetry[prop];
-      }
+  var workerRequest = {};
 
-      if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
-        workerRequest[prop] = request[prop];
-      }
+  props.forEach(function (prop) {
+    if (
+      domainObject.telemetry &&
+      Object.prototype.hasOwnProperty.call(domainObject.telemetry, prop)
+    ) {
+      workerRequest[prop] = domainObject.telemetry[prop];
+    }
 
-      if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
-        workerRequest[prop] = REQUEST_DEFAULTS[prop];
-      }
+    if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
+      workerRequest[prop] = request[prop];
+    }
 
-      workerRequest[prop] = Number(workerRequest[prop]);
-    });
+    if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
+      workerRequest[prop] = REQUEST_DEFAULTS[prop];
+    }
 
-    workerRequest.id = this.openmct.objects.makeKeyString(domainObject.identifier);
-    workerRequest.name = domainObject.name;
+    workerRequest[prop] = Number(workerRequest[prop]);
+  });
 
-    return workerRequest;
-  };
+  workerRequest.id = this.openmct.objects.makeKeyString(domainObject.identifier);
+  workerRequest.name = domainObject.name;
 
-  GeneratorProvider.prototype.request = function (domainObject, request) {
-    var workerRequest = this.makeWorkerRequest(domainObject, request);
-    workerRequest.start = request.start;
-    workerRequest.end = request.end;
+  return workerRequest;
+};
 
-    return this.workerInterface.request(workerRequest);
-  };
+GeneratorProvider.prototype.request = function (domainObject, request) {
+  var workerRequest = this.makeWorkerRequest(domainObject, request);
+  workerRequest.start = request.start;
+  workerRequest.end = request.end;
 
-  GeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-    var workerRequest = this.makeWorkerRequest(domainObject, {});
+  return this.workerInterface.request(workerRequest);
+};
 
-    return this.workerInterface.subscribe(workerRequest, callback);
-  };
+GeneratorProvider.prototype.subscribe = function (domainObject, callback) {
+  var workerRequest = this.makeWorkerRequest(domainObject, {});
 
-  return GeneratorProvider;
-});
+  return this.workerInterface.subscribe(workerRequest, callback);
+};

example/generator/SinewaveLimitProvider.js

@@ -20,147 +20,143 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([], function () {
-  var PURPLE = {
-      sin: 2.2,
-      cos: 2.2
+var PURPLE = {
+    sin: 2.2,
+    cos: 2.2
+  },
+  RED = {
+    sin: 0.9,
+    cos: 0.9
+  },
+  ORANGE = {
+    sin: 0.7,
+    cos: 0.7
+  },
+  YELLOW = {
+    sin: 0.5,
+    cos: 0.5
+  },
+  CYAN = {
+    sin: 0.45,
+    cos: 0.45
+  },
+  LIMITS = {
+    rh: {
+      cssClass: 'is-limit--upr is-limit--red',
+      low: RED,
+      high: Number.POSITIVE_INFINITY,
+      name: 'Red High'
     },
-    RED = {
-      sin: 0.9,
-      cos: 0.9
+    rl: {
+      cssClass: 'is-limit--lwr is-limit--red',
+      high: -RED,
+      low: Number.NEGATIVE_INFINITY,
+      name: 'Red Low'
     },
-    ORANGE = {
-      sin: 0.7,
-      cos: 0.7
+    yh: {
+      cssClass: 'is-limit--upr is-limit--yellow',
+      low: YELLOW,
+      high: RED,
+      name: 'Yellow High'
     },
-    YELLOW = {
-      sin: 0.5,
-      cos: 0.5
-    },
-    CYAN = {
-      sin: 0.45,
-      cos: 0.45
-    },
-    LIMITS = {
-      rh: {
-        cssClass: 'is-limit--upr is-limit--red',
-        low: RED,
-        high: Number.POSITIVE_INFINITY,
-        name: 'Red High'
-      },
-      rl: {
-        cssClass: 'is-limit--lwr is-limit--red',
-        high: -RED,
-        low: Number.NEGATIVE_INFINITY,
-        name: 'Red Low'
-      },
-      yh: {
-        cssClass: 'is-limit--upr is-limit--yellow',
-        low: YELLOW,
-        high: RED,
-        name: 'Yellow High'
-      },
-      yl: {
-        cssClass: 'is-limit--lwr is-limit--yellow',
-        low: -RED,
-        high: -YELLOW,
-        name: 'Yellow Low'
-      }
-    };
-
-  function SinewaveLimitProvider() {}
-
-  SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
-    return domainObject.type === 'generator';
+    yl: {
+      cssClass: 'is-limit--lwr is-limit--yellow',
+      low: -RED,
+      high: -YELLOW,
+      name: 'Yellow Low'
+    }
   };
 
-  SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
-    return {
-      evaluate: function (datum, valueMetadata) {
-        var range = valueMetadata && valueMetadata.key;
+export default function SinewaveLimitProvider() {}
 
-        if (datum[range] > RED[range]) {
-          return LIMITS.rh;
-        }
+SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
+  return domainObject.type === 'generator';
+};
 
-        if (datum[range] < -RED[range]) {
-          return LIMITS.rl;
-        }
+SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
+  return {
+    evaluate: function (datum, valueMetadata) {
+      var range = valueMetadata && valueMetadata.key;
 
-        if (datum[range] > YELLOW[range]) {
-          return LIMITS.yh;
-        }
-
-        if (datum[range] < -YELLOW[range]) {
-          return LIMITS.yl;
-        }
+      if (datum[range] > RED[range]) {
+        return LIMITS.rh;
       }
-    };
-  };
 
-  SinewaveLimitProvider.prototype.getLimits = function (domainObject) {
-    return {
-      limits: function () {
-        return Promise.resolve({
-          WATCH: {
-            low: {
-              color: 'cyan',
-              sin: -CYAN.sin,
-              cos: -CYAN.cos
-            },
-            high: {
-              color: 'cyan',
-              ...CYAN
-            }
+      if (datum[range] < -RED[range]) {
+        return LIMITS.rl;
+      }
+
+      if (datum[range] > YELLOW[range]) {
+        return LIMITS.yh;
+      }
+
+      if (datum[range] < -YELLOW[range]) {
+        return LIMITS.yl;
+      }
+    }
+  };
+};
+
+SinewaveLimitProvider.prototype.getLimits = function (domainObject) {
+  return {
+    limits: function () {
+      return Promise.resolve({
+        WATCH: {
+          low: {
+            color: 'cyan',
+            sin: -CYAN.sin,
+            cos: -CYAN.cos
           },
-          WARNING: {
-            low: {
-              color: 'yellow',
-              sin: -YELLOW.sin,
-              cos: -YELLOW.cos
-            },
-            high: {
-              color: 'yellow',
-              ...YELLOW
-            }
-          },
-          DISTRESS: {
-            low: {
-              color: 'orange',
-              sin: -ORANGE.sin,
-              cos: -ORANGE.cos
-            },
-            high: {
-              color: 'orange',
-              ...ORANGE
-            }
-          },
-          CRITICAL: {
-            low: {
-              color: 'red',
-              sin: -RED.sin,
-              cos: -RED.cos
-            },
-            high: {
-              color: 'red',
-              ...RED
-            }
-          },
-          SEVERE: {
-            low: {
-              color: 'purple',
-              sin: -PURPLE.sin,
-              cos: -PURPLE.cos
-            },
-            high: {
-              color: 'purple',
-              ...PURPLE
-            }
+          high: {
+            color: 'cyan',
+            ...CYAN
           }
-        });
-      }
-    };
+        },
+        WARNING: {
+          low: {
+            color: 'yellow',
+            sin: -YELLOW.sin,
+            cos: -YELLOW.cos
+          },
+          high: {
+            color: 'yellow',
+            ...YELLOW
+          }
+        },
+        DISTRESS: {
+          low: {
+            color: 'orange',
+            sin: -ORANGE.sin,
+            cos: -ORANGE.cos
+          },
+          high: {
+            color: 'orange',
+            ...ORANGE
+          }
+        },
+        CRITICAL: {
+          low: {
+            color: 'red',
+            sin: -RED.sin,
+            cos: -RED.cos
+          },
+          high: {
+            color: 'red',
+            ...RED
+          }
+        },
+        SEVERE: {
+          low: {
+            color: 'purple',
+            sin: -PURPLE.sin,
+            cos: -PURPLE.cos
+          },
+          high: {
+            color: 'purple',
+            ...PURPLE
+          }
+        }
+      });
+    }
   };
-
-  return SinewaveLimitProvider;
-});
+};

example/generator/StateGeneratorProvider.js

@@ -20,56 +20,52 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([], function () {
-  function StateGeneratorProvider() {}
+export default function StateGeneratorProvider() {}
 
-  function pointForTimestamp(timestamp, duration, name) {
-    return {
-      name: name,
-      utc: Math.floor(timestamp / duration) * duration,
-      value: Math.floor(timestamp / duration) % 2
-    };
+function pointForTimestamp(timestamp, duration, name) {
+  return {
+    name: name,
+    utc: Math.floor(timestamp / duration) * duration,
+    value: Math.floor(timestamp / duration) % 2
+  };
+}
+
+StateGeneratorProvider.prototype.supportsSubscribe = function (domainObject) {
+  return domainObject.type === 'example.state-generator';
+};
+
+StateGeneratorProvider.prototype.subscribe = function (domainObject, callback) {
+  var duration = domainObject.telemetry.duration * 1000;
+
+  var interval = setInterval(function () {
+    var now = Date.now();
+    var datum = pointForTimestamp(now, duration, domainObject.name);
+    datum.value = String(datum.value);
+    callback(datum);
+  }, duration);
+
+  return function () {
+    clearInterval(interval);
+  };
+};
+
+StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
+  return domainObject.type === 'example.state-generator';
+};
+
+StateGeneratorProvider.prototype.request = function (domainObject, options) {
+  var start = options.start;
+  var end = Math.min(Date.now(), options.end); // no future values
+  var duration = domainObject.telemetry.duration * 1000;
+  if (options.strategy === 'latest' || options.size === 1) {
+    start = end;
   }
 
-  StateGeneratorProvider.prototype.supportsSubscribe = function (domainObject) {
-    return domainObject.type === 'example.state-generator';
-  };
+  var data = [];
+  while (start <= end && data.length < 5000) {
+    data.push(pointForTimestamp(start, duration, domainObject.name));
+    start += duration;
+  }
 
-  StateGeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-    var duration = domainObject.telemetry.duration * 1000;
-
-    var interval = setInterval(function () {
-      var now = Date.now();
-      var datum = pointForTimestamp(now, duration, domainObject.name);
-      datum.value = String(datum.value);
-      callback(datum);
-    }, duration);
-
-    return function () {
-      clearInterval(interval);
-    };
-  };
-
-  StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
-    return domainObject.type === 'example.state-generator';
-  };
-
-  StateGeneratorProvider.prototype.request = function (domainObject, options) {
-    var start = options.start;
-    var end = Math.min(Date.now(), options.end); // no future values
-    var duration = domainObject.telemetry.duration * 1000;
-    if (options.strategy === 'latest' || options.size === 1) {
-      start = end;
-    }
-
-    var data = [];
-    while (start <= end && data.length < 5000) {
-      data.push(pointForTimestamp(start, duration, domainObject.name));
-      start += duration;
-    }
-
-    return Promise.resolve(data);
-  };
-
-  return StateGeneratorProvider;
-});
+  return Promise.resolve(data);
+};

example/generator/WorkerInterface.js

@@ -20,88 +20,86 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(['uuid'], function ({ v4: uuid }) {
-  function WorkerInterface(openmct, StalenessProvider) {
-    // 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 = {};
+import { v4 as uuid } from 'uuid';
 
-    this.watchStaleness();
+export default function WorkerInterface(openmct, StalenessProvider) {
+  // 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];
+  if (callback) {
+    callback(message);
+  }
+};
+
+WorkerInterface.prototype.dispatch = function (request, data, callback) {
+  var message = {
+    request: request,
+    data: data,
+    id: uuid()
+  };
+
+  if (callback) {
+    this.callbacks[message.id] = callback;
   }
 
-  WorkerInterface.prototype.watchStaleness = function () {
-    this.StalenessProvider.on('stalenessEvent', ({ id, isStale }) => {
-      this.staleTelemetryIds[id] = isStale;
-    });
-  };
+  this.worker.postMessage(message);
 
-  WorkerInterface.prototype.onMessage = function (message) {
-    message = message.data;
-    var callback = this.callbacks[message.id];
-    if (callback) {
-      callback(message);
-    }
-  };
+  return message.id;
+};
 
-  WorkerInterface.prototype.dispatch = function (request, data, callback) {
-    var message = {
-      request: request,
-      data: data,
-      id: uuid()
-    };
+WorkerInterface.prototype.request = function (request) {
+  var deferred = {};
+  var promise = new Promise(function (resolve, reject) {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
+  });
+  var messageId;
 
-    if (callback) {
-      this.callbacks[message.id] = callback;
+  let self = this;
+  function callback(message) {
+    if (message.error) {
+      deferred.reject(message.error);
+    } else {
+      deferred.resolve(message.data);
     }
 
-    this.worker.postMessage(message);
+    delete self.callbacks[messageId];
+  }
 
-    return message.id;
-  };
+  messageId = this.dispatch('request', request, callback.bind(this));
 
-  WorkerInterface.prototype.request = function (request) {
-    var deferred = {};
-    var promise = new Promise(function (resolve, reject) {
-      deferred.resolve = resolve;
-      deferred.reject = reject;
-    });
-    var messageId;
+  return promise;
+};
 
-    let self = this;
-    function callback(message) {
-      if (message.error) {
-        deferred.reject(message.error);
-      } else {
-        deferred.resolve(message.data);
-      }
-
-      delete self.callbacks[messageId];
+WorkerInterface.prototype.subscribe = function (request, cb) {
+  const { id, loadDelay } = request;
+  const messageId = this.dispatch('subscribe', request, (message) => {
+    if (!this.staleTelemetryIds[id]) {
+      setTimeout(() => cb(message.data), Math.max(loadDelay, 0));
     }
+  });
 
-    messageId = this.dispatch('request', request, callback.bind(this));
-
-    return promise;
-  };
-
-  WorkerInterface.prototype.subscribe = function (request, cb) {
-    const { id, loadDelay } = request;
-    const messageId = this.dispatch('subscribe', request, (message) => {
-      if (!this.staleTelemetryIds[id]) {
-        setTimeout(() => cb(message.data), Math.max(loadDelay, 0));
-      }
+  return function () {
+    this.dispatch('unsubscribe', {
+      id: messageId
     });
-
-    return function () {
-      this.dispatch('unsubscribe', {
-        id: messageId
-      });
-      delete this.callbacks[messageId];
-    }.bind(this);
-  };
-
-  return WorkerInterface;
-});
+    delete this.callbacks[messageId];
+  }.bind(this);
+};