Support binary websockets

.circleci/config.yml

@@ -1,31 +1,57 @@
 version: 2.1
-orbs:
-  node: circleci/node@5.2.0
-  browser-tools: circleci/browser-tools@1.3.0
 executors:
   pw-focal-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.42.1-focal
+      - image: mcr.microsoft.com/playwright:v1.39.0-focal
     environment:
       NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
       PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps
       PERCY_LOGLEVEL: 'debug' # Enable DEBUG level logging for Percy (Issue: https://github.com/nasa/openmct/issues/5742)
-      PERCY_PARALLEL_TOTAL: 2
   ubuntu:
     machine:
       image: ubuntu-2204:current
       docker_layer_caching: true
+parameters:
+  BUST_CACHE:
+    description: 'Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!'
+    default: false
+    type: boolean
 commands:
   build_and_install:
-    description: 'All steps used to build and install.'
+    description: 'All steps used to build and install. Will use cache if found'
     parameters:
       node-version:
         type: string
     steps:
       - checkout
+      - restore_cache_cmd:
+          node-version: << parameters.node-version >>
       - node/install:
           node-version: << parameters.node-version >>
-      - node/install-packages
+      - run: npm install --no-audit --progress=false
+  restore_cache_cmd:
+    description: 'Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache'
+    parameters:
+      node-version:
+        type: string
+    steps:
+      - when:
+          condition:
+            equal: [false, << pipeline.parameters.BUST_CACHE >>]
+          steps:
+            - restore_cache:
+                key: deps--{{ arch }}--{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
+  save_cache_cmd:
+    description: 'Custom command for saving cache.'
+    parameters:
+      node-version:
+        type: string
+    steps:
+      - save_cache:
+          key: deps--{{ arch }}--{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
+          paths:
+            - ~/.npm
+            - node_modules
   generate_and_store_version_and_filesystem_artifacts:
     description: 'Track important packages and files'
     steps:
@@ -45,6 +71,9 @@ commands:
     steps:
       - run: npm run cov:e2e:report || true
       - run: npm run cov:e2e:<<parameters.suite>>:publish
+orbs:
+  node: circleci/node@5.1.0
+  browser-tools: circleci/browser-tools@1.3.0
 jobs:
   npm-audit:
     parameters:
@@ -76,12 +105,10 @@ jobs:
           node-version: <<parameters.node-version>>
       - browser-tools/install-chrome:
           replace-existing: false
-      - run:
-          command: |
-            mkdir -p dist/reports/tests/
-            TESTFILES=$(circleci tests glob "src/**/*Spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test" --verbose
+      - run: npm run test
       - run: npm run cov:unit:publish
+      - save_cache_cmd:
+          node-version: <<parameters.node-version>>
       - store_test_results:
           path: dist/reports/tests/
       - store_artifacts:
@@ -96,7 +123,7 @@ jobs:
       suite: #stable or full
         type: string
     executor: pw-focal-development
-    parallelism: 7
+    parallelism: 6
     steps:
       - build_and_install:
           node-version: lts/hydrogen
@@ -105,11 +132,7 @@ jobs:
             equal: ['full', <<parameters.suite>>]
           steps:
             - run: npx playwright install chrome-beta
-      - run:
-          command: |
-            mkdir test-results
-            TESTFILES=$(circleci tests glob "e2e/**/*.spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test:e2e:<<parameters.suite>>" --verbose --split-by=timings
+      - run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; npm run test:e2e:<<parameters.suite>> -- --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
       - 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
@@ -129,37 +152,12 @@ 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
-  e2e-mobile:
-    executor: pw-focal-development
-    steps:
-      - build_and_install:
-          node-version: lts/hydrogen
-      - run: npm run test:e2e:mobile
-      - 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_e2e_code_cov_report:
-                suite: full
-      - store_test_results:
-          path: test-results/results.xml
-      - store_artifacts:
-          path: test-results
-      - store_artifacts:
-          path: coverage
-      - store_artifacts:
-          path: html-test-results
-      - when:
-          condition:
-            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
   e2e-couchdb:
     executor: ubuntu
     steps:
       - build_and_install:
           node-version: lts/hydrogen
-      - run: npx playwright@1.42.1 install #Necessary for bare ubuntu machine
+      - run: npx playwright@1.39.0 install #Necessary for bare ubuntu machine
       - run: |
           export $(cat src/plugins/persistence/couch/.env.ci | xargs)
           docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
@@ -221,15 +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-a11y:
+  visual-a11y-tests:
     parameters:
       suite:
         type: string # ci or full
     executor: pw-focal-development
-    parallelism: 2
     steps:
       - build_and_install:
-          node-version: lts/iron
+          node-version: lts/hydrogen
       - run: npm run test:e2e:visual:<<parameters.suite>>
       - store_test_results:
           path: test-results/results.xml
@@ -242,7 +239,6 @@ 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
-
 workflows:
   overall-circleci-commit-status: #These jobs run on every commit
     jobs:
@@ -255,9 +251,10 @@ workflows:
       - e2e-test:
           name: e2e-stable
           suite: stable
-      - e2e-mobile
-      - visual-a11y:
-          name: visual-a11y-ci
+      - mem-test
+      - perf-test
+      - visual-a11y-tests:
+          name: visual-test-ci
           suite: ci
 
   the-nightly: #These jobs do not run on PRs, but against master at night
@@ -273,11 +270,10 @@ workflows:
       - e2e-test:
           name: e2e-full-nightly
           suite: full
-      - e2e-mobile
-      - perf-test
       - mem-test
-      - visual-a11y:
-          name: visual-a11y-nightly
+      - perf-test
+      - visual-a11y-tests:
+          name: visual-test-nightly
           suite: full
       - e2e-couchdb
     triggers:

.cspell.json

@@ -492,15 +492,9 @@
     "gcov",
     "WCAG",
     "stackedplot",
-    "Andale",
-    "unnormalized",
-    "checksnapshots",
-    "specced",
-    "composables",
-    "countup",
-    "darkmatter"
+    "Andale"
   ],
-  "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US", "en-gb", "misc"],
+  "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US"],
   "ignorePaths": [
     "package.json",
     "dist/**",

.eslintrc.cjs

@@ -1,13 +1,10 @@
 const LEGACY_FILES = ['example/**'];
-/** @type {import('eslint').Linter.Config} */
-const config = {
+module.exports = {
   env: {
     browser: true,
-    es2024: true,
+    es6: true,
     jasmine: true,
-    node: true,
-    worker: true,
-    serviceworker: true
+    amd: true
   },
   globals: {
     _: 'readonly'
@@ -26,11 +23,10 @@ const config = {
     parser: '@babel/eslint-parser',
     requireConfigFile: false,
     allowImportExportEverywhere: true,
-    ecmaVersion: 'latest',
+    ecmaVersion: 2015,
     ecmaFeatures: {
       impliedStrict: true
-    },
-    sourceType: 'module'
+    }
   },
   rules: {
     'simple-import-sort/imports': 'warn',
@@ -156,7 +152,7 @@ const config = {
         cases: {
           pascalCase: true
         },
-        ignore: ['^.*\\.(js|cjs|mjs)$']
+        ignore: ['^.*\\.js$']
       }
     ],
     'vue/first-attribute-linebreak': 'error',
@@ -183,5 +179,3 @@ const config = {
     }
   ]
 };
-
-module.exports = config;

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,7 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 
 * [ ] Have you followed the guidelines in our [Contributing document](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md)?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/openmct/pulls) for the same update/change?
-* [ ] Is this a [notable change](../docs/src/process/release.md) that will require a special callout in the release notes? For example, will this break compatibility with existing APIs or projects that consume these plugins?
+* [ ] Is this change backwards compatible? For example, developers won't need to change how they are calling the API or how they've extended core plugins such as Tables or Plots.
 
 ### Author Checklist
 
@@ -17,6 +17,7 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 * [ ] 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

.github/release.yml

@@ -1,8 +1,5 @@
 changelog:
   categories:
-    - title: 💥 Notable Changes
-      labels:
-        - notable_change
     - title: 🏕 Features
       labels:
         - type:feature
@@ -23,4 +20,4 @@ changelog:
         - dependencies
     - title: 🐛 Bug Fixes
       labels:
-        - "*"
+        - '*'

.github/workflows/e2e-couchdb.yml

@@ -28,7 +28,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - run: npm ci --no-audit --progress=false
+      - run: npm install --cache ~/.npm --no-audit --progress=false
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -37,7 +37,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - run: npx playwright@1.42.1 install
+      - run: npx playwright@1.39.0 install
 
       - name: Start CouchDB Docker Container and Init with Setup Scripts
         run: |

.github/workflows/e2e-flakefinder.yml

@@ -1,61 +0,0 @@
-name: 'pr:e2e:flakefinder'
-
-on:
-#  push:
-#    branches: master
-  workflow_dispatch:
-#  pull_request:
-#    types:
-#      - labeled
-#      - opened
-#  schedule:
-#    - cron: '0 0 * * *'
-
-jobs:
-  e2e-flakefinder:
-    if: contains(github.event.pull_request.labels.*.name, 'pr:e2e:flakefinder') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event.action == 'opened'
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/hydrogen'
-
-      - name: Cache NPM dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - run: npx playwright@1.42.1 install
-      - run: npm ci --no-audit --progress=false
-
-      - name: Run E2E Tests (Repeated 10 Times)
-        run: npm run test:e2e:stable -- --retries=0 --repeat-each=10 --max-failures=50
-
-      - name: Archive test results
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          path: test-results
-
-      - name: Remove pr:e2e:flakefinder label (if present)
-        if: always()
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { owner, repo, number } = context.issue;
-            const labelToRemove = 'pr:e2e:flakefinder';
-            try {
-                await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: number,
-                name: labelToRemove
-                });
-            } catch (error) {
-                core.warning(`Failed to remove ' + labelToRemove + ' label: ${error.message}`);
-            }

.github/workflows/e2e-perf.yml

@@ -1,58 +0,0 @@
-name: 'e2e-perf'
-on:
-  push:
-    branches: master
-  workflow_dispatch:
-  pull_request:
-    types:
-      - labeled
-      - opened
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  e2e-full:
-    if: contains(github.event.pull_request.labels.*.name, 'pr:e2e:perf') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/hydrogen'
-
-      - name: Cache NPM dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - run: npx playwright@1.42.1 install
-      - run: npm ci --no-audit --progress=false
-      - run: npm run test:perf:localhost
-      - run: npm run test:perf:contract
-      - run: npm run test:perf:memory
-      - name: Archive test results
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          path: test-results
-
-      - name: Remove pr:e2e:perf label (if present)
-        if: always()
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { owner, repo, number } = context.issue;
-            const labelToRemove = 'pr:e2e:perf';
-            try {
-              await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: number,
-                name: labelToRemove
-              });
-            } catch (error) {
-              core.warning(`Failed to remove ' + labelToRemove + ' label: ${error.message}`);
-            }

.github/workflows/e2e-pr.yml

@@ -33,9 +33,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - run: npx playwright@1.42.1 install
+      - run: npx playwright@1.39.0 install
       - run: npx playwright install chrome-beta
-      - run: npm ci --no-audit --progress=false
+      - run: npm install --cache ~/.npm --no-audit --progress=false
       - run: npm run test:e2e:full -- --max-failures=40
       - run: npm run cov:e2e:report || true
       - shell: bash

.github/workflows/npm-prerelease.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/hydrogen
-      - run: npm ci
+      - run: npm install
       - run: |
           echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
           npm whoami
@@ -31,7 +31,7 @@ jobs:
         with:
           node-version: lts/hydrogen
           registry-url: https://registry.npmjs.org/
-      - run: npm ci
+      - run: npm install
       - run: npm publish --access=public --tag unstable
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/pr-platform.yml

@@ -45,7 +45,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.node_version }}-
 
-      - run: npm ci --no-audit --progress=false
+      - run: npm install --cache ~/.npm --no-audit --progress=false
 
       - run: npm test
 

.github/workflows/prcop.yml

@@ -5,8 +5,6 @@ on:
     types:
       - labeled
       - unlabeled
-      - milestoned
-      - demilestoned
       - opened
       - reopened
       - synchronize

.gitignore

@@ -48,5 +48,5 @@ index.html.bak
 coverage
 codecov
 
-# Don't commit MacOS screenshots
-*-darwin.png
+# :(
+package-lock.json

.npmignore

@@ -22,3 +22,9 @@
 !index.html
 !openmct.js
 !SECURITY.md
+
+# Add e2e tests to npm package
+!/e2e/**/*
+
+# ... except our test-data folder files.
+/e2e/test-data/*.json

.npmrc

@@ -2,3 +2,6 @@ loglevel=warn
 
 #Prevent folks from ignoring an important error when building from source
 engine-strict=true
+
+# Dont include lockfile
+package-lock=false

.vscode/extensions.json

@@ -1,13 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-  // List of extensions which should be recommended for users of this workspace.
-  "recommendations": [
-    "Vue.volar",
-    "dbaeumer.vscode-eslint",
-    "rvest.vs-code-prettier-eslint"
-  ],
-  // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-  "unwantedRecommendations": ["octref.vetur"]
-}

.webpack/webpack.common.js

@@ -1,8 +1,8 @@
 /*
 This is the OpenMCT common webpack file. It is imported by the other three webpack configurations:
- - webpack.prod.mjs - the production configuration for OpenMCT (default)
- - webpack.dev.mjs - the development configuration for OpenMCT
- - webpack.coverage.mjs - imports webpack.dev.js and adds code coverage
+ - webpack.prod.js - the production configuration for OpenMCT (default)
+ - webpack.dev.js - the development configuration for OpenMCT
+ - webpack.coverage.js - imports webpack.dev.js and adds code coverage
 There are separate npm scripts to use these configurations, though simply running `npm install`
 will use the default production configuration.
 */
@@ -15,11 +15,10 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { VueLoaderPlugin } from 'vue-loader';
 import webpack from 'webpack';
-import { merge } from 'webpack-merge';
 let gitRevision = 'error-retrieving-revision';
 let gitBranch = 'error-retrieving-branch';
 
-const { version } = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
+const packageDefinition = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
 
 try {
   gitRevision = execSync('git rev-parse HEAD').toString().trim();
@@ -49,18 +48,15 @@ const config = {
     couchDBChangesFeed: './src/plugins/persistence/couch/CouchChangesFeed.js',
     inMemorySearchWorker: './src/api/objects/InMemorySearchWorker.js',
     espressoTheme: './src/plugins/themes/espresso-theme.scss',
-    snowTheme: './src/plugins/themes/snow-theme.scss',
-    darkmatterTheme: './src/plugins/themes/darkmatter-theme.scss'
+    snowTheme: './src/plugins/themes/snow-theme.scss'
   },
   output: {
     globalObject: 'this',
     filename: '[name].js',
     path: path.resolve(projectRootDir, 'dist'),
-    library: {
-      name: 'openmct',
-      type: 'umd',
-      export: 'default'
-    },
+    library: 'openmct',
+    libraryExport: 'default',
+    libraryTarget: 'umd',
     publicPath: '',
     hashFunction: 'xxhash64',
     clean: true
@@ -85,12 +81,12 @@ const config = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      __OPENMCT_VERSION__: `'${version}'`,
+      __OPENMCT_VERSION__: `'${packageDefinition.version}'`,
       __OPENMCT_BUILD_DATE__: `'${new Date()}'`,
       __OPENMCT_REVISION__: `'${gitRevision}'`,
       __OPENMCT_BUILD_BRANCH__: `'${gitBranch}'`,
       __VUE_OPTIONS_API__: true, // enable/disable Options API support, default: true
-      __VUE_PROD_DEVTOOLS__: true // enable/disable devtools support in production, default: false
+      __VUE_PROD_DEVTOOLS__: false // enable/disable devtools support in production, default: false
     }),
     new VueLoaderPlugin(),
     new CopyWebpackPlugin({

.webpack/webpack.coverage.js

@@ -1,12 +1,15 @@
 /*
-This file extends the webpack.dev.mjs config to add babel istanbul coverage.
+This file extends the webpack.dev.js config to add babel istanbul coverage.
 OpenMCT Continuous Integration servers use this configuration to add code coverage
 information to pull requests.
 */
 
-import config from './webpack.dev.mjs';
+import config from './webpack.dev.js';
+// eslint-disable-next-line no-undef
+const CI = process.env.CI === 'true';
+
+config.devtool = CI ? false : undefined;
 
-config.devtool = 'source-map';
 config.devServer.hot = false;
 
 config.module.rules.push({
@@ -16,6 +19,7 @@ config.module.rules.push({
     loader: 'babel-loader',
     options: {
       retainLines: true,
+      // eslint-disable-next-line no-undef
       plugins: [
         [
           'babel-plugin-istanbul',

.webpack/webpack.dev.js

@@ -1,15 +1,14 @@
 /*
 This configuration should be used for development purposes. It contains full source map, a
 devServer (which be invoked using by `npm start`), and a non-minified Vue.js distribution.
-If OpenMCT is to be used for a production server, use webpack.prod.mjs instead.
+If OpenMCT is to be used for a production server, use webpack.prod.js instead.
 */
-import { fileURLToPath } from 'node:url';
-
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
+import { fileURLToPath } from 'node:url';
 
-import common from './webpack.common.mjs';
+import common from './webpack.common.js';
 
 export default merge(common, {
   mode: 'development',

.webpack/webpack.prod.js

@@ -6,7 +6,7 @@ It is the default webpack configuration.
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 
-import common from './webpack.common.mjs';
+import common from './webpack.common.js';
 
 export default merge(common, {
   mode: 'production',

API.md

@@ -1305,16 +1305,6 @@ View provider Example:
 }
 ```
 
-## User API
-
-Open MCT provides a User API which can be used to define providers for user information. The API
-can be used to manage user information and roles.
-
-### Example
-
-Open MCT provides an example [user](example/exampleUser/exampleUserCreator.js) and [user provider](example/exampleUser/ExampleUserProvider.js) which 
-can be used as a starting point for creating a custom user provider.
-
 ## 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).

SECURITY.md

@@ -16,6 +16,8 @@ The [CodeQL GitHub Actions workflow](https://github.com/nasa/openmct/blob/master
 
 CodeQL is run for every pull-request in GitHub Actions.
 
+The project is also monitored by [LGTM](https://lgtm.com/projects/g/nasa/openmct/) and is available to public.
+
 ### ESLint
 
 Static analysis is run for every push on the master branch and every pull request on all branches in Github Actions. 

TESTING.md

@@ -63,7 +63,7 @@ Once the file is generated, it can be published to codecov with
 ### e2e
 The e2e line coverage is a bit more complex than the karma implementation. This is the general sequence of events:
 
-1. Each e2e suite will start webpack with the ```npm run start:coverage``` command with config `webpack.coverage.mjs` and the `babel-plugin-istanbul` plugin to generate code coverage during e2e test execution using our custom [baseFixture](./baseFixtures.js). 
+1. Each e2e suite will start webpack with the ```npm run start:coverage``` command with config `webpack.coverage.js` and the `babel-plugin-istanbul` plugin to generate code coverage during e2e test execution using our custom [baseFixture](./baseFixtures.js). 
 1. During testcase execution, each e2e shard will generate its piece of the larger coverage suite. **This coverage file is not merged**. The raw coverage file is stored in a `.nyc_report` directory.
 1. [nyc](https://github.com/istanbuljs/nyc) converts this directory into a `lcov` file with the following command `npm run cov:e2e:report`
 1. Most of the tests are run in the '@stable' configuration and focus on chrome/ubuntu at a single resolution. This coverage is published to codecov with `npm run cov:e2e:stable:publish`.
@@ -91,14 +91,12 @@ There are a few reasons that your GitHub PR could be failing beyond simple faile
 ### Local=Pass and CI=Fail
 Although rare, it is possible that your test can pass locally but fail in CI.
 
-### Reset your workspace
-It's possible that you're running with dependencies or a local environment which is out of sync with the branch you're working on. Make sure to execute the following:
-
-```sh
-nvm use
-npm run clean
-npm install
-```
+#### Busting Cache
+In certain circumstances, the CircleCI cache can become stale. In order to bust the cache, we've implemented a runtime boolean parameter in Circle CI creatively name BUST_CACHE. To execute:
+1. Navigate to the branch in Circle CI believed to have stale cache.
+1. Click on the 'Trigger Pipeline' button.
+1. Add Parameter -> Parameter Type = boolean , Name = BUST_CACHE ,Value = true
+1. Click 'Trigger Pipeline'
 
 #### Run tests in the same container as CI
 

docs/src/process/release.md

@@ -1,30 +0,0 @@
-
-# Release of NASA Open MCT NPM Package
-
-This document outlines the process and key considerations for releasing a new version of the NASA Open MCT project as an NPM (Node Package Manager) package.
-
-## 1. Pre-requisites
-
-Before releasing a new version of the NASA Open MCT NPM package, ensure all dependencies are updated, and comprehensive tests are performed. This ensures compatibility and performance of the Open MCT within the Node.js ecosystem.
-
-## 2. Versioning
-
-Versioning is a critical step for package release. The Open MCT team follows [Semantic Versioning (SemVer)](https://semver.org) that consists of three major components: MAJOR.MINOR.PATCH. These ensure a structured process for updating, bug fixes, backward compatibility, and software progress.
-
-## 3. Changelog Maintenance
-
-A comprehensive changelog file, `CHANGELOG.md`, documents any changes, adding a high level of transparencies for anyone desiring to look into the status of new and past progress. It includes the summation of any major new enhancements, changes, bug fixes, and the credits to the users responsible for each unique progress.
-
-## 4. Notable Changes Labels on GitHub PRs
-
-For the Open MCT package, we leverage GitHub's Pull Request (PR) mechanisms extensively, with three important PR labels dedicated to signifying 'notable_changes':
-
-- **Breaking Change** Highlights the integration of changes that are suspected to break, or without a doubt will break, backward compatibility. These should signal to users the upgrade might be seamless only if dependency and integration factors are properly managed, if not, one should expect to manage atypical technical snags.
-- **API change** Signifies when a contribution makes any complete or under layer changes to the communication or its supporting access processes. This label flags required see-through insight on how the web-based control panel sees and manipulates any value and or network logs.
-- **Default Behavior Change:** In the incident an update either adjusts a form to or integrates a not previously kept setting or plugin. i.e. autoscale is enabled by default when working with plots.
-
-## 6. Community & Contributions
-
-A flat community and the rounded center are kept in continuous celebration, with the given station open for two open-specifying dialogues, research, and all-for development probing. State the ownership for a handed looped, a welcome for even structure-core and architectural draft and impend.
-
-Thank you for your collaboration and commitment to moving the project onto a text big club. 

e2e/.npmignore

@@ -1,7 +0,0 @@
-*
-!appActions.js
-!baseFixtures.js
-!pluginFixtures.js
-!avpFixtures.js
-!index.js
-!*.md

e2e/README.md

@@ -76,31 +76,29 @@ To read about how to write a good visual test, please see [How to write a great
 
 `npm run test:e2e:visual` commands will run all of the visual tests against a local instance of Open MCT. If no `PERCY_TOKEN` API key is found in the terminal or command line environment variables, no visual comparisons will be made.
 
-- `npm run test:e2e:visual:ci` will run against every commit and PR.
-- `npm run test:e2e:visual:full` will run every night with additional comparisons made for Larger Displays and with the `snow` theme.
-
+ - `npm run test:e2e:visual:ci` will run against every commit and PR.
+ - `npm run test:e2e:visual:full` will run every night with additional comparisons made for Larger Displays and with the `snow` theme.
 #### Percy.io
 
 To make this possible, we're leveraging a 3rd party service, [Percy](https://percy.io/). This service maintains a copy of all changes, users, scm-metadata, and baselines to verify that the application looks and feels the same _unless approved by a Open MCT developer_. To request a Percy API token, please reach out to the Open MCT Dev team on GitHub. For more information, please see the official [Percy documentation](https://docs.percy.io/docs/visual-testing-basics).
 
-At present, we are using percy with two configuration files: `./e2e/.percy.nightly.yml` and `./e2e/.percy.ci.yml`. This is mainly to reduce the number of snapshots.
+At present, we are using percy with two configuration files: `./e2e/.percy.nightly.yml` and `./e2e/.percy.ci.yml`. This is mainly to reduce the number of snapshots. 
 
 ### Advanced: Snapshot Testing (Not Recommended)
 
 While snapshot testing offers a precise way to detect changes in your application without relying on third-party services like Percy.io, we've found that it doesn't offer any advantages over visual testing in our use-cases. Therefore, snapshot testing is **not recommended** for further implementation.
 
 #### CI vs Manual Checks
-
 Snapshot tests can be reliably executed in Continuous Integration (CI) environments but lack the manual oversight provided by visual testing platforms like Percy.io. This means they may miss issues that a human reviewer could catch during manual checks.
 
 #### Example
-
 A single visual test assertion in Percy.io can be executed across 10 different browser and resolution combinations without additional setup, providing comprehensive testing with minimal configuration. In contrast, a snapshot test is restricted to a single OS and browser resolution, requiring more effort to achieve the same level of coverage.
 
-#### Further Reading
 
+#### Further Reading
 For those interested in the mechanics of snapshot testing with Playwright, you can refer to the [Playwright Snapshots Documentation](https://playwright.dev/docs/test-snapshots). However, keep in mind that we do not recommend using this approach.
 
+
 #### Open MCT's implementation
 
 - Our Snapshot tests receive a `@snapshot` tag.
@@ -111,7 +109,7 @@ For those interested in the mechanics of snapshot testing with Playwright, you c
 // from our package.json or circleCI configuration file
 docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
 npm install
-npm run test:e2e:checksnapshots
+npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
 ```
 
 ### Updating Snapshots
@@ -120,6 +118,14 @@ When the `@snapshot` tests fail, they will need to be evaluated to determine if
 
 To compare a snapshot, run a test and open the html report with the 'Expected' vs 'Actual' screenshot. If the actual screenshot is preferred, then the source-controlled 'Expected' snapshots will need to be updated with the following scripts.
 
+MacOS
+
+```
+npm run test:e2e:updatesnapshots
+```
+
+Linux/CI
+
 ```sh
 // Replace {X.X.X} with the current Playwright version 
 // from our package.json or circleCI configuration file
@@ -128,12 +134,6 @@ npm install
 npm run test:e2e:updatesnapshots
 ```
 
-Once that's done, you'll need to run the following to verify that the changes do not cause more problems:
-
-```sh
-npm run test:e2e:checksnapshots
-```
-
 ## Automated Accessibility (a11y) Testing
 
 Open MCT incorporates accessibility testing through two primary methods to ensure its compliance with accessibility standards:
@@ -167,9 +167,9 @@ When an a11y test fails, the result must be interpreted in the html test report
 
 The open source performance tests function in three ways which match their naming and folder structure:
 
-`tests/performance` - The tests at the root of this folder path detect functional changes which are mostly apparent with large performance regressions like [this](https://github.com/nasa/openmct/issues/6879). These tests run against openmct webpack in `production-mode` with the `npm run test:perf:localhost` script.
-`tests/performance/contract/` -  These tests serve as [contracts](https://martinfowler.com/bliki/ContractTest.html) for the locator logic, functionality, and assumptions will work in our downstream, closed source test suites. These tests run against openmct webpack in `dev-mode` with the `npm run test:perf:contract` script.
-`tests/performance/memory/` -  These tests execute memory leak detection checks in various ways. This is expected to evolve as we move to the `memlab` project. These tests run against openmct webpack in `production-mode` with the `npm run test:perf:memory` script.
+`./e2e/tests/performance` - The tests at the root of this folder path detect functional changes which are mostly apparent with large performance regressions like [this](https://github.com/nasa/openmct/issues/6879). These tests run against openmct webpack in `production-mode` with the `npm run test:perf:localhost` script.
+`./e2e/tests/performance/contract/` -  These tests serve as [contracts](https://martinfowler.com/bliki/ContractTest.html) for the locator logic, functionality, and assumptions will work in our downstream, closed source test suites. These tests run against openmct webpack in `dev-mode` with the `npm run test:perf:contract` script.
+`./e2e/tests/performance/memory/` -  These tests execute memory leak detection checks in various ways. This is expected to evolve as we move to the `memlab` project. These tests run against openmct webpack in `production-mode` with the `npm run test:perf:memory` script.
 
 These tests are expected to become blocking and gating with assertions as we extend the capabilities of Playwright.
 
@@ -223,7 +223,7 @@ Current list of test tags:
 
 |Test Tag|Description|
 |:-:|-|
-|`@mobile` | 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).|
+|`@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`.|
@@ -232,7 +232,6 @@ Current list of test tags:
 |`@unstable` | A new test or test which is known to be flaky.|
 |`@2p` | Indicates that multiple users are involved, or multiple tabs/pages are used. Useful for testing multi-user interactivity.|
 |`@generatedata` | Indicates that a test is used to generate testdata or test the generated test data. Usually to be associated with localstorage, but this may grow over time.|
-|`@clock` | A test which modifies the clock. These have expanded out of the visual tests and into the functional tests.
 
 ### Continuous Integration
 
@@ -324,17 +323,9 @@ In terms of operating system testing, we're only limited by what the CI provider
 
 #### **Mobile**
 
-We have a Mission-need to support iPad and mobile devices. To run our test suites with mobile devices, please see our `playwright-mobile.config.js` projects.
+We have the Mission-need to support iPad. To run our iPad suite, please see our `playwright-*.config.js` with the 'iPad' project.
 
-In general, our test suite is not designed to run against mobile devices as the mobile experience is a focused version of the application. Core functionality is missing (chiefly the 'Create' button). To bypass the object creation, we leverage the `storageState` properties for starting the mobile tests with localstorage.
-
-For now, the mobile tests will exist in the /tests/mobile/ suites and be executed with the
-
-```sh
-npm run test:e2e:mobile
-```
-
-command.
+In general, our test suite is not designed to run against mobile devices as the mobile experience is a focused version of the application. Core functionality is missing (chiefly the 'Create' button) and so this will likely turn into a separate suite.
 
 #### **Skipping or executing tests based on browser, os, and/os browser version:**
 
@@ -373,7 +364,6 @@ In general, strive to test only through the UI as a user would. As stated in the
 By adhering to this principle, we can create tests that are both robust and reflective of actual user experiences.
 
 #### How to make tests robust to function in other contexts (VISTA, COUCHDB, YAMCS, VIPER, etc.)
-
   1. Leverage the use of `appActions.js` methods such as `createDomainObjectWithDefaults()`. This ensures that your tests will create unique instances of objects for your test to interact with.
   1. Do not assert on the order or structure of objects available unless you created them yourself. These tests may be used against a persistent datastore like couchdb with many objects in the tree.
   1. Do not search for your created objects. Open MCT does not performance uniqueness checks so it's possible that your tests will break when run twice.
@@ -381,7 +371,6 @@ By adhering to this principle, we can create tests that are both robust and refl
   1. Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });` instead of `{ waitUntil: 'networkidle' }`. Tests run against deployments with websockets often have issues with the networkidle detection.
   
 #### How to make tests faster and more resilient
-
   1. Avoid app interaction when possible. The best way of doing this is to navigate directly by URL:
 
   ```js
@@ -394,11 +383,10 @@ By adhering to this principle, we can create tests that are both robust and refl
 
   1. Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });`
     - Initial navigation should _almost_ always use the `{ waitUntil: 'domcontentloaded' }` option.
-  1. Avoid repeated setup to test a single assertion. Write longer tests with multiple soft assertions.
+  1.  Avoid repeated setup to test a single assertion. Write longer tests with multiple soft assertions.
   This ensures that your changes will be picked up with large refactors.
 
 ##### Utilizing LocalStorage
-
   1. In order to save test runtime in the case of tests that require a decent amount of initial setup (such as in the case of testing complex displays), you may use [Playwright's `storageState` feature](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state) to generate and load localStorage states.
   1. To generate a localStorage state to be used in a test:
     - Add an e2e test to our generateLocalStorageData suite which sets the initial state (creating/configuring objects, etc.), saving it in the `test-data` folder:
@@ -419,6 +407,7 @@ By adhering to this principle, we can create tests that are both robust and refl
       }); 
     ```
 
+
 ### How to write a great test
 
 - Avoid using css locators to find elements to the page. Use modern web accessible locators like `getByRole`
@@ -434,7 +423,7 @@ By adhering to this principle, we can create tests that are both robust and refl
   await notesInput.fill(testNotes);
   ```
 
-#### How to Write a Great Visual Test
+ #### How to Write a Great Visual Test
 
 1. **Look for the Unknown Unknowns**: Avoid asserting on specific differences in the visual diff. Visual tests are most effective for identifying unknown unknowns.
 
@@ -443,27 +432,22 @@ By adhering to this principle, we can create tests that are both robust and refl
 3. **Expect the Unexpected**: Use functional expect statements only to verify assumptions about the state between steps. A great visual test doesn't fail during the test itself, but rather when changes are reviewed in Percy.io.
 
 4. **Control Variability**: Account for variations inherent in working with time-based telemetry and clocks.
-
-- Utilize `percyCSS` to ignore time-based elements. For more details, consult our [percyCSS file](./.percy.ci.yml).
-- Use Open MCT's fixed-time mode unless explicitly testing realtime clock
-- Employ the `createExampleTelemetryObject` appAction to source telemetry and specify a `name` to avoid autogenerated names.
-- Avoid creating objects with a time component like timers and clocks.
+  - Utilize `percyCSS` to ignore time-based elements. For more details, consult our [percyCSS file](./.percy.ci.yml).
+  - Use Open MCT's fixed-time mode unless explicitly testing realtime clock
+  - Employ the `createExampleTelemetryObject` appAction to source telemetry and specify a `name` to avoid autogenerated names.
 
 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-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
     });
     ```
-
     - Note: The `scope` variable can be any valid CSS selector.
 
 7. **Write many `percySnapshot` commands in a single test**: In line with our approach to longer functional tests, we recommend that many test percySnapshots are taken in a single test. For instance:
-
     ```js
     //<Some interesting state>
     await percySnapshot(page, `Before object expanded (theme: ${theme})`);
@@ -513,35 +497,11 @@ test.describe('foo test suite', () => {
   });
 });
   ```
-
   More info and options for `overrideClock` can be found in [baseFixtures.js](baseFixtures.js)
 
 - Working with multiple pages
 There are instances where multiple browser pages will needed to verify multi-page or multi-tab application behavior. Make sure to use the `@2p` annotation as well as name each page appropriately: i.e. `page1` and `page2` or `tab1` and `tab2` depending on the intended use case. Generally pages should be used unless testing `sharedWorker` code, specifically.
 
-- Working with file downloads and JSON data
-Open MCT has the capability of exporting certain objects in the form of a JSON file handled by the chrome browser. The best example of this type of test can be found in the exportAsJson test.
-
-```js
-const [download] = await Promise.all([
-  page.waitForEvent('download'), // Waits for the download event
-  page.getByLabel('Export as JSON').click() // Triggers the download
-]);
-
-// Wait for the download process to complete
-const path = await download.path();
-
-// Read the contents of the downloaded file using readFile from fs/promises
-const fileContents = await fs.readFile(path, 'utf8');
-const jsonData = JSON.parse(fileContents);
-
-// Use the function to retrieve the key
-const key = getFirstKeyFromOpenMctJson(jsonData);
-
-// Verify the contents of the JSON file
-expect(jsonData.openmct[key]).toHaveProperty('name', 'e2e folder');
-```
-
 ### Reporting
 
 Test Reporting is done through official Playwright reporters and the CI Systems which execute them.
@@ -617,7 +577,6 @@ A single e2e test in Open MCT is extended to run:
 ### 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.

e2e/appActions.js

@@ -392,8 +392,6 @@ async function setTimeConductorMode(page, isFixedTimespan = true) {
     await page.getByRole('menuitem', { name: /Real-Time/ }).click();
     await page.waitForURL(/tc\.mode=local/);
   }
-  //dismiss the time conductor popup
-  await page.getByLabel('Discard changes and close time popup').click();
 }
 
 /**
@@ -507,14 +505,15 @@ async function setTimeConductorBounds(page, startDate, endDate) {
  * @param {string} startDate
  * @param {string} endDate
  */
-async function setIndependentTimeConductorBounds(page, { start, end }) {
-  // Activate Independent Time Conductor
-  await page.getByLabel('Enable Independent Time Conductor').click();
+async function setIndependentTimeConductorBounds(page, startDate, endDate) {
+  // Activate Independent Time Conductor in Fixed Time Mode
+  await page.getByRole('switch').click();
 
   // Bring up the time conductor popup
-  await page.getByLabel('Independent Time Conductor Settings').click();
+  await page.click('.c-conductor-holder--compact .c-compact-tc');
   await expect(page.locator('.itc-popout')).toBeInViewport();
-  await setTimeBounds(page, start, end);
+
+  await setTimeBounds(page, startDate, endDate);
 
   await page.keyboard.press('Enter');
 }
@@ -664,6 +663,5 @@ export {
   setRealTimeMode,
   setStartOffset,
   setTimeConductorBounds,
-  setTimeConductorMode,
   waitForPlotsToRender
 };

e2e/avpFixtures.js

@@ -36,71 +36,32 @@
 import AxeBuilder from '@axe-core/playwright';
 import fs from 'fs';
 import path from 'path';
-import { fileURLToPath } from 'url';
 
 import { expect, test } from './pluginFixtures.js';
+
 // Constants for repeated values
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const TEST_RESULTS_DIR = path.join(__dirname, './test-results');
-
-const extendedTest = test.extend({
-  /**
-   * Overrides the default screenshot function to apply default options that should apply to all
-   * screenshots taken in the AVP tests.
-   *
-   * @param {import('@playwright/test').PlaywrightTestArgs} args - The Playwright test arguments.
-   * @param {Function} use - The function to use the page object.
-   * Defaults:
-   * - Disables animations
-   * - Masks the clock indicator
-   * - Masks the time conductor last update time in realtime mode
-   * - Masks the time conductor start bounds in fixed mode
-   * - Masks the time conductor end bounds in fixed mode
-   */
-  page: async ({ page }, use) => {
-    const playwrightScreenshot = page.screenshot;
-
-    /**
-     * Override the screenshot function to always mask a given set of locators which will always
-     * show variance across screenshots. Defaults may be overridden by passing in options to the
-     * screenshot function.
-     * @param {import('@playwright/test').PageScreenshotOptions} options - The options for the screenshot.
-     * @returns {Promise<Buffer>} Returns the screenshot as a buffer.
-     */
-    page.screenshot = async function (options = {}) {
-      const mask = [
-        this.getByLabel('Clock Indicator'), // Mask the clock indicator
-        this.getByLabel('Last update'), // Mask the time conductor last update time in realtime mode
-        this.getByLabel('Start bounds'), // Mask the time conductor start bounds in fixed mode
-        this.getByLabel('End bounds') // Mask the time conductor end bounds in fixed mode
-      ];
-
-      const result = await playwrightScreenshot.call(this, {
-        animations: 'disabled',
-        mask,
-        ...options // Pass through or override any options
-      });
-      return result;
-    };
-
-    await use(page);
-  }
-});
+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 {{ reportName?: string }} [options={}] - The options for the report generation.
- * @returns {Promise<Object|null>} Returns the accessibility scan results if violations are found, otherwise returns null.
+ * @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 */
 export async function scanForA11yViolations(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
@@ -133,4 +94,4 @@ export async function scanForA11yViolations(page, testCaseName, options = {}) {
   }
 }
 
-export { expect, extendedTest as test };
+export { expect, test };

e2e/baseFixtures.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 /*****************************************************************************
  * Open MCT, Copyright (c) 2014-2024, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
@@ -39,7 +40,7 @@ import { v4 as uuid } from 'uuid';
  * @see {@link https://github.com/microsoft/playwright/discussions/11690 Github Discussion}
  * @private
  * @param {import('@playwright/test').ConsoleMessage} msg
- * @returns {string} formatted string with message type, text, url, and line and column numbers
+ * @returns {String} formatted string with message type, text, url, and line and column numbers
  */
 function _consoleMessageToString(msg) {
   const { url, lineNumber, columnNumber } = msg.location();
@@ -60,16 +61,14 @@ function waitForAnimations(locator) {
   );
 }
 
-const istanbulCLIOutput = fileURLToPath(new URL('.nyc_output', import.meta.url));
+/**
+ * This is part of our codecoverage shim.
+ * @see {@link https://github.com/mxschmitt/playwright-test-coverage Github Example Project}
+ * @constant {string}
+ */
+const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output');
 
 const extendedTest = test.extend({
-  /**
-   * Path to output raw coverage files. Can be overridden in Playwright config file.
-   * @see {@link https://github.com/mxschmitt/playwright-test-coverage Github Example Project}
-   * @constant {string}
-   */
-
-  coveragePath: [istanbulCLIOutput, { option: true }],
   /**
    * This allows the test to manipulate the browser clock. This is useful for Visual and Snapshot tests which need
    * the Time Indicator Clock to be in a specific state.
@@ -112,55 +111,21 @@ const extendedTest = test.extend({
       scope: 'test'
     }
   ],
-  /**
-   * Exposes a function to manually tick the clock. This is useful when overriding the clock to not
-   * tick (`shouldAdvanceTime: false`) for visual tests, as events such as re-renders and router params
-   * updates are clock-driven and must be manually ticked.
-   *
-   * Usage:
-   * ```js
-   * test.describe('Manual Clock Tick', () => {
-   *  test.use({
-   *   clockOptions: {
-   *     now: MISSION_TIME, // Set to the desired time
-   *     shouldAdvanceTime: false // Clock overridden to no longer tick
-   *   }
-   *  });
-   *  test('Visual - Manual Clock Tick', async ({ page, tick }) => {
-   *   // Tick the clock 2 seconds in the future
-   *   await tick(2000);
-   *  });
-   * });
-   * ```
-   *
-   * @param {Object} param0
-   * @param {import('@playwright/test').Page} param0.page
-   * @param {import('@playwright/test').Use} param0.use
-   */
-  tick: async ({ page }, use) => {
-    // eslint-disable-next-line func-style
-    const tick = async (milliseconds) => {
-      await page.evaluate((_milliseconds) => {
-        window.__clock.tick(_milliseconds);
-      }, milliseconds);
-    };
-    await use(tick);
-  },
   /**
    * Extends the base context class to add codecoverage shim.
    * @see {@link https://github.com/mxschmitt/playwright-test-coverage Github Project}
    */
-  context: async ({ context, coveragePath }, use) => {
+  context: async ({ context }, use) => {
     await context.addInitScript(() =>
       window.addEventListener('beforeunload', () =>
         window.collectIstanbulCoverage(JSON.stringify(window.__coverage__))
       )
     );
-    await fs.promises.mkdir(coveragePath, { recursive: true });
+    await fs.promises.mkdir(istanbulCLIOutput, { recursive: true });
     await context.exposeFunction('collectIstanbulCoverage', (coverageJSON) => {
       if (coverageJSON) {
         fs.writeFileSync(
-          path.join(coveragePath, `playwright_coverage_${uuid()}.json`),
+          path.join(istanbulCLIOutput, `playwright_coverage_${uuid()}.json`),
           coverageJSON
         );
       }
@@ -168,9 +133,9 @@ const extendedTest = test.extend({
 
     await use(context);
     for (const page of context.pages()) {
-      await page.evaluate(() => {
-        window.collectIstanbulCoverage(JSON.stringify(window.__coverage__));
-      });
+      await page.evaluate(() =>
+        window.collectIstanbulCoverage(JSON.stringify(window.__coverage__))
+      );
     }
   },
   /**
@@ -189,13 +154,17 @@ const extendedTest = test.extend({
     // function in the generatorWorker context. This is necessary
     // to ensure that example telemetry data is generated for the new clock time.
     if (clockOptions?.now !== undefined) {
-      page.on('worker', (worker) => {
-        if (worker.url().includes('generatorWorker')) {
-          worker.evaluate((time) => {
-            self.Date.now = () => time;
-          }, clockOptions.now);
-        }
-      });
+      page.on(
+        'worker',
+        (worker) => {
+          if (worker.url().includes('generatorWorker')) {
+            worker.evaluate((time) => {
+              self.Date.now = () => time;
+            });
+          }
+        },
+        clockOptions.now
+      );
     }
 
     // Capture any console errors during test execution

e2e/constants.js

@@ -1,3 +1,4 @@
+/* eslint-disable prettier/prettier */
 /**
  * Constants which may be used across all e2e tests.
  */
@@ -7,30 +8,12 @@
  * - Used for overriding the browser clock in tests.
  */
 export const MISSION_TIME = 1732413600000; // Saturday, November 23, 2024 6:00:00 PM GMT-08:00 (Thanksgiving Dinner Time)
-// Subtracting 30 minutes from MISSION_TIME
-export const MISSION_TIME_FIXED_START = 1732413600000 - 1800000; // 1732411800000
 
-// Adding 1 minute to MISSION_TIME
-export const MISSION_TIME_FIXED_END = 1732413600000 + 60000; // 1732413660000
 /**
  * URL Constants
- * These constants are used for initial navigation in visual tests, in either fixed or realtime mode.
- * They navigate to the 'My Items' folder at MISSION_TIME.
- * They set the following url parameters:
- *  - tc.mode - The time conductor mode ('fixed' or 'local')
- *  - tc.startBound - The time conductor start bound (when in fixed mode)
- *  - tc.endBound - The time conductor end bound (when in fixed mode)
- *  - tc.startDelta - The time conductor start delta (when in realtime mode)
- *  - tc.endDelta - The time conductor end delta (when in realtime mode)
- *  - tc.timeSystem - The time conductor time system ('utc')
- *  - view - The view to display ('grid')
- *  - hideInspector - Whether to hide the inspector (true)
- *  - hideTree - Whether to hide the tree (true)
- * @typedef {string} VisualUrl
+ * - This is the URL that the browser will be directed to when running visual tests. This URL
+ *    - hides the tree and inspector to prevent visual noise
+ *    - sets the time bounds to a fixed range
  */
-
-/** @type {VisualUrl} */
-export const VISUAL_FIXED_URL = `./#/browse/mine?tc.mode=fixed&tc.startBound=${MISSION_TIME_FIXED_START}&tc.endBound=${MISSION_TIME_FIXED_END}&tc.timeSystem=utc&view=grid&hideInspector=true&hideTree=true`;
-/** @type {VisualUrl} */
-export const VISUAL_REALTIME_URL =
-  './#/browse/mine?tc.mode=local&tc.timeSystem=utc&view=grid&tc.startDelta=1800000&tc.endDelta=30000&hideTree=true&hideInspector=true';
+export const VISUAL_URL =
+  './#/browse/mine?tc.mode=fixed&tc.startBound=1693592063607&tc.endBound=1693593893607&tc.timeSystem=utc&view=grid&hideInspector=true&hideTree=true';

e2e/helper/faultUtils.js

@@ -21,12 +21,10 @@
  *****************************************************************************/
 import { fileURLToPath } from 'url';
 
-import { expect } from '../pluginFixtures.js';
-
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function navigateToFaultManagementWithExample(page) {
+async function navigateToFaultManagementWithExample(page) {
   await page.addInitScript({
     path: fileURLToPath(new URL('./addInitExampleFaultProvider.js', import.meta.url))
   });
@@ -37,7 +35,7 @@ export async function navigateToFaultManagementWithExample(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function navigateToFaultManagementWithStaticExample(page) {
+async function navigateToFaultManagementWithStaticExample(page) {
   await page.addInitScript({
     path: fileURLToPath(new URL('./addInitExampleFaultProviderStatic.js', import.meta.url))
   });
@@ -48,7 +46,7 @@ export async function navigateToFaultManagementWithStaticExample(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function navigateToFaultManagementWithoutExample(page) {
+async function navigateToFaultManagementWithoutExample(page) {
   await page.addInitScript({
     path: fileURLToPath(new URL('./addInitFaultManagementPlugin.js', import.meta.url))
   });
@@ -59,7 +57,7 @@ export async function navigateToFaultManagementWithoutExample(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function navigateToFaultItemInTree(page) {
+async function navigateToFaultItemInTree(page) {
   await page.goto('./', { waitUntil: 'networkidle' });
 
   const faultManagementTreeItem = page
@@ -77,95 +75,88 @@ export async function navigateToFaultItemInTree(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function acknowledgeFault(page, rowNumber) {
+async function acknowledgeFault(page, rowNumber) {
   await openFaultRowMenu(page, rowNumber);
-  await page.getByLabel('Acknowledge', { exact: true }).click();
-  await page.getByLabel('Save').click();
+  await page.locator('.c-menu >> text="Acknowledge"').click();
+  // Click [aria-label="Save"]
+  await page.locator('[aria-label="Save"]').click();
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function shelveMultipleFaults(page, ...nums) {
+async function shelveMultipleFaults(page, ...nums) {
   const selectRows = nums.map((num) => {
     return selectFaultItem(page, num);
   });
   await Promise.all(selectRows);
 
-  await page.getByLabel('Shelve selected faults').click();
-  await page.getByLabel('Save').click();
+  await page.locator('button:has-text("Shelve")').click();
+  await page.locator('[aria-label="Save"]').click();
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function acknowledgeMultipleFaults(page, ...nums) {
+async function acknowledgeMultipleFaults(page, ...nums) {
   const selectRows = nums.map((num) => {
     return selectFaultItem(page, num);
   });
   await Promise.all(selectRows);
 
   await page.locator('button:has-text("Acknowledge")').click();
-  await page.getByLabel('Save').click();
+  await page.locator('[aria-label="Save"]').click();
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function shelveFault(page, rowNumber) {
+async function shelveFault(page, rowNumber) {
   await openFaultRowMenu(page, rowNumber);
   await page.locator('.c-menu >> text="Shelve"').click();
   // Click [aria-label="Save"]
-  await page.getByLabel('Save').click();
+  await page.locator('[aria-label="Save"]').click();
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function changeViewTo(page, view) {
+async function changeViewTo(page, view) {
   await page.locator('.c-fault-mgmt__search-row select').first().selectOption(view);
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function sortFaultsBy(page, sort) {
+async function sortFaultsBy(page, sort) {
   await page.locator('.c-fault-mgmt__list-header-sortButton select').selectOption(sort);
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function enterSearchTerm(page, term) {
+async function enterSearchTerm(page, term) {
   await page.locator('.c-fault-mgmt-search [aria-label="Search Input"]').fill(term);
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function clearSearch(page) {
+async function clearSearch(page) {
   await enterSearchTerm(page, '');
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function selectFaultItem(page, rowNumber) {
-  await page
-    .getByLabel('Select fault')
-    .nth(rowNumber - 1)
-    .check({
-      // Need force here because checkbox state is changed by an event emitted by the checkbox
-      // eslint-disable-next-line playwright/no-force-option
-      force: true
-    });
-  await expect(page.getByLabel('Select fault').nth(rowNumber - 1)).toBeChecked();
+async function selectFaultItem(page, rowNumber) {
+  await page.locator(`.c-fault-mgmt-item > input >> nth=${rowNumber - 1}`).check();
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getHighestSeverity(page) {
+async function getHighestSeverity(page) {
   const criticalCount = await page.locator('[title=CRITICAL]').count();
   const warningCount = await page.locator('[title=WARNING]').count();
 
@@ -181,7 +172,7 @@ export async function getHighestSeverity(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getLowestSeverity(page) {
+async function getLowestSeverity(page) {
   const warningCount = await page.locator('[title=WARNING]').count();
   const watchCount = await page.locator('[title=WATCH]').count();
 
@@ -197,7 +188,7 @@ export async function getLowestSeverity(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getFaultResultCount(page) {
+async function getFaultResultCount(page) {
   const count = await page.locator('.c-faults-list-view-item-body > .c-fault-mgmt__list').count();
 
   return count;
@@ -206,7 +197,7 @@ export async function getFaultResultCount(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export function getFault(page, rowNumber) {
+function getFault(page, rowNumber) {
   const fault = page.locator(
     `.c-faults-list-view-item-body > .c-fault-mgmt__list >> nth=${rowNumber - 1}`
   );
@@ -217,7 +208,7 @@ export function getFault(page, rowNumber) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export function getFaultByName(page, name) {
+function getFaultByName(page, name) {
   const fault = page.locator(`.c-fault-mgmt__list-faultname:has-text("${name}")`);
 
   return fault;
@@ -226,7 +217,7 @@ export function getFaultByName(page, name) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getFaultName(page, rowNumber) {
+async function getFaultName(page, rowNumber) {
   const faultName = await page
     .locator(`.c-fault-mgmt__list-faultname >> nth=${rowNumber - 1}`)
     .textContent();
@@ -237,7 +228,7 @@ export async function getFaultName(page, rowNumber) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getFaultSeverity(page, rowNumber) {
+async function getFaultSeverity(page, rowNumber) {
   const faultSeverity = await page
     .locator(`.c-faults-list-view-item-body .c-fault-mgmt__list-severity >> nth=${rowNumber - 1}`)
     .getAttribute('title');
@@ -248,7 +239,7 @@ export async function getFaultSeverity(page, rowNumber) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getFaultNamespace(page, rowNumber) {
+async function getFaultNamespace(page, rowNumber) {
   const faultNamespace = await page
     .locator(`.c-fault-mgmt__list-path >> nth=${rowNumber - 1}`)
     .textContent();
@@ -259,7 +250,7 @@ export async function getFaultNamespace(page, rowNumber) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function getFaultTriggerTime(page, rowNumber) {
+async function getFaultTriggerTime(page, rowNumber) {
   const faultTriggerTime = await page
     .locator(`.c-fault-mgmt__list-trigTime >> nth=${rowNumber - 1} >> .c-fault-mgmt-item__value`)
     .textContent();
@@ -270,10 +261,35 @@ export async function getFaultTriggerTime(page, rowNumber) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-export async function openFaultRowMenu(page, rowNumber) {
+async function openFaultRowMenu(page, rowNumber) {
   // select
   await page
-    .getByLabel('Disposition actions')
-    .nth(rowNumber - 1)
+    .locator(`.c-fault-mgmt-item > .c-fault-mgmt__list-action-button >> nth=${rowNumber - 1}`)
     .click();
 }
+
+export {
+  acknowledgeFault,
+  acknowledgeMultipleFaults,
+  changeViewTo,
+  clearSearch,
+  enterSearchTerm,
+  getFault,
+  getFaultByName,
+  getFaultName,
+  getFaultNamespace,
+  getFaultResultCount,
+  getFaultSeverity,
+  getFaultTriggerTime,
+  getHighestSeverity,
+  getLowestSeverity,
+  navigateToFaultItemInTree,
+  navigateToFaultManagementWithExample,
+  navigateToFaultManagementWithoutExample,
+  navigateToFaultManagementWithStaticExample,
+  openFaultRowMenu,
+  selectFaultItem,
+  shelveFault,
+  shelveMultipleFaults,
+  sortFaultsBy
+};

e2e/helper/hotkeys/clipboard.js

@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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 isMac = process.platform === 'darwin';
-const modifier = isMac ? 'Meta' : 'Control';
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function selectAll(page) {
-  await page.keyboard.press(`${modifier}+KeyA`);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function copy(page) {
-  await page.keyboard.press(`${modifier}+KeyC`);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function paste(page) {
-  await page.keyboard.press(`${modifier}+KeyV`);
-}
-
-export { copy, paste, selectAll };

e2e/helper/hotkeys/hotkeys.js

@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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.
- *****************************************************************************/
-
-export * from './clipboard.js';

e2e/helper/notebookUtils.js

@@ -28,26 +28,14 @@ import { fileURLToPath } from 'url';
 
 /**
  * @param {import('@playwright/test').Page} page
- * @param {string} text
  */
 async function enterTextEntry(page, text) {
-  await addNotebookEntry(page);
-  await enterTextInLastEntry(page, text);
-  await commitEntry(page);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function addNotebookEntry(page) {
+  // Click the 'Add Notebook Entry' area
   await page.locator(NOTEBOOK_DROP_AREA).click();
-}
 
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function enterTextInLastEntry(page, text) {
+  // enter text
   await page.getByLabel('Notebook Entry Input').last().fill(text);
+  await commitEntry(page);
 }
 
 /**
@@ -80,6 +68,7 @@ async function commitEntry(page) {
  * @param {import('@playwright/test').Page} page
  */
 async function startAndAddRestrictedNotebookObject(page) {
+  // eslint-disable-next-line no-undef
   await page.addInitScript({
     path: fileURLToPath(new URL('./addInitRestrictedNotebook.js', import.meta.url))
   });
@@ -152,13 +141,10 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
 }
 
 export {
-  addNotebookEntry,
-  commitEntry,
   createNotebookAndEntry,
   createNotebookEntryAndTags,
   dragAndDropEmbed,
   enterTextEntry,
-  enterTextInLastEntry,
   lockPage,
   startAndAddRestrictedNotebookObject
 };

e2e/helper/planningUtils.js

@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { createDomainObjectWithDefaults, createPlanFromJSON } from '../appActions.js';
 import { expect } from '../pluginFixtures.js';
 
 /**
@@ -29,7 +28,7 @@ import { expect } from '../pluginFixtures.js';
  * for each activity in the plan data per group, using the earliest activity's
  * start time as the start bound and the current activity's end time as the end bound.
  * @param {import('@playwright/test').Page} page the page
- * @param {Object} plan The raw plan json to assert against
+ * @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 assertPlanActivities(page, plan, objectUrl) {
@@ -86,7 +85,7 @@ 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 {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) {
@@ -110,7 +109,7 @@ export async function assertPlanOrderedSwimLanes(page, plan, objectUrl) {
  * Navigate to the plan view, switch to fixed time mode,
  * and set the bounds to span all activities.
  * @param {import('@playwright/test').Page} page
- * @param {Object} planJson
+ * @param {object} planJson
  * @param {string} planObjectUrl
  */
 export async function setBoundsToSpanAllActivities(page, planJson, planObjectUrl) {
@@ -125,7 +124,7 @@ export async function setBoundsToSpanAllActivities(page, planJson, planObjectUrl
 }
 
 /**
- * @param {Object} planJson
+ * @param {object} planJson
  * @returns {number}
  */
 export function getEarliestStartTime(planJson) {
@@ -135,7 +134,7 @@ export function getEarliestStartTime(planJson) {
 
 /**
  *
- * @param {Object} planJson
+ * @param {object} planJson
  * @returns {number}
  */
 export function getLatestEndTime(planJson) {
@@ -143,18 +142,6 @@ export function getLatestEndTime(planJson) {
   return Math.max(...activities.map((activity) => activity.end));
 }
 
-/**
- *
- * @param {object} planJson
- * @returns {object}
- */
-export function getFirstActivity(planJson) {
-  const groups = Object.keys(planJson);
-  const firstGroupKey = groups[0];
-  const firstGroupItems = planJson[firstGroupKey];
-  return firstGroupItems[0];
-}
-
 /**
  * Uses the Open MCT API to set the status of a plan to 'draft'.
  * @param {import('@playwright/test').Page} page
@@ -185,55 +172,3 @@ export async function addPlanGetInterceptor(page) {
     });
   });
 }
-
-/**
- * Create a Plan from JSON and add it to a Timelist and Navigate to the Plan view
- * @param {import('@playwright/test').Page} page
- */
-export async function createTimelistWithPlanAndSetActivityInProgress(page, planJson) {
-  await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-  const timelist = await createDomainObjectWithDefaults(page, {
-    name: 'Time List',
-    type: 'Time List'
-  });
-
-  await createPlanFromJSON(page, {
-    name: 'Test Plan',
-    json: planJson,
-    parent: timelist.uuid
-  });
-
-  // Ensure that all activities are shown in the expanded view
-  const groups = Object.keys(planJson);
-  const firstGroupKey = groups[0];
-  const firstGroupItems = planJson[firstGroupKey];
-  const firstActivityForPlan = firstGroupItems[0];
-  const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-  const startBound = firstActivityForPlan.start;
-  const endBound = lastActivity.end;
-
-  // Switch to fixed time mode with all plan events within the bounds
-  await page.goto(
-    `${timelist.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=timelist.view`
-  );
-
-  // Change the object to edit mode
-  await page.getByRole('button', { name: 'Edit Object' }).click();
-
-  // Find the display properties section in the inspector
-  await page.getByRole('tab', { name: 'View Properties' }).click();
-  // Switch to expanded view and save the setting
-  await page.getByLabel('Display Style').selectOption({ label: 'Expanded' });
-
-  // Click on the "Save" button
-  await page.getByRole('button', { name: 'Save' }).click();
-  await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
-  const anActivity = page.getByRole('row').nth(0);
-
-  // Set the activity to in progress
-  await anActivity.click();
-  await page.getByRole('tab', { name: 'Activity' }).click();
-  await page.getByLabel('Activity Status', { exact: true }).selectOption({ label: 'In progress' });
-}

e2e/helper/plotTagsUtils.js

@@ -27,8 +27,8 @@ import { expect } from '../pluginFixtures.js';
  * 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
+ * @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 }) {

e2e/index.js

@@ -1,8 +0,0 @@
-// Import everything from the specific fixture files
-import * as appActions from './appActions.js';
-import * as avpFixtures from './avpFixtures.js';
-import * as baseFixtures from './baseFixtures.js';
-import * as pluginFixtures from './pluginFixtures.js';
-
-// Export these as named exports
-export { appActions, avpFixtures, baseFixtures, pluginFixtures };

e2e/package.json

@@ -1,27 +0,0 @@
-{
-  "name": "openmct-e2e",
-  "version": "4.0.0-next",
-  "description": "The Open MCT e2e framework",
-  "type": "module",
-  "module": "index.js",
-  "exports": {
-    ".": {
-      "import": "./index.js"
-    }
-  },
-  "scripts": {
-    "pretest:visual": "npm install",
-    "test": "npx playwright test",
-    "test:visual": "percy exec"
-  },
-  "devDependencies": {
-    "@types/sinonjs__fake-timers": "8.1.5",
-    "@percy/cli": "1.27.4",
-    "@percy/playwright": "1.0.4",
-    "@playwright/test": "1.42.1",
-    "@axe-core/playwright": "4.8.5",
-    "sinon": "17.0.0"
-  },
-  "author": "NASA Ames Research Center",
-  "license": "Apache-2.0"
-}

e2e/playwright-ci.config.js

@@ -3,7 +3,6 @@
 
 // eslint-disable-next-line no-unused-vars
 import { devices } from '@playwright/test';
-import { fileURLToPath } from 'url';
 const MAX_FAILURES = 5;
 const NUM_WORKERS = 2;
 
@@ -11,12 +10,10 @@ const NUM_WORKERS = 2;
 const config = {
   retries: 2, //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',
-  grepInvert: /@mobile/, //Ignore mobile tests
   testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
   timeout: 60 * 1000,
   webServer: {
     command: 'npm run start:coverage',
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
     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.
@@ -29,9 +26,7 @@ const config = {
     ignoreHTTPSErrors: true,
     screenshot: 'only-on-failure',
     trace: 'on-first-retry',
-    video: 'off',
-    // @ts-ignore - custom configuration option for nyc codecoverage output path
-    coveragePath: fileURLToPath(new URL('../.nyc_output', import.meta.url))
+    video: 'off'
   },
   projects: [
     {

e2e/playwright-local.config.js

@@ -1,16 +1,17 @@
 // playwright.config.js
 // @ts-check
-import { fileURLToPath } from 'url';
+
+// eslint-disable-next-line no-unused-vars
+import { devices } from '@playwright/test';
+
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
   retries: 0,
   testDir: 'tests',
-  testMatch: '**/*.e2e.spec.js', // only run e2e tests
   testIgnore: '**/*.perf.spec.js',
   timeout: 30 * 1000,
   webServer: {
     command: 'npm run start:coverage',
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
     url: 'http://localhost:8080/#',
     timeout: 120 * 1000,
     reuseExistingServer: true
@@ -34,6 +35,7 @@ const config = {
     },
     {
       name: 'MMOC',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
@@ -45,6 +47,8 @@ const config = {
     },
     {
       name: 'safari',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
+      grep: /@ipad/, // only run ipad tests due to this bug https://github.com/microsoft/playwright/issues/8340
       grepInvert: /@snapshot/,
       use: {
         browserName: 'webkit'
@@ -52,6 +56,7 @@ const config = {
     },
     {
       name: 'firefox',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'firefox'
@@ -59,6 +64,7 @@ const config = {
     },
     {
       name: 'canary',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
@@ -67,11 +73,22 @@ const config = {
     },
     {
       name: 'chrome-beta',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
         channel: 'chrome-beta'
       }
+    },
+    {
+      name: 'ipad',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
+      grep: /@ipad/,
+      grepInvert: /@snapshot/,
+      use: {
+        browserName: 'webkit',
+        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
+      }
     }
   ],
   reporter: [

e2e/playwright-mobile.config.js

@@ -1,72 +0,0 @@
-// playwright.config.js
-// @ts-check
-
-import { devices } from '@playwright/test';
-const MAX_FAILURES = 5;
-
-import { fileURLToPath } from 'url';
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-  retries: 1, //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',
-  testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
-  timeout: 30 * 1000,
-  webServer: {
-    command: 'npm run start:coverage',
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
-    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: 1, //Limit to 1 due to resource constraints similar to https://github.com/percy/cli/discussions/1067
-
-  use: {
-    baseURL: 'http://localhost:8080/',
-    headless: true,
-    ignoreHTTPSErrors: true,
-    screenshot: 'only-on-failure',
-    trace: 'on-first-retry',
-    video: 'off',
-    // @ts-ignore - custom configuration option for nyc codecoverage output path
-    coveragePath: fileURLToPath(new URL('../.nyc_output', import.meta.url))
-  },
-  projects: [
-    {
-      name: 'ipad',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    },
-    {
-      name: 'iphone',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPhone 14 Pro'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    }
-  ],
-  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' }]
-  ]
-};
-
-export default config;

e2e/playwright-performance-dev.config.js

@@ -1,6 +1,6 @@
 // playwright.config.js
 // @ts-check
-import { fileURLToPath } from 'url';
+
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
   retries: 1, //Only for debugging purposes for trace: 'on-first-retry'
@@ -10,7 +10,6 @@ const config = {
   workers: 1, //Only run in serial with 1 worker
   webServer: {
     command: 'npm run start', //need development mode for performance.marks and others
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
     url: 'http://localhost:8080/#',
     timeout: 200 * 1000,
     reuseExistingServer: false

e2e/playwright-performance-prod.config.js

@@ -1,6 +1,6 @@
 // playwright.config.js
 // @ts-check
-import { fileURLToPath } from 'url';
+
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
   retries: 0, //Only for debugging purposes for trace: 'on-first-retry'
@@ -10,7 +10,6 @@ const config = {
   workers: 1, //Only run in serial with 1 worker
   webServer: {
     command: 'npm run start:prod', //Production mode
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
     url: 'http://localhost:8080/#',
     timeout: 200 * 1000,
     reuseExistingServer: false //Must be run with this option to prevent dev mode

e2e/playwright-visual-a11y.config.js

@@ -1,6 +1,7 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
-import { fileURLToPath } from 'url';
+
 /** @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
@@ -10,7 +11,6 @@ const config = {
   workers: 1, //Lower stress on Circle CI Agent for Visual tests https://github.com/percy/cli/discussions/1067
   webServer: {
     command: 'npm run start:coverage',
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
     url: 'http://localhost:8080/#',
     timeout: 200 * 1000,
     reuseExistingServer: !process.env.CI
@@ -36,13 +36,6 @@ const config = {
         browserName: 'chromium',
         theme: 'snow'
       }
-    },
-    {
-      name: 'darkmatter-theme', //Runs the same visual tests but with darkmatter-theme
-      use: {
-        browserName: 'chromium',
-        theme: 'darkmatter-theme'
-      }
     }
   ],
   reporter: [

e2e/playwright-watch.config.js

@@ -1,7 +1,5 @@
 // playwright.config.js
 // @ts-check
-import { devices } from '@playwright/test';
-import { fileURLToPath } from 'url';
 
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
@@ -10,7 +8,6 @@ const config = {
   timeout: 60 * 1000,
   webServer: {
     command: 'npm run start', //Start in dev mode for hot reloading
-    cwd: fileURLToPath(new URL('../', import.meta.url)), // Provide cwd for the root of the project
     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.
@@ -31,28 +28,6 @@ const config = {
       use: {
         browserName: 'chromium'
       }
-    },
-    {
-      name: 'ipad',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    },
-    {
-      name: 'iphone',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPhone 14 Pro'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
     }
   ],
   reporter: [

e2e/pluginFixtures.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 /*****************************************************************************
  * Open MCT, Copyright (c) 2014-2024, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
@@ -122,6 +123,7 @@ const extendedTest = test.extend({
   theme: [theme, { option: true }],
   // eslint-disable-next-line no-shadow
   page: async ({ page, theme }, use, testInfo) => {
+    // eslint-disable-next-line playwright/no-conditional-in-test
     if (theme === 'snow') {
       //inject snow theme
       await page.addInitScript({

e2e/test-data/examplePlans/ExamplePlan_Small1.json

@@ -6,8 +6,7 @@
       "end": 1660343797000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 1
+      "textColor": "white"
     },
     {
       "name": "Past event 2",
@@ -15,8 +14,7 @@
       "end": 1660429160000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 2
+      "textColor": "white"
     },
     {
       "name": "Past event 3",
@@ -24,8 +22,7 @@
       "end": 1660503981000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 3
+      "textColor": "white"
     },
     {
       "name": "Past event 4",
@@ -33,8 +30,7 @@
       "end": 1660624108000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 4
+      "textColor": "white"
     },
     {
       "name": "Past event 5",
@@ -42,8 +38,7 @@
       "end": 1660681529000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 5
+      "textColor": "white"
     }
   ]
 }

e2e/test-data/examplePlans/ExamplePlan_Small3.json

@@ -6,8 +6,7 @@
       "end": 1660343797000,
       "type": "Group 1",
       "color": "orange",
-      "textColor": "white",
-      "id": 1
+      "textColor": "white"
     },
     {
       "name": "Time until supper",
@@ -15,8 +14,7 @@
       "end": 1650420410000,
       "type": "Group 2",
       "color": "blue",
-      "textColor": "white",
-      "id": 2
+      "textColor": "white"
     }
   ],
   "Group 2": [
@@ -26,8 +24,7 @@
       "end": 1650320102001,
       "type": "Group 2",
       "color": "green",
-      "textColor": "white",
-      "id": 3
+      "textColor": "white"
     },
     {
       "name": "Time since last accident",
@@ -35,8 +32,7 @@
       "end": 1650320102002,
       "type": "Group 1",
       "color": "yellow",
-      "textColor": "white",
-      "id": 4
+      "textColor": "white"
     }
   ]
 }

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

@@ -174,6 +174,6 @@ test.describe('AppActions', () => {
       type: 'Folder'
     });
     await openObjectTreeContextMenu(page, folder.url);
-    await expect(page.getByLabel(`${folder.name} Context Menu`)).toBeVisible();
+    await expect(page.getByLabel('Menu')).toBeVisible();
   });
 });

e2e/tests/framework/baseFixtures.e2e.spec.js

@@ -26,12 +26,11 @@ relates to how we've extended it (i.e. ./e2e/baseFixtures.js) and assumptions ma
 (`npm start` and ./e2e/webpack-dev-middleware.js)
 */
 
-import { expect, test } from '../../baseFixtures.js';
-import { MISSION_TIME } from '../../constants.js';
+import { test } from '../../baseFixtures.js';
 
 test.describe('baseFixtures tests', () => {
   //Skip this test for now https://github.com/nasa/openmct/issues/6785
-  test('Verify that tests fail if console.error is thrown', async ({ page }) => {
+  test.fixme('Verify that tests fail if console.error is thrown', async ({ page }) => {
     test.fail();
     //Go to baseURL
     await page.goto('./', { waitUntil: 'domcontentloaded' });
@@ -53,27 +52,3 @@ test.describe('baseFixtures tests', () => {
     ]);
   });
 });
-
-test.describe('baseFixtures tests @clock', () => {
-  test.use({
-    clockOptions: {
-      now: MISSION_TIME,
-      shouldAdvanceTime: false
-    }
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-
-  test('Can use clockOptions and tick fixtures to control the clock', async ({ page, tick }) => {
-    let time = await page.evaluate(() => new Date().getTime());
-    expect(time).toBe(MISSION_TIME);
-    await tick(1000);
-    time = await page.evaluate(() => new Date().getTime());
-    expect(time).toBe(MISSION_TIME + 1000 * 1);
-    await tick(1000);
-    time = await page.evaluate(() => new Date().getTime());
-    expect(time).toBe(MISSION_TIME + 1000 * 2);
-  });
-});

e2e/tests/framework/generateLocalStorageData.e2e.spec.js

@@ -33,18 +33,13 @@
 
 import { fileURLToPath } from 'url';
 
-import {
-  createDomainObjectWithDefaults,
-  createExampleTelemetryObject,
-  setIndependentTimeConductorBounds,
-  setTimeConductorBounds
-} from '../../appActions.js';
+import { createDomainObjectWithDefaults, createExampleTelemetryObject } from '../../appActions.js';
 import { MISSION_TIME } from '../../constants.js';
 import { expect, test } from '../../pluginFixtures.js';
 
 const overlayPlotName = 'Overlay Plot with Telemetry Object';
 
-test.describe('Generate Visual Test Data @localStorage @generatedata @clock', () => {
+test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
   test.use({
     clockOptions: {
       now: MISSION_TIME,
@@ -94,53 +89,6 @@ test.describe('Generate Visual Test Data @localStorage @generatedata @clock', ()
     });
   });
 
-  test('Generate display layout with 1 child overlay plot', async ({ page, context }) => {
-    const parent = await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Parent Display Layout'
-    });
-    const overlayPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Overlay Plot',
-      name: 'Child Overlay Plot 1',
-      parent: parent.uuid
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      name: 'Child SWG 1',
-      parent: overlayPlot.uuid
-    });
-
-    await page.goto(parent.url, { waitUntil: 'domcontentloaded' });
-
-    await setIndependentTimeConductorBounds(page, {
-      start: '2024-11-12 19:11:11.000Z',
-      end: '2024-11-12 20:11:11.000Z'
-    });
-
-    const NEW_GLOBAL_START_BOUNDS = '2024-11-11 19:11:11.000Z';
-    const NEW_GLOBAL_END_BOUNDS = '2024-11-11 20:11:11.000Z';
-
-    await setTimeConductorBounds(page, NEW_GLOBAL_START_BOUNDS, NEW_GLOBAL_END_BOUNDS);
-
-    // Verify that the global time conductor bounds have been updated
-    expect(
-      await page.getByLabel('Global Time Conductor').getByLabel('Start bounds').textContent()
-    ).toEqual(NEW_GLOBAL_START_BOUNDS);
-    expect(
-      await page.getByLabel('Global Time Conductor').getByLabel('End bounds').textContent()
-    ).toEqual(NEW_GLOBAL_END_BOUNDS);
-
-    //Save localStorage for future test execution
-    await context.storageState({
-      path: fileURLToPath(
-        new URL(
-          '../../../e2e/test-data/display_layout_with_child_overlay_plot.json',
-          import.meta.url
-        )
-      )
-    });
-  });
-
   test('Generate flexible layout with 2 child display layouts', async ({ page, context }) => {
     // Create Display Layout
     const parent = await createDomainObjectWithDefaults(page, {

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

@@ -31,8 +31,8 @@ import { createDomainObjectWithDefaults } from '../../appActions.js';
 import { expect, test } from '../../pluginFixtures.js';
 
 const TEST_FOLDER = 'test folder';
-const jsonFilePath = 'test-data/ExampleLayouts.json';
-const imageFilePath = 'test-data/rick.jpg';
+const jsonFilePath = 'e2e/test-data/ExampleLayouts.json';
+const imageFilePath = 'e2e/test-data/rick.jpg';
 
 test.describe('Form Validation Behavior', () => {
   test('Required Field indicators appear if title is empty and can be corrected', async ({

e2e/tests/functional/missionStatus.e2e.spec.js

@@ -1,127 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which verify persistability checks
-*/
-
-import { fileURLToPath } from 'url';
-
-import { expect, test } from '../../baseFixtures.js';
-
-test.describe('Mission Status @addInit', () => {
-  const NO_GO = '0';
-  const GO = '1';
-  test.beforeEach(async ({ page }) => {
-    // FIXME: determine if plugins will be added to index.html or need to be injected
-    await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addInitExampleUser.js', import.meta.url))
-    });
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await expect(page.getByText('Select Role')).toBeVisible();
-    // Description should be empty https://github.com/nasa/openmct/issues/6978
-    await expect(page.getByLabel('Dialog message')).toBeHidden();
-    // set role
-    await page.getByRole('button', { name: 'Select', exact: true }).click();
-    // dismiss role confirmation popup
-    await page.getByRole('button', { name: 'Dismiss' }).click();
-  });
-
-  test('Basic functionality', async ({ page }) => {
-    const imageryStatusSelect = page.getByRole('combobox', { name: 'Imagery' });
-    const commandingStatusSelect = page.getByRole('combobox', { name: 'Commanding' });
-    const drivingStatusSelect = page.getByRole('combobox', { name: 'Driving' });
-    const missionStatusPanel = page.getByRole('dialog', { name: 'User Control Panel' });
-
-    await test.step('Mission status panel shows/hides when toggled', async () => {
-      // Ensure that clicking the button toggles the dialog
-      await page.getByLabel('Toggle Mission Status Panel').click();
-      await expect(missionStatusPanel).toBeVisible();
-      await page.getByLabel('Toggle Mission Status Panel').click();
-      await expect(missionStatusPanel).toBeHidden();
-      await page.getByLabel('Toggle Mission Status Panel').click();
-      await expect(missionStatusPanel).toBeVisible();
-
-      // Ensure that clicking the close button closes the dialog
-      await page.getByLabel('Close Mission Status Panel').click();
-      await expect(missionStatusPanel).toBeHidden();
-      await page.getByLabel('Toggle Mission Status Panel').click();
-      await expect(missionStatusPanel).toBeVisible();
-
-      // Ensure clicking off the dialog also closes it
-      await page.getByLabel('My Items Grid View').click();
-      await expect(missionStatusPanel).toBeHidden();
-      await page.getByLabel('Toggle Mission Status Panel').click();
-      await expect(missionStatusPanel).toBeVisible();
-    });
-
-    await test.step('Mission action statuses have correct defaults and can be set', async () => {
-      await expect(imageryStatusSelect).toHaveValue(NO_GO);
-      await expect(commandingStatusSelect).toHaveValue(NO_GO);
-      await expect(drivingStatusSelect).toHaveValue(NO_GO);
-
-      await setMissionStatus(page, 'Imagery', GO);
-      await expect(imageryStatusSelect).toHaveValue(GO);
-      await expect(commandingStatusSelect).toHaveValue(NO_GO);
-      await expect(drivingStatusSelect).toHaveValue(NO_GO);
-
-      await setMissionStatus(page, 'Commanding', GO);
-      await expect(imageryStatusSelect).toHaveValue(GO);
-      await expect(commandingStatusSelect).toHaveValue(GO);
-      await expect(drivingStatusSelect).toHaveValue(NO_GO);
-
-      await setMissionStatus(page, 'Driving', GO);
-      await expect(imageryStatusSelect).toHaveValue(GO);
-      await expect(commandingStatusSelect).toHaveValue(GO);
-      await expect(drivingStatusSelect).toHaveValue(GO);
-
-      await setMissionStatus(page, 'Imagery', NO_GO);
-      await expect(imageryStatusSelect).toHaveValue(NO_GO);
-      await expect(commandingStatusSelect).toHaveValue(GO);
-      await expect(drivingStatusSelect).toHaveValue(GO);
-
-      await setMissionStatus(page, 'Commanding', NO_GO);
-      await expect(imageryStatusSelect).toHaveValue(NO_GO);
-      await expect(commandingStatusSelect).toHaveValue(NO_GO);
-      await expect(drivingStatusSelect).toHaveValue(GO);
-
-      await setMissionStatus(page, 'Driving', NO_GO);
-      await expect(imageryStatusSelect).toHaveValue(NO_GO);
-      await expect(commandingStatusSelect).toHaveValue(NO_GO);
-      await expect(drivingStatusSelect).toHaveValue(NO_GO);
-    });
-  });
-});
-
-/**
- *
- * @param {import('@playwright/test').Page} page
- * @param {'Commanding'|'Imagery'|'Driving'} action
- * @param {'0'|'1'} status
- */
-async function setMissionStatus(page, action, status) {
-  await page.getByRole('combobox', { name: action }).selectOption(status);
-  await expect(
-    page.getByRole('alert').filter({ hasText: 'Successfully set mission status' })
-  ).toBeVisible();
-  await page.getByLabel('Dismiss').click();
-}

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

@@ -21,6 +21,7 @@
  *****************************************************************************/
 import fs from 'fs';
 
+import { getPreciseDuration } from '../../../../src/utils/duration.js';
 import { createDomainObjectWithDefaults, createPlanFromJSON } from '../../../appActions.js';
 import {
   assertPlanActivities,
@@ -131,58 +132,3 @@ test.describe('Gantt Chart', () => {
     );
   });
 });
-
-const ONE_SECOND = 1000;
-const ONE_MINUTE = 60 * ONE_SECOND;
-const ONE_HOUR = ONE_MINUTE * 60;
-const ONE_DAY = ONE_HOUR * 24;
-
-function normalizeAge(num) {
-  const hundredtized = num * 100;
-  const isWhole = hundredtized % 100 === 0;
-
-  return isWhole ? hundredtized / 100 : num;
-}
-
-function padLeadingZeros(num, numOfLeadingZeros) {
-  return num.toString().padStart(numOfLeadingZeros, '0');
-}
-
-function toDoubleDigits(num) {
-  return padLeadingZeros(num, 2);
-}
-
-function toTripleDigits(num) {
-  return padLeadingZeros(num, 3);
-}
-
-function getPreciseDuration(value, { excludeMilliSeconds, useDayFormat } = {}) {
-  let preciseDuration;
-  const ms = value || 0;
-
-  const duration = [
-    Math.floor(normalizeAge(ms / ONE_DAY)),
-    toDoubleDigits(Math.floor(normalizeAge((ms % ONE_DAY) / ONE_HOUR))),
-    toDoubleDigits(Math.floor(normalizeAge((ms % ONE_HOUR) / ONE_MINUTE))),
-    toDoubleDigits(Math.floor(normalizeAge((ms % ONE_MINUTE) / ONE_SECOND)))
-  ];
-  if (!excludeMilliSeconds) {
-    duration.push(toTripleDigits(Math.floor(normalizeAge(ms % ONE_SECOND))));
-  }
-
-  if (useDayFormat) {
-    // Format days as XD
-    const days = duration.shift();
-    if (days > 0) {
-      preciseDuration = `${days}D ${duration.join(':')}`;
-    } else {
-      preciseDuration = duration.join(':');
-    }
-  } else {
-    const days = toDoubleDigits(duration.shift());
-    duration.unshift(days);
-    preciseDuration = duration.join(':');
-  }
-
-  return preciseDuration;
-}

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

@@ -27,7 +27,7 @@ import {
   assertPlanActivities,
   assertPlanOrderedSwimLanes
 } from '../../../helper/planningUtils.js';
-import { expect, test } from '../../../pluginFixtures.js';
+import { test } from '../../../pluginFixtures.js';
 
 const testPlan1 = JSON.parse(
   fs.readFileSync(
@@ -63,47 +63,4 @@ test.describe('Plan', () => {
     });
     await assertPlanOrderedSwimLanes(page, testPlanWithOrderedLanes, planWithSwimLanes.url);
   });
-
-  test('Allows setting the state of an activity when selected.', async ({ page }) => {
-    const groups = Object.keys(testPlan1);
-    const firstGroupKey = groups[0];
-    const firstGroupItems = testPlan1[firstGroupKey];
-    const firstActivity = firstGroupItems[0];
-    const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-    const startBound = firstActivity.start;
-    // Set the endBound to the end time of the current activity
-    let endBound = lastActivity.end;
-    // eslint-disable-next-line playwright/no-conditional-in-test
-    if (endBound === startBound) {
-      // Prevent oddities with setting start and end bound equal
-      // via URL params
-      endBound += 1;
-    }
-
-    // Switch to fixed time mode with all plan events within the bounds
-    await page.goto(
-      `${plan.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=plan.view`
-    );
-
-    // select the first activity in the list
-    await page.getByText('Past event 1').click();
-
-    // Find the activity state section in the inspector
-    await page.getByRole('tab', { name: 'Activity' }).click();
-
-    // Check that activity state dropdown selection shows the `set status` option by default
-    await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-      'Not started'
-    );
-
-    // Change the selection of the activity status
-    await page.getByRole('combobox').selectOption({ label: 'Aborted' });
-    // select a different activity and back to the previous one
-    await page.getByText('Past event 2').click();
-    await page.getByText('Past event 1').click();
-    // Check that activity state dropdown selection shows the previously selected option by default
-    await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-      'Aborted'
-    );
-  });
 });

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

@@ -22,15 +22,71 @@
 import fs from 'fs';
 
 import { createDomainObjectWithDefaults, createPlanFromJSON } from '../../../appActions.js';
+import { getEarliestStartTime } from '../../../helper/planningUtils';
 import { expect, test } from '../../../pluginFixtures.js';
 
-const examplePlanSmall1 = JSON.parse(
+const examplePlanSmall3 = JSON.parse(
   fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small1.json', import.meta.url)
+    new URL('../../../test-data/examplePlans/ExamplePlan_Small3.json', import.meta.url)
   )
 );
+// eslint-disable-next-line no-unused-vars
+const START_TIME_COLUMN = 0;
+// eslint-disable-next-line no-unused-vars
+const END_TIME_COLUMN = 1;
+const TIME_TO_FROM_COLUMN = 2;
+// eslint-disable-next-line no-unused-vars
+const ACTIVITY_COLUMN = 3;
+const HEADER_ROW = 0;
+const NUM_COLUMNS = 4;
+
+const testPlan = {
+  TEST_GROUP: [
+    {
+      name: 'Past event 1',
+      start: 1660320408000,
+      end: 1660343797000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 2',
+      start: 1660406808000,
+      end: 1660429160000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 3',
+      start: 1660493208000,
+      end: 1660503981000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 4',
+      start: 1660579608000,
+      end: 1660624108000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 5',
+      start: 1660666008000,
+      end: 1660681529000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    }
+  ]
+};
+
 test.describe('Time List', () => {
-  test("Create a Time List, add a single Plan to it, verify all the activities are displayed with no milliseconds and selecting an activity shows it's properties", async ({
+  test('Create a Time List, add a single Plan to it and verify all the activities are displayed with no milliseconds', async ({
     page
   }) => {
     // Goto baseURL
@@ -47,16 +103,12 @@ test.describe('Time List', () => {
     await test.step('Create a Plan and add it to the timelist', async () => {
       await createPlanFromJSON(page, {
         name: 'Test Plan',
-        json: examplePlanSmall1,
+        json: testPlan,
         parent: timelist.uuid
       });
-      const groups = Object.keys(examplePlanSmall1);
-      const firstGroupKey = groups[0];
-      const firstGroupItems = examplePlanSmall1[firstGroupKey];
-      const firstActivity = firstGroupItems[0];
-      const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-      const startBound = firstActivity.start;
-      const endBound = lastActivity.end;
+
+      const startBound = testPlan.TEST_GROUP[0].start;
+      const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
 
       // Switch to fixed time mode with all plan events within the bounds
       await page.goto(
@@ -66,7 +118,7 @@ test.describe('Time List', () => {
       // Verify all events are displayed
       const eventCount = await page.getByRole('row').count();
       // subtracting one for the header
-      await expect(eventCount - 1).toEqual(firstGroupItems.length);
+      await expect(eventCount - 1).toEqual(testPlan.TEST_GROUP.length);
     });
 
     await test.step('Does not show milliseconds in times', async () => {
@@ -79,86 +131,164 @@ test.describe('Time List', () => {
       await expect(row.locator('.--end')).not.toContainText('.');
       await expect(row.locator('.--duration')).not.toContainText('.');
     });
+  });
+});
 
-    await test.step('Shows activity properties when a row is selected', async () => {
-      await page.getByRole('row').nth(2).click();
+/**
+ * The regular expression used to parse the countdown string.
+ * Some examples of valid Countdown strings:
+ * ```
+ * '35D 02:03:04'
+ * '-1D 01:02:03'
+ * '01:02:03'
+ * '-05:06:07'
+ * ```
+ */
+const COUNTDOWN_REGEXP = /(-)?(\d+D\s)?(\d{2}):(\d{2}):(\d{2})/;
 
-      // Find the activity state section in the inspector
-      await page.getByRole('tab', { name: 'Activity' }).click();
-      // Check that activity state label is displayed in the inspector.
-      await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-        'Not started'
+/**
+ * @typedef {Object} CountdownObject
+ * @property {string} sign - The sign of the countdown ('-' if the countdown is negative, otherwise undefined).
+ * @property {string} days - The number of days in the countdown (undefined if there are no days).
+ * @property {string} hours - The number of hours in the countdown.
+ * @property {string} minutes - The number of minutes in the countdown.
+ * @property {string} seconds - The number of seconds in the countdown.
+ * @property {string} toString - The countdown string.
+ */
+
+/**
+ * Object representing the indices of the capture groups in a countdown regex match.
+ *
+ * @typedef {{ SIGN: number, DAYS: number, HOURS: number, MINUTES: number, SECONDS: number, REGEXP: RegExp }}
+ * @property {number} SIGN - The index for the sign capture group (1 if a '-' sign is present, otherwise undefined).
+ * @property {number} DAYS - The index for the days capture group (2 for the number of days, otherwise undefined).
+ * @property {number} HOURS - The index for the hours capture group (3 for the hour part of the time).
+ * @property {number} MINUTES - The index for the minutes capture group (4 for the minute part of the time).
+ * @property {number} SECONDS - The index for the seconds capture group (5 for the second part of the time).
+ */
+const COUNTDOWN = Object.freeze({
+  SIGN: 1,
+  DAYS: 2,
+  HOURS: 3,
+  MINUTES: 4,
+  SECONDS: 5
+});
+
+test.describe('Time List with controlled clock', () => {
+  test.use({
+    clockOptions: {
+      now: getEarliestStartTime(examplePlanSmall3),
+      shouldAdvanceTime: true
+    }
+  });
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+  test('Time List shows current events and counts down correctly in real-time mode', async ({
+    page
+  }) => {
+    await test.step('Create a Time List, add a Plan to it, and switch to real-time mode', async () => {
+      // Create Time List
+      const timelist = await createDomainObjectWithDefaults(page, {
+        type: 'Time List'
+      });
+
+      // Create a Plan with events that count down and up.
+      // Add it as a child to the Time List.
+      await createPlanFromJSON(page, {
+        json: examplePlanSmall3,
+        parent: timelist.uuid
+      });
+
+      // Navigate to the Time List in real-time mode
+      await page.goto(
+        `${timelist.url}?tc.mode=local&tc.startDelta=900000&tc.endDelta=1800000&tc.timeSystem=utc&view=grid`
       );
     });
+
+    const countUpCells = [
+      getCellByIndex(page, 1, TIME_TO_FROM_COLUMN),
+      getCellByIndex(page, 2, TIME_TO_FROM_COLUMN)
+    ];
+    const countdownCells = [
+      getCellByIndex(page, 3, TIME_TO_FROM_COLUMN),
+      getCellByIndex(page, 4, TIME_TO_FROM_COLUMN)
+    ];
+
+    // Verify that the countdown cells are counting down
+    for (let i = 0; i < countdownCells.length; i++) {
+      await test.step(`Countdown cell ${i + 1} counts down`, async () => {
+        const countdownCell = countdownCells[i];
+        // Get the initial countdown timestamp object
+        const beforeCountdown = await getAndAssertCountdownObject(page, i + 3);
+        // Wait until it changes
+        await expect(countdownCell).not.toHaveText(beforeCountdown.toString());
+        // Get the new countdown timestamp object
+        const afterCountdown = await getAndAssertCountdownObject(page, i + 3);
+        // Verify that the new countdown timestamp object is less than the old one
+        expect(Number(afterCountdown.seconds)).toBeLessThan(Number(beforeCountdown.seconds));
+      });
+    }
+
+    // Verify that the count-up cells are counting up
+    for (let i = 0; i < countUpCells.length; i++) {
+      await test.step(`Count-up cell ${i + 1} counts up`, async () => {
+        const countdownCell = countUpCells[i];
+        // Get the initial count-up timestamp object
+        const beforeCountdown = await getAndAssertCountdownObject(page, i + 1);
+        // Wait until it changes
+        await expect(countdownCell).not.toHaveText(beforeCountdown.toString());
+        // Get the new count-up timestamp object
+        const afterCountdown = await getAndAssertCountdownObject(page, i + 1);
+        // Verify that the new count-up timestamp object is greater than the old one
+        expect(Number(afterCountdown.seconds)).toBeGreaterThan(Number(beforeCountdown.seconds));
+      });
+    }
   });
 });
 
-test("View a timelist in expanded view, verify all the activities are displayed and selecting an activity shows it's properties", async ({
-  page
-}) => {
-  // Goto baseURL
-  await page.goto('./', { waitUntil: 'domcontentloaded' });
+/**
+ * Get the cell at the given row and column indices.
+ * @param {import('@playwright/test').Page} page
+ * @param {number} rowIndex
+ * @param {number} columnIndex
+ * @returns {import('@playwright/test').Locator} cell
+ */
+function getCellByIndex(page, rowIndex, columnIndex) {
+  return page.getByRole('cell').nth(rowIndex * NUM_COLUMNS + columnIndex);
+}
 
-  const timelist = await test.step('Create a Time List', async () => {
-    const createdTimeList = await createDomainObjectWithDefaults(page, { type: 'Time List' });
-    const objectName = await page.locator('.l-browse-bar__object-name').innerText();
-    expect(objectName).toBe(createdTimeList.name);
+/**
+ * Return the innerText of the cell at the given row and column indices.
+ * @param {import('@playwright/test').Page} page
+ * @param {number} rowIndex
+ * @param {number} columnIndex
+ * @returns {Promise<string>} text
+ */
+async function getCellTextByIndex(page, rowIndex, columnIndex) {
+  const text = await getCellByIndex(page, rowIndex, columnIndex).innerText();
+  return text;
+}
 
-    return createdTimeList;
-  });
+/**
+ * Get the text from the countdown cell in the given row, assert that it matches the countdown
+ * regex, and return an object representing the countdown.
+ * @param {import('@playwright/test').Page} page
+ * @param {number} rowIndex the row index
+ * @returns {Promise<CountdownObject>} countdownObject
+ */
+async function getAndAssertCountdownObject(page, rowIndex) {
+  const timeToFrom = await getCellTextByIndex(page, HEADER_ROW + rowIndex, TIME_TO_FROM_COLUMN);
 
-  await test.step('Create a Plan and add it to the timelist', async () => {
-    await createPlanFromJSON(page, {
-      name: 'Test Plan',
-      json: examplePlanSmall1,
-      parent: timelist.uuid
-    });
+  expect(timeToFrom).toMatch(COUNTDOWN_REGEXP);
+  const match = timeToFrom.match(COUNTDOWN_REGEXP);
 
-    // Ensure that all activities are shown in the expanded view
-    const groups = Object.keys(examplePlanSmall1);
-    const firstGroupKey = groups[0];
-    const firstGroupItems = examplePlanSmall1[firstGroupKey];
-    const firstActivity = firstGroupItems[0];
-    const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-    const startBound = firstActivity.start;
-    const endBound = lastActivity.end;
-
-    // Switch to fixed time mode with all plan events within the bounds
-    await page.goto(
-      `${timelist.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=timelist.view`
-    );
-
-    // Change the object to edit mode
-    await page.getByRole('button', { name: 'Edit Object' }).click();
-
-    // Find the display properties section in the inspector
-    await page.getByRole('tab', { name: 'View Properties' }).click();
-    // Switch to expanded view and save the setting
-    await page.getByLabel('Display Style').selectOption({ label: 'Expanded' });
-
-    // Click on the "Save" button
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
-    // Verify all events are displayed
-    const eventCount = await page.getByRole('row').count();
-    await expect(eventCount).toEqual(firstGroupItems.length);
-  });
-
-  await test.step('Shows activity properties when a row is selected in the expanded view', async () => {
-    await page.getByRole('row').nth(2).click();
-
-    // Find the activity state section in the inspector
-    await page.getByRole('tab', { name: 'Activity' }).click();
-    // Check that activity state label is displayed in the inspector.
-    await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-      'Not started'
-    );
-  });
-
-  await test.step("Verify absence of progress indication for an activity that's not in progress", async () => {
-    // When an activity is not in progress, the progress pie is not visible
-    const hidden = await page.getByRole('row').locator('path').nth(1).isHidden();
-    await expect(hidden).toBe(true);
-  });
-});
+  return {
+    sign: match[COUNTDOWN.SIGN],
+    days: match[COUNTDOWN.DAYS],
+    hours: match[COUNTDOWN.HOURS],
+    minutes: match[COUNTDOWN.MINUTES],
+    seconds: match[COUNTDOWN.SECONDS],
+    toString: () => timeToFrom
+  };
+}

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

@@ -1,290 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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.
- *****************************************************************************/
-
-/*
-Collection of Time List tests set to run with browser clock manipulate made possible with the
-clockOptions plugin fixture.
-*/
-
-import fs from 'fs';
-
-import { createDomainObjectWithDefaults, createPlanFromJSON } from '../../../appActions.js';
-import {
-  createTimelistWithPlanAndSetActivityInProgress,
-  getEarliestStartTime,
-  getFirstActivity
-} from '../../../helper/planningUtils';
-import { expect, test } from '../../../pluginFixtures.js';
-
-const examplePlanSmall3 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small3.json', import.meta.url)
-  )
-);
-
-const examplePlanSmall1 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small1.json', import.meta.url)
-  )
-);
-
-const TIME_TO_FROM_COLUMN = 2;
-const HEADER_ROW = 0;
-const NUM_COLUMNS = 5;
-const FULL_CIRCLE_PATH =
-  'M3.061616997868383e-15,-50A50,50,0,1,1,-3.061616997868383e-15,50A50,50,0,1,1,3.061616997868383e-15,-50Z';
-
-/**
- * The regular expression used to parse the countdown string.
- * Some examples of valid Countdown strings:
- * ```
- * '35D 02:03:04'
- * '-1D 01:02:03'
- * '01:02:03'
- * '-05:06:07'
- * ```
- */
-const COUNTDOWN_REGEXP = /(-)?(\d+D\s)?(\d{2}):(\d{2}):(\d{2})/;
-
-/**
- * @typedef {Object} CountdownOrUpObject
- * @property {string} sign - The sign of the countdown ('-' if the countdown is negative, '+' otherwise).
- * @property {string} days - The number of days in the countdown (undefined if there are no days).
- * @property {string} hours - The number of hours in the countdown.
- * @property {string} minutes - The number of minutes in the countdown.
- * @property {string} seconds - The number of seconds in the countdown.
- * @property {string} toString - The countdown string.
- */
-
-/**
- * Object representing the indices of the capture groups in a countdown regex match.
- *
- * @typedef {{ SIGN: number, DAYS: number, HOURS: number, MINUTES: number, SECONDS: number, REGEXP: RegExp }}
- * @property {number} SIGN - The index for the sign capture group (1 if a '-' sign is present, otherwise undefined).
- * @property {number} DAYS - The index for the days capture group (2 for the number of days, otherwise undefined).
- * @property {number} HOURS - The index for the hours capture group (3 for the hour part of the time).
- * @property {number} MINUTES - The index for the minutes capture group (4 for the minute part of the time).
- * @property {number} SECONDS - The index for the seconds capture group (5 for the second part of the time).
- */
-const COUNTDOWN = Object.freeze({
-  SIGN: 1,
-  DAYS: 2,
-  HOURS: 3,
-  MINUTES: 4,
-  SECONDS: 5
-});
-
-test.describe('Time List with controlled clock @clock', () => {
-  test.use({
-    clockOptions: {
-      now: getEarliestStartTime(examplePlanSmall3),
-      shouldAdvanceTime: true
-    }
-  });
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    // Create Time List
-    const timelist = await createDomainObjectWithDefaults(page, {
-      type: 'Time List'
-    });
-
-    // Create a Plan with events that count down and up.
-    // Add it as a child to the Time List.
-    await createPlanFromJSON(page, {
-      json: examplePlanSmall3,
-      parent: timelist.uuid
-    });
-
-    // Navigate to the Time List in real-time mode
-    await page.goto(
-      `${timelist.url}?tc.mode=local&tc.startDelta=900000&tc.endDelta=1800000&tc.timeSystem=utc&view=grid`
-    );
-
-    //Expand the viewport to show the entire time list
-    await page.getByLabel('Collapse Inspect Pane').click();
-    await page.getByLabel('Collapse Browse Pane').click();
-  });
-  test('Time List shows current events and counts down correctly in real-time mode', async ({
-    page
-  }) => {
-    const countUpCells = [
-      getTimeListCellByIndex(page, 1, TIME_TO_FROM_COLUMN),
-      getTimeListCellByIndex(page, 2, TIME_TO_FROM_COLUMN)
-    ];
-    const countdownCells = [
-      getTimeListCellByIndex(page, 3, TIME_TO_FROM_COLUMN),
-      getTimeListCellByIndex(page, 4, TIME_TO_FROM_COLUMN)
-    ];
-
-    // Verify that the countdown cells are counting down
-    for (let i = 0; i < countdownCells.length; i++) {
-      await test.step(`Countdown cell ${i + 1} counts down`, async () => {
-        const countdownCell = countdownCells[i];
-        // Get the initial countdown timestamp object
-        const beforeCountdown = await getAndAssertCountdownOrUpObject(page, i + 3);
-        // should not have a '-' sign
-        await expect(countdownCell).not.toHaveText('-');
-        // Wait until it changes
-        await expect(countdownCell).not.toHaveText(beforeCountdown.toString());
-        // Get the new countdown timestamp object
-        const afterCountdown = await getAndAssertCountdownOrUpObject(page, i + 3);
-        // Verify that the new countdown timestamp object is less than the old one
-        expect(Number(afterCountdown.seconds)).toBeLessThan(Number(beforeCountdown.seconds));
-      });
-    }
-
-    // Verify that the count-up cells are counting up
-    for (let i = 0; i < countUpCells.length; i++) {
-      await test.step(`Count-up cell ${i + 1} counts up`, async () => {
-        const countUpCell = countUpCells[i];
-        // Get the initial count-up timestamp object
-        const beforeCountUp = await getAndAssertCountdownOrUpObject(page, i + 1);
-        // should not have a '+' sign
-        await expect(countUpCell).not.toHaveText('+');
-        // Wait until it changes
-        await expect(countUpCell).not.toHaveText(beforeCountUp.toString());
-        // Get the new count-up timestamp object
-        const afterCountUp = await getAndAssertCountdownOrUpObject(page, i + 1);
-        // Verify that the new count-up timestamp object is greater than the old one
-        expect(Number(afterCountUp.seconds)).toBeGreaterThan(Number(beforeCountUp.seconds));
-      });
-    }
-  });
-});
-
-test.describe('Activity progress when activity is in the future @clock', () => {
-  const firstActivity = getFirstActivity(examplePlanSmall1);
-
-  test.use({
-    clockOptions: {
-      now: firstActivity.start - 1,
-      shouldAdvanceTime: true
-    }
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
-  });
-
-  test('progress pie is empty', async ({ page }) => {
-    const anActivity = page.getByRole('row').nth(0);
-    // Progress pie shows no progress when now is less than the start time
-    await expect(anActivity.getByLabel('Activity in progress').locator('path')).not.toHaveAttribute(
-      'd'
-    );
-  });
-});
-
-test.describe('Activity progress when now is between start and end of the activity @clock', () => {
-  const firstActivity = getFirstActivity(examplePlanSmall1);
-  test.beforeEach(async ({ page }) => {
-    await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
-  });
-
-  test.use({
-    clockOptions: {
-      now: firstActivity.start + 50000,
-      shouldAdvanceTime: true
-    }
-  });
-
-  test('progress pie is partially filled', async ({ page }) => {
-    const anActivity = page.getByRole('row').nth(0);
-    const pathElement = anActivity.getByLabel('Activity in progress').locator('path');
-    // Progress pie shows progress when now is greater than the start time
-    await expect(pathElement).toHaveAttribute('d');
-  });
-});
-
-test.describe('Activity progress when now is after end of the activity @clock', () => {
-  const firstActivity = getFirstActivity(examplePlanSmall1);
-
-  test.use({
-    clockOptions: {
-      now: firstActivity.end + 10000,
-      shouldAdvanceTime: true
-    }
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
-  });
-
-  test('progress pie is full', async ({ page }) => {
-    const anActivity = page.getByRole('row').nth(0);
-    // Progress pie is completely full and doesn't update if now is greater than the end time
-    await expect(anActivity.getByLabel('Activity in progress').locator('path')).toHaveAttribute(
-      'd',
-      FULL_CIRCLE_PATH
-    );
-  });
-});
-
-/**
- * Get the cell at the given row and column indices.
- * @param {import('@playwright/test').Page} page
- * @param {number} rowIndex
- * @param {number} columnIndex
- * @returns {import('@playwright/test').Locator} cell
- */
-function getTimeListCellByIndex(page, rowIndex, columnIndex) {
-  return page.getByRole('cell').nth(rowIndex * NUM_COLUMNS + columnIndex);
-}
-
-/**
- * Return the innerText of the cell at the given row and column indices.
- * @param {import('@playwright/test').Page} page
- * @param {number} rowIndex
- * @param {number} columnIndex
- * @returns {Promise<string>} text
- */
-async function getTimeListCellTextByIndex(page, rowIndex, columnIndex) {
-  const text = await getTimeListCellByIndex(page, rowIndex, columnIndex).innerText();
-  return text;
-}
-
-/**
- * Get the text from the countdown (or countup) cell in the given row, assert that it matches the countdown/countup
- * regex, and return an object representing the countdown.
- * @param {import('@playwright/test').Page} page
- * @param {number} rowIndex the row index
- * @returns {Promise<CountdownOrUpObject>} The countdown (or countup) object
- */
-async function getAndAssertCountdownOrUpObject(page, rowIndex) {
-  const timeToFrom = await getTimeListCellTextByIndex(
-    page,
-    HEADER_ROW + rowIndex,
-    TIME_TO_FROM_COLUMN
-  );
-
-  expect(timeToFrom).toMatch(COUNTDOWN_REGEXP);
-  const match = timeToFrom.match(COUNTDOWN_REGEXP);
-
-  return {
-    sign: match[COUNTDOWN.SIGN],
-    days: match[COUNTDOWN.DAYS],
-    hours: match[COUNTDOWN.HOURS],
-    minutes: match[COUNTDOWN.MINUTES],
-    seconds: match[COUNTDOWN.SECONDS],
-    toString: () => timeToFrom
-  };
-}

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

@@ -131,10 +131,7 @@ test.describe('Time Strip', () => {
       const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
       const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
 
-      await setIndependentTimeConductorBounds(page, {
-        start: startBoundString,
-        end: endBoundString
-      });
+      await setIndependentTimeConductorBounds(page, startBoundString, endBoundString);
       expect(await activityBounds.count()).toEqual(1);
     });
 
@@ -163,10 +160,7 @@ test.describe('Time Strip', () => {
       const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
       const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
 
-      await setIndependentTimeConductorBounds(page, {
-        start: startBoundString,
-        end: endBoundString
-      });
+      await setIndependentTimeConductorBounds(page, startBoundString, endBoundString);
 
       // Verify that two events are displayed
       expect(await activityBounds.count()).toEqual(2);

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

@@ -35,7 +35,7 @@ import { expect, test } from '../../../../pluginFixtures.js';
 
 let conditionSetUrl;
 
-test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () => {
+test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
   test.beforeAll(async ({ browser }) => {
     //TODO: This needs to be refactored
     const context = await browser.newContext();
@@ -68,35 +68,30 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
   });
 
   //Begin suite of tests again localStorage
-  test.fixme(
-    'Condition set object properties persist in main view and inspector @localStorage',
-    async ({ page }) => {
-      test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/7421'
-      });
-      //Navigate to baseURL with injected localStorage
-      await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
+  test('Condition set object properties persist in main view and inspector @localStorage', async ({
+    page
+  }) => {
+    //Navigate to baseURL with injected localStorage
+    await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
 
-      //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
-      await expect
-        .soft(page.locator('.l-browse-bar__object-name'))
-        .toContainText('Unnamed Condition Set');
+    //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');
 
-      //Assertions on loaded Condition Set in Inspector
-      expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
+    //Assertions on loaded Condition Set in Inspector
+    expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
 
-      //Reload Page
-      await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);
+    //Reload Page
+    await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);
 
-      //Re-verify after reload
-      await expect
-        .soft(page.locator('.l-browse-bar__object-name'))
-        .toContainText('Unnamed Condition Set');
-      //Assertions on loaded Condition Set in Inspector
-      expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
-    }
-  );
+    //Re-verify after reload
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');
+    //Assertions on loaded Condition Set in Inspector
+    expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
+  });
   test('condition set object can be modified on @localStorage', async ({ page, openmctConfig }) => {
     const { myItemsFolderName } = openmctConfig;
 
@@ -286,29 +281,19 @@ test.describe('Basic Condition Set Use', () => {
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
-    await page.getByLabel('Open the View Switcher Menu').click();
+    await page.click('button[title="Change the current view"]');
 
     await expect(page.getByRole('menuitem', { name: /Lad Table/ })).toBeHidden();
     await expect(page.getByRole('menuitem', { name: /Conditions View/ })).toBeVisible();
     await expect(page.getByRole('menuitem', { name: /Plot/ })).toBeVisible();
     await expect(page.getByRole('menuitem', { name: /Telemetry Table/ })).toBeVisible();
-    await page.getByLabel('Plot').click();
-    await expect(
-      page.getByLabel('Plot Legend Collapsed').getByText('Test Condition Set')
-    ).toBeVisible();
-    await page.getByLabel('Open the View Switcher Menu').click();
-    await page.getByLabel('Telemetry Table').click();
-    await expect(page.getByRole('searchbox', { name: 'output filter input' })).toBeVisible();
-    await page.getByLabel('Open the View Switcher Menu').click();
-    await page.getByLabel('Conditions View').click();
-    await expect(page.getByText('Current Output')).toBeVisible();
   });
   test('ConditionSet has correct outputs when telemetry is and is not available', async ({
     page
   }) => {
     const exampleTelemetry = await createExampleTelemetryObject(page);
 
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
     await page.goto(conditionSet.url);
     // Change the object to edit mode
     await page.getByLabel('Edit Object').click();
@@ -388,90 +373,4 @@ test.describe('Basic Condition Set Use', () => {
     await page.goto(conditionSet.url);
     await expect(outputValue).toHaveText('---');
   });
-
-  test('ConditionSet has correct outputs when test data is enabled', async ({ page }) => {
-    const exampleTelemetry = await createExampleTelemetryObject(page);
-
-    await page.getByLabel('Show selected item in tree').click();
-    await page.goto(conditionSet.url);
-    // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
-
-    // Create two conditions
-    await page.locator('#addCondition').click();
-    await page.locator('#addCondition').click();
-    await page.locator('#conditionCollection').getByRole('textbox').nth(0).fill('First Condition');
-    await page.locator('#conditionCollection').getByRole('textbox').nth(1).fill('Second Condition');
-
-    // Add Telemetry to ConditionSet
-    const sineWaveGeneratorTreeItem = page
-      .getByRole('tree', {
-        name: 'Main Tree'
-      })
-      .getByRole('treeitem', {
-        name: exampleTelemetry.name
-      });
-    const conditionCollection = page.locator('#conditionCollection');
-    await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
-
-    // Modify First Criterion
-    const firstCriterionTelemetry = page.locator(
-      '[aria-label="Criterion Telemetry Selection"] >> nth=0'
-    );
-    firstCriterionTelemetry.selectOption({ label: exampleTelemetry.name });
-    const firstCriterionMetadata = page.locator(
-      '[aria-label="Criterion Metadata Selection"] >> nth=0'
-    );
-    firstCriterionMetadata.selectOption({ label: 'Sine' });
-    const firstCriterionComparison = page.locator(
-      '[aria-label="Criterion Comparison Selection"] >> nth=0'
-    );
-    firstCriterionComparison.selectOption({ label: 'is greater than or equal to' });
-    const firstCriterionInput = page.locator('[aria-label="Criterion Input"] >> nth=0');
-    await firstCriterionInput.fill('0');
-
-    // Modify Second Criterion
-    const secondCriterionTelemetry = page.locator(
-      '[aria-label="Criterion Telemetry Selection"] >> nth=1'
-    );
-    await secondCriterionTelemetry.selectOption({ label: exampleTelemetry.name });
-
-    const secondCriterionMetadata = page.locator(
-      '[aria-label="Criterion Metadata Selection"] >> nth=1'
-    );
-    await secondCriterionMetadata.selectOption({ label: 'Sine' });
-
-    const secondCriterionComparison = page.locator(
-      '[aria-label="Criterion Comparison Selection"] >> nth=1'
-    );
-    await secondCriterionComparison.selectOption({ label: 'is less than' });
-
-    const secondCriterionInput = page.locator('[aria-label="Criterion Input"] >> nth=1');
-    await secondCriterionInput.fill('0');
-
-    // Enable test data
-    await page.getByLabel('Apply Test Data').nth(1).click();
-    const testDataTelemetry = page.locator('[aria-label="Test Data Telemetry Selection"] >> nth=0');
-    await testDataTelemetry.selectOption({ label: exampleTelemetry.name });
-
-    const testDataMetadata = page.locator('[aria-label="Test Data Metadata Selection"] >> nth=0');
-    await testDataMetadata.selectOption({ label: 'Sine' });
-
-    const testInput = page.locator('[aria-label="Test Data Input"] >> nth=0');
-    await testInput.fill('0');
-
-    // Validate that the condition set is evaluating and outputting
-    // the correct value when the underlying telemetry subscription is active.
-    let outputValue = page.locator('[aria-label="Current Output Value"]');
-    await expect(outputValue).toHaveText('false');
-
-    await page.goto(exampleTelemetry.url);
-  });
-
-  test.fixme('Ensure condition sets work with telemetry like operator status', ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7484'
-    });
-  });
 });

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

@@ -23,7 +23,6 @@ import { fileURLToPath } from 'url';
 
 import {
   createDomainObjectWithDefaults,
-  navigateToObjectWithFixedTimeBounds,
   setFixedTimeMode,
   setIndependentTimeConductorBounds,
   setRealTimeMode,
@@ -31,120 +30,12 @@ import {
 } from '../../../../appActions.js';
 import { expect, test } from '../../../../pluginFixtures.js';
 
-const CHILD_LAYOUT_STORAGE_STATE_PATH = fileURLToPath(
+const LOCALSTORAGE_PATH = fileURLToPath(
   new URL('../../../../test-data/display_layout_with_child_layouts.json', import.meta.url)
 );
-const CHILD_PLOT_STORAGE_STATE_PATH = fileURLToPath(
-  new URL('../../../../test-data/display_layout_with_child_overlay_plot.json', import.meta.url)
-);
 const TINY_IMAGE_BASE64 =
   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII';
 
-test.describe('Display Layout Sub-object Actions @localStorage', () => {
-  const INIT_ITC_START_BOUNDS = '2024-11-12 19:11:11.000Z';
-  const INIT_ITC_END_BOUNDS = '2024-11-12 20:11:11.000Z';
-  const NEW_GLOBAL_START_BOUNDS = '2024-11-11 19:11:11.000Z';
-  const NEW_GLOBAL_END_BOUNDS = '2024-11-11 20:11:11.000Z';
-
-  test.use({
-    storageState: CHILD_PLOT_STORAGE_STATE_PATH
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await page.getByLabel('Expand My Items folder').click();
-    const waitForMyItemsNavigation = page.waitForURL(`**/mine/?*`);
-    await page
-      .getByLabel('Main Tree')
-      .getByLabel('Navigate to Parent Display Layout layout Object')
-      .click();
-    // Wait for the URL to change to the display layout
-    await waitForMyItemsNavigation;
-  });
-  test('Open in New Tab action preserves time bounds @2p', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7524'
-    });
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/6982'
-    });
-
-    const TEST_FIXED_START_TIME = 1731352271000; // 2024-11-11 19:11:11.000Z
-    const TEST_FIXED_END_TIME = TEST_FIXED_START_TIME + 3600000; // 2024-11-11 20:11:11.000Z
-
-    // Verify the ITC has the expected initial bounds
-    expect(
-      await page
-        .getByLabel('Child Overlay Plot 1 Frame Controls')
-        .getByLabel('Start bounds')
-        .textContent()
-    ).toEqual(INIT_ITC_START_BOUNDS);
-    expect(
-      await page
-        .getByLabel('Child Overlay Plot 1 Frame Controls')
-        .getByLabel('End bounds')
-        .textContent()
-    ).toEqual(INIT_ITC_END_BOUNDS);
-
-    // Update the global fixed bounds to 2024-11-11 19:11:11.000Z / 2024-11-11 20:11:11.000Z
-    const url = page.url().split('?')[0];
-    await navigateToObjectWithFixedTimeBounds(
-      page,
-      url,
-      TEST_FIXED_START_TIME,
-      TEST_FIXED_END_TIME
-    );
-
-    // ITC bounds should still match the initial ITC bounds
-    expect(
-      await page
-        .getByLabel('Child Overlay Plot 1 Frame Controls')
-        .getByLabel('Start bounds')
-        .textContent()
-    ).toEqual(INIT_ITC_START_BOUNDS);
-    expect(
-      await page
-        .getByLabel('Child Overlay Plot 1 Frame Controls')
-        .getByLabel('End bounds')
-        .textContent()
-    ).toEqual(INIT_ITC_END_BOUNDS);
-
-    // Open the Child Overlay Plot 1 in a new tab
-    await page.getByLabel('View menu items').click();
-    const pagePromise = page.context().waitForEvent('page');
-    await page.getByLabel('Open In New Tab').click();
-
-    const newPage = await pagePromise;
-    await newPage.waitForLoadState('domcontentloaded');
-
-    // Verify that the global time conductor bounds in the new page match the updated global bounds
-    expect(
-      await newPage.getByLabel('Global Time Conductor').getByLabel('Start bounds').textContent()
-    ).toEqual(NEW_GLOBAL_START_BOUNDS);
-    expect(
-      await newPage.getByLabel('Global Time Conductor').getByLabel('End bounds').textContent()
-    ).toEqual(NEW_GLOBAL_END_BOUNDS);
-
-    // Verify that the ITC is enabled in the new page
-    await expect(newPage.getByLabel('Disable Independent Time Conductor')).toBeVisible();
-    // Verify that the ITC bounds in the new page match the original ITC bounds
-    expect(
-      await newPage
-        .getByLabel('Independent Time Conductor Panel')
-        .getByLabel('Start bounds')
-        .textContent()
-    ).toEqual(INIT_ITC_START_BOUNDS);
-    expect(
-      await newPage
-        .getByLabel('Independent Time Conductor Panel')
-        .getByLabel('End bounds')
-        .textContent()
-    ).toEqual(INIT_ITC_END_BOUNDS);
-  });
-});
-
 test.describe('Display Layout Toolbar Actions @localStorage', () => {
   const PARENT_DISPLAY_LAYOUT_NAME = 'Parent Display Layout';
   const CHILD_DISPLAY_LAYOUT_NAME1 = 'Child Layout 1';
@@ -159,7 +50,7 @@ test.describe('Display Layout Toolbar Actions @localStorage', () => {
     await page.getByLabel('Edit Object').click();
   });
   test.use({
-    storageState: CHILD_LAYOUT_STORAGE_STATE_PATH
+    storageState: LOCALSTORAGE_PATH
   });
 
   test('can add/remove Text element to a single layout', async ({ page }) => {
@@ -270,13 +161,6 @@ test.describe('Display Layout', () => {
     const trimmedDisplayValue = displayLayoutValue.trim();
 
     expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
-
-    // ensure we can right click on the alpha-numeric widget and view historical data
-    await page.getByLabel(/Alpha-numeric telemetry value of.*/).click({
-      button: 'right'
-    });
-    await page.getByLabel('View Historical Data').click();
-    await expect(page.getByLabel('Plot Container Style Target')).toBeVisible();
   });
   test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({
     page
@@ -445,7 +329,7 @@ test.describe('Display Layout', () => {
 
     const startDate = '2021-12-30 01:01:00.000Z';
     const endDate = '2021-12-30 01:11:00.000Z';
-    await setIndependentTimeConductorBounds(page, { start: startDate, end: endDate });
+    await setIndependentTimeConductorBounds(page, startDate, endDate);
 
     // check image date
     await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();

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

@@ -20,46 +20,25 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {
-  acknowledgeFault,
-  acknowledgeMultipleFaults,
-  changeViewTo,
-  clearSearch,
-  enterSearchTerm,
-  getFault,
-  getFaultByName,
-  getFaultName,
-  getFaultNamespace,
-  getFaultResultCount,
-  getFaultSeverity,
-  getFaultTriggerTime,
-  getHighestSeverity,
-  getLowestSeverity,
-  navigateToFaultManagementWithExample,
-  navigateToFaultManagementWithoutExample,
-  selectFaultItem,
-  shelveFault,
-  shelveMultipleFaults,
-  sortFaultsBy
-} from '../../../../helper/faultUtils.js';
+import * as utils from '../../../../helper/faultUtils.js';
 import { expect, test } from '../../../../pluginFixtures.js';
 
 test.describe('The Fault Management Plugin using example faults', () => {
   test.beforeEach(async ({ page }) => {
-    await navigateToFaultManagementWithExample(page);
+    await utils.navigateToFaultManagementWithExample(page);
   });
 
-  test('Shows a criticality icon for every fault', async ({ page }) => {
+  test('Shows a criticality icon for every fault @unstable', async ({ page }) => {
     const faultCount = await page.locator('c-fault-mgmt__list').count();
     const criticalityIconCount = await page.locator('c-fault-mgmt__list-severity').count();
 
-    expect(faultCount).toEqual(criticalityIconCount);
+    expect.soft(faultCount).toEqual(criticalityIconCount);
   });
 
-  test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector', async ({
+  test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector @unstable', async ({
     page
   }) => {
-    await selectFaultItem(page, 1);
+    await utils.selectFaultItem(page, 1);
 
     await page.getByRole('tab', { name: 'Config' }).click();
     const selectedFaultName = await page
@@ -69,22 +48,22 @@ test.describe('The Fault Management Plugin using example faults', () => {
       .locator(`.c-inspector__properties >> :text("${selectedFaultName}")`)
       .count();
 
-    await expect(
-      page.locator('.c-faults-list-view-item-body > .c-fault-mgmt__list').first()
-    ).toHaveClass(/is-selected/);
-    expect(inspectorFaultNameCount).toEqual(1);
+    await expect
+      .soft(page.locator('.c-faults-list-view-item-body > .c-fault-mgmt__list').first())
+      .toHaveClass(/is-selected/);
+    expect.soft(inspectorFaultNameCount).toEqual(1);
   });
 
-  test('When selecting multiple faults, no specific fault information is shown in the inspector', async ({
+  test('When selecting multiple faults, no specific fault information is shown in the inspector @unstable', async ({
     page
   }) => {
-    await selectFaultItem(page, 1);
-    await selectFaultItem(page, 2);
+    await utils.selectFaultItem(page, 1);
+    await utils.selectFaultItem(page, 2);
 
     const selectedRows = page.locator(
       '.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname'
     );
-    expect(await selectedRows.count()).toEqual(2);
+    expect.soft(await selectedRows.count()).toEqual(2);
 
     await page.getByRole('tab', { name: 'Config' }).click();
     const firstSelectedFaultName = await selectedRows.nth(0).textContent();
@@ -96,180 +75,180 @@ test.describe('The Fault Management Plugin using example faults', () => {
       .locator(`.c-inspector__properties >> :text("${secondSelectedFaultName}")`)
       .count();
 
-    expect(firstNameInInspectorCount).toEqual(0);
-    expect(secondNameInInspectorCount).toEqual(0);
+    expect.soft(firstNameInInspectorCount).toEqual(0);
+    expect.soft(secondNameInInspectorCount).toEqual(0);
   });
 
-  test('Allows you to shelve a fault', async ({ page }) => {
-    const shelvedFaultName = await getFaultName(page, 2);
-    const beforeShelvedFault = getFaultByName(page, shelvedFaultName);
+  test('Allows you to shelve a fault @unstable', async ({ page }) => {
+    const shelvedFaultName = await utils.getFaultName(page, 2);
+    const beforeShelvedFault = utils.getFaultByName(page, shelvedFaultName);
 
-    await expect(beforeShelvedFault).toHaveCount(1);
+    expect.soft(await beforeShelvedFault.count()).toBe(1);
 
-    await shelveFault(page, 2);
+    await utils.shelveFault(page, 2);
 
     // check it is removed from standard view
-    const afterShelvedFault = getFaultByName(page, shelvedFaultName);
-    expect(await afterShelvedFault.count()).toBe(0);
+    const afterShelvedFault = utils.getFaultByName(page, shelvedFaultName);
+    expect.soft(await afterShelvedFault.count()).toBe(0);
 
-    await changeViewTo(page, 'shelved');
+    await utils.changeViewTo(page, 'shelved');
 
-    const shelvedViewFault = getFaultByName(page, shelvedFaultName);
+    const shelvedViewFault = utils.getFaultByName(page, shelvedFaultName);
 
-    expect(await shelvedViewFault.count()).toBe(1);
+    expect.soft(await shelvedViewFault.count()).toBe(1);
   });
 
-  test('Allows you to acknowledge a fault', async ({ page }) => {
-    const acknowledgedFaultName = await getFaultName(page, 3);
+  test('Allows you to acknowledge a fault @unstable', async ({ page }) => {
+    const acknowledgedFaultName = await utils.getFaultName(page, 3);
 
-    await acknowledgeFault(page, 3);
+    await utils.acknowledgeFault(page, 3);
 
-    const fault = getFault(page, 3);
-    await expect(fault).toHaveClass(/is-acknowledged/);
+    const fault = utils.getFault(page, 3);
+    await expect.soft(fault).toHaveClass(/is-acknowledged/);
 
-    await changeViewTo(page, 'acknowledged');
+    await utils.changeViewTo(page, 'acknowledged');
 
-    const acknowledgedViewFaultName = await getFaultName(page, 1);
-    expect(acknowledgedFaultName).toEqual(acknowledgedViewFaultName);
+    const acknowledgedViewFaultName = await utils.getFaultName(page, 1);
+    expect.soft(acknowledgedFaultName).toEqual(acknowledgedViewFaultName);
   });
 
-  test('Allows you to shelve multiple faults', async ({ page }) => {
-    const shelvedFaultNameOne = await getFaultName(page, 1);
-    const shelvedFaultNameFour = await getFaultName(page, 4);
+  test('Allows you to shelve multiple faults @unstable', async ({ page }) => {
+    const shelvedFaultNameOne = await utils.getFaultName(page, 1);
+    const shelvedFaultNameFour = await utils.getFaultName(page, 4);
 
-    const beforeShelvedFaultOne = getFaultByName(page, shelvedFaultNameOne);
-    const beforeShelvedFaultFour = getFaultByName(page, shelvedFaultNameFour);
+    const beforeShelvedFaultOne = utils.getFaultByName(page, shelvedFaultNameOne);
+    const beforeShelvedFaultFour = utils.getFaultByName(page, shelvedFaultNameFour);
 
-    await expect(beforeShelvedFaultOne).toHaveCount(1);
-    await expect(beforeShelvedFaultFour).toHaveCount(1);
+    expect.soft(await beforeShelvedFaultOne.count()).toBe(1);
+    expect.soft(await beforeShelvedFaultFour.count()).toBe(1);
 
-    await shelveMultipleFaults(page, 1, 4);
+    await utils.shelveMultipleFaults(page, 1, 4);
 
     // check it is removed from standard view
-    const afterShelvedFaultOne = getFaultByName(page, shelvedFaultNameOne);
-    const afterShelvedFaultFour = getFaultByName(page, shelvedFaultNameFour);
-    await expect(afterShelvedFaultOne).toHaveCount(0);
-    await expect(afterShelvedFaultFour).toHaveCount(0);
+    const afterShelvedFaultOne = utils.getFaultByName(page, shelvedFaultNameOne);
+    const afterShelvedFaultFour = utils.getFaultByName(page, shelvedFaultNameFour);
+    expect.soft(await afterShelvedFaultOne.count()).toBe(0);
+    expect.soft(await afterShelvedFaultFour.count()).toBe(0);
 
-    await changeViewTo(page, 'shelved');
+    await utils.changeViewTo(page, 'shelved');
 
-    const shelvedViewFaultOne = getFaultByName(page, shelvedFaultNameOne);
-    const shelvedViewFaultFour = getFaultByName(page, shelvedFaultNameFour);
+    const shelvedViewFaultOne = utils.getFaultByName(page, shelvedFaultNameOne);
+    const shelvedViewFaultFour = utils.getFaultByName(page, shelvedFaultNameFour);
 
-    await expect(shelvedViewFaultOne).toHaveCount(1);
-    await expect(shelvedViewFaultFour).toHaveCount(1);
+    expect.soft(await shelvedViewFaultOne.count()).toBe(1);
+    expect.soft(await shelvedViewFaultFour.count()).toBe(1);
   });
 
-  test('Allows you to acknowledge multiple faults', async ({ page }) => {
-    const acknowledgedFaultNameTwo = await getFaultName(page, 2);
-    const acknowledgedFaultNameFive = await getFaultName(page, 5);
+  test('Allows you to acknowledge multiple faults @unstable', async ({ page }) => {
+    const acknowledgedFaultNameTwo = await utils.getFaultName(page, 2);
+    const acknowledgedFaultNameFive = await utils.getFaultName(page, 5);
 
-    await acknowledgeMultipleFaults(page, 2, 5);
+    await utils.acknowledgeMultipleFaults(page, 2, 5);
 
-    const faultTwo = getFault(page, 2);
-    const faultFive = getFault(page, 5);
+    const faultTwo = utils.getFault(page, 2);
+    const faultFive = utils.getFault(page, 5);
 
     // check they have been acknowledged
-    await expect(faultTwo).toHaveClass(/is-acknowledged/);
-    await expect(faultFive).toHaveClass(/is-acknowledged/);
+    await expect.soft(faultTwo).toHaveClass(/is-acknowledged/);
+    await expect.soft(faultFive).toHaveClass(/is-acknowledged/);
 
-    await changeViewTo(page, 'acknowledged');
+    await utils.changeViewTo(page, 'acknowledged');
 
-    const acknowledgedViewFaultTwo = getFaultByName(page, acknowledgedFaultNameTwo);
-    const acknowledgedViewFaultFive = getFaultByName(page, acknowledgedFaultNameFive);
+    const acknowledgedViewFaultTwo = utils.getFaultByName(page, acknowledgedFaultNameTwo);
+    const acknowledgedViewFaultFive = utils.getFaultByName(page, acknowledgedFaultNameFive);
 
-    await expect(acknowledgedViewFaultTwo).toHaveCount(1);
-    await expect(acknowledgedViewFaultFive).toHaveCount(1);
+    expect.soft(await acknowledgedViewFaultTwo.count()).toBe(1);
+    expect.soft(await acknowledgedViewFaultFive.count()).toBe(1);
   });
 
-  test('Allows you to search faults', async ({ page }) => {
-    const faultThreeNamespace = await getFaultNamespace(page, 3);
-    const faultTwoName = await getFaultName(page, 2);
-    const faultFiveTriggerTime = await getFaultTriggerTime(page, 5);
+  test('Allows you to search faults @unstable', async ({ page }) => {
+    const faultThreeNamespace = await utils.getFaultNamespace(page, 3);
+    const faultTwoName = await utils.getFaultName(page, 2);
+    const faultFiveTriggerTime = await utils.getFaultTriggerTime(page, 5);
 
     // should be all faults (5)
-    let faultResultCount = await getFaultResultCount(page);
-    expect(faultResultCount).toEqual(5);
+    let faultResultCount = await utils.getFaultResultCount(page);
+    expect.soft(faultResultCount).toEqual(5);
 
     // search namespace
-    await enterSearchTerm(page, faultThreeNamespace);
+    await utils.enterSearchTerm(page, faultThreeNamespace);
 
-    faultResultCount = await getFaultResultCount(page);
-    expect(faultResultCount).toEqual(1);
-    expect(await getFaultNamespace(page, 1)).toEqual(faultThreeNamespace);
+    faultResultCount = await utils.getFaultResultCount(page);
+    expect.soft(faultResultCount).toEqual(1);
+    expect.soft(await utils.getFaultNamespace(page, 1)).toEqual(faultThreeNamespace);
 
     // all faults
-    await clearSearch(page);
-    faultResultCount = await getFaultResultCount(page);
-    expect(faultResultCount).toEqual(5);
+    await utils.clearSearch(page);
+    faultResultCount = await utils.getFaultResultCount(page);
+    expect.soft(faultResultCount).toEqual(5);
 
     // search name
-    await enterSearchTerm(page, faultTwoName);
+    await utils.enterSearchTerm(page, faultTwoName);
 
-    faultResultCount = await getFaultResultCount(page);
-    expect(faultResultCount).toEqual(1);
-    expect(await getFaultName(page, 1)).toEqual(faultTwoName);
+    faultResultCount = await utils.getFaultResultCount(page);
+    expect.soft(faultResultCount).toEqual(1);
+    expect.soft(await utils.getFaultName(page, 1)).toEqual(faultTwoName);
 
     // all faults
-    await clearSearch(page);
-    faultResultCount = await getFaultResultCount(page);
-    expect(faultResultCount).toEqual(5);
+    await utils.clearSearch(page);
+    faultResultCount = await utils.getFaultResultCount(page);
+    expect.soft(faultResultCount).toEqual(5);
 
     // search triggerTime
-    await enterSearchTerm(page, faultFiveTriggerTime);
+    await utils.enterSearchTerm(page, faultFiveTriggerTime);
 
-    faultResultCount = await getFaultResultCount(page);
-    expect(faultResultCount).toEqual(1);
-    expect(await getFaultTriggerTime(page, 1)).toEqual(faultFiveTriggerTime);
+    faultResultCount = await utils.getFaultResultCount(page);
+    expect.soft(faultResultCount).toEqual(1);
+    expect.soft(await utils.getFaultTriggerTime(page, 1)).toEqual(faultFiveTriggerTime);
   });
 
-  test('Allows you to sort faults', async ({ page }) => {
-    const highestSeverity = await getHighestSeverity(page);
-    const lowestSeverity = await getLowestSeverity(page);
+  test('Allows you to sort faults @unstable', async ({ page }) => {
+    const highestSeverity = await utils.getHighestSeverity(page);
+    const lowestSeverity = await utils.getLowestSeverity(page);
     const faultOneName = 'Example Fault 1';
     const faultFiveName = 'Example Fault 5';
-    let firstFaultName = await getFaultName(page, 1);
+    let firstFaultName = await utils.getFaultName(page, 1);
 
-    expect(firstFaultName).toEqual(faultOneName);
+    expect.soft(firstFaultName).toEqual(faultOneName);
 
-    await sortFaultsBy(page, 'oldest-first');
+    await utils.sortFaultsBy(page, 'oldest-first');
 
-    firstFaultName = await getFaultName(page, 1);
-    expect(firstFaultName).toEqual(faultFiveName);
+    firstFaultName = await utils.getFaultName(page, 1);
+    expect.soft(firstFaultName).toEqual(faultFiveName);
 
-    await sortFaultsBy(page, 'severity');
+    await utils.sortFaultsBy(page, 'severity');
 
-    const sortedHighestSeverity = await getFaultSeverity(page, 1);
-    const sortedLowestSeverity = await getFaultSeverity(page, 5);
-    expect(sortedHighestSeverity).toEqual(highestSeverity);
-    expect(sortedLowestSeverity).toEqual(lowestSeverity);
+    const sortedHighestSeverity = await utils.getFaultSeverity(page, 1);
+    const sortedLowestSeverity = await utils.getFaultSeverity(page, 5);
+    expect.soft(sortedHighestSeverity).toEqual(highestSeverity);
+    expect.soft(sortedLowestSeverity).toEqual(lowestSeverity);
   });
 });
 
 test.describe('The Fault Management Plugin without using example faults', () => {
   test.beforeEach(async ({ page }) => {
-    await navigateToFaultManagementWithoutExample(page);
+    await utils.navigateToFaultManagementWithoutExample(page);
   });
 
-  test('Shows no faults when no faults are provided', async ({ page }) => {
+  test('Shows no faults when no faults are provided @unstable', async ({ page }) => {
     const faultCount = await page.locator('c-fault-mgmt__list').count();
 
-    expect(faultCount).toEqual(0);
+    expect.soft(faultCount).toEqual(0);
 
-    await changeViewTo(page, 'acknowledged');
+    await utils.changeViewTo(page, 'acknowledged');
     const acknowledgedCount = await page.locator('c-fault-mgmt__list').count();
-    expect(acknowledgedCount).toEqual(0);
+    expect.soft(acknowledgedCount).toEqual(0);
 
-    await changeViewTo(page, 'shelved');
+    await utils.changeViewTo(page, 'shelved');
     const shelvedCount = await page.locator('c-fault-mgmt__list').count();
-    expect(shelvedCount).toEqual(0);
+    expect.soft(shelvedCount).toEqual(0);
   });
 
-  test('Will return no faults when searching', async ({ page }) => {
-    await enterSearchTerm(page, 'fault');
+  test('Will return no faults when searching @unstable', async ({ page }) => {
+    await utils.enterSearchTerm(page, 'fault');
 
     const faultCount = await page.locator('c-fault-mgmt__list').count();
 
-    expect(faultCount).toEqual(0);
+    expect.soft(faultCount).toEqual(0);
   });
 });

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

@@ -78,8 +78,8 @@ test.describe('Flexible Layout', () => {
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
     // Add the Sine Wave Generator and Clock to the Flexible Layout
-    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl-container.is-empty').first());
-    await clockTreeItem.dragTo(page.locator('.c-fl-container.is-empty'));
+    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
+    await clockTreeItem.dragTo(page.locator('.c-fl__container.is-empty'));
     // Check that panes can be dragged while Flexible Layout is in Edit mode
     let dragWrapper = page
       .locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper')
@@ -105,8 +105,8 @@ test.describe('Flexible Layout', () => {
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
     // Add the Sine Wave Generator and Clock to the Flexible Layout
-    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl-container.is-empty').first());
-    await clockTreeItem.dragTo(page.locator('.c-fl-container.is-empty'));
+    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
+    await clockTreeItem.dragTo(page.locator('.c-fl__container.is-empty'));
 
     // Click on the first frame to select it
     await page.locator('.c-fl-container__frame').first().click();
@@ -122,7 +122,7 @@ test.describe('Flexible Layout', () => {
     expect(await page.locator('.c-fl--rows').count()).toEqual(0);
 
     // Change the layout to rows orientation
-    await page.getByTitle('Switch to rows layout').click();
+    await page.getByTitle('Columns layout').click();
 
     // Assert the layout is in rows orientation
     expect(await page.locator('.c-fl--rows').count()).toBeGreaterThan(0);
@@ -171,7 +171,7 @@ test.describe('Flexible Layout', () => {
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
     // Add the Sine Wave Generator to the Flexible Layout and save changes
-    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl-container.is-empty').first());
+    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
@@ -202,7 +202,7 @@ test.describe('Flexible Layout', () => {
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
     // Add the Sine Wave Generator to the Flexible Layout and save changes
-    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl-container.is-empty').first());
+    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
@@ -242,16 +242,17 @@ test.describe('Flexible Layout', () => {
       name: new RegExp(exampleImageryObject.name)
     });
     // Add the Sine Wave Generator to the Flexible Layout and save changes
-    await exampleImageryTreeItem.dragTo(page.locator('.c-fl-container.is-empty').first());
+    await exampleImageryTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
 
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
     // flip on independent time conductor
-    await setIndependentTimeConductorBounds(page, {
-      start: '2021-12-30 01:01:00.000Z',
-      end: '2021-12-30 01:11:00.000Z'
-    });
+    await setIndependentTimeConductorBounds(
+      page,
+      '2021-12-30 01:01:00.000Z',
+      '2021-12-30 01:11:00.000Z'
+    );
 
     // check image date
     await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();
@@ -289,7 +290,7 @@ test.describe('Flexible Layout Toolbar Actions @localStorage', () => {
     await page.getByTitle('Add Container').click();
     expect(await containerHandles.count()).toEqual(3);
     await page.getByTitle('Remove Container').click();
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toContainText(
+    await expect(page.getByRole('dialog', { name: 'Overlay' })).toHaveText(
       'This action will permanently delete this container from this Flexible Layout. Do you want to continue?'
     );
     await page.getByRole('button', { name: 'OK', exact: true }).click();
@@ -299,7 +300,7 @@ test.describe('Flexible Layout Toolbar Actions @localStorage', () => {
     expect(await page.getByRole('group', { name: 'Frame' }).count()).toEqual(2);
     await page.getByRole('group', { name: 'Child Layout 1' }).click();
     await page.getByTitle('Remove Frame').click();
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toContainText(
+    await expect(page.getByRole('dialog', { name: 'Overlay' })).toHaveText(
       'This action will remove this frame from this Flexible Layout. Do you want to continue?'
     );
     await page.getByRole('button', { name: 'OK', exact: true }).click();
@@ -309,9 +310,9 @@ test.describe('Flexible Layout Toolbar Actions @localStorage', () => {
     await page.getByRole('columnheader', { name: 'Container Handle 1' }).click();
     const flexRows = page.getByLabel('Flexible Layout Row');
     expect(await flexRows.count()).toEqual(0);
-    await page.getByTitle('Switch to rows layout').click();
+    await page.getByTitle('Columns layout').click();
     expect(await flexRows.count()).toEqual(1);
-    await page.getByTitle('Switch to columns layout').click();
+    await page.getByTitle('Rows layout').click();
     expect(await flexRows.count()).toEqual(0);
   });
 });

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

@@ -136,11 +136,7 @@ test.describe('Gauge', () => {
     // TODO: Verify changes in the UI
   });
 
-  test.fixme('Gauge does not display NaN when data not available', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7421'
-    });
+  test('Gauge does not display NaN when data not available', async ({ page }) => {
     // Create a Gauge
     const gauge = await createDomainObjectWithDefaults(page, {
       type: 'Gauge'
@@ -175,13 +171,13 @@ test.describe('Gauge', () => {
     });
 
     // Try to create a Folder into the Gauge. Should be disallowed.
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.getByRole('button', { name: /Create/ }).click();
     await page.getByRole('menuitem', { name: /Folder/ }).click();
     await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
     await page.getByLabel('Cancel').click();
 
     // Try to create a Display Layout into the Gauge. Should be disallowed.
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.getByRole('button', { name: /Create/ }).click();
     await page.getByRole('menuitem', { name: /Display Layout/ }).click();
     await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
   });

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

@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding imagery,
 but only assume that example imagery is present.
 */
-
+/* globals process */
 import { createDomainObjectWithDefaults, setRealTimeMode } from '../../../../appActions.js';
 import { waitForAnimations } from '../../../../baseFixtures.js';
 import { expect, test } from '../../../../pluginFixtures.js';
@@ -363,7 +363,7 @@ test.describe('Example Imagery in Display Layout', () => {
     await page.locator('li[title="View Large"]').click();
     await expect(pausePlayButton).toHaveClass(/is-paused/);
 
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.locator('[aria-label="Close"]').click();
     await expect.soft(pausePlayButton).not.toHaveClass(/is-paused/);
   });
 
@@ -386,7 +386,7 @@ test.describe('Example Imagery in Display Layout', () => {
     await page.locator('li[title="View Large"]').click();
     await expect(pausePlayButton).toHaveClass(/is-paused/);
 
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.locator('[aria-label="Close"]').click();
     await expect.soft(pausePlayButton).toHaveClass(/is-paused/);
   });
 
@@ -509,7 +509,7 @@ test.describe('Example Imagery in Flexible layout', () => {
     await page.getByRole('button', { name: 'Background Image', state: 'visible' });
 
     // Close the large view
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.getByLabel('Close').click();
   });
 
   test.beforeEach(async ({ page }) => {
@@ -773,7 +773,7 @@ async function dragContrastSliderAndAssertFilterValues(page) {
  * Gets the filter:brightness value of the current background-image and
  * asserts against an expected value
  * @param {import('@playwright/test').Page} page
- * @param {string} expected The expected brightness value
+ * @param {String} expected The expected brightness value
  */
 async function assertBackgroundImageBrightness(page, expected) {
   const backgroundImage = page.locator('.c-imagery__main-image__background-image');
@@ -938,7 +938,7 @@ async function buttonZoomOnImageAndAssert(page) {
  * Gets the filter:contrast value of the current background-image and
  * asserts against an expected value
  * @param {import('@playwright/test').Page} page
- * @param {string} expected The expected contrast value
+ * @param {String} expected The expected contrast value
  */
 async function assertBackgroundImageContrast(page, expected) {
   const backgroundImage = page.locator('.c-imagery__main-image__background-image');

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

@@ -27,6 +27,7 @@ import { expect, test } from '../../../../pluginFixtures.js';
 
 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: fileURLToPath(
         new URL('../../../../helper/addInitDataVisualization.js', import.meta.url)
@@ -36,8 +37,6 @@ test.describe('Testing numeric data with inspector data visualization (i.e., dat
   });
 
   test('Can click on telemetry and see data in inspector @2p', async ({ page, context }) => {
-    const initStartBounds = await page.getByLabel('Start bounds').textContent();
-    const initEndBounds = await page.getByLabel('End bounds').textContent();
     const exampleDataVisualizationSource = await createDomainObjectWithDefaults(page, {
       type: 'Example Data Visualization Source'
     });
@@ -79,9 +78,5 @@ test.describe('Testing numeric data with inspector data visualization (i.e., dat
     await newPage.waitForLoadState();
     // expect new tab title to contain 'Second Sine Wave Generator'
     await expect(newPage).toHaveTitle('Second Sine Wave Generator');
-
-    // Verify that "Open in New Tab" preserves the time bounds
-    expect(initStartBounds).toEqual(await newPage.getByLabel('Start bounds').textContent());
-    expect(initEndBounds).toEqual(await newPage.getByLabel('End bounds').textContent());
   });
 });

e2e/tests/functional/plugins/lad/ladTable.e2e.spec.js

@@ -1,86 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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 { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-test.describe('LAD Table', () => {
-  let ladTable;
-  let swg;
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-    ladTable = await createDomainObjectWithDefaults(page, {
-      type: 'LAD Table'
-    });
-
-    swg = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: ladTable.uuid
-    });
-
-    await page.goto(ladTable.url);
-  });
-
-  test('Ensure we have numbers in cells', async ({ page }) => {
-    // Wait for the initial value to show after mount
-    await expect(page.getByLabel('lad value').first()).not.toContainText('---');
-
-    const valueFromFirstSineWave = await page.getByLabel('lad value').first().innerText();
-    const firstSineWaveNumber = parseFloat(valueFromFirstSineWave);
-    // ensure we have a float value in the cell and it's finite
-    expect(Number.isFinite(firstSineWaveNumber)).toBeTruthy();
-
-    const valueFromSecondSineWave = await page.getByLabel('lad value').last().innerText();
-    const secondSineWaveNumber = parseFloat(valueFromSecondSineWave);
-    // ensure we have a float value in the cell and it's finite
-    expect(Number.isFinite(secondSineWaveNumber)).toBeTruthy();
-  });
-
-  test(
-    'Can remove telemetry from composition',
-    {
-      annotation: {
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/7633'
-      }
-    },
-    async ({ page }) => {
-      // Assert that the table is initially populated
-      await expect(page.getByLabel('lad row')).toHaveCount(1);
-
-      // Expand the tree so the SWG is visible
-      await page.getByLabel('Expand My Items').click();
-      await page.getByLabel('Expand LAD Table').click();
-
-      // Right-click the SWG treeitem context menu and click 'Remove' and confirm
-      await page.getByRole('treeitem', { name: swg.name }).click({ button: 'right' });
-      await page.getByRole('menuitem', { name: 'Remove' }).click();
-      await page.getByRole('button', { name: 'OK', exact: true }).click();
-
-      // Assert that the SWG is no longer in the tree and the table is empty
-      await expect(page.getByRole('treeitem', { name: swg.name })).toBeHidden();
-      await expect(page.getByLabel('lad row')).toHaveCount(0);
-    }
-  );
-});

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

@@ -27,7 +27,6 @@ This test suite is dedicated to tests which verify the basic operations surround
 import { fileURLToPath } from 'url';
 
 import { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import { copy, paste, selectAll } from '../../../../helper/hotkeys/hotkeys.js';
 import * as nbUtils from '../../../../helper/notebookUtils.js';
 import { expect, streamToString, test } from '../../../../pluginFixtures.js';
 
@@ -278,6 +277,7 @@ test.describe('Notebook entry tests', () => {
   // Create Notebook with URL Whitelist
   let notebookObject;
   test.beforeEach(async ({ page }) => {
+    // eslint-disable-next-line no-undef
     await page.addInitScript({
       path: fileURLToPath(new URL('../../../../helper/addInitNotebookWithUrls.js', import.meta.url))
     });
@@ -308,7 +308,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await page
       .getByRole('treeitem', { name: overlayPlot.name })
@@ -332,7 +332,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(page, 'Entry to drop into');
     await page
@@ -377,7 +377,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(page, `This should be a link: ${TEST_LINK} is it?`);
 
@@ -404,7 +404,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(page, `This should NOT be a link: ${TEST_LINK} is it?`);
 
@@ -421,7 +421,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(page, `This should NOT be a link: ${TEST_LINK} is it?`);
 
@@ -438,7 +438,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(page, `This should be a link: ${INVALID_TEST_LINK} is it?`);
 
@@ -455,7 +455,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(page, `This should be a link: ${TEST_LINK} is it?`);
 
@@ -483,7 +483,7 @@ test.describe('Notebook entry tests', () => {
     await page.goto(notebookObject.url);
 
     // Reveal the notebook in the tree
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     await nbUtils.enterTextEntry(
       page,
@@ -547,53 +547,4 @@ test.describe('Notebook entry tests', () => {
     );
     await expect(secondLineOfBlockquoteText).toBeVisible();
   });
-
-  /**
-   *  Paste into notebook entry tests
-   */
-  test('Can paste text into a notebook entry', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7686'
-    });
-    const TEST_TEXT = 'This is a test';
-    const iterations = 20;
-    const EXPECTED_TEXT = TEST_TEXT.repeat(iterations);
-
-    await page.goto(notebookObject.url);
-
-    await nbUtils.addNotebookEntry(page);
-    await nbUtils.enterTextInLastEntry(page, TEST_TEXT);
-    await selectAll(page);
-    await copy(page);
-    for (let i = 0; i < iterations; i++) {
-      await paste(page);
-    }
-    await nbUtils.commitEntry(page);
-
-    await expect(page.locator(`text="${EXPECTED_TEXT}"`)).toBeVisible();
-  });
-
-  test('Prevents pasting text into selected notebook entry if not editing', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7686'
-    });
-    const TEST_TEXT = 'This is a test';
-
-    await page.goto(notebookObject.url);
-
-    await nbUtils.addNotebookEntry(page);
-    await nbUtils.enterTextInLastEntry(page, TEST_TEXT);
-    await selectAll(page);
-    await copy(page);
-    await paste(page);
-    await nbUtils.commitEntry(page);
-
-    // This should not paste text into the entry
-    await paste(page);
-
-    await expect(await page.locator(`text="${TEST_TEXT.repeat(1)}"`).count()).toEqual(1);
-    await expect(await page.locator(`text="${TEST_TEXT.repeat(2)}"`).count()).toEqual(0);
-  });
 });

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

@@ -68,7 +68,7 @@ test.describe('Snapshot image tests', () => {
     // expect large image to be displayed
     await expect(page.getByRole('dialog').getByText('favicon-96x96.png')).toBeVisible();
 
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.getByLabel('Close').click();
 
     // drop another image onto the entry
     await page.dispatchEvent('.c-snapshots', 'drop', { dataTransfer: dropTransfer });

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

@@ -71,89 +71,42 @@ test.describe('Snapshot Container tests', () => {
   test.beforeEach(async ({ page }) => {
     //Navigate to baseURL
     await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await page.getByLabel('Open the Notebook Snapshot Menu').click();
+
+    // Create Notebook
+    // const notebook = await createDomainObjectWithDefaults(page, {
+    //     type: 'Notebook',
+    //     name: "Test Notebook"
+    // });
+    // // Create Overlay Plot
+    // const snapShotObject = await createDomainObjectWithDefaults(page, {
+    //     type: 'Overlay Plot',
+    //     name: "Dropped Overlay Plot"
+    // });
+
+    await page.getByLabel('Take a Notebook Snapshot').click();
     await page.getByRole('menuitem', { name: 'Save to Notebook Snapshots' }).click();
     await page.getByLabel('Show Snapshots').click();
   });
   test('A snapshot can be Quick Viewed from Container with 3 dot action menu', async ({ page }) => {
-    await page.getByLabel('My Items Notebook Embed').getByLabel('More actions').click();
+    await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More actions').click();
     await page.getByRole('menuitem', { name: 'Quick View' }).click();
-    await expect(page.getByLabel('Modal Overlay')).toBeVisible();
-    await expect(page.getByLabel('Preview Container')).toBeVisible();
-  });
-  test('A snapshot can be Viewed, Annotated, display deleted, and saved from Container with 3 dot action menu', async ({
-    page
-  }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7552'
-    });
-    //Open Snapshot Object View
-    await page.getByLabel('My Items Notebook Embed').getByLabel('More actions').click();
-    await page.getByRole('menuitem', { name: 'View Snapshot' }).click();
-    await expect(page.getByRole('dialog', { name: 'Modal Overlay' })).toBeVisible();
-    await expect(page.locator('#snapshotDescriptor')).toHaveText(
-      /SNAPSHOT \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/
-    );
-    // Open Annotation Editor with Painterro
-    await page.getByLabel('Annotate this snapshot').click();
-    await expect(page.locator('#snap-annotation-canvas')).toBeVisible();
-    // Clear the canvas
-    await page.getByRole('button', { name: 'Put text [T]' }).click();
-    // Click in the Painterro canvas to add a text annotation
-    await page.locator('.ptro-crp-el').click();
-    await page.locator('.ptro-text-tool-input').fill('...is there life on mars?');
-    // When working with Painterro, we need to check that the Apply button is hidden after clicking
-    await page.getByTitle('Apply').click();
-    await expect(page.getByTitle('Apply')).toBeHidden();
-
-    // Save and exit annotation window
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('button', { name: 'Done' }).click();
-
-    // Open up annotation again
-    await page.getByRole('img', { name: 'My Items thumbnail' }).click();
-    await expect(page.getByLabel('Modal Overlay').getByRole('img')).toBeVisible();
-  });
-  test('A snapshot can be Annotated and saved as a JPG and PNG', async ({ page }) => {
-    //Open Snapshot Object View
-    await page.getByLabel('My Items Notebook Embed').getByLabel('More actions').click();
-    await page.getByRole('menuitem', { name: 'View Snapshot' }).click();
-    await expect(page.getByRole('dialog', { name: 'Modal Overlay' })).toBeVisible();
-
-    // Open Annotation Editor with Painterro
-    await page.getByLabel('Annotate this snapshot').click();
-    await expect(page.locator('#snap-annotation-canvas')).toBeVisible();
-    // Clear the canvas
-    await page.getByRole('button', { name: 'Put text [T]' }).click();
-    // Click in the Painterro canvas to add a text annotation
-    await page.locator('.ptro-crp-el').click();
-    await page.locator('.ptro-text-tool-input').fill('...is there life on mars?');
-    // When working with Painterro, we need to check that the Apply button is hidden after clicking
-    await page.getByTitle('Apply').click();
-    await expect(page.getByTitle('Apply')).toBeHidden();
-
-    // Save and exit annotation window
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('button', { name: 'Done' }).click();
-
-    // Open up annotation again
-    await page.getByRole('img', { name: 'My Items thumbnail' }).click();
-    await expect(page.getByLabel('Modal Overlay').getByRole('img')).toBeVisible();
-
-    // Save as JPG
-    await Promise.all([
-      page.waitForEvent('download'), // Waits for the download event
-      page.getByLabel('Export as JPG').click() // Triggers the download
-    ]);
-
-    // Save as PNG
-    await expect(page.getByLabel('Modal Overlay').getByRole('img')).toBeVisible();
-    await Promise.all([
-      page.waitForEvent('download'), // Waits for the download event
-      page.getByLabel('Export as PNG').click() // Triggers the download
-    ]);
+    await expect(page.locator('.c-overlay__outer')).toBeVisible();
   });
+  test.fixme(
+    'A snapshot can be Viewed, Annotated, display deleted, and saved from Container with 3 dot action menu',
+    async ({ page }) => {
+      await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More actions').click();
+      await page.getByRole('menuitem', { name: ' View Snapshot' }).click();
+      await expect(page.locator('.c-overlay__outer')).toBeVisible();
+      await page.getByTitle('Annotate').click();
+      await expect(page.locator('#snap-annotation-canvas')).toBeVisible();
+      await page.getByRole('button', { name: '' }).click();
+      // await expect(page.locator('#snap-annotation-canvas')).not.toBeVisible();
+      await page.getByRole('button', { name: 'Save' }).click();
+      await page.getByRole('button', { name: 'Done' }).click();
+      //await expect(await page.locator)
+    }
+  );
   test.fixme('5 Snapshots can be added to a container', async ({ page }) => {});
   test.fixme(
     '5 Snapshots can be added to a container and Deleted with Delete All action',
@@ -163,6 +116,10 @@ test.describe('Snapshot Container tests', () => {
     'A snapshot can be Deleted from Container with 3 dot action menu',
     async ({ page }) => {}
   );
+  test.fixme(
+    'A snapshot can be Navigated To from Container with 3 dot action menu',
+    async ({ page }) => {}
+  );
   test.fixme(
     'A snapshot can be Navigated To Item in Time from Container with 3 dot action menu',
     async ({ page }) => {}
@@ -194,4 +151,11 @@ test.describe('Snapshot Container tests', () => {
       //Snapshot removed from container?
     }
   );
+  test.fixme(
+    'Verify Embedded options for PNG, JPG, and Annotate work correctly',
+    async ({ page }) => {
+      //Add snapshot to container
+      //Verify PNG, JPG, and Annotate buttons work correctly
+    }
+  );
 });

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

@@ -24,60 +24,138 @@
 Tests to verify log plot functionality when objects are missing
 */
 
-import { createDomainObjectWithDefaults } from '../../../../appActions.js';
 import { expect, test } from '../../../../pluginFixtures.js';
 
 test.describe('Handle missing object for plots', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-  test('Displays empty div for missing stacked plot item', async ({ page, browserName }) => {
+  test('Displays empty div for missing stacked plot item @unstable', async ({
+    page,
+    browserName,
+    openmctConfig
+  }) => {
     // eslint-disable-next-line playwright/no-skipped-test
     test.skip(browserName === 'firefox', 'Firefox failing due to console events being missed');
 
-    let warningReceived = false;
+    const { myItemsFolderName } = openmctConfig;
+    const errorLogs = [];
 
     page.on('console', (message) => {
       if (message.type() === 'warning' && message.text().includes('Missing domain object')) {
-        warningReceived = true;
+        errorLogs.push(message.text());
       }
     });
 
-    const stackedPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Stacked Plot'
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: stackedPlot.uuid
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: stackedPlot.uuid
-    });
+    //Make stacked plot
+    await makeStackedPlot(page, myItemsFolderName);
 
     //Gets local storage and deletes the last sine wave generator in the stacked plot
-    const mct = await page.evaluate(() => window.localStorage.getItem('mct'));
-    const parsedData = JSON.parse(mct);
-    const key = Object.entries(parsedData).find(([, value]) => value.type === 'generator')?.[0];
+    const localStorage = await page.evaluate(() => window.localStorage);
+    const parsedData = JSON.parse(localStorage.mct);
+    const keys = Object.keys(parsedData);
+    const lastKey = keys[keys.length - 1];
 
-    delete parsedData[key];
+    delete parsedData[lastKey];
 
     //Sets local storage with missing object
-    const jsonData = JSON.stringify(parsedData);
-    await page.evaluate((data) => {
-      window.localStorage.setItem('mct', data);
-    }, jsonData);
+    await page.evaluate(`window.localStorage.setItem('mct', '${JSON.stringify(parsedData)}')`);
 
     //Reloads page and clicks on stacked plot
-    await page.reload({ waitUntil: 'domcontentloaded' });
-    await page.goto(stackedPlot.url);
+    await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);
 
     //Verify Main section is there on load
-    await expect(page.locator('.l-browse-bar__object-name')).toContainText(stackedPlot.name);
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Stacked Plot');
+
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+    await Promise.all([
+      page.waitForNavigation(),
+      page.locator('text=Unnamed Stacked Plot').first().click()
+    ]);
 
     //Check that there is only one stacked item plot with a plot, the missing one will be empty
-    await expect(page.getByLabel('Stacked Plot Item')).toHaveCount(1);
-    //Verify that console.warn was thrown
-    expect(warningReceived).toBe(true);
+    await expect(page.locator('.c-plot--stacked-container:has(.gl-plot)')).toHaveCount(1);
+    //Verify that console.warn is thrown
+    expect(errorLogs).toHaveLength(1);
   });
 });
+
+/**
+ * This is used the create a stacked plot object
+ * @private
+ */
+async function makeStackedPlot(page, myItemsFolderName) {
+  // fresh page with time range from 2022-03-29 22:00:00.000Z to 2022-03-29 22:00:30.000Z
+  await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+  // create stacked plot
+  await page.locator('button.c-create-button').click();
+  await page.locator('li[role="menuitem"]:has-text("Stacked Plot")').click();
+
+  await Promise.all([
+    page.waitForNavigation({ waitUntil: 'networkidle' }),
+    page.locator('button:has-text("OK")').click(),
+    //Wait for Save Banner to appear
+    page.waitForSelector('.c-message-banner__message')
+  ]);
+
+  // save the stacked plot
+  await saveStackedPlot(page);
+
+  // create a sinewave generator
+  await createSineWaveGenerator(page);
+
+  // click on stacked plot
+  await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+  await Promise.all([
+    page.waitForNavigation(),
+    page.locator('text=Unnamed Stacked Plot').first().click()
+  ]);
+
+  // create a second sinewave generator
+  await createSineWaveGenerator(page);
+
+  // click on stacked plot
+  await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+  await Promise.all([
+    page.waitForNavigation(),
+    page.locator('text=Unnamed Stacked Plot').first().click()
+  ]);
+}
+
+/**
+ * This is used to save a stacked plot object
+ * @private
+ */
+async function saveStackedPlot(page) {
+  // save stacked plot
+  await page
+    .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
+    .nth(1)
+    .click();
+
+  await Promise.all([
+    page.locator('text=Save and Finish Editing').click(),
+    //Wait for Save Banner to appear
+    page.waitForSelector('.c-message-banner__message')
+  ]);
+  //Wait until Save Banner is gone
+  await page.locator('.c-message-banner__close-button').click();
+  await page.waitForSelector('.c-message-banner__message', { state: 'detached' });
+}
+
+/**
+ * This is used to create a sine wave generator object
+ * @private
+ */
+async function createSineWaveGenerator(page) {
+  //Create sine wave generator
+  await page.locator('button.c-create-button').click();
+  await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
+
+  await Promise.all([
+    page.waitForNavigation({ waitUntil: 'networkidle' }),
+    page.locator('button:has-text("OK")').click(),
+    //Wait for Save Banner to appear
+    page.waitForSelector('.c-message-banner__message')
+  ]);
+}

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

@@ -33,15 +33,15 @@ import {
 import { expect, test } from '../../../../pluginFixtures.js';
 
 test.describe('Overlay Plot', () => {
-  let overlayPlot;
   test.beforeEach(async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
-    overlayPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Overlay Plot'
-    });
   });
 
   test('Plot legend color is in sync with plot series color', async ({ page }) => {
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
     await createDomainObjectWithDefaults(page, {
       type: 'Sine Wave Generator',
       parent: overlayPlot.uuid
@@ -63,63 +63,6 @@ test.describe('Overlay Plot', () => {
     await expect(seriesColorSwatch).toHaveCSS('background-color', 'rgb(255, 166, 61)');
   });
 
-  test('Plot legend expands by default', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7403'
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
-    });
-
-    await page.goto(overlayPlot.url);
-
-    await page.getByRole('tab', { name: 'Config' }).click();
-
-    // Assert that the legend is collapsed by default
-    await expect(page.getByLabel('Plot Legend Collapsed')).toBeVisible();
-    await expect(page.getByLabel('Plot Legend Expanded')).toBeHidden();
-    await expect(page.getByLabel('Expand by Default')).toHaveText('No');
-
-    expect(await page.getByLabel('Plot Legend Item').count()).toBe(3);
-
-    // Change the legend to expand by default
-    await page.getByLabel('Edit Object').click();
-    await page.getByLabel('Expand By Default').check();
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-    // Assert that the legend is now open
-    await expect(page.getByLabel('Plot Legend Collapsed')).toBeHidden();
-    await expect(page.getByLabel('Plot Legend Expanded')).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Name' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Value' })).toBeVisible();
-    await expect(page.getByLabel('Expand by Default')).toHaveText('Yes');
-    await expect(page.getByLabel('Plot Legend Item')).toHaveCount(3);
-
-    // Assert that the legend is expanded on page load
-    await page.reload();
-    await expect(page.getByLabel('Plot Legend Collapsed')).toBeHidden();
-    await expect(page.getByLabel('Plot Legend Expanded')).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Name' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
-    await expect(page.getByRole('cell', { name: 'Value' })).toBeVisible();
-    await expect(page.getByLabel('Expand by Default')).toHaveText('Yes');
-    await expect(page.getByLabel('Plot Legend Item')).toHaveCount(3);
-  });
-
   test('Limit lines persist when series is moved to another Y Axis and on refresh', async ({
     page
   }) => {
@@ -127,6 +70,10 @@ test.describe('Overlay Plot', () => {
       type: 'issue',
       description: 'https://github.com/nasa/openmct/issues/6338'
     });
+    // Create an Overlay Plot with a default SWG
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
 
     const swgA = await createDomainObjectWithDefaults(page, {
       type: 'Sine Wave Generator',
@@ -189,60 +136,13 @@ test.describe('Overlay Plot', () => {
     await assertLimitLinesExistAndAreVisible(page);
   });
 
-  test('Limit lines adjust when series is resized', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/6987'
-    });
-    // Create an Overlay Plot with a default SWG
-    overlayPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Overlay Plot'
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
-    });
-
-    await page.goto(overlayPlot.url);
-
-    // Assert that no limit lines are shown by default
-    await page.waitForSelector('.js-limit-area', { state: 'attached' });
-    expect(await page.locator('.c-plot-limit-line').count()).toBe(0);
-
-    // Enter edit mode
-    await page.getByLabel('Edit Object').click();
-
-    // Expand the "Sine Wave Generator" plot series options and enable limit lines
-    await page.getByRole('tab', { name: 'Config' }).click();
-    await page
-      .getByRole('list', { name: 'Plot Series Properties' })
-      .locator('span')
-      .first()
-      .click();
-    await page
-      .getByRole('list', { name: 'Plot Series Properties' })
-      .getByRole('checkbox', { name: 'Limit lines' })
-      .check();
-
-    await assertLimitLinesExistAndAreVisible(page);
-
-    // Save (exit edit mode)
-    await page.locator('button[title="Save"]').click();
-    await page.locator('li[title="Save and Finish Editing"]').click();
-
-    const initialCoords = await assertLimitLinesExistAndAreVisible(page);
-    // Resize the chart container by showing the snapshot pane.
-    await page.getByLabel('Show Snapshots').click();
-
-    const newCoords = await assertLimitLinesExistAndAreVisible(page);
-    // We just need to know that the first limit line redrew somewhere lower than the initial y position.
-    expect(newCoords.y).toBeGreaterThan(initialCoords.y);
-  });
-
   test('The elements pool supports dragging series into multiple y-axis buckets', async ({
     page
   }) => {
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
     const swgA = await createDomainObjectWithDefaults(page, {
       type: 'Sine Wave Generator',
       parent: overlayPlot.uuid
@@ -324,39 +224,14 @@ test.describe('Overlay Plot', () => {
     expect(yAxis3Group.getByRole('listitem').nth(0).getByText(swgB.name)).toBeTruthy();
   });
 
-  test.fixme(
-    'Clicking on an item in the elements pool brings up the plot preview with data points',
-    async ({ page }) => {
-      test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/7421'
-      });
-
-      const swgA = await createDomainObjectWithDefaults(page, {
-        type: 'Sine Wave Generator',
-        parent: overlayPlot.uuid
-      });
-
-      await page.goto(overlayPlot.url);
-      // Wait for plot series data to load and be drawn
-      await waitForPlotsToRender(page);
-      await page.getByLabel('Edit Object').click();
-
-      await page.getByRole('tab', { name: 'Elements' }).click();
-
-      await page.locator(`#inspector-elements-tree >> text=${swgA.name}`).click();
-      const plotPixels = await getCanvasPixels(page, '.js-overlay canvas');
-      const plotPixelSize = plotPixels.length;
-      expect(plotPixelSize).toBeGreaterThan(0);
-    }
-  );
-
-  test('Can remove an item via the elements pool action menu', async ({ page }) => {
-    const swgA = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
+  test('Clicking on an item in the elements pool brings up the plot preview with data points', async ({
+    page
+  }) => {
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
     });
-    const swgB = await createDomainObjectWithDefaults(page, {
+
+    const swgA = await createDomainObjectWithDefaults(page, {
       type: 'Sine Wave Generator',
       parent: overlayPlot.uuid
     });
@@ -368,29 +243,11 @@ test.describe('Overlay Plot', () => {
 
     await page.getByRole('tab', { name: 'Elements' }).click();
 
-    const swgAElementsPoolItem = page.getByLabel(`Preview ${swgA.name}`);
-    await expect(swgAElementsPoolItem).toBeVisible();
-    await swgAElementsPoolItem.click({ button: 'right' });
-    await page.getByRole('menuitem', { name: 'Remove' }).click();
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
-    await expect(swgAElementsPoolItem).toBeHidden();
+    await page.locator(`#inspector-elements-tree >> text=${swgA.name}`).click();
 
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7530'
-    });
-    await test.step('Verify that the legend is correct after removing a series', async () => {
-      await page.getByLabel('Plot Canvas').hover();
-      await page.mouse.move(50, 0, {
-        steps: 10
-      });
-      await expect(page.getByLabel('Plot Legend Item')).toHaveCount(1);
-      await expect(page.getByLabel(`Plot Legend Item for ${swgA.name}`)).toBeHidden();
-      await expect(page.getByLabel(`Plot Legend Item for ${swgB.name}`)).toBeVisible();
-    });
+    const plotPixels = await getCanvasPixels(page, '.js-overlay canvas');
+    const plotPixelSize = plotPixels.length;
+    expect(plotPixelSize).toBeGreaterThan(0);
   });
 });
 
@@ -409,7 +266,4 @@ async function assertLimitLinesExistAndAreVisible(page) {
   for (let i = 0; i < limitLineCount; i++) {
     await expect(page.locator('.c-plot-limit-line').nth(i)).toBeVisible();
   }
-
-  const firstLimitLineCoords = await page.locator('.c-plot-limit-line').first().boundingBox();
-  return firstLimitLineCoords;
 }

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

@@ -52,11 +52,7 @@ test.describe('Plot Rendering', () => {
     expect(createMineFolderRequests.length).toEqual(0);
   });
 
-  test.fixme('Plot is rendered when infinity values exist', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7421'
-    });
+  test('Plot is rendered when infinity values exist', async ({ page }) => {
     // Edit Plot
     await editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject);
 

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

@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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 { createDomainObjectWithDefaults } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-test.describe('Plots work in Previews', () => {
-  test('We can preview plot in display layouts', async ({ page, openmctConfig }) => {
-    const { myItemsFolderName } = openmctConfig;
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    // Create a Sinewave Generator
-    const sineWaveObject = await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator'
-    });
-    // Create a Display Layout
-    await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Test Display Layout'
-    });
-    // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
-
-    // Expand the 'My Items' folder in the left tree
-    await page.getByLabel(`Expand ${myItemsFolderName} folder`).click();
-    // Add the Sine Wave Generator to the Display Layout and save changes
-    const treePane = page.getByRole('tree', {
-      name: 'Main Tree'
-    });
-    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-      name: new RegExp(sineWaveObject.name)
-    });
-    const layoutGridHolder = page.getByLabel('Test Display Layout Layout Grid');
-    await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
-    // right click on the plot and select view large
-    await page.getByLabel(/Alpha-numeric telemetry value of.*/).click({
-      button: 'right'
-    });
-    await page.getByLabel('View Historical Data').click();
-    await expect(page.getByLabel('Preview Container').getByLabel('Plot Canvas')).toBeVisible();
-    await page.getByRole('button', { name: 'Close' }).click();
-    await page.getByLabel('Expand Test Display Layout layout').click();
-
-    // change to a plot and ensure embiggen works
-    await page.getByLabel('Edit Object').click();
-    await page.getByLabel('Move Sub-object Frame').click();
-    await page.getByText('View type').click();
-    await page.getByText('Overlay Plot').click();
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-    await expect(
-      page.getByLabel('Test Display Layout Layout', { exact: true }).getByLabel('Plot Canvas')
-    ).toBeVisible();
-    await expect(page.getByLabel('Preview Container')).toBeHidden();
-    await page.getByLabel('Large View').click();
-    await expect(page.getByLabel('Preview Container').getByLabel('Plot Canvas')).toBeVisible();
-    await page.getByRole('button', { name: 'Close' }).click();
-
-    // get last sinewave tree item (in the display layout)
-    await page
-      .getByRole('treeitem', { name: /Sine Wave Generator/ })
-      .locator('a')
-      .last()
-      .click({ button: 'right' });
-    await page.getByLabel('View', { exact: true }).click();
-    await expect(page.getByLabel('Preview Container').getByLabel('Plot Canvas')).toBeVisible();
-    await page.getByRole('button', { name: 'Close' }).click();
-  });
-});

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

@@ -257,56 +257,6 @@ test.describe('Stacked Plot', () => {
 
     await assertAggregateLegendIsVisible(page);
   });
-
-  test('can toggle between aggregate and per child legends', async ({ page }) => {
-    // make some an overlay plot
-    const overlayPlot = await createDomainObjectWithDefaults(page, {
-      type: 'Overlay Plot',
-      parent: stackedPlot.uuid
-    });
-
-    // make some SWGs for the overlay plot
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: overlayPlot.uuid
-    });
-
-    await page.goto(stackedPlot.url);
-    await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'Config' }).click();
-    await page.getByLabel('Inspector Views').getByRole('checkbox').uncheck();
-    await page.getByLabel('Expand By Default').check();
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-    await expect(page.getByLabel('Plot Legend Expanded')).toHaveCount(1);
-    await expect(page.getByLabel('Plot Legend Item')).toHaveCount(5);
-
-    // reload and ensure the legend is still expanded
-    await page.reload();
-    await expect(page.getByLabel('Plot Legend Expanded')).toHaveCount(1);
-    await expect(page.getByLabel('Plot Legend Item')).toHaveCount(5);
-
-    // change to collapsed by default
-    await page.getByLabel('Edit Object').click();
-    await page.getByLabel('Expand By Default').uncheck();
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-    await expect(page.getByLabel('Plot Legend Collapsed')).toHaveCount(1);
-    await expect(page.getByLabel('Plot Legend Item')).toHaveCount(5);
-
-    // change it to individual legends
-    await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'Config' }).click();
-    await page.getByLabel('Show Legends For Children').check();
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-    await expect(page.getByLabel('Plot Legend Collapsed')).toHaveCount(4);
-    await expect(page.getByLabel('Plot Legend Item')).toHaveCount(5);
-  });
 });
 
 /**

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

@@ -1,135 +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.
- *****************************************************************************/
-import { createDomainObjectWithDefaults, expandEntireTree } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-test.describe('Reload action', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-    const displayLayout = await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout'
-    });
-
-    const alphaTable = await createDomainObjectWithDefaults(page, {
-      type: 'Telemetry Table',
-      name: 'Alpha Table'
-    });
-
-    const betaTable = await createDomainObjectWithDefaults(page, {
-      type: 'Telemetry Table',
-      name: 'Beta Table'
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: alphaTable.uuid,
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.001'
-      }
-    });
-
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: betaTable.uuid,
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.001'
-      }
-    });
-
-    await page.goto(displayLayout.url);
-
-    // Expand all folders
-    await expandEntireTree(page);
-
-    await page.getByLabel('Edit Object', { exact: true }).click();
-
-    await page.dragAndDrop(`text='Alpha Table'`, '.l-layout__grid-holder', {
-      targetPosition: { x: 0, y: 0 }
-    });
-
-    await page.dragAndDrop(`text='Beta Table'`, '.l-layout__grid-holder', {
-      targetPosition: { x: 0, y: 250 }
-    });
-
-    await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-  });
-
-  test('can reload display layout and its children', async ({ page }) => {
-    const beforeReloadAlphaTelemetryValue = await page
-      .getByLabel('Alpha Table table content')
-      .getByLabel('wavelengths table cell')
-      .first()
-      .getAttribute('title');
-    const beforeReloadBetaTelemetryValue = await page
-      .getByLabel('Beta Table table content')
-      .getByLabel('wavelengths table cell')
-      .first()
-      .getAttribute('title');
-    // reload alpha
-    await page.getByTitle('View menu items').first().click();
-    await page.getByRole('menuitem', { name: /Reload/ }).click();
-
-    const afterReloadAlphaTelemetryValue = await page
-      .getByLabel('Alpha Table table content')
-      .getByLabel('wavelengths table cell')
-      .first()
-      .getAttribute('title');
-    const afterReloadBetaTelemetryValue = await page
-      .getByLabel('Beta Table table content')
-      .getByLabel('wavelengths table cell')
-      .first()
-      .getAttribute('title');
-
-    expect(beforeReloadAlphaTelemetryValue).not.toEqual(afterReloadAlphaTelemetryValue);
-    expect(beforeReloadBetaTelemetryValue).toEqual(afterReloadBetaTelemetryValue);
-
-    // now reload parent
-    await page.getByTitle('More actions').click();
-    await page.getByRole('menuitem', { name: /Reload/ }).click();
-
-    const fullReloadAlphaTelemetryValue = await page
-      .getByLabel('Alpha Table table content')
-      .getByLabel('wavelengths table cell')
-      .first()
-      .getAttribute('title');
-    const fullReloadBetaTelemetryValue = await page
-      .getByLabel('Beta Table table content')
-      .getByLabel('wavelengths table cell')
-      .first()
-      .getAttribute('title');
-
-    expect(fullReloadAlphaTelemetryValue).not.toEqual(afterReloadAlphaTelemetryValue);
-    expect(fullReloadBetaTelemetryValue).not.toEqual(afterReloadBetaTelemetryValue);
-  });
-
-  test('is disabled in Previews', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7638'
-    });
-    await page.getByLabel('Alpha Table Frame Controls').getByLabel('Large View').click();
-    await page.getByLabel('Modal Overlay').getByLabel('More actions').click();
-    await expect(page.getByLabel('Reload')).toBeHidden();
-  });
-});

e2e/tests/functional/plugins/styling/flexLayoutStyling.e2e.spec.js

@@ -32,10 +32,10 @@ const setBorderColor = '#ff00ff';
 const setBackgroundColor = '#5b0f00';
 const setTextColor = '#e6b8af';
 const defaultFrameBorderColor = '#e6b8af'; //default border color
-const defaultBorderTargetColor = '#acacac';
-const defaultTextColor = '#acacac'; // default text color
-const inheritedColor = '#acacac'; // inherited from the body style
-const pukeGreen = '#6aa84f'; //Ugliest green known to man 🤮
+const defaultBorderTargetColor = '#aaaaaa';
+const defaultTextColor = '#aaaaaa'; // default text color
+const inheritedColor = '#aaaaaa'; // inherited from the body style
+const pukeGreen = '#6aa84f'; //Ugliest green known to man
 const NO_STYLE_RGBA = 'rgba(0, 0, 0, 0)'; //default background color value
 
 test.describe('Flexible Layout styling', () => {
@@ -114,9 +114,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultFrameBorderColor),
       NO_STYLE_RGBA,
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2. Note: https://github.com/nasa/openmct/issues/7337
@@ -124,9 +122,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultFrameBorderColor),
       NO_STYLE_RGBA,
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
   });
 
@@ -147,9 +143,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(defaultTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2
@@ -157,9 +151,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(defaultTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Set styles using setStyles function on StackedPlot1 but not StackedPlot2
@@ -168,7 +160,7 @@ test.describe('Flexible Layout styling', () => {
       setBorderColor,
       setBackgroundColor,
       setTextColor,
-      page.getByRole('group', { name: 'StackedPlot1 Frame' })
+      page.getByLabel('StackedPlot1 Frame')
     );
 
     // Check styles on StackedPlot1
@@ -176,9 +168,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2
@@ -186,9 +176,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(defaultTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Save Flexible Layout
@@ -203,9 +191,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2
@@ -213,9 +199,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(defaultTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
   });
 
@@ -257,9 +241,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2 to verify they are the default
@@ -267,9 +249,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(defaultTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Set styles using setStyles function on StackedPlot2
@@ -278,7 +258,7 @@ test.describe('Flexible Layout styling', () => {
       setBorderColor,
       setBackgroundColor,
       setTextColor,
-      page.getByRole('group', { name: 'StackedPlot2 Frame' })
+      page.getByLabel('StackedPlot2 Frame')
     );
 
     // Check styles on StackedPlot2
@@ -286,9 +266,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Save Flexible Layout
@@ -303,9 +281,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2
@@ -313,9 +289,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Directly navigate to the flexible layout
@@ -352,9 +326,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Check styles on StackedPlot2 matches previous set colors
@@ -362,9 +334,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot2 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot2 Frame').getByLabel('Stacked Plot Style Target')
     );
   });
 
@@ -386,7 +356,7 @@ test.describe('Flexible Layout styling', () => {
       setBorderColor,
       setBackgroundColor,
       setTextColor,
-      page.getByRole('group', { name: 'StackedPlot1 Frame' })
+      page.getByLabel('StackedPlot1 Frame')
     );
 
     // Check styles using checkStyles function
@@ -394,9 +364,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(setBorderColor),
       hexToRGB(setBackgroundColor),
       hexToRGB(setTextColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
 
     // Save Flexible Layout
@@ -418,7 +386,7 @@ test.describe('Flexible Layout styling', () => {
       'No Style',
       'No Style',
       'No Style',
-      page.getByRole('group', { name: 'StackedPlot1 Frame' })
+      page.getByLabel('StackedPlot1 Frame')
     );
 
     // Check styles using checkStyles function
@@ -426,13 +394,11 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(inheritedColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
     // Save Flexible Layout
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('button[title="Save"]').click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // Reload page and verify that styles persist
     await page.reload({ waitUntil: 'domcontentloaded' });
@@ -442,44 +408,7 @@ test.describe('Flexible Layout styling', () => {
       hexToRGB(defaultBorderTargetColor),
       NO_STYLE_RGBA,
       hexToRGB(inheritedColor),
-      page
-        .getByRole('group', { name: 'StackedPlot1 Frame' })
-        .getByLabel('Stacked Plot Style Target')
-    );
-  });
-
-  test('Styling, and then canceling reverts to previous style', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7233'
-    });
-
-    await page.goto(flexibleLayout.url);
-
-    await page.getByLabel('Edit Object').click();
-    await page.getByRole('tab', { name: 'Styles' }).click();
-    await setStyles(
-      page,
-      setBorderColor,
-      setBackgroundColor,
-      setTextColor,
-      page.getByLabel('Flexible Layout Column')
-    );
-    await page.getByLabel('Cancel Editing').click();
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
-    await checkStyles(
-      hexToRGB(defaultBorderTargetColor),
-      NO_STYLE_RGBA,
-      hexToRGB(inheritedColor),
-      page.getByLabel('Flexible Layout Column')
-    );
-
-    await page.reload();
-    await checkStyles(
-      hexToRGB(defaultBorderTargetColor),
-      NO_STYLE_RGBA,
-      hexToRGB(inheritedColor),
-      page.getByLabel('Flexible Layout Column')
+      page.getByLabel('StackedPlot1 Frame').getByLabel('Stacked Plot Style Target')
     );
   });
 });

e2e/tests/functional/plugins/styling/stackedPlotStyling.e2e.spec.js

@@ -36,9 +36,9 @@ import { test } from '../../../../pluginFixtures.js';
 const setBorderColor = '#ff00ff';
 const setBackgroundColor = '#5b0f00';
 const setTextColor = '#e6b8af';
-const defaultTextColor = '#acacac'; // default text color
+const defaultTextColor = '#aaaaaa'; // default text color
 const NO_STYLE_RGBA = 'rgba(0, 0, 0, 0)'; //default background color value
-const DEFAULT_PLOT_VIEW_BORDER_COLOR = '#acacac';
+const DEFAULT_PLOT_VIEW_BORDER_COLOR = '#AAAAAA';
 const setFontSize = '72px';
 const setFontWeight = '700'; //bold for monospace bold
 const setFontFamily = '"Andale Mono", sans-serif';

e2e/tests/functional/plugins/styling/styleInspectorOptions.e2e.spec.js

@@ -67,7 +67,7 @@ test.describe('Style Inspector Options', () => {
     await expect(page.getByRole('tab', { name: 'Styles' })).toBeVisible();
 
     // Select Stacked Layout Column
-    await page.getByRole('group', { name: 'Stacked Plot Frame' }).click();
+    await page.getByLabel('Stacked Plot Frame').click();
 
     // The overall Flex Layout or Stacked Plot itself MUST be style-able.
     await expect(page.getByRole('tab', { name: 'Styles' })).toBeVisible();

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

@@ -24,18 +24,13 @@ import { createDomainObjectWithDefaults } from '../../../../appActions.js';
 import { expect, test } from '../../../../pluginFixtures.js';
 
 test.describe('Tabs View', () => {
-  let tabsView;
-  let table;
-  let notebook;
-  let sineWaveGenerator;
-
-  test.beforeEach(async ({ page }) => {
+  test('Renders tabbed elements', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    tabsView = await createDomainObjectWithDefaults(page, {
+    const tabsView = await createDomainObjectWithDefaults(page, {
       type: 'Tabs View'
     });
-    table = await createDomainObjectWithDefaults(page, {
+    const table = await createDomainObjectWithDefaults(page, {
       type: 'Telemetry Table',
       parent: tabsView.uuid
     });
@@ -43,21 +38,19 @@ test.describe('Tabs View', () => {
       type: 'Event Message Generator',
       parent: table.uuid
     });
-    notebook = await createDomainObjectWithDefaults(page, {
+    const notebook = await createDomainObjectWithDefaults(page, {
       type: 'Notebook',
       parent: tabsView.uuid
     });
-    sineWaveGenerator = await createDomainObjectWithDefaults(page, {
+    const sineWaveGenerator = await createDomainObjectWithDefaults(page, {
       type: 'Sine Wave Generator',
       parent: tabsView.uuid
     });
-  });
 
-  test('Renders tabbed elements', async ({ page }) => {
-    await page.goto(tabsView.url);
+    page.goto(tabsView.url);
 
     // select first tab
-    await page.getByLabel(`${table.name} tab`, { exact: true }).click();
+    await page.getByLabel(`${table.name} tab`).click();
     // ensure table header visible
     await expect(page.getByRole('searchbox', { name: 'message filter input' })).toBeVisible();
 
@@ -65,7 +58,7 @@ test.describe('Tabs View', () => {
     await expect(page.locator('canvas[id=webglContext]')).toBeHidden();
 
     // select second tab
-    await page.getByLabel(`${notebook.name} tab`, { exact: true }).click();
+    await page.getByLabel(`${notebook.name} tab`).click();
 
     // ensure notebook visible
     await expect(page.locator('.c-notebook__drag-area')).toBeVisible();
@@ -74,7 +67,7 @@ test.describe('Tabs View', () => {
     await expect(page.locator('canvas[id=webglContext]')).toBeHidden();
 
     // select third tab
-    await page.getByLabel(`${sineWaveGenerator.name} tab`, { exact: true }).click();
+    await page.getByLabel(`${sineWaveGenerator.name} tab`).click();
 
     // expect sine wave generator visible
     await expect(page.locator('.c-plot')).toBeVisible();
@@ -85,7 +78,7 @@ test.describe('Tabs View', () => {
     await expect(page.locator('canvas').nth(1)).toBeVisible();
 
     // now try to select the first tab again
-    await page.getByLabel(`${table.name} tab`, { exact: true }).click();
+    await page.getByLabel(`${table.name} tab`).click();
     // ensure table header visible
     await expect(page.getByRole('searchbox', { name: 'message filter input' })).toBeVisible();
 
@@ -93,29 +86,3 @@ test.describe('Tabs View', () => {
     await expect(page.locator('canvas[id=webglContext]')).toBeHidden();
   });
 });
-
-test.describe('Tabs View CRUD', () => {
-  let tabsView;
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    tabsView = await createDomainObjectWithDefaults(page, {
-      type: 'Tabs View'
-    });
-  });
-
-  test('Eager Load Tabs is the default and then can be toggled off', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7198'
-    });
-    await page.goto(tabsView.url);
-
-    await page.getByLabel('Edit Object').click();
-    await page.getByLabel('More actions').click();
-    await page.getByLabel('Edit Properties...').click();
-    await expect(await page.getByLabel('Eager Load Tabs')).not.toBeChecked();
-    await page.getByLabel('Eager Load Tabs').setChecked(true);
-    await expect(await page.getByLabel('Eager Load Tabs')).toBeChecked();
-  });
-});

e2e/tests/functional/plugins/telemetryTable/preview.e2e.spec.js

@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*
- * This test suite is dedicated to testing the preview plugin.
- */
-
-import { createDomainObjectWithDefaults, expandEntireTree } from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-test.describe('Preview mode', () => {
-  test('all context menu items are available for a telemetry table', async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    // Create a Display Layout
-    const displayLayout = await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout'
-    });
-    // Create a Telemetry Table
-    const telemetryTable = await createDomainObjectWithDefaults(page, {
-      type: 'Telemetry Table',
-      parent: displayLayout.uuid
-    });
-    // Create a Sinewave Generator
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: telemetryTable.uuid
-    });
-
-    await page.goto(displayLayout.url);
-    await page.getByLabel('View menu items').click();
-    await expect(page.getByLabel('Export Marked Rows')).toBeVisible();
-
-    await page.getByRole('menuitem', { name: 'Large View' }).click();
-    await page.getByLabel('Overlay').getByLabel('More actions').click();
-    await expect(page.getByLabel('Export Table Data')).toBeVisible();
-    await expect(page.getByLabel('Export Marked Rows')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Pause' }).click();
-    await page.getByRole('button', { name: 'Close' }).click();
-
-    await expandEntireTree(page);
-
-    await page.getByLabel('Edit Object').click();
-
-    const treePane = page.getByRole('tree', {
-      name: 'Main Tree'
-    });
-    const telemetryTableTreeItem = treePane.getByRole('treeitem', {
-      name: new RegExp(telemetryTable.name)
-    });
-    await telemetryTableTreeItem.locator('a').click();
-    await page.getByLabel('Overlay').getByLabel('More actions').click();
-    await expect(page.getByLabel('Export Table Data')).toBeVisible();
-    await expect(page.getByLabel('Export Marked Rows')).toBeVisible();
-    await expect(page.getByLabel('Export Marked Rows')).toBeDisabled();
-    await page.getByLabel('Pause').click();
-    const tableWrapper = page.getByLabel('Preview Container').locator('div.c-table-wrapper');
-    await expect(tableWrapper).toHaveClass(/is-paused/);
-  });
-});

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

@@ -20,31 +20,10 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {
-  createDomainObjectWithDefaults,
-  setTimeConductorBounds,
-  setTimeConductorMode
-} from '../../../../appActions.js';
+import { createDomainObjectWithDefaults, setTimeConductorBounds } from '../../../../appActions.js';
 import { expect, test } from '../../../../pluginFixtures.js';
 
 test.describe('Telemetry Table', () => {
-  let table;
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    table = await createDomainObjectWithDefaults(page, { type: 'Telemetry Table' });
-  });
-
-  test('Limits to 50 rows by default', async ({ page }) => {
-    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator',
-      parent: table.uuid
-    });
-    await page.goto(table.url);
-    await setTimeConductorMode(page, false);
-    const rows = page.getByLabel('table content').getByLabel('Table Row');
-    await expect(rows).toHaveCount(50);
-  });
-
   test('unpauses and filters data when paused by button and user changes bounds', async ({
     page
   }) => {
@@ -55,6 +34,7 @@ test.describe('Telemetry Table', () => {
 
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
+    const table = await createDomainObjectWithDefaults(page, { type: 'Telemetry Table' });
     await createDomainObjectWithDefaults(page, {
       type: 'Sine Wave Generator',
       parent: table.uuid
@@ -84,9 +64,10 @@ test.describe('Telemetry Table', () => {
 
     // Get the most recent telemetry date
     const latestTelemetryDate = await page
-      .getByLabel('table content')
-      .getByLabel('utc table cell')
+      .locator('table.c-telemetry-table__body > tbody > tr')
       .last()
+      .locator('td')
+      .nth(1)
       .getAttribute('title');
 
     // Verify that it is <= our new end bound
@@ -98,6 +79,7 @@ test.describe('Telemetry Table', () => {
   test('Supports filtering telemetry by regular text search', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
+    const table = await createDomainObjectWithDefaults(page, { type: 'Telemetry Table' });
     await createDomainObjectWithDefaults(page, {
       type: 'Event Message Generator',
       parent: table.uuid
@@ -109,7 +91,7 @@ test.describe('Telemetry Table', () => {
     await page.getByRole('searchbox', { name: 'message filter input' }).click();
     await page.getByRole('searchbox', { name: 'message filter input' }).fill('Roger');
 
-    let cells = await page.getByRole('cell').getByText(/Roger/).all();
+    let cells = await page.getByRole('cell', { name: /Roger/ }).all();
     // ensure we've got more than one cell
     expect(cells.length).toBeGreaterThan(1);
     // ensure the text content of each cell contains the search term
@@ -121,10 +103,7 @@ test.describe('Telemetry Table', () => {
     await page.getByRole('searchbox', { name: 'message filter input' }).click();
     await page.getByRole('searchbox', { name: 'message filter input' }).fill('Dodger');
 
-    cells = await page
-      .getByRole('cell')
-      .getByText(/Dodger/)
-      .all();
+    cells = await page.getByRole('cell', { name: /Dodger/ }).all();
     // ensure we've got more than one cell
     expect(cells.length).toBe(0);
     // ensure the text content of each cell contains the search term
@@ -140,6 +119,7 @@ test.describe('Telemetry Table', () => {
   test('Supports filtering using Regex', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
+    const table = await createDomainObjectWithDefaults(page, { type: 'Telemetry Table' });
     await createDomainObjectWithDefaults(page, {
       type: 'Event Message Generator',
       parent: table.uuid
@@ -155,7 +135,7 @@ test.describe('Telemetry Table', () => {
     await page.getByRole('searchbox', { name: 'message filter input' }).click();
     await page.getByRole('searchbox', { name: 'message filter input' }).fill('/[Rr]oger/');
 
-    let cells = await page.getByRole('cell').getByText(/Roger/).all();
+    let cells = await page.getByRole('cell', { name: /Roger/ }).all();
     // ensure we've got more than one cell
     expect(cells.length).toBeGreaterThan(1);
     // ensure the text content of each cell contains the search term
@@ -167,10 +147,7 @@ test.describe('Telemetry Table', () => {
     await page.getByRole('searchbox', { name: 'message filter input' }).click();
     await page.getByRole('searchbox', { name: 'message filter input' }).fill('/[Dd]oger/');
 
-    cells = await page
-      .getByRole('cell')
-      .getByText(/Dodger/)
-      .all();
+    cells = await page.getByRole('cell', { name: /Dodger/ }).all();
     // ensure we've got more than one cell
     expect(cells.length).toBe(0);
     // ensure the text content of each cell contains the search term

e2e/tests/functional/plugins/timeConductor/datepicker.e2e.spec.js

@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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 {
-  createDomainObjectWithDefaults,
-  setIndependentTimeConductorBounds
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-const FIXED_TIME =
-  './#/browse/mine?tc.mode=fixed&tc.startBound=1693592063607&tc.endBound=1693593893607&tc.timeSystem=utc&view=grid&hideInspector=true&hideTree=true';
-test.describe('Datepicker operations', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto(FIXED_TIME);
-  });
-  test('Verify that user can use the datepicker in the TC', async ({ page }) => {
-    await page.getByLabel('Time Conductor Mode').click();
-    // Click on the date picker that is left-most on the screen
-    await page.getByLabel('Global Time Conductor').locator('a').first().click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    // Click on the first cell
-    await page.getByText('27 239').click();
-    // Expect datepicker to close and time conductor date setting to be changed
-    await expect(page.getByRole('dialog')).toHaveCount(0);
-  });
-  test('Verify that user can use the datepicker in the ITC', async ({ page }) => {
-    const createdTimeList = await createDomainObjectWithDefaults(page, { type: 'Time List' });
-
-    await page.goto(createdTimeList.url, { waitUntil: 'domcontentloaded' });
-
-    await setIndependentTimeConductorBounds(page, {
-      start: '2024-11-12 19:11:11.000Z',
-      end: '2024-11-12 20:11:11.000Z'
-    });
-    // Open ITC
-    await page.getByLabel('Start bounds').nth(0).click();
-    // Click on the datepicker icon
-    await page.locator('form a').first().click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    // Click on the first cell
-    await page.getByText('7 342').click();
-    // Expect datepicker to close and time conductor date setting to be changed
-    await expect(page.getByRole('dialog')).toHaveCount(0);
-  });
-});

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

@@ -48,7 +48,7 @@ test.describe('Time conductor operations', () => {
     await setTimeConductorBounds(page, startDate);
 
     // Bring up the time conductor popup
-    const timeConductorMode = page.locator('.c-compact-tc');
+    const timeConductorMode = await page.locator('.c-compact-tc');
     await timeConductorMode.click();
     const startDateLocator = page.locator('input[type="text"]').first();
     const endDateLocator = page.locator('input[type="text"]').nth(2);

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

@@ -66,7 +66,7 @@ test.describe('Timer', () => {
   });
 });
 
-test.describe('Timer with target date @clock', () => {
+test.describe('Timer with target date', () => {
   let timer;
 
   test.beforeEach(async ({ page }) => {

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

@@ -191,7 +191,7 @@ test.describe('Recent Objects', () => {
 
     // Navigate to the clock and reveal it in the tree
     await page.goto(clock.url);
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     // Right click the clock and create an alias using the "link" context menu action
     const clockTreeItem = page
@@ -298,7 +298,7 @@ test.describe('Recent Objects', () => {
     // Assert that the list is empty
     expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(0);
   });
-  test('Verify functionality of "clear" and "collapse pane" buttons', async ({ page }) => {
+  test('Ensure clear recent objects button is active or inactive', async ({ page }) => {
     // Assert that the list initially contains 3 objects (clock, folder, my items)
     expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(3);
 
@@ -331,24 +331,6 @@ test.describe('Recent Objects', () => {
     expect(await page.getByRole('button', { name: 'Clear Recently Viewed' }).isEnabled()).toBe(
       true
     );
-
-    // Assert initial state of pane and collapse the Recent Objects panel
-    await expect(page.getByLabel('Expand Recently Viewed Pane')).toBeHidden();
-    await expect(page.getByLabel('Collapse Recently Viewed Pane')).toBeVisible();
-    await page.getByLabel('Collapse Recently Viewed Pane').click();
-
-    // Assert that the "Expand Recently Viewed Pane" button is visible
-    // and that the "Collapse Recently Viewed Pane" button is hidden
-    await expect(page.getByLabel('Expand Recently Viewed Pane')).toBeVisible();
-    await expect(page.getByLabel('Collapse Recently Viewed Pane')).toBeHidden();
-
-    // Expand the Recent Objects panel by clicking on the "Expand Recently Viewed Pane" button
-    await page.getByLabel('Expand Recently Viewed Pane').click();
-
-    // Assert that the "Expand Recently Viewed Pane" button is hidden
-    // and that the "Collapse Recently Viewed Pane" button is visible
-    await expect(page.getByLabel('Expand Recently Viewed Pane')).toBeHidden();
-    await expect(page.getByLabel('Collapse Recently Viewed Pane')).toBeVisible();
   });
 
   function assertInitialRecentObjectsListState() {

e2e/tests/functional/smoke.e2e.spec.js

@@ -48,7 +48,7 @@ test('Verify that the create button appears and that the Folder Domain Object is
   await expect(page.locator(':nth-match(:text("Folder"), 2)')).toBeEnabled();
 });
 
-test('Verify that My Items Tree appears', async ({ page, openmctConfig }) => {
+test('Verify that My Items Tree appears @ipad', async ({ page, openmctConfig }) => {
   const { myItemsFolderName } = openmctConfig;
   //Go to baseURL
   await page.goto('./');

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

@@ -109,7 +109,7 @@ test.describe('Verify tooltips', () => {
 
     async function getToolTip(object) {
       await page.locator('.c-create-button').hover();
-      await page.getByLabel('lad name').getByText(object.name).hover();
+      await page.getByRole('cell', { name: object.name }).hover();
       let tooltipText = await page.locator('.c-tooltip').textContent();
       return tooltipText.replace('\n', '').trim();
     }
@@ -265,8 +265,8 @@ test.describe('Verify tooltips', () => {
       name: 'Test Flexible Layout'
     });
 
-    await page.dragAndDrop(`text=${sineWaveObject1.name}`, '.c-fl-container >> nth=0');
-    await page.dragAndDrop(`text=${sineWaveObject3.name}`, '.c-fl-container >> nth=1');
+    await page.dragAndDrop(`text=${sineWaveObject1.name}`, '.c-fl__container >> nth=0');
+    await page.dragAndDrop(`text=${sineWaveObject3.name}`, '.c-fl__container >> nth=1');
 
     await page.locator('button[title="Save"]').click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
@@ -359,11 +359,7 @@ test.describe('Verify tooltips', () => {
     expect(tooltipText).toBe(sineWaveObject3.path);
   });
 
-  test.fixme('display tooltip path for telemetry table names', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7421'
-    });
+  test('display tooltip path for telemetry table names', async ({ page }) => {
     // set endBound to 10 seconds after start bound
     const url = await page.url();
     const parsedUrl = new URL(url.replace('#', '!'));

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

@@ -40,7 +40,7 @@ test.describe('Main Tree', () => {
       type: 'Folder'
     });
 
-    await page.getByLabel('Show selected item in tree').click();
+    await page.getByTitle('Show selected item in tree').click();
 
     const clock = await createDomainObjectWithDefaults(page, {
       type: 'Clock',

e2e/tests/functional/ui/inspector.e2e.spec.js

@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, 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 { createDomainObjectWithDefaults } from '../../../appActions.js';
-import { expect, test } from '../../../baseFixtures.js';
-
-// We don't need cspell to check this. It doesn't know latin.
-/* cSpell:disable */
-const loremIpsum = `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Molestie at elementum eu facilisis sed. Feugiat pretium nibh ipsum consequat. Amet consectetur adipiscing elit duis tristique sollicitudin nibh sit amet. Eget nullam non nisi est sit amet. A pellentesque sit amet porttitor eget dolor morbi non arcu. Ullamcorper sit amet risus nullam eget felis eget nunc. In tellus integer feugiat scelerisque varius morbi enim nunc. Ac feugiat sed lectus vestibulum mattis ullamcorper. Nulla facilisi morbi tempus iaculis urna id volutpat. Massa vitae tortor condimentum lacinia quis vel eros donec. Ornare quam viverra orci sagittis eu. Vestibulum sed arcu non odio. In egestas erat imperdiet sed euismod nisi porta lorem. Vitae auctor eu augue ut lectus arcu bibendum at. Donec adipiscing tristique risus nec feugiat in fermentum posuere urna. Velit euismod in pellentesque massa placerat duis ultricies. Nulla facilisi nullam vehicula ipsum a arcu cursus vitae. Aliquam malesuada bibendum arcu vitae elementum curabitur.
-Vel eros donec ac odio tempor orci. Et netus et malesuada fames ac turpis egestas sed tempus. Turpis egestas pretium aenean pharetra magna ac placerat. Euismod elementum nisi quis eleifend. Vitae auctor eu augue ut lectus arcu. At imperdiet dui accumsan sit amet nulla facilisi. Est velit egestas dui id ornare arcu odio ut sem. Ornare arcu dui vivamus arcu felis. Luctus venenatis lectus magna fringilla. At elementum eu facilisis sed. Tristique et egestas quis ipsum suspendisse ultrices gravida dictum. Enim eu turpis egestas pretium aenean pharetra magna ac placerat. Lobortis scelerisque fermentum dui faucibus in. Tempor orci eu lobortis elementum nibh tellus molestie nunc non. Dignissim convallis aenean et tortor at risus. Enim tortor at auctor urna nunc id cursus. Libero volutpat sed cras ornare arcu dui vivamus. Scelerisque fermentum dui faucibus in ornare quam viverra.
-Odio ut sem nulla pharetra. Neque vitae tempus quam pellentesque nec. A arcu cursus vitae congue mauris. Turpis nunc eget lorem dolor sed viverra ipsum nunc aliquet. Nibh tellus molestie nunc non blandit massa enim nec. Risus feugiat in ante metus dictum at tempor commodo ullamcorper. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Pulvinar elementum integer enim neque. Bibendum ut tristique et egestas. Nibh praesent tristique magna sit. Lectus magna fringilla urna porttitor. Eu non diam phasellus vestibulum lorem sed risus. Rhoncus mattis rhoncus urna neque. Rutrum tellus pellentesque eu tincidunt tortor aliquam. Pharetra convallis posuere morbi leo urna molestie at elementum. Quis commodo odio aenean sed adipiscing. Enim sit amet venenatis urna cursus eget nunc.
-Enim nec dui nunc mattis. Cursus turpis massa tincidunt dui ut. Donec adipiscing tristique risus nec feugiat in. Eleifend mi in nulla posuere sollicitudin. Donec enim diam vulputate ut pharetra sit. Ultricies mi eget mauris pharetra et ultrices neque. Eros in cursus turpis massa tincidunt dui. Cursus risus at ultrices mi tempus imperdiet nulla malesuada. Morbi enim nunc faucibus a pellentesque sit. Porttitor rhoncus dolor purus non. Ac tortor vitae purus faucibus.
-Proin libero nunc consequat interdum varius sit amet mattis vulputate. Metus dictum at tempor commodo ullamcorper a lacus vestibulum sed. Quisque non tellus orci ac auctor augue mauris. Id ornare arcu odio ut. Rhoncus est pellentesque elit ullamcorper dignissim. Senectus et netus et malesuada fames ac turpis egestas. Volutpat ac tincidunt vitae semper quis lectus nulla. Adipiscing elit duis tristique sollicitudin. Ipsum faucibus vitae aliquet nec ullamcorper sit. Gravida neque convallis a cras semper auctor neque vitae tempus. Porttitor leo a diam sollicitudin tempor id. Dictum non consectetur a erat nam at lectus. At volutpat diam ut venenatis tellus in. Morbi enim nunc faucibus a pellentesque sit amet. Cursus in hac habitasse platea. Sed augue lacus viverra vitae.
-`;
-
-test.describe('Inspector tests', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-
-  test('Content in inspector can be scrolled to vertically', async ({ page }) => {
-    const folderWithOverflowingTitle = await createDomainObjectWithDefaults(page, {
-      type: 'Folder',
-      name: loremIpsum
-    });
-
-    await page.goto(folderWithOverflowingTitle.url);
-
-    const inspectorPropertiesLocator = page
-      .getByRole('tabpanel', { name: 'Inspector Views' })
-      .getByLabel('Inspector Properties Details');
-    const inspectorPropertiesList = inspectorPropertiesLocator.getByRole('list');
-    const firstInspectorPropertyValue = inspectorPropertiesList
-      .getByRole('listitem')
-      .first()
-      .getByLabel('value', { exact: false });
-    const lastInspectorPropertyValue = inspectorPropertiesList
-      .getByRole('listitem')
-      .last()
-      .getByLabel('value', { exact: false });
-
-    // inspector content partially in viewport, but not all the way in viewport
-    await expect(inspectorPropertiesLocator).toBeInViewport();
-    await expect(inspectorPropertiesLocator).not.toBeInViewport({ ratio: 0.9 });
-
-    await expect(firstInspectorPropertyValue).toBeInViewport();
-    await expect(lastInspectorPropertyValue).not.toBeInViewport();
-
-    // using page.mouse.wheel to scroll the inspector content by the height of the content
-    // because click and scrollIntoView will scroll even if scrollbar not available
-    await inspectorPropertiesLocator.hover();
-    const offset = await inspectorPropertiesLocator.evaluate((el) => el.offsetHeight);
-    await page.mouse.wheel(0, offset);
-
-    await expect(lastInspectorPropertyValue).toBeInViewport();
-  });
-});

e2e/tests/mobile/smoke.e2e.spec.js

@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which can quickly verify that any openmct installation is
-operable and that any type of testing can proceed.
-
-Ideally, smoke tests should make zero assumptions about how and where they are run. This makes them
-more resilient to change and therefor a better indicator of failure. Smoke tests will also run quickly
-as they cover a very "thin surface" of functionality.
-
-When deciding between authoring new smoke tests or functional tests, ask yourself "would I feel
-comfortable running this test during a live mission?" Avoid creating or deleting Domain Objects.
-Make no assumptions about the order that elements appear in the DOM.
-*/
-
-import { expect, test } from '../../pluginFixtures.js';
-
-test.describe('Smoke tests for @mobile', () => {
-  test.beforeEach(async ({ page }) => {
-    //For now, this test is going to be hardcoded against './test-data/display_layout_with_child_layouts.json'
-    await page.goto('./');
-  });
-
-  test('Verify that My Items Tree appears @mobile', async ({ page }) => {
-    //My Items to be visible
-    await expect(page.getByRole('treeitem', { name: 'My Items' })).toBeVisible();
-  });
-
-  test('Verify that user can search @mobile', async ({ page }) => {
-    await page.getByRole('searchbox', { name: 'Search Input' }).click();
-    await page.getByRole('searchbox', { name: 'Search Input' }).fill('Parent Display Layout');
-    //Search Results appear in search modal
-    await expect(
-      page.getByLabel('Object Results').getByText('Parent Display Layout')
-    ).toBeVisible();
-    //Clicking on the search result takes you to the object
-    await page.getByLabel('Object Results').getByText('Parent Display Layout').click();
-    await page.getByTitle('Collapse Browse Pane').click();
-    await expect(page.getByRole('main').getByText('Parent Display Layout')).toBeVisible();
-  });
-
-  test('Verify that user can change time conductor @mobile', async ({ page }) => {
-    //Collapse Browse Pane to get more Time Conductor space
-    await page.getByLabel('Collapse Browse Pane').click();
-    //Open Time Conductor and change to Real Time Mode and set offset hour by 1 hour
-    // Disabling line because we're intentionally obscuring the text
-    // eslint-disable-next-line playwright/no-force-option
-    await page.getByLabel('Time Conductor Mode').click({ force: true });
-    await page.getByLabel('Time Conductor Mode Menu').click();
-    await page.getByLabel('Real-Time').click();
-    await page.getByLabel('Start offset hours').fill('01');
-    await page.getByLabel('Submit time offsets').click();
-    await expect(page.getByLabel('Start offset: 01:30:00')).toBeVisible();
-  });
-
-  test('Remove Object and confirmation dialog @mobile', async ({ page }) => {
-    await page.getByRole('searchbox', { name: 'Search Input' }).click();
-    await page.getByRole('searchbox', { name: 'Search Input' }).fill('Parent Display Layout');
-    //Search Results appear in search modal
-    //Clicking on the search result takes you to the object
-    await page.getByLabel('Object Results').getByText('Parent Display Layout').click();
-    await page.getByTitle('Collapse Browse Pane').click();
-    await expect(page.getByRole('main').getByText('Parent Display Layout')).toBeVisible();
-    //Verify both objects are in view
-    await expect(await page.getByLabel('Child Layout 1 Layout')).toBeVisible();
-    await expect(await page.getByLabel('Child Layout 2 Layout')).toBeVisible();
-    //Remove First Object to bring up confirmation dialog
-    await page.getByLabel('View menu items').nth(1).click();
-    await page.getByLabel('Remove').click();
-    await page.getByRole('button', { name: 'OK' }).click();
-    //Verify that the object is removed
-    await expect(await page.getByLabel('Child Layout 1 Layout')).toBeVisible();
-    expect(await page.getByLabel('Child Layout 2 Layout').count()).toBe(0);
-  });
-});

e2e/tests/performance/contract/imagery.contract.perf.spec.js

@@ -34,7 +34,7 @@ TODO:
 
 import { expect, test } from '@playwright/test';
 
-const filePath = 'test-data/PerformanceDisplayLayout.json';
+const filePath = 'e2e/test-data/PerformanceDisplayLayout.json';
 
 test.describe('Performance tests', () => {
   test.beforeEach(async ({ page, browser }, testInfo) => {
@@ -178,7 +178,7 @@ test.describe('Performance tests', () => {
     console.log('jpgResourceTiming ' + JSON.stringify(jpgResourceTiming));
 
     // Click Close Icon
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.locator('[aria-label="Close"]').click();
     await page.evaluate(() => window.performance.mark('view-large-close-button'));
 
     //await client.send('HeapProfiler.enable');

e2e/tests/performance/contract/notebook.contract.perf.spec.js

@@ -33,7 +33,7 @@ TODO:
 
 import { expect, test } from '@playwright/test';
 
-const notebookFilePath = 'test-data/PerformanceNotebook.json';
+const notebookFilePath = 'e2e/test-data/PerformanceNotebook.json';
 
 test.describe('Performance tests', () => {
   test.beforeEach(async ({ page, browser }, testInfo) => {