Return infinite values

.circleci/config.yml

@@ -2,11 +2,10 @@ version: 2.1
 executors:
   pw-focal-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.25.2-focal
+      - image: mcr.microsoft.com/playwright:v1.23.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)
 parameters:
   BUST_CACHE:
     description: "Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!"

.github/dependabot.yml

@@ -7,19 +7,12 @@ updates:
       interval: "daily"  
     open-pull-requests-limit: 10
     labels:
-      - "pr:e2e"
       - "type:maintenance"
       - "dependencies"
+      - "pr:e2e"
       - "pr:daveit"
+      - "pr:visual"
       - "pr:platform"
-    ignore:
-        #We have to source the container which is not detected by Dependabot
-      - dependency-name: "@playwright/test"
-        #Lots of noise in these type patch releases.
-      - dependency-name: "@babel/eslint-parser"
-        update-types: ["version-update:semver-patch"]
-      - dependency-name: "eslint-plugin-vue"
-        update-types: ["version-update:semver-patch"]
 
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/e2e-couchdb.yml

@@ -1,38 +0,0 @@
-name: "e2e-couchdb"
-on:
-  workflow_dispatch:
-  pull_request:
-    types:
-      - labeled
-      - opened
-env:
-  OPENMCT_DATABASE_NAME: openmct
-  COUCH_ADMIN_USER: admin
-  COUCH_ADMIN_PASSWORD: password
-  COUCH_BASE_LOCAL: http://localhost:5984
-  COUCH_NODE_NAME: nonode@nohost
-jobs:
-  e2e-couchdb:
-    if: ${{ github.event.label.name == 'pr:e2e:couchdb' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - run : docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
-      - run : sleep 3 # wait until CouchDB has started (TODO: there must be a better way)
-      - run : bash src/plugins/persistence/couch/setup-couchdb.sh
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-      - run: npx playwright@1.25.2 install
-      - run: npm install
-      - run: sh src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
-      - run: npm run test:e2e:couchdb
-      - run: ls -latr
-      - name: Archive test results
-        uses: actions/upload-artifact@v3
-        with:
-          path: test-results
-      - name: Archive html test results
-        uses: actions/upload-artifact@v3
-        with:
-          path: html-test-results

.github/workflows/e2e-pr.yml

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

.gitignore

@@ -36,10 +36,6 @@ report.*.json
 test-results
 html-test-results
 
-# couchdb scripting artifacts
-src/plugins/persistence/couch/.env.local
-index.html.bak
-
 # codecov artifacts
 .nyc_output
 coverage

API.md

@@ -390,7 +390,7 @@ A telemetry object is a domain object with a telemetry property.  To take an exa
             {
                 "key": "value",
                 "name": "Value",
-                "unit": "kilograms",
+                "units": "kilograms",
                 "format": "float",
                 "min": 0,
                 "max": 100,
@@ -425,7 +425,7 @@ attribute      | type   | flags    | notes
 `name`         | string | optional | a human readable label for this field.  If omitted, defaults to `key`.
 `source`       | string | optional | identifies the property of a datum where this value is stored.  If omitted, defaults to `key`.
 `format`       | string | optional | a specific format identifier, mapping to a formatter.  If omitted, uses a default formatter.  For enumerations, use `enum`.  For timestamps, use `utc` if you are using utc dates, otherwise use a key mapping to your custom date format.  
-`unit`        | string | optional | the unit of this value, e.g. `km`, `seconds`, `parsecs`
+`units`        | string | optional | the units of this value, e.g. `km`, `seconds`, `parsecs`
 `min`          | number | optional | the minimum possible value of this measurement.  Will be used by plots, gauges, etc to automatically set a min value.
 `max`          | number | optional | the maximum possible value of this measurement.  Will be used by plots, gauges, etc to automatically set a max value.
 `enumerations` | array  | optional | for objects where `format` is `"enum"`, this array tracks all possible enumerations of the value.  Each entry in this array is an object, with a `value` property that is the numerical value of the enumeration, and a `string` property that is the text value of the enumeration.  ex: `{"value": 0, "string": "OFF"}`.  If you use an enumerations array, `min` and `max` will be set automatically for you.
@@ -1082,4 +1082,4 @@ View provider Example:
         return openmct.priority.HIGH;
     }
 }
-```
+```

CONTRIBUTING.md

@@ -173,7 +173,7 @@ The following guidelines are provided for anyone contributing source code to the
 1. Avoid deep nesting (especially of functions), except where necessary
    (e.g. due to closure scope).
 1. End with a single new-line character.
-1. Always use ES6 `Class`es and inheritance rather than the pre-ES6 prototypal 
+1. Always use ES6 `Class`es and inheritence rather than the pre-ES6 prototypal 
    pattern.
 1. Within a given function's scope, do not mix declarations and imperative
    code, and  present these in the following order:
@@ -328,4 +328,4 @@ checklist).
 Write out a small list of tests performed with just enough detail for another developer on the team 
 to execute. 
 
-i.e. ```When Clicking on Add button, new `object` appears in dropdown.```
+i.e. ```When Clicking on Add button, new `object` appears in dropdown.```

e2e/.percy.yml

@@ -2,5 +2,4 @@ version: 2
 snapshot:
   widths: [1024, 2000]
   min-height: 1440 # px
-discovery:
-  concurrency: 2 # https://github.com/percy/cli/discussions/1067
+  

e2e/README.md

@@ -23,23 +23,21 @@ If this is your first time ever using the Playwright framework, we recommend goi
 Once you've got an understanding of Playwright, you'll need a baseline understanding of Open MCT:
 
 1. Follow the steps [Building and Running Open MCT Locally](../README.md#building-and-running-open-mct-locally)
-2. Once you're serving Open MCT locally, create a 'Display Layout' object. Save it.
+2. Once you're serving Open MCT locally, create an Example Telemetry Object (e.g.: 'Sine Wave Generator')
 3. Create a 'Plot' Object (e.g.: 'Stacked Plot')
-4. Create an Example Telemetry Object (e.g.: 'Sine Wave Generator')
-5. Expand the Tree and note the hierarchy of objects which were created.
-6. Navigate to the Demo Display Layout Object to edit and modify the embedded plot.
-7. Modify the embedded plot with Telemetry Data.
+4. Expand the Tree on the left-hand nav and drag and drop the Example Telemetry Object into the Plot Object
+5. Create a 'Display Layout' object
+6. From the Tree, Drag the Plot object into the Display Layout
 
 What you've created is a display which mimics the display that a mission control operator might use to understand and model telemetry data.
 
 Recreate the steps above with Playwright's codegen tool:
 
-1. `npm run start` in a terminal window to serve Open MCT locally
-2. `npx @playwright/test install` to install playwright and dependencies
-3. Open another terminal window and start the Playwright codegen application `npx playwright codegen`
-4. Navigate the browser to `http://localhost:8080`
-5. Click the Create button and notice how your actions in the browser are being recorded in the Playwright Inspector
-6. Continue through the steps 2-6 above
+1. `npm run start` in a terminal window
+2. Open another terminal window and start the Playwright codegen application `npx playwright codegen`
+3. Navigate the browser to `http://localhost:8080`
+4. Click the Create button and notice how your actions in the browser are being recorded in the Playwright Inspector
+5. Continue through the steps 2-6 above
 
 What you've created is an automated test which mimics the creation of a mission control display.
 
@@ -70,85 +68,80 @@ The bulk of our e2e coverage lies in "functional" test coverage which verifies t
 Visual Testing is an essential part of our e2e strategy as it ensures that the application _appears_ correctly to a user while it compliments the functional e2e suite. It would be impractical to make thousands of assertions functional assertions on the look and feel of the application. Visual testing is interested in getting the DOM into a specified state and then comparing that it has not changed against a baseline.
 
 For a better understanding of the visual issues which affect Open MCT, please see our bug tracker with the `label:visual` filter applied [here](https://github.com/nasa/openmct/issues?q=label%3Abug%3Avisual+)
-To read about how to write a good visual test, please see [How to write a great Visual Test](#how-to-write-a-great-visual-test).
+To read about how to write a good visual test, please see [How to write a great Visual Test](#how-to-write-a-great-visual-test). 
 
 `npm run test:e2e:visual` 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.
 
 #### 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)
 
 ### (Advanced) Snapshot Testing
 
 Snapshot testing is very similar to visual testing but allows us to be more precise in detecting change without relying on a 3rd party service. Unfortuantely, this precision requires advanced test setup and teardown and so we're using this pattern as a last resort.
 
-To give an example, if a _single_ visual test assertion for an Overlay plot is run through multiple DOM rendering engines at various viewports to see how the Plot looks. If that same test were run as a snapshot test, it could only be executed against a single browser, on a single platform (ubuntu docker container).
+To give an example, if a *single* visual test assertion for an Overlay plot is run through multiple DOM rendering engines at various viewports to see how the Plot looks. If that same test were run as a snapshot test, it could only be executed against a single browser, on a single platform (ubuntu docker container).
 
 Read more about [Playwright Snapshots](https://playwright.dev/docs/test-snapshots)
 
-#### Open MCT's implementation
+Open MCT's implementation
+-Our Snapshot tests receive a @snapshot tag.
+-Snapshots need to be executed within the official playwright container to ensure we're using the exact rendering platform in CI and locally
 
-- Our Snapshot tests receive a `@snapshot` tag.
-- Snapshots need to be executed within the official Playwright container to ensure we're using the exact rendering platform in CI and locally.
-
-```sh
+```
 docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:[GET THIS VERSION FROM OUR CIRCLECI CONFIG FILE]-focal /bin/bash
 npm install
 npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
 ```
 
-### (WIP) Updating Snapshots
-
-When the `@snapshot` tests fail, they will need to be evaluated to see if the failure is an acceptable change or
+(WIP) Updating Snapshots
+When the @snapshot tests fail, they will need to be evaluated to see if the failure is an acceptable change or 
 
 ## Performance Testing
 
 The open source performance tests function mostly as a contract for the locator logic, functionality, and assumptions will work in our downstream, closed source test suites.
 
-They're found under `./e2e/tests/performance` and are to be executed with the following npm script:
+They're found in the `/e2e/tests/performance` repo and are to be executed with the following npm script:
 
-`npm run test:perf`
+```npm run test:perf```
 
-These tests are expected to become blocking and gating with assertions as we extend the capabilities of Playwright.
+These tests are expected to become blocking and gating with assertions as we extend the capabilities of playwright.
 
 ## Test Architecture and CI
 
 ### Architecture (TODO)
 
+
+
 ### File Structure
 
 Our file structure follows the type of type of testing being excercised at the e2e layer and files containing test suites which matcher application behavior or our `src` and `example` layout. This area is not well refined as we figure out what works best for closed source and downstream projects. This may change altogether if we move `e2e` to it's own npm package.
 
-- `./helper` - contains helper functions or scripts which are leveraged directly within the testsuites. i.e. non-default plugin scripts injected into DOM
-- `./test-data` - contains test data which is leveraged or generated in the functional, performance, or visual test suites. i.e. localStorage data
-- `./tests/functional` - the bulk of the tests are contained within this folder to verify the functionality of open mct
-- `./tests/functional/example/` - tests which specifically verify the example plugins
-- `./tests/functional/plugins/` - tests which loosely test each plugin. This folder is the most likely to change. Note: some @snapshot tests are still contained within this structure
-- `./tests/framework/` - tests which verify that our testframework functionality and assumptions will continue to work based on further refactoring or playwright version changes
-- `./tests/performance/` - performance tests
-- `./tests/visual/` - Visual tests
-- `./appActions.js` - Contains common fixtures which can be leveraged by testcase authors to quickly move through the application when writing new tests.
-- `./baseFixture.js` - Contains base fixtures which only extend default `@playwright/test` functionality. The goal is to remove these fixtures as native Playwright APIs improve.
+ - `./helper` - contains helper functions or scripts which are leveraged directly within the testsuites. i.e. non-default plugin scripts injected into DOM
+ - `./test-data` - contains test data which is leveraged or generated in the functional, performance, or visual test suites. i.e. localStorage data
+ - `./tests/functional` - the bulk of the tests are contained within this folder to verify the functionality of open mct
+ - `./tests/functional/example/` - tests which specifically verify the example plugins
+ - `./tests/functional/plugins/` - tests which loosely test each plugin. This folder is the most likely to change. Note: some @snapshot tests are still contained within this structure
+ - `./tests/framework/` - tests which verify that our testframework functionality and assumptions will continue to work based on further refactoring or playwright version changes
+ - `./tests/performance/` - performance tests
+ - `./tests/visual/` - Visual tests
+ - `./appActions.js` - Contains common fixtures which can be leveraged by testcase authors to quickly move through the application when writing new tests.
+ - `./baseFixture.js` - Contains base fixtures which only extend default `@playwright/test` functionality. The goal is to remove these fixtures as native Playwright APIs improve.
 
-Our functional tests end in `*.e2e.spec.js`, visual tests in `*.visual.spec.js` and performance tests in `*.perf.spec.js`.
+Our functional tests end in `*.e2e.spec.js`, visual tests in `*.visual.spec.js` and performance tests in `*.perf.spec.js`. 
 
 ### Configuration
 
 Where possible, we try to run Open MCT without modification or configuration change so that the Open MCT doesn't fail exclusively in "test mode" or in "production mode".
 
 Open MCT is leveraging the [config file](https://playwright.dev/docs/test-configuration) pattern to describe the capabilities of Open MCT e2e _where_ it's run
-
 - `./playwright-ci.config.js` - Used when running in CI or to debug CI issues locally
 - `./playwright-local.config.js` - Used when running locally
 - `./playwright-performance.config.js` - Used when running performance tests in CI or locally
 - `./playwright-visual.config.js` - Used to run the visual tests in CI or locally
-
 #### Test Tags
 
-Test tags are a great way of organizing tests outside of a file structure. To learn more see the official documentation [here](https://playwright.dev/docs/test-annotations#tag-tests).
-
+Test tags are a great way of organizing tests outside of a file structure. To learn more see the official documentation [here](https://playwright.dev/docs/test-annotations#tag-tests)
 Current list of test tags:
-
 - `@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).
 - `@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 app.js.
@@ -159,42 +152,34 @@ Current list of test tags:
 
 ### Continuous Integration
 
-The cheapest time to catch a bug is pre-merge. Unfortuantely, this is the most expensive time to run all of the tests since each merge event can consist of hundreds of commits. For this reason, we're selective in _what we run_ as much as _when we run it_.
+The cheapest time to catch a bug is Pre-merge. Unfortuantely, this is the most expensive time to run all of the tests since each Merge event can consistent of hundreds of commits. For this reason, we're selective in _what_ we run as much as _when_ we run it.
 
-We leverage CircleCI to run tests against each commit and inject the Test Reports which are generated by Playwright so that they team can keep track of flaky and [historical test trends](https://app.circleci.com/insights/github/nasa/openmct/workflows/overall-circleci-commit-status/tests?branch=master&reporting-window=last-30-days)
+We leverage CircleCI to run tests against each commit and inject the Test Reports which are generated by playwright so that they team can keep track of flaky and [historical Test Trends](https://app.circleci.com/insights/github/nasa/openmct/workflows/overall-circleci-commit-status/tests?branch=master&reporting-window=last-30-days)
 
 We leverage Github Actions / Workflows to execute tests as it gives us the ability to run against multiple operating systems with greater control over git event triggers (i.e. Run on a PR Comment event).
 
 Our CI environment consists of 3 main modes of operation:
 
 #### 1. Per-Commit Testing
-
 CircleCI
-
 - Stable e2e tests against ubuntu and chrome
 - Performance tests against ubuntu and chrome
 - e2e tests are linted
 
 #### 2. Per-Merge Testing
-
 Github Actions / Workflow
-
 - Full suite against all browsers/projects. Triggered with Github Label Event 'pr:e2e'
 - Visual Tests. Triggered with Github Label Event 'pr:visual'
 
 #### 3. Scheduled / Batch Testing
-
 Nightly Testing in Circle CI
-
 - Full e2e suite against ubuntu and chrome
 - Performance tests against ubuntu and chrome
 
 Github Actions / Workflow
-
 - Visual Test baseline generation.
 
 #### Parallelism and Fast Feedback
-
 In order to provide fast feedback in the Per-Commit context, we try to keep total test feedback at 5 minutes or less. That is to say, A developer should have a pass/fail result in under 5 minutes.
 
 Playwright has native support for semi-intelligent sharding. Read about it [here](https://playwright.dev/docs/test-parallel#shard-tests-between-multiple-machines).
@@ -206,7 +191,6 @@ In addition to the Parallelization of Test Runners (Sharding), we're also runnin
 So for every commit, Playwright is effectively running 4 x 2 concurrent browsercontexts to keep the overall runtime to a miminum.
 
 At the same time, we don't want to waste CI resources on parallel runs, so we've configured each shard to fail after 5 test failures. Test failure logs are recorded and stored to allow fast triage.
-
 #### Test Promotion
 
 In order to maintain fast and reliable feedback, tests go through a promotion process. All new test cases or test suites must be labeled with the `@unstable` annotation. The Open MCT dev team runs these unstable tests in our private repos to ensure they work downstream and are reliable.
@@ -214,66 +198,24 @@ In order to maintain fast and reliable feedback, tests go through a promotion pr
 To run the stable tests, use the ```npm run test:e2e:stable``` command. To run the new and flaky tests, use the ```npm run test:e2e:unstable``` command.
 
 A testcase and testsuite are to be unmarked as @unstable when:
-
 1. They run as part of "full" run 5 times without failure.
 2. They've been by a Open MCT Developer 5 times in the closed source repo without failure.
 
 ### Cross-browser and Cross-operating system
 
-#### **What's supported:**
-
-We are leveraging the `browserslist` project to declare our supported list of browsers.
-
-#### **Where it's tested:**
-
-We lint on `browserslist` to ensure that we're not implementing deprecated browser APIs and are aware of browser API improvements over time.
-
-We also have the need to execute our e2e tests across this published list of browsers. Our browsers and browser version matrix is found inside of our `./playwright-*.config.js`, but mostly follows in order of bleeding edge to stable:
-
-- `playwright-chromium channel:beta`
-  - A beta version of Chromium from official chromium channels. As close to the bleeding edge as we can get.
-- `playwright-chromium`
-  - A stable version of Chromium from the official chromium channels. This is always at least 1 version ahead of desktop chrome.
-- `playwright-chrome`
-  - The stable channel of Chrome from the official chrome channels. This is always 2 versions behind chromium.
-
-#### **Mobile**
-
-We have the Mission-need to support iPad. To run our iPad suite, please see our `playwright-*.config.js` with the 'iPad' project.
-
-#### **Skipping or executing tests based on browser, os, and/os browser version:**
-
-Conditionally skipping tests based on browser (**RECOMMENDED**):
-
-```js
-test('Can adjust image brightness/contrast by dragging the sliders', async ({ page, browserName }) => {
-  // eslint-disable-next-line playwright/no-skipped-test
-  test.skip(browserName === 'firefox', 'This test needs to be updated to work with firefox');
-
-  // ...
-```
-
-Conditionally skipping tests based on OS:
-
-```js
-test('Can adjust image brightness/contrast by dragging the sliders', async ({ page }) => {
-  // eslint-disable-next-line playwright/no-skipped-test
-  test.skip(process.platform === 'darwin', 'This test needs to be updated to work with MacOS');
-
-  // ...
-```
-
-Skipping based on browser version (Rarely used): <https://github.com/microsoft/playwright/discussions/17318>
+- Where is it tested
+- What's supported
+- Mobile
 
 ## Test Design, Best Practices, and Tips & Tricks
 
 ### Test Design (TODO)
 
 - How to make tests robust to function in other contexts (VISTA, VIPER, etc.)
-  - Leverage the use of `appActions.js` methods such as `createDomainObjectWithDefaults()`
+  - Leverage the use of appActions.js like getOrCreateDomainObject
 - How to make tests faster and more resilient
   - When possible, navigate directly by URL
-  - Leverage `await page.goto('./', { waitUntil: 'networkidle' });`
+  - Leverage ```await page.goto('/', { waitUntil: 'networkidle' });```
   - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.
 
 ### How to write a great test (TODO)
@@ -296,7 +238,6 @@ There are instances where multiple browser pages will need to be opened to verif
 Test Reporting is done through official Playwright reporters and the CI Systems which execute them.
 
 We leverage the following official Playwright reporters:
-
 - HTML
 - junit
 - github annotations
@@ -306,7 +247,6 @@ We leverage the following official Playwright reporters:
 When running the tests locally with the `npm run test:local` command, the html report will open automatically on failure. Inside this HTML report will be a complete summary of the finished tests. If the tests failed, you'll see embedded links to screenshot failure, execution logs, and the Tracefile.
 
 When looking at the reports run in CI, you'll leverage this same HTML Report which is hosted either in CircleCI or Github Actions as a build artifact.
-
 ### e2e Code Coverage
 
 Code coverage is collected during test execution using our custom [baseFixture](./baseFixtures.js). The raw coverage files are stored in a `.nyc_report` directory to be converted into a lcov file with the following [nyc](https://github.com/istanbuljs/nyc) command:
@@ -315,14 +255,13 @@ Code coverage is collected during test execution using our custom [baseFixture](
 
 At this point, the nyc linecov report can be published to [codecov.io](https://about.codecov.io/) with the following command:
 
-```npm run cov:e2e:stable:publish``` for the stable suite running in ubuntu.
-or
+```npm run cov:e2e:stable:publish``` for the stable suite running in ubuntu. 
+or 
 ```npm run cov:e2e:full:publish``` for the full suite running against all available platforms.
 
 Codecov.io will combine each of the above commands with [Codecov.io Flags](https://docs.codecov.com/docs/flags). Effectively, this allows us to combine multiple reports which are run at various stages of our CI Pipeline or run as part of a parallel process.
 
 This e2e coverage is combined with our unit test report to give a comprehensive (if flawed) view of line coverage.
-
 ## Other
 
 ### About e2e testing
@@ -375,6 +314,6 @@ A single e2e test in Open MCT is extended to run:
 
 - Why is my test failing on CI and not locally?
 - How can I view the failing tests on CI?
-- Tests won't start because 'Error: <http://localhost:8080/># is already used...'
+- Tests won't start because 'Error: http://localhost:8080/# is already used...'
 This error will appear when running the tests locally. Sometimes, the webserver is left in an orphaned state and needs to be cleaned up. To clear up the orphaned webserver, execute the following from your Terminal:
 ```lsof -n -i4TCP:8080 | awk '{print$2}' | tail -1 | xargs kill -9```

e2e/appActions.js

@@ -30,39 +30,18 @@
  */
 
 /**
- * Defines parameters to be used in the creation of a domain object.
- * @typedef {Object} CreateObjectOptions
- * @property {string} type the type of domain object to create (e.g.: "Sine Wave Generator").
- * @property {string} [name] the desired name of the created domain object.
- * @property {string | import('../src/api/objects/ObjectAPI').Identifier} [parent] the Identifier or uuid of the parent object.
- */
-
-/**
- * Contains information about the newly created domain object.
- * @typedef {Object} CreatedObjectInfo
- * @property {string} name the name of the created object
- * @property {string} uuid the uuid of the created object
- * @property {string} url the relative url to the object (for use with `page.goto()`)
- */
-
-const Buffer = require('buffer').Buffer;
-
-/**
- * This common function creates a domain object with the default options. It is the preferred way of creating objects
+ * This common function creates a `domainObject` with default options. It is the preferred way of creating objects
  * in the e2e suite when uninterested in properties of the objects themselves.
- *
  * @param {import('@playwright/test').Page} page
- * @param {CreateObjectOptions} options
- * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
+ * @param {string} type
+ * @param {string | undefined} name
  */
-async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine' }) {
-    const parentUrl = await getHashUrlToDomainObject(page, parent);
-
-    // Navigate to the parent object. This is necessary to create the object
-    // in the correct location, such as a folder, layout, or plot.
-    await page.goto(`${parentUrl}?hideTree=true`);
+async function createDomainObjectWithDefaults(page, type, name) {
+    // Navigate to focus the 'My Items' folder, and hide the object tree
+    // This is necessary so that subsequent objects can be created without a parent
+    // TODO: Ideally this would navigate to a common `e2e` folder
+    await page.goto('./#/browse/mine?hideTree=true');
     await page.waitForLoadState('networkidle');
-
     //Click the Create button
     await page.click('button:has-text("Create")');
 
@@ -71,7 +50,7 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
 
     // Modify the name input field of the domain object to accept 'name'
     if (name) {
-        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+        const nameInput = page.locator('input[type="text"]').nth(2);
         await nameInput.fill("");
         await nameInput.fill(name);
     }
@@ -84,253 +63,30 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
         page.waitForSelector('.c-message-banner__message')
     ]);
 
-    // Wait until the URL is updated
-    await page.waitForURL(`**/${parent}/*`);
-    const uuid = await getFocusedObjectUuid(page);
-    const objectUrl = await getHashUrlToDomainObject(page, uuid);
-
-    if (await _isInEditMode(page, uuid)) {
-        // Save (exit edit mode)
-        await page.locator('button[title="Save"]').click();
-        await page.locator('li[title="Save and Finish Editing"]').click();
-    }
-
-    return {
-        name: name || `Unnamed ${type}`,
-        uuid: uuid,
-        url: objectUrl
-    };
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- * @param {string} name
- */
-async function expandTreePaneItemByName(page, name) {
-    const treePane = page.locator('#tree-pane');
-    const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
-    const expandTriangle = treeItem.locator('.c-disclosure-triangle');
-    await expandTriangle.click();
-}
-
-/**
- * Create a Plan object from JSON with the provided options.
- * @param {import('@playwright/test').Page} page
- * @param {*} options
- * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
- */
-async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
-    const parentUrl = await getHashUrlToDomainObject(page, parent);
-
-    // Navigate to the parent object. This is necessary to create the object
-    // in the correct location, such as a folder, layout, or plot.
-    await page.goto(`${parentUrl}?hideTree=true`);
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click 'Plan' menu option
-    await page.click(`li:text("Plan")`);
-
-    // Modify the name input field of the domain object to accept 'name'
-    if (name) {
-        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-        await nameInput.fill("");
-        await nameInput.fill(name);
-    }
-
-    // Upload buffer from memory
-    await page.locator('input#fileElem').setInputFiles({
-        name: 'plan.txt',
-        mimeType: 'text/plain',
-        buffer: Buffer.from(JSON.stringify(json))
-    });
-
-    // Click OK button and wait for Navigate event
-    await Promise.all([
-        page.waitForLoadState(),
-        page.click('[aria-label="Save"]'),
-        // Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
-
-    // Wait until the URL is updated
-    await page.waitForURL(`**/mine/*`);
-    const uuid = await getFocusedObjectUuid(page);
-    const objectUrl = await getHashUrlToDomainObject(page, uuid);
-
-    return {
-        uuid,
-        name,
-        url: objectUrl
-    };
+    return name || `Unnamed ${type}`;
 }
 
 /**
 * Open the given `domainObject`'s context menu from the object tree.
-* Expands the path to the object and scrolls to it if necessary.
-*
+* Expands the 'My Items' folder if it is not already expanded.
 * @param {import('@playwright/test').Page} page
-* @param {string} url the url to the object
+* @param {string} myItemsFolderName the name of the "My Items" folder
+* @param {string} domainObjectName the display name of the `domainObject`
 */
-async function openObjectTreeContextMenu(page, url) {
-    await page.goto(url);
-    await page.click('button[title="Show selected item in tree"]');
-    await page.locator('.is-navigated-object').click({
+async function openObjectTreeContextMenu(page, myItemsFolderName, domainObjectName) {
+    const myItemsFolder = page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3);
+    const className = await myItemsFolder.getAttribute('class');
+    if (!className.includes('c-disclosure-triangle--expanded')) {
+        await myItemsFolder.click();
+    }
+
+    await page.locator(`a:has-text("${domainObjectName}")`).click({
         button: 'right'
     });
 }
 
-/**
- * Gets the UUID of the currently focused object by parsing the current URL
- * and returning the last UUID in the path.
- * @param {import('@playwright/test').Page} page
- * @returns {Promise<string>} the uuid of the focused object
- */
-async function getFocusedObjectUuid(page) {
-    const UUIDv4Regexp = /[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/gi;
-    const focusedObjectUuid = await page.evaluate((regexp) => {
-        return window.location.href.split('?')[0].match(regexp).at(-1);
-    }, UUIDv4Regexp);
-
-    return focusedObjectUuid;
-}
-
-/**
- * Returns the hashUrl to the domainObject given its uuid.
- * Useful for directly navigating to the given domainObject.
- *
- * URLs returned will be of the form `'./browse/#/mine/<uuid0>/<uuid1>/...'`
- *
- * @param {import('@playwright/test').Page} page
- * @param {string} uuid the uuid of the object to get the url for
- * @returns {Promise<string>} the url of the object
- */
-async function getHashUrlToDomainObject(page, uuid) {
-    const hashUrl = await page.evaluate(async (objectUuid) => {
-        const path = await window.openmct.objects.getOriginalPath(objectUuid);
-        let url = './#/browse/' + [...path].reverse()
-            .map((object) => window.openmct.objects.makeKeyString(object.identifier))
-            .join('/');
-
-        // Drop the vestigial '/ROOT' if it exists
-        if (url.includes('/ROOT')) {
-            url = url.split('/ROOT').join('');
-        }
-
-        return url;
-    }, uuid);
-
-    return hashUrl;
-}
-
-/**
- * Utilizes the OpenMCT API to detect if the given object has an active transaction (is in Edit mode).
- * @private
- * @param {import('@playwright/test').Page} page
- * @param {string | import('../src/api/objects/ObjectAPI').Identifier} identifier
- * @return {Promise<boolean>} true if the object has an active transaction, false otherwise
- */
-async function _isInEditMode(page, identifier) {
-    // eslint-disable-next-line no-return-await
-    return await page.evaluate((objectIdentifier) => window.openmct.objects.isTransactionActive(objectIdentifier), identifier);
-}
-
-/**
- * Set the time conductor mode to either fixed timespan or realtime mode.
- * @param {import('@playwright/test').Page} page
- * @param {boolean} [isFixedTimespan=true] true for fixed timespan mode, false for realtime mode; default is true
- */
-async function setTimeConductorMode(page, isFixedTimespan = true) {
-    // Click 'mode' button
-    await page.locator('.c-mode-button').click();
-
-    // Switch time conductor mode
-    if (isFixedTimespan) {
-        await page.locator('data-testid=conductor-modeOption-fixed').click();
-    } else {
-        await page.locator('data-testid=conductor-modeOption-realtime').click();
-    }
-}
-
-/**
- * Set the time conductor to fixed timespan mode
- * @param {import('@playwright/test').Page} page
- */
-async function setFixedTimeMode(page) {
-    await setTimeConductorMode(page, true);
-}
-
-/**
- * Set the time conductor to realtime mode
- * @param {import('@playwright/test').Page} page
- */
-async function setRealTimeMode(page) {
-    await setTimeConductorMode(page, false);
-}
-
-/**
- * @typedef {Object} OffsetValues
- * @property {string | undefined} hours
- * @property {string | undefined} mins
- * @property {string | undefined} secs
- */
-
-/**
- * Set the values (hours, mins, secs) for the TimeConductor offsets when in realtime mode
- * @param {import('@playwright/test').Page} page
- * @param {OffsetValues} offset
- * @param {import('@playwright/test').Locator} offsetButton
- */
-async function setTimeConductorOffset(page, {hours, mins, secs}, offsetButton) {
-    await offsetButton.click();
-
-    if (hours) {
-        await page.fill('.pr-time-controls__hrs', hours);
-    }
-
-    if (mins) {
-        await page.fill('.pr-time-controls__mins', mins);
-    }
-
-    if (secs) {
-        await page.fill('.pr-time-controls__secs', secs);
-    }
-
-    // Click the check button
-    await page.locator('.pr-time__buttons .icon-check').click();
-}
-
-/**
- * Set the values (hours, mins, secs) for the start time offset when in realtime mode
- * @param {import('@playwright/test').Page} page
- * @param {OffsetValues} offset
- */
-async function setStartOffset(page, offset) {
-    const startOffsetButton = page.locator('data-testid=conductor-start-offset-button');
-    await setTimeConductorOffset(page, offset, startOffsetButton);
-}
-
-/**
- * Set the values (hours, mins, secs) for the end time offset when in realtime mode
- * @param {import('@playwright/test').Page} page
- * @param {OffsetValues} offset
- */
-async function setEndOffset(page, offset) {
-    const endOffsetButton = page.locator('data-testid=conductor-end-offset-button');
-    await setTimeConductorOffset(page, offset, endOffsetButton);
-}
-
 // eslint-disable-next-line no-undef
 module.exports = {
     createDomainObjectWithDefaults,
-    expandTreePaneItemByName,
-    createPlanFromJSON,
-    openObjectTreeContextMenu,
-    getHashUrlToDomainObject,
-    getFocusedObjectUuid,
-    setFixedTimeMode,
-    setRealTimeMode,
-    setStartOffset,
-    setEndOffset
+    openObjectTreeContextMenu
 };

e2e/helper/addInitExampleFaultProvider.js

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

e2e/helper/addInitExampleFaultProviderStatic.js

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

e2e/helper/addInitFaultManagementPlugin.js

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

e2e/helper/faultUtils.js

@@ -1,277 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const path = require('path');
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function navigateToFaultManagementWithExample(page) {
-    // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, './', 'addInitExampleFaultProvider.js') });
-
-    await navigateToFaultItemInTree(page);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function navigateToFaultManagementWithStaticExample(page) {
-    // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, './', 'addInitExampleFaultProviderStatic.js') });
-
-    await navigateToFaultItemInTree(page);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function navigateToFaultManagementWithoutExample(page) {
-    // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, './', 'addInitFaultManagementPlugin.js') });
-
-    await navigateToFaultItemInTree(page);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function navigateToFaultItemInTree(page) {
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    // Click text=Fault Management
-    await page.click('text=Fault Management'); // this verifies the plugin has been added
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function acknowledgeFault(page, rowNumber) {
-    await openFaultRowMenu(page, rowNumber);
-    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
- */
-async function shelveMultipleFaults(page, ...nums) {
-    const selectRows = nums.map((num) => {
-        return selectFaultItem(page, num);
-    });
-    await Promise.all(selectRows);
-
-    await page.locator('button:has-text("Shelve")').click();
-    await page.locator('[aria-label="Save"]').click();
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-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.locator('[aria-label="Save"]').click();
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function shelveFault(page, rowNumber) {
-    await openFaultRowMenu(page, rowNumber);
-    await page.locator('.c-menu >> text="Shelve"').click();
-    // Click [aria-label="Save"]
-    await page.locator('[aria-label="Save"]').click();
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function changeViewTo(page, view) {
-    await page.locator('.c-fault-mgmt__search-row select').first().selectOption(view);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function sortFaultsBy(page, sort) {
-    await page.locator('.c-fault-mgmt__list-header-sortButton select').selectOption(sort);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function enterSearchTerm(page, term) {
-    await page.locator('.c-fault-mgmt-search [aria-label="Search Input"]').fill(term);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function clearSearch(page) {
-    await enterSearchTerm(page, '');
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function selectFaultItem(page, rowNumber) {
-    // eslint-disable-next-line playwright/no-force-option
-    await page.check(`.c-fault-mgmt-item > input >> nth=${rowNumber - 1}`, { force: true }); // this will not work without force true, saw this may be a pw bug
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getHighestSeverity(page) {
-    const criticalCount = await page.locator('[title=CRITICAL]').count();
-    const warningCount = await page.locator('[title=WARNING]').count();
-
-    if (criticalCount > 0) {
-        return 'CRITICAL';
-    } else if (warningCount > 0) {
-        return 'WARNING';
-    }
-
-    return 'WATCH';
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getLowestSeverity(page) {
-    const warningCount = await page.locator('[title=WARNING]').count();
-    const watchCount = await page.locator('[title=WATCH]').count();
-
-    if (watchCount > 0) {
-        return 'WATCH';
-    } else if (warningCount > 0) {
-        return 'WARNING';
-    }
-
-    return 'CRITICAL';
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getFaultResultCount(page) {
-    const count = await page.locator('.c-faults-list-view-item-body > .c-fault-mgmt__list').count();
-
-    return count;
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-function getFault(page, rowNumber) {
-    const fault = page.locator(`.c-faults-list-view-item-body > .c-fault-mgmt__list >> nth=${rowNumber - 1}`);
-
-    return fault;
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-function getFaultByName(page, name) {
-    const fault = page.locator(`.c-fault-mgmt__list-faultname:has-text("${name}")`);
-
-    return fault;
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getFaultName(page, rowNumber) {
-    const faultName = await page.locator(`.c-fault-mgmt__list-faultname >> nth=${rowNumber - 1}`).textContent();
-
-    return faultName;
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-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');
-
-    return faultSeverity;
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getFaultNamespace(page, rowNumber) {
-    const faultNamespace = await page.locator(`.c-fault-mgmt__list-path >> nth=${rowNumber - 1}`).textContent();
-
-    return faultNamespace;
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getFaultTriggerTime(page, rowNumber) {
-    const faultTriggerTime = await page.locator(`.c-fault-mgmt__list-trigTime >> nth=${rowNumber - 1} >> .c-fault-mgmt-item__value`).textContent();
-
-    return faultTriggerTime.toString().trim();
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function openFaultRowMenu(page, rowNumber) {
-    // select
-    await page.locator(`.c-fault-mgmt-item > .c-fault-mgmt__list-action-button >> nth=${rowNumber - 1}`).click();
-
-}
-
-// eslint-disable-next-line no-undef
-module.exports = {
-    navigateToFaultManagementWithExample,
-    navigateToFaultManagementWithStaticExample,
-    navigateToFaultManagementWithoutExample,
-    navigateToFaultItemInTree,
-    acknowledgeFault,
-    shelveMultipleFaults,
-    acknowledgeMultipleFaults,
-    shelveFault,
-    changeViewTo,
-    sortFaultsBy,
-    enterSearchTerm,
-    clearSearch,
-    selectFaultItem,
-    getHighestSeverity,
-    getLowestSeverity,
-    getFaultResultCount,
-    getFault,
-    getFaultByName,
-    getFaultName,
-    getFaultSeverity,
-    getFaultNamespace,
-    getFaultTriggerTime,
-    openFaultRowMenu
-};

e2e/helper/notebookUtils.js

@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function enterTextEntry(page, text) {
-    // Click .c-notebook__drag-area
-    await page.locator(NOTEBOOK_DROP_AREA).click();
-
-    // enter text
-    await page.locator('div.c-ne__text').click();
-    await page.locator('div.c-ne__text').fill(text);
-    await page.locator('div.c-ne__text').press('Enter');
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function dragAndDropEmbed(page, myItemsFolderName) {
-    // Click button:has-text("Create")
-    await page.locator('button:has-text("Create")').click();
-    // Click li:has-text("Sine Wave Generator")
-    await page.locator('li:has-text("Sine Wave Generator")').click();
-    // Click form[name="mctForm"] >> text=My Items
-    await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
-    // Click text=OK
-    await page.locator('text=OK').click();
-    // Click text=Open MCT My Items >> span >> nth=3
-    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
-    // Click text=Unnamed CUSTOM_NAME
-    await Promise.all([
-        page.waitForNavigation(),
-        page.locator('text=Unnamed CUSTOM_NAME').click()
-    ]);
-
-    await page.dragAndDrop('text=UNNAMED SINE WAVE GENERATOR', NOTEBOOK_DROP_AREA);
-}
-
-// eslint-disable-next-line no-undef
-module.exports = {
-    enterTextEntry,
-    dragAndDropEmbed
-};

e2e/playwright-visual.config.js

@@ -4,11 +4,11 @@
 
 /** @type {import('@playwright/test').PlaywrightTestConfig<{ theme: string }>} */
 const config = {
-    retries: 1, // visual tests should never retry due to snapshot comparison errors. Leaving as a shim
+    retries: 0, // visual tests should never retry due to snapshot comparison errors
     testDir: 'tests/visual',
     testMatch: '**/*.visual.spec.js', // only run visual tests
     timeout: 60 * 1000,
-    workers: 1, //Lower stress on Circle CI Agent for Visual tests https://github.com/percy/cli/discussions/1067
+    workers: 2, //Limit to 2 for CircleCI Agent
     webServer: {
         command: 'cross-env NODE_ENV=test npm run start',
         url: 'http://localhost:8080/#',
@@ -19,8 +19,8 @@ const config = {
         baseURL: 'http://localhost:8080/',
         headless: true, // this needs to remain headless to avoid visual changes due to GPU rendering in headed browsers
         ignoreHTTPSErrors: true,
-        screenshot: 'only-on-failure',
-        trace: 'on-first-retry',
+        screenshot: 'on',
+        trace: 'on',
         video: 'off'
     },
     projects: [

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

@@ -23,66 +23,19 @@
 const { test, expect } = require('../../baseFixtures.js');
 const { createDomainObjectWithDefaults } = require('../../appActions.js');
 
-test.describe('AppActions', () => {
-    test('createDomainObjectsWithDefaults', async ({ page }) => {
+test.describe('appActions tests', () => {
+    test('createDomainObjectsWithDefaults can create multiple objects in a row', async ({ page }) => {
         await page.goto('./', { waitUntil: 'networkidle' });
+        await createDomainObjectWithDefaults(page, 'Timer', 'Timer Foo');
+        await createDomainObjectWithDefaults(page, 'Timer', 'Timer Bar');
+        await createDomainObjectWithDefaults(page, 'Timer', 'Timer Baz');
 
-        const e2eFolder = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'e2e folder'
-        });
+        // Expand the tree
+        await page.click('.c-disclosure-triangle');
 
-        await test.step('Create multiple flat objects in a row', async () => {
-            const timer1 = await createDomainObjectWithDefaults(page, {
-                type: 'Timer',
-                name: 'Timer Foo',
-                parent: e2eFolder.uuid
-            });
-            const timer2 = await createDomainObjectWithDefaults(page, {
-                type: 'Timer',
-                name: 'Timer Bar',
-                parent: e2eFolder.uuid
-            });
-            const timer3 = await createDomainObjectWithDefaults(page, {
-                type: 'Timer',
-                name: 'Timer Baz',
-                parent: e2eFolder.uuid
-            });
-
-            await page.goto(timer1.url, { waitUntil: 'networkidle' });
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Timer Foo');
-            await page.goto(timer2.url, { waitUntil: 'networkidle' });
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Timer Bar');
-            await page.goto(timer3.url, { waitUntil: 'networkidle' });
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Timer Baz');
-        });
-
-        await test.step('Create multiple nested objects in a row', async () => {
-            const folder1 = await createDomainObjectWithDefaults(page, {
-                type: 'Folder',
-                name: 'Folder Foo',
-                parent: e2eFolder.uuid
-            });
-            const folder2 = await createDomainObjectWithDefaults(page, {
-                type: 'Folder',
-                name: 'Folder Bar',
-                parent: folder1.uuid
-            });
-            const folder3 = await createDomainObjectWithDefaults(page, {
-                type: 'Folder',
-                name: 'Folder Baz',
-                parent: folder2.uuid
-            });
-            await page.goto(folder1.url, { waitUntil: 'networkidle' });
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Folder Foo');
-            await page.goto(folder2.url, { waitUntil: 'networkidle' });
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Folder Bar');
-            await page.goto(folder3.url, { waitUntil: 'networkidle' });
-            await expect(page.locator('.l-browse-bar__object-name')).toHaveText('Folder Baz');
-
-            expect(folder1.url).toBe(`${e2eFolder.url}/${folder1.uuid}`);
-            expect(folder2.url).toBe(`${e2eFolder.url}/${folder1.uuid}/${folder2.uuid}`);
-            expect(folder3.url).toBe(`${e2eFolder.url}/${folder1.uuid}/${folder2.uuid}/${folder3.uuid}`);
-        });
+        // Verify the objects were created
+        await expect(page.locator('a :text("Timer Foo")')).toBeVisible();
+        await expect(page.locator('a :text("Timer Bar")')).toBeVisible();
+        await expect(page.locator('a :text("Timer Baz")')).toBeVisible();
     });
 });

e2e/tests/framework/exampleTemplate.e2e.spec.js

@@ -21,11 +21,12 @@
  *****************************************************************************/
 
 /*
-* This test suite template is to be used when creating new test suites. It will be kept up to date with the latest improvements
+* This test suite template is to be used when creating new testsuites. It will be kept up to date with the latest improvements
 * made by the Open MCT team. It will also follow our best pratices as those evolve. Please use this structure as a _reference_ and clear
 * or update any references when creating a new test suite!
 *
-* To illustrate current best practices, we've included a mocked up test suite for Renaming a Timer domain object.
+* To illustrate current best practices, we've included a mocked up test suite for Renaming a Timer domain object. In this example
+* this test suite should be cloned and renamed as /e2e/tests/plugins/timer/renameTimer.e2e.spec.js
 *
 * Demonstrated:
 * - Using appActions to leverage existing functions
@@ -42,73 +43,55 @@
 *    -> test2
 *    -> test3(stub)
 * 4. Any custom functions
+*
 */
 
-// Structure: Some standard Imports. Please update the required pathing.
+//Structure: Some standard Imports. Please update the required pathing
 const { test, expect } = require('../../baseFixtures');
 const { createDomainObjectWithDefaults } = require('../../appActions');
 
-/**
- * Structure:
- *  Try to keep a single describe block per logical groups of tests.
- *  If your test runtime exceeds 5 minutes or 500 lines, it's likely that it will need to be split.
- *
- * Annotations:
- *  Please use the @unstable tag at the end of the test title so that our automation can pick it up
- *  as a part of our test promotion pipeline.
- */
+// Structure: Try to keep a single describe block per logical groups of tests. If your test runtime exceeds 5 minutes or 500 lines, it's likely that it will need to be split.
+// Annotations: Please use the @unstable tag so that our automation can pick it up as a part of our test promotion pipeline.
 test.describe('Renaming Timer Object', () => {
-    // Top-level declaration of the Timer object created in beforeEach().
-    // We can then use this throughout the entire test suite.
-    let timer;
-    test.beforeEach(async ({ page }) => {
-        // Open a browser, navigate to the main page, and wait until all network events to resolve
+    //Create a testcase name which will be obvious when it fails in CI
+    test('Can create a new Timer object and rename it from actions Menu', async ({ page }) => {
+        //Open a browser, navigate to the main page, and wait until all networkevents to resolve
         await page.goto('./', { waitUntil: 'networkidle' });
+        //We provide some helper functions in appActions like createDomainObjectWithDefaults. This example will create a Timer object
+        await createDomainObjectWithDefaults(page, 'Timer');
+        //Assert the object to be created and check it's name in the title
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Timer');
 
-        // We provide some helper functions in appActions like `createDomainObjectWithDefaults()`.
-        // This example will create a Timer object with default properties, under the root folder:
-        timer = await createDomainObjectWithDefaults(page, { type: 'Timer' });
-
-        // Assert the object to be created and check its name in the title
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText(timer.name);
-    });
-
-    /**
-     * Make sure to use testcase names which are descriptive and easy to understand.
-     * A good testcase name concisely describes the test's goal(s) and should give
-     * some hint as to what went wrong if the test fails.
-     */
-    test('An existing Timer object can be renamed via the 3dot actions menu', async ({ page }) => {
         const newObjectName = "Renamed Timer";
+        //We've created an example of a shared function which pases the page and newObjectName values
+        await renameObjectFrom3DotMenu(page, newObjectName);
 
-        // We've created an example of a shared function which pases the page and newObjectName values
-        await renameTimerFrom3DotMenu(page, timer.url, newObjectName);
-
-        // Assert that the name has changed in the browser bar to the value we assigned above
+        //Assert that the name has changed in the browser bar to the value we assigned above
         await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName);
     });
-
     test('An existing Timer object can be renamed twice', async ({ page }) => {
+        //Open a browser, navigate to the main page, and wait until all networkevents to resolve
+        await page.goto('./', { waitUntil: 'networkidle' });
+        //We provide some helper functions in appActions like createDomainObjectWithDefaults. This example will create a Timer object
+        await createDomainObjectWithDefaults(page, 'Timer');
+        //Expect the object to be created and check it's name in the title
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Timer');
+
         const newObjectName = "Renamed Timer";
         const newObjectName2 = "Re-Renamed Timer";
+        //We've created an example of a shared function which pases the page and newObjectName values
+        await renameObjectFrom3DotMenu(page, newObjectName);
 
-        await renameTimerFrom3DotMenu(page, timer.url, newObjectName);
-
-        // Assert that the name has changed in the browser bar to the value we assigned above
+        //Assert that the name has changed in the browser bar to the value we assigned above
         await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName);
 
-        // Rename the Timer object again
-        await renameTimerFrom3DotMenu(page, timer.url, newObjectName2);
+        await renameObjectFrom3DotMenu(page, newObjectName2);
 
-        // Assert that the name has changed in the browser bar to the second value
+        //Assert that the name has changed in the browser bar to the second value
         await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName2);
     });
 
-    /**
-     * If you run out of time to write new tests, please stub in the missing tests
-     * in-place with a test.fixme and BDD-style test steps.
-     * Someone will carry the baton!
-     */
+    //If you run out of time to write new tests, please stub in the missing tests in place with a test.fixme and BDD-style test steps. Someone will carry the baton!
     test.fixme('Can Rename Timer Object from Tree', async ({ page }) => {
         //Create a new object
         //Copy this object
@@ -117,30 +100,22 @@ test.describe('Renaming Timer Object', () => {
     });
 });
 
-/**
- * Structure:
- * Custom functions should be declared last.
- * We are leaning on JSDoc pretty heavily to describe functionality. It is not required, but highly recommended.
- */
+//Structure: custom functions should be declared last. We are leaning on JSDoc pretty heavily to describe functionality. It is not required, but heavily recommended.
 
 /**
  * This is an example of a function which is shared between testcases in this test suite. When refactoring, we'll be looking
  * for common functionality which makes sense to generalize for the entire test framework.
  * @param {import('@playwright/test').Page} page
- * @param {string} timerUrl The URL of the timer object to be renamed
- * @param {string} newNameForTimer New name for object
+ * @param {string} newNameForTimer New Name for object
  */
-async function renameTimerFrom3DotMenu(page, timerUrl, newNameForTimer) {
-    // Navigate to the timer object
-    await page.goto(timerUrl);
+async function renameObjectFrom3DotMenu(page, newNameForTimer) {
 
     // Click on 3 Dot Menu
     await page.locator('button[title="More options"]').click();
-
     // Click text=Edit Properties...
     await page.locator('text=Edit Properties...').click();
 
-    // Rename the timer object
+    // Rename the object with newNameForTimer variable which is passed into this function
     await page.locator('text=Properties Title Notes >> input[type="text"]').fill(newNameForTimer);
 
     // Click Ok button to Save

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

@@ -31,13 +31,29 @@ TODO: Provide additional validation of object properties as it grows.
 
 */
 
-const { createDomainObjectWithDefaults } = require('../../appActions.js');
 const { test, expect } = require('../../pluginFixtures.js');
 
-test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
+test('Generate Visual Test Data @localStorage', async ({ page, context, openmctConfig }) => {
+    const { myItemsFolderName } = openmctConfig;
+
     //Go to baseURL
     await page.goto('./', { waitUntil: 'networkidle' });
-    const overlayPlot = await createDomainObjectWithDefaults(page, { type: 'Overlay Plot' });
+
+    await page.locator('button:has-text("Create")').click();
+
+    // add overlay plot with defaults
+    await page.locator('li:has-text("Overlay Plot")').click();
+
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('text=OK').click(),
+        //Wait for Save Banner to appear1
+        page.waitForSelector('.c-message-banner__message')
+    ]);
+
+    // save (exit edit mode)
+    await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // click create button
     await page.locator('button:has-text("Create")').click();
@@ -51,12 +67,16 @@ test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=OK').click(),
-        //Wait for Save Banner to appear
+        //Wait for Save Banner to appear1
         page.waitForSelector('.c-message-banner__message')
     ]);
 
     // focus the overlay plot
-    await page.goto(overlayPlot.url);
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('text=Unnamed Overlay Plot').first().click()
+    ]);
 
     await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Overlay Plot');
     //Save localStorage for future test execution

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

@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-* This test suite is meant to be executed against a couchdb container. More doc to come
-*
-*/
-
-const { test, expect } = require('../../baseFixtures');
-
-test.describe("CouchDB Status Indicator @couchdb", () => {
-    test.use({ failOnConsoleError: false });
-    //TODO BeforeAll Verify CouchDB Connectivity with APIContext
-    test('Shows green if connected', async ({ page }) => {
-        await page.route('**/openmct/mine', route => {
-            route.fulfill({
-                status: 200,
-                contentType: 'application/json',
-                body: JSON.stringify({})
-            });
-        });
-
-        //Go to baseURL
-        await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', { waitUntil: 'networkidle' });
-        await expect(page.locator('div:has-text("CouchDB is connected")').nth(3)).toBeVisible();
-    });
-    test('Shows red if not connected', async ({ page }) => {
-        await page.route('**/openmct/**', route => {
-            route.fulfill({
-                status: 503,
-                contentType: 'application/json',
-                body: JSON.stringify({})
-            });
-        });
-
-        //Go to baseURL
-        await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', { waitUntil: 'networkidle' });
-        await expect(page.locator('div:has-text("CouchDB is offline")').nth(3)).toBeVisible();
-    });
-    test('Shows unknown if it receives an unexpected response code', async ({ page }) => {
-        await page.route('**/openmct/mine', route => {
-            route.fulfill({
-                status: 418,
-                contentType: 'application/json',
-                body: JSON.stringify({})
-            });
-        });
-
-        //Go to baseURL
-        await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', { waitUntil: 'networkidle' });
-        await expect(page.locator('div:has-text("CouchDB connectivity unknown")').nth(3)).toBeVisible();
-    });
-});
-
-test.describe("CouchDB initialization @couchdb", () => {
-    test.use({ failOnConsoleError: false });
-    test("'My Items' folder is created if it doesn't exist", async ({ page }) => {
-        // Store any relevant PUT requests that happen on the page
-        const createMineFolderRequests = [];
-        page.on('request', req => {
-            // eslint-disable-next-line playwright/no-conditional-in-test
-            if (req.method() === 'PUT' && req.url().endsWith('openmct/mine')) {
-                createMineFolderRequests.push(req);
-            }
-        });
-
-        // Override the first request to GET openmct/mine to return a 404
-        await page.route('**/openmct/mine', route => {
-            route.fulfill({
-                status: 404,
-                contentType: 'application/json',
-                body: JSON.stringify({})
-            });
-        }, { times: 1 });
-
-        // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Verify that error banner is displayed
-        const bannerMessage = await page.locator('.c-message-banner__message').innerText();
-        expect(bannerMessage).toEqual('Failed to retrieve object mine');
-
-        // Verify that a PUT request to create "My Items" folder was made
-        expect.poll(() => createMineFolderRequests.length, {
-            message: 'Verify that PUT request to create "mine" folder was made',
-            timeout: 1000
-        }).toBeGreaterThanOrEqual(1);
-    });
-});

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

@@ -35,10 +35,7 @@ test.describe('Example Event Generator CRUD Operations', () => {
         //Create a name for the object
         const newObjectName = 'Test Event Generator';
 
-        await createDomainObjectWithDefaults(page, {
-            type: 'Event Message Generator',
-            name: newObjectName
-        });
+        await createDomainObjectWithDefaults(page, 'Event Message Generator', newObjectName);
 
         //Assertions against newly created object which define standard behavior
         await expect(page.waitForURL(/.*&view=table/)).toBeTruthy();

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

@@ -28,8 +28,7 @@ const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Sine Wave Generator', () => {
     test('Create new Sine Wave Generator Object and validate create Form Logic', async ({ page, browserName }) => {
-        // eslint-disable-next-line playwright/no-skipped-test
-        test.skip(browserName === 'firefox', 'This test needs to be updated to work with firefox');
+        test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
 
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });

e2e/tests/functional/menu.e2e.spec.js

@@ -42,7 +42,7 @@ test.describe('Persistence operations @addInit', () => {
             button: 'right'
         });
 
-        const menuOptions = page.locator('.c-menu li');
+        const menuOptions = page.locator('.c-menu ul');
 
         await expect.soft(menuOptions).toContainText(['Open In New Tab', 'View', 'Create Link']);
         await expect(menuOptions).not.toContainText(['Move', 'Duplicate', 'Remove', 'Add New Folder', 'Edit Properties...', 'Export as JSON', 'Import from JSON']);

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

@@ -1,212 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which verify the basic operations surrounding moving & linking objects.
-*/
-
-const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-
-test.describe('Move & link item tests', () => {
-    test('Create a basic object and verify that it can be moved to another folder', async ({ page, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-
-        // Go to Open MCT
-        await page.goto('./');
-
-        const parentFolder = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Parent Folder'
-        });
-        const childFolder = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Child Folder',
-            parent: parentFolder.uuid
-        });
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Grandchild Folder',
-            parent: childFolder.uuid
-        });
-
-        // Attempt to move parent to its own grandparent
-        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
-        await page.locator('.c-disclosure-triangle >> nth=0').click();
-
-        await page.locator(`a:has-text("Parent Folder") >> nth=0`).click({
-            button: 'right'
-        });
-
-        await page.locator('li.icon-move').click();
-        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=0').click();
-        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=1').click();
-        await page.locator('form[name="mctForm"] >> text=Child Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=2').click();
-        await page.locator('form[name="mctForm"] >> text=Grandchild Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('[aria-label="Cancel"]').click();
-
-        // Move Child Folder from Parent Folder to My Items
-        await page.locator('.c-disclosure-triangle >> nth=0').click();
-        await page.locator('.c-disclosure-triangle >> nth=1').click();
-
-        await page.locator(`a:has-text("Child Folder") >> nth=0`).click({
-            button: 'right'
-        });
-        await page.locator('li.icon-move').click();
-        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
-
-        await page.locator('text=OK').click();
-
-        // Expect that Child Folder is in My Items, the root folder
-        expect(page.locator(`text=${myItemsFolderName} >> nth=0:has(text=Child Folder)`)).toBeTruthy();
-    });
-    test('Create a basic object and verify that it cannot be moved to telemetry object without Composition Provider', async ({ page, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-
-        // Go to Open MCT
-        await page.goto('./');
-
-        // Create Telemetry Table
-        let telemetryTable = 'Test Telemetry Table';
-        await page.locator('button:has-text("Create")').click();
-        await page.locator('li:has-text("Telemetry Table")').click();
-        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
-        await page.locator('text=Properties Title Notes >> input[type="text"]').fill(telemetryTable);
-
-        await page.locator('text=OK').click();
-
-        // Finish editing and save Telemetry Table
-        await page.locator('.c-button--menu.c-button--major.icon-save').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        // Create New Folder Basic Domain Object
-        let folder = 'Test Folder';
-        await page.locator('button:has-text("Create")').click();
-        await page.locator('li:has-text("Folder")').click();
-        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
-        await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folder);
-
-        // See if it's possible to put the folder in the Telemetry object during creation (Soft Assert)
-        await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
-        let okButton = await page.locator('button.c-button.c-button--major:has-text("OK")');
-        let okButtonStateDisabled = await okButton.isDisabled();
-        expect.soft(okButtonStateDisabled).toBeTruthy();
-
-        // Continue test regardless of assertion and create it in My Items
-        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
-        await page.locator('text=OK').click();
-
-        // Open My Items
-        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
-
-        // Select Folder Object and select Move from context menu
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator(`a:has-text("${folder}")`).click()
-        ]);
-        await page.locator('.c-tree__item.is-navigated-object .c-tree__item__label .c-tree__item__type-icon').click({
-            button: 'right'
-        });
-        await page.locator('li.icon-move').click();
-
-        // See if it's possible to put the folder in the Telemetry object after creation
-        await page.locator(`text=Location Open MCT ${myItemsFolderName} >> span`).nth(3).click();
-        await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
-        let okButton2 = await page.locator('button.c-button.c-button--major:has-text("OK")');
-        let okButtonStateDisabled2 = await okButton2.isDisabled();
-        expect(okButtonStateDisabled2).toBeTruthy();
-    });
-
-    test('Create a basic object and verify that it can be linked to another folder', async ({ page, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-
-        // Go to Open MCT
-        await page.goto('./');
-
-        const parentFolder = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Parent Folder'
-        });
-        const childFolder = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Child Folder',
-            parent: parentFolder.uuid
-        });
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Grandchild Folder',
-            parent: childFolder.uuid
-        });
-
-        // Attempt to link parent to its own grandparent
-        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
-        await page.locator('.c-disclosure-triangle >> nth=0').click();
-
-        await page.locator(`a:has-text("Parent Folder") >> nth=0`).click({
-            button: 'right'
-        });
-
-        await page.locator('li.icon-link').click();
-        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=0').click();
-        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=1').click();
-        await page.locator('form[name="mctForm"] >> text=Child Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('form[name="mctForm"] >> .c-disclosure-triangle >> nth=2').click();
-        await page.locator('form[name="mctForm"] >> text=Grandchild Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('form[name="mctForm"] >> text=Parent Folder').click();
-        await expect(page.locator('[aria-label="Save"]')).toBeDisabled();
-        await page.locator('[aria-label="Cancel"]').click();
-
-        // Link Child Folder from Parent Folder to My Items
-        await page.locator('.c-disclosure-triangle >> nth=0').click();
-        await page.locator('.c-disclosure-triangle >> nth=1').click();
-
-        await page.locator(`a:has-text("Child Folder") >> nth=0`).click({
-            button: 'right'
-        });
-        await page.locator('li.icon-link').click();
-        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
-
-        await page.locator('text=OK').click();
-
-        // Expect that Child Folder is in My Items, the root folder
-        expect(page.locator(`text=${myItemsFolderName} >> nth=0:has(text=Child Folder)`)).toBeTruthy();
-    });
-});
-
-test.fixme('Cannot move a previously created domain object to non-peristable object in Move Modal', async ({ page }) => {
-    //Create a domain object
-    //Save Domain object
-    //Move Object and verify that cannot select non-persistable object
-    //Move Object to My Items
-    //Verify successful move
-});

e2e/tests/functional/moveObjects.e2e.spec.js

@@ -0,0 +1,148 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+This test suite is dedicated to tests which verify the basic operations surrounding moving objects.
+*/
+
+const { test, expect } = require('../../pluginFixtures');
+
+test.describe('Move item tests', () => {
+    test('Create a basic object and verify that it can be moved to another folder', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        // Go to Open MCT
+        await page.goto('./');
+
+        // Create a new folder in the root my items folder
+        let folder1 = "Folder1";
+        await page.locator('button:has-text("Create")').click();
+        await page.locator('li.icon-folder').click();
+
+        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folder1);
+
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=OK').click(),
+            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'});
+
+        // Create another folder with a new name at default location, which is currently inside Folder 1
+        let folder2 = "Folder2";
+        await page.locator('button:has-text("Create")').click();
+        await page.locator('li.icon-folder').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folder2);
+
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=OK').click(),
+            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'});
+
+        // Move Folder 2 from Folder 1 to My Items
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+        await page.locator('.c-tree__scrollable div div:nth-child(2) .c-tree__item .c-tree__item__view-control').click();
+
+        await page.locator(`a:has-text("${folder2}")`).click({
+            button: 'right'
+        });
+        await page.locator('li.icon-move').click();
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
+
+        await page.locator('text=OK').click();
+
+        // Expect that Folder 2 is in My Items, the root folder
+        expect(page.locator(`text=${myItemsFolderName} >> nth=0:has(text=${folder2})`)).toBeTruthy();
+    });
+    test('Create a basic object and verify that it cannot be moved to telemetry object without Composition Provider', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        // Go to Open MCT
+        await page.goto('./');
+
+        // Create Telemetry Table
+        let telemetryTable = 'Test Telemetry Table';
+        await page.locator('button:has-text("Create")').click();
+        await page.locator('li:has-text("Telemetry Table")').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').fill(telemetryTable);
+
+        await page.locator('text=OK').click();
+
+        // Finish editing and save Telemetry Table
+        await page.locator('.c-button--menu.c-button--major.icon-save').click();
+        await page.locator('text=Save and Finish Editing').click();
+
+        // Create New Folder Basic Domain Object
+        let folder = 'Test Folder';
+        await page.locator('button:has-text("Create")').click();
+        await page.locator('li:has-text("Folder")').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
+        await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folder);
+
+        // See if it's possible to put the folder in the Telemetry object during creation (Soft Assert)
+        await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
+        let okButton = await page.locator('button.c-button.c-button--major:has-text("OK")');
+        let okButtonStateDisabled = await okButton.isDisabled();
+        expect.soft(okButtonStateDisabled).toBeTruthy();
+
+        // Continue test regardless of assertion and create it in My Items
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
+        await page.locator('text=OK').click();
+
+        // Open My Items
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+
+        // Select Folder Object and select Move from context menu
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator(`a:has-text("${folder}")`).click()
+        ]);
+        await page.locator('.c-tree__item.is-navigated-object .c-tree__item__label .c-tree__item__type-icon').click({
+            button: 'right'
+        });
+        await page.locator('li.icon-move').click();
+
+        // See if it's possible to put the folder in the Telemetry object after creation
+        await page.locator(`text=Location Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+        await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
+        let okButton2 = await page.locator('button.c-button.c-button--major:has-text("OK")');
+        let okButtonStateDisabled2 = await okButton2.isDisabled();
+        expect(okButtonStateDisabled2).toBeTruthy();
+    });
+});
+
+test.fixme('Cannot move a previously created domain object to non-peristable object in Move Modal', async ({ page }) => {
+    //Create a domain object
+    //Save Domain object
+    //Move Object and verify that cannot select non-persistable object
+    //Move Object to My Items
+    //Verify successful move
+});

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

@@ -1,87 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-const { test, expect } = require('../../../pluginFixtures');
-const { createPlanFromJSON } = require('../../../appActions');
-
-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("Plan", () => {
-    test("Create a Plan and display all plan events @unstable", async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        const plan = await createPlanFromJSON(page, {
-            name: 'Test Plan',
-            json: testPlan
-        });
-        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(`${plan.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=plan.view`);
-        const eventCount = await page.locator('.activity-bounds').count();
-        expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
-    });
-});
-

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

@@ -1,181 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../../pluginFixtures');
-const { createDomainObjectWithDefaults, createPlanFromJSON } = require('../../../appActions');
-
-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 Strip", () => {
-    test("Create two Time Strips, add a single Plan to both, and verify they can have separate Indepdenent Time Contexts @unstable", async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5627'
-        });
-
-        // Constant locators
-        const independentTimeConductorInputs = page.locator('.l-shell__main-independent-time-conductor .c-input--datetime');
-        const activityBounds = page.locator('.activity-bounds');
-
-        // Goto baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        const timestrip = await test.step("Create a Time Strip", async () => {
-            const createdTimeStrip = await createDomainObjectWithDefaults(page, { type: 'Time Strip' });
-            const objectName = await page.locator('.l-browse-bar__object-name').innerText();
-            expect(objectName).toBe(createdTimeStrip.name);
-
-            return createdTimeStrip;
-        });
-
-        const plan = await test.step("Create a Plan and add it to the timestrip", async () => {
-            const createdPlan = await createPlanFromJSON(page, {
-                name: 'Test Plan',
-                json: testPlan
-            });
-
-            await page.goto(timestrip.url);
-            // Expand the tree to show the plan
-            await page.click("button[title='Show selected item in tree']");
-            await page.dragAndDrop(`role=treeitem[name=/${createdPlan.name}/]`, '.c-object-view');
-            await page.click("button[title='Save']");
-            await page.click("li[title='Save and Finish Editing']");
-            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(`${timestrip.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=time-strip.view`);
-
-            // Verify all events are displayed
-            const eventCount = await page.locator('.activity-bounds').count();
-            expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
-
-            return createdPlan;
-        });
-
-        await test.step("TimeStrip can use the Independent Time Conductor", async () => {
-            // Activate Independent Time Conductor in Fixed Time Mode
-            await page.click('.c-toggle-switch__slider');
-            expect(await activityBounds.count()).toEqual(0);
-
-            // Set the independent time bounds so that only one event is shown
-            const startBound = testPlan.TEST_GROUP[0].start;
-            const endBound = testPlan.TEST_GROUP[0].end;
-            const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
-            const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
-
-            await independentTimeConductorInputs.nth(0).fill('');
-            await independentTimeConductorInputs.nth(0).fill(startBoundString);
-            await page.keyboard.press('Enter');
-            await independentTimeConductorInputs.nth(1).fill('');
-            await independentTimeConductorInputs.nth(1).fill(endBoundString);
-            await page.keyboard.press('Enter');
-            expect(await activityBounds.count()).toEqual(1);
-        });
-
-        await test.step("Can have multiple TimeStrips with the same plan linked and different Independent Time Contexts", async () => {
-            // Create another Time Strip and verify that it has been created
-            const createdTimeStrip = await createDomainObjectWithDefaults(page, {
-                type: 'Time Strip',
-                name: "Another Time Strip"
-            });
-
-            const objectName = await page.locator('.l-browse-bar__object-name').innerText();
-            expect(objectName).toBe(createdTimeStrip.name);
-
-            // Drag the existing Plan onto the newly created Time Strip, and save.
-            await page.dragAndDrop(`role=treeitem[name=/${plan.name}/]`, '.c-object-view');
-            await page.click("button[title='Save']");
-            await page.click("li[title='Save and Finish Editing']");
-
-            // Activate Independent Time Conductor in Fixed Time Mode
-            await page.click('.c-toggle-switch__slider');
-
-            // All events should be displayed at this point because the
-            // initial independent context bounds will match the global bounds
-            expect(await activityBounds.count()).toEqual(5);
-
-            // Set the independent time bounds so that two events are shown
-            const startBound = testPlan.TEST_GROUP[0].start;
-            const endBound = testPlan.TEST_GROUP[1].end;
-            const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
-            const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
-
-            await independentTimeConductorInputs.nth(0).fill('');
-            await independentTimeConductorInputs.nth(0).fill(startBoundString);
-            await page.keyboard.press('Enter');
-            await independentTimeConductorInputs.nth(1).fill('');
-            await independentTimeConductorInputs.nth(1).fill(endBoundString);
-            await page.keyboard.press('Enter');
-
-            // Verify that two events are displayed
-            expect(await activityBounds.count()).toEqual(2);
-
-            // Switch to the previous Time Strip and verify that only one event is displayed
-            await page.goto(timestrip.url);
-            expect(await activityBounds.count()).toEqual(1);
-        });
-    });
-});

e2e/tests/functional/plugins/clocks/clock.e2e.spec.js

@@ -50,7 +50,7 @@ test.describe('Clock Generator CRUD Operations', () => {
         await page.locator('.icon-arrow-down').click();
 
         // Verify clicking on the autocomplete arrow collapses the dropdown
-        await expect(page.locator(".c-input--autocomplete__options")).toBeHidden();
+        await expect(page.locator(".c-input--autocomplete__options")).not.toBeVisible();
 
         // Click timezone input to open dropdown
         await page.locator('.c-input--autocomplete__input').click();
@@ -60,7 +60,7 @@ test.describe('Clock Generator CRUD Operations', () => {
         // Verify clicking outside the autocomplete dropdown collapses it
         await page.locator('text=Timezone').click();
         // Verify clicking on the autocomplete arrow collapses the dropdown
-        await expect(page.locator(".c-input--autocomplete__options")).toBeHidden();
+        await expect(page.locator(".c-input--autocomplete__options")).not.toBeVisible();
 
     });
 });

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

@@ -27,7 +27,6 @@ demonstrate some playwright for test developers. This pattern should not be re-u
 */
 
 const { test, expect } = require('../../../../pluginFixtures.js');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 let conditionSetUrl;
 let getConditionSetIdentifierFromUrl;
@@ -179,24 +178,3 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
 
     });
 });
-
-test.describe('Basic Condition Set Use', () => {
-    test('Can add a condition', async ({ page }) => {
-        //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create a new condition set
-        await createDomainObjectWithDefaults(page, {
-            type: 'Condition Set',
-            name: "Test Condition Set"
-        });
-        // Change the object to edit mode
-        await page.locator('[title="Edit"]').click();
-
-        // Click Add Condition button
-        await page.locator('#addCondition').click();
-        // Check that the new Unnamed Condition section appears
-        const numOfUnnamedConditions = await page.locator('text=Unnamed Condition').count();
-        expect(numOfUnnamedConditions).toEqual(1);
-    });
-});

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

@@ -1,186 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions');
-
-test.describe('Testing Display Layout @unstable', () => {
-    let sineWaveObject;
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-        await setRealTimeMode(page);
-
-        // Create Sine Wave Generator
-        sineWaveObject = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: "Test Sine Wave Generator"
-        });
-    });
-    test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in real time', async ({ page }) => {
-        // Create a Display Layout
-        await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout',
-            name: "Test Display Layout"
-        });
-        // Edit Display Layout
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-        // Add the Sine Wave Generator to the Display Layout and save changes
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        // Subscribe to the Sine Wave Generator data
-        // On getting data, check if the value found in the  Display Layout is the most recent value
-        // from the Sine Wave Generator
-        const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
-        const formattedTelemetryValue = await getTelemValuePromise;
-        const displayLayoutValuePromise = await page.waitForSelector(`text="${formattedTelemetryValue}"`);
-        const displayLayoutValue = await displayLayoutValuePromise.textContent();
-        const trimmedDisplayValue = displayLayoutValue.trim();
-
-        await expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
-    });
-    test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({ page }) => {
-        // Create a Display Layout
-        await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout',
-            name: "Test Display Layout"
-        });
-        // Edit Display Layout
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-        // Add the Sine Wave Generator to the Display Layout and save changes
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        // Subscribe to the Sine Wave Generator data
-        const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
-        // Set an offset of 1 minute and then change the time mode to fixed to set a 1 minute historical window
-        await setStartOffset(page, { mins: '1' });
-        await setFixedTimeMode(page);
-
-        // On getting data, check if the value found in the Display Layout is the most recent value
-        // from the Sine Wave Generator
-        const formattedTelemetryValue = await getTelemValuePromise;
-        const displayLayoutValuePromise = await page.waitForSelector(`text="${formattedTelemetryValue}"`);
-        const displayLayoutValue = await displayLayoutValuePromise.textContent();
-        const trimmedDisplayValue = displayLayoutValue.trim();
-
-        await expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
-    });
-    test('items in a display layout can be removed with object tree context menu when viewing the display layout', async ({ page }) => {
-        // Create a Display Layout
-        await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout',
-            name: "Test Display Layout"
-        });
-        // Edit Display Layout
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-        // Add the Sine Wave Generator to the Display Layout and save changes
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(1);
-
-        // Expand the Display Layout so we can remove the sine wave generator
-        await page.locator('.c-tree__item.is-navigated-object .c-disclosure-triangle').click();
-
-        // Bring up context menu and remove
-        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').first().click({ button: 'right' });
-        await page.locator('text=Remove').click();
-        await page.locator('text=OK').click();
-
-        // delete
-
-        expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
-    });
-    test('items in a display layout can be removed with object tree context menu when viewing another item', async ({ page }) => {
-        // Create a Display Layout
-        await createDomainObjectWithDefaults(page, {
-            type: 'Display Layout',
-            name: "Test Display Layout"
-        });
-        // Edit Display Layout
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-        // Add the Sine Wave Generator to the Display Layout and save changes
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.l-layout__grid-holder');
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(1);
-
-        // Expand the Display Layout so we can remove the sine wave generator
-        await page.locator('.c-tree__item.is-navigated-object .c-disclosure-triangle').click();
-
-        // Click the original Sine Wave Generator to navigate away from the Display Layout
-        await page.locator('.c-tree__item .c-tree__item__name:text("Test Sine Wave Generator")').click();
-
-        // Bring up context menu and remove
-        await page.locator('.c-tree__item.is-alias .c-tree__item__name:text("Test Sine Wave Generator")').click({ button: 'right' });
-        await page.locator('text=Remove').click();
-        await page.locator('text=OK').click();
-
-        // navigate back to the display layout to confirm it has been removed
-        await page.locator('.c-tree__item .c-tree__item__name:text("Test Display Layout")').click();
-
-        expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
-    });
-});
-
-/**
- * Util for subscribing to a telemetry object by object identifier
- * Limitations: Currently only works to return telemetry once to the node scope
- * To Do: See if there's a way to await this multiple times to allow for multiple
- * values to be returned over time
- * @param {import('@playwright/test').Page} page
- * @param {string} objectIdentifier identifier for object
- * @returns {Promise<string>} the formatted sin telemetry value
- */
-async function subscribeToTelemetry(page, objectIdentifier) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getTelemValue', resolve));
-
-    await page.evaluate(async (telemetryIdentifier) => {
-        const telemetryObject = await window.openmct.objects.get(telemetryIdentifier);
-        const metadata = window.openmct.telemetry.getMetadata(telemetryObject);
-        const formats = await window.openmct.telemetry.getFormatMap(metadata);
-        window.openmct.telemetry.subscribe(telemetryObject, (obj) => {
-            const sinVal = obj.sin;
-            const formattedSinVal = formats.sin.format(sinVal);
-            window.getTelemValue(formattedSinVal);
-        });
-    }, objectIdentifier);
-
-    return getTelemValuePromise;
-}

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

@@ -1,237 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const utils = require('../../../../helper/faultUtils');
-
-test.describe('The Fault Management Plugin using example faults', () => {
-    test.beforeEach(async ({ page }) => {
-        await utils.navigateToFaultManagementWithExample(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.soft(faultCount).toEqual(criticalityIconCount);
-    });
-
-    test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector @unstable', async ({ page }) => {
-        await utils.selectFaultItem(page, 1);
-
-        const selectedFaultName = await page.locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname').textContent();
-        const inspectorFaultNameCount = await page.locator(`.c-inspector__properties >> :text("${selectedFaultName}")`).count();
-
-        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 @unstable', async ({ page }) => {
-        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.soft(await selectedRows.count()).toEqual(2);
-
-        const firstSelectedFaultName = await selectedRows.nth(0).textContent();
-        const secondSelectedFaultName = await selectedRows.nth(1).textContent();
-        const firstNameInInspectorCount = await page.locator(`.c-inspector__properties >> :text("${firstSelectedFaultName}")`).count();
-        const secondNameInInspectorCount = await page.locator(`.c-inspector__properties >> :text("${secondSelectedFaultName}")`).count();
-
-        expect.soft(firstNameInInspectorCount).toEqual(0);
-        expect.soft(secondNameInInspectorCount).toEqual(0);
-    });
-
-    test('Allows you to shelve a fault @unstable', async ({ page }) => {
-        const shelvedFaultName = await utils.getFaultName(page, 2);
-        const beforeShelvedFault = utils.getFaultByName(page, shelvedFaultName);
-
-        expect.soft(await beforeShelvedFault.count()).toBe(1);
-
-        await utils.shelveFault(page, 2);
-
-        // check it is removed from standard view
-        const afterShelvedFault = utils.getFaultByName(page, shelvedFaultName);
-        expect.soft(await afterShelvedFault.count()).toBe(0);
-
-        await utils.changeViewTo(page, 'shelved');
-
-        const shelvedViewFault = utils.getFaultByName(page, shelvedFaultName);
-
-        expect.soft(await shelvedViewFault.count()).toBe(1);
-    });
-
-    test('Allows you to acknowledge a fault @unstable', async ({ page }) => {
-        const acknowledgedFaultName = await utils.getFaultName(page, 3);
-
-        await utils.acknowledgeFault(page, 3);
-
-        const fault = utils.getFault(page, 3);
-        await expect.soft(fault).toHaveClass(/is-acknowledged/);
-
-        await utils.changeViewTo(page, 'acknowledged');
-
-        const acknowledgedViewFaultName = await utils.getFaultName(page, 1);
-        expect.soft(acknowledgedFaultName).toEqual(acknowledgedViewFaultName);
-    });
-
-    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 = utils.getFaultByName(page, shelvedFaultNameOne);
-        const beforeShelvedFaultFour = utils.getFaultByName(page, shelvedFaultNameFour);
-
-        expect.soft(await beforeShelvedFaultOne.count()).toBe(1);
-        expect.soft(await beforeShelvedFaultFour.count()).toBe(1);
-
-        await utils.shelveMultipleFaults(page, 1, 4);
-
-        // check it is removed from standard view
-        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 utils.changeViewTo(page, 'shelved');
-
-        const shelvedViewFaultOne = utils.getFaultByName(page, shelvedFaultNameOne);
-        const shelvedViewFaultFour = utils.getFaultByName(page, shelvedFaultNameFour);
-
-        expect.soft(await shelvedViewFaultOne.count()).toBe(1);
-        expect.soft(await shelvedViewFaultFour.count()).toBe(1);
-    });
-
-    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 utils.acknowledgeMultipleFaults(page, 2, 5);
-
-        const faultTwo = utils.getFault(page, 2);
-        const faultFive = utils.getFault(page, 5);
-
-        // check they have been acknowledged
-        await expect.soft(faultTwo).toHaveClass(/is-acknowledged/);
-        await expect.soft(faultFive).toHaveClass(/is-acknowledged/);
-
-        await utils.changeViewTo(page, 'acknowledged');
-
-        const acknowledgedViewFaultTwo = utils.getFaultByName(page, acknowledgedFaultNameTwo);
-        const acknowledgedViewFaultFive = utils.getFaultByName(page, acknowledgedFaultNameFive);
-
-        expect.soft(await acknowledgedViewFaultTwo.count()).toBe(1);
-        expect.soft(await acknowledgedViewFaultFive.count()).toBe(1);
-    });
-
-    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 utils.getFaultResultCount(page);
-        expect.soft(faultResultCount).toEqual(5);
-
-        // search namespace
-        await utils.enterSearchTerm(page, faultThreeNamespace);
-
-        faultResultCount = await utils.getFaultResultCount(page);
-        expect.soft(faultResultCount).toEqual(1);
-        expect.soft(await utils.getFaultNamespace(page, 1)).toEqual(faultThreeNamespace);
-
-        // all faults
-        await utils.clearSearch(page);
-        faultResultCount = await utils.getFaultResultCount(page);
-        expect.soft(faultResultCount).toEqual(5);
-
-        // search name
-        await utils.enterSearchTerm(page, faultTwoName);
-
-        faultResultCount = await utils.getFaultResultCount(page);
-        expect.soft(faultResultCount).toEqual(1);
-        expect.soft(await utils.getFaultName(page, 1)).toEqual(faultTwoName);
-
-        // all faults
-        await utils.clearSearch(page);
-        faultResultCount = await utils.getFaultResultCount(page);
-        expect.soft(faultResultCount).toEqual(5);
-
-        // search triggerTime
-        await utils.enterSearchTerm(page, 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 @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 utils.getFaultName(page, 1);
-
-        expect.soft(firstFaultName).toEqual(faultOneName);
-
-        await utils.sortFaultsBy(page, 'oldest-first');
-
-        firstFaultName = await utils.getFaultName(page, 1);
-        expect.soft(firstFaultName).toEqual(faultFiveName);
-
-        await utils.sortFaultsBy(page, 'severity');
-
-        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 utils.navigateToFaultManagementWithoutExample(page);
-    });
-
-    test('Shows no faults when no faults are provided @unstable', async ({ page }) => {
-        const faultCount = await page.locator('c-fault-mgmt__list').count();
-
-        expect.soft(faultCount).toEqual(0);
-
-        await utils.changeViewTo(page, 'acknowledged');
-        const acknowledgedCount = await page.locator('c-fault-mgmt__list').count();
-        expect.soft(acknowledgedCount).toEqual(0);
-
-        await utils.changeViewTo(page, 'shelved');
-        const shelvedCount = await page.locator('c-fault-mgmt__list').count();
-        expect.soft(shelvedCount).toEqual(0);
-    });
-
-    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.soft(faultCount).toEqual(0);
-    });
-});

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

@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
-
-test.describe('Testing Flexible Layout @unstable', () => {
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create Sine Wave Generator
-        await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: "Test Sine Wave Generator"
-        });
-
-        // Create Clock Object
-        await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            name: "Test Clock"
-        });
-    });
-    test('panes have the appropriate draggable attribute while in Edit and Browse modes', async ({ page }) => {
-        // Create a Flexible Layout
-        await createDomainObjectWithDefaults(page, {
-            type: 'Flexible Layout',
-            name: "Test Flexible Layout"
-        });
-        // Edit Flexible Layout
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
-        // Add the Sine Wave Generator and Clock to the Flexible Layout
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.c-fl__container.is-empty');
-        await page.dragAndDrop('text=Test Clock', '.c-fl__container.is-empty');
-        // Check that panes can be dragged while Flexible Layout is in Edit mode
-        let dragWrapper = await page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
-        await expect(dragWrapper).toHaveAttribute('draggable', 'true');
-        // Save Flexible Layout
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-        // Check that panes are not draggable while Flexible Layout is in Browse mode
-        dragWrapper = await page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
-        await expect(dragWrapper).toHaveAttribute('draggable', 'false');
-    });
-});

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

@@ -25,7 +25,7 @@ This test suite is dedicated to tests which verify the basic operations surround
 but only assume that example imagery is present.
 */
 /* globals process */
-const { v4: uuid } = require('uuid');
+
 const { waitForAnimations } = require('../../../../baseFixtures');
 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
@@ -35,29 +35,49 @@ const expectedAltText = process.platform === 'linux' ? 'Ctrl+Alt drag to pan' :
 
 //The following block of tests verifies the basic functionality of example imagery and serves as a template for Imagery objects embedded in other objects.
 test.describe('Example Imagery Object', () => {
+
     test.beforeEach(async ({ page }) => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
         // Create a default 'Example Imagery' object
-        await createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
+        createDomainObjectWithDefaults(page, 'Example Imagery');
+
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator(backgroundImageSelector).hover({trial: true}),
+            // eslint-disable-next-line playwright/missing-playwright-await
+            expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery')
+        ]);
 
         // Verify that the created object is focused
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
-        await page.locator(backgroundImageSelector).hover({trial: true});
     });
 
     test('Can use Mouse Wheel to zoom in and out of latest image', async ({ page }) => {
-        // Zoom in x2 and assert
-        await mouseZoomOnImageAndAssert(page, 2);
+        const deltaYStep = 100; //equivalent to 1x zoom
+        await page.locator(backgroundImageSelector).hover({trial: true});
+        const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
+        // zoom in
+        await page.locator(backgroundImageSelector).hover({trial: true});
+        await page.mouse.wheel(0, deltaYStep * 2);
+        // wait for zoom animation to finish
+        await page.locator(backgroundImageSelector).hover({trial: true});
+        const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
+        // zoom out
+        await page.locator(backgroundImageSelector).hover({trial: true});
+        await page.mouse.wheel(0, -deltaYStep);
+        // wait for zoom animation to finish
+        await page.locator(backgroundImageSelector).hover({trial: true});
+        const imageMouseZoomedOut = await page.locator(backgroundImageSelector).boundingBox();
 
-        // Zoom out x2 and assert
-        await mouseZoomOnImageAndAssert(page, -2);
+        expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
+        expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
+        expect(imageMouseZoomedOut.height).toBeLessThan(imageMouseZoomedIn.height);
+        expect(imageMouseZoomedOut.width).toBeLessThan(imageMouseZoomedIn.width);
     });
 
     test('Can adjust image brightness/contrast by dragging the sliders', async ({ page, browserName }) => {
-        // eslint-disable-next-line playwright/no-skipped-test
-        test.skip(browserName === 'firefox', 'This test needs to be updated to work with firefox');
+        test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
         // Open the image filter menu
         await page.locator('[role=toolbar] button[title="Brightness and contrast"]').click();
 
@@ -130,7 +150,30 @@ test.describe('Example Imagery Object', () => {
     });
 
     test('Can use + - buttons to zoom on the image @unstable', async ({ page }) => {
-        await buttonZoomOnImageAndAssert(page);
+        // Get initial image dimensions
+        const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+
+        // Zoom in twice via button
+        await zoomIntoImageryByButton(page);
+        await zoomIntoImageryByButton(page);
+
+        // Get and assert zoomed in image dimensions
+        const zoomedInBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+        expect(zoomedInBoundingBox.height).toBeGreaterThan(initialBoundingBox.height);
+        expect(zoomedInBoundingBox.width).toBeGreaterThan(initialBoundingBox.width);
+
+        // Zoom out once via button
+        await zoomOutOfImageryByButton(page);
+
+        // Get and assert zoomed out image dimensions
+        const zoomedOutBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+        expect(zoomedOutBoundingBox.height).toBeLessThan(zoomedInBoundingBox.height);
+        expect(zoomedOutBoundingBox.width).toBeLessThan(zoomedInBoundingBox.width);
+
+        // Zoom out again via button, assert against the initial image dimensions
+        await zoomOutOfImageryByButton(page);
+        const finalBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+        expect(finalBoundingBox).toEqual(initialBoundingBox);
     });
 
     test('Can use the reset button to reset the image @unstable', async ({ page }, testInfo) => {
@@ -168,227 +211,46 @@ test.describe('Example Imagery Object', () => {
         await expect(pausePlayButton).not.toHaveClass(/is-paused/);
     });
 
-    test('Uses low fetch priority', async ({ page }) => {
-        const priority = await page.locator('.js-imageryView-image').getAttribute('fetchpriority');
-        await expect(priority).toBe('low');
-    });
 });
 
-test.describe('Example Imagery in Display Layout', () => {
-    let displayLayout;
-    test.beforeEach(async ({ page }) => {
-        // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        displayLayout = await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
-        await page.goto(displayLayout.url);
-
-        /* Create Sine Wave Generator with minimum Image Load Delay */
-        // Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click text=Example Imagery
-        await page.click('text=Example Imagery');
-
-        // Clear and set Image load delay to minimum value
-        await page.locator('input[type="number"]').fill('');
-        await page.locator('input[type="number"]').fill('5000');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('text=OK'),
-            //Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
-
-        await page.goto(displayLayout.url);
+// The following test case will cover these scenarios
+// ('Can use Mouse Wheel to zoom in and out of previous image');
+// ('Can use alt+drag to move around image once zoomed in');
+// ('Clicking on the left arrow should pause the imagery and go to previous image');
+// ('If the imagery view is in pause mode, it should not be updated when new images come in');
+// ('If the imagery view is not in pause mode, it should be updated when new images come in');
+test('Example Imagery in Display layout @unstable', async ({ page }) => {
+    test.info().annotations.push({
+        type: 'issue',
+        description: 'https://github.com/nasa/openmct/issues/5265'
     });
 
-    test('Imagery View operations @unstable', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5265'
-        });
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'networkidle' });
 
-        // Edit mode
-        await page.click('button[title="Edit"]');
+    // Click the Create button
+    await page.click('button:has-text("Create")');
 
-        // Click on example imagery to expose toolbar
-        await page.locator('.c-so-view__header').click();
+    // Click text=Example Imagery
+    await page.click('text=Example Imagery');
 
-        // Adjust object height
-        await page.locator('div[title="Resize object height"] > input').click();
-        await page.locator('div[title="Resize object height"] > input').fill('50');
+    // Clear and set Image load delay to minimum value
+    await page.locator('input[type="number"]').fill('');
+    await page.locator('input[type="number"]').fill('5000');
 
-        // Adjust object width
-        await page.locator('div[title="Resize object width"] > input').click();
-        await page.locator('div[title="Resize object width"] > input').fill('50');
+    // Click text=OK
+    await Promise.all([
+        page.waitForNavigation({waitUntil: 'networkidle'}),
+        page.click('text=OK'),
+        //Wait for Save Banner to appear
+        page.waitForSelector('.c-message-banner__message')
+    ]);
 
-        await performImageryViewOperationsAndAssert(page);
-    });
+    // Wait until Save Banner is gone
+    await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+    await page.locator(backgroundImageSelector).hover({trial: true});
 
-    test('Resizing the layout changes thumbnail visibility and size', async ({ page }) => {
-        const thumbsWrapperLocator = page.locator('.c-imagery__thumbs-wrapper');
-        // Edit mode
-        await page.click('button[title="Edit"]');
-
-        // Click on example imagery to expose toolbar
-        await page.locator('.c-so-view__header').click();
-
-        // expect thumbnails not be visible when first added
-        expect.soft(thumbsWrapperLocator.isHidden()).toBeTruthy();
-
-        // Resize the example imagery vertically to change the thumbnail visibility
-        /*
-        The following arbitrary values are added to observe the separate visual
-        conditions of the thumbnails (hidden, small thumbnails, regular thumbnails).
-        Specifically, height is set to 50px for small thumbs and 100px for regular
-        */
-        await page.locator('div[title="Resize object height"] > input').click();
-        await page.locator('div[title="Resize object height"] > input').fill('50');
-
-        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
-        await expect(thumbsWrapperLocator).toHaveClass(/is-small-thumbs/);
-
-        // Resize the example imagery vertically to change the thumbnail visibility
-        await page.locator('div[title="Resize object height"] > input').click();
-        await page.locator('div[title="Resize object height"] > input').fill('100');
-
-        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
-        await expect(thumbsWrapperLocator).not.toHaveClass(/is-small-thumbs/);
-    });
-});
-
-test.describe('Example Imagery in Flexible layout', () => {
-    let flexibleLayout;
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        flexibleLayout = await createDomainObjectWithDefaults(page, { type: 'Flexible Layout' });
-        await page.goto(flexibleLayout.url);
-
-        /* Create Sine Wave Generator with minimum Image Load Delay */
-        // Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click text=Example Imagery
-        await page.click('text=Example Imagery');
-
-        // Clear and set Image load delay to minimum value
-        await page.locator('input[type="number"]').fill('');
-        await page.locator('input[type="number"]').fill('5000');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('text=OK'),
-            //Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
-
-        await page.goto(flexibleLayout.url);
-    });
-    test('Imagery View operations @unstable', async ({ page, browserName }) => {
-        test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5326'
-        });
-
-        await performImageryViewOperationsAndAssert(page);
-    });
-});
-
-test.describe('Example Imagery in Tabs View', () => {
-    let tabsView;
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        tabsView = await createDomainObjectWithDefaults(page, { type: 'Tabs View' });
-        await page.goto(tabsView.url);
-
-        /* Create Sine Wave Generator with minimum Image Load Delay */
-        // Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click text=Example Imagery
-        await page.click('text=Example Imagery');
-
-        // Clear and set Image load delay to minimum value
-        await page.locator('input[type="number"]').fill('');
-        await page.locator('input[type="number"]').fill('5000');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('text=OK'),
-            //Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
-
-        await page.goto(tabsView.url);
-    });
-    test('Imagery View operations @unstable', async ({ page }) => {
-        await performImageryViewOperationsAndAssert(page);
-    });
-});
-
-test.describe('Example Imagery in Time Strip', () => {
-    let timeStripObject;
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-        timeStripObject = await createDomainObjectWithDefaults(page, {
-            type: 'Time Strip',
-            name: 'Time Strip'.concat(' ', uuid())
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Example Imagery',
-            name: 'Example Imagery'.concat(' ', uuid()),
-            parent: timeStripObject.uuid
-        });
-        // Navigate to timestrip
-        await page.goto(timeStripObject.url);
-    });
-    test('Clicking a thumbnail loads the image in large view', async ({ page, browserName }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5632'
-        });
-        await page.locator('.c-imagery-tsv-container').hover();
-        // get url of the hovered image
-        const hoveredImg = page.locator('.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img');
-        const hoveredImgSrc = await hoveredImg.getAttribute('src');
-        expect(hoveredImgSrc).toBeTruthy();
-        await page.locator('.c-imagery-tsv-container').click();
-        // get image of view large container
-        const viewLargeImg = page.locator('img.c-imagery__main-image__image');
-        const viewLargeImgSrc = await viewLargeImg.getAttribute('src');
-        expect(viewLargeImgSrc).toBeTruthy();
-        expect(viewLargeImgSrc).toEqual(hoveredImgSrc);
-    });
-});
-
-/**
- * Perform the common actions and assertions for the Imagery View.
- * This function verifies the following in order:
- * 1. Can zoom in/out using the zoom buttons
- * 2. Can zoom in/out using the mouse wheel
- * 3. Can pan the image using the pan hotkey + mouse drag
- * 4. Clicking on the left arrow button pauses imagery and moves to the previous image
- * 5. Imagery is updated as new images stream in, regardless of pause status
- * 6. Old images are discarded when new images stream in
- * 7. Image brightness/contrast can be adjusted by dragging the sliders
- * @param {import('@playwright/test').Page} page
- */
-async function performImageryViewOperationsAndAssert(page) {
     // Click previous image button
     const previousImageButton = page.locator('.c-nav--prev');
     await previousImageButton.click();
@@ -397,17 +259,27 @@ async function performImageryViewOperationsAndAssert(page) {
     const selectedImage = page.locator('.selected');
     await expect(selectedImage).toBeVisible();
 
-    // Use the zoom buttons to zoom in and out
-    await buttonZoomOnImageAndAssert(page);
+    // Zoom in
+    const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
+    await page.locator(backgroundImageSelector).hover({trial: true});
+    const deltaYStep = 100; // equivalent to 1x zoom
+    await page.mouse.wheel(0, deltaYStep * 2);
+    const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+    const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
+    const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
 
-    // Use Mouse Wheel to zoom in to previous image
-    await mouseZoomOnImageAndAssert(page, 2);
+    // Wait for zoom animation to finish
+    await page.locator(backgroundImageSelector).hover({trial: true});
+    const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
+    expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
+    expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
 
-    // Use alt+drag to move around image once zoomed in
-    await panZoomAndAssertImageProperties(page);
+    // Center the mouse pointer
+    await page.mouse.move(imageCenterX, imageCenterY);
 
-    // Use Mouse Wheel to zoom out of previous image
-    await mouseZoomOnImageAndAssert(page, -2);
+    // Pan Imagery Hints
+    const imageryHintsText = await page.locator('.c-imagery__hints').innerText();
+    expect(expectedAltText).toEqual(imageryHintsText);
 
     // Click next image button
     const nextImageButton = page.locator('.c-nav--next');
@@ -420,14 +292,21 @@ async function performImageryViewOperationsAndAssert(page) {
     await page.locator('[data-testid=conductor-modeOption-realtime]').click();
 
     // Zoom in on next image
-    await mouseZoomOnImageAndAssert(page, 2);
+    await page.locator(backgroundImageSelector).hover({trial: true});
+    await page.mouse.wheel(0, deltaYStep * 2);
 
-    // Clicking on the left arrow should pause the imagery and go to previous image
+    // Wait for zoom animation to finish
+    await page.locator(backgroundImageSelector).hover({trial: true});
+    const imageNextMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
+    expect(imageNextMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
+    expect(imageNextMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
+
+    // Click previous image button
     await previousImageButton.click();
-    await expect(page.locator('.c-button.pause-play')).toHaveClass(/is-paused/);
+
+    // Verify previous image
     await expect(selectedImage).toBeVisible();
 
-    // The imagery view should be updated when new images come in
     const imageCount = await page.locator('.c-imagery__thumb').count();
     await expect.poll(async () => {
         const newImageCount = await page.locator('.c-imagery__thumb').count();
@@ -435,7 +314,7 @@ async function performImageryViewOperationsAndAssert(page) {
         return newImageCount;
     }, {
         message: "verify that old images are discarded",
-        timeout: 7 * 1000
+        timeout: 6 * 1000
     }).toBe(imageCount);
 
     // Verify selected image is still displayed
@@ -453,6 +332,253 @@ async function performImageryViewOperationsAndAssert(page) {
     // Drag the brightness and contrast sliders around and assert filter values
     await dragBrightnessSliderAndAssertFilterValues(page);
     await dragContrastSliderAndAssertFilterValues(page);
+});
+
+test.describe('Example imagery thumbnails resize in display layouts', () => {
+    test('Resizing the layout changes thumbnail visibility and size', async ({ page }) => {
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        const thumbsWrapperLocator = page.locator('.c-imagery__thumbs-wrapper');
+        // Click button:has-text("Create")
+        await page.locator('button:has-text("Create")').click();
+
+        // Click li:has-text("Display Layout")
+        await page.locator('li:has-text("Display Layout")').click();
+        const displayLayoutTitleField = page.locator('text=Properties Title Notes Horizontal grid (px) Vertical grid (px) Horizontal size ( >> input[type="text"]');
+        await displayLayoutTitleField.click();
+
+        await displayLayoutTitleField.fill('Thumbnail Display Layout');
+
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=OK').click()
+        ]);
+
+        // Click text=Snapshot Save and Finish Editing Save and Continue Editing >> button >> nth=1
+        await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+
+        // Click text=Save and Finish Editing
+        await page.locator('text=Save and Finish Editing').click();
+
+        // Click button:has-text("Create")
+        await page.locator('button:has-text("Create")').click();
+
+        // Click li:has-text("Example Imagery")
+        await page.locator('li:has-text("Example Imagery")').click();
+
+        const imageryTitleField = page.locator('text=Properties Title Notes Images url list (comma separated) Image load delay (milli >> input[type="text"]');
+        // Click text=Properties Title Notes Images url list (comma separated) Image load delay (milli >> input[type="text"]
+        await imageryTitleField.click();
+
+        // Fill text=Properties Title Notes Images url list (comma separated) Image load delay (milli >> input[type="text"]
+        await imageryTitleField.fill('Thumbnail Example Imagery');
+
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=OK').click()
+        ]);
+
+        // Click text=Thumbnail Example Imagery Imagery Layout Snapshot >> button >> nth=0
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=Thumbnail Example Imagery Imagery Layout Snapshot >> button').first().click()
+        ]);
+
+        // Edit mode
+        await page.locator('text=Thumbnail Display Layout Snapshot >> button').nth(3).click();
+
+        // Click on example imagery to expose toolbar
+        await page.locator('text=Thumbnail Example Imagery Snapshot Large View').click();
+
+        // expect thumbnails not be visible when first added
+        expect.soft(thumbsWrapperLocator.isHidden()).toBeTruthy();
+
+        // Resize the example imagery vertically to change the thumbnail visibility
+        /*
+        The following arbitrary values are added to observe the separate visual
+        conditions of the thumbnails (hidden, small thumbnails, regular thumbnails).
+        Specifically, height is set to 50px for small thumbs and 100px for regular
+        */
+        // Click #mct-input-id-103
+        await page.locator('#mct-input-id-103').click();
+
+        // Fill #mct-input-id-103
+        await page.locator('#mct-input-id-103').fill('50');
+
+        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
+        await expect(thumbsWrapperLocator).toHaveClass(/is-small-thumbs/);
+
+        // Resize the example imagery vertically to change the thumbnail visibility
+        // Click #mct-input-id-103
+        await page.locator('#mct-input-id-103').click();
+
+        // Fill #mct-input-id-103
+        await page.locator('#mct-input-id-103').fill('100');
+
+        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
+        await expect(thumbsWrapperLocator).not.toHaveClass(/is-small-thumbs/);
+    });
+});
+
+// test.fixme('Can use Mouse Wheel to zoom in and out of previous image');
+// test.fixme('Can use alt+drag to move around image once zoomed in');
+// test.fixme('Clicking on the left arrow should pause the imagery and go to previous image');
+// test.fixme('If the imagery view is in pause mode, images still come in');
+// test.fixme('If the imagery view is not in pause mode, it should be updated when new images come in');
+test.describe('Example Imagery in Flexible layout', () => {
+    test('Example Imagery in Flexible layout @unstable', async ({ page, browserName, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/5326'
+        });
+
+        // Go to baseURL
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        // Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Example Imagery
+        await page.click('text=Example Imagery');
+
+        // Clear and set Image load delay (milliseconds)
+        await page.click('input[type="number"]', {clickCount: 3});
+        await page.type('input[type="number"]', "20");
+
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation({waitUntil: 'networkidle'}),
+            page.click('text=OK'),
+            //Wait for Save Banner to appear
+            page.waitForSelector('.c-message-banner__message')
+        ]);
+        // Wait until Save Banner is gone
+        await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+        await page.locator(backgroundImageSelector).hover({trial: true});
+
+        // Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Flexible Layout
+        await page.click('text=Flexible Layout');
+
+        // Assert Flexible layout
+        await expect(page.locator('.js-form-title')).toHaveText('Create a New Flexible Layout');
+
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
+
+        // Click My Items
+        await Promise.all([
+            page.locator('text=OK').click(),
+            page.waitForNavigation({waitUntil: 'networkidle'})
+        ]);
+
+        // Click My Items
+        await page.locator('.c-disclosure-triangle').click();
+
+        // Right click example imagery
+        await page.click(('text=Unnamed Example Imagery'), { button: 'right' });
+
+        // Click move
+        await page.locator('.icon-move').click();
+
+        // Click triangle to open sub menu
+        await page.locator('.c-form__section .c-disclosure-triangle').click();
+
+        // Click Flexable Layout
+        await page.click('.c-overlay__outer >> text=Unnamed Flexible Layout');
+
+        // Click text=OK
+        await page.locator('text=OK').click();
+
+        // Save template
+        await saveTemplate(page);
+
+        // Zoom in
+        await mouseZoomIn(page);
+
+        // Center the mouse pointer
+        const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
+        const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
+        const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
+        await page.mouse.move(imageCenterX, imageCenterY);
+
+        // Pan zoom
+        await panZoomAndAssertImageProperties(page);
+
+        // Click previous image button
+        const previousImageButton = page.locator('.c-nav--prev');
+        await previousImageButton.click();
+
+        // Verify previous image
+        const selectedImage = page.locator('.selected');
+        await expect(selectedImage).toBeVisible();
+
+        // Click time conductor mode button
+        await page.locator('.c-mode-button').click();
+
+        // Select local clock mode
+        await page.locator('[data-testid=conductor-modeOption-realtime]').nth(0).click();
+
+        // Zoom in on next image
+        await mouseZoomIn(page);
+
+        // Click previous image button
+        await previousImageButton.click();
+
+        // Verify previous image
+        await expect(selectedImage).toBeVisible();
+
+        const imageCount = await page.locator('.c-imagery__thumb').count();
+        await expect.poll(async () => {
+            const newImageCount = await page.locator('.c-imagery__thumb').count();
+
+            return newImageCount;
+        }, {
+            message: "verify that old images are discarded",
+            timeout: 6 * 1000
+        }).toBe(imageCount);
+
+        // Verify selected image is still displayed
+        await expect(selectedImage).toBeVisible();
+
+        // Unpause imagery
+        await page.locator('.pause-play').click();
+
+        //Get background-image url from background-image css prop
+        await assertBackgroundImageUrlFromBackgroundCss(page);
+
+        // Open the image filter menu
+        await page.locator('[role=toolbar] button[title="Brightness and contrast"]').click();
+
+        // Drag the brightness and contrast sliders around and assert filter values
+        await dragBrightnessSliderAndAssertFilterValues(page);
+        await dragContrastSliderAndAssertFilterValues(page);
+    });
+});
+
+test.describe('Example Imagery in Tabs view', () => {
+    test.fixme('Can use Mouse Wheel to zoom in and out of previous image');
+    test.fixme('Can use alt+drag to move around image once zoomed in');
+    test.fixme('Can zoom into the latest image and the real-time/fixed-time imagery will pause');
+    test.fixme('Can zoom into a previous image from thumbstrip in real-time or fixed-time');
+    test.fixme('Clicking on the left arrow should pause the imagery and go to previous image');
+    test.fixme('If the imagery view is in pause mode, it should not be updated when new images come in');
+    test.fixme('If the imagery view is not in pause mode, it should be updated when new images come in');
+});
+
+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function saveTemplate(page) {
+    await page.locator('.c-button--menu.c-button--major.icon-save').click();
+    await page.locator('text=Save and Finish Editing').click();
 }
 
 /**
@@ -535,7 +661,7 @@ async function assertBackgroundImageUrlFromBackgroundCss(page) {
         return backgroundImageUrl2;
     }, {
         message: "verify next image has updated",
-        timeout: 7 * 1000
+        timeout: 6 * 1000
     }).not.toBe(backgroundImageUrl1);
     console.log('backgroundImageUrl2 ' + backgroundImageUrl2);
 }
@@ -589,17 +715,14 @@ async function panZoomAndAssertImageProperties(page) {
 }
 
 /**
- * Use the mouse wheel to zoom in or out of an image and assert that the image
- * has successfully zoomed in or out.
  * @param {import('@playwright/test').Page} page
- * @param {number} [factor = 2] The zoom factor. Positive for zoom in, negative for zoom out.
 */
-async function mouseZoomOnImageAndAssert(page, factor = 2) {
+async function mouseZoomIn(page) {
     // Zoom in
     const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
     await page.locator(backgroundImageSelector).hover({trial: true});
     const deltaYStep = 100; // equivalent to 1x zoom
-    await page.mouse.wheel(0, deltaYStep * factor);
+    await page.mouse.wheel(0, deltaYStep * 2);
     const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
     const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
     const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
@@ -609,47 +732,9 @@ async function mouseZoomOnImageAndAssert(page, factor = 2) {
 
     // Wait for zoom animation to finish
     await page.locator(backgroundImageSelector).hover({trial: true});
-    const imageMouseZoomed = await page.locator(backgroundImageSelector).boundingBox();
-
-    if (factor > 0) {
-        expect(imageMouseZoomed.height).toBeGreaterThan(originalImageDimensions.height);
-        expect(imageMouseZoomed.width).toBeGreaterThan(originalImageDimensions.width);
-    } else {
-        expect(imageMouseZoomed.height).toBeLessThan(originalImageDimensions.height);
-        expect(imageMouseZoomed.width).toBeLessThan(originalImageDimensions.width);
-    }
-}
-
-/**
- * Zoom in and out of the image using the buttons, and assert that the image has
- * been successfully zoomed in or out.
- * @param {import('@playwright/test').Page} page
- */
-async function buttonZoomOnImageAndAssert(page) {
-    // Get initial image dimensions
-    const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-
-    // Zoom in twice via button
-    await zoomIntoImageryByButton(page);
-    await zoomIntoImageryByButton(page);
-
-    // Get and assert zoomed in image dimensions
-    const zoomedInBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-    expect(zoomedInBoundingBox.height).toBeGreaterThan(initialBoundingBox.height);
-    expect(zoomedInBoundingBox.width).toBeGreaterThan(initialBoundingBox.width);
-
-    // Zoom out once via button
-    await zoomOutOfImageryByButton(page);
-
-    // Get and assert zoomed out image dimensions
-    const zoomedOutBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-    expect(zoomedOutBoundingBox.height).toBeLessThan(zoomedInBoundingBox.height);
-    expect(zoomedOutBoundingBox.width).toBeLessThan(zoomedInBoundingBox.width);
-
-    // Zoom out again via button, assert against the initial image dimensions
-    await zoomOutOfImageryByButton(page);
-    const finalBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
-    expect(finalBoundingBox).toEqual(initialBoundingBox);
+    const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
+    expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
+    expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
 }
 
 /**

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

@@ -1,120 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions');
-
-test.describe('Testing LAD table @unstable', () => {
-    let sineWaveObject;
-    test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-        await setRealTimeMode(page);
-
-        // Create Sine Wave Generator
-        sineWaveObject = await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            name: "Test Sine Wave Generator"
-        });
-    });
-    test('telemetry value exactly matches latest telemetry value received in real time', async ({ page }) => {
-        // Create LAD table
-        await createDomainObjectWithDefaults(page, {
-            type: 'LAD Table',
-            name: "Test LAD Table"
-        });
-        // Edit LAD table
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-        // Add the Sine Wave Generator to the LAD table and save changes
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.c-lad-table-wrapper');
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        // Subscribe to the Sine Wave Generator data
-        // On getting data, check if the value found in the LAD table is the most recent value
-        // from the Sine Wave Generator
-        const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
-        const subscribeTelemValue = await getTelemValuePromise;
-        const ladTableValuePromise = await page.waitForSelector(`text="${subscribeTelemValue}"`);
-        const ladTableValue = await ladTableValuePromise.textContent();
-
-        expect(ladTableValue).toBe(subscribeTelemValue);
-    });
-    test('telemetry value exactly matches latest telemetry value received in fixed time', async ({ page }) => {
-        // Create LAD table
-        await createDomainObjectWithDefaults(page, {
-            type: 'LAD Table',
-            name: "Test LAD Table"
-        });
-        // Edit LAD table
-        await page.locator('[title="Edit"]').click();
-
-        // Expand the 'My Items' folder in the left tree
-        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-        // Add the Sine Wave Generator to the LAD table and save changes
-        await page.dragAndDrop('text=Test Sine Wave Generator', '.c-lad-table-wrapper');
-        await page.locator('button[title="Save"]').click();
-        await page.locator('text=Save and Finish Editing').click();
-
-        // Subscribe to the Sine Wave Generator data
-        const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
-        // Set an offset of 1 minute and then change the time mode to fixed to set a 1 minute historical window
-        await setStartOffset(page, { mins: '1' });
-        await setFixedTimeMode(page);
-
-        // On getting data, check if the value found in the LAD table is the most recent value
-        // from the Sine Wave Generator
-        const subscribeTelemValue = await getTelemValuePromise;
-        const ladTableValuePromise = await page.waitForSelector(`text="${subscribeTelemValue}"`);
-        const ladTableValue = await ladTableValuePromise.textContent();
-
-        expect(ladTableValue).toBe(subscribeTelemValue);
-    });
-});
-
-/**
- * Util for subscribing to a telemetry object by object identifier
- * Limitations: Currently only works to return telemetry once to the node scope
- * To Do: See if there's a way to await this multiple times to allow for multiple
- * values to be returned over time
- * @param {import('@playwright/test').Page} page
- * @param {string} objectIdentifier identifier for object
- * @returns {Promise<string>} the formatted sin telemetry value
- */
-async function subscribeToTelemetry(page, objectIdentifier) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getTelemValue', resolve));
-
-    await page.evaluate(async (telemetryIdentifier) => {
-        const telemetryObject = await window.openmct.objects.get(telemetryIdentifier);
-        const metadata = window.openmct.telemetry.getMetadata(telemetryObject);
-        const formats = await window.openmct.telemetry.getFormatMap(metadata);
-        window.openmct.telemetry.subscribe(telemetryObject, (obj) => {
-            const sinVal = obj.sin;
-            const formattedSinVal = formats.sin.format(sinVal);
-            window.getTelemValue(formattedSinVal);
-        });
-    }, objectIdentifier);
-
-    return getTelemValuePromise;
-}

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

@@ -27,8 +27,6 @@ This test suite is dedicated to tests which verify the basic operations surround
 // FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
 const { test, expect } = require('../../../../baseFixtures');
-const { expandTreePaneItemByName, createDomainObjectWithDefaults } = require('../../../../appActions');
-const nbUtils = require('../../../../helper/notebookUtils');
 
 test.describe('Notebook CRUD Operations', () => {
     test.fixme('Can create a Notebook Object', async ({ page }) => {
@@ -69,32 +67,10 @@ test.describe('Default Notebook', () => {
 
 test.describe('Notebook section tests', () => {
     //The following test cases are associated with Notebook Sections
-    test.beforeEach(async ({ page }) => {
-        //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create Notebook
-        await createDomainObjectWithDefaults(page, {
-            type: 'Notebook',
-            name: "Test Notebook"
-        });
-    });
-    test('Default and new sections are automatically named Unnamed Section with Unnamed Page', async ({ page }) => {
-        // Check that the default section and page are created and the name matches the defaults
-        const defaultSectionName = await page.locator('.c-notebook__sections .c-list__item__name').textContent();
-        expect(defaultSectionName).toBe('Unnamed Section');
-        const defaultPageName = await page.locator('.c-notebook__pages .c-list__item__name').textContent();
-        expect(defaultPageName).toBe('Unnamed Page');
-
-        // Expand sidebar and add a section
-        await page.locator('.c-notebook__toggle-nav-button').click();
-        await page.locator('.js-sidebar-sections .c-icon-button.icon-plus').click();
-
-        // Check that new section and page within the new section match the defaults
-        const newSectionName = await page.locator('.c-notebook__sections .c-list__item__name').nth(1).textContent();
-        expect(newSectionName).toBe('Unnamed Section');
-        const newPageName = await page.locator('.c-notebook__pages .c-list__item__name').textContent();
-        expect(newPageName).toBe('Unnamed Page');
+    test.fixme('New sections are automatically named Unnamed Section with Unnamed Page', async ({ page }) => {
+        //Create new notebook A
+        //Add section
+        //Verify new section and new page details
     });
     test.fixme('Section selection operations and associated behavior', async ({ page }) => {
         //Create new notebook A
@@ -110,59 +86,10 @@ test.describe('Notebook section tests', () => {
         //Delete 3rd section
         //1st is selected and there is no default notebook
     });
-    test.fixme('Section rename operations', async ({ page }) => {
-        // Create a new notebook
-        // Add a section
-        // Rename the section but do not confirm
-        // Keyboard press 'Escape'
-        // Verify that the section name reverts to the default name
-        // Rename the section but do not confirm
-        // Keyboard press 'Enter'
-        // Verify that the section name is updated
-        // Rename the section to "" (empty string)
-        // Keyboard press 'Enter' to confirm
-        // Verify that the section name reverts to the default name
-        // Rename the section to something long that overflows the text box
-        // Verify that the section name is not truncated while input is active
-        // Confirm the section name edit
-        // Verify that the section name is truncated now that input is not active
-    });
 });
 
 test.describe('Notebook page tests', () => {
     //The following test cases are associated with Notebook Pages
-    test.beforeEach(async ({ page }) => {
-        //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Create Notebook
-        await createDomainObjectWithDefaults(page, {
-            type: 'Notebook',
-            name: "Test Notebook"
-        });
-    });
-    //Test will need to be implemented after a refactor in #5713
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip('Delete page popup is removed properly on clicking dropdown again', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5713'
-        });
-        // Expand sidebar and add a second page
-        await page.locator('.c-notebook__toggle-nav-button').click();
-        await page.locator('text=Page Add >> button').click();
-
-        // Click on the 2nd page dropdown button and expect the Delete Page option to appear
-        await page.locator('button[title="Open context menu"]').nth(2).click();
-        await expect(page.locator('text=Delete Page')).toBeEnabled();
-        // Clicking on the same page a second time causes the same Delete Page option to recreate
-        await page.locator('button[title="Open context menu"]').nth(2).click();
-        await expect(page.locator('text=Delete Page')).toBeEnabled();
-        // Clicking on the first page causes the first delete button to detach and recreate on the first page
-        await page.locator('button[title="Open context menu"]').nth(1).click();
-        const numOfDeletePagePopups = await page.locator('li[title="Delete Page"]').count();
-        expect(numOfDeletePagePopups).toBe(1);
-    });
     test.fixme('Page selection operations and associated behavior', async ({ page }) => {
         //Create new notebook A
         //Delete existing Page
@@ -180,23 +107,6 @@ test.describe('Notebook page tests', () => {
         //Delete 3rd page
         //First is now selected and there is no default notebook
     });
-    test.fixme('Page rename operations', async ({ page }) => {
-        // Create a new notebook
-        // Add a page
-        // Rename the page but do not confirm
-        // Keyboard press 'Escape'
-        // Verify that the page name reverts to the default name
-        // Rename the page but do not confirm
-        // Keyboard press 'Enter'
-        // Verify that the page name is updated
-        // Rename the page to "" (empty string)
-        // Keyboard press 'Enter' to confirm
-        // Verify that the page name reverts to the default name
-        // Rename the page to something long that overflows the text box
-        // Verify that the page name is not truncated while input is active
-        // Confirm the page name edit
-        // Verify that the page name is truncated now that input is not active
-    });
 });
 
 test.describe('Notebook search tests', () => {
@@ -210,58 +120,13 @@ test.describe('Notebook search tests', () => {
 
 test.describe('Notebook entry tests', () => {
     test.fixme('When a new entry is created, it should be focused', async ({ page }) => {});
-    test('When an object is dropped into a notebook, a new entry is created and it should be focused @unstable', async ({ page }) => {
-        await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-
-        // Create Notebook
-        const notebook = await createDomainObjectWithDefaults(page, {
-            type: 'Notebook',
-            name: "Embed Test Notebook"
-        });
-        // Create Overlay Plot
-        await createDomainObjectWithDefaults(page, {
-            type: 'Overlay Plot',
-            name: "Dropped Overlay Plot"
-        });
-
-        await expandTreePaneItemByName(page, 'My Items');
-
-        await page.goto(notebook.url);
-        await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', '.c-notebook__drag-area');
-
-        const embed = page.locator('.c-ne__embed__link');
-        const embedName = await embed.textContent();
-
-        await expect(embed).toHaveClass(/icon-plot-overlay/);
-        expect(embedName).toBe('Dropped Overlay Plot');
+    test.fixme('When a telemetry object is dropped into a notebook, a new entry is created and it should be focused', async ({ page }) => {
+        // Drag and drop any telmetry object on 'drop object'
+        // new entry gets created with telemtry object
     });
-    test('When an object is dropped into a notebooks existing entry, it should be focused @unstable', async ({ page }) => {
-        await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-
-        // Create Notebook
-        const notebook = await createDomainObjectWithDefaults(page, {
-            type: 'Notebook',
-            name: "Embed Test Notebook"
-        });
-        // Create Overlay Plot
-        await createDomainObjectWithDefaults(page, {
-            type: 'Overlay Plot',
-            name: "Dropped Overlay Plot"
-        });
-
-        await expandTreePaneItemByName(page, 'My Items');
-
-        await page.goto(notebook.url);
-
-        await nbUtils.enterTextEntry(page, 'Entry to drop into');
-        await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', 'text=Entry to drop into');
-
-        const existingEntry = page.locator('.c-ne__content', { has: page.locator('text="Entry to drop into"') });
-        const embed = existingEntry.locator('.c-ne__embed__link');
-        const embedName = await embed.textContent();
-
-        await expect(embed).toHaveClass(/icon-plot-overlay/);
-        expect(embedName).toBe('Dropped Overlay Plot');
+    test.fixme('When a telemetry object is dropped into a notebooks existing entry, it should be focused', async ({ page }) => {
+        // Drag and drop any telemetry object onto existing entry
+        // Entry updated with object and snapshot
     });
     test.fixme('new entries persist through navigation events without save', async ({ page }) => {});
     test.fixme('previous and new entries can be deleted', async ({ page }) => {});

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

@@ -21,18 +21,17 @@
  *****************************************************************************/
 
 const { test, expect } = require('../../../../pluginFixtures');
-const { openObjectTreeContextMenu, createDomainObjectWithDefaults } = require('../../../../appActions');
+const { openObjectTreeContextMenu } = require('../../../../appActions');
 const path = require('path');
-const nbUtils = require('../../../../helper/notebookUtils');
 
 const TEST_TEXT = 'Testing text for entries.';
 const TEST_TEXT_NAME = 'Test Page';
 const CUSTOM_NAME = 'CUSTOM_NAME';
+const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
 
 test.describe('Restricted Notebook', () => {
-    let notebook;
     test.beforeEach(async ({ page }) => {
-        notebook = await startAndAddRestrictedNotebookObject(page);
+        await startAndAddRestrictedNotebookObject(page);
     });
 
     test('Can be renamed @addInit', async ({ page }) => {
@@ -40,7 +39,9 @@ test.describe('Restricted Notebook', () => {
     });
 
     test('Can be deleted if there are no locked pages @addInit', async ({ page, openmctConfig }) => {
-        await openObjectTreeContextMenu(page, notebook.url);
+        const { myItemsFolderName } = openmctConfig;
+
+        await openObjectTreeContextMenu(page, myItemsFolderName, `Unnamed ${CUSTOM_NAME}`);
 
         const menuOptions = page.locator('.c-menu ul');
         await expect.soft(menuOptions).toContainText('Remove');
@@ -66,7 +67,7 @@ test.describe('Restricted Notebook', () => {
 
     test('Can be locked if at least one page has one entry @addInit', async ({ page }) => {
 
-        await nbUtils.enterTextEntry(page, TEST_TEXT);
+        await enterTextEntry(page);
 
         const commitButton = page.locator('button:has-text("Commit Entries")');
         expect(await commitButton.count()).toEqual(1);
@@ -75,19 +76,19 @@ test.describe('Restricted Notebook', () => {
 });
 
 test.describe('Restricted Notebook with at least one entry and with the page locked @addInit', () => {
-    let notebook;
+
     test.beforeEach(async ({ page }) => {
-        notebook = await startAndAddRestrictedNotebookObject(page);
-        await nbUtils.enterTextEntry(page, TEST_TEXT);
+        await startAndAddRestrictedNotebookObject(page);
+        await enterTextEntry(page);
         await lockPage(page);
 
         // open sidebar
         await page.locator('button.c-notebook__toggle-nav-button').click();
     });
 
-    test('Locked page should now be in a locked state @addInit @unstable', async ({ page }, testInfo) => {
-        // eslint-disable-next-line playwright/no-skipped-test
-        test.skip(testInfo.project === 'chrome-beta', "Test is unreliable on chrome-beta");
+    test('Locked page should now be in a locked state @addInit @unstable', async ({ page, openmctConfig }, testInfo) => {
+        test.fixme(testInfo.project === 'chrome-beta', "Test is unreliable on chrome-beta");
+        const { myItemsFolderName } = openmctConfig;
         // main lock message on page
         const lockMessage = page.locator('text=This page has been committed and cannot be modified or removed');
         expect.soft(await lockMessage.count()).toEqual(1);
@@ -97,7 +98,7 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
         expect.soft(await pageLockIcon.count()).toEqual(1);
 
         // no way to remove a restricted notebook with a locked page
-        await openObjectTreeContextMenu(page, notebook.url);
+        await openObjectTreeContextMenu(page, myItemsFolderName, `Unnamed ${CUSTOM_NAME}`);
         const menuOptions = page.locator('.c-menu ul');
 
         await expect(menuOptions).not.toContainText('Remove');
@@ -121,7 +122,7 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
         expect.soft(newPageCount).toEqual(1);
 
         // enter test text
-        await nbUtils.enterTextEntry(page, TEST_TEXT);
+        await enterTextEntry(page);
 
         // expect new page to be lockable
         const commitButton = page.locator('BUTTON:HAS-TEXT("COMMIT ENTRIES")');
@@ -148,7 +149,7 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit
     test.beforeEach(async ({ page, openmctConfig }) => {
         const { myItemsFolderName } = openmctConfig;
         await startAndAddRestrictedNotebookObject(page);
-        await nbUtils.dragAndDropEmbed(page, myItemsFolderName);
+        await dragAndDropEmbed(page, myItemsFolderName);
     });
 
     test('Allows embeds to be deleted if page unlocked @addInit', async ({ page }) => {
@@ -177,8 +178,49 @@ async function startAndAddRestrictedNotebookObject(page) {
     // eslint-disable-next-line no-undef
     await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitRestrictedNotebook.js') });
     await page.goto('./', { waitUntil: 'networkidle' });
+    await page.click('button:has-text("Create")');
+    await page.click(`text=${CUSTOM_NAME}`); // secondarily tests renamability also
+    // Click text=OK
+    await Promise.all([
+        page.waitForNavigation({waitUntil: 'networkidle'}),
+        page.click('text=OK')
+    ]);
+}
 
-    return createDomainObjectWithDefaults(page, { type: CUSTOM_NAME });
+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function enterTextEntry(page) {
+    // Click .c-notebook__drag-area
+    await page.locator(NOTEBOOK_DROP_AREA).click();
+
+    // enter text
+    await page.locator('div.c-ne__text').click();
+    await page.locator('div.c-ne__text').fill(TEST_TEXT);
+    await page.locator('div.c-ne__text').press('Enter');
+}
+
+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function dragAndDropEmbed(page, myItemsFolderName) {
+    // Click button:has-text("Create")
+    await page.locator('button:has-text("Create")').click();
+    // Click li:has-text("Sine Wave Generator")
+    await page.locator('li:has-text("Sine Wave Generator")').click();
+    // Click form[name="mctForm"] >> text=My Items
+    await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
+    // Click text=OK
+    await page.locator('text=OK').click();
+    // Click text=Open MCT My Items >> span >> nth=3
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+    // Click text=Unnamed CUSTOM_NAME
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('text=Unnamed CUSTOM_NAME').click()
+    ]);
+
+    await page.dragAndDrop('text=UNNAMED SINE WAVE GENERATOR', NOTEBOOK_DROP_AREA);
 }
 
 /**

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

@@ -36,7 +36,7 @@ async function createNotebookAndEntry(page, iterations = 1) {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'networkidle' });
 
-    createDomainObjectWithDefaults(page, { type: 'Notebook' });
+    createDomainObjectWithDefaults(page, 'Notebook');
 
     for (let iteration = 0; iteration < iterations; iteration++) {
         // Click text=To start a new entry, click here or drag and drop any object
@@ -56,23 +56,19 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
     await createNotebookAndEntry(page, iterations);
 
     for (let iteration = 0; iteration < iterations; iteration++) {
-        // Hover and click "Add Tag" button
-        // Hover is needed here to "slow down" the actions while running in headless mode
-        await page.hover(`button:has-text("Add Tag") >> nth = ${iteration}`);
+        // Click text=To start a new entry, click here or drag and drop any object
         await page.locator(`button:has-text("Add Tag") >> nth = ${iteration}`).click();
 
-        // Click inside the tag search input
+        // Click [placeholder="Type to select tag"]
         await page.locator('[placeholder="Type to select tag"]').click();
-        // Select the "Driving" tag
+        // Click text=Driving
         await page.locator('[aria-label="Autocomplete Options"] >> text=Driving').click();
 
-        // Hover and click "Add Tag" button
-        // Hover is needed here to "slow down" the actions while running in headless mode
-        await page.hover(`button:has-text("Add Tag") >> nth = ${iteration}`);
+        // Click button:has-text("Add Tag")
         await page.locator(`button:has-text("Add Tag") >> nth = ${iteration}`).click();
-        // Click inside the tag search input
+        // Click [placeholder="Type to select tag"]
         await page.locator('[placeholder="Type to select tag"]').click();
-        // Select the "Science" tag
+        // Click text=Science
         await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
     }
 }
@@ -126,16 +122,15 @@ test.describe('Tagging in Notebooks @addInit', () => {
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
         // Fill [aria-label="OpenMCT Search"] input[type="search"]
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Xq');
-        await expect(page.locator('[aria-label="Search Result"]')).toBeHidden();
-        await expect(page.locator('[aria-label="Search Result"]')).toBeHidden();
+        await expect(page.locator('[aria-label="Search Result"]')).not.toBeVisible();
+        await expect(page.locator('[aria-label="Search Result"]')).not.toBeVisible();
     });
 
     test('Can delete tags', async ({ page }) => {
         await createNotebookEntryAndTags(page);
         await page.locator('[aria-label="Notebook Entries"]').click();
         // Delete Driving
-        await page.hover('.c-tag__label:has-text("Driving")');
-        await page.locator('.c-tag__label:has-text("Driving") ~ .c-completed-tag-deletion').click();
+        await page.locator('text=Science Driving Add Tag >> button').nth(1).click();
 
         await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText("Science");
         await expect(page.locator('[aria-label="Notebook Entry"]')).not.toContainText("Driving");
@@ -144,28 +139,11 @@ test.describe('Tagging in Notebooks @addInit', () => {
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
         await expect(page.locator('[aria-label="Search Result"]')).not.toContainText("Driving");
     });
-
-    test('Can delete objects with tags and neither return in search', async ({ page }) => {
-        await createNotebookEntryAndTags(page);
-        // Delete Notebook
-        await page.locator('button[title="More options"]').click();
-        await page.locator('li[title="Remove this object from its containing object."]').click();
-        await page.locator('button:has-text("OK")').click();
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Fill [aria-label="OpenMCT Search"] input[type="search"]
-        await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Unnamed');
-        await expect(page.locator('text=No results found')).toBeVisible();
-        await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sci');
-        await expect(page.locator('text=No results found')).toBeVisible();
-        await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('dri');
-        await expect(page.locator('text=No results found')).toBeVisible();
-    });
     test('Tags persist across reload', async ({ page }) => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        await createDomainObjectWithDefaults(page, { type: 'Clock' });
+        await createDomainObjectWithDefaults(page, 'Clock');
 
         const ITERATIONS = 4;
         await createNotebookEntryAndTags(page, ITERATIONS);

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

@@ -56,7 +56,7 @@ test.describe('ExportAsJSON', () => {
 
         await canvas.hover({trial: true});
 
-        expect(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-prepan.png', { animations: 'disabled' });
+        expect(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-prepan');
 
         //Alt Drag Start
         await page.keyboard.down('Alt');
@@ -80,7 +80,7 @@ test.describe('ExportAsJSON', () => {
 
         await canvas.hover({trial: true});
 
-        expect(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-panned.png', { animations: 'disabled' });
+        expect(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-panned');
     });
 });
 

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

@@ -28,10 +28,9 @@ const { test, expect } = require('../../../../pluginFixtures');
 
 test.describe('Handle missing object for plots', () => {
     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');
-
         const { myItemsFolderName } = openmctConfig;
+
+        test.fixme(browserName === 'firefox', 'Firefox failing due to console events being missed');
         const errorLogs = [];
 
         page.on("console", (message) => {

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

@@ -1,110 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-Tests to verify log plot functionality. Note this test suite if very much under active development and should not
-necessarily be used for reference when writing new tests in this area.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-
-test.describe('Legend color in sync with plot color', () => {
-    test('Testing', async ({ page }) => {
-        await makeOverlayPlot(page);
-
-        // navigate to plot series color palette
-        await page.click('.l-browse-bar__actions__edit');
-        await page.locator('li.c-tree__item.menus-to-left .c-disclosure-triangle').click();
-        await page.locator('.c-click-swatch--menu').click();
-        await page.locator('.c-palette__item[style="background: rgb(255, 166, 61);"]').click();
-
-        // gets color for swatch located in legend
-        const element = await page.waitForSelector('.plot-series-color-swatch');
-        const color = await element.evaluate((el) => {
-            return window.getComputedStyle(el).getPropertyValue('background-color');
-        });
-
-        expect(color).toBe('rgb(255, 166, 61)');
-    });
-});
-
-async function saveOverlayPlot(page) {
-    // save overlay 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' });
-}
-
-async function makeOverlayPlot(page) {
-    // 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: 'networkidle' });
-
-    // create overlay plot
-
-    await page.locator('button.c-create-button').click();
-    await page.locator('li:has-text("Overlay Plot")').click();
-    await Promise.all([
-        page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('text=OK').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'});
-
-    // save the overlay plot
-
-    await saveOverlayPlot(page);
-
-    // create a sinewave generator
-
-    await page.locator('button.c-create-button').click();
-    await page.locator('li:has-text("Sine Wave Generator")').click();
-
-    // Click OK to make generator
-
-    await Promise.all([
-        page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('text=OK').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'});
-
-    // click on overlay plot
-
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
-    await Promise.all([
-        page.waitForNavigation(),
-        page.locator('text=Unnamed Overlay Plot').first().click()
-    ]);
-}

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

@@ -20,26 +20,55 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
 const { test, expect } = require('../../../../pluginFixtures');
 
 test.describe('Telemetry Table', () => {
-    test('unpauses and filters data when paused by button and user changes bounds', async ({ page }) => {
+    test('unpauses and filters data when paused by button and user changes bounds', async ({ page, openmctConfig }) => {
         test.info().annotations.push({
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/5113'
         });
 
+        const { myItemsFolderName } = openmctConfig;
+        const bannerMessage = '.c-message-banner__message';
+        const createButton = 'button:has-text("Create")';
+
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        const table = await createDomainObjectWithDefaults(page, { type: 'Telemetry Table' });
-        await createDomainObjectWithDefaults(page, {
-            type: 'Sine Wave Generator',
-            parent: table.uuid
-        });
+        // Click create button
+        await page.locator(createButton).click();
+        await page.locator('li:has-text("Telemetry Table")').click();
+
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=OK').click(),
+            // Wait for Save Banner to appear
+            page.waitForSelector(bannerMessage)
+        ]);
+
+        // Save (exit edit mode)
+        await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(3).click();
+        await page.locator('text=Save and Finish Editing').click();
+
+        // Click create button
+        await page.locator(createButton).click();
+
+        // add Sine Wave Generator with defaults
+        await page.locator('li:has-text("Sine Wave Generator")').click();
+
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=OK').click(),
+            // Wait for Save Banner to appear
+            page.waitForSelector(bannerMessage)
+        ]);
 
         // focus the Telemetry Table
-        page.goto(table.url);
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
+        await Promise.all([
+            page.waitForNavigation(),
+            page.locator('text=Unnamed Telemetry Table').first().click()
+        ]);
 
         // Click pause button
         const pauseButton = page.locator('button.c-button.icon-pause');

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

@@ -21,7 +21,6 @@
  *****************************************************************************/
 
 const { test, expect } = require('../../../../baseFixtures');
-const { setFixedTimeMode, setRealTimeMode, setStartOffset, setEndOffset } = require('../../../../appActions');
 
 test.describe('Time conductor operations', () => {
     test('validate start time does not exceeds end time', async ({ page }) => {
@@ -147,24 +146,89 @@ test.describe('Time conductor input fields real-time mode', () => {
         expect(page.url()).toContain(`startDelta=${startDelta}`);
         expect(page.url()).toContain(`endDelta=${endDelta}`);
     });
-
-    test.fixme('time conductor history in fixed time mode will track changing start and end times', async ({ page }) => {
-        // change start time, verify it's tracked in history
-        // change end time, verify it's tracked in history
-    });
-
-    test.fixme('time conductor history in realtime mode will track changing start and end times', async ({ page }) => {
-        // change start offset, verify it's tracked in history
-        // change end offset, verify it's tracked in history
-    });
-
-    test.fixme('time conductor history allows you to set a historical timeframe', async ({ page }) => {
-        // make sure there are historical history options
-        // select an option and make sure the time conductor start and end bounds are updated correctly
-    });
-
-    test.fixme('time conductor history allows you to set a realtime offsets', async ({ page }) => {
-        // make sure there are realtime history options
-        // select an option and verify the offsets are updated correctly
-    });
 });
+
+/**
+ * @typedef {Object} OffsetValues
+ * @property {string | undefined} hours
+ * @property {string | undefined} mins
+ * @property {string | undefined} secs
+ */
+
+/**
+ * Set the values (hours, mins, secs) for the start time offset when in realtime mode
+ * @param {import('@playwright/test').Page} page
+ * @param {OffsetValues} offset
+ */
+async function setStartOffset(page, offset) {
+    const startOffsetButton = page.locator('data-testid=conductor-start-offset-button');
+    await setTimeConductorOffset(page, offset, startOffsetButton);
+}
+
+/**
+ * Set the values (hours, mins, secs) for the end time offset when in realtime mode
+ * @param {import('@playwright/test').Page} page
+ * @param {OffsetValues} offset
+ */
+async function setEndOffset(page, offset) {
+    const endOffsetButton = page.locator('data-testid=conductor-end-offset-button');
+    await setTimeConductorOffset(page, offset, endOffsetButton);
+}
+
+/**
+ * Set the time conductor to fixed timespan mode
+ * @param {import('@playwright/test').Page} page
+ */
+async function setFixedTimeMode(page) {
+    await setTimeConductorMode(page, true);
+}
+
+/**
+ * Set the time conductor to realtime mode
+ * @param {import('@playwright/test').Page} page
+ */
+async function setRealTimeMode(page) {
+    await setTimeConductorMode(page, false);
+}
+
+/**
+ * Set the values (hours, mins, secs) for the TimeConductor offsets when in realtime mode
+ * @param {import('@playwright/test').Page} page
+ * @param {OffsetValues} offset
+ * @param {import('@playwright/test').Locator} offsetButton
+ */
+async function setTimeConductorOffset(page, {hours, mins, secs}, offsetButton) {
+    await offsetButton.click();
+
+    if (hours) {
+        await page.fill('.pr-time-controls__hrs', hours);
+    }
+
+    if (mins) {
+        await page.fill('.pr-time-controls__mins', mins);
+    }
+
+    if (secs) {
+        await page.fill('.pr-time-controls__secs', secs);
+    }
+
+    // Click the check button
+    await page.locator('.icon-check').click();
+}
+
+/**
+ * Set the time conductor mode to either fixed timespan or realtime mode.
+ * @param {import('@playwright/test').Page} page
+ * @param {boolean} [isFixedTimespan=true] true for fixed timespan mode, false for realtime mode; default is true
+ */
+async function setTimeConductorMode(page, isFixedTimespan = true) {
+    // Click 'mode' button
+    await page.locator('.c-mode-button').click();
+
+    // Switch time conductor mode
+    if (isFixedTimespan) {
+        await page.locator('data-testid=conductor-modeOption-fixed').click();
+    } else {
+        await page.locator('data-testid=conductor-modeOption-realtime').click();
+    }
+}

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

@@ -24,10 +24,9 @@ const { test, expect } = require('../../../../pluginFixtures');
 const { openObjectTreeContextMenu, createDomainObjectWithDefaults } = require('../../../../appActions');
 
 test.describe('Timer', () => {
-    let timer;
     test.beforeEach(async ({ page }) => {
         await page.goto('./', { waitUntil: 'networkidle' });
-        timer = await createDomainObjectWithDefaults(page, { type: 'timer' });
+        await createDomainObjectWithDefaults(page, 'timer');
     });
 
     test('Can perform actions on the Timer', async ({ page, openmctConfig }) => {
@@ -36,13 +35,13 @@ test.describe('Timer', () => {
             description: 'https://github.com/nasa/openmct/issues/4313'
         });
 
-        const timerUrl = timer.url;
+        const { myItemsFolderName } = await openmctConfig;
 
         await test.step("From the tree context menu", async () => {
-            await triggerTimerContextMenuAction(page, timerUrl, 'Start');
-            await triggerTimerContextMenuAction(page, timerUrl, 'Pause');
-            await triggerTimerContextMenuAction(page, timerUrl, 'Restart at 0');
-            await triggerTimerContextMenuAction(page, timerUrl, 'Stop');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Start');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Pause');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Restart at 0');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Stop');
         });
 
         await test.step("From the 3dot menu", async () => {
@@ -75,9 +74,9 @@ test.describe('Timer', () => {
  * @param {import('@playwright/test').Page} page
  * @param {TimerAction} action
  */
-async function triggerTimerContextMenuAction(page, timerUrl, action) {
+async function triggerTimerContextMenuAction(page, myItemsFolderName, action) {
     const menuAction = `.c-menu ul li >> text="${action}"`;
-    await openObjectTreeContextMenu(page, timerUrl);
+    await openObjectTreeContextMenu(page, myItemsFolderName, "Unnamed Timer");
     await page.locator(menuAction).click();
     assertTimerStateAfterAction(page, action);
 }

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

@@ -24,8 +24,6 @@
  */
 
 const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-const { v4: uuid } = require('uuid');
 
 test.describe('Grand Search', () => {
     test('Can search for objects, and subsequent search dropdown behaves properly', async ({ page, openmctConfig }) => {
@@ -43,7 +41,7 @@ test.describe('Grand Search', () => {
         await expect(page.locator('[aria-label="Search Result"] >> nth=3')).toContainText(`Clock D ${myItemsFolderName} Red Folder Blue Folder`);
         // Click text=Elements >> nth=0
         await page.locator('text=Elements').first().click();
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();
+        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).not.toBeVisible();
 
         await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').click();
         await page.locator('[aria-label="Clock A clock result"] >> text=Clock A').click();
@@ -56,11 +54,11 @@ test.describe('Grand Search', () => {
 
         // Click [aria-label="OpenMCT Search"] a >> nth=0
         await page.locator('[aria-label="OpenMCT Search"] a').first().click();
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();
+        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).not.toBeVisible();
 
         // Fill [aria-label="OpenMCT Search"] input[type="search"]
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('foo');
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();
+        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).not.toBeVisible();
 
         // Click text=Snapshot Save and Finish Editing Save and Continue Editing >> button >> nth=1
         await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
@@ -109,21 +107,15 @@ test.describe("Search Tests @unstable", () => {
 
         // Verify that no results are found
         expect(await searchResults.count()).toBe(0);
-
-        // Verify proper message appears
-        await expect(page.locator('text=No results found')).toBeVisible();
     });
 
-    test('Validate single object in search result @couchdb', async ({ page }) => {
+    test('Validate single object in search result', async ({ page }) => {
         //Go to baseURL
         await page.goto("./", { waitUntil: "networkidle" });
 
         // Create a folder object
-        const folderName = uuid();
-        await createDomainObjectWithDefaults(page, {
-            type: 'folder',
-            name: folderName
-        });
+        const folderName = 'testFolder';
+        await createFolderObject(page, folderName);
 
         // Full search for object
         await page.type("input[type=search]", folderName);
@@ -132,7 +124,7 @@ test.describe("Search Tests @unstable", () => {
         await waitForSearchCompletion(page);
 
         // Get the search results
-        const searchResults = page.locator(searchResultSelector);
+        const searchResults = await page.locator(searchResultSelector);
 
         // Verify that one result is found
         expect(await searchResults.count()).toBe(1);
@@ -220,7 +212,7 @@ async function createObjectsForSearch(page, myItemsFolderName) {
     ]);
 
     await page.locator('button:has-text("Create")').click();
-    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await page.locator('li[title="A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts."]').click();
     await Promise.all([
         page.waitForNavigation(),
         await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock A'),
@@ -229,7 +221,7 @@ async function createObjectsForSearch(page, myItemsFolderName) {
     ]);
 
     await page.locator('button:has-text("Create")').click();
-    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await page.locator('li[title="A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts."]').click();
     await Promise.all([
         page.waitForNavigation(),
         await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock B'),
@@ -238,7 +230,7 @@ async function createObjectsForSearch(page, myItemsFolderName) {
     ]);
 
     await page.locator('button:has-text("Create")').click();
-    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await page.locator('li[title="A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts."]').click();
     await Promise.all([
         page.waitForNavigation(),
         await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock C'),
@@ -247,7 +239,7 @@ async function createObjectsForSearch(page, myItemsFolderName) {
     ]);
 
     await page.locator('button:has-text("Create")').click();
-    await page.locator('li[title="A digital clock that uses system time and supports a variety of display formats and timezones."]').click();
+    await page.locator('li[title="A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts."]').click();
     await Promise.all([
         page.waitForNavigation(),
         await page.locator('text=Properties Title Notes >> input[type="text"] >> nth=0').fill('Clock D'),

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

@@ -1,138 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test, expect } = require('../../pluginFixtures.js');
-const {
-    createDomainObjectWithDefaults,
-    openObjectTreeContextMenu
-} = require('../../appActions.js');
-
-test.describe('Tree operations', () => {
-    test('Renaming an object reorders the tree @unstable', async ({ page, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Foo'
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Bar'
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: 'Baz'
-        });
-
-        const clock1 = await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            name: 'aaa'
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            name: 'www'
-        });
-
-        // Expand the root folder
-        await expandTreePaneItemByName(page, myItemsFolderName);
-
-        await test.step("Reorders objects with the same tree depth", async () => {
-            await getAndAssertTreeItems(page, ['aaa', 'Bar', 'Baz', 'Foo', 'www']);
-            await renameObjectFromContextMenu(page, clock1.url, 'zzz');
-            await getAndAssertTreeItems(page, ['Bar', 'Baz', 'Foo', 'www', 'zzz']);
-        });
-
-        await test.step("Reorders links to objects as well as original objects", async () => {
-            await page.click('role=treeitem[name=/Bar/]');
-            await page.dragAndDrop('role=treeitem[name=/www/]', '.c-object-view');
-            await page.dragAndDrop('role=treeitem[name=/zzz/]', '.c-object-view');
-            await page.click('role=treeitem[name=/Baz/]');
-            await page.dragAndDrop('role=treeitem[name=/www/]', '.c-object-view');
-            await page.dragAndDrop('role=treeitem[name=/zzz/]', '.c-object-view');
-            await page.click('role=treeitem[name=/Foo/]');
-            await page.dragAndDrop('role=treeitem[name=/www/]', '.c-object-view');
-            await page.dragAndDrop('role=treeitem[name=/zzz/]', '.c-object-view');
-            // Expand the unopened folders
-            await expandTreePaneItemByName(page, 'Bar');
-            await expandTreePaneItemByName(page, 'Baz');
-            await expandTreePaneItemByName(page, 'Foo');
-
-            await renameObjectFromContextMenu(page, clock1.url, '___');
-            await getAndAssertTreeItems(page,
-                [
-                    "___",
-                    "Bar",
-                    "___",
-                    "www",
-                    "Baz",
-                    "___",
-                    "www",
-                    "Foo",
-                    "___",
-                    "www",
-                    "www"
-                ]);
-        });
-    });
-});
-
-/**
- * @param {import('@playwright/test').Page} page
- * @param {Array<string>} expected
- */
-async function getAndAssertTreeItems(page, expected) {
-    const treeItems = page.locator('[role="treeitem"]');
-    const allTexts = await treeItems.allInnerTexts();
-    // Get rid of root folder ('My Items') as its position will not change
-    allTexts.shift();
-    expect(allTexts).toEqual(expected);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- * @param {string} name
- */
-async function expandTreePaneItemByName(page, name) {
-    const treePane = page.locator('#tree-pane');
-    const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
-    const expandTriangle = treeItem.locator('.c-disclosure-triangle');
-    await expandTriangle.click();
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- * @param {string} myItemsFolderName
- * @param {string} url
- * @param {string} newName
- */
-async function renameObjectFromContextMenu(page, url, newName) {
-    await openObjectTreeContextMenu(page, url);
-    await page.click('li:text("Edit Properties")');
-    const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-    await nameInput.fill("");
-    await nameInput.fill(newName);
-    await page.click('[aria-label="Save"]');
-}

e2e/tests/visual/addInit.visual.spec.js

@@ -53,7 +53,7 @@ test.describe('Visual - addInit', () => {
         //Go to baseURL
         await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
 
-        await createDomainObjectWithDefaults(page, { type: CUSTOM_NAME });
+        await createDomainObjectWithDefaults(page, CUSTOM_NAME);
 
         // Take a snapshot of the newly created CUSTOM_NAME notebook
         await percySnapshot(page, `Restricted Notebook with CUSTOM_NAME (theme: '${theme}')`);

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

@@ -1,101 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test } = require('../../../pluginFixtures.js');
-const { createDomainObjectWithDefaults } = require('../../../appActions.js');
-
-const percySnapshot = require('@percy/playwright');
-
-test.describe('Visual - Tree Pane', () => {
-    test('Tree pane in various states @unstable', async ({ page, theme, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-        await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-
-        const foo = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: "Foo Folder"
-        });
-
-        const bar = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: "Bar Folder",
-            parent: foo.uuid
-        });
-
-        const baz = await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: "Baz Folder",
-            parent: bar.uuid
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            name: 'A Clock'
-        });
-
-        await createDomainObjectWithDefaults(page, {
-            type: 'Clock',
-            name: 'Z Clock'
-        });
-
-        const treePane = "#tree-pane";
-
-        await percySnapshot(page, `Tree Pane w/ collapsed tree (theme: ${theme})`, {
-            scope: treePane
-        });
-
-        await expandTreePaneItemByName(page, myItemsFolderName);
-
-        await page.goto(foo.url);
-        await page.dragAndDrop('role=treeitem[name=/A Clock/]', '.c-object-view');
-        await page.dragAndDrop('role=treeitem[name=/Z Clock/]', '.c-object-view');
-        await page.goto(bar.url);
-        await page.dragAndDrop('role=treeitem[name=/A Clock/]', '.c-object-view');
-        await page.dragAndDrop('role=treeitem[name=/Z Clock/]', '.c-object-view');
-        await page.goto(baz.url);
-        await page.dragAndDrop('role=treeitem[name=/A Clock/]', '.c-object-view');
-        await page.dragAndDrop('role=treeitem[name=/Z Clock/]', '.c-object-view');
-
-        await percySnapshot(page, `Tree Pane w/ single level expanded (theme: ${theme})`, {
-            scope: treePane
-        });
-
-        await expandTreePaneItemByName(page, foo.name);
-        await expandTreePaneItemByName(page, bar.name);
-        await expandTreePaneItemByName(page, baz.name);
-
-        await percySnapshot(page, `Tree Pane w/ multiple levels expanded (theme: ${theme})`, {
-            scope: treePane
-        });
-    });
-});
-
-/**
- * @param {import('@playwright/test').Page} page
- * @param {string} name
- */
-async function expandTreePaneItemByName(page, name) {
-    const treePane = page.locator('#tree-pane');
-    const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
-    const expandTriangle = treeItem.locator('.c-disclosure-triangle');
-    await expandTriangle.click();
-}

e2e/tests/visual/default.visual.spec.js

@@ -67,21 +67,21 @@ test.describe('Visual - Default', () => {
         await percySnapshot(page, `About (theme: '${theme}')`);
     });
 
-    test('Visual - Default Condition Set @unstable', async ({ page, theme }) => {
+    test('Visual - Default Condition Set', async ({ page, theme }) => {
 
-        await createDomainObjectWithDefaults(page, { type: 'Condition Set' });
+        await createDomainObjectWithDefaults(page, 'Condition Set');
 
         // Take a snapshot of the newly created Condition Set object
         await percySnapshot(page, `Default Condition Set (theme: '${theme}')`);
     });
 
-    test('Visual - Default Condition Widget @unstable', async ({ page, theme }) => {
+    test.fixme('Visual - Default Condition Widget', async ({ page, theme }) => {
         test.info().annotations.push({
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/5349'
         });
 
-        await createDomainObjectWithDefaults(page, { type: 'Condition Widget' });
+        await createDomainObjectWithDefaults(page, 'Condition Widget');
 
         // Take a snapshot of the newly created Condition Widget object
         await percySnapshot(page, `Default Condition Widget (theme: '${theme}')`);
@@ -137,8 +137,8 @@ test.describe('Visual - Default', () => {
         await percySnapshot(page, `removed amplitude property value (theme: '${theme}')`);
     });
 
-    test('Visual - Save Successful Banner @unstable', async ({ page, theme }) => {
-        await createDomainObjectWithDefaults(page, { type: 'Timer' });
+    test('Visual - Save Successful Banner', async ({ page, theme }) => {
+        await createDomainObjectWithDefaults(page, 'Timer');
 
         await page.locator('.c-message-banner__message').hover({ trial: true });
         await percySnapshot(page, `Banner message shown (theme: '${theme}')`);
@@ -159,8 +159,8 @@ test.describe('Visual - Default', () => {
 
     });
 
-    test('Visual - Default Gauge is correct @unstable', async ({ page, theme }) => {
-        await createDomainObjectWithDefaults(page, { type: 'Gauge' });
+    test('Visual - Default Gauge is correct', async ({ page, theme }) => {
+        await createDomainObjectWithDefaults(page, 'Gauge');
 
         // Take a snapshot of the newly created Gauge object
         await percySnapshot(page, `Default Gauge (theme: '${theme}')`);

e2e/tests/visual/faultManagement.visual.spec.js

@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const path = require('path');
-const { test } = require('../../pluginFixtures');
-const percySnapshot = require('@percy/playwright');
-
-const utils = require('../../helper/faultUtils');
-
-test.describe('The Fault Management Plugin Visual Test', () => {
-
-    test('icon test', async ({ page, theme }) => {
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../helper/', 'addInitFaultManagementPlugin.js') });
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        await percySnapshot(page, `Fault Management icon appears in tree (theme: '${theme}')`);
-    });
-
-    test('fault list and acknowledged faults', async ({ page, theme }) => {
-        await utils.navigateToFaultManagementWithStaticExample(page);
-
-        await percySnapshot(page, `Shows a list of faults in the standard view (theme: '${theme}')`);
-
-        await utils.acknowledgeFault(page, 1);
-        await utils.changeViewTo(page, 'acknowledged');
-
-        await percySnapshot(page, `Acknowledged faults, have a checkmark on the fault icon and appear in the acknowldeged view (theme: '${theme}')`);
-    });
-
-    test('shelved faults', async ({ page, theme }) => {
-        await utils.navigateToFaultManagementWithStaticExample(page);
-
-        await utils.shelveFault(page, 1);
-        await utils.changeViewTo(page, 'shelved');
-
-        await percySnapshot(page, `Shelved faults appear in the shelved view (theme: '${theme}')`);
-
-        await utils.openFaultRowMenu(page, 1);
-
-        await percySnapshot(page, `Shelved faults have a 3-dot menu with Unshelve option enabled (theme: '${theme}')`);
-    });
-
-    test('3-dot menu for fault', async ({ page, theme }) => {
-        await utils.navigateToFaultManagementWithStaticExample(page);
-
-        await utils.openFaultRowMenu(page, 1);
-
-        await percySnapshot(page, `Faults have a 3-dot menu with Acknowledge, Shelve and Unshelve (Unshelve is disabled) options (theme: '${theme}')`);
-    });
-
-    test('ability to acknowledge or shelve', async ({ page, theme }) => {
-        await utils.navigateToFaultManagementWithStaticExample(page);
-
-        await utils.selectFaultItem(page, 1);
-
-        await percySnapshot(page, `Selected faults highlight the ability to Acknowledge or Shelve above the fault list (theme: '${theme}')`);
-    });
-});

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

@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-const { test } = require('../../pluginFixtures');
-const percySnapshot = require('@percy/playwright');
-const { expandTreePaneItemByName, createDomainObjectWithDefaults } = require('../../appActions');
-
-test.describe('Visual - Notebook', () => {
-    test('Accepts dropped objects as embeds @unstable', async ({ page, theme, openmctConfig }) => {
-        const { myItemsFolderName } = openmctConfig;
-        await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-
-        // Create Notebook
-        const notebook = await createDomainObjectWithDefaults(page, {
-            type: 'Notebook',
-            name: "Embed Test Notebook"
-        });
-        // Create Overlay Plot
-        await createDomainObjectWithDefaults(page, {
-            type: 'Overlay Plot',
-            name: "Dropped Overlay Plot"
-        });
-
-        await expandTreePaneItemByName(page, myItemsFolderName);
-
-        await page.goto(notebook.url);
-        await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', '.c-notebook__drag-area');
-
-        await percySnapshot(page, `Notebook w/ dropped embed (theme: ${theme})`);
-
-    });
-});

e2e/tests/visual/search.visual.spec.js

@@ -46,10 +46,7 @@ test.describe('Grand Search', () => {
         // await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
         // await page.locator('text=Save and Finish Editing').click();
         const folder1 = 'Folder1';
-        await createDomainObjectWithDefaults(page, {
-            type: 'Folder',
-            name: folder1
-        });
+        await createDomainObjectWithDefaults(page, 'Folder', folder1);
 
         // Click [aria-label="OpenMCT Search"] input[type="search"]
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();

example/faultManagement/utils.js

@@ -1,76 +0,0 @@
-const SEVERITIES = ['WATCH', 'WARNING', 'CRITICAL'];
-const NAMESPACE = '/Example/fault-';
-const getRandom = {
-    severity: () => SEVERITIES[Math.floor(Math.random() * 3)],
-    value: () => Math.random() + Math.floor(Math.random() * 21) - 10,
-    fault: (num, staticFaults) => {
-        let val = getRandom.value();
-        let severity = getRandom.severity();
-        let time = Date.now() - num;
-
-        if (staticFaults) {
-            let severityIndex = num > 3 ? num % 3 : num;
-
-            val = num;
-            severity = SEVERITIES[severityIndex - 1];
-            time = num;
-        }
-
-        return {
-            type: num,
-            fault: {
-                acknowledged: false,
-                currentValueInfo: {
-                    value: val,
-                    rangeCondition: severity,
-                    monitoringResult: severity
-                },
-                id: `id-${num}`,
-                name: `Example Fault ${num}`,
-                namespace: NAMESPACE + num,
-                seqNum: 0,
-                severity: severity,
-                shelved: false,
-                shortDescription: '',
-                triggerTime: time,
-                triggerValueInfo: {
-                    value: val,
-                    rangeCondition: severity,
-                    monitoringResult: severity
-                }
-            }
-        };
-    }
-};
-
-function shelveFault(fault, opts = {
-    shelved: true,
-    comment: '',
-    shelveDuration: 90000
-}) {
-    fault.shelved = true;
-
-    setTimeout(() => {
-        fault.shelved = false;
-    }, opts.shelveDuration);
-}
-
-function acknowledgeFault(fault) {
-    fault.acknowledged = true;
-}
-
-function randomFaults(staticFaults, count = 5) {
-    let faults = [];
-
-    for (let x = 1, y = count + 1; x < y; x++) {
-        faults.push(getRandom.fault(x, staticFaults));
-    }
-
-    return faults;
-}
-
-export default {
-    randomFaults,
-    shelveFault,
-    acknowledgeFault
-};

example/faultManagment/exampleFaultSource.js

@@ -20,36 +20,59 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import utils from './utils';
-
-export default function (staticFaults = false) {
+export default function () {
     return function install(openmct) {
         openmct.install(openmct.plugins.FaultManagement());
 
-        const faultsData = utils.randomFaults(staticFaults);
-
         openmct.faults.addProvider({
             request(domainObject, options) {
-                return Promise.resolve(faultsData);
+                const faults = JSON.parse(localStorage.getItem('faults'));
+
+                return Promise.resolve(faults.alarms);
             },
             subscribe(domainObject, callback) {
-                return () => {};
+                const faultsData = JSON.parse(localStorage.getItem('faults')).alarms;
+
+                function getRandomIndex(start, end) {
+                    return Math.floor(start + (Math.random() * (end - start + 1)));
+                }
+
+                let id = setInterval(() => {
+                    const index = getRandomIndex(0, faultsData.length - 1);
+                    const randomFaultData = faultsData[index];
+                    const randomFault = randomFaultData.fault;
+                    randomFault.currentValueInfo.value = Math.random();
+                    callback({
+                        fault: randomFault,
+                        type: 'alarms'
+                    });
+                }, 300);
+
+                return () => {
+                    clearInterval(id);
+                };
             },
             supportsRequest(domainObject) {
-                return domainObject.type === 'faultManagement';
+                const faults = localStorage.getItem('faults');
+
+                return faults && domainObject.type === 'faultManagement';
             },
             supportsSubscribe(domainObject) {
-                return domainObject.type === 'faultManagement';
+                const faults = localStorage.getItem('faults');
+
+                return faults && domainObject.type === 'faultManagement';
             },
             acknowledgeFault(fault, { comment = '' }) {
-                utils.acknowledgeFault(fault);
+                console.log('acknowledgeFault', fault);
+                console.log('comment', comment);
 
                 return Promise.resolve({
                     success: true
                 });
             },
-            shelveFault(fault, duration) {
-                utils.shelveFault(fault, duration);
+            shelveFault(fault, shelveData) {
+                console.log('shelveFault', fault);
+                console.log('shelveData', shelveData);
 
                 return Promise.resolve({
                     success: true

example/generator/generatorWorker.js

@@ -161,8 +161,12 @@
     }
 
     function sin(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
-            * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+        if (Math.round(Math.random())) {
+            return 1 / 0;
+        } else {
+            return amplitude
+                * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+        }
     }
 
     function wavelengths() {

example/generator/plugin.js

@@ -36,7 +36,7 @@ define([
 
         openmct.types.addType("example.state-generator", {
             name: "State Generator",
-            description: "For development use. Generates example enumerated telemetry by cycling through a given set of states.",
+            description: "For development use.  Generates test enumerated telemetry by cycling through a given set of states",
             cssClass: "icon-generator-telemetry",
             creatable: true,
             form: [

package.json

@@ -1,13 +1,13 @@
 {
   "name": "openmct",
-  "version": "2.1.1-SNAPSHOT",
+  "version": "2.1.0-SNAPSHOT",
   "description": "The Open MCT core platform",
   "devDependencies": {
     "@babel/eslint-parser": "7.18.9",
     "@braintree/sanitize-url": "6.0.0",
-    "@percy/cli": "1.10.3",
+    "@percy/cli": "1.7.2",
     "@percy/playwright": "1.0.4",
-    "@playwright/test": "1.25.2",
+    "@playwright/test": "1.23.0",
     "@types/eventemitter3": "^1.0.0",
     "@types/jasmine": "^4.0.1",
     "@types/karma": "^6.3.2",
@@ -23,9 +23,9 @@
     "d3-axis": "3.0.0",
     "d3-scale": "3.3.0",
     "d3-selection": "3.0.0",
-    "eslint": "8.23.1",
+    "eslint": "8.18.0",
     "eslint-plugin-compat": "4.0.2",
-    "eslint-plugin-playwright": "0.11.1",
+    "eslint-plugin-playwright": "0.10.0",
     "eslint-plugin-vue": "9.3.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
     "eventemitter3": "1.2.0",
@@ -33,8 +33,9 @@
     "file-saver": "2.0.5",
     "git-rev-sync": "3.0.2",
     "html2canvas": "1.4.1",
-    "imports-loader": "4.0.1",
-    "jasmine-core": "4.4.0",
+    "imports-loader": "0.8.0",
+    "jasmine-core": "4.3.0",
+    "jsdoc": "3.6.11",
     "karma": "6.3.20",
     "karma-chrome-launcher": "3.1.1",
     "karma-cli": "2.0.0",
@@ -45,32 +46,34 @@
     "karma-sourcemap-loader": "0.3.8",
     "karma-spec-reporter": "0.0.34",
     "karma-webpack": "5.0.0",
+    "lighthouse": "9.6.1",
     "location-bar": "3.0.1",
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.6.1",
     "moment": "2.29.4",
     "moment-duration-format": "2.3.2",
-    "moment-timezone": "0.5.37",
+    "moment-timezone": "0.5.34",
+    "node-bourbon": "4.2.3",
     "nyc":"15.1.0",
     "painterro": "1.2.78",
-    "plotly.js-basic-dist": "2.14.0",
-    "plotly.js-gl2d-dist": "2.14.0",
+    "plotly.js-basic-dist": "2.12.0",
+    "plotly.js-gl2d-dist": "2.12.0",
     "printj": "1.3.1",
     "request": "2.88.2",
     "resolve-url-loader": "5.0.0",
-    "sass": "1.54.9",
+    "sass": "1.52.2",
     "sass-loader": "13.0.2",
     "sinon": "14.0.0",
-    "style-loader": "^3.3.1",
-    "uuid": "9.0.0",
+    "style-loader": "^1.0.1",
+    "uuid": "8.3.2",
     "vue": "2.6.14",
-    "vue-eslint-parser": "9.1.0",
+    "vue-eslint-parser": "9.0.2",
     "vue-loader": "15.9.8",
     "vue-template-compiler": "2.6.14",
-    "webpack": "5.74.0",
+    "webpack": "5.68.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-middleware": "5.3.3",
-    "webpack-hot-middleware": "2.25.2",
+    "webpack-hot-middleware": "2.25.1",
     "webpack-merge": "5.8.0"
   },
   "scripts": {
@@ -87,17 +90,19 @@
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run",
     "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run",
     "test:e2e": "npx playwright test",
-    "test:e2e:couchdb": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @couchdb",
-    "test:e2e:stable": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep-invert \"@unstable|@couchdb\"",
+    "test:e2e:stable": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep-invert @unstable",
     "test:e2e:unstable": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @unstable",
     "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js --project=chrome",
     "test:e2e:updatesnapshots": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot --update-snapshots",
     "test:e2e:visual": "percy exec --config ./e2e/.percy.yml -- npx playwright test --config=e2e/playwright-visual.config.js --grep-invert @unstable",
-    "test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js --grep-invert @couchdb",
+    "test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js",
     "test:perf": "npx playwright test --config=e2e/playwright-performance.config.js",
     "test:watch": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run",
+    "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "update-about-dialog-copyright": "perl -pi -e 's/20\\d\\d\\-202\\d/2014\\-2022/gm' ./src/ui/layout/AboutDialog.vue",
     "update-copyright-date": "npm run update-about-dialog-copyright && grep -lr --null --include=*.{js,scss,vue,ts,sh,html,md,frag} 'Copyright (c) 20' . | xargs -r0 perl -pi -e 's/Copyright\\s\\(c\\)\\s20\\d\\d\\-20\\d\\d/Copyright \\(c\\)\\ 2014\\-2022/gm'",
+    "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
+    "docs": "npm run jsdoc ; npm run otherdoc",
     "cov:e2e:report":"nyc report --reporter=lcovonly --report-dir=./coverage/e2e",
     "cov:e2e:full:publish":"codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-full",
     "cov:e2e:stable:publish":"codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-stable",

src/api/annotation/AnnotationAPI.js

@@ -40,8 +40,6 @@ const ANNOTATION_TYPES = Object.freeze({
     PLOT_SPATIAL: 'PLOT_SPATIAL'
 });
 
-const ANNOTATION_TYPE = 'annotation';
-
 /**
  * @typedef {Object} Tag
  * @property {String} key a unique identifier for the tag
@@ -56,7 +54,7 @@ export default class AnnotationAPI extends EventEmitter {
 
         this.ANNOTATION_TYPES = ANNOTATION_TYPES;
 
-        this.openmct.types.addType(ANNOTATION_TYPE, {
+        this.openmct.types.addType('annotation', {
             name: 'Annotation',
             description: 'A user created note or comment about time ranges, pixel space, and geospatial features.',
             creatable: false,
@@ -138,10 +136,6 @@ export default class AnnotationAPI extends EventEmitter {
         this.availableTags[tagKey] = tagsDefinition;
     }
 
-    isAnnotation(domainObject) {
-        return domainObject && (domainObject.type === ANNOTATION_TYPE);
-    }
-
     getAvailableTags() {
         if (this.availableTags) {
             const rearrangedToArray = Object.keys(this.availableTags).map(tagKey => {
@@ -277,10 +271,7 @@ export default class AnnotationAPI extends EventEmitter {
         const searchResults = (await Promise.all(this.openmct.objects.search(matchingTagKeys, abortController, this.openmct.objects.SEARCH_TYPES.TAGS))).flat();
         const appliedTagSearchResults = this.#addTagMetaInformationToResults(searchResults, matchingTagKeys);
         const appliedTargetsModels = await this.#addTargetModelsToResults(appliedTagSearchResults);
-        const resultsWithValidPath = appliedTargetsModels.filter(result => {
-            return this.openmct.objects.isReachable(result.targetModels?.[0]?.originalPath);
-        });
 
-        return resultsWithValidPath;
+        return appliedTargetsModels;
     }
 }

src/api/annotation/AnnotationAPISpec.js

@@ -27,26 +27,15 @@ describe("The Annotation API", () => {
     let openmct;
     let mockObjectProvider;
     let mockDomainObject;
-    let mockFolderObject;
     let mockAnnotationObject;
 
     beforeEach((done) => {
         openmct = createOpenMct();
         openmct.install(new ExampleTagsPlugin());
         const availableTags = openmct.annotation.getAvailableTags();
-        mockFolderObject = {
-            type: 'root',
-            name: 'folderFoo',
-            location: '',
-            identifier: {
-                key: 'someParent',
-                namespace: 'fooNameSpace'
-            }
-        };
         mockDomainObject = {
             type: 'notebook',
             name: 'fooRabbitNotebook',
-            location: 'fooNameSpace:someParent',
             identifier: {
                 key: 'some-object',
                 namespace: 'fooNameSpace'
@@ -79,8 +68,6 @@ describe("The Annotation API", () => {
                 return mockDomainObject;
             } else if (identifier.key === mockAnnotationObject.identifier.key) {
                 return mockAnnotationObject;
-            } else if (identifier.key === mockFolderObject.identifier.key) {
-                return mockFolderObject;
             } else {
                 return null;
             }
@@ -163,7 +150,6 @@ describe("The Annotation API", () => {
             // use local worker
             sharedWorkerToRestore = openmct.objects.inMemorySearchProvider.worker;
             openmct.objects.inMemorySearchProvider.worker = null;
-            await openmct.objects.inMemorySearchProvider.index(mockFolderObject);
             await openmct.objects.inMemorySearchProvider.index(mockDomainObject);
             await openmct.objects.inMemorySearchProvider.index(mockAnnotationObject);
         });

src/api/forms/FormsAPI.js

@@ -139,7 +139,7 @@ export default class FormsAPI extends EventEmitter {
         } else {
             overlay = self.openmct.overlays.overlay({
                 element: vm.$el,
-                size: 'dialog',
+                size: 'small',
                 onDestroy: () => vm.$destroy()
             });
         }

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

@@ -32,49 +32,53 @@
         prevent
         class="u-contents"
     >
-        <input
-            v-model="date"
-            class="field control date"
-            :pattern="/\d{4}-\d{2}-\d{2}/"
-            :placeholder="format"
-            type="date"
-            name="date"
-            @change="onChange"
-        >
-        <input
-            v-model="hour"
-            class="field control hour c-input--sm"
-            :pattern="/\d+/"
-            type="number"
-            name="hour"
-            maxlength="10"
-            min="0"
-            max="23"
-            @change="onChange"
-        >
-        <input
-            v-model="min"
-            class="field control min c-input--sm"
-            :pattern="/\d+/"
-            type="number"
-            name="min"
-            maxlength="2"
-            min="0"
-            max="59"
-            @change="onChange"
-        >
-        <input
-            v-model="sec"
-            class="field control sec c-input--sm"
-            :pattern="/\d+/"
-            type="number"
-            name="sec"
-            maxlength="2"
-            min="0"
-            max="59"
-            @change="onChange"
-        >
-        <div class="field control hint timezone">
+        <div class="field control date">
+            <input
+                v-model="date"
+                :pattern="/\d{4}-\d{2}-\d{2}/"
+                :placeholder="format"
+                type="date"
+                name="date"
+                @change="onChange"
+            >
+        </div>
+        <div class="field control hour sm">
+            <input
+                v-model="hour"
+                :pattern="/\d+/"
+                type="number"
+                name="hour"
+                maxlength="10"
+                min="0"
+                max="23"
+                @change="onChange"
+            >
+        </div>
+        <div class="field control min sm">
+            <input
+                v-model="min"
+                :pattern="/\d+/"
+                type="number"
+                name="min"
+                maxlength="2"
+                min="0"
+                max="59"
+                @change="onChange"
+            >
+        </div>
+        <div class="field control sec sm">
+            <input
+                v-model="sec"
+                :pattern="/\d+/"
+                type="number"
+                name="sec"
+                maxlength="2"
+                min="0"
+                max="59"
+                @change="onChange"
+            >
+        </div>
+        <div class="field control timezone">
             UTC
         </div>
     </form>

src/api/objects/InMemorySearchProvider.js

@@ -63,8 +63,6 @@ class InMemorySearchProvider {
         this.localSearchForTags = this.localSearchForTags.bind(this);
         this.localSearchForNotebookAnnotations = this.localSearchForNotebookAnnotations.bind(this);
         this.onAnnotationCreation = this.onAnnotationCreation.bind(this);
-        this.onCompositionAdded = this.onCompositionAdded.bind(this);
-        this.onCompositionRemoved = this.onCompositionRemoved.bind(this);
         this.onerror = this.onWorkerError.bind(this);
         this.startIndexing = this.startIndexing.bind(this);
 
@@ -77,12 +75,6 @@ class InMemorySearchProvider {
                 this.worker.port.close();
             }
 
-            Object.keys(this.indexedCompositions).forEach(keyString => {
-                const composition = this.indexedCompositions[keyString];
-                composition.off('add', this.onCompositionAdded);
-                composition.off('remove', this.onCompositionRemoved);
-            });
-
             this.destroyObservers(this.indexedIds);
             this.destroyObservers(this.indexedCompositions);
         });
@@ -267,6 +259,7 @@ class InMemorySearchProvider {
     }
 
     onAnnotationCreation(annotationObject) {
+
         const objectProvider = this.openmct.objects.getProvider(annotationObject.identifier);
         if (objectProvider === undefined || objectProvider.search === undefined) {
             const provider = this;
@@ -288,34 +281,17 @@ class InMemorySearchProvider {
         provider.index(domainObject);
     }
 
-    onCompositionAdded(newDomainObjectToIndex) {
+    onCompositionMutation(domainObject, composition) {
         const provider = this;
-        // The object comes in as a mutable domain object, which has functions,
-        // which the index function cannot handle as it will eventually be serialized
-        // using structuredClone. Thus we're using JSON.parse/JSON.stringify to discard
-        // those functions.
-        const nonMutableDomainObject = JSON.parse(JSON.stringify(newDomainObjectToIndex));
+        const indexedComposition = domainObject.composition;
+        const identifiersToIndex = composition
+            .filter(identifier => !indexedComposition
+                .some(indexedIdentifier => this.openmct.objects
+                    .areIdsEqual([identifier, indexedIdentifier])));
 
-        const objectProvider = this.openmct.objects.getProvider(nonMutableDomainObject.identifier);
-        if (objectProvider === undefined || objectProvider.search === undefined) {
-            provider.index(nonMutableDomainObject);
-        }
-    }
-
-    onCompositionRemoved(domainObjectToRemoveIdentifier) {
-        const keyString = this.openmct.objects.makeKeyString(domainObjectToRemoveIdentifier);
-        if (this.indexedIds[keyString]) {
-            // we store the unobserve function in the indexedId map
-            this.indexedIds[keyString]();
-            delete this.indexedIds[keyString];
-        }
-
-        const composition = this.indexedCompositions[keyString];
-        if (composition) {
-            composition.off('add', this.onCompositionAdded);
-            composition.off('remove', this.onCompositionRemoved);
-            delete this.indexedCompositions[keyString];
-        }
+        identifiersToIndex.forEach(identifier => {
+            this.openmct.objects.get(identifier).then(objectToIndex => provider.index(objectToIndex));
+        });
     }
 
     /**
@@ -329,7 +305,6 @@ class InMemorySearchProvider {
     async index(domainObject) {
         const provider = this;
         const keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
-        const composition = this.openmct.composition.get(domainObject);
 
         if (!this.indexedIds[keyString]) {
             this.indexedIds[keyString] = this.openmct.objects.observe(
@@ -337,12 +312,11 @@ class InMemorySearchProvider {
                 'name',
                 this.onNameMutation.bind(this, domainObject)
             );
-            if (composition) {
-                composition.on('add', this.onCompositionAdded);
-                composition.on('remove', this.onCompositionRemoved);
-                this.indexedCompositions[keyString] = composition;
-            }
-
+            this.indexedCompositions[keyString] = this.openmct.objects.observe(
+                domainObject,
+                'composition',
+                this.onCompositionMutation.bind(this, domainObject)
+            );
             if (domainObject.type === 'annotation') {
                 this.indexedTags[keyString] = this.openmct.objects.observe(
                     domainObject,
@@ -364,6 +338,8 @@ class InMemorySearchProvider {
             }
         }
 
+        const composition = this.openmct.composition.get(domainObject);
+
         if (composition !== undefined) {
             const children = await composition.load();
 

src/api/objects/ObjectAPI.js

@@ -34,11 +34,11 @@ import InMemorySearchProvider from './InMemorySearchProvider';
  * Uniquely identifies a domain object.
  *
  * @typedef Identifier
+ * @memberof module:openmct.ObjectAPI~
  * @property {string} namespace the namespace to/from which this domain
  *           object should be loaded/stored.
  * @property {string} key a unique identifier for the domain object
  *           within that namespace
- * @memberof module:openmct.ObjectAPI~
  */
 
 /**
@@ -230,10 +230,15 @@ export default class ObjectAPI {
             return result;
         }).catch((result) => {
             console.warn(`Failed to retrieve ${keystring}:`, result);
+            this.openmct.notifications.error(`Failed to retrieve object ${keystring}`);
 
             delete this.cache[keystring];
 
-            result = this.applyGetInterceptors(identifier);
+            if (!result) {
+                //no result means resource either doesn't exist or is missing
+                //otherwise it's an error, and we shouldn't apply interceptors
+                result = this.applyGetInterceptors(identifier);
+            }
 
             return result;
         });
@@ -610,60 +615,27 @@ export default class ObjectAPI {
      * @param {module:openmct.ObjectAPI~Identifier[]} identifiers
      */
     areIdsEqual(...identifiers) {
-        const firstIdentifier = utils.parseKeyString(identifiers[0]);
-
         return identifiers.map(utils.parseKeyString)
             .every(identifier => {
-                return identifier === firstIdentifier
-                    || (identifier.namespace === firstIdentifier.namespace
-                        && identifier.key === firstIdentifier.key);
+                return identifier === identifiers[0]
+                    || (identifier.namespace === identifiers[0].namespace
+                        && identifier.key === identifiers[0].key);
             });
     }
 
-    /**
-     * Given an original path check if the path is reachable via root
-     * @param {Array<Object>} originalPath an array of path objects to check
-     * @returns {boolean} whether the domain object is reachable
-     */
-    isReachable(originalPath) {
-        if (originalPath && originalPath.length) {
-            return (originalPath[originalPath.length - 1].type === 'root');
-        }
+    getOriginalPath(identifier, path = []) {
+        return this.get(identifier).then((domainObject) => {
+            path.push(domainObject);
+            let location = domainObject.location;
 
-        return false;
-    }
-
-    #pathContainsDomainObject(keyStringToCheck, path) {
-        if (!keyStringToCheck) {
-            return false;
-        }
-
-        return path.some(pathElement => {
-            const identifierToCheck = utils.parseKeyString(keyStringToCheck);
-
-            return this.areIdsEqual(identifierToCheck, pathElement.identifier);
+            if (location) {
+                return this.getOriginalPath(utils.parseKeyString(location), path);
+            } else {
+                return path;
+            }
         });
     }
 
-    /**
-     * Given an identifier, constructs the original path by walking up its parents
-     * @param {module:openmct.ObjectAPI~Identifier} identifier
-     * @param {Array<module:openmct.DomainObject>} path an array of path objects
-     * @returns {Promise<Array<module:openmct.DomainObject>>} a promise containing an array of domain objects
-     */
-    async getOriginalPath(identifier, path = []) {
-        const domainObject = await this.get(identifier);
-        path.push(domainObject);
-        const { location } = domainObject;
-        if (location && (!this.#pathContainsDomainObject(location, path))) {
-            // if we have a location, and we don't already have this in our constructed path,
-            // then keep walking up the path
-            return this.getOriginalPath(utils.parseKeyString(location), path);
-        } else {
-            return path;
-        }
-    }
-
     isObjectPathToALink(domainObject, objectPath) {
         return objectPath !== undefined
             && objectPath.length > 1

src/api/objects/ObjectAPISpec.js

@@ -377,73 +377,6 @@ describe("The Object API", () => {
         });
     });
 
-    describe("getOriginalPath", () => {
-        let mockGrandParentObject;
-        let mockParentObject;
-        let mockChildObject;
-
-        beforeEach(() => {
-            const mockObjectProvider = jasmine.createSpyObj("mock object provider", [
-                "create",
-                "update",
-                "get"
-            ]);
-
-            mockGrandParentObject = {
-                type: 'folder',
-                name: 'Grand Parent Folder',
-                location: 'fooNameSpace:child',
-                identifier: {
-                    key: 'grandParent',
-                    namespace: 'fooNameSpace'
-                }
-            };
-            mockParentObject = {
-                type: 'folder',
-                name: 'Parent Folder',
-                location: 'fooNameSpace:grandParent',
-                identifier: {
-                    key: 'parent',
-                    namespace: 'fooNameSpace'
-                }
-            };
-            mockChildObject = {
-                type: 'folder',
-                name: 'Child Folder',
-                location: 'fooNameSpace:parent',
-                identifier: {
-                    key: 'child',
-                    namespace: 'fooNameSpace'
-                }
-            };
-
-            // eslint-disable-next-line require-await
-            mockObjectProvider.get = async (identifier) => {
-                if (identifier.key === mockGrandParentObject.identifier.key) {
-                    return mockGrandParentObject;
-                } else if (identifier.key === mockParentObject.identifier.key) {
-                    return mockParentObject;
-                } else if (identifier.key === mockChildObject.identifier.key) {
-                    return mockChildObject;
-                } else {
-                    return null;
-                }
-            };
-
-            openmct.objects.addProvider('fooNameSpace', mockObjectProvider);
-
-            mockObjectProvider.create.and.returnValue(Promise.resolve(true));
-            mockObjectProvider.update.and.returnValue(Promise.resolve(true));
-
-            openmct.objects.addProvider('fooNameSpace', mockObjectProvider);
-        });
-
-        it('can construct paths even with cycles', async () => {
-            const objectPath = await objectAPI.getOriginalPath(mockChildObject.identifier);
-            expect(objectPath.length).toEqual(3);
-        });
-    });
-
     describe("transactions", () => {
         beforeEach(() => {
             spyOn(openmct.editor, 'isEditing').and.returnValue(true);

src/api/objects/object-utils.js

@@ -91,10 +91,6 @@ define([
      * @returns keyString
      */
     function makeKeyString(identifier) {
-        if (!identifier) {
-            throw new Error("Cannot make key string from null identifier");
-        }
-
         if (isKeyString(identifier)) {
             return identifier;
         }

src/api/overlays/Overlay.js

@@ -6,8 +6,7 @@ const cssClasses = {
     large: 'l-overlay-large',
     small: 'l-overlay-small',
     fit: 'l-overlay-fit',
-    fullscreen: 'l-overlay-fullscreen',
-    dialog: 'l-overlay-dialog'
+    fullscreen: 'l-overlay-fullscreen'
 };
 
 class Overlay extends EventEmitter {

src/api/overlays/components/overlay-component.scss

@@ -1,4 +1,4 @@
-@mixin overlaySizing($marginTB: auto, $marginLR: auto, $width: auto, $height: auto) {
+@mixin overlaySizing($marginTB: 5%, $marginLR: $marginTB, $width: auto, $height: auto) {
     position: absolute;
     top: $marginTB; right: $marginLR; bottom: $marginTB; left: $marginLR;
     width: $width;
@@ -98,7 +98,6 @@ body.desktop {
     // Overlay types, styling for desktop. Appended to .l-overlay-wrapper element.
     .l-overlay-large,
     .l-overlay-small,
-    .l-overlay-dialog,
     .l-overlay-fit {
         .c-overlay__outer {
             border-radius: $overlayCr;
@@ -109,7 +108,7 @@ body.desktop {
     .l-overlay-fullscreen {
         // Used by About > Licenses display
         .c-overlay__outer {
-            @include overlaySizing(nth($overlayOuterMarginFullscreen, 1), nth($overlayOuterMarginFullscreen, 2));
+            @include overlaySizing($overlayOuterMarginFullscreen);
         }
     }
 
@@ -120,7 +119,7 @@ body.desktop {
         $lrPad: $pad;
         .c-overlay {
             &__outer {
-                @include overlaySizing(nth($overlayOuterMarginLarge, 1), nth($overlayOuterMarginLarge, 2));
+                @include overlaySizing($overlayOuterMarginLarge);
                 padding: $tbPad $lrPad;
             }
 
@@ -138,20 +137,14 @@ body.desktop {
 
     .l-overlay-small {
         .c-overlay__outer {
-            @include overlaySizing(nth($overlayOuterMarginSmall, 1), nth($overlayOuterMarginSmall, 2));
-        }
-    }
-
-    .l-overlay-dialog {
-        .c-overlay__outer {
-            @include overlaySizing(nth($overlayOuterMarginDialog, 1), nth($overlayOuterMarginDialog, 2));
+            @include overlaySizing($overlayOuterMarginDialog);
         }
     }
 
     .t-dialog-sm .l-overlay-small, // Legacy dialog support
     .l-overlay-fit {
         .c-overlay__outer {
-            @include overlaySizing(auto, auto);
+            @include overlaySizing(auto);
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);

src/api/time/TimeAPI.js

@@ -171,38 +171,27 @@ class TimeAPI extends GlobalTimeContext {
      * @memberof module:openmct.TimeAPI#
      * @method getContextForView
      */
-    getContextForView(objectPath) {
-        if (!objectPath || !Array.isArray(objectPath)) {
-            throw new Error('No objectPath provided');
-        }
-
+    getContextForView(objectPath = []) {
         const viewKey = objectPath.length && this.openmct.objects.makeKeyString(objectPath[0].identifier);
 
-        if (!viewKey) {
-            // Return the global time context
-            return this;
-        }
-
-        let viewTimeContext = this.getIndependentContext(viewKey);
-        if (!viewTimeContext) {
-            // If the context doesn't exist yet, create it.
-            viewTimeContext = new IndependentTimeContext(this.openmct, this, objectPath);
-            this.independentContexts.set(viewKey, viewTimeContext);
-        } else {
-            // If it already exists, compare the objectPath to see if it needs to be updated.
-            const currentPath = this.openmct.objects.getRelativePath(viewTimeContext.objectPath);
-            const newPath = this.openmct.objects.getRelativePath(objectPath);
-
-            if (currentPath !== newPath) {
-                // If the path has changed, update the context.
+        if (viewKey) {
+            let viewTimeContext = this.getIndependentContext(viewKey);
+            if (viewTimeContext) {
                 this.independentContexts.delete(viewKey);
+            } else {
                 viewTimeContext = new IndependentTimeContext(this.openmct, this, objectPath);
-                this.independentContexts.set(viewKey, viewTimeContext);
             }
+
+            // return a new IndependentContext in case the objectPath is different
+            this.independentContexts.set(viewKey, viewTimeContext);
+
+            return viewTimeContext;
         }
 
-        return viewTimeContext;
+        // always follow the global time context
+        return this;
     }
+
 }
 
 export default TimeAPI;

src/plugins/LADTable/plugin.js

@@ -32,7 +32,7 @@ export default function plugin() {
         openmct.types.addType('LadTable', {
             name: "LAD Table",
             creatable: true,
-            description: "Display the current value for one or more telemetry end points in a fixed table. Each row is a telemetry end point.",
+            description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
             cssClass: 'icon-tabular-lad',
             initialize(domainObject) {
                 domainObject.composition = [];
@@ -42,7 +42,7 @@ export default function plugin() {
         openmct.types.addType('LadTableSet', {
             name: "LAD Table Set",
             creatable: true,
-            description: "Group LAD Tables together into a single view with sub-headers.",
+            description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
             cssClass: 'icon-tabular-lad-set',
             initialize(domainObject) {
                 domainObject.composition = [];

src/plugins/URLTimeSettingsSynchronizer/pluginSpec.js

@@ -56,76 +56,85 @@ describe("The URLTimeSettingsSynchronizer", () => {
     it("initial clock is set to fixed is reflected in URL", (done) => {
         resolveFunction = () => {
             oldHash = window.location.hash;
-            expect(window.location.hash).toContain('tc.mode=fixed');
+            expect(window.location.hash.includes('tc.mode=fixed')).toBe(true);
 
             openmct.router.removeListener('change:hash', resolveFunction);
             done();
         };
 
-        // We have a debounce set to 300ms on setHash, so if we don't flush,
-        // the above resolve function sometimes doesn't fire due to a race condition.
-        openmct.router.setHash.flush();
         openmct.router.on('change:hash', resolveFunction);
     });
 
     it("when the clock is set via the time API, it is reflected in the URL", (done) => {
+        let success;
+
         resolveFunction = () => {
             openmct.time.clock('local', {
                 start: -2000,
                 end: 200
             });
-            openmct.router.setHash.flush();
-            const urlHash = window.location.hash;
-            expect(urlHash).toContain('tc.startDelta=2000');
-            expect(urlHash).toContain('tc.endDelta=200');
-            expect(urlHash).toContain('tc.mode=local');
-            openmct.router.removeListener('change:hash', resolveFunction);
-            done();
+
+            const hasStartDelta = window.location.hash.includes('tc.startDelta=2000');
+            const hasEndDelta = window.location.hash.includes('tc.endDelta=200');
+            const hasLocalClock = window.location.hash.includes('tc.mode=local');
+            success = hasStartDelta && hasEndDelta && hasLocalClock;
+            if (success) {
+                expect(success).toBe(true);
+
+                openmct.router.removeListener('change:hash', resolveFunction);
+                done();
+            }
         };
 
-        // We have a debounce set to 300ms on setHash, so if we don't flush,
-        // the above resolve function sometimes doesn't fire due to a race condition.
-        openmct.router.setHash.flush();
         openmct.router.on('change:hash', resolveFunction);
     });
 
     it("when the clock mode is set to local, it is reflected in the URL", (done) => {
+        let success;
+
         resolveFunction = () => {
             let hash = window.location.hash;
             hash = hash.replace('tc.mode=fixed', 'tc.mode=local');
             window.location.hash = hash;
 
-            expect(window.location.hash).toContain('tc.mode=local');
-            done();
+            success = window.location.hash.includes('tc.mode=local');
+            if (success) {
+                expect(success).toBe(true);
+                done();
+            }
         };
 
-        // We have a debounce set to 300ms on setHash, so if we don't flush,
-        // the above resolve function sometimes doesn't fire due to a race condition.
-        openmct.router.setHash.flush();
         openmct.router.on('change:hash', resolveFunction);
     });
 
     it("when the clock mode is set to local, it is reflected in the URL", (done) => {
+        let success;
+
         resolveFunction = () => {
             let hash = window.location.hash;
 
             hash = hash.replace('tc.mode=fixed', 'tc.mode=local');
             window.location.hash = hash;
-            expect(window.location.hash).toContain('tc.mode=local');
-            done();
+            success = window.location.hash.includes('tc.mode=local');
+            if (success) {
+                expect(success).toBe(true);
+                done();
+            }
         };
 
-        // We have a debounce set to 300ms on setHash, so if we don't flush,
-        // the above resolve function sometimes doesn't fire due to a race condition.
-        openmct.router.setHash.flush();
         openmct.router.on('change:hash', resolveFunction);
     });
 
     it("reset hash", (done) => {
+        let success;
+
         window.location.hash = oldHash;
         resolveFunction = () => {
-            expect(window.location.hash).toBe(oldHash);
-            done();
+            success = window.location.hash === oldHash;
+            if (success) {
+                expect(success).toBe(true);
+                done();
+            }
         };
 
         openmct.router.on('change:hash', resolveFunction);

src/plugins/charts/scatter/ScatterPlotView.vue

@@ -97,11 +97,11 @@ export default {
 
         },
         followTimeContext() {
-            this.timeContext.on('bounds', this.reloadTelemetryOnBoundsChange);
+            this.timeContext.on('bounds', this.reloadTelemetry);
         },
         stopFollowingTimeContext() {
             if (this.timeContext) {
-                this.timeContext.off('bounds', this.reloadTelemetryOnBoundsChange);
+                this.timeContext.off('bounds', this.reloadTelemetry);
             }
         },
         addToComposition(telemetryObject) {
@@ -181,11 +181,6 @@ export default {
             this.composition.on('remove', this.removeTelemetryObject);
             this.composition.load();
         },
-        reloadTelemetryOnBoundsChange(bounds, isTick) {
-            if (!isTick) {
-                this.reloadTelemetry();
-            }
-        },
         reloadTelemetry() {
             this.valuesByTimestamp = {};
 

src/plugins/clock/plugin.js

@@ -32,7 +32,7 @@ export default function ClockPlugin(options) {
         const CLOCK_INDICATOR_FORMAT = 'YYYY/MM/DD HH:mm:ss';
         openmct.types.addType('clock', {
             name: 'Clock',
-            description: 'A digital clock that uses system time and supports a variety of display formats and timezones.',
+            description: 'A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.',
             creatable: true,
             cssClass: 'icon-clock',
             initialize: function (domainObject) {

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -51,11 +51,7 @@ export default class TelemetryCriterion extends EventEmitter {
     }
 
     initialize() {
-        this.telemetryObjectIdAsString = "";
-        if (![undefined, null, ""].includes(this.telemetryDomainObjectDefinition?.telemetry)) {
-            this.telemetryObjectIdAsString = this.openmct.objects.makeKeyString(this.telemetryDomainObjectDefinition.telemetry);
-        }
-
+        this.telemetryObjectIdAsString = this.openmct.objects.makeKeyString(this.telemetryDomainObjectDefinition.telemetry);
         this.updateTelemetryObjects(this.telemetryDomainObjectDefinition.telemetryObjects);
         if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
             this.subscribeForStaleData();

src/plugins/displayLayout/DisplayLayoutToolbar.js

@@ -93,7 +93,7 @@ define(['lodash'], function (_) {
                     'table': {
                         value: 'table',
                         name: 'Table',
-                        class: 'icon-tabular-scrolling'
+                        class: 'icon-tabular-realtime'
                     }
                 };
                 const APPLICABLE_VIEWS = {

src/plugins/displayLayout/DrawingObjectTypes.js

@@ -1,34 +0,0 @@
-const displayLayoutDrawingObjectTypes = {
-    'box-view': {
-        name: "Box",
-        creatable: false,
-        description: 'A rectangle shape.',
-        cssClass: 'icon-box-round-corners'
-    },
-    'ellipse-view': {
-        name: "Ellipse",
-        creatable: false,
-        description: 'A ellipse shape.',
-        cssClass: 'icon-circle'
-    },
-    'line-view': {
-        name: "Line",
-        creatable: false,
-        description: 'A line.',
-        cssClass: 'icon-line-horz'
-    },
-    'text-view': {
-        name: "Text",
-        creatable: false,
-        description: 'An editable text box.',
-        cssClass: 'icon-font'
-    },
-    'image-view': {
-        name: "Image",
-        creatable: false,
-        description: 'An image.',
-        cssClass: 'icon-image'
-    }
-};
-
-export default displayLayoutDrawingObjectTypes;

src/plugins/displayLayout/components/DisplayLayout.vue

@@ -517,19 +517,7 @@ export default {
         initializeItems() {
             this.telemetryViewMap = {};
             this.objectViewMap = {};
-
-            let removedItems = [];
-            this.layoutItems.forEach((item) => {
-                if (item.identifier) {
-                    if (this.containsObject(item.identifier)) {
-                        this.trackItem(item);
-                    } else {
-                        removedItems.push(this.openmct.objects.makeKeyString(item.identifier));
-                    }
-                }
-            });
-
-            removedItems.forEach(this.removeFromConfiguration);
+            this.layoutItems.forEach(this.trackItem);
         },
         isItemAlreadyTracked(child) {
             let found = false;

src/plugins/displayLayout/components/SubobjectView.vue

@@ -147,7 +147,7 @@ export default {
             this.mutablePromise.then(() => {
                 this.openmct.objects.destroyMutable(this.domainObject);
             });
-        } else if (this?.domainObject?.isMutable) {
+        } else if (this.domainObject.isMutable) {
             this.openmct.objects.destroyMutable(this.domainObject);
         }
     },

src/plugins/displayLayout/components/TelemetryView.vue

@@ -232,18 +232,16 @@ export default {
             this.removeSelectable();
         }
 
-        if (this.telemetryCollection) {
-            this.telemetryCollection.off('add', this.setLatestValues);
-            this.telemetryCollection.off('clear', this.refreshData);
+        this.telemetryCollection.off('add', this.setLatestValues);
+        this.telemetryCollection.off('clear', this.refreshData);
 
-            this.telemetryCollection.destroy();
-        }
+        this.telemetryCollection.destroy();
 
         if (this.mutablePromise) {
             this.mutablePromise.then(() => {
                 this.openmct.objects.destroyMutable(this.domainObject);
             });
-        } else if (this?.domainObject?.isMutable) {
+        } else if (this.domainObject.isMutable) {
             this.openmct.objects.destroyMutable(this.domainObject);
         }
     },

src/plugins/displayLayout/components/layout-frame.scss

@@ -74,15 +74,14 @@
                         transition-delay: $moveBarOutDelay;
                         @include userSelectNone();
                         background: $editFrameMovebarColorBg;
-                        box-shadow: rgba(black, 0.3) 0 2px;
+                        box-shadow: rgba(black, 0.2) 0 1px;
                         bottom: auto;
                         display: block;
                         height: 0; // Height is set on hover below
-                        opacity: 0.9;
+                        opacity: 0.8;
                         max-height: 100%;
                         overflow: hidden;
                         text-align: center;
-                        z-index: 10;
 
                         &:before {
                             // Grippy
@@ -105,6 +104,7 @@
                     > .c-so-view.has-complex-content {
                         transition: $transIn;
                         transition-delay: 0s;
+                        padding-top: $editFrameMovebarH + $interiorMarginSm;
 
                         > .c-so-view__local-controls {
                             transform: translateY($editFrameMovebarH);

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

@@ -4,7 +4,7 @@
 
     > * {
         // Label and value holders
-        flex: 1 1 50%;
+        flex: 1 1 auto;
         display: flex;
         flex-direction: row;
         align-items: center;

src/plugins/displayLayout/plugin.js

@@ -25,7 +25,6 @@ import CopyToClipboardAction from './actions/CopyToClipboardAction';
 import DisplayLayout from './components/DisplayLayout.vue';
 import DisplayLayoutToolbar from './DisplayLayoutToolbar.js';
 import DisplayLayoutType from './DisplayLayoutType.js';
-import DisplayLayoutDrawingObjectTypes from './DrawingObjectTypes.js';
 
 import objectUtils from 'objectUtils';
 
@@ -126,11 +125,6 @@ export default function DisplayLayoutPlugin(options) {
                 return true;
             }
         });
-
-        for (const [type, definition] of Object.entries(DisplayLayoutDrawingObjectTypes)) {
-            openmct.types.addType(type, definition);
-        }
-
         DisplayLayoutPlugin._installed = true;
     };
 }

src/plugins/displayLayout/pluginSpec.js

@@ -21,7 +21,6 @@
  *****************************************************************************/
 
 import { createOpenMct, resetApplicationState } from 'utils/testing';
-import Vue from 'vue';
 import DisplayLayoutPlugin from './plugin';
 
 describe('the plugin', function () {
@@ -118,59 +117,6 @@ describe('the plugin', function () {
 
     });
 
-    describe('on load', () => {
-        let displayLayoutItem;
-        let item;
-
-        beforeEach((done) => {
-            item = {
-                'width': 32,
-                'height': 18,
-                'x': 78,
-                'y': 8,
-                'identifier': {
-                    'namespace': '',
-                    'key': 'bdeb91ab-3a7e-4a71-9dd2-39d73644e136'
-                },
-                'hasFrame': true,
-                'type': 'line-view', // so no telemetry functionality is triggered, just want to test the sync
-                'id': 'c0ff485a-344c-4e70-8d83-a9d9998a69fc'
-
-            };
-            displayLayoutItem = {
-                'composition': [
-                    // no item in compostion, but item in configuration items
-                ],
-                'configuration': {
-                    'items': [
-                        item
-                    ],
-                    'layoutGrid': [
-                        10,
-                        10
-                    ]
-                },
-                'name': 'Display Layout',
-                'type': 'layout',
-                'identifier': {
-                    'namespace': '',
-                    'key': 'c5e636c1-6771-4c9c-b933-8665cab189b3'
-                }
-            };
-
-            const applicableViews = openmct.objectViews.get(displayLayoutItem, []);
-            const displayLayoutViewProvider = applicableViews.find((viewProvider) => viewProvider.key === 'layout.view');
-            const view = displayLayoutViewProvider.view(displayLayoutItem);
-            view.show(child, false);
-
-            Vue.nextTick(done);
-        });
-
-        it('will sync compostion and layout items', () => {
-            expect(displayLayoutItem.configuration.items.length).toBe(0);
-        });
-    });
-
     describe('the alpha numeric format view', () => {
         let displayLayoutItem;
         let telemetryItem;

src/plugins/faultManagement/FaultManagementListView.vue

@@ -71,8 +71,6 @@ import FaultManagementToolbar from './FaultManagementToolbar.vue';
 
 import { FAULT_MANAGEMENT_SHELVE_DURATIONS_IN_MS, FILTER_ITEMS, SORT_ITEMS } from './constants';
 
-const SEARCH_KEYS = ['id', 'triggerValueInfo', 'currentValueInfo', 'triggerTime', 'severity', 'name', 'shortDescription', 'namespace'];
-
 export default {
     components: {
         FaultManagementListHeader,
@@ -127,19 +125,27 @@ export default {
     },
     methods: {
         filterUsingSearchTerm(fault) {
-            if (!fault) {
-                return false;
+            if (fault?.id?.toString().toLowerCase().includes(this.searchTerm)) {
+                return true;
             }
 
-            let match = false;
+            if (fault?.triggerValueInfo?.toString().toLowerCase().includes(this.searchTerm)) {
+                return true;
+            }
 
-            SEARCH_KEYS.forEach((key) => {
-                if (fault[key]?.toString().toLowerCase().includes(this.searchTerm)) {
-                    match = true;
-                }
-            });
+            if (fault?.currentValueInfo?.toString().toLowerCase().includes(this.searchTerm)) {
+                return true;
+            }
 
-            return match;
+            if (fault?.triggerTime.toString().toLowerCase().includes(this.searchTerm)) {
+                return true;
+            }
+
+            if (fault?.severity.toString().toLowerCase().includes(this.searchTerm)) {
+                return true;
+            }
+
+            return false;
         },
         isSelected(fault) {
             return Boolean(this.selectedFaults[fault.id]);

src/plugins/faultManagement/pluginSpec.js

@@ -24,22 +24,10 @@ import {
     createOpenMct,
     resetApplicationState
 } from '../../utils/testing';
-import {
-    FAULT_MANAGEMENT_TYPE,
-    FAULT_MANAGEMENT_VIEW,
-    FAULT_MANAGEMENT_NAMESPACE
-} from './constants';
+import { FAULT_MANAGEMENT_TYPE } from './constants';
 
 describe("The Fault Management Plugin", () => {
     let openmct;
-    const faultDomainObject = {
-        name: 'it is not your fault',
-        type: FAULT_MANAGEMENT_TYPE,
-        identifier: {
-            key: 'nobodies',
-            namespace: 'fault'
-        }
-    };
 
     beforeEach(() => {
         openmct = createOpenMct();
@@ -50,54 +38,15 @@ describe("The Fault Management Plugin", () => {
     });
 
     it('is not installed by default', () => {
-        const typeDef = openmct.types.get(FAULT_MANAGEMENT_TYPE).definition;
+        let typeDef = openmct.types.get(FAULT_MANAGEMENT_TYPE).definition;
 
         expect(typeDef.name).toBe('Unknown Type');
     });
 
     it('can be installed', () => {
         openmct.install(openmct.plugins.FaultManagement());
-        const typeDef = openmct.types.get(FAULT_MANAGEMENT_TYPE).definition;
+        let typeDef = openmct.types.get(FAULT_MANAGEMENT_TYPE).definition;
 
         expect(typeDef.name).toBe('Fault Management');
     });
-
-    describe('once it is installed', () => {
-        beforeEach(() => {
-            openmct.install(openmct.plugins.FaultManagement());
-        });
-
-        it('provides a view for fault management types', () => {
-            const applicableViews = openmct.objectViews.get(faultDomainObject, []);
-            const faultManagementView = applicableViews.find(
-                (viewProvider) => viewProvider.key === FAULT_MANAGEMENT_VIEW
-            );
-
-            expect(applicableViews.length).toEqual(1);
-            expect(faultManagementView).toBeDefined();
-        });
-
-        it('provides an inspector view for fault management types', () => {
-            const faultDomainObjectSelection = [[
-                {
-                    context: {
-                        item: faultDomainObject
-                    }
-                }
-            ]];
-            const applicableInspectorViews = openmct.inspectorViews.get(faultDomainObjectSelection);
-
-            expect(applicableInspectorViews.length).toEqual(1);
-        });
-
-        it('creates a root object for fault management', async () => {
-            const root = await openmct.objects.getRoot();
-            const rootCompositionCollection = openmct.composition.get(root);
-            const rootComposition = await rootCompositionCollection.load();
-            const faultObject = rootComposition.find(obj => obj.identifier.namespace === FAULT_MANAGEMENT_NAMESPACE);
-
-            expect(faultObject).toBeDefined();
-        });
-
-    });
 });

src/plugins/flexibleLayout/components/flexibleLayout.vue

@@ -281,10 +281,6 @@ export default {
                 return false;
             }
 
-            if (!this.isEditing) {
-                return false;
-            }
-
             let containerId = event.dataTransfer.getData('containerid');
             let container = this.containers.filter((c) => c.id === containerId)[0];
             let containerPos = this.containers.indexOf(container);

src/plugins/flexibleLayout/components/frame.vue

@@ -31,7 +31,7 @@
     <div
         ref="frame"
         class="c-frame c-fl-frame__drag-wrapper is-selectable u-inspectable is-moveable"
-        :draggable="draggable"
+        draggable="true"
         @dragstart="initDrag"
     >
         <object-frame
@@ -93,20 +93,18 @@ export default {
     computed: {
         hasFrame() {
             return !this.frame.noFrame;
-        },
-        draggable() {
-            return this.isEditing;
         }
     },
     mounted() {
         if (this.frame.domainObjectIdentifier) {
+            let domainObjectPromise;
             if (this.openmct.objects.supportsMutation(this.frame.domainObjectIdentifier)) {
-                this.domainObjectPromise = this.openmct.objects.getMutable(this.frame.domainObjectIdentifier);
+                domainObjectPromise = this.openmct.objects.getMutable(this.frame.domainObjectIdentifier);
             } else {
-                this.domainObjectPromise = this.openmct.objects.get(this.frame.domainObjectIdentifier);
+                domainObjectPromise = this.openmct.objects.get(this.frame.domainObjectIdentifier);
             }
 
-            this.domainObjectPromise.then((object) => {
+            domainObjectPromise.then((object) => {
                 this.setDomainObject(object);
             });
         }
@@ -114,13 +112,7 @@ export default {
         this.dragGhost = document.getElementById('js-fl-drag-ghost');
     },
     beforeDestroy() {
-        if (this.domainObjectPromise) {
-            this.domainObjectPromise.then(() => {
-                if (this?.domainObject?.isMutable) {
-                    this.openmct.objects.destroyMutable(this.domainObject);
-                }
-            });
-        } else if (this?.domainObject?.isMutable) {
+        if (this.domainObject.isMutable) {
             this.openmct.objects.destroyMutable(this.domainObject);
         }
 

src/plugins/flexibleLayout/toolbarProvider.js

@@ -159,7 +159,7 @@ function ToolbarProvider(openmct) {
 
                         let prompt = openmct.overlays.dialog({
                             iconClass: 'alert',
-                            message: 'This action will permanently delete this container from this Flexible Layout. Do you want to continue?',
+                            message: 'This action will permanently delete this container from this Flexible Layout',
                             buttons: [
                                 {
                                     label: 'OK',

src/plugins/gauge/gauge.scss

@@ -52,8 +52,6 @@ $meterNeedleBorderRadius: 5px;
 .c-dial {
   max-height: 100%;
   max-width: 100%;
-  display: block;
-  margin: auto; // Centers SVG in container while allowing scaling
 
   &__bg {
     fill: $colorGaugeBg;

src/plugins/hyperlink/plugin.js

@@ -27,7 +27,7 @@ export default function () {
         openmct.types.addType('hyperlink', {
             name: 'Hyperlink',
             key: 'hyperlink',
-            description: 'A text element or button that links to any URL including Open MCT views.',
+            description: 'A hyperlink to redirect to a different link',
             creatable: true,
             cssClass: 'icon-chain-links',
             initialize: function (domainObject) {

src/plugins/imagery/components/ImageThumbnail.vue

@@ -38,7 +38,6 @@
         <img
             class="c-thumb__image"
             :src="image.url"
-            fetchpriority="low"
         >
     </a>
     <div class="c-thumb__timestamp">{{ image.formattedTime }}</div>

src/plugins/imagery/components/ImageryView.vue

@@ -82,7 +82,6 @@
                     }"
                     :data-openmct-image-timestamp="time"
                     :data-openmct-object-keystring="keyString"
-                    fetchpriority="low"
                 >
                 <div
                     v-if="imageUrl"
@@ -520,17 +519,20 @@ export default {
     },
     watch: {
         imageHistory: {
-            handler(newHistory, _oldHistory) {
+            handler(newHistory, oldHistory) {
                 const newSize = newHistory.length;
-                let imageIndex = newSize > 0 ? newSize - 1 : undefined;
+                let imageIndex;
                 if (this.focusedImageTimestamp !== undefined) {
                     const foundImageIndex = newHistory.findIndex(img => img.time === this.focusedImageTimestamp);
-                    if (foundImageIndex > -1) {
-                        imageIndex = foundImageIndex;
-                    }
+                    imageIndex = foundImageIndex > -1
+                        ? foundImageIndex
+                        : newSize - 1;
+                } else {
+                    imageIndex = newSize > 0
+                        ? newSize - 1
+                        : undefined;
                 }
 
-                this.setFocusedImage(imageIndex);
                 this.nextImageIndex = imageIndex;
 
                 if (this.previousFocusedImage && newHistory.length) {

src/plugins/interceptors/missingObjectInterceptor.js

@@ -27,13 +27,10 @@ export default function MissingObjectInterceptor(openmct) {
         },
         invoke: (identifier, object) => {
             if (object === undefined) {
-                const keyString = openmct.objects.makeKeyString(identifier);
-                openmct.notifications.error(`Failed to retrieve object ${keyString}`);
-
                 return {
                     identifier,
                     type: 'unknown',
-                    name: 'Missing: ' + keyString
+                    name: 'Missing: ' + openmct.objects.makeKeyString(identifier)
                 };
             }
 

src/plugins/linkAction/LinkAction.js

@@ -83,6 +83,7 @@ export default class LinkAction {
                 }
             ]
         };
+
         this.openmct.forms.showForm(formStructure)
             .then(this.onSave.bind(this));
     }
@@ -90,8 +91,8 @@ export default class LinkAction {
     validate(currentParent) {
         return (data) => {
 
-            // default current parent to ROOT, if it's null, then it's a root level item
-            if (!currentParent) {
+            // default current parent to ROOT, if it's undefined, then it's a root level item
+            if (currentParent === undefined) {
                 currentParent = {
                     identifier: {
                         key: 'ROOT',
@@ -100,23 +101,24 @@ export default class LinkAction {
                 };
             }
 
-            const parentCandidatePath = data.value;
-            const parentCandidate = parentCandidatePath[0];
+            const parentCandidate = data.value[0];
+            const currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier);
+            const parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.identifier);
             const objectKeystring = this.openmct.objects.makeKeyString(this.object.identifier);
 
             if (!this.openmct.objects.isPersistable(parentCandidate.identifier)) {
                 return false;
             }
 
-            // check if moving to same place
-            if (this.openmct.objects.areIdsEqual(parentCandidate.identifier, currentParent.identifier)) {
+            if (!parentCandidateKeystring || !currentParentKeystring) {
                 return false;
             }
 
-            // check if moving to a child
-            if (parentCandidatePath.some(candidatePath => {
-                return this.openmct.objects.areIdsEqual(candidatePath.identifier, this.object.identifier);
-            })) {
+            if (parentCandidateKeystring === currentParentKeystring) {
+                return false;
+            }
+
+            if (parentCandidateKeystring === objectKeystring) {
                 return false;
             }
 

src/plugins/move/MoveAction.js

@@ -145,24 +145,26 @@ export default class MoveAction {
             const parentCandidatePath = data.value;
             const parentCandidate = parentCandidatePath[0];
 
-            // check if moving to same place
-            if (this.openmct.objects.areIdsEqual(parentCandidate.identifier, currentParent.identifier)) {
-                return false;
-            }
-
-            // check if moving to a child
-            if (parentCandidatePath.some(candidatePath => {
-                return this.openmct.objects.areIdsEqual(candidatePath.identifier, this.object.identifier);
-            })) {
-                return false;
-            }
-
             if (!this.openmct.objects.isPersistable(parentCandidate.identifier)) {
                 return false;
             }
 
+            let currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier);
+            let parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.identifier);
             let objectKeystring = this.openmct.objects.makeKeyString(this.object.identifier);
 
+            if (!parentCandidateKeystring || !currentParentKeystring) {
+                return false;
+            }
+
+            if (parentCandidateKeystring === currentParentKeystring) {
+                return false;
+            }
+
+            if (parentCandidateKeystring === objectKeystring) {
+                return false;
+            }
+
             const parentCandidateComposition = parentCandidate.composition;
             if (parentCandidateComposition && parentCandidateComposition.indexOf(objectKeystring) !== -1) {
                 return false;