cherry-pick(#7096 ): Catchall for bug fix PRs and add performance category (#7100 )

cherry-pick(7096): Catchall for bug fix PRs and add performance category (#7096) * Catchall for bug fix PRs and add performance category * Move Bug fixes to the bottom * Fix performance label
cherry-pick(#7090 ): chore: add release.yml (#7095 )
2025-06-25 18:50:11 +00:00 · 2023-09-29 10:46:08 -07:00 · 2023-09-27 14:59:22 -07:00 · 2023-09-21 22:23:56 +00:00 · 2023-09-21 15:13:57 -07:00 · 2023-09-21 18:05:39 +00:00
190 changed files with 5096 additions and 1822 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -2,7 +2,7 @@ version: 2.1
 executors:
  pw-focal-development:
    docker:
-      - image: mcr.microsoft.com/playwright:v1.32.3-focal
+      - image: mcr.microsoft.com/playwright:v1.36.2-focal
    environment:
      NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
      PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps
@ -162,7 +162,7 @@ jobs:
    steps:
      - build_and_install:
          node-version: <<parameters.node-version>>
-      - run: npx playwright@1.32.3 install #Necessary for bare ubuntu machine
+      - run: npx playwright@1.36.2 install #Necessary for bare ubuntu machine
      - run: |
          export $(cat src/plugins/persistence/couch/.env.ci | xargs)
          docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
@ -197,7 +197,9 @@ jobs:
    steps:
      - build_and_install:
          node-version: <<parameters.node-version>>
-      - run: npm run test:perf
+      - run: npm run test:perf:memory
+      - run: npm run test:perf:localhost
+      - run: npm run test:perf:contract
      - store_test_results:
          path: test-results/results.xml
      - store_artifacts:
@ -213,11 +215,13 @@ jobs:
    parameters:
      node-version:
        type: string
+      suite:
+        type: string # ci or full
    executor: pw-focal-development
    steps:
      - build_and_install:
          node-version: <<parameters.node-version>>
-      - run: npm run test:e2e:visual
+      - run: npm run test:e2e:visual:<<parameters.suite>>
      - store_test_results:
          path: test-results/results.xml
      - store_artifacts:
@ -245,6 +249,8 @@ workflows:
      - perf-test:
          node-version: lts/hydrogen
      - visual-test:
+          name: visual-test-ci
+          suite: ci
          node-version: lts/hydrogen

  the-nightly: #These jobs do not run on PRs, but against master at night
@ -264,6 +270,8 @@ workflows:
      - perf-test:
          node-version: lts/hydrogen
      - visual-test:
+          name: visual-test-nightly
+          suite: full
          node-version: lts/hydrogen
      - e2e-couchdb:
          node-version: lts/hydrogen
--- a/.cspell.json
+++ b/.cspell.json
@ -0,0 +1,499 @@
+{
+  "version": "0.2",
+  "language": "en,en-us",
+  "words": [
+    "gress",
+    "doctoc",
+    "minmax",
+    "openmct",
+    "datasources",
+    "recieved",
+    "evalute",
+    "Sinewave",
+    "deregistration",
+    "unregisters",
+    "configutation",
+    "configuation",
+    "codecov",
+    "carryforward",
+    "Chacon",
+    "Straub",
+    "OWASP",
+    "Testathon",
+    "exploratorily",
+    "Testathons",
+    "testathon",
+    "npmjs",
+    "publishj",
+    "treeitem",
+    "timespan",
+    "Timespan",
+    "spinbutton",
+    "popout",
+    "textbox",
+    "tablist",
+    "Telem",
+    "codecoverage",
+    "browserless",
+    "networkidle",
+    "nums",
+    "mgmt",
+    "faultname",
+    "gantt",
+    "sharded",
+    "perfromance",
+    "MMOC",
+    "deploysentinel",
+    "codegen",
+    "Unfortuantely",
+    "viewports",
+    "updatesnapshots",
+    "excercised",
+    "Circel",
+    "browsercontexts",
+    "miminum",
+    "testcase",
+    "testsuite",
+    "domcontentloaded",
+    "Tracefile",
+    "lcov",
+    "linecov",
+    "Browserless",
+    "webserver",
+    "yamcs",
+    "quickstart",
+    "subobject",
+    "autosize",
+    "Horz",
+    "vehicula",
+    "Praesent",
+    "pharetra",
+    "Duis",
+    "eget",
+    "arcu",
+    "elementum",
+    "mauris",
+    "Donec",
+    "nunc",
+    "quis",
+    "Proin",
+    "elit",
+    "Nunc",
+    "Aenean",
+    "mollis",
+    "hendrerit",
+    "Vestibulum",
+    "placerat",
+    "velit",
+    "augue",
+    "Quisque",
+    "mattis",
+    "lectus",
+    "rutrum",
+    "Fusce",
+    "tincidunt",
+    "nibh",
+    "blandit",
+    "urna",
+    "Nullam",
+    "congue",
+    "enim",
+    "Morbi",
+    "bibendum",
+    "Vivamus",
+    "imperdiet",
+    "Pellentesque",
+    "cursus",
+    "Aliquam",
+    "orci",
+    "Suspendisse",
+    "amet",
+    "justo",
+    "Etiam",
+    "vestibulum",
+    "ullamcorper",
+    "Cras",
+    "aliquet",
+    "Mauris",
+    "Nulla",
+    "scelerisque",
+    "viverra",
+    "metus",
+    "condimentum",
+    "varius",
+    "nulla",
+    "sapien",
+    "Curabitur",
+    "tristique",
+    "Nonsectetur",
+    "convallis",
+    "accumsan",
+    "lacus",
+    "posuere",
+    "turpis",
+    "egestas",
+    "feugiat",
+    "tortor",
+    "faucibus",
+    "euismod",
+    "pratices",
+    "pathing",
+    "pases",
+    "testcases",
+    "Noneditable",
+    "listitem",
+    "Gantt",
+    "timelist",
+    "timestrip",
+    "networkevents",
+    "fetchpriority",
+    "persistable",
+    "Persistable",
+    "persistability",
+    "Persistability",
+    "testdata",
+    "Testdata",
+    "metdata",
+    "timeconductor",
+    "contenteditable",
+    "autoscale",
+    "Autoscale",
+    "prepan",
+    "sinewave",
+    "cyanish",
+    "driv",
+    "searchbox",
+    "datetime",
+    "timeframe",
+    "recents",
+    "recentobjects",
+    "gsearch",
+    "Disp",
+    "Cloc",
+    "noselect",
+    "requestfailed",
+    "viewlarge",
+    "Imageurl",
+    "thumbstrip",
+    "checkmark",
+    "Unshelve",
+    "autosized",
+    "chacskaylo",
+    "numberfield",
+    "OPENMCT",
+    "Autoflow",
+    "Timelist",
+    "faultmanagement",
+    "GEOSPATIAL",
+    "geospatial",
+    "plotspatial",
+    "annnotation",
+    "keystrings",
+    "undelete",
+    "sometag",
+    "containee",
+    "composability",
+    "mutables",
+    "Mutables",
+    "composee",
+    "handleoutsideclick",
+    "Datetime",
+    "Perc",
+    "autodismiss",
+    "filetree",
+    "deeptailor",
+    "keystring",
+    "reindex",
+    "unlisten",
+    "symbolsfont",
+    "ellipsize",
+    "dismissable",
+    "TIMESYSTEM",
+    "Metadatas",
+    "stalenes",
+    "receieves",
+    "unsub",
+    "callbacktwo",
+    "unsubscribetwo",
+    "telem",
+    "Telemetery",
+    "unemitted",
+    "granually",
+    "timesystem",
+    "metadatas",
+    "iteratees",
+    "metadatum",
+    "printj",
+    "sprintf",
+    "unlisteners",
+    "amts",
+    "reregistered",
+    "hudsonfoo",
+    "onclone",
+    "autoflow",
+    "xdescribe",
+    "mockmct",
+    "Autoflowed",
+    "plotly",
+    "relayout",
+    "Plotly",
+    "Yaxis",
+    "showlegend",
+    "textposition",
+    "xaxis",
+    "automargin",
+    "fixedrange",
+    "yaxis",
+    "Axistype",
+    "showline",
+    "bglayer",
+    "autorange",
+    "hoverinfo",
+    "dotful",
+    "Dotful",
+    "cartesianlayer",
+    "scatterlayer",
+    "textfont",
+    "ampm",
+    "cdef",
+    "horz",
+    "STYLEABLE",
+    "styleable",
+    "afff",
+    "shdw",
+    "braintree",
+    "vals",
+    "Subobject",
+    "Shdw",
+    "Movebar",
+    "inspectable",
+    "Stringformatter",
+    "sclk",
+    "Objectpath",
+    "Keystring",
+    "duplicatable",
+    "composees",
+    "Composees",
+    "Composee",
+    "callthrough",
+    "objectpath",
+    "createable",
+    "noneditable",
+    "Classname",
+    "classname",
+    "selectedfaults",
+    "accum",
+    "newpersisted",
+    "Metadatum",
+    "MCWS",
+    "YAMCS",
+    "frameid",
+    "containerid",
+    "mmgis",
+    "PERC",
+    "curval",
+    "viewbox",
+    "mutablegauge",
+    "Flatbush",
+    "flatbush",
+    "Indicies",
+    "Marqueed",
+    "NSEW",
+    "nsew",
+    "vrover",
+    "gimbled",
+    "Pannable",
+    "unsynced",
+    "Unsynced",
+    "pannable",
+    "autoscroll",
+    "TIMESTRIP",
+    "TWENTYFOUR",
+    "FULLSIZE",
+    "intialize",
+    "Timestrip",
+    "spyon",
+    "Unlistener",
+    "multipane",
+    "DATESTRING",
+    "akhenry",
+    "Niklas",
+    "Hertzen",
+    "Kash",
+    "Nouroozi",
+    "Bostock",
+    "BOSTOCK",
+    "Arnout",
+    "Kazemier",
+    "Karolis",
+    "Narkevicius",
+    "Ashkenas",
+    "Madhavan",
+    "Iskren",
+    "Ivov",
+    "Chernev",
+    "Borshchov",
+    "painterro",
+    "sheetjs",
+    "Yuxi",
+    "ACITON",
+    "localstorage",
+    "Linkto",
+    "Painterro",
+    "Editability",
+    "filteredsnapshots",
+    "Fromimage",
+    "muliple",
+    "notebookstorage",
+    "Andpage",
+    "pixelize",
+    "Quickstart",
+    "indexhtml",
+    "youradminpassword",
+    "chttpd",
+    "sourcefiles",
+    "USERPASS",
+    "XPUT",
+    "adipiscing",
+    "eiusmod",
+    "tempor",
+    "incididunt",
+    "labore",
+    "dolore",
+    "aliqua",
+    "perspiciatis",
+    "iteree",
+    "submodels",
+    "symlog",
+    "Plottable",
+    "antisymlog",
+    "docstrings",
+    "webglcontextlost",
+    "gridlines",
+    "Xaxis",
+    "Crosshairs",
+    "telemetrylimit",
+    "xscale",
+    "yscale",
+    "untracks",
+    "swatched",
+    "NULLVALUE",
+    "unobserver",
+    "unsubscriber",
+    "drap",
+    "Averager",
+    "averager",
+    "movecolumnfromindex",
+    "callout",
+    "Konqueror",
+    "unmark",
+    "hitarea",
+    "Hitarea",
+    "Unmark",
+    "controlbar",
+    "reactified",
+    "perc",
+    "DHMS",
+    "timespans",
+    "timeframes",
+    "Timesystems",
+    "Hilite",
+    "datetimes",
+    "momentified",
+    "ucontents",
+    "TIMELIST",
+    "Timeframe",
+    "Guirk",
+    "resizeable",
+    "iframing",
+    "Btns",
+    "Ctrls",
+    "Chakra",
+    "Petch",
+    "propor",
+    "phoneandtablet",
+    "desktopandtablet",
+    "Imgs",
+    "UNICODES",
+    "datatable",
+    "csvg",
+    "cpath",
+    "cellipse",
+    "xlink",
+    "cstyle",
+    "bfill",
+    "ctitle",
+    "eicon",
+    "interactability",
+    "AFFORDANCES",
+    "affordance",
+    "scrollcontainer",
+    "Icomoon",
+    "icomoon",
+    "configurability",
+    "btns",
+    "AUTOFLOW",
+    "DATETIME",
+    "infobubble",
+    "thumbsbubble",
+    "codehilite",
+    "vscroll",
+    "bgsize",
+    "togglebutton",
+    "Hacskaylo",
+    "noie",
+    "fullscreen",
+    "horiz",
+    "menubutton",
+    "SNAPSHOTTING",
+    "snapshotting",
+    "PAINTERRO",
+    "ptro",
+    "PLOTLY",
+    "gridlayer",
+    "xtick",
+    "ytick",
+    "subobjects",
+    "Ucontents",
+    "Userand",
+    "Userbefore",
+    "brdr",
+    "pushs",
+    "ALPH",
+    "Recents",
+    "Qbert",
+    "Infobubble",
+    "haslink",
+    "VPID",
+    "vpid",
+    "updatedtest",
+    "KHTML",
+    "Chromezilla",
+    "Safarifox",
+    "deregistering",
+    "hundredtized",
+    "dhms",
+    "unthrottled",
+    "Codecov",
+    "dont",
+    "mediump",
+    "sinonjs",
+    "generatedata",
+    "grandsearch",
+    "websockets",
+    "swgs",
+    "memlab",
+    "devmode"
+  ],
+  "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US"],
+  "ignorePaths": [
+    "package.json",
+    "dist/**",
+    "package-lock.json",
+    "node_modules",
+    "coverage",
+    "*.log",
+    "html-test-results",
+    "test-results"
+  ]
+}
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -13,7 +13,7 @@ module.exports = {
  extends: [
    'eslint:recommended',
    'plugin:compat/recommended',
-    'plugin:vue/recommended',
+    'plugin:vue/vue3-recommended',
    'plugin:you-dont-need-lodash-underscore/compatible',
    'plugin:prettier/recommended'
  ],
@ -28,6 +28,8 @@ module.exports = {
    }
  },
  rules: {
+    'vue/no-deprecated-dollar-listeners-api': 'warn',
+    'vue/no-deprecated-events-api': 'warn',
    'vue/no-v-for-template-key': 'off',
    'vue/no-v-for-template-key-on-child': 'error',
    'prettier/prettier': 'error',
--- a/.github/release.yml
+++ b/.github/release.yml
@ -0,0 +1,23 @@
+changelog:
+  categories:
+    - title: 🏕 Features
+      labels:
+        - type:feature
+    - title: 🎉 Enhancements
+      labels:
+        - type:enhancement
+      exclude:
+        labels:
+          - type:feature
+    - title: 🔧 Maintenance
+      labels:
+        - type:maintenance
+    - title: ⚡ Performance
+      labels:
+        - performance
+    - title: 👒 Dependencies
+      labels:
+        - dependencies
+    - title: 🐛 Bug Fixes
+      labels:
+        - '*'
--- a/.github/workflows/e2e-couchdb.yml
+++ b/.github/workflows/e2e-couchdb.yml
@ -28,7 +28,7 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-node-
      
-      - run: npm install --cache ~/.npm --prefer-offline --no-audit --progress=false
+      - run: npm install --cache ~/.npm --no-audit --progress=false

      - name: Login to DockerHub
        uses: docker/login-action@v2 
@ -36,7 +36,7 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      
-      - run: npx playwright@1.32.3 install
+      - run: npx playwright@1.36.2 install

      - name: Start CouchDB Docker Container and Init with Setup Scripts
        run: |
--- a/.github/workflows/e2e-pr.yml
+++ b/.github/workflows/e2e-pr.yml
@ -33,9 +33,9 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-node-
            
-      - run: npx playwright@1.32.3 install
+      - run: npx playwright@1.36.2 install
      - run: npx playwright install chrome-beta
-      - run: npm install --cache ~/.npm --prefer-offline --no-audit --progress=false
+      - run: npm install --cache ~/.npm --no-audit --progress=false
      - run: npm run test:e2e:full -- --max-failures=40
      - run: npm run cov:e2e:report || true
      - shell: bash
--- a/.github/workflows/pr-platform.yml
+++ b/.github/workflows/pr-platform.yml
@ -45,7 +45,7 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-${{ matrix.node_version }}-

-      - run: npm install --cache ~/.npm --prefer-offline --no-audit --progress=false
+      - run: npm install --cache ~/.npm --no-audit --progress=false
      
      - run: npm test
      
--- a/.webpack/webpack.common.js
+++ b/.webpack/webpack.common.js
@ -33,6 +33,16 @@ const projectRootDir = path.resolve(__dirname, '..');
 /** @type {import('webpack').Configuration} */
 const config = {
  context: projectRootDir,
+  devServer: {
+    client: {
+      progress: true,
+      overlay: {
+        // Disable overlay for runtime errors.
+        // See: https://github.com/webpack/webpack-dev-server/issues/4771
+        runtimeErrors: false
+      }
+    }
+  },
  entry: {
    openmct: './openmct.js',
    generatorWorker: './example/generator/generatorWorker.js',
@ -100,6 +110,12 @@ const config = {
    new MiniCssExtractPlugin({
      filename: '[name].css',
      chunkFilename: '[name].css'
+    }),
+    // Add a UTF-8 BOM to CSS output to avoid random mojibake
+    new webpack.BannerPlugin({
+      test: /.*Theme\.css$/,
+      raw: true,
+      banner: '@charset "UTF-8";',
    })
  ],
  module: {
@ -125,6 +141,7 @@ const config = {
        loader: 'vue-loader',
        options: {
          compilerOptions: {
+            hoistStatic: false,
            whitespace: 'preserve',
            compatConfig: {
              MODE: 2
--- a/.webpack/webpack.dev.js
+++ b/.webpack/webpack.dev.js
@ -45,14 +45,6 @@ module.exports = merge(common, {
      directory: path.join(__dirname, '..', '/dist'),
      publicPath: '/dist',
      watch: false
-    },
-    client: {
-      progress: true,
-      overlay: {
-        // Disable overlay for runtime errors.
-        // See: https://github.com/webpack/webpack-dev-server/issues/4771
-        runtimeErrors: false
-      }
    }
  }
 });
--- a/e2e/.percy.ci.yml
+++ b/e2e/.percy.ci.yml
@ -0,0 +1,17 @@
+version: 2
+snapshot:
+  widths: [1024]
+  min-height: 1440 # px
+  percyCSS: |
+    .t-indicator-clock > .label {
+      opacity: 0 !important;
+    }
+    .c-input--datetime {
+      opacity: 0 !important;
+    }
+    div.c-conductor-axis.c-conductor__ticks > svg {
+      opacity: 0 !important;
+    }
+    div.c-inspector__properties.c-inspect-properties > ul > li:nth-child(3) {
+      display: none !important;
+    }
--- a/e2e/.percy.nightly.yml
+++ b/e2e/.percy.nightly.yml
@ -0,0 +1,17 @@
+version: 2
+snapshot:
+  widths: [1024, 2000]
+  min-height: 1440 # px
+  percyCSS: |
+    .t-indicator-clock > .label {
+      opacity: 0 !important;
+    }
+    .c-input--datetime {
+      opacity: 0 !important;
+    }
+    div.c-conductor-axis.c-conductor__ticks > svg {
+      opacity: 0 !important;
+    }
+    div.c-inspector__properties.c-inspect-properties > ul > li:nth-child(3) {
+      display: none !important;
+    }
--- a/e2e/.percy.yml
+++ b/e2e/.percy.yml
@ -1,6 +0,0 @@
-version: 2
-snapshot:
-  widths: [1024, 2000]
-  min-height: 1440 # px
-discovery:
-  concurrency: 2 # https://github.com/percy/cli/discussions/1067
--- a/e2e/README.md
+++ b/e2e/README.md
@ -72,19 +72,30 @@ Visual Testing is an essential part of our e2e strategy as it ensures that the a
 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).

-`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.
+`npm run test:e2e:visual` commands will run all of the visual tests against a local instance of Open MCT. If no `PERCY_TOKEN` API key is found in the terminal or command line environment variables, no visual comparisons will be made.

+ - `npm run test:e2e:visual:ci` will run against every commit and PR.
+ - `npm run test:e2e:visual:full` will run every night with additional comparisons made for Larger Displays and with the `snow` theme.
 #### 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)
+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
+At present, we are using percy with two configuration files: `./e2e/.percy.nightly.yml` and `./e2e/.percy.ci.yml`. This is mainly to reduce the number of snapshots. 

-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.
+### Advanced: Snapshot Testing (Not Recommended)

-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).
+While snapshot testing offers a precise way to detect changes in your application without relying on third-party services like Percy.io, we've found that it doesn't offer any advantages over visual testing in our use-cases. Therefore, snapshot testing is **not recommended** for further implementation.
+
+#### CI vs Manual Checks
+Snapshot tests can be reliably executed in Continuous Integration (CI) environments but lack the manual oversight provided by visual testing platforms like Percy.io. This means they may miss issues that a human reviewer could catch during manual checks.
+
+#### Example
+A single visual test assertion in Percy.io can be executed across 10 different browser and resolution combinations without additional setup, providing comprehensive testing with minimal configuration. In contrast, a snapshot test is restricted to a single OS and browser resolution, requiring more effort to achieve the same level of coverage.
+
+
+#### Further Reading
+For those interested in the mechanics of snapshot testing with Playwright, you can refer to the [Playwright Snapshots Documentation](https://playwright.dev/docs/test-snapshots). However, keep in mind that we do not recommend using this approach.

-Read more about [Playwright Snapshots](https://playwright.dev/docs/test-snapshots)

 #### Open MCT's implementation

@ -123,17 +134,17 @@ npm run test:e2e:updatesnapshots

 ## 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.
+The open source performance tests function in three ways which match their naming and folder structure:

-They're found under `./e2e/tests/performance` and are to be executed with the following npm script:
-
-`npm run test:perf`
+`./e2e/tests/performance` - The tests at the root of this folder path detect functional changes which are mostly apparent with large performance regressions like [this](https://github.com/nasa/openmct/issues/6879). These tests run against openmct webpack in `production-mode` with the `npm run test:perf:localhost` script.
+`./e2e/tests/performance/contract/` -  These tests serve as [contracts](https://martinfowler.com/bliki/ContractTest.html) for the locator logic, functionality, and assumptions will work in our downstream, closed source test suites. These tests run against openmct webpack in `dev-mode` with the `npm run test:perf:contract` script.
+`./e2e/tests/performance/memory/` -  These tests execute memory leak detection checks in various ways. This is expected to evolve as we move to the `memlab` project. These tests run against openmct webpack in `production-mode` with the `npm run test:perf:memory` script.

 These tests are expected to become blocking and gating with assertions as we extend the capabilities of Playwright.

 ## Test Architecture and CI

-### Architecture (TODO)
+### Architecture

 ### File Structure

@ -147,8 +158,11 @@ Our file structure follows the type of type of testing being excercised at the e
 |`./tests/functional/example/` | Tests which specifically verify the example plugins (e.g.: Sine Wave Generator).|
 |`./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 testing framework's functionality and assumptions will continue to work based on further refactoring or Playwright version changes (e.g.: verifying custom fixtures and appActions).|
-|`./tests/performance/`        | Performance tests.|
+|`./tests/performance/`        | Performance tests which should be run on every commit.|
+|`./tests/performance/contract/` | A subset of performance tests which are designed to provide a contract between the open source tests which are run on every commit and the downstream tests which are run post merge and with other frameworks.|
+|`./tests/performance/memory`  | A subset of performance tests which are designed to test for memory leaks.|
 |`./tests/visual/`             | Visual tests.|
+|`./tests/visual/component/`             | Visual tests which are only run against a single component.|
 |`./appActions.js`             | Contains common methods which can be leveraged by test case authors to quickly move through the application when writing new tests.|
 |`./baseFixture.js`            | Contains base fixtures which only extend default `@playwright/test` functionality. The expectation is that these fixtures will be removed as the native Playwright API improves|

@ -165,6 +179,7 @@ Open MCT is leveraging the [config file](https://playwright.dev/docs/test-config
 |`./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-performance-devmode.config.js` | Used when running performance tests in CI or locally|
 |`./playwright-visual.config.js` | Used to run the visual tests in CI or locally|

 #### Test Tags
@ -182,6 +197,7 @@ Current list of test tags:
 |`@snapshot` | Uses Playwright's snapshot functionality to record a copy of the DOM for direct comparison. Must be run inside of the playwright container.|
 |`@unstable` | A new test or test which is known to be flaky.|
 |`@2p` | Indicates that multiple users are involved, or multiple tabs/pages are used. Useful for testing multi-user interactivity.|
+|`@generatedata` | Indicates that a test is used to generate testdata or test the generated test data. Usually to be associated with localstorage, but this may grow over time.|

 ### Continuous Integration

@ -200,6 +216,7 @@ CircleCI
 - Stable e2e tests against ubuntu and chrome
 - Performance tests against ubuntu and chrome
 - e2e tests are linted
+- Visual tests are run in a single resolution on the default `espresso` theme

 #### 2. Per-Merge Testing

@ -207,18 +224,19 @@ Github Actions / Workflow

 - Full suite against all browsers/projects. Triggered with Github Label Event 'pr:e2e'
 - CouchDB Tests. Triggered on PR Create and again with Github Label Event 'pr:e2e:couchdb'
- 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
+- Full e2e suite against ubuntu and chrome, firefox, and an MMOC resolution profile
 - Performance tests against ubuntu and chrome
+- CouchDB suite
+- Visual Tests are run in the full profile

 Github Actions / Workflow

- Visual Test baseline generation.
+- None at the moment

 #### Parallelism and Fast Feedback

@ -250,7 +268,7 @@ A testcase and testsuite are to be unmarked as @unstable when:

 #### **What's supported:**

-We are leveraging the `browserslist` project to declare our supported list of browsers.
+We are leveraging the `browserslist` project to declare our supported list of browsers. We support macOS, Windows, and ubuntu 20+.

 #### **Where it's tested:**

@ -264,11 +282,17 @@ We also have the need to execute our e2e tests across this published list of bro
  - 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.
+- `playwright-firefox`
+  - Firefox Latest Stable. Modified slightly by the playwright team to support a CDP Shim.
+
+In terms of operating system testing, we're only limited by what the CI providers are able to support. The bulk of our testing is performed on the official playwright container which is based on ubuntu. Github Actions allows us to use `windows-latest` and `mac-latest` and is run as needed.

 #### **Mobile**

 We have the Mission-need to support iPad. To run our iPad suite, please see our `playwright-*.config.js` with the 'iPad' project.

+In general, our test suite is not designed to run against mobile devices as the mobile experience is a focused version of the application. Core functionality is missing (chiefly the 'Create' button) and so this will likely turn into a separate suite.
+
 #### **Skipping or executing tests based on browser, os, and/os browser version:**

 Conditionally skipping tests based on browser (**RECOMMENDED**):
@ -295,14 +319,27 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p

 ## Test Design, Best Practices, and Tips & Tricks

-### Test Design (TODO)
+### Test Design

- How to make tests robust to function in other contexts (VISTA, VIPER, etc.)
-  - Leverage the use of `appActions.js` methods such as `createDomainObjectWithDefaults()`
- How to make tests faster and more resilient
-  - When possible, navigate directly by URL:
+#### Test as the User

-  ```javascript
+In general, strive to test only through the UI as a user would. As stated in the [Playwright Best Practices](https://playwright.dev/docs/best-practices#test-user-visible-behavior):
+
+> "Automated tests should verify that the application code works for the end users, and avoid relying on implementation details such as things which users will not typically use, see, or even know about such as the name of a function, whether something is an array, or the CSS class of some element. The end user will see or interact with what is rendered on the page, so your test should typically only see/interact with the same rendered output."
+
+By adhering to this principle, we can create tests that are both robust and reflective of actual user experiences.
+
+#### How to make tests robust to function in other contexts (VISTA, COUCHDB, YAMCS, VIPER, etc.)
+  1. Leverage the use of `appActions.js` methods such as `createDomainObjectWithDefaults()`. This ensures that your tests will create unique instances of objects for your test to interact with.
+  1. Do not assert on the order or structure of objects available unless you created them yourself. These tests may be used against a persistent datastore like couchdb with many objects in the tree.
+  1. Do not search for your created objects. Open MCT does not performance uniqueness checks so it's possible that your tests will break when run twice.
+  1. Avoid creating locator aliases. This likely means that you're compensating for a bad locator. Improve the application instead.
+  1. Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });` instead of `{ waitUntil: 'networkidle' }`. Tests run against deployments with websockets often have issues with the networkidle detection.
+  
+#### How to make tests faster and more resilient
+  1. Avoid app interaction when possible. The best way of doing this is to navigate directly by URL:
+
+  ```js
    // You can capture the CreatedObjectInfo returned from this appAction:
    const clock = await createDomainObjectWithDefaults(page, { type: 'Clock' });

@ -310,12 +347,14 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p
    await page.goto(clock.url);
  ```

-  - Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });`
+  1. Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });`
    - Initial navigation should _almost_ always use the `{ waitUntil: 'domcontentloaded' }` option.
-  - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.
+  1.  Avoid repeated setup to test a single assertion. Write longer tests with multiple soft assertions.
+  This ensures that your changes will be picked up with large refactors.

-### How to write a great test (WIP)
+### How to write a great test

+- Avoid using css locators to find elements to the page. Use modern web accessible locators like `getByRole`
 - Use our [App Actions](./appActions.js) for performing common actions whenever applicable.
  - Use `waitForPlotsToRender()` before asserting against anything that is dependent upon plot series data being loaded and drawn.
 - If you create an object outside of using the `createDomainObjectWithDefaults` App Action, make sure to fill in the 'Notes' section of your object with `page.testNotes`:
@ -328,7 +367,29 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p
  await notesInput.fill(testNotes);
  ```

-#### How to write a great visual test (TODO)
+ #### How to Write a Great Visual Test
+
+1. **Look for the Unknown Unknowns**: Avoid asserting on specific differences in the visual diff. Visual tests are most effective for identifying unknown unknowns.
+
+2. **Get the App into Interesting States**: Prioritize getting Open MCT into unusual layouts or behaviors before capturing a visual snapshot. For instance, you could open a dropdown menu.
+
+3. **Expect the Unexpected**: Use functional expect statements only to verify assumptions about the state between steps. A great visual test doesn't fail during the test itself, but rather when changes are reviewed in Percy.io.
+
+4. **Control Variability**: Account for variations inherent in working with time-based telemetry and clocks.
+  - Utilize `percyCSS` to ignore time-based elements. For more details, consult our [percyCSS file](./.percy.ci.yml).
+  - Use Open MCT's fixed-time mode.
+  - Employ the `createExampleTelemetryObject` appAction to source telemetry and specify a `name` to avoid autogenerated names.
+
+5. **Hide the Tree and Inspector**: Generally, your test will not require comparisons involving the tree and inspector. These aspects are covered in component-specific tests (explained below). To exclude them from the comparison by default, navigate to the root of the main view with the tree and inspector hidden:
+    - `await page.goto('./#/browse/mine?hideTree=true&hideInspector=true')`
+
+6. **Component-Specific Tests**: If you wish to focus on a particular component, use the `/visual/component/` folder and limit the scope of the comparison to that component. For instance:
+    ```js
+    await percySnapshot(page, `Tree Pane w/ single level expanded (theme: ${theme})`, {
+        scope: treePane
+    });
+    ```
+    - Note: The `scope` variable can be any valid CSS selector.

 #### How to write a great network test

@ -345,12 +406,35 @@ For now, our best practices exist as self-tested, living documentation in our [e

 For best practices with regards to mocking network responses, see our [couchdb.e2e.spec.js](./tests/functional/couchdb.e2e.spec.js) file.

-### Tips & Tricks (TODO)
+### Tips & Tricks

 The following contains a list of tips and tricks which don't exactly fit into a FAQ or Best Practices doc.

+- (Advanced) Overriding the Browser's Clock
+It is possible to override the browser's clock in order to control time-based elements. Since this can cause unwanted behavior (i.e. Tree not rendering), only use this sparingly. To do this, use the `overrideClock` fixture as such:
+
+```js
+const { test, expect } = require('../../pluginFixtures.js');
+
+test.describe('foo test suite', () => {
+  
+  // All subsequent tests in this suite will override the clock
+  test.use({
+    clockOptions: {
+      now: 1732413600000, // A timestamp given as milliseconds since the epoch
+      shouldAdvanceTime: true // Should the clock tick?
+    }
+  });
+
+  test('bar test', async ({ page }) => {
+    // ...
+  });
+});
+  ```
+  More info and options for `overrideClock` can be found in [baseFixtures.js](baseFixtures.js)
+
 - Working with multiple pages
-There are instances where multiple browser pages will need to be opened to verify multi-page or multi-tab application behavior.
+There are instances where multiple browser pages will needed to verify multi-page or multi-tab application behavior. Make sure to use the `@2p` annotation as well as name each page appropriately: i.e. `page1` and `page2` or `tab1` and `tab2` depending on the intended use case. Generally pages should be used unless testing `sharedWorker` code, specifically.

 ### Reporting

--- a/e2e/appActions.js
+++ b/e2e/appActions.js
@ -35,6 +35,7 @@
 * @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.
+ * @property {Object<string, string>} [customParameters] any additional parameters to be passed to the domain object's form. E.g. '[aria-label="Data Rate (hz)"]': {'0.1'}
 */

 /**
@ -65,7 +66,10 @@ const { expect } = require('@playwright/test');
 * @param {CreateObjectOptions} options
 * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
 */
-async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine' }) {
+async function createDomainObjectWithDefaults(
+  page,
+  { type, name, parent = 'mine', customParameters = {} }
+) {
  if (!name) {
    name = `${type}:${genUuid()}`;
  }
@ -74,7 +78,7 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine

  // 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`);
+  await page.goto(`${parentUrl}`);

  //Click the Create button
  await page.click('button:has-text("Create")');
@ -94,6 +98,13 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
    await notesInput.fill(page.testNotes);
  }

+  // If there are any further parameters, fill them in
+  for (const [key, value] of Object.entries(customParameters)) {
+    const input = page.locator(`form[name="mctForm"] ${key}`);
+    await input.fill('');
+    await input.fill(value);
+  }
+
  // Click OK button and wait for Navigate event
  await Promise.all([
    page.waitForLoadState(),
@ -168,7 +179,7 @@ async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {

  // 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`);
+  await page.goto(`${parentUrl}`);

  // Click the Create button
  await page.click('button:has-text("Create")');
@ -177,7 +188,7 @@ async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
  await page.click(`li:text("Plan")`);

  // Modify the name input field of the domain object to accept 'name'
-  const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+  const nameInput = page.getByLabel('Title', { exact: true });
  await nameInput.fill('');
  await nameInput.fill(name);

@ -208,6 +219,64 @@ async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
  };
 }

+/**
+ * Create a standardized Telemetry Object (Sine Wave Generator) for use in visual tests
+ * and tests against plotting telemetry (e.g. logPlot tests).
+ * @param {import('@playwright/test').Page} page
+ * @param {string | import('../src/api/objects/ObjectAPI').Identifier} [parent] the uuid or identifier of the parent object. Defaults to 'mine'
+ * @returns {Promise<CreatedObjectInfo>} An object containing information about the telemetry object.
+ */
+async function createExampleTelemetryObject(page, parent = 'mine') {
+  const parentUrl = await getHashUrlToDomainObject(page, parent);
+  // TODO: Make this field even more accessible
+  const name = 'VIPER Rover Heading';
+  const nameInputLocator = page.getByRole('dialog').locator('input[type="text"]');
+
+  await page.goto(`${parentUrl}`);
+
+  await page.locator('button:has-text("Create")').click();
+
+  await page.locator('li:has-text("Sine Wave Generator")').click();
+
+  await nameInputLocator.fill(name);
+
+  // Fill out the fields with default values
+  await page.getByRole('spinbutton', { name: 'Period' }).fill('10');
+  await page.getByRole('spinbutton', { name: 'Amplitude' }).fill('1');
+  await page.getByRole('spinbutton', { name: 'Offset' }).fill('0');
+  await page.getByRole('spinbutton', { name: 'Data Rate (hz)' }).fill('1');
+  await page.getByRole('spinbutton', { name: 'Phase (radians)' }).fill('0');
+  await page.getByRole('spinbutton', { name: 'Randomness' }).fill('0');
+  await page.getByRole('spinbutton', { name: 'Loading Delay (ms)' }).fill('0');
+
+  await page.getByRole('button', { name: 'Save' }).click();
+
+  // Wait until the URL is updated
+  await page.waitForURL(`**/${parent}/*`);
+
+  const uuid = await getFocusedObjectUuid(page);
+  const url = await getHashUrlToDomainObject(page, uuid);
+
+  return {
+    name,
+    uuid,
+    url
+  };
+}
+
+/**
+ * Navigates directly to a given object url, in fixed time mode, with the given start and end bounds.
+ * @param {import('@playwright/test').Page} page
+ * @param {string} url The url to the domainObject
+ * @param {string | number} start The starting time bound in milliseconds since epoch
+ * @param {string | number} end The ending time bound in milliseconds since epoch
+ */
+async function navigateToObjectWithFixedTimeBounds(page, url, start, end) {
+  await page.goto(
+    `${url}?tc.mode=fixed&tc.timeSystem=utc&tc.startBound=${start}&tc.endBound=${end}`
+  );
+}
+
 /**
 * Open the given `domainObject`'s context menu from the object tree.
 * Expands the path to the object and scrolls to it if necessary.
@ -271,13 +340,13 @@ async function getFocusedObjectUuid(page) {
 * 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
+ * @param {string | import('../src/api/objects/ObjectAPI').Identifier} identifier the uuid or identifier of the object to get the url for
 * @returns {Promise<string>} the url of the object
 */
-async function getHashUrlToDomainObject(page, uuid) {
-  await page.waitForLoadState('load'); //Add some determinism
-  const hashUrl = await page.evaluate(async (objectUuid) => {
-    const path = await window.openmct.objects.getOriginalPath(objectUuid);
+async function getHashUrlToDomainObject(page, identifier) {
+  await page.waitForLoadState('load');
+  const hashUrl = await page.evaluate(async (objectIdentifier) => {
+    const path = await window.openmct.objects.getOriginalPath(objectIdentifier);
    let url =
      './#/browse/' +
      [...path]
@ -291,7 +360,7 @@ async function getHashUrlToDomainObject(page, uuid) {
    }

    return url;
-  }, uuid);
+  }, identifier);

  return hashUrl;
 }
@ -300,6 +369,7 @@ async function getHashUrlToDomainObject(page, uuid) {
 * Utilizes the OpenMCT API to detect if the UI 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 Open MCT is in Edit Mode
 */
 async function _isInEditMode(page, identifier) {
@ -410,8 +480,18 @@ async function setEndOffset(page, offset) {
  await setTimeConductorOffset(page, offset);
 }

+/**
+ * Set the time conductor bounds in fixed time mode
+ *
+ * NOTE: Unless explicitly testing the Time Conductor itself, it is advised to instead
+ * navigate directly to the object with the desired time bounds using `navigateToObjectWithFixedTimeBounds()`.
+ * @param {import('@playwright/test').Page} page
+ * @param {string} startDate
+ * @param {string} endDate
+ */
 async function setTimeConductorBounds(page, startDate, endDate) {
  // Bring up the time conductor popup
+  expect(await page.locator('.l-shell__time-conductor.c-compact-tc').count()).toBe(1);
  await page.click('.l-shell__time-conductor.c-compact-tc');

  await setTimeBounds(page, startDate, endDate);
@ -419,20 +499,31 @@ async function setTimeConductorBounds(page, startDate, endDate) {
  await page.keyboard.press('Enter');
 }

+/**
+ * Set the independent time conductor bounds in fixed time mode
+ * @param {import('@playwright/test').Page} page
+ * @param {string} startDate
+ * @param {string} endDate
+ */
 async function setIndependentTimeConductorBounds(page, startDate, endDate) {
  // Activate Independent Time Conductor in Fixed Time Mode
  await page.getByRole('switch').click();

  // Bring up the time conductor popup
  await page.click('.c-conductor-holder--compact .c-compact-tc');
-
-  await expect(page.locator('.itc-popout')).toBeVisible();
+  await expect(page.locator('.itc-popout')).toBeInViewport();

  await setTimeBounds(page, startDate, endDate);

  await page.keyboard.press('Enter');
 }

+/**
+ * Set the bounds of the visible conductor in fixed time mode
+ * @param {import('@playwright/test').Page} page
+ * @param {string} startDate
+ * @param {string} endDate
+ */
 async function setTimeBounds(page, startDate, endDate) {
  if (startDate) {
    // Fill start time
@ -549,9 +640,25 @@ async function getCanvasPixels(page, canvasSelector) {
  return getTelemValuePromise;
 }

+/**
+ * @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.getByLabel('Title', { exact: true });
+  await nameInput.fill('');
+  await nameInput.fill(newName);
+  await page.click('[aria-label="Save"]');
+}
+
 // eslint-disable-next-line no-undef
 module.exports = {
  createDomainObjectWithDefaults,
+  createExampleTelemetryObject,
  createNotification,
  createPlanFromJSON,
  expandEntireTree,
@ -559,6 +666,7 @@ module.exports = {
  getCanvasPixels,
  getHashUrlToDomainObject,
  getFocusedObjectUuid,
+  navigateToObjectWithFixedTimeBounds,
  openObjectTreeContextMenu,
  setFixedTimeMode,
  setRealTimeMode,
@ -567,5 +675,6 @@ module.exports = {
  setTimeConductorBounds,
  setIndependentTimeConductorBounds,
  selectInspectorTab,
-  waitForPlotsToRender
+  waitForPlotsToRender,
+  renameObjectFromContextMenu
 };
--- a/e2e/baseFixtures.js
+++ b/e2e/baseFixtures.js
@ -72,8 +72,13 @@ exports.test = base.test.extend({
  /**
   * This allows the test to manipulate the browser clock. This is useful for Visual and Snapshot tests which need
   * the Time Indicator Clock to be in a specific state.
+   *
+   * Warning: Has many limitations and secondary side effects in Open MCT.
+   * 1. The tree component does not render.
+   * 2. page.WaitForNavigation does not trigger.
+   *
   * Usage:
-   * ```
+   * ```js
   * test.use({
   *   clockOptions: {
   *       now: 0,
@ -85,6 +90,7 @@ exports.test = base.test.extend({
   *
   * @see {@link https://github.com/microsoft/playwright/issues/6347 Github RFE}
   * @see {@link https://github.com/sinonjs/fake-timers/#var-clock--faketimersinstallconfig SinonJS FakeTimers Config}
+   * @type {import('@types/sinonjs__fake-timers').FakeTimerInstallOpts}
   */
  clockOptions: [undefined, { option: true }],
  overrideClock: [
@ -143,7 +149,24 @@ exports.test = base.test.extend({
   * Extends the base page class to enable console log error detection.
   * @see {@link https://github.com/microsoft/playwright/discussions/11690 Github Discussion}
   */
-  page: async ({ page, failOnConsoleError }, use) => {
+  page: async ({ page, failOnConsoleError, clockOptions }, use) => {
+    // If overriding the clock, we must also override the Date.now()
+    // function in the generatorWorker context. This is necessary
+    // to ensure that example telemetry data is generated for the new clock time.
+    if (clockOptions?.now !== undefined) {
+      page.on(
+        'worker',
+        (worker) => {
+          if (worker.url().includes('generatorWorker')) {
+            worker.evaluate((time) => {
+              self.Date.now = () => time;
+            });
+          }
+        },
+        clockOptions.now
+      );
+    }
+
    // Capture any console errors during test execution
    const messages = [];
    page.on('console', (msg) => messages.push(msg));
--- a/e2e/constants.js
+++ b/e2e/constants.js
@ -0,0 +1,9 @@
+/**
+ * Constants which may be used across all e2e tests.
+ */
+
+/**
+ * Time Constants
+ * - Used for overriding the browser clock in tests.
+ */
+export const MISSION_TIME = 1732413600000; // Saturday, November 23, 2024 6:00:00 PM GMT-08:00 (Thanksgiving Dinner Time)
--- a/e2e/helper/notebookUtils.js
+++ b/e2e/helper/notebookUtils.js
@ -20,9 +20,11 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-const { createDomainObjectWithDefaults } = require('../appActions');
+const { selectInspectorTab, createDomainObjectWithDefaults } = require('../appActions');

 const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
+const CUSTOM_NAME = 'CUSTOM_NAME';
+const path = require('path');

 /**
 * @param {import('@playwright/test').Page} page
@ -62,8 +64,86 @@ async function commitEntry(page) {
  await page.locator('.c-ne__save-button > button').click();
 }

+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function startAndAddRestrictedNotebookObject(page) {
+  // eslint-disable-next-line no-undef
+  await page.addInitScript({ path: path.join(__dirname, 'addInitRestrictedNotebook.js') });
+  await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+  return createDomainObjectWithDefaults(page, {
+    type: CUSTOM_NAME,
+    name: 'Restricted Test Notebook'
+  });
+}
+
+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function lockPage(page) {
+  const commitButton = page.locator('button:has-text("Commit Entries")');
+  await commitButton.click();
+
+  //Wait until Lock Banner is visible
+  await page.locator('text=Lock Page').click();
+}
+
+/**
+ * Creates a notebook object and adds an entry.
+ * @param {import('@playwright/test').Page} - page to load
+ * @param {number} [iterations = 1] - the number of entries to create
+ */
+async function createNotebookAndEntry(page, iterations = 1) {
+  const notebook = createDomainObjectWithDefaults(page, { type: 'Notebook' });
+
+  for (let iteration = 0; iteration < iterations; iteration++) {
+    await enterTextEntry(page, `Entry ${iteration}`);
+  }
+
+  return notebook;
+}
+
+/**
+ * Creates a notebook object, adds an entry, and adds a tag.
+ * @param {import('@playwright/test').Page} page
+ * @param {number} [iterations = 1] - the number of entries (and tags) to create
+ */
+async function createNotebookEntryAndTags(page, iterations = 1) {
+  const notebook = await createNotebookAndEntry(page, iterations);
+  await selectInspectorTab(page, 'Annotations');
+
+  for (let iteration = 0; iteration < iterations; iteration++) {
+    // Hover and click "Add Tag" button
+    // Hover is needed here to "slow down" the actions while running in headless mode
+    await page.locator(`[aria-label="Notebook Entry"] >> nth = ${iteration}`).click();
+    await page.hover(`button:has-text("Add Tag")`);
+    await page.locator(`button:has-text("Add Tag")`).click();
+
+    // Click inside the tag search input
+    await page.locator('[placeholder="Type to select tag"]').click();
+    // Select the "Driving" tag
+    await page.locator('[aria-label="Autocomplete Options"] >> text=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")`);
+    await page.locator(`button:has-text("Add Tag")`).click();
+    // Click inside the tag search input
+    await page.locator('[placeholder="Type to select tag"]').click();
+    // Select the "Science" tag
+    await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
+  }
+
+  return notebook;
+}
+
 // eslint-disable-next-line no-undef
 module.exports = {
  enterTextEntry,
-  dragAndDropEmbed
+  dragAndDropEmbed,
+  startAndAddRestrictedNotebookObject,
+  lockPage,
+  createNotebookEntryAndTags,
+  createNotebookAndEntry
 };
--- a/e2e/playwright-performance-dev.config.js
+++ b/e2e/playwright-performance-dev.config.js
@ -2,25 +2,24 @@
 // playwright.config.js
 // @ts-check

-const CI = process.env.CI === 'true';
-
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
  retries: 1, //Only for debugging purposes for trace: 'on-first-retry'
  testDir: 'tests/performance/',
+  testMatch: '*.contract.perf.spec.js', //Run everything except contract tests which require marks in dev mode
  timeout: 60 * 1000,
  workers: 1, //Only run in serial with 1 worker
  webServer: {
-    command: 'npm run start', //coverage not generated
+    command: 'npm run start', //need development mode for performance.marks and others
    url: 'http://localhost:8080/#',
    timeout: 200 * 1000,
-    reuseExistingServer: !CI
+    reuseExistingServer: false
  },
  use: {
    browserName: 'chromium',
    baseURL: 'http://localhost:8080/',
-    headless: CI, //Only if running locally
-    ignoreHTTPSErrors: true,
+    headless: true,
+    ignoreHTTPSErrors: false, //HTTP performance varies!
    screenshot: 'off',
    trace: 'on-first-retry',
    video: 'off'
@ -28,6 +27,7 @@ const config = {
  projects: [
    {
      name: 'chrome',
+      testIgnore: '*.memory.perf.spec.js', //Do not run memory tests without proper flags. Shouldn't get here
      use: {
        browserName: 'chromium'
      }
--- a/e2e/playwright-performance-prod.config.js
+++ b/e2e/playwright-performance-prod.config.js
@ -0,0 +1,60 @@
+/* eslint-disable no-undef */
+// playwright.config.js
+// @ts-check
+
+/** @type {import('@playwright/test').PlaywrightTestConfig} */
+const config = {
+  retries: 0, //Only for debugging purposes for trace: 'on-first-retry'
+  testDir: 'tests/performance/',
+  testIgnore: '*.contract.perf.spec.js', //Run everything except contract tests which require marks in dev mode
+  timeout: 60 * 1000,
+  workers: 1, //Only run in serial with 1 worker
+  webServer: {
+    command: 'npm run start:prod', //Production mode
+    url: 'http://localhost:8080/#',
+    timeout: 200 * 1000,
+    reuseExistingServer: false //Must be run with this option to prevent dev mode
+  },
+  use: {
+    baseURL: 'http://localhost:8080/',
+    headless: true,
+    ignoreHTTPSErrors: false, //HTTP performance varies!
+    screenshot: 'off',
+    trace: 'on-first-retry',
+    video: 'off'
+  },
+  projects: [
+    {
+      name: 'chrome-memory',
+      testMatch: '*.memory.perf.spec.js', //Only run memory tests
+      use: {
+        browserName: 'chromium',
+        launchOptions: {
+          args: [
+            '--no-sandbox',
+            '--disable-notifications',
+            '--use-fake-ui-for-media-stream',
+            '--use-fake-device-for-media-stream',
+            '--js-flags=--no-move-object-start --expose-gc',
+            '--enable-precise-memory-info',
+            '--display=:100'
+          ]
+        }
+      }
+    },
+    {
+      name: 'chrome',
+      testIgnore: '*.memory.perf.spec.js', //Do not run memory tests without proper flags
+      use: {
+        browserName: 'chromium'
+      }
+    }
+  ],
+  reporter: [
+    ['list'],
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    ['json', { outputFile: '../test-results/results.json' }]
+  ]
+};
+
+module.exports = config;
--- a/e2e/pluginFixtures.js
+++ b/e2e/pluginFixtures.js
@ -45,8 +45,6 @@ const path = require('path');
 // const createdObjects = new Map();

 /**
- * **NOTE: This feature is a work-in-progress and should not currently be used.**
- *
 * This action will create a domain object for the test to reference and return the uuid. If an object
 * of a given name already exists, it will return the uuid of that object to the test instead of creating
 * a new file. The intent is to move object creation out of test suites which are not explicitly worried
@ -65,10 +63,7 @@ const path = require('path');

 //     await createDomainObjectWithDefaults(page, type, name);

-//     // Once object is created, get the uuid from the url
-//     const uuid = await page.evaluate(() => {
-//         return window.location.href.match(/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/)[0];
-//     });
+//     const uuid = getHashUrlToDomainObject(page);

 //     createdObjects.set(objectName, uuid);

@ -146,6 +141,7 @@ exports.test = test.extend({
    await use({ myItemsFolderName });
  }
 });
+
 exports.expect = expect;
 exports.request = request;

--- a/e2e/test-data/VisualTestData_storage.json
+++ b/e2e/test-data/VisualTestData_storage.json
@ -1,22 +0,0 @@
-{
-  "cookies": [],
-  "origins": [
-    {
-      "origin": "http://localhost:8080",
-      "localStorage": [
-        {
-          "name": "tcHistory",
-          "value": "{\"utc\":[{\"start\":1658617611983,\"end\":1658619411983}]}"
-        },
-        {
-          "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"persisted\":1658619412848,\"modified\":1658619412848},\"7fa5749b-8969-494c-9d85-c272516d333c\":{\"identifier\":{\"key\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"namespace\":\"\"},\"name\":\"Unnamed Overlay Plot\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"}}]},\"modified\":1658619413566,\"location\":\"mine\",\"persisted\":1658619413567},\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\"},\"modified\":1658619413552,\"location\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"persisted\":1658619413552}}"
-        },
-        {
-          "name": "mct-tree-expanded",
-          "value": "[\"/browse/mine\"]"
-        }
-      ]
-    }
-  ]
-}
--- a/e2e/test-data/memory-leak-detection.json
+++ b/e2e/test-data/memory-leak-detection.json
--- a/e2e/test-data/overlay_plot_storage.json
+++ b/e2e/test-data/overlay_plot_storage.json
@ -0,0 +1,26 @@
+{
+  "cookies": [],
+  "origins": [
+    {
+      "origin": "http://localhost:8080",
+      "localStorage": [
+        {
+          "name": "mct",
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741852556,\"created\":1678741830859,\"persisted\":1678741852557},\"8c863964-4640-4db1-8a98-0e546c3c271d\":{\"identifier\":{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1678741862011,\"location\":\"mine\",\"created\":1678741839461,\"persisted\":1678741862011},\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\":{\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"identifier\":{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"},\"telemetry\":{\"period\":\"1\",\"amplitude\":\"1\",\"offset\":\"0\",\"dataRateInHz\":\"1\",\"phase\":\"0\",\"randomness\":\"0\",\"loadDelay\":\"0\",\"infinityValues\":false,\"staleness\":false},\"modified\":1678741852553,\"location\":\"mine\",\"created\":1678741852553,\"persisted\":1678741852553}}"
+        },
+        {
+          "name": "mct-tree-expanded",
+          "value": "[]"
+        },
+        {
+          "name": "tcHistory",
+          "value": "{\"utc\":[{\"start\":1678740030748,\"end\":1678741830748}]}"
+        },
+        {
+          "name": "mct-recent-objects",
+          "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1678741860389,\"location\":\"mine\",\"created\":1678741839461,\"persisted\":1678741860389},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741852556,\"created\":1678741830859,\"persisted\":1678741852557},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/8c863964-4640-4db1-8a98-0e546c3c271d\",\"domainObject\":{\"identifier\":{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1678741860389,\"location\":\"mine\",\"created\":1678741839461,\"persisted\":1678741860389}},{\"objectPath\":[{\"identifier\":{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":\"1\",\"amplitude\":\"1\",\"offset\":\"0\",\"dataRateInHz\":\"1\",\"phase\":\"0\",\"randomness\":\"0\",\"loadDelay\":\"0\",\"infinityValues\":false,\"staleness\":false},\"modified\":1678741852553,\"location\":\"mine\",\"created\":1678741852553,\"persisted\":1678741852553},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741852556,\"created\":1678741830859,\"persisted\":1678741852557},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"domainObject\":{\"identifier\":{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":\"1\",\"amplitude\":\"1\",\"offset\":\"0\",\"dataRateInHz\":\"1\",\"phase\":\"0\",\"randomness\":\"0\",\"loadDelay\":\"0\",\"infinityValues\":false,\"staleness\":false},\"modified\":1678741852553,\"location\":\"mine\",\"created\":1678741852553,\"persisted\":1678741852553}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741852556,\"created\":1678741830859,\"persisted\":1678741852557},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine\",\"domainObject\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"8c863964-4640-4db1-8a98-0e546c3c271d\",\"namespace\":\"\"},{\"key\":\"f5c7e86c-a5b4-4c6c-9038-9cf03cd9a99e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741852556,\"created\":1678741830859,\"persisted\":1678741852557}}]"
+        }
+      ]
+    }
+  ]
+}
--- a/e2e/test-data/overlay_plot_with_delay_storage.json
+++ b/e2e/test-data/overlay_plot_with_delay_storage.json
@ -0,0 +1,26 @@
+{
+  "cookies": [],
+  "origins": [
+    {
+      "origin": "http://localhost:8080",
+      "localStorage": [
+        {
+          "name": "mct",
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741890986,\"created\":1678741885545,\"persisted\":1678741890987},\"db9fb115-7a72-4c45-81a4-1f6021156b4e\":{\"identifier\":{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1678741904378,\"location\":\"mine\",\"created\":1678741890983,\"persisted\":1678741904385},\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1678741896800,\"location\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"created\":1678741896800,\"persisted\":1678741896800}}"
+        },
+        {
+          "name": "mct-tree-expanded",
+          "value": "[]"
+        },
+        {
+          "name": "tcHistory",
+          "value": "{\"utc\":[{\"start\":1678740085436,\"end\":1678741885436}]}"
+        },
+        {
+          "name": "mct-recent-objects",
+          "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1678741896803,\"location\":\"mine\",\"created\":1678741890983,\"persisted\":1678741896803},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741890986,\"created\":1678741885545,\"persisted\":1678741890987},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"domainObject\":{\"identifier\":{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1678741896803,\"location\":\"mine\",\"created\":1678741890983,\"persisted\":1678741896803}},{\"objectPath\":[{\"identifier\":{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"},\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1678741896800,\"location\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"created\":1678741896800,\"persisted\":1678741896800},{\"identifier\":{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1678741896803,\"location\":\"mine\",\"created\":1678741890983,\"persisted\":1678741896803},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741890986,\"created\":1678741885545,\"persisted\":1678741890987},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/db9fb115-7a72-4c45-81a4-1f6021156b4e/4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"domainObject\":{\"identifier\":{\"key\":\"4c0b2c16-5f28-4906-abd3-befd16e5a77e\",\"namespace\":\"\"},\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1678741896800,\"location\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"created\":1678741896800,\"persisted\":1678741896800}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741890986,\"created\":1678741885545,\"persisted\":1678741890987},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine\",\"domainObject\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"db9fb115-7a72-4c45-81a4-1f6021156b4e\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1678741890986,\"created\":1678741885545,\"persisted\":1678741890987}}]"
+        }
+      ]
+    }
+  ]
+}
--- a/e2e/tests/framework/exampleTemplate.e2e.spec.js
+++ b/e2e/tests/framework/exampleTemplate.e2e.spec.js
@ -117,6 +117,35 @@ test.describe('Renaming Timer Object', () => {
  });
 });

+/**
+ * The next most important concept in our testing is working with telemetry objects. Telemetry is at the core of Open MCT
+ * and we have developed a great pattern for working with it.
+ */
+test.describe('Advanced: Working with telemetry objects', () => {
+  let displayLayout;
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Create a Display Layout with a meaningful name
+    displayLayout = await createDomainObjectWithDefaults(page, {
+      type: 'Display Layout',
+      name: 'Display Layout with Embedded SWG'
+    });
+    // Create Telemetry object within the parent object created above
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Telemetry',
+      parent: displayLayout.uuid //reference the display layout in the creation process
+    });
+  });
+  test('Can directly navigate to a Display Layout with embedded telemetry', async ({ page }) => {
+    //Now you can directly navigate to the displayLayout created in the beforeEach with the embedded telemetry
+    await page.goto(displayLayout.url);
+    //Expect the created Telemetry Object to be visible when directly navigating to the displayLayout
+    await expect(page.getByTitle('Sine')).toBeVisible();
+  });
+});
+
 /**
 * Structure:
 * Custom functions should be declared last.
--- a/e2e/tests/framework/generateLocalStorageData.e2e.spec.js
+++ b/e2e/tests/framework/generateLocalStorageData.e2e.spec.js
@ -0,0 +1,260 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/* global __dirname */
+/**
+ * This test suite is dedicated to generating LocalStorage via Session Storage to be used
+ * in some visual test suites like controlledClock.visual.spec.js. This suite should run to completion
+ * and generate an artifact in ./e2e/test-data/<name>_storage.json . This will run
+ * on every commit to ensure that this object still loads into tests correctly and will retain the
+ * *.e2e.spec.js suffix.
+ *
+ * TODO: Provide additional validation of object properties as it grows.
+ * Verification of object properties happens in this file before the test-data is generated,
+ * and is additionally verified in the validation test suites below.
+ */
+
+const { test, expect } = require('../../pluginFixtures.js');
+const {
+  createDomainObjectWithDefaults,
+  createExampleTelemetryObject,
+  selectInspectorTab
+} = require('../../appActions.js');
+const { MISSION_TIME } = require('../../constants.js');
+const path = require('path');
+
+const overlayPlotName = 'Overlay Plot with Telemetry Object';
+
+test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
+  test.use({
+    clockOptions: {
+      now: MISSION_TIME,
+      shouldAdvanceTime: true
+    }
+  });
+
+  test.beforeEach(async ({ page }) => {
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+
+  // TODO: Visual test for the generated object here
+  // - Move to using appActions to create the overlay plot
+  //   and embedded standard telemetry object
+  test('Generate Overlay Plot with Telemetry Object', async ({ page, context }) => {
+    // Create Overlay Plot
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot',
+      name: overlayPlotName
+    });
+
+    // Create Telemetry Object
+    const exampleTelemetry = await createExampleTelemetryObject(page);
+
+    // Make Link from Telemetry Object to Overlay Plot
+    await page.locator('button[title="More options"]').click();
+
+    // Select 'Create Link' from dropdown
+    await page.getByRole('menuitem', { name: ' Create Link' }).click();
+
+    // Search and Select for overlay Plot within Create Modal
+    await page.getByRole('dialog').getByRole('searchbox', { name: 'Search Input' }).click();
+    await page
+      .getByRole('dialog')
+      .getByRole('searchbox', { name: 'Search Input' })
+      .fill(overlayPlot.name);
+    await page
+      .getByRole('treeitem', { name: new RegExp(overlayPlot.name) })
+      .locator('a')
+      .click();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    await page.goto(overlayPlot.url);
+
+    // TODO: Flesh Out Assertions against created Objects
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(overlayPlotName);
+    await selectInspectorTab(page, 'Config');
+    await page
+      .getByRole('list', { name: 'Plot Series Properties' })
+      .locator('span')
+      .first()
+      .click();
+
+    // TODO: Modify the Overlay Plot to use fixed Scaling
+    // TODO: Verify Autoscaling.
+
+    // TODO: Fix accessibility of Plot Series Properties tables
+    // Assert that the Plot Series properties have the correct values
+    await expect(
+      page.locator('[role=cell]:has-text("Value")~[role=cell]:has-text("sin")')
+    ).toBeVisible();
+    await expect(
+      page.locator(
+        '[role=cell]:has-text("Line Method")~[role=cell]:has-text("Linear interpolation")'
+      )
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Markers")~[role=cell]:has-text("Point: 2px")')
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Alarm Markers")~[role=cell]:has-text("Enabled")')
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Limit Lines")~[role=cell]:has-text("Disabled")')
+    ).toBeVisible();
+
+    await page.goto(exampleTelemetry.url);
+    await selectInspectorTab(page, 'Properties');
+
+    // TODO: assert Example Telemetry property values
+    // await page.goto(exampleTelemetry.url);
+
+    // Save localStorage for future test execution
+    await context.storageState({
+      path: path.join(__dirname, '../../../e2e/test-data/overlay_plot_storage.json')
+    });
+  });
+  // TODO: Merge this with previous test. Edit object created in previous test.
+  test('Generate Overlay Plot with 5s Delay', async ({ page, context }) => {
+    // add overlay plot with defaults
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot',
+      name: 'Overlay Plot with 5s Delay'
+    });
+
+    const swgWith5sDelay = await createExampleTelemetryObject(page, overlayPlot.uuid);
+
+    await page.goto(swgWith5sDelay.url);
+    await page.getByTitle('More options').click();
+    await page.getByRole('menuitem', { name: ' Edit Properties...' }).click();
+
+    //Edit Example Telemetry Object to include 5s loading Delay
+    await page.locator('[aria-label="Loading Delay \\(ms\\)"]').fill('5000');
+
+    await Promise.all([
+      page.waitForNavigation(),
+      page.locator('text=OK').click(),
+      //Wait for Save Banner to appear
+      page.waitForSelector('.c-message-banner__message')
+    ]);
+
+    // focus the overlay plot
+    await page.goto(overlayPlot.url);
+
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(overlayPlot.name);
+
+    // Clear Recently Viewed
+    await page.getByRole('button', { name: 'Clear Recently Viewed' }).click();
+    await page.getByRole('button', { name: 'OK' }).click();
+    //Save localStorage for future test execution
+    await context.storageState({
+      path: path.join(__dirname, '../../../e2e/test-data/overlay_plot_with_delay_storage.json')
+    });
+  });
+});
+
+test.describe('Validate Overlay Plot with Telemetry Object @localStorage @generatedata', () => {
+  test.use({
+    storageState: path.join(__dirname, '../../../e2e/test-data/overlay_plot_storage.json')
+  });
+  test('Validate Overlay Plot with Telemetry Object', async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    await page.locator('a').filter({ hasText: overlayPlotName }).click();
+    // TODO: Flesh Out Assertions against created Objects
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(overlayPlotName);
+    await selectInspectorTab(page, 'Config');
+    await page
+      .getByRole('list', { name: 'Plot Series Properties' })
+      .locator('span')
+      .first()
+      .click();
+
+    // TODO: Modify the Overlay Plot to use fixed Scaling
+    // TODO: Verify Autoscaling.
+
+    // TODO: Fix accessibility of Plot Series Properties tables
+    // Assert that the Plot Series properties have the correct values
+    await expect(
+      page.locator('[role=cell]:has-text("Value")~[role=cell]:has-text("sin")')
+    ).toBeVisible();
+    await expect(
+      page.locator(
+        '[role=cell]:has-text("Line Method")~[role=cell]:has-text("Linear interpolation")'
+      )
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Markers")~[role=cell]:has-text("Point: 2px")')
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Alarm Markers")~[role=cell]:has-text("Enabled")')
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Limit Lines")~[role=cell]:has-text("Disabled")')
+    ).toBeVisible();
+  });
+});
+
+test.describe('Validate Overlay Plot with 5s Delay Telemetry Object @localStorage @generatedata', () => {
+  test.use({
+    storageState: path.join(
+      __dirname,
+      '../../../e2e/test-data/overlay_plot_with_delay_storage.json'
+    )
+  });
+  test('Validate Overlay Plot with Telemetry Object', async ({ page }) => {
+    const plotName = 'Overlay Plot with 5s Delay';
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    await page.locator('a').filter({ hasText: plotName }).click();
+    // TODO: Flesh Out Assertions against created Objects
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(plotName);
+    await selectInspectorTab(page, 'Config');
+    await page
+      .getByRole('list', { name: 'Plot Series Properties' })
+      .locator('span')
+      .first()
+      .click();
+
+    // TODO: Modify the Overlay Plot to use fixed Scaling
+    // TODO: Verify Autoscaling.
+
+    // TODO: Fix accessibility of Plot Series Properties tables
+    // Assert that the Plot Series properties have the correct values
+    await expect(
+      page.locator('[role=cell]:has-text("Value")~[role=cell]:has-text("sin")')
+    ).toBeVisible();
+    await expect(
+      page.locator(
+        '[role=cell]:has-text("Line Method")~[role=cell]:has-text("Linear interpolation")'
+      )
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Markers")~[role=cell]:has-text("Point: 2px")')
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Alarm Markers")~[role=cell]:has-text("Enabled")')
+    ).toBeVisible();
+    await expect(
+      page.locator('[role=cell]:has-text("Limit Lines")~[role=cell]:has-text("Disabled")')
+    ).toBeVisible();
+  });
+});
--- a/e2e/tests/framework/generateVisualTestData.e2e.spec.js
+++ b/e2e/tests/framework/generateVisualTestData.e2e.spec.js
@ -1,64 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to generating LocalStorage via Session Storage to be used
-in some visual test suites like controlledClock.visual.spec.js. This suite should run to completion
-and generate an artifact named ./e2e/test-data/VisualTestData_storage.json . This will run
-on every Commit to ensure that this object still loads into tests correctly and will retain the
-.e2e.spec.js suffix.
-
-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 }) => {
-  //Go to baseURL
-  await page.goto('./', { waitUntil: 'domcontentloaded' });
-  const overlayPlot = await createDomainObjectWithDefaults(page, { type: 'Overlay Plot' });
-
-  // click create button
-  await page.locator('button:has-text("Create")').click();
-
-  // add sine wave generator with defaults
-  await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
-
-  //Add a 5000 ms Delay
-  await page.locator('[aria-label="Loading Delay \\(ms\\)"]').fill('5000');
-
-  await Promise.all([
-    page.waitForNavigation(),
-    page.locator('button:has-text("OK")').click(),
-    //Wait for Save Banner to appear
-    page.waitForSelector('.c-message-banner__message')
-  ]);
-
-  // focus the overlay plot
-  await page.goto(overlayPlot.url);
-
-  await expect(page.locator('.l-browse-bar__object-name')).toContainText(overlayPlot.name);
-  //Save localStorage for future test execution
-  await context.storageState({ path: './e2e/test-data/VisualTestData_storage.json' });
-});
--- a/e2e/tests/framework/testData.e2e.spec.js
+++ b/e2e/tests/framework/testData.e2e.spec.js
@ -1,35 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
- * This test suite template is to be used when verifying Test Data files found in /e2e/test-data/
- */
-
-const { test } = require('../../baseFixtures');
-
-test.describe('recycled_local_storage @localStorage', () => {
-  //We may want to do some additional level of verification of this file. For now, we just verify that it exists and can be used in a test suite.
-  test.use({ storageState: './e2e/test-data/recycled_local_storage.json' });
-  test('Can use recycled_local_storage file', async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-});
--- a/e2e/tests/functional/plugins/displayLayout/displayLayout.e2e.spec.js
+++ b/e2e/tests/functional/plugins/displayLayout/displayLayout.e2e.spec.js
@ -260,6 +260,7 @@ test.describe('Display Layout', () => {
  test('When multiple plots are contained in a layout, we only ask for annotations once @couchdb', async ({
    page
  }) => {
+    await setFixedTimeMode(page);
    // Create another Sine Wave Generator
    const anotherSineWaveObject = await createDomainObjectWithDefaults(page, {
      type: 'Sine Wave Generator'
@ -316,10 +317,20 @@ test.describe('Display Layout', () => {

    // wait for annotations requests to be batched and requested
    await page.waitForLoadState('networkidle');
-
    // Network requests for the composite telemetry with multiple items should be:
    // 1.  a single batched request for annotations
    expect(networkRequests.length).toBe(1);
+
+    await setRealTimeMode(page);
+    networkRequests = [];
+
+    await page.reload();
+
+    // wait for annotations to not load (if we have any, we've got a problem)
+    await page.waitForLoadState('networkidle');
+
+    // In real time mode, we don't fetch annotations at all
+    expect(networkRequests.length).toBe(0);
  });
 });

--- a/e2e/tests/functional/plugins/flexibleLayout/flexibleLayout.e2e.spec.js
+++ b/e2e/tests/functional/plugins/flexibleLayout/flexibleLayout.e2e.spec.js
@ -29,6 +29,10 @@ const {
 test.describe('Flexible Layout', () => {
  let sineWaveObject;
  let clockObject;
+  let treePane;
+  let sineWaveGeneratorTreeItem;
+  let clockTreeItem;
+  let flexibleLayout;
  test.beforeEach(async ({ page }) => {
    await page.goto('./', { waitUntil: 'domcontentloaded' });

@ -41,23 +45,27 @@ test.describe('Flexible Layout', () => {
    clockObject = await createDomainObjectWithDefaults(page, {
      type: 'Clock'
    });
+
+    // Create a Flexible Layout
+    flexibleLayout = await createDomainObjectWithDefaults(page, {
+      type: 'Flexible Layout'
+    });
+
+    // Define the Sine Wave Generator and Clock tree items
+    treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
+    sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: new RegExp(sineWaveObject.name)
+    });
+    clockTreeItem = treePane.getByRole('treeitem', {
+      name: new RegExp(clockObject.name)
+    });
  });
  test('panes have the appropriate draggable attribute while in Edit and Browse modes', async ({
    page
  }) => {
-    const treePane = page.getByRole('tree', {
-      name: 'Main Tree'
-    });
-    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-      name: new RegExp(sineWaveObject.name)
-    });
-    const clockTreeItem = treePane.getByRole('treeitem', {
-      name: new RegExp(clockObject.name)
-    });
-    // Create a Flexible Layout
-    await createDomainObjectWithDefaults(page, {
-      type: 'Flexible Layout'
-    });
+    await page.goto(flexibleLayout.url);
    // Edit Flexible Layout
    await page.locator('[title="Edit"]').click();

@ -78,19 +86,79 @@ test.describe('Flexible Layout', () => {
    dragWrapper = page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
    await expect(dragWrapper).toHaveAttribute('draggable', 'false');
  });
+  test('changing toolbar settings in edit mode is immediately reflected and persists upon save', async ({
+    page
+  }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6942'
+    });
+
+    await page.goto(flexibleLayout.url);
+
+    // Expand the 'My Items' folder in the left tree
+    await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
+    // Add the Sine Wave Generator and Clock to the Flexible Layout
+    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
+    await clockTreeItem.dragTo(page.locator('.c-fl__container.is-empty'));
+
+    // Click on the first frame to select it
+    await page.locator('.c-fl-container__frame').first().click();
+    await expect(page.locator('.c-fl-container__frame > .c-frame').first()).toHaveAttribute(
+      's-selected',
+      ''
+    );
+
+    // Assert the toolbar is visible
+    await expect(page.locator('.c-toolbar')).toBeInViewport();
+
+    // Assert the layout is in columns orientation
+    expect(await page.locator('.c-fl--rows').count()).toEqual(0);
+
+    // Change the layout to rows orientation
+    await page.getByTitle('Columns layout').click();
+
+    // Assert the layout is in rows orientation
+    expect(await page.locator('.c-fl--rows').count()).toBeGreaterThan(0);
+
+    // Assert the frame of the first item is visible
+    await expect(page.locator('.c-so-view').first()).not.toHaveClass(/c-so-view--no-frame/);
+
+    // Hide the frame of the first item
+    await page.getByTitle('Frame visible').click();
+
+    // Assert the frame is hidden
+    await expect(page.locator('.c-so-view').first()).toHaveClass(/c-so-view--no-frame/);
+
+    // Assert there are 2 containers
+    expect(await page.locator('.c-fl-container').count()).toEqual(2);
+
+    // Add a container
+    await page.getByTitle('Add Container').click();
+
+    // Assert there are 3 containers
+    expect(await page.locator('.c-fl-container').count()).toEqual(3);
+
+    // Save Flexible Layout
+    await page.locator('button[title="Save"]').click();
+    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+
+    // Nav away and back
+    await page.goto(sineWaveObject.url);
+    await page.goto(flexibleLayout.url);
+
+    // Wait for the first frame to be visible so we know the layout has loaded
+    await expect(page.locator('.c-fl-container').nth(0)).toBeInViewport();
+
+    // Assert the settings have persisted
+    expect(await page.locator('.c-fl-container').count()).toEqual(3);
+    expect(await page.locator('.c-fl--rows').count()).toBeGreaterThan(0);
+    await expect(page.locator('.c-so-view').first()).toHaveClass(/c-so-view--no-frame/);
+  });
  test('items in a flexible layout can be removed with object tree context menu when viewing the flexible layout', async ({
    page
  }) => {
-    const treePane = page.getByRole('tree', {
-      name: 'Main Tree'
-    });
-    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-      name: new RegExp(sineWaveObject.name)
-    });
-    // Create a Display Layout
-    await createDomainObjectWithDefaults(page, {
-      type: 'Flexible Layout'
-    });
+    await page.goto(flexibleLayout.url);
    // Edit Flexible Layout
    await page.locator('[title="Edit"]').click();

@ -121,17 +189,7 @@ test.describe('Flexible Layout', () => {
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/3117'
    });
-    const treePane = page.getByRole('tree', {
-      name: 'Main Tree'
-    });
-    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
-      name: new RegExp(sineWaveObject.name)
-    });
-
-    // Create a Flexible Layout
-    const flexibleLayout = await createDomainObjectWithDefaults(page, {
-      type: 'Flexible Layout'
-    });
+    await page.goto(flexibleLayout.url);
    // Edit Flexible Layout
    await page.locator('[title="Edit"]').click();

@ -167,19 +225,13 @@ test.describe('Flexible Layout', () => {
    const exampleImageryObject = await createDomainObjectWithDefaults(page, {
      type: 'Example Imagery'
    });
-    // Create a Flexible Layout
-    await createDomainObjectWithDefaults(page, {
-      type: 'Flexible Layout'
-    });
-    // Edit Display Layout
+
+    await page.goto(flexibleLayout.url);
+    // Edit Flexible Layout
    await page.locator('[title="Edit"]').click();

    // Expand the 'My Items' folder in the left tree
    await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
-    // Add the Sine Wave Generator to the Flexible Layout and save changes
-    const treePane = page.getByRole('tree', {
-      name: 'Main Tree'
-    });
    const exampleImageryTreeItem = treePane.getByRole('treeitem', {
      name: new RegExp(exampleImageryObject.name)
    });
--- a/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
+++ b/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
@ -79,25 +79,25 @@ test.describe('Example Imagery Object', () => {
    // Test independent fixed time with global fixed time
    // flip on independent time conductor
    await page.getByRole('switch', { name: 'Enable Independent Time Conductor' }).click();
+
+    // Adding in delay to address flakiness of ITC test-- button event handlers not registering in time
+    await expect(page.locator('#independentTCToggle')).toBeChecked();
+    await expect(page.locator('.c-compact-tc').first()).toBeVisible();
+
    await page.getByRole('button', { name: 'Independent Time Conductor Settings' }).click();
-    await page.getByRole('textbox', { name: 'Start date' }).fill('');
+
    await page.getByRole('textbox', { name: 'Start date' }).fill('2021-12-30');
    await page.keyboard.press('Tab');
-    await page.getByRole('textbox', { name: 'Start time' }).fill('');
-    await page.getByRole('textbox', { name: 'Start time' }).type('01:01:00');
+    await page.getByRole('textbox', { name: 'Start time' }).fill('01:01:00');
    await page.keyboard.press('Tab');
-    await page.getByRole('textbox', { name: 'End date' }).fill('');
-    await page.getByRole('textbox', { name: 'End date' }).type('2021-12-30');
+    await page.getByRole('textbox', { name: 'End date' }).fill('2021-12-30');
    await page.keyboard.press('Tab');
-    await page.getByRole('textbox', { name: 'End time' }).fill('');
-    await page.getByRole('textbox', { name: 'End time' }).type('01:11:00');
+    await page.getByRole('textbox', { name: 'End time' }).fill('01:11:00');
    await page.keyboard.press('Tab');
    await page.keyboard.press('Enter');
-    // expect(await page.getByRole('button', { name: 'Submit time bounds' }).isEnabled()).toBe(true);
-    // await page.getByRole('button', { name: 'Submit time bounds' }).click();

    // check image date
-    await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();
+    await expect(page.getByText('2021-12-30 01:01:00.000Z').first()).toBeVisible();

    // flip it off
    await page.getByRole('switch', { name: 'Disable Independent Time Conductor' }).click();
@ -106,9 +106,12 @@ test.describe('Example Imagery Object', () => {

    // Test independent fixed time with global realtime
    await setRealTimeMode(page);
+    await expect(
+      page.getByRole('switch', { name: 'Enable Independent Time Conductor' })
+    ).toBeEnabled();
    await page.getByRole('switch', { name: 'Enable Independent Time Conductor' }).click();
    // check image date to be in the past
-    await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();
+    await expect(page.getByText('2021-12-30 01:01:00.000Z').first()).toBeVisible();
    // flip it off
    await page.getByRole('switch', { name: 'Disable Independent Time Conductor' }).click();
    // timestamp shouldn't be in the past anymore
--- a/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
@ -19,18 +19,18 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/* global __dirname */
+
 const { test, expect, streamToString } = require('../../../../pluginFixtures');
+const { openObjectTreeContextMenu } = require('../../../../appActions');
 const {
-  openObjectTreeContextMenu,
-  createDomainObjectWithDefaults
-} = require('../../../../appActions');
-const path = require('path');
-const nbUtils = require('../../../../helper/notebookUtils');
+  lockPage,
+  dragAndDropEmbed,
+  enterTextEntry,
+  startAndAddRestrictedNotebookObject
+} = require('../../../../helper/notebookUtils');

 const TEST_TEXT = 'Testing text for entries.';
 const TEST_TEXT_NAME = 'Test Page';
-const CUSTOM_NAME = 'CUSTOM_NAME';

 test.describe('Restricted Notebook', () => {
  let notebook;
@ -68,7 +68,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, TEST_TEXT);

    const commitButton = page.locator('button:has-text("Commit Entries")');
    expect(await commitButton.count()).toEqual(1);
@ -79,7 +79,7 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
  let notebook;
  test.beforeEach(async ({ page }) => {
    notebook = await startAndAddRestrictedNotebookObject(page);
-    await nbUtils.enterTextEntry(page, TEST_TEXT);
+    await enterTextEntry(page, TEST_TEXT);
    await lockPage(page);

    // open sidebar
@ -125,7 +125,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, TEST_TEXT);

    // expect new page to be lockable
    const commitButton = page.getByRole('button', { name: ' Commit Entries' });
@ -136,7 +136,7 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
    // Delete the page
    await page.getByRole('menuitem', { name: 'Delete Page' }).click();
    // Click OK button
-    await page.getByRole('button', { name: 'Ok' }).click();
+    await page.getByRole('button', { name: 'Ok', exact: true }).click();

    // deleted page, should no longer exist
    const deletedPageElement = page.getByText(TEST_TEXT_NAME);
@ -147,12 +147,12 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
 test.describe('Restricted Notebook with a page locked and with an embed @addInit', () => {
  test.beforeEach(async ({ page }) => {
    const notebook = await startAndAddRestrictedNotebookObject(page);
-    await nbUtils.dragAndDropEmbed(page, notebook);
+    await dragAndDropEmbed(page, notebook);
  });

  test('Allows embeds to be deleted if page unlocked @addInit', async ({ page }) => {
-    // Click .c-ne__embed__name .c-popup-menu-button
-    await page.locator('.c-ne__embed__name .c-icon-button').click(); // embed popup menu
+    // Click embed popup menu
+    await page.locator('.c-ne__embed__name .c-icon-button').click();

    const embedMenu = page.locator('body >> .c-menu');
    await expect(embedMenu).toContainText('Remove This Embed');
@ -160,8 +160,8 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit

  test('Disallows embeds to be deleted if page locked @addInit', async ({ page }) => {
    await lockPage(page);
-    // Click .c-ne__embed__name .c-popup-menu-button
-    await page.locator('.c-ne__embed__name .c-icon-button').click(); // embed popup menu
+    // Click embed popup menu
+    await page.locator('.c-ne__embed__name .c-icon-button').click();

    const embedMenu = page.locator('body >> .c-menu');
    await expect(embedMenu).not.toContainText('Remove This Embed');
@ -174,7 +174,7 @@ test.describe('can export restricted notebook as text', () => {
  });

  test('basic functionality ', async ({ page }) => {
-    await nbUtils.enterTextEntry(page, `Foo bar entry`);
+    await enterTextEntry(page, `Foo bar entry`);
    // Click on 3 Dot Menu
    await page.locator('button[title="More options"]').click();
    const downloadPromise = page.waitForEvent('download');
@ -182,6 +182,8 @@ test.describe('can export restricted notebook as text', () => {
    await page.getByRole('menuitem', { name: /Export Notebook as Text/ }).click();

    await page.getByRole('button', { name: 'Save' }).click();
+
+    //Verify exported text as a stream of text instead of a file read from the filesystem
    const download = await downloadPromise;
    const readStream = await download.createReadStream();
    const exportedText = await streamToString(readStream);
@ -193,26 +195,3 @@ test.describe('can export restricted notebook as text', () => {
  test.fixme('can export all notebook tags', async ({ page }) => {});
  test.fixme('can export all notebook snapshots', async ({ page }) => {});
 });
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function startAndAddRestrictedNotebookObject(page) {
-  await page.addInitScript({
-    path: path.join(__dirname, '../../../../helper/', 'addInitRestrictedNotebook.js')
-  });
-  await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-  return createDomainObjectWithDefaults(page, { type: CUSTOM_NAME });
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function lockPage(page) {
-  const commitButton = page.locator('button:has-text("Commit Entries")');
-  await commitButton.click();
-
-  //Wait until Lock Banner is visible
-  await page.locator('text=Lock Page').click();
-}
--- a/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
@ -26,56 +26,11 @@ This test suite is dedicated to tests which verify notebook tag functionality.

 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults, selectInspectorTab } = require('../../../../appActions');
-const nbUtils = require('../../../../helper/notebookUtils');
-
-/**
- * Creates a notebook object and adds an entry.
- * @param {import('@playwright/test').Page} - page to load
- * @param {number} [iterations = 1] - the number of entries to create
- */
-async function createNotebookAndEntry(page, iterations = 1) {
-  const notebook = createDomainObjectWithDefaults(page, { type: 'Notebook' });
-
-  for (let iteration = 0; iteration < iterations; iteration++) {
-    await nbUtils.enterTextEntry(page, `Entry ${iteration}`);
-  }
-
-  return notebook;
-}
-
-/**
- * Creates a notebook object, adds an entry, and adds a tag.
- * @param {import('@playwright/test').Page} page
- * @param {number} [iterations = 1] - the number of entries (and tags) to create
- */
-async function createNotebookEntryAndTags(page, iterations = 1) {
-  const notebook = await createNotebookAndEntry(page, iterations);
-  await selectInspectorTab(page, 'Annotations');
-
-  for (let iteration = 0; iteration < iterations; iteration++) {
-    // Hover and click "Add Tag" button
-    // Hover is needed here to "slow down" the actions while running in headless mode
-    await page.locator(`[aria-label="Notebook Entry"] >> nth = ${iteration}`).click();
-    await page.hover(`button:has-text("Add Tag")`);
-    await page.locator(`button:has-text("Add Tag")`).click();
-
-    // Click inside the tag search input
-    await page.locator('[placeholder="Type to select tag"]').click();
-    // Select the "Driving" tag
-    await page.locator('[aria-label="Autocomplete Options"] >> text=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")`);
-    await page.locator(`button:has-text("Add Tag")`).click();
-    // Click inside the tag search input
-    await page.locator('[placeholder="Type to select tag"]').click();
-    // Select the "Science" tag
-    await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
-  }
-
-  return notebook;
-}
+const {
+  enterTextEntry,
+  createNotebookAndEntry,
+  createNotebookEntryAndTags
+} = require('../../../../helper/notebookUtils');

 test.describe('Tagging in Notebooks @addInit', () => {
  test.beforeEach(async ({ page }) => {
@ -112,7 +67,7 @@ test.describe('Tagging in Notebooks @addInit', () => {
    await createDomainObjectWithDefaults(page, { type: 'Notebook' });
    await selectInspectorTab(page, 'Annotations');

-    await nbUtils.enterTextEntry(page, '');
+    await enterTextEntry(page, '');
    await page.hover(`button:has-text("Add Tag")`);
    await page.locator(`button:has-text("Add Tag")`).click();

--- a/e2e/tests/functional/plugins/plot/tagging.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/tagging.e2e.spec.js
@ -29,10 +29,11 @@ const {
  createDomainObjectWithDefaults,
  setRealTimeMode,
  setFixedTimeMode,
-  waitForPlotsToRender
+  waitForPlotsToRender,
+  selectInspectorTab
 } = require('../../../../appActions');

-test.describe.fixme('Plot Tagging', () => {
+test.describe('Plot Tagging', () => {
  /**
   * Given a canvas and a set of points, tags the points on the canvas.
   * @param {import('@playwright/test').Page} page
@ -41,7 +42,7 @@ test.describe.fixme('Plot Tagging', () => {
   * @param {Number} yEnd a telemetry item with a plot
   * @returns {Promise}
   */
-  async function createTags({ page, canvas, xEnd, yEnd }) {
+  async function createTags({ page, canvas, xEnd = 700, yEnd = 520 }) {
    await canvas.hover({ trial: true });

    //Alt+Shift Drag Start to select some points to tag
@ -90,15 +91,17 @@ test.describe.fixme('Plot Tagging', () => {
    await expect(page.getByText('No tags to display for this item')).toBeVisible();

    const canvas = page.locator('canvas').nth(1);
+    //Wait for canvas to stabilize.
+    await waitForPlotsToRender(page);

-    //Wait for canvas to stablize.
+    await expect(canvas).toBeInViewport();
    await canvas.hover({ trial: true });

    // click on the tagged plot point
    await canvas.click({
      position: {
-        x: 325,
-        y: 377
+        x: 100,
+        y: 100
      }
    });

@ -146,7 +149,10 @@ test.describe.fixme('Plot Tagging', () => {
    // wait for plots to load
    await waitForPlotsToRender(page);

-    await page.getByText('Annotations').click();
+    await expect(page.getByRole('tab', { name: 'Annotations' })).not.toHaveClass(/is-current/);
+    await selectInspectorTab(page, 'Annotations');
+    await expect(page.getByRole('tab', { name: 'Annotations' })).toHaveClass(/is-current/);
+
    await expect(page.getByText('No tags to display for this item')).toBeVisible();

    const canvas = page.locator('canvas').nth(1);
@ -171,8 +177,6 @@ test.describe.fixme('Plot Tagging', () => {
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/6822'
    });
-    //Test.slow decorator is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
-    test.slow();

    const overlayPlot = await createDomainObjectWithDefaults(page, {
      type: 'Overlay Plot'
@ -181,13 +185,19 @@ test.describe.fixme('Plot Tagging', () => {
    const alphaSineWave = await createDomainObjectWithDefaults(page, {
      type: 'Sine Wave Generator',
      name: 'Alpha Sine Wave',
-      parent: overlayPlot.uuid
+      parent: overlayPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.01'
+      }
    });

    await createDomainObjectWithDefaults(page, {
      type: 'Sine Wave Generator',
      name: 'Beta Sine Wave',
-      parent: overlayPlot.uuid
+      parent: overlayPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.02'
+      }
    });

    await page.goto(overlayPlot.url);
@ -200,9 +210,7 @@ test.describe.fixme('Plot Tagging', () => {

    await createTags({
      page,
-      canvas,
-      xEnd: 700,
-      yEnd: 480
+      canvas
    });

    await setFixedTimeMode(page);
@ -232,15 +240,15 @@ test.describe.fixme('Plot Tagging', () => {

  test('Tags work with Plot View of telemetry items', async ({ page }) => {
    await createDomainObjectWithDefaults(page, {
-      type: 'Sine Wave Generator'
+      type: 'Sine Wave Generator',
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.01'
+      }
    });
-
    const canvas = page.locator('canvas').nth(1);
    await createTags({
      page,
-      canvas,
-      xEnd: 700,
-      yEnd: 480
+      canvas
    });
    await basicTagsTests(page);
  });
@ -253,13 +261,19 @@ test.describe.fixme('Plot Tagging', () => {
    const alphaSineWave = await createDomainObjectWithDefaults(page, {
      type: 'Sine Wave Generator',
      name: 'Alpha Sine Wave',
-      parent: stackedPlot.uuid
+      parent: stackedPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.01'
+      }
    });

    await createDomainObjectWithDefaults(page, {
      type: 'Sine Wave Generator',
      name: 'Beta Sine Wave',
-      parent: stackedPlot.uuid
+      parent: stackedPlot.uuid,
+      customParameters: {
+        '[aria-label="Data Rate (hz)"]': '0.02'
+      }
    });

    await page.goto(stackedPlot.url);
@ -270,7 +284,7 @@ test.describe.fixme('Plot Tagging', () => {
      page,
      canvas,
      xEnd: 700,
-      yEnd: 215
+      yEnd: 240
    });
    await basicTagsTests(page);
    await testTelemetryItem(page, alphaSineWave);
--- a/e2e/tests/functional/plugins/timer/timer.e2e.spec.js
+++ b/e2e/tests/functional/plugins/timer/timer.e2e.spec.js
@ -25,12 +25,15 @@ const {
  openObjectTreeContextMenu,
  createDomainObjectWithDefaults
 } = require('../../../../appActions');
+import { MISSION_TIME } from '../../../../constants';

 test.describe('Timer', () => {
  let timer;
+
  test.beforeEach(async ({ page }) => {
    await page.goto('./', { waitUntil: 'domcontentloaded' });
    timer = await createDomainObjectWithDefaults(page, { type: 'timer' });
+    await assertTimerElements(page, timer);
  });

  test('Can perform actions on the Timer', async ({ page }) => {
@ -63,6 +66,70 @@ test.describe('Timer', () => {
  });
 });

+test.describe('Timer with target date', () => {
+  let timer;
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+    timer = await createDomainObjectWithDefaults(page, { type: 'timer' });
+    await assertTimerElements(page, timer);
+  });
+
+  // Override clock
+  test.use({
+    clockOptions: {
+      now: MISSION_TIME,
+      shouldAdvanceTime: true
+    }
+  });
+
+  test('Can count down to a target date', async ({ page }) => {
+    // Set the target date to 2024-11-24 03:30:00
+    await page.getByTitle('More options').click();
+    await page.getByRole('menuitem', { name: /Edit Properties.../ }).click();
+    await page.getByPlaceholder('YYYY-MM-DD').fill('2024-11-24');
+    await page.locator('input[name="hour"]').fill('3');
+    await page.locator('input[name="min"]').fill('30');
+    await page.locator('input[name="sec"]').fill('00');
+    await page.getByLabel('Save').click();
+
+    // Get the current timer seconds value
+    const timerSecValue = (await page.locator('.c-timer__value').innerText()).split(':').at(-1);
+    await expect(page.locator('.c-timer__direction')).toHaveClass(/icon-minus/);
+
+    // Wait for the timer to count down and assert
+    await expect
+      .poll(async () => {
+        const newTimerValue = (await page.locator('.c-timer__value').innerText()).split(':').at(-1);
+        return Number(newTimerValue);
+      })
+      .toBeLessThan(Number(timerSecValue));
+  });
+
+  test('Can count up from a target date', async ({ page }) => {
+    // Set the target date to 2020-11-23 03:30:00
+    await page.getByTitle('More options').click();
+    await page.getByRole('menuitem', { name: /Edit Properties.../ }).click();
+    await page.getByPlaceholder('YYYY-MM-DD').fill('2020-11-23');
+    await page.locator('input[name="hour"]').fill('3');
+    await page.locator('input[name="min"]').fill('30');
+    await page.locator('input[name="sec"]').fill('00');
+    await page.getByLabel('Save').click();
+
+    // Get the current timer seconds value
+    const timerSecValue = (await page.locator('.c-timer__value').innerText()).split(':').at(-1);
+    await expect(page.locator('.c-timer__direction')).toHaveClass(/icon-plus/);
+
+    // Wait for the timer to count up and assert
+    await expect
+      .poll(async () => {
+        const newTimerValue = (await page.locator('.c-timer__value').innerText()).split(':').at(-1);
+        return Number(newTimerValue);
+      })
+      .toBeGreaterThan(Number(timerSecValue));
+  });
+});
+
 /**
 * Actions that can be performed on a timer from context menus.
 * @typedef {'Start' | 'Stop' | 'Pause' | 'Restart at 0'} TimerAction
@ -141,14 +208,17 @@ function buttonTitleFromAction(action) {
 * @param {TimerAction} action
 */
 async function assertTimerStateAfterAction(page, action) {
+  const timerValue = page.locator('.c-timer__value');
  let timerStateClass;
  switch (action) {
    case 'Start':
    case 'Restart at 0':
      timerStateClass = 'is-started';
+      expect(await timerValue.innerText()).toBe('0D 00:00:00');
      break;
    case 'Stop':
      timerStateClass = 'is-stopped';
+      expect(await timerValue.innerText()).toBe('--:--:--');
      break;
    case 'Pause':
      timerStateClass = 'is-paused';
@ -157,3 +227,25 @@ async function assertTimerStateAfterAction(page, action) {

  await expect.soft(page.locator('.c-timer')).toHaveClass(new RegExp(timerStateClass));
 }
+
+/**
+ * Assert that all the major components of a timer are present in the DOM.
+ * @param {import('@playwright/test').Page} page
+ * @param {import('../../../../appActions').CreatedObjectInfo} timer
+ */
+async function assertTimerElements(page, timer) {
+  const timerElement = page.locator('.c-timer');
+  const resetButton = page.getByRole('button', { name: 'Reset' });
+  const pausePlayButton = page
+    .getByRole('button', { name: 'Pause' })
+    .or(page.getByRole('button', { name: 'Start' }));
+  const timerDirectionIcon = page.locator('.c-timer__direction');
+  const timerValue = page.locator('.c-timer__value');
+
+  expect(await page.locator('.l-browse-bar__object-name').innerText()).toBe(timer.name);
+  expect(timerElement).toBeAttached();
+  expect(resetButton).toBeAttached();
+  expect(pausePlayButton).toBeAttached();
+  expect(timerDirectionIcon).toBeAttached();
+  expect(timerValue).toBeAttached();
+}
--- a/e2e/tests/functional/recentObjects.e2e.spec.js
+++ b/e2e/tests/functional/recentObjects.e2e.spec.js
@ -59,59 +59,57 @@ test.describe('Recent Objects', () => {
    await page.mouse.move(0, 100);
    await page.mouse.up();
  });
-  test.fixme(
-    'Navigated objects show up in recents, object renames and deletions are reflected',
-    async ({ page }) => {
-      test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/6818'
-      });
+  test('Navigated objects show up in recents, object renames and deletions are reflected', async ({
+    page
+  }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6818'
+    });

-      // Verify that both created objects appear in the list and are in the correct order
-      await assertInitialRecentObjectsListState();
+    // Verify that both created objects appear in the list and are in the correct order
+    await assertInitialRecentObjectsListState();

-      // Navigate to the folder by clicking on the main object name in the recent objects list item
-      await page.getByRole('listitem', { name: folderA.name }).getByText(folderA.name).click();
-      await page.waitForURL(`**/${folderA.uuid}?*`);
-      expect(recentObjectsList.getByRole('listitem').nth(0).getByText(folderA.name)).toBeTruthy();
+    // Navigate to the folder by clicking on the main object name in the recent objects list item
+    await page.getByRole('listitem', { name: folderA.name }).getByText(folderA.name).click();
+    await page.waitForURL(`**/${folderA.uuid}?*`);
+    expect(recentObjectsList.getByRole('listitem').nth(0).getByText(folderA.name)).toBeTruthy();

-      // Rename
-      folderA.name = `${folderA.name}-NEW!`;
-      await page.locator('.l-browse-bar__object-name').fill('');
-      await page.locator('.l-browse-bar__object-name').fill(folderA.name);
-      await page.keyboard.press('Enter');
+    // Rename
+    folderA.name = `${folderA.name}-NEW!`;
+    await page.locator('.l-browse-bar__object-name').fill('');
+    await page.locator('.l-browse-bar__object-name').fill(folderA.name);
+    await page.keyboard.press('Enter');

-      // Verify rename has been applied in recent objects list item and objects paths
-      expect(
-        await page
-          .getByRole('navigation', {
-            name: clock.name
-          })
-          .locator('a')
-          .filter({
-            hasText: folderA.name
-          })
-          .count()
-      ).toBeGreaterThan(0);
-      expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeTruthy();
-
-      // Delete
-      await page.click('button[title="Show selected item in tree"]');
-      // Delete the folder via the left tree pane treeitem context menu
+    // Verify rename has been applied in recent objects list item and objects paths
+    expect(
      await page
-        .getByRole('treeitem', { name: new RegExp(folderA.name) })
+        .getByRole('navigation', {
+          name: clock.name
+        })
        .locator('a')
-        .click({
-          button: 'right'
-        });
-      await page.getByRole('menuitem', { name: /Remove/ }).click();
-      await page.getByRole('button', { name: 'OK' }).click();
+        .filter({
+          hasText: folderA.name
+        })
+        .count()
+    ).toBeGreaterThan(0);
+    expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeTruthy();

-      // Verify that the folder and clock are no longer in the recent objects list
-      await expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeHidden();
-      await expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeHidden();
-    }
-  );
+    await page.click('button[title="Show selected item in tree"]');
+    // Delete the folder via the left tree pane treeitem context menu
+    await page
+      .getByRole('treeitem', { name: new RegExp(folderA.name) })
+      .locator('a')
+      .click({
+        button: 'right'
+      });
+    await page.getByRole('menuitem', { name: /Remove/ }).click();
+    await page.getByRole('button', { name: 'OK' }).click();
+
+    // Verify that the folder and clock are no longer in the recent objects list
+    await expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeHidden();
+    await expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeHidden();
+  });

  test('Clicking on an object in the path of a recent object navigates to the object', async ({
    page,
--- a/e2e/tests/functional/renaming.e2e.spec.js
+++ b/e2e/tests/functional/renaming.e2e.spec.js
@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+This test suite is dedicated to tests for renaming objects, and their global application effects.
+*/
+
+const { test, expect } = require('../../baseFixtures.js');
+const {
+  createDomainObjectWithDefaults,
+  renameObjectFromContextMenu
+} = require('../../appActions.js');
+
+test.describe('Renaming objects', () => {
+  test.beforeEach(async ({ page }) => {
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'networkidle' });
+  });
+
+  test('When renaming objects, the browse bar and various components all update', async ({
+    page
+  }) => {
+    const folder = await createDomainObjectWithDefaults(page, {
+      type: 'Folder'
+    });
+    // Create a new 'Clock' object with default settings
+    const clock = await createDomainObjectWithDefaults(page, {
+      type: 'Clock',
+      parent: folder.uuid
+    });
+
+    // Rename
+    clock.name = `${clock.name}-NEW!`;
+    await renameObjectFromContextMenu(page, clock.url, clock.name);
+    // check inspector for new name
+    const titleValue = await page
+      .getByLabel('Title inspector properties')
+      .getByLabel('inspector property value')
+      .textContent();
+    expect(titleValue).toBe(clock.name);
+    // check browse bar for new name
+    await expect(page.locator(`.l-browse-bar >> text=${clock.name}`)).toBeVisible();
+    // check tree item for new name
+    await expect(
+      page.getByRole('listitem', {
+        name: clock.name
+      })
+    ).toBeVisible();
+    // check recent objects for new name
+    await expect(
+      page.getByRole('navigation', {
+        name: clock.name
+      })
+    ).toBeVisible();
+    // check title for new name
+    const title = await page.title();
+    expect(title).toBe(clock.name);
+  });
+});
--- a/e2e/tests/functional/tree.e2e.spec.js
+++ b/e2e/tests/functional/tree.e2e.spec.js
@ -23,7 +23,7 @@
 const { test, expect } = require('../../pluginFixtures.js');
 const {
  createDomainObjectWithDefaults,
-  openObjectTreeContextMenu
+  renameObjectFromContextMenu
 } = require('../../appActions.js');

 test.describe('Main Tree', () => {
@ -249,18 +249,3 @@ async function expandTreePaneItemByName(page, name) {
  });
  await treeItem.locator('.c-disclosure-triangle').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"]');
-}
--- a/e2e/tests/performance/contract/imagery.contract.perf.spec.js
+++ b/e2e/tests/performance/contract/imagery.contract.perf.spec.js
--- a/e2e/tests/performance/contract/notebook.contract.perf.spec.js
+++ b/e2e/tests/performance/contract/notebook.contract.perf.spec.js
--- a/e2e/tests/performance/memleak-imagery.perf.spec.js
+++ b/e2e/tests/performance/memleak-imagery.perf.spec.js
@ -1,121 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is an initial example for memory leak testing using performance. This configuration and execution must
-be kept separate from the traditional performance measurements to avoid any "observer" effects associated with tracing
-or profiling playwright and/or the browser.
-
-Based on a pattern identified in https://github.com/trentmwillis/devtools-protocol-demos/blob/master/testing-demos/memory-leak-by-heap.js
-and https://github.com/paulirish/automated-chrome-profiling/issues/3
-
-Best path forward: https://github.com/cowchimp/headless-devtools/blob/master/src/Memory/example.js
-
-*/
-
-const { test, expect } = require('@playwright/test');
-
-const filePath = 'e2e/test-data/PerformanceDisplayLayout.json';
-
-// eslint-disable-next-line playwright/no-skipped-test
-test.describe.skip('Memory Performance tests', () => {
-  test.beforeEach(async ({ page, browser }, testInfo) => {
-    // Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    // Click a:has-text("My Items")
-    await page.locator('a:has-text("My Items")').click({
-      button: 'right'
-    });
-
-    // Click text=Import from JSON
-    await page.locator('text=Import from JSON').click();
-
-    // Upload Performance Display Layout.json
-    await page.setInputFiles('#fileElem', filePath);
-
-    // Click text=OK
-    await page.locator('text=OK').click();
-
-    await expect(
-      page.locator('a:has-text("Performance Display Layout Display Layout")')
-    ).toBeVisible();
-  });
-
-  test('Embedded View Large for Imagery is performant in Fixed Time', async ({ page, browser }) => {
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    // To to Search Available after Launch
-    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
-    // Fill Search input
-    await page
-      .locator('[aria-label="OpenMCT Search"] input[type="search"]')
-      .fill('Performance Display Layout');
-    //Search Result Appears and is clicked
-    await Promise.all([
-      page.waitForNavigation(),
-      page.locator('a:has-text("Performance Display Layout")').first().click()
-    ]);
-
-    //Time to Example Imagery Frame loads within Display Layout
-    await page.waitForSelector('.c-imagery__main-image__bg', { state: 'visible' });
-    //Time to Example Imagery object loads
-    await page.waitForSelector('.c-imagery__main-image__background-image', { state: 'visible' });
-
-    const client = await page.context().newCDPSession(page);
-    await client.send('HeapProfiler.enable');
-    await client.send('HeapProfiler.startSampling');
-    // await client.send('HeapProfiler.collectGarbage');
-    await client.send('Performance.enable');
-
-    let performanceMetricsBefore = await client.send('Performance.getMetrics');
-    console.log(performanceMetricsBefore.metrics);
-
-    //await client.send('Performance.disable');
-
-    //Open Large view
-    await page.locator('button:has-text("Large View")').click();
-    await client.send('HeapProfiler.takeHeapSnapshot');
-
-    //Time to Imagery Rendered in Large Frame
-    await page.waitForSelector('.c-imagery__main-image__bg', { state: 'visible' });
-
-    //Time to Example Imagery object loads
-    await page.waitForSelector('.c-imagery__main-image__background-image', { state: 'visible' });
-
-    // Click Close Icon
-    await page.locator('.c-click-icon').click();
-
-    //Time to Example Imagery Frame loads within Display Layout
-    await page.waitForSelector('.c-imagery__main-image__bg', { state: 'visible' });
-    //Time to Example Imagery object loads
-    await page.waitForSelector('.c-imagery__main-image__background-image', { state: 'visible' });
-
-    await client.send('HeapProfiler.collectGarbage');
-    //await client.send('Performance.enable');
-
-    let performanceMetricsAfter = await client.send('Performance.getMetrics');
-    console.log(performanceMetricsAfter.metrics);
-
-    //await client.send('Performance.disable');
-  });
-});
--- a/e2e/tests/performance/memory/navigation.memory.perf.spec.js
+++ b/e2e/tests/performance/memory/navigation.memory.perf.spec.js
@ -0,0 +1,299 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+const { test, expect } = require('@playwright/test');
+
+const memoryLeakFilePath = 'e2e/test-data/memory-leak-detection.json';
+/**
+ * Executes tests to verify that views are not leaking memory on navigation away. This sort of
+ * memory leak is generally caused by a failure to clean up registered listeners.
+ *
+ * These tests are executed on a set of pre-built displays loaded from ../test-data/memory-leak-detection.json.
+ *
+ * In order to modify the test data set:
+ * 1. Run Open MCT locally (npm start)
+ * 2. Right click on a folder in the tree, and select "Import From JSON"
+ * 3. In the subsequent dialog, select the file ../test-data/memory-leak-detection.json
+ * 4. Click "OK"
+ * 5. Modify test objects as desired
+ * 6. Right click on the "Memory Leak Detection" folder, and select "Export to JSON"
+ * 7. Copy the exported file to ../test-data/memory-leak-detection.json
+ *
+ */
+
+const NAV_LEAK_TIMEOUT = 10 * 1000; // 10s
+test.describe('Navigation memory leak is not detected in', () => {
+  test.beforeEach(async ({ page }) => {
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    await page.locator('a:has-text("My Items")').click({
+      button: 'right'
+    });
+
+    await page.locator('text=Import from JSON').click();
+
+    // Upload memory-leak-detection.json
+    await page.setInputFiles('#fileElem', memoryLeakFilePath);
+
+    await page.locator('text=OK').click();
+
+    await expect(page.locator('a:has-text("Memory Leak Detection")')).toBeVisible();
+  });
+
+  test('plot view', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'overlay-plot-single-1hz-swg', {
+      timeout: NAV_LEAK_TIMEOUT
+    });
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('stacked plot view', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'stacked-plot-single-1hz-swg', {
+      timeout: NAV_LEAK_TIMEOUT
+    });
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('LAD table view', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'lad-table-single-1hz-swg', {
+      timeout: NAV_LEAK_TIMEOUT
+    });
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('LAD table set', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(page, 'lad-table-set-single-1hz-swg', {
+      timeout: NAV_LEAK_TIMEOUT
+    });
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  //TODO: Figure out why using the `table-row` component inside the `table` component leaks TelemetryTableRow objects
+  test('telemetry table view', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'telemetry-table-single-1hz-swg',
+      {
+        timeout: NAV_LEAK_TIMEOUT
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  //TODO: Figure out why using the `SideBar` component inside the leaks Notebook objects
+  test('notebook view', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'notebook-memory-leak-detection-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('display layout of a single SWG alphanumeric', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'display-layout-single-1hz-swg',
+      {
+        timeout: NAV_LEAK_TIMEOUT
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('display layout of a single SWG plot', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'display-layout-single-overlay-plot',
+      {
+        timeout: NAV_LEAK_TIMEOUT
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  //TODO: Figure out why `svg` in the CompassRose component leaks imagery
+  test('example imagery view', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'example-imagery-memory-leak-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('display layout of example imagery views', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'display-layout-images-memory-leak-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('display layout with plots of swgs, alphanumerics, and condition sets, ', async ({
+    page
+  }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'display-layout-simple-telemetry',
+      {
+        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('flexible layout with plots of swgs', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'flexible-layout-plots-memory-leak-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('flexible layout of example imagery views', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'flexible-layout-images-memory-leak-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('tabbed view of display layouts and time strips', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'tab-view-simple-memory-leak-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT * 6 * 2 // 2 min
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  test('time strip view of telemetry', async ({ page }) => {
+    const result = await navigateToObjectAndDetectMemoryLeak(
+      page,
+      'time-strip-telemetry-memory-leak-test',
+      {
+        timeout: NAV_LEAK_TIMEOUT * 6 // 1 min
+      }
+    );
+
+    // If we got here without timing out, then the root view object was garbage collected and no memory leak was detected.
+    expect(result).toBe(true);
+  });
+
+  /**
+   *
+   * @param {import('@playwright/test').Page} page
+   * @param {*} objectName
+   * @returns
+   */
+  async function navigateToObjectAndDetectMemoryLeak(page, objectName) {
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    // Fill Search input
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill(objectName);
+
+    //Search Result Appears and is clicked
+    await Promise.all([
+      page.locator(`div.c-gsearch-result__title:has-text("${objectName}")`).first().click(),
+      page.waitForNavigation()
+    ]);
+
+    // Register a finalization listener on the root node for the view. This tends to be the last thing to be
+    // garbage collected since it has either direct or indirect references to all resources used by the view. Therefore it's a pretty good proxy
+    // for detecting memory leaks.
+    await page.evaluate(() => {
+      window.gcPromise = new Promise((resolve) => {
+        // eslint-disable-next-line no-undef
+        window.fr = new FinalizationRegistry(resolve);
+        window.fr.register(
+          window.openmct.layout.$refs.browseObject.$refs.objectViewWrapper.firstChild,
+          'navigatedObject',
+          window.openmct.layout.$refs.browseObject.$refs.objectViewWrapper.firstChild
+        );
+      });
+    });
+
+    // Nav back to folder
+    await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
+    await page.waitForNavigation();
+
+    // This next code block blocks until the finalization listener is called and the gcPromise resolved. This means that the root node for the view has been garbage collected.
+    // In the event that the root node is not garbage collected, the gcPromise will never resolve and the test will time out.
+    await page.evaluate(() => {
+      const gcPromise = window.gcPromise;
+      window.gcPromise = null;
+
+      // Manually invoke the garbage collector once all references are removed.
+      window.gc();
+
+      return gcPromise;
+    });
+
+    // Clean up the finalization registry since we don't need it any more.
+    await page.evaluate(() => {
+      window.fr = null;
+    });
+
+    // If we get here without timing out, it means the garbage collection promise resolved and the test passed.
+    return true;
+  }
+});
--- a/e2e/tests/performance/tagging.perf.spec.js
+++ b/e2e/tests/performance/tagging.perf.spec.js
@ -0,0 +1,273 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+Tests to verify plot tagging performance.
+*/
+
+const { test, expect } = require('../../pluginFixtures');
+const {
+  createDomainObjectWithDefaults,
+  setRealTimeMode,
+  setFixedTimeMode,
+  waitForPlotsToRender
+} = require('../../appActions');
+
+test.describe.fixme('Plot Tagging Performance', () => {
+  /**
+   * Given a canvas and a set of points, tags the points on the canvas.
+   * @param {import('@playwright/test').Page} page
+   * @param {HTMLCanvasElement} canvas a telemetry item with a plot
+   * @param {Number} xEnd a telemetry item with a plot
+   * @param {Number} yEnd a telemetry item with a plot
+   * @returns {Promise}
+   */
+  async function createTags({ page, canvas, xEnd = 700, yEnd = 520 }) {
+    await canvas.hover({ trial: true });
+
+    //Alt+Shift Drag Start to select some points to tag
+    await page.keyboard.down('Alt');
+    await page.keyboard.down('Shift');
+
+    await canvas.dragTo(canvas, {
+      sourcePosition: {
+        x: 1,
+        y: 1
+      },
+      targetPosition: {
+        x: xEnd,
+        y: yEnd
+      }
+    });
+
+    //Alt Drag End
+    await page.keyboard.up('Alt');
+    await page.keyboard.up('Shift');
+
+    //Wait for canvas to stablize.
+    await canvas.hover({ trial: true });
+
+    // add some tags
+    await page.getByText('Annotations').click();
+    await page.getByRole('button', { name: /Add Tag/ }).click();
+    await page.getByPlaceholder('Type to select tag').click();
+    await page.getByText('Driving').click();
+
+    await page.getByRole('button', { name: /Add Tag/ }).click();
+    await page.getByPlaceholder('Type to select tag').click();
+    await page.getByText('Science').click();
+  }
+
+  /**
+   * Given a telemetry item (e.g., a Sine Wave Generator) with a plot, tests that the plot can be tagged.
+   * @param {import('@playwright/test').Page} page
+   * @param {import('../../../../appActions').CreatedObjectInfo} telemetryItem a telemetry item with a plot
+   * @returns {Promise}
+   */
+  async function testTelemetryItem(page, telemetryItem) {
+    // Check that telemetry item also received the tag
+    await page.goto(telemetryItem.url);
+
+    await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+    const canvas = page.locator('canvas').nth(1);
+
+    //Wait for canvas to stablize.
+    await canvas.hover({ trial: true });
+
+    // click on the tagged plot point
+    await canvas.click({
+      position: {
+        x: 100,
+        y: 100
+      }
+    });
+
+    await expect(page.getByText('Science')).toBeVisible();
+    await expect(page.getByText('Driving')).toBeHidden();
+  }
+
+  /**
+   * Given a page, tests that tags are searchable, deletable, and persist across reloads.
+   * @param {import('@playwright/test').Page} page
+   * @returns {Promise}
+   */
+  async function basicTagsTests(page) {
+    // Search for Driving
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+
+    // Clicking elsewhere should cause annotation selection to be cleared
+    await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
+    // click on the search result
+    await page
+      .getByRole('searchbox', { name: 'OpenMCT Search' })
+      .getByText(/Sine Wave/)
+      .first()
+      .click();
+
+    // Delete Driving
+    await page.hover('[aria-label="Tag"]:has-text("Driving")');
+    await page.locator('[aria-label="Remove tag Driving"]').click();
+
+    // Search for Science
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
+    await expect(page.locator('[aria-label="Search Result"]').nth(0)).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]').nth(0)).not.toContainText('Drilling');
+
+    // Search for Driving
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
+    await expect(page.getByText('No results found')).toBeVisible();
+
+    //Reload Page
+    await page.reload({ waitUntil: 'domcontentloaded' });
+    // wait for plots to load
+    await waitForPlotsToRender(page);
+
+    await page.getByText('Annotations').click();
+    await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+    const canvas = page.locator('canvas').nth(1);
+    // click on the tagged plot point
+    await canvas.click({
+      position: {
+        x: 100,
+        y: 100
+      }
+    });
+
+    await expect(page.getByText('Science')).toBeVisible();
+    await expect(page.getByText('Driving')).toBeHidden();
+  }
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+
+  test('Tags work with Overlay Plots', async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6822'
+    });
+    //Test.slow decorator is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
+    test.slow();
+
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: overlayPlot.uuid
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: overlayPlot.uuid
+    });
+
+    await page.goto(overlayPlot.url);
+
+    let canvas = page.locator('canvas').nth(1);
+
+    // Switch to real-time mode
+    // Adding tags should pause the plot
+    await setRealTimeMode(page);
+
+    await createTags({
+      page,
+      canvas
+    });
+
+    await setFixedTimeMode(page);
+
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+
+    // set to real time mode
+    await setRealTimeMode(page);
+
+    // Search for Science
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
+    // click on the search result
+    await page
+      .getByRole('searchbox', { name: 'OpenMCT Search' })
+      .getByText('Alpha Sine Wave')
+      .first()
+      .click();
+    // wait for plots to load
+    await expect(page.locator('.js-series-data-loaded')).toBeVisible();
+    // expect plot to be paused
+    await expect(page.locator('[title="Resume displaying real-time data"]')).toBeVisible();
+
+    await setFixedTimeMode(page);
+  });
+
+  test('Tags work with Plot View of telemetry items', async ({ page }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator'
+    });
+    const canvas = page.locator('canvas').nth(1);
+    await createTags({
+      page,
+      canvas
+    });
+    await basicTagsTests(page);
+  });
+
+  test('Tags work with Stacked Plots', async ({ page }) => {
+    const stackedPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Stacked Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: stackedPlot.uuid
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: stackedPlot.uuid
+    });
+
+    await page.goto(stackedPlot.url);
+
+    const canvas = page.locator('canvas').nth(1);
+
+    await createTags({
+      page,
+      canvas,
+      xEnd: 700,
+      yEnd: 240
+    });
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+  });
+});
--- a/e2e/tests/visual/addInit.visual.spec.js
+++ b/e2e/tests/visual/addInit.visual.spec.js
@ -1,63 +0,0 @@
-/* eslint-disable no-undef */
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/* global __dirname */
-/*
-Collection of Visual Tests set to run with modified init scripts to inject plugins not otherwise available in the default contexts.
-
-These should only use functional expect statements to verify assumptions about the state
-in a test and not for functional verification of correctness. Visual tests are not supposed
-to "fail" on assertions. Instead, they should be used to detect changes between builds or branches.
-
-Note: Larger testsuite sizes are OK due to the setup time associated with these tests.
-*/
-
-// eslint-disable-next-line no-unused-vars
-const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-const percySnapshot = require('@percy/playwright');
-const path = require('path');
-
-const CUSTOM_NAME = 'CUSTOM_NAME';
-
-test.describe('Visual - addInit', () => {
-  test.use({
-    clockOptions: {
-      now: 0, //Set browser clock to UNIX Epoch
-      shouldAdvanceTime: false //Don't advance the clock
-    }
-  });
-
-  test('Restricted Notebook is visually correct @addInit @unstable', async ({ page, theme }) => {
-    await page.addInitScript({
-      path: path.join(__dirname, '../../helper', './addInitRestrictedNotebook.js')
-    });
-    //Go to baseURL
-    await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-    await page.getByTitle('Collapse Browse Pane').click();
-
-    await createDomainObjectWithDefaults(page, { type: CUSTOM_NAME });
-
-    // Take a snapshot of the newly created CUSTOM_NAME notebook
-    await percySnapshot(page, `Restricted Notebook with CUSTOM_NAME (theme: '${theme}')`);
-  });
-});
--- a/e2e/tests/visual/components/about.visual.spec.js
+++ b/e2e/tests/visual/components/about.visual.spec.js
@ -20,26 +20,33 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-import { createOpenMct, resetApplicationState } from 'utils/testing';
+/*
+Tests the branding associated with the default deployment. At least the about modal for now
+*/

-describe('UI Components', () => {
-  let openmct;
+const { test, expect } = require('../../../pluginFixtures');
+const percySnapshot = require('@percy/playwright');

-  beforeEach((done) => {
-    openmct = createOpenMct();
-    openmct.on('start', done);
-    openmct.startHeadless();
+test.describe('Visual - Branding', () => {
+  test.beforeEach(async ({ page }) => {
+    //Go to baseURL and Hide Tree
+    await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
  });

-  afterEach(() => {
-    return resetApplicationState();
-  });
+  test('Visual - About Modal', async ({ page, theme }) => {
+    // Click About button
+    await page.click('.l-shell__app-logo');

-  it('are exposed to users', () => {
-    expect(openmct.components).toBeDefined();
-  });
+    // Modify the Build information in 'about' to be consistent run-over-run
+    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info').first();
+    await expect(versionInformationLocator).toBeEnabled();
+    await versionInformationLocator.evaluate(
+      (node) =>
+        (node.innerHTML =
+          '<li>Version: visual-snapshot</li> <li>Build Date: Mon Nov 15 2021 08:07:51 GMT-0800 (Pacific Standard Time)</li> <li>Revision: 93049cdbc6c047697ca204893db9603b864b8c9f</li> <li>Branch: master</li>')
+    );

-  it('exposes the object view', () => {
-    expect(openmct.components.ObjectView).toBeDefined();
+    // Take a snapshot of the About modal
+    await percySnapshot(page, `About (theme: '${theme}')`);
  });
 });
--- a/e2e/tests/visual/components/tree.visual.spec.js
+++ b/e2e/tests/visual/components/tree.visual.spec.js
@ -21,7 +21,10 @@
 *****************************************************************************/

 const { test } = require('../../../pluginFixtures.js');
-const { createDomainObjectWithDefaults } = require('../../../appActions.js');
+const {
+  expandTreePaneItemByName,
+  createDomainObjectWithDefaults
+} = require('../../../appActions.js');

 const percySnapshot = require('@percy/playwright');

@ -88,14 +91,3 @@ test.describe('Visual - Tree Pane', () => {
    });
  });
 });
-
-/**
- * @param {import('@playwright/test').Page} page
- * @param {string} name
- */
-async function expandTreePaneItemByName(page, name) {
-  const treePane = page.getByTestId('tree-pane');
-  const treeItem = treePane.locator(`role=treeitem[expanded=false][name=/${name}/]`);
-  const expandTriangle = treeItem.locator('.c-disclosure-triangle');
-  await expandTriangle.click();
-}
--- a/e2e/tests/visual/controlledClock.visual.spec.js
+++ b/e2e/tests/visual/controlledClock.visual.spec.js
@ -21,20 +21,21 @@
 *****************************************************************************/

 /*
-Collection of Visual Tests set to run in a default context. The tests within this suite
-are only meant to run against openmct started by `npm start` within the
-`./e2e/playwright-visual.config.js` file.
-
+Collection of Visual Tests set to run with browser clock manipulate made possible with the
+clockOptions plugin fixture.
 */

 const { test, expect } = require('../../pluginFixtures');
 const percySnapshot = require('@percy/playwright');

-test.describe('Visual - Controlled Clock @localStorage', () => {
+test.describe('Visual - Controlled Clock', () => {
+  test.beforeEach(async ({ page }) => {
+    //Go to baseURL and Hide Tree
+    await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
+  });
  test.use({
-    storageState: './e2e/test-data/VisualTestData_storage.json',
+    storageState: './e2e/test-data/overlay_plot_with_delay_storage.json',
    clockOptions: {
-      now: 0, //Set browser clock to UNIX Epoch
      shouldAdvanceTime: false //Don't advance the clock
    }
  });
@ -43,10 +44,14 @@ test.describe('Visual - Controlled Clock @localStorage', () => {
    // Go to baseURL
    await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
    await page.getByTitle('Collapse Browse Pane').click();
-
-    await page.locator('a:has-text("Unnamed Overlay Plot Overlay Plot")').click();
+    await page
+      .locator('a')
+      .filter({ hasText: 'Overlay Plot with Telemetry Object Overlay Plot' })
+      .click();
    //Ensure that we're on the Unnamed Overlay Plot object
-    await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Overlay Plot');
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(
+      'Overlay Plot with Telemetry Object'
+    );

    //Wait for canvas to be rendered and stop animating
    await page.locator('canvas >> nth=1').hover({ trial: true });
--- a/e2e/tests/visual/default.visual.spec.js
+++ b/e2e/tests/visual/default.visual.spec.js
@ -1,173 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-Collection of Visual Tests set to run in a default context. The tests within this suite
-are only meant to run against openmct started by `npm start` within the
-`./e2e/playwright-visual.config.js` file.
-
-These should only use functional expect statements to verify assumptions about the state
-in a test and not for functional verification of correctness. Visual tests are not supposed
-to "fail" on assertions. Instead, they should be used to detect changes between builds or branches.
-
-Note: Larger testsuite sizes are OK due to the setup time associated with these tests.
-*/
-
-const { test, expect } = require('../../pluginFixtures');
-const percySnapshot = require('@percy/playwright');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-
-test.describe('Visual - Default', () => {
-  test.beforeEach(async ({ page }) => {
-    //Go to baseURL and Hide Tree
-    await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
-    await page.getByTitle('Collapse Browse Pane').click();
-  });
-  test.use({
-    clockOptions: {
-      now: 0, //Set browser clock to UNIX Epoch
-      shouldAdvanceTime: false //Don't advance the clock
-    }
-  });
-
-  test('Visual - Root and About', async ({ page, theme }) => {
-    // Verify that Create button is actionable
-    await expect(page.locator('button:has-text("Create")')).toBeEnabled();
-
-    // Take a snapshot of the Dashboard
-    await percySnapshot(page, `Root (theme: '${theme}')`);
-
-    // Click About button
-    await page.click('.l-shell__app-logo');
-
-    // Modify the Build information in 'about' to be consistent run-over-run
-    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info').first();
-    await expect(versionInformationLocator).toBeEnabled();
-    await versionInformationLocator.evaluate(
-      (node) =>
-        (node.innerHTML =
-          '<li>Version: visual-snapshot</li> <li>Build Date: Mon Nov 15 2021 08:07:51 GMT-0800 (Pacific Standard Time)</li> <li>Revision: 93049cdbc6c047697ca204893db9603b864b8c9f</li> <li>Branch: master</li>')
-    );
-
-    // Take a snapshot of the About modal
-    await percySnapshot(page, `About (theme: '${theme}')`);
-  });
-
-  test('Visual - Default Condition Set @unstable', async ({ page, theme }) => {
-    await createDomainObjectWithDefaults(page, { type: '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.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/5349'
-    });
-
-    await createDomainObjectWithDefaults(page, { type: 'Condition Widget' });
-
-    // Take a snapshot of the newly created Condition Widget object
-    await percySnapshot(page, `Default Condition Widget (theme: '${theme}')`);
-  });
-
-  test('Visual - Time Conductor start time is less than end time', async ({ page, theme }) => {
-    const year = new Date().getFullYear();
-
-    let startDate = 'xxxx-01-01 01:00:00.000Z';
-    startDate = year + startDate.substring(4);
-
-    let endDate = 'xxxx-01-01 02:00:00.000Z';
-    endDate = year + endDate.substring(4);
-
-    await page.getByRole('button', { name: 'Time Conductor Settings' }).click();
-
-    await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
-    await page.locator('input[type="text"]').first().fill(startDate.toString());
-
-    //  verify no error msg
-    await percySnapshot(page, `Default Time conductor (theme: '${theme}')`);
-
-    startDate = year + 1 + startDate.substring(4);
-    await page.locator('input[type="text"]').first().fill(startDate.toString());
-    await page.locator('input[type="text"]').nth(1).click();
-
-    //  verify error msg for start time (unable to capture snapshot of popup)
-    await percySnapshot(page, `Start time error (theme: '${theme}')`);
-
-    startDate = year - 1 + startDate.substring(4);
-    await page.locator('input[type="text"]').first().fill(startDate.toString());
-
-    endDate = year - 2 + endDate.substring(4);
-    await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
-
-    await page.locator('input[type="text"]').first().click();
-
-    //  verify error msg for end time (unable to capture snapshot of popup)
-    await percySnapshot(page, `End time error (theme: '${theme}')`);
-  });
-
-  test('Visual - Sine Wave Generator Form', async ({ page, theme }) => {
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click text=Sine Wave Generator
-    await page.click('text=Sine Wave Generator');
-
-    await percySnapshot(page, `Default Sine Wave Generator Form (theme: '${theme}')`);
-
-    await page.locator('.field.control.l-input-sm input').first().click();
-    await page.locator('.field.control.l-input-sm input').first().fill('');
-
-    // Validate red x mark
-    await percySnapshot(page, `removed amplitude property value (theme: '${theme}')`);
-  });
-
-  test('Visual - Save Successful Banner @unstable', async ({ page, theme }) => {
-    await createDomainObjectWithDefaults(page, { type: 'Timer' });
-
-    await page.locator('.c-message-banner__message').hover({ trial: true });
-    await percySnapshot(page, `Banner message shown (theme: '${theme}')`);
-
-    //Wait until Save Banner is gone
-    await page.locator('.c-message-banner__close-button').click();
-    await page.waitForSelector('.c-message-banner__message', { state: 'detached' });
-    await percySnapshot(page, `Banner message gone (theme: '${theme}')`);
-  });
-
-  test('Visual - Display Layout Icon is correct', async ({ page, theme }) => {
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    //Hover on Display Layout option.
-    await page.locator('text=Display Layout').hover();
-    await percySnapshot(page, `Display Layout Create Menu (theme: '${theme}')`);
-  });
-
-  test('Visual - Default Gauge is correct @unstable', async ({ page, theme }) => {
-    await createDomainObjectWithDefaults(page, { type: 'Gauge' });
-
-    // Take a snapshot of the newly created Gauge object
-    await percySnapshot(page, `Default Gauge (theme: '${theme}')`);
-  });
-});
--- a/e2e/tests/visual/defaultPlugins.visual.spec.js
+++ b/e2e/tests/visual/defaultPlugins.visual.spec.js
@ -0,0 +1,101 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+Collection of Visual Tests set to run in a default context with default Plugins. The tests within this suite
+are only meant to run against openmct's app.js started by `npm run start` within the
+`./e2e/playwright-visual.config.js` file.
+*/
+
+const { test, expect } = require('../../pluginFixtures');
+const percySnapshot = require('@percy/playwright');
+const { createDomainObjectWithDefaults } = require('../../appActions');
+
+test.describe('Visual - Default', () => {
+  test.beforeEach(async ({ page }) => {
+    //Go to baseURL and Hide Tree
+    await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
+  });
+
+  test('Visual - Default Dashboard', async ({ page, theme }) => {
+    // Verify that Create button is actionable
+    await expect(page.locator('button:has-text("Create")')).toBeEnabled();
+
+    // Take a snapshot of the Dashboard
+    await percySnapshot(page, `Default Dashboard (theme: '${theme}')`);
+  });
+
+  test('Visual - Default Condition Set', async ({ page, theme }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Condition Set',
+      name: 'Default 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', async ({ page, theme }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Condition Widget',
+      name: 'Default Condition Widget'
+    });
+
+    // Take a snapshot of the newly created Condition Widget object
+    await percySnapshot(page, `Default Condition Widget (theme: '${theme}')`);
+  });
+
+  test('Visual - Sine Wave Generator Form', async ({ page, theme }) => {
+    //Click the Create button
+    await page.click('button:has-text("Create")');
+
+    // Click text=Sine Wave Generator
+    await page.click('text=Sine Wave Generator');
+
+    await percySnapshot(page, `Default Sine Wave Generator Form (theme: '${theme}')`);
+
+    await page.locator('.field.control.l-input-sm input').first().click();
+    await page.locator('.field.control.l-input-sm input').first().fill('');
+
+    // Validate red x mark
+    await percySnapshot(page, `removed amplitude property value (theme: '${theme}')`);
+  });
+
+  test('Visual - Display Layout Icon is correct in Create Menu', async ({ page, theme }) => {
+    // Click the Create button
+    await page.click('button:has-text("Create")');
+
+    // Hover on Display Layout option.
+    await page.locator('text=Display Layout').hover();
+    await percySnapshot(page, `Display Layout Create Menu (theme: '${theme}')`);
+  });
+
+  test('Visual - Default Gauge', async ({ page, theme }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Gauge',
+      name: 'Default Gauge'
+    });
+
+    // Take a snapshot of the newly created Gauge object
+    await percySnapshot(page, `Default Gauge (theme: '${theme}')`);
+  });
+});
--- a/e2e/tests/visual/faultManagement.visual.spec.js
+++ b/e2e/tests/visual/faultManagement.visual.spec.js
@ -26,12 +26,12 @@ const percySnapshot = require('@percy/playwright');

 const utils = require('../../helper/faultUtils');

-test.describe('The Fault Management Plugin Visual Test', () => {
+test.describe('Fault Management Visual Tests', () => {
  test('icon test', async ({ page, theme }) => {
    await page.addInitScript({
      path: path.join(__dirname, '../../helper/', 'addInitFaultManagementPlugin.js')
    });
-    await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await percySnapshot(page, `Fault Management icon appears in tree (theme: '${theme}')`);
  });
--- a/e2e/tests/visual/notebook.visual.spec.js
+++ b/e2e/tests/visual/notebook.visual.spec.js
@ -22,14 +22,35 @@

 const { test } = require('../../pluginFixtures');
 const percySnapshot = require('@percy/playwright');
-const { expandTreePaneItemByName, createDomainObjectWithDefaults } = require('../../appActions');
+const {
+  selectInspectorTab,
+  expandTreePaneItemByName,
+  createDomainObjectWithDefaults
+} = require('../../appActions');
+const {
+  startAndAddRestrictedNotebookObject,
+  enterTextEntry
+} = require('../../helper/notebookUtils');
+
+test.describe('Visual - Restricted Notebook', () => {
+  test.beforeEach(async ({ page }) => {
+    await startAndAddRestrictedNotebookObject(page);
+  });
+
+  test('Restricted Notebook is visually correct @addInit', async ({ page, theme }) => {
+    // Take a snapshot of the newly created CUSTOM_NAME notebook
+    await percySnapshot(page, `Restricted Notebook with CUSTOM_NAME (theme: '${theme}')`);
+  });
+});

 test.describe('Visual - Notebook', () => {
+  test.beforeEach(async ({ page }) => {
+    //Go to baseURL and Hide Tree
+    await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
+  });
  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'
@ -43,8 +64,36 @@ test.describe('Visual - Notebook', () => {
    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})`);
  });
+  test("Blur 'Add tag' on Notebook", async ({ page, theme }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Notebook',
+      name: 'Add Tag Test Notebook'
+    });
+    await enterTextEntry(page, 'Entry 0');
+
+    // Click on Annotations tab
+    await selectInspectorTab(page, 'Annotations');
+
+    // Take snapshot of the notebook with the Annotations tab opened
+    await percySnapshot(page, `Notebook Annotation (theme: '${theme}')`);
+
+    await page.locator('button:has-text("Add Tag")').click();
+
+    // Take snapshot of the notebook with the AutoComplete field visible
+    await percySnapshot(page, `Notebook Add Tag (theme: '${theme}')`);
+
+    // Click inside the AutoComplete field
+    await page.locator('[placeholder="Type to select tag"]').click();
+
+    // Click on the "Tags" header (simulating a click outside the autocomplete field)
+    await page.locator('div.c-inspect-properties__header:has-text("Tags")').click();
+
+    // Take snapshot of the notebook with the AutoComplete field hidden and with the "Add Tag" button visible
+    await percySnapshot(page, `Notebook Annotation de-select blur (theme: '${theme}')`);
+  });
 });
--- a/e2e/tests/visual/notification.visual.spec.js
+++ b/e2e/tests/visual/notification.visual.spec.js
@ -39,7 +39,10 @@ test.describe("Visual - Check Notification Info Banner of 'Save successful'", ()
    theme
  }) => {
    // Create a clock domain object
-    await createDomainObjectWithDefaults(page, { type: 'Clock' });
+    await createDomainObjectWithDefaults(page, {
+      type: 'Clock',
+      name: 'Default Clock'
+    });
    // Verify there is a button with aria-label="Review 1 Notification"
    expect(await page.locator('button[aria-label="Review 1 Notification"]').isVisible()).toBe(true);
    // Verify there is a button with aria-label="Clear all notifications"
@ -52,12 +55,14 @@ test.describe("Visual - Check Notification Info Banner of 'Save successful'", ()
    expect(await page.locator('div[role="dialog"]').isVisible()).toBe(true);
    // Verify the div with role="dialog" contains text "Save successful"
    expect(await page.locator('div[role="dialog"]').innerText()).toContain('Save successful');
-    await percySnapshot(page, `Notification banner - ${theme}`);
+    await percySnapshot(page, `Notification banner shows Save successful (theme: '${theme}')`);
    // Verify there is a button with text "Dismiss"
    expect(await page.locator('button:has-text("Dismiss")').isVisible()).toBe(true);
+    await percySnapshot(page, `Notification banner shows Dismiss (theme: '${theme}')`);
    // Click on button with text "Dismiss"
    await page.locator('button:has-text("Dismiss")').click();
    // Verify there is no div with role="dialog"
    expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
+    await percySnapshot(page, `Notification banner dismissed (theme: '${theme}')`);
  });
 });
--- a/e2e/tests/visual/search.visual.spec.js
+++ b/e2e/tests/visual/search.visual.spec.js
@ -30,60 +30,72 @@ const { createDomainObjectWithDefaults } = require('../../appActions');
 const percySnapshot = require('@percy/playwright');

 test.describe('Grand Search', () => {
+  let clock;
+  let displayLayout;
  test.beforeEach(async ({ page, theme }) => {
-    //Go to baseURL and Hide Tree
-    await page.goto('./#/browse/mine', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    await page.getByTitle('Collapse Browse Pane').click();
+
+    displayLayout = await createDomainObjectWithDefaults(page, {
+      type: 'Display Layout',
+      name: 'Visual Test Display Layout'
+    });
+
+    clock = await createDomainObjectWithDefaults(page, {
+      type: 'Clock',
+      name: 'Visual Test Clock',
+      parent: displayLayout.uuid
+    });
  });
-  test.use({
-    clockOptions: {
-      now: 0, //Set browser clock to UNIX Epoch
-      shouldAdvanceTime: false //Don't advance the clock
-    }
-  });
-  //This needs to be rewritten to use a non clock or non display layout object
-  test('Can search for objects, and subsequent search dropdown behaves properly @unstable', async ({
+
+  test('Can search for folder object, and subsequent search dropdown behaves properly', async ({
    page,
    theme
  }) => {
-    // await createDomainObjectWithDefaults(page, 'Display Layout');
-    // 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
-    });
+    const searchInput = page.getByRole('searchbox', { name: 'Search Input' });
+    const searchResults = page.getByRole('searchbox', { name: 'OpenMCT Search' });
+    // Navigate to display layout
+    await page.goto(displayLayout.url);

-    // Click [aria-label="OpenMCT Search"] input[type="search"]
-    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(folder1);
-    await expect(page.locator('[aria-label="Search Result"]')).toContainText(folder1);
-    await percySnapshot(page, 'Searching for Folder Object');
+    // Search for the clock object
+    await searchInput.click();
+    await searchInput.fill(clock.name);
+    await expect(searchResults.getByText('Visual Test Clock')).toBeVisible();
+
+    //Searching for an object returns that object in the grandsearch
+    await percySnapshot(page, `Searching for Clock Object (theme: '${theme}')`);
+
+    // Enter Edit mode on the Display Layout
+    await page.getByRole('button', { name: 'Edit' }).click();
+
+    // Navigate to the clock object while in edit mode on the display layout
+    await searchInput.click();
+    await searchResults.getByText('Visual Test Clock').click();

-    await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').click();
-    await page.locator('[aria-label="Unnamed Clock clock result"] >> text=Unnamed Clock').click();
    await percySnapshot(
      page,
-      'Preview for clock should display when editing enabled and search item clicked'
+      `Preview for clock should display when editing enabled and search item clicked (theme: '${theme}')`
    );

-    await page.locator('[aria-label="Close"]').click();
-    await percySnapshot(page, 'Search should still be showing after preview closed');
+    // Close the preview
+    await page.getByRole('button', { name: 'Close' }).click();
+    await percySnapshot(
+      page,
+      `Search should still be showing after preview closed (theme: '${theme}')`
+    );

-    await page
-      .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
-      .nth(1)
-      .click();
+    // Save and finish editing the Display Layout
+    await page.getByRole('button', { name: 'Save' }).click();
+    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();

-    await page.locator('text=Save and Finish Editing').click();
+    // Search for the clock object
+    await searchInput.click();
+    await searchInput.fill(clock.name);
+    await expect(searchResults.getByText('Visual Test Clock')).toBeVisible();

-    await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').click();
+    // Navigate to the clock object while not in edit mode on the display layout
+    await searchResults.getByText('Visual Test Clock').click();

-    await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').fill('Cl');
-
-    await Promise.all([page.waitForNavigation(), page.locator('text=Unnamed Clock').click()]);
    await percySnapshot(
      page,
      `Clicking on search results should navigate to them if not editing (theme: '${theme}')`
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "openmct",
-  "version": "3.0.0-SNAPSHOT",
+  "version": "3.0.2",
  "description": "The Open MCT core platform",
  "devDependencies": {
    "@babel/eslint-parser": "7.22.5",
@ -8,7 +8,7 @@
    "@deploysentinel/playwright": "0.3.4",
    "@percy/cli": "1.26.0",
    "@percy/playwright": "1.0.4",
-    "@playwright/test": "1.32.3",
+    "@playwright/test": "1.36.2",
    "@types/eventemitter3": "1.2.0",
    "@types/jasmine": "4.3.4",
    "@types/lodash": "4.14.192",
@ -55,7 +55,6 @@
    "moment-timezone": "0.5.41",
    "nyc": "15.1.0",
    "painterro": "1.2.78",
-    "playwright-core": "1.32.3",
    "plotly.js-basic-dist": "2.20.0",
    "plotly.js-gl2d-dist": "2.20.0",
    "prettier": "2.8.7",
@ -80,8 +79,10 @@
    "clean": "rm -rf ./dist ./node_modules ./package-lock.json ./coverage ./html-test-results ./test-results ./.nyc_output ",
    "clean-test-lint": "npm run clean; npm install; npm run test; npm run lint",
    "start": "npx webpack serve --config ./.webpack/webpack.dev.js",
+    "start:prod": "npx webpack serve --config ./.webpack/webpack.prod.js",
    "start:coverage": "npx webpack serve --config ./.webpack/webpack.coverage.js",
-    "lint": "eslint example src e2e --ext .js,.vue openmct.js --max-warnings=0",
+    "lint": "eslint example src e2e --ext .js openmct.js --max-warnings=0 && eslint example src --ext .vue",
+    "lint:spelling": "cspell \"**/*.{js,md,vue}\" --show-context --gitignore",
    "lint:fix": "eslint example src e2e --ext .js,.vue openmct.js --fix",
    "build:prod": "webpack --config ./.webpack/webpack.prod.js",
    "build:dev": "webpack --config ./.webpack/webpack.dev.js",
@ -92,14 +93,18 @@
    "test:debug": "KARMA_DEBUG=true karma start",
    "test:e2e": "npx playwright test",
    "test:e2e:couchdb": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @couchdb --workers=1",
-    "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|@couchdb|@generatedata\"",
    "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:generatedata": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @generatedata",
    "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:visual:ci": "percy exec --config ./e2e/.percy.ci.yml --partial -- npx playwright test --config=e2e/playwright-visual.config.js --project=chrome --grep-invert @unstable",
+    "test:e2e:visual:full": "percy exec --config ./e2e/.percy.nightly.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:watch": "npx playwright test --ui --config=e2e/playwright-ci.config.js",
-    "test:perf": "npx playwright test --config=e2e/playwright-performance.config.js",
+    "test:perf:contract": "npx playwright test --config=e2e/playwright-performance-dev.config.js",
+    "test:perf:localhost": "npx playwright test --config=e2e/playwright-performance-prod.config.js --project=chrome",
+    "test:perf:memory": "npx playwright test --config=e2e/playwright-performance-prod.config.js --project=chrome-memory",
    "update-about-dialog-copyright": "perl -pi -e 's/20\\d\\d\\-202\\d/2014\\-2023/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\\-2023/gm'",
    "cov:e2e:report": "nyc report --reporter=lcovonly --report-dir=./coverage/e2e",
--- a/src/MCT.js
+++ b/src/MCT.js
@ -43,7 +43,6 @@ define([
  './plugins/duplicate/plugin',
  './plugins/importFromJSONAction/plugin',
  './plugins/exportAsJSONAction/plugin',
-  './ui/components/components',
  'vue'
 ], function (
  EventEmitter,
@ -68,7 +67,6 @@ define([
  DuplicateActionPlugin,
  ImportFromJSONAction,
  ExportAsJSONAction,
-  components,
  Vue
 ) {
  /**
@ -430,7 +428,6 @@ define([
  };

  MCT.prototype.plugins = plugins;
-  MCT.prototype.components = components.default;

  return MCT;
 });
--- a/src/api/actions/ActionsAPI.js
+++ b/src/api/actions/ActionsAPI.js
@ -92,7 +92,7 @@ class ActionsAPI extends EventEmitter {
    if (this._actionCollections.has(key)) {
      let actionCollection = this._actionCollections.get(key);
      actionCollection.off('destroy', this._updateCachedActionCollections);
-
+      delete actionCollection.applicableActions;
      this._actionCollections.delete(key);
    }
  }
--- a/src/api/annotation/AnnotationAPI.js
+++ b/src/api/annotation/AnnotationAPI.js
@ -100,7 +100,7 @@ export default class AnnotationAPI extends EventEmitter {
      creatable: false,
      cssClass: 'icon-notebook',
      initialize: function (domainObject) {
-        domainObject.targets = domainObject.targets || {};
+        domainObject.targets = domainObject.targets || [];
        domainObject._deleted = domainObject._deleted || false;
        domainObject.originalContextPath = domainObject.originalContextPath || '';
        domainObject.tags = domainObject.tags || [];
@ -117,10 +117,10 @@ export default class AnnotationAPI extends EventEmitter {
   * @property {ANNOTATION_TYPES} annotationType the type of annotation to create (e.g., PLOT_SPATIAL)
   * @property {Tag[]} tags tags to add to the annotation, e.g., SCIENCE for science related annotations
   * @property {String} contentText Some text to add to the annotation, e.g. ("This annotation is about science")
-   * @property {Object<string, Object>} targets The targets ID keystrings and their specific properties.
-   * For plots, this will be a bounding box, e.g.: {maxY: 100, minY: 0, maxX: 100, minX: 0}
+   * @property {Array<Object>} targets The targets ID keystrings and their specific properties.
+   * For plots, this will be a bounding box, e.g.: {keyString: "d8385009-789d-457b-acc7-d50ba2fd55ea", maxY: 100, minY: 0, maxX: 100, minX: 0}
   * For notebooks, this will be an entry ID, e.g.: {entryId: "entry-ecb158f5-d23c-45e1-a704-649b382622ba"}
-   * @property {DomainObject>} targetDomainObjects the targets ID keystrings and the domain objects this annotation points to (e.g., telemetry objects for a plot)
+   * @property {DomainObject>[]} targetDomainObjects the domain objects this annotation points to (e.g., telemetry objects for a plot)
   */
  /**
   * @method create
@ -141,11 +141,15 @@ export default class AnnotationAPI extends EventEmitter {
      throw new Error(`Unknown annotation type: ${annotationType}`);
    }

-    if (!Object.keys(targets).length) {
+    if (!targets.length) {
      throw new Error(`At least one target is required to create an annotation`);
    }

-    if (!Object.keys(targetDomainObjects).length) {
+    if (targets.some((target) => !target.keyString)) {
+      throw new Error(`All targets require a keyString to create an annotation`);
+    }
+
+    if (!targetDomainObjects.length) {
      throw new Error(`At least one targetDomainObject is required to create an annotation`);
    }

@ -181,7 +185,7 @@ export default class AnnotationAPI extends EventEmitter {
    const success = await this.openmct.objects.save(createdObject);
    if (success) {
      this.emit('annotationCreated', createdObject);
-      Object.values(targetDomainObjects).forEach((targetDomainObject) => {
+      targetDomainObjects.forEach((targetDomainObject) => {
        this.#updateAnnotationModified(targetDomainObject);
      });

@ -321,7 +325,10 @@ export default class AnnotationAPI extends EventEmitter {
  }

  #addTagMetaInformationToTags(tags) {
-    return tags.map((tagKey) => {
+    // Convert to Set and back to Array to remove duplicates
+    const uniqueTags = [...new Set(tags)];
+
+    return uniqueTags.map((tagKey) => {
      const tagModel = this.availableTags[tagKey];
      tagModel.tagID = tagKey;

@ -363,7 +370,8 @@ export default class AnnotationAPI extends EventEmitter {
    const modelAddedToResults = await Promise.all(
      results.map(async (result) => {
        const targetModels = await Promise.all(
-          Object.keys(result.targets).map(async (targetID) => {
+          result.targets.map(async (target) => {
+            const targetID = target.keyString;
            const targetModel = await this.openmct.objects.get(targetID);
            const targetKeyString = this.openmct.objects.makeKeyString(targetModel.identifier);
            const originalPathObjects = await this.openmct.objects.getOriginalPath(targetKeyString);
@ -410,13 +418,12 @@ export default class AnnotationAPI extends EventEmitter {
  #breakApartSeparateTargets(results) {
    const separateResults = [];
    results.forEach((result) => {
-      Object.keys(result.targets).forEach((targetID) => {
+      result.targets.forEach((target) => {
+        const targetID = target.keyString;
        const separatedResult = {
          ...result
        };
-        separatedResult.targets = {
-          [targetID]: result.targets[targetID]
-        };
+        separatedResult.targets = [target];
        separatedResult.targetModels = result.targetModels.filter((targetModel) => {
          const targetKeyString = this.openmct.objects.makeKeyString(targetModel.identifier);

--- a/src/api/annotation/AnnotationAPISpec.js
+++ b/src/api/annotation/AnnotationAPISpec.js
@ -62,11 +62,12 @@ describe('The Annotation API', () => {
        key: 'anAnnotationKey',
        namespace: 'fooNameSpace'
      },
-      targets: {
-        'fooNameSpace:some-object': {
+      targets: [
+        {
+          keyString: 'fooNameSpace:some-object',
          entryId: 'fooBarEntry'
        }
-      }
+      ]
    };

    mockObjectProvider = jasmine.createSpyObj('mock provider', ['create', 'update', 'get']);
@ -121,7 +122,7 @@ describe('The Annotation API', () => {
        tags: ['sometag'],
        contentText: 'fooContext',
        targetDomainObjects: [mockDomainObject],
-        targets: { fooTarget: {} }
+        targets: [{ keyString: 'fooTarget' }]
      };
      const annotationObject = await openmct.annotation.create(annotationCreationArguments);
      expect(annotationObject).toBeDefined();
@ -136,7 +137,7 @@ describe('The Annotation API', () => {
        tags: ['sometag'],
        contentText: 'fooContext',
        targetDomainObjects: [mockDomainObject],
-        targets: { fooTarget: {} }
+        targets: [{ keyString: 'fooTarget' }]
      };
      openmct.annotation.setNamespaceToSaveAnnotations('fooNameSpace');
      const annotationObject = await openmct.annotation.create(annotationCreationArguments);
@ -166,7 +167,7 @@ describe('The Annotation API', () => {
          tags: ['sometag'],
          contentText: 'fooContext',
          targetDomainObjects: [mockDomainObject],
-          targets: { fooTarget: {} }
+          targets: [{ keyString: 'fooTarget' }]
        };
        openmct.annotation.setNamespaceToSaveAnnotations('nameespaceThatDoesNotExist');
        await openmct.annotation.create(annotationCreationArguments);
@ -183,7 +184,7 @@ describe('The Annotation API', () => {
          tags: ['sometag'],
          contentText: 'fooContext',
          targetDomainObjects: [mockDomainObject],
-          targets: { fooTarget: {} }
+          targets: [{ keyString: 'fooTarget' }]
        };
        openmct.annotation.setNamespaceToSaveAnnotations('immutableProvider');
        await openmct.annotation.create(annotationCreationArguments);
@ -202,7 +203,7 @@ describe('The Annotation API', () => {
        annotationType: openmct.annotation.ANNOTATION_TYPES.NOTEBOOK,
        tags: ['aWonderfulTag'],
        contentText: 'fooContext',
-        targets: { 'fooNameSpace:some-object': { entryId: 'fooBarEntry' } },
+        targets: [{ keyString: 'fooNameSpace:some-object', entryId: 'fooBarEntry' }],
        targetDomainObjects: [mockDomainObject]
      };
    });
@ -272,17 +273,19 @@ describe('The Annotation API', () => {
    let comparator;

    beforeEach(() => {
-      targets = {
-        fooTarget: {
+      targets = [
+        {
+          keyString: 'fooTarget',
          foo: 42
        }
-      };
-      otherTargets = {
-        fooTarget: {
+      ];
+      otherTargets = [
+        {
+          keyString: 'fooTarget',
          bar: 42
        }
-      };
-      comparator = (t1, t2) => t1.fooTarget.foo === t2.fooTarget.bar;
+      ];
+      comparator = (t1, t2) => t1[0].foo === t2[0].bar;
    });

    it('can add a comparator function', () => {
--- a/src/api/composition/CompositionProvider.js
+++ b/src/api/composition/CompositionProvider.js
@ -185,9 +185,10 @@ export default class CompositionProvider {
      return;
    }

-    this.#publicAPI.objects.eventEmitter.on('mutation', this.#onMutation.bind(this));
+    const onMutation = this.#onMutation.bind(this);
+    this.#publicAPI.objects.eventEmitter.on('mutation', onMutation);
    this.topicListener = () => {
-      this.#publicAPI.objects.eventEmitter.off('mutation', this.#onMutation.bind(this));
+      this.#publicAPI.objects.eventEmitter.off('mutation', onMutation);
    };
  }

--- a/src/api/forms/components/FormRow.vue
+++ b/src/api/forms/components/FormRow.vue
@ -22,9 +22,9 @@

 <template>
  <div class="form-row c-form__row" :class="[{ first: first }, cssClass]" @onChange="onChange">
-    <div class="c-form-row__label" :title="row.description">
+    <label class="c-form-row__label" :title="row.description" :for="`form-${row.key}`">
      {{ row.name }}
-    </div>
+    </label>
    <div class="c-form-row__state-indicator" :class="reqClass"></div>
    <div v-if="row.control" ref="rowElement" class="c-form-row__controls"></div>
  </div>
--- a/src/api/forms/components/controls/Datetime.vue
+++ b/src/api/forms/components/controls/Datetime.vue
@ -123,7 +123,6 @@ export default {
    formatDatetime(timestamp = this.model.value) {
      if (!timestamp) {
        this.resetValues();
-
        return;
      }

@ -137,7 +136,7 @@ export default {

      const data = {
        model,
-        value: timestamp
+        value: new Date(timestamp).toISOString()
      };

      this.$emit('onChange', data);
--- a/src/api/forms/components/controls/TextField.vue
+++ b/src/api/forms/components/controls/TextField.vue
@ -23,7 +23,14 @@
 <template>
  <span class="form-control shell">
    <span class="field control" :class="model.cssClass">
-      <input v-model="field" type="text" :size="model.size" @input="updateText()" />
+      <input
+        :id="`form-${model.key}`"
+        v-model="field"
+        :name="model.key"
+        type="text"
+        :size="model.size"
+        @input="updateText()"
+      />
    </span>
  </span>
 </template>
--- a/src/api/objects/InMemorySearchProvider.js
+++ b/src/api/objects/InMemorySearchProvider.js
@ -435,7 +435,8 @@ class InMemorySearchProvider {
  }

  localIndexAnnotation(objectToIndex, model) {
-    Object.keys(model.targets).forEach((targetID) => {
+    model.targets.forEach((target) => {
+      const targetID = target.keyString;
      if (!this.localIndexedAnnotationsByDomainObject[targetID]) {
        this.localIndexedAnnotationsByDomainObject[targetID] = [];
      }
--- a/src/api/objects/InMemorySearchWorker.js
+++ b/src/api/objects/InMemorySearchWorker.js
@ -57,7 +57,8 @@
  };

  function indexAnnotation(objectToIndex, model) {
-    Object.keys(model.targets).forEach((targetID) => {
+    model.targets.forEach((target) => {
+      const targetID = target.keyString;
      if (!indexedAnnotationsByDomainObject[targetID]) {
        indexedAnnotationsByDomainObject[targetID] = [];
      }
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@ -554,28 +554,34 @@ export default class ObjectAPI {
   */
  async getTelemetryPath(identifier, telemetryIdentifier) {
    const objectDetails = await this.get(identifier);
-    const telemetryPath = [];
-    if (objectDetails.composition && !['folder'].includes(objectDetails.type)) {
-      let sourceTelemetry = objectDetails.composition[0];
+    let telemetryPath = [];
+    if (objectDetails?.type === 'folder') {
+      return telemetryPath;
+    }
+
+    let sourceTelemetry = null;
+    if (telemetryIdentifier && utils.identifierEquals(identifier, telemetryIdentifier)) {
+      sourceTelemetry = identifier;
+    } else if (objectDetails.composition) {
+      sourceTelemetry = objectDetails.composition[0];
      if (telemetryIdentifier) {
-        sourceTelemetry = objectDetails.composition.find(
-          (telemetrySource) =>
-            this.makeKeyString(telemetrySource) === this.makeKeyString(telemetryIdentifier)
+        sourceTelemetry = objectDetails.composition.find((telemetrySource) =>
+          utils.identifierEquals(telemetrySource, telemetryIdentifier)
        );
      }
-      const compositionElement = await this.get(sourceTelemetry);
-      if (!['yamcs.telemetry', 'generator'].includes(compositionElement.type)) {
-        return telemetryPath;
-      }
-      const telemetryKey = compositionElement.identifier.key;
-      const telemetryPathObjects = await this.getOriginalPath(telemetryKey);
-      telemetryPathObjects.forEach((pathObject) => {
-        if (pathObject.type === 'root') {
-          return;
-        }
-        telemetryPath.unshift(pathObject.name);
-      });
    }
+
+    const compositionElement = await this.get(sourceTelemetry);
+    if (!['yamcs.telemetry', 'generator', 'yamcs.aggregate'].includes(compositionElement.type)) {
+      return telemetryPath;
+    }
+
+    const telemetryPathObjects = await this.getOriginalPath(compositionElement.identifier);
+    telemetryPath = telemetryPathObjects
+      .reverse()
+      .filter((pathObject) => pathObject.type !== 'root')
+      .map((pathObject) => pathObject.name);
+
    return telemetryPath;
  }

--- a/src/api/time/TimeContext.js
+++ b/src/api/time/TimeContext.js
@ -42,6 +42,7 @@ class TimeContext extends EventEmitter {
    this.activeClock = undefined;
    this.offsets = undefined;
    this.mode = undefined;
+    this.warnCounts = {};

    this.tick = this.tick.bind(this);
  }
@ -648,6 +649,17 @@ class TimeContext extends EventEmitter {
  }

  #warnMethodDeprecated(method, newMethod) {
+    const MAX_CALLS = 1; // Only warn once per unique method and newMethod combination
+
+    const key = `${method}.${newMethod}`;
+    const currentWarnCount = this.warnCounts[key] || 0;
+
+    if (currentWarnCount >= MAX_CALLS) {
+      return; // Don't warn if already warned once
+    }
+
+    this.warnCounts[key] = currentWarnCount + 1;
+
    let message = `[DEPRECATION WARNING]: The ${method} API method is deprecated and will be removed in a future version of Open MCT.`;

    if (newMethod) {
--- a/src/api/tooltips/ToolTipAPI.js
+++ b/src/api/tooltips/ToolTipAPI.js
@ -57,13 +57,22 @@ class TooltipAPI {
   * @private for platform-internal use
   */
  showTooltip(tooltip) {
+    this.removeAllTooltips();
+    this.activeToolTips.push(tooltip);
+    tooltip.show();
+  }
+
+  /**
+   * API method to allow for removing all tooltips
+   */
+  removeAllTooltips() {
+    if (!this.activeToolTips?.length) {
+      return;
+    }
    for (let i = this.activeToolTips.length - 1; i > -1; i--) {
      this.activeToolTips[i].destroy();
      this.activeToolTips.splice(i, 1);
    }
-    this.activeToolTips.push(tooltip);
-
-    tooltip.show();
  }

  /**
--- a/src/api/tooltips/components/tooltip-component.scss
+++ b/src/api/tooltips/components/tooltip-component.scss
@ -3,6 +3,7 @@
  height: auto;
  width: auto;
  padding: $interiorMargin;
+  overflow-wrap: break-word;
 }

 .c-tooltip {
--- a/src/plugins/autoflow/AutoflowTabularRowController.js
+++ b/src/plugins/autoflow/AutoflowTabularRowController.js
@ -68,7 +68,12 @@ define([], function () {
      this.updateRowData.bind(this)
    );

-    this.openmct.telemetry.request(this.domainObject, { size: 1 }).then(
+    const options = {
+      size: 1,
+      strategy: 'latest',
+      timeContext: this.openmct.time.getContextForView([])
+    };
+    this.openmct.telemetry.request(this.domainObject, options).then(
      function (history) {
        if (!this.initialized && history.length > 0) {
          this.updateRowData(history[history.length - 1]);
--- a/src/plugins/charts/bar/BarGraphPlot.vue
+++ b/src/plugins/charts/bar/BarGraphPlot.vue
@ -86,16 +86,19 @@ export default {
      handler: 'updateData'
    }
  },
+  created() {
+    this.registerListeners();
+  },
  mounted() {
+    this.plotResizeObserver.observe(this.$refs.plotWrapper);
    Plotly.newPlot(this.$refs.plot, Array.from(this.data), this.getLayout(), {
      responsive: true,
      displayModeBar: false
    });
-    this.registerListeners();
  },
  beforeUnmount() {
    if (this.plotResizeObserver) {
-      this.plotResizeObserver.unobserve(this.$refs.plotWrapper);
+      this.plotResizeObserver.disconnect();
      clearTimeout(this.resizeTimer);
    }

@ -226,7 +229,6 @@ export default {
            window.dispatchEvent(new Event('resize'));
          }, 250);
        });
-        this.plotResizeObserver.observe(this.$refs.plotWrapper);
      }
    },
    reset() {
--- a/src/plugins/charts/bar/BarGraphViewProvider.js
+++ b/src/plugins/charts/bar/BarGraphViewProvider.js
@ -43,17 +43,16 @@ export default function BarGraphViewProvider(openmct) {
      return domainObject && domainObject.type === BAR_GRAPH_KEY;
    },

-    view: function (domainObject, objectPath) {
+    view(domainObject, objectPath) {
      let _destroy = null;
      let component = null;

      return {
-        show: function (element) {
+        show(element) {
          let isCompact = isCompactView(objectPath);

          const { vNode, destroy } = mount(
            {
-              el: element,
              components: {
                BarGraphView
              },
@ -79,7 +78,7 @@ export default function BarGraphViewProvider(openmct) {
          _destroy = destroy;
          component = vNode.componentInstance;
        },
-        destroy: function () {
+        destroy() {
          _destroy();
        },
        onClearData() {
--- a/src/plugins/charts/bar/pluginSpec.js
+++ b/src/plugins/charts/bar/pluginSpec.js
@ -220,7 +220,7 @@ describe('the plugin', function () {
    });
  });

-  xdescribe('The spectral plot view for telemetry objects with array values', () => {
+  describe('The spectral plot view for telemetry objects with array values', () => {
    let barGraphObject;
    // eslint-disable-next-line no-unused-vars
    let mockComposition;
@ -256,7 +256,7 @@ describe('the plugin', function () {
      await Vue.nextTick();
    });

-    it('Renders spectral plots', () => {
+    it('Renders spectral plots', async () => {
      const dotFullTelemetryObject = {
        identifier: {
          namespace: 'someNamespace',
@ -304,11 +304,12 @@ describe('the plugin', function () {
      barGraphView.show(child, true);
      mockComposition.emit('add', dotFullTelemetryObject);

-      return Vue.nextTick().then(() => {
-        const plotElement = element.querySelector('.cartesianlayer .scatterlayer .trace .lines');
-        expect(plotElement).not.toBeNull();
-        barGraphView.destroy();
-      });
+      await Vue.nextTick();
+      await Vue.nextTick();
+
+      const plotElement = element.querySelector('.cartesianlayer .scatterlayer .trace .lines');
+      expect(plotElement).not.toBeNull();
+      barGraphView.destroy();
    });
  });

--- a/src/plugins/charts/scatter/ScatterPlotWithUnderlay.vue
+++ b/src/plugins/charts/scatter/ScatterPlotWithUnderlay.vue
@ -115,7 +115,7 @@ export default {
    }

    if (this.plotResizeObserver) {
-      this.plotResizeObserver.unobserve(this.$refs.plotWrapper);
+      this.plotResizeObserver.disconnect();
      clearTimeout(this.resizeTimer);
    }

--- a/src/plugins/charts/scatter/plugin.js
+++ b/src/plugins/charts/scatter/plugin.js
@ -98,9 +98,11 @@ export default function () {
  };

  function getScatterPlotFormControl(openmct) {
+    let destroyComponent;
+
    return {
      show(element, model, onChange) {
-        const { vNode } = mount(
+        const { vNode, destroy } = mount(
          {
            el: element,
            components: {
@ -122,8 +124,12 @@ export default function () {
            element
          }
        );
+        destroyComponent = destroy;

        return vNode;
+      },
+      destroy() {
+        destroyComponent();
      }
    };
  }
--- a/src/plugins/clearData/plugin.js
+++ b/src/plugins/clearData/plugin.js
@ -30,7 +30,7 @@ export default function plugin(appliesToObjects, options = { indicator: true })

  return function install(openmct) {
    if (installIndicator) {
-      const { vNode } = mount(
+      const { vNode, destroy } = mount(
        {
          components: {
            GlobalClearIndicator
@ -49,7 +49,8 @@ export default function plugin(appliesToObjects, options = { indicator: true })
      let indicator = {
        element: vNode.el,
        key: 'global-clear-indicator',
-        priority: openmct.priority.DEFAULT
+        priority: openmct.priority.DEFAULT,
+        destroy: destroy
      };

      openmct.indicators.add(indicator);
--- a/src/plugins/condition/Condition.js
+++ b/src/plugins/condition/Condition.js
@ -65,6 +65,9 @@ export default class Condition extends EventEmitter {

    this.trigger = conditionConfiguration.configuration.trigger;
    this.summary = '';
+    this.handleCriterionUpdated = this.handleCriterionUpdated.bind(this);
+    this.handleOldTelemetryCriterion = this.handleOldTelemetryCriterion.bind(this);
+    this.handleTelemetryStaleness = this.handleTelemetryStaleness.bind(this);
  }

  updateResult(datum) {
@ -195,15 +198,15 @@ export default class Condition extends EventEmitter {
    if (found) {
      const newCriterionConfiguration = this.generateCriterion(criterionConfiguration);
      let newCriterion = new TelemetryCriterion(newCriterionConfiguration, this.openmct);
-      newCriterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-      newCriterion.on('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-      newCriterion.on('telemetryStaleness', () => this.handleTelemetryStaleness());
+      newCriterion.on('criterionUpdated', this.handleCriterionUpdated);
+      newCriterion.on('telemetryIsOld', this.handleOldTelemetryCriterion);
+      newCriterion.on('telemetryStaleness', this.handleTelemetryStaleness);

      let criterion = found.item;
      criterion.unsubscribe();
-      criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-      criterion.off('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-      newCriterion.off('telemetryStaleness', () => this.handleTelemetryStaleness());
+      criterion.off('criterionUpdated', this.handleCriterionUpdated);
+      criterion.off('telemetryIsOld', this.handleOldTelemetryCriterion);
+      newCriterion.off('telemetryStaleness', this.handleTelemetryStaleness);
      this.criteria.splice(found.index, 1, newCriterion);
    }
  }
@ -212,9 +215,9 @@ export default class Condition extends EventEmitter {
    let found = this.findCriterion(id);
    if (found) {
      let criterion = found.item;
-      criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-      criterion.off('telemetryIsOld', (obj) => this.handleOldTelemetryCriterion(obj));
-      criterion.off('telemetryStaleness', () => this.handleTelemetryStaleness());
+      criterion.off('criterionUpdated', this.handleCriterionUpdated);
+      criterion.off('telemetryIsOld', this.handleOldTelemetryCriterion);
+      criterion.off('telemetryStaleness', this.handleTelemetryStaleness);
      criterion.destroy();
      this.criteria.splice(found.index, 1);

--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@ -127,6 +127,7 @@ export default {
    this.composition.off('remove', this.removeTelemetryObject);
    if (this.conditionManager) {
      this.conditionManager.off('conditionSetResultUpdated', this.handleConditionSetResultUpdated);
+      this.conditionManager.off('noTelemetryObjects', this.emitNoTelemetryObjectEvent);
      this.conditionManager.destroy();
    }

--- a/src/plugins/condition/criterion/AllTelemetryCriterion.js
+++ b/src/plugins/condition/criterion/AllTelemetryCriterion.js
@ -201,9 +201,11 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
  }

  requestLAD(telemetryObjects, requestOptions) {
+    //We pass in the global time context here
    let options = {
      strategy: 'latest',
-      size: 1
+      size: 1,
+      timeContext: this.openmct.time.getContextForView([])
    };

    if (requestOptions !== undefined) {
--- a/src/plugins/condition/criterion/TelemetryCriterion.js
+++ b/src/plugins/condition/criterion/TelemetryCriterion.js
@ -189,9 +189,11 @@ export default class TelemetryCriterion extends EventEmitter {
  }

  requestLAD(telemetryObjects, requestOptions) {
+    //We pass in the global time context here
    let options = {
      strategy: 'latest',
-      size: 1
+      size: 1,
+      timeContext: this.openmct.time.getContextForView([])
    };

    if (requestOptions !== undefined) {
--- a/src/plugins/condition/criterion/TelemetryCriterionSpec.js
+++ b/src/plugins/condition/criterion/TelemetryCriterionSpec.js
@ -83,13 +83,19 @@ describe('The telemetry criterion', function () {
    });
    openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry);

-    openmct.time = jasmine.createSpyObj('timeAPI', ['timeSystem', 'bounds', 'getAllTimeSystems']);
+    openmct.time = jasmine.createSpyObj('timeAPI', [
+      'timeSystem',
+      'bounds',
+      'getAllTimeSystems',
+      'getContextForView'
+    ]);
    openmct.time.timeSystem.and.returnValue({ key: 'system' });
    openmct.time.bounds.and.returnValue({
      start: 0,
      end: 1
    });
    openmct.time.getAllTimeSystems.and.returnValue([{ key: 'system' }]);
+    openmct.time.getContextForView.and.returnValue({});

    testCriterionDefinition = {
      id: 'test-criterion-id',
--- a/src/plugins/conditionWidget/components/ConditionWidget.vue
+++ b/src/plugins/conditionWidget/components/ConditionWidget.vue
@ -81,7 +81,7 @@ export default {
      this.listenToConditionSetChanges();
    }
  },
-  beforeUnmount() {
+  unmounted() {
    this.stopListeningToConditionSetChanges();
  },
  methods: {
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@ -170,7 +170,7 @@ define(['lodash'], function (_) {
                if (form) {
                  showForm(form, name, selectionPath);
                } else {
-                  selectionPath[0].context.addElement(name);
+                  openmct.objectViews.emit('contextAction', 'addElement', name);
                }
              },
              key: 'add',
@ -236,7 +236,6 @@ define(['lodash'], function (_) {
            icon: 'icon-trash',
            title: 'Delete the selected object',
            method: function () {
-              let removeItem = selectionPath[1].context.removeItem;
              let prompt = openmct.overlays.dialog({
                iconClass: 'alert',
                message: `Warning! This action will remove this item from the Display Layout. Do you want to continue?`,
@ -245,7 +244,11 @@ define(['lodash'], function (_) {
                    label: 'OK',
                    emphasis: 'true',
                    callback: function () {
-                      removeItem(getAllTypes(selection));
+                      openmct.objectViews.emit(
+                        'contextAction',
+                        'removeItem',
+                        getAllTypes(selection)
+                      );
                      prompt.dismiss();
                    }
                  },
@ -290,7 +293,12 @@ define(['lodash'], function (_) {
              }
            ],
            method: function (option) {
-              selectionPath[1].context.orderItem(option.value, getAllTypes(selectedObjects));
+              openmct.objectViews.emit(
+                'contextAction',
+                'orderItem',
+                option.value,
+                getAllTypes(selectedObjects)
+              );
            }
          };
        }
@ -474,9 +482,7 @@ define(['lodash'], function (_) {
            icon: 'icon-duplicate',
            title: 'Duplicate the selected object',
            method: function () {
-              let duplicateItem = selectionPath[1].context.duplicateItem;
-
-              duplicateItem(selection);
+              openmct.objectViews.emit('contextAction', 'duplicateItem', selection);
            }
          };
        }
@ -555,6 +561,7 @@ define(['lodash'], function (_) {

        function getViewSwitcherMenu(selectedParent, selectionPath, selection) {
          if (selection.length === 1) {
+            // eslint-disable-next-line no-unused-vars
            let displayLayoutContext = selectionPath[1].context;
            let selectedItemContext = selectionPath[0].context;
            let selectedItemType = selectedItemContext.item.type;
@ -574,14 +581,18 @@ define(['lodash'], function (_) {
                label: 'View type',
                options: viewOptions,
                method: function (option) {
-                  displayLayoutContext.switchViewType(selectedItemContext, option.value, selection);
+                  openmct.objectViews.emit(
+                    'contextAction',
+                    'switchViewType',
+                    selectedItemContext,
+                    option.value,
+                    selection
+                  );
                }
              };
            }
          } else if (selection.length > 1) {
            if (areAllViews('telemetry-view', 'layoutItem.type', selection)) {
-              let displayLayoutContext = selectionPath[1].context;
-
              return {
                control: 'menu',
                domainObject: selectedParent,
@ -590,12 +601,15 @@ define(['lodash'], function (_) {
                label: 'View type',
                options: APPLICABLE_VIEWS['telemetry-view-multi'],
                method: function (option) {
-                  displayLayoutContext.mergeMultipleTelemetryViews(selection, option.value);
+                  openmct.objectViews.emit(
+                    'contextAction',
+                    'mergeMultipleTelemetryViews',
+                    selection,
+                    option.value
+                  );
                }
              };
            } else if (areAllViews('telemetry.plot.overlay', 'item.type', selection)) {
-              let displayLayoutContext = selectionPath[1].context;
-
              return {
                control: 'menu',
                domainObject: selectedParent,
@ -603,7 +617,12 @@ define(['lodash'], function (_) {
                title: 'Merge into a stacked plot',
                options: APPLICABLE_VIEWS['telemetry.plot.overlay-multi'],
                method: function (option) {
-                  displayLayoutContext.mergeMultipleOverlayPlots(selection, option.value);
+                  openmct.objectViews.emit(
+                    'contextAction',
+                    'mergeMultipleOverlayPlots',
+                    selection,
+                    option.value
+                  );
                }
              };
            }
@ -627,7 +646,7 @@ define(['lodash'], function (_) {
            domainObject: displayLayoutContext.item,
            icon: ICON_GRID_SHOW,
            method: function () {
-              displayLayoutContext.toggleGrid();
+              openmct.objectViews.emit('contextAction', 'toggleGrid');

              this.icon = this.icon === ICON_GRID_SHOW ? ICON_GRID_HIDE : ICON_GRID_SHOW;
            },
@ -653,7 +672,7 @@ define(['lodash'], function (_) {

        function showForm(formStructure, name, selectionPath) {
          openmct.forms.showForm(formStructure).then((changes) => {
-            selectionPath[0].context.addElement(name, changes);
+            openmct.objectViews.emit('contextAction', 'addElement', name, changes);
          });
        }

--- a/src/plugins/displayLayout/components/BoxView.vue
+++ b/src/plugins/displayLayout/components/BoxView.vue
@ -25,14 +25,16 @@
    :item="item"
    :grid-size="gridSize"
    :is-editing="isEditing"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
+    @move="move"
+    @endMove="endMove"
  >
-    <div
-      class="c-box-view u-style-receiver js-style-receiver"
-      :class="[styleClass]"
-      :style="style"
-    ></div>
+    <template #content>
+      <div
+        class="c-box-view u-style-receiver js-style-receiver"
+        :class="[styleClass]"
+        :style="style"
+      ></div>
+    </template>
  </layout-frame>
 </template>

@ -115,10 +117,18 @@ export default {
      this.initSelect
    );
  },
-  unmounted() {
+  beforeUnmount() {
    if (this.removeSelectable) {
      this.removeSelectable();
    }
+  },
+  methods: {
+    move(gridDelta) {
+      this.$emit('move', gridDelta);
+    },
+    endMove() {
+      this.$emit('endMove');
+    }
  }
 };
 </script>
--- a/src/plugins/displayLayout/components/DisplayLayout.vue
+++ b/src/plugins/displayLayout/components/DisplayLayout.vue
@ -144,7 +144,7 @@ function getItemDefinition(itemType, ...options) {

 export default {
  components: components,
-  inject: ['openmct', 'objectPath', 'options', 'objectUtils', 'currentView'],
+  inject: ['openmct', 'objectPath', 'options', 'currentView'],
  props: {
    domainObject: {
      type: Object,
@ -221,13 +221,21 @@ export default {
    this.composition.load();
    this.gridDimensions = [this.$el.offsetWidth, this.$el.scrollHeight];

-    this.openmct.objects.observe(this.domainObject, 'configuration.items', (items) => {
-      this.layoutItems = items;
-    });
+    this.unObserveItems = this.openmct.objects.observe(
+      this.domainObject,
+      'configuration.items',
+      (items) => {
+        this.layoutItems = [...items];
+      }
+    );

    this.watchDisplayResize();
  },
-  unmounted() {
+  beforeUnmount() {
+    if (this.unObserveItems) {
+      this.unObserveItems();
+    }
+    this.unwatchDisplayResize();
    this.openmct.selection.off('change', this.setSelection);
    this.composition.off('add', this.addChild);
    this.composition.off('remove', this.removeChild);
@ -251,9 +259,15 @@ export default {
      this.$el.click();
    },
    watchDisplayResize() {
-      const resizeObserver = new ResizeObserver(() => this.updateGrid());
+      this.unwatchDisplayResize();
+      this.resizeObserver = new ResizeObserver(this.updateGrid);

-      resizeObserver.observe(this.$el);
+      this.resizeObserver.observe(this.$el);
+    },
+    unwatchDisplayResize() {
+      if (this.resizeObserver) {
+        this.resizeObserver.disconnect();
+      }
    },
    addElement(itemType, element) {
      this.addItem(itemType + '-view', element);
@ -623,7 +637,7 @@ export default {
          return this.openmct.objects.makeKeyString(item.identifier) !== keyString;
        }
      });
-      this.layoutItems = layoutItems;
+      this.layoutItems = [...layoutItems];
      this.mutate('configuration.items', layoutItems);
      this.clearSelection();
    },
--- a/src/plugins/displayLayout/components/EllipseView.vue
+++ b/src/plugins/displayLayout/components/EllipseView.vue
@ -25,14 +25,16 @@
    :item="item"
    :grid-size="gridSize"
    :is-editing="isEditing"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
+    @move="move"
+    @endMove="endMove"
  >
-    <div
-      class="c-ellipse-view u-style-receiver js-style-receiver"
-      :class="[styleClass]"
-      :style="style"
-    ></div>
+    <template #content>
+      <div
+        class="c-ellipse-view u-style-receiver js-style-receiver"
+        :class="[styleClass]"
+        :style="style"
+      ></div>
+    </template>
  </layout-frame>
 </template>

@ -115,10 +117,18 @@ export default {
      this.initSelect
    );
  },
-  unmounted() {
+  beforeUnmount() {
    if (this.removeSelectable) {
      this.removeSelectable();
    }
+  },
+  methods: {
+    move(gridDelta) {
+      this.$emit('move', gridDelta);
+    },
+    endMove() {
+      this.$emit('endMove');
+    }
  }
 };
 </script>
--- a/src/plugins/displayLayout/components/ImageView.vue
+++ b/src/plugins/displayLayout/components/ImageView.vue
@ -25,10 +25,12 @@
    :item="item"
    :grid-size="gridSize"
    :is-editing="isEditing"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
+    @move="move"
+    @endMove="endMove"
  >
-    <div class="c-image-view" :class="[styleClass]" :style="style"></div>
+    <template #content>
+      <div class="c-image-view" :style="style"></div>
+    </template>
  </layout-frame>
 </template>

@ -118,10 +120,18 @@ export default {
      this.initSelect
    );
  },
-  unmounted() {
+  beforeUnmount() {
    if (this.removeSelectable) {
      this.removeSelectable();
    }
+  },
+  methods: {
+    move(gridDelta) {
+      this.$emit('move', gridDelta);
+    },
+    endMove() {
+      this.$emit('endMove');
+    }
  }
 };
 </script>
--- a/src/plugins/displayLayout/components/LayoutFrame.vue
+++ b/src/plugins/displayLayout/components/LayoutFrame.vue
@ -29,7 +29,7 @@
    }"
    :style="style"
  >
-    <slot></slot>
+    <slot name="content"></slot>
    <div class="c-frame__move-bar" @mousedown.left="startMove($event)"></div>
  </div>
 </template>
--- a/src/plugins/displayLayout/components/SubobjectView.vue
+++ b/src/plugins/displayLayout/components/SubobjectView.vue
@ -24,19 +24,21 @@
    :item="item"
    :grid-size="gridSize"
    :is-editing="isEditing"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
+    @move="move"
+    @endMove="endMove"
  >
-    <object-frame
-      v-if="domainObject"
-      ref="objectFrame"
-      :domain-object="domainObject"
-      :object-path="currentObjectPath"
-      :has-frame="item.hasFrame"
-      :show-edit-view="false"
-      :layout-font-size="item.fontSize"
-      :layout-font="item.font"
-    />
+    <template #content>
+      <ObjectFrame
+        v-if="domainObject"
+        ref="objectFrame"
+        :domain-object="domainObject"
+        :object-path="currentObjectPath"
+        :has-frame="item.hasFrame"
+        :show-edit-view="false"
+        :layout-font-size="item.fontSize"
+        :layout-font="item.font"
+      />
+    </template>
  </layout-frame>
 </template>

@ -104,8 +106,7 @@ export default {
  data() {
    return {
      domainObject: undefined,
-      currentObjectPath: [],
-      mutablePromise: undefined
+      currentObjectPath: []
    };
  },
  watch: {
@ -168,6 +169,12 @@ export default {
          delete this.immediatelySelect;
        }
      });
+    },
+    move(gridDelta) {
+      this.$emit('move', gridDelta);
+    },
+    endMove() {
+      this.$emit('endMove');
    }
  }
 };
--- a/src/plugins/displayLayout/components/TelemetryView.vue
+++ b/src/plugins/displayLayout/components/TelemetryView.vue
@ -25,42 +25,44 @@
    :item="item"
    :grid-size="gridSize"
    :is-editing="isEditing"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
+    @move="move"
+    @endMove="endMove"
  >
-    <div
-      v-if="domainObject"
-      ref="telemetryViewWrapper"
-      class="c-telemetry-view u-style-receiver"
-      :class="[itemClasses]"
-      :style="styleObject"
-      :data-font-size="item.fontSize"
-      :data-font="item.font"
-      @contextmenu.prevent="showContextMenu"
-      @mouseover.ctrl="showToolTip"
-      @mouseleave="hideToolTip"
-    >
-      <div class="is-status__indicator" :title="`This item is ${status}`"></div>
-      <div v-if="showLabel" class="c-telemetry-view__label">
-        <div class="c-telemetry-view__label-text">
-          {{ domainObject.name }}
-        </div>
-      </div>
-
+    <template #content>
      <div
-        v-if="showValue"
-        :title="fieldName"
-        class="c-telemetry-view__value"
-        :class="[telemetryClass]"
+        v-if="domainObject"
+        ref="telemetryViewWrapper"
+        class="c-telemetry-view u-style-receiver"
+        :class="[itemClasses]"
+        :style="styleObject"
+        :data-font-size="item.fontSize"
+        :data-font="item.font"
+        @contextmenu.prevent="showContextMenu"
+        @mouseover.ctrl="showToolTip"
+        @mouseleave="hideToolTip"
      >
-        <div class="c-telemetry-view__value-text">
-          {{ telemetryValue }}
-          <span v-if="unit && item.showUnits" class="c-telemetry-view__value-text__unit">
-            {{ unit }}
-          </span>
+        <div class="is-status__indicator" :title="`This item is ${status}`"></div>
+        <div v-if="showLabel" class="c-telemetry-view__label">
+          <div class="c-telemetry-view__label-text">
+            {{ domainObject.name }}
+          </div>
+        </div>
+
+        <div
+          v-if="showValue"
+          :title="fieldName"
+          class="c-telemetry-view__value"
+          :class="[telemetryClass]"
+        >
+          <div class="c-telemetry-view__value-text">
+            {{ telemetryValue }}
+            <span v-if="unit && item.showUnits" class="c-telemetry-view__value-text__unit">
+              {{ unit }}
+            </span>
+          </div>
        </div>
      </div>
-    </div>
+    </template>
  </layout-frame>
 </template>

@ -387,6 +389,12 @@ export default {
    async showToolTip() {
      const { BELOW } = this.openmct.tooltips.TOOLTIP_LOCATIONS;
      this.buildToolTip(await this.getObjectPath(), BELOW, 'telemetryViewWrapper');
+    },
+    move(gridDelta) {
+      this.$emit('move', gridDelta);
+    },
+    endMove() {
+      this.$emit('endMove');
    }
  }
 };
--- a/src/plugins/displayLayout/components/TextView.vue
+++ b/src/plugins/displayLayout/components/TextView.vue
@ -25,18 +25,20 @@
    :item="item"
    :grid-size="gridSize"
    :is-editing="isEditing"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
+    @move="move"
+    @endMove="endMove"
  >
-    <div
-      class="c-text-view u-style-receiver js-style-receiver"
-      :data-font-size="item.fontSize"
-      :data-font="item.font"
-      :class="[styleClass]"
-      :style="style"
-    >
-      <div class="c-text-view__text">{{ item.text }}</div>
-    </div>
+    <template #content>
+      <div
+        class="c-text-view u-style-receiver js-style-receiver"
+        :data-font-size="item.fontSize"
+        :data-font="item.font"
+        :class="[styleClass]"
+        :style="style"
+      >
+        <div class="c-text-view__text">{{ item.text }}</div>
+      </div>
+    </template>
  </layout-frame>
 </template>

@ -127,10 +129,18 @@ export default {
      this.initSelect
    );
  },
-  unmounted() {
+  beforeUnmount() {
    if (this.removeSelectable) {
      this.removeSelectable();
    }
+  },
+  methods: {
+    move(gridDelta) {
+      this.$emit('move', gridDelta);
+    },
+    endMove() {
+      this.$emit('endMove');
+    }
  }
 };
 </script>
--- a/src/plugins/displayLayout/plugin.js
+++ b/src/plugins/displayLayout/plugin.js
@ -20,14 +20,14 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-import AlphaNumericFormatViewProvider from './AlphanumericFormatViewProvider.js';
+import mount from 'utils/mount';
+
 import CopyToClipboardAction from './actions/CopyToClipboardAction';
+import AlphaNumericFormatViewProvider from './AlphanumericFormatViewProvider.js';
 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';
-import mount from 'utils/mount';

 class DisplayLayoutView {
  constructor(openmct, domainObject, objectPath, options) {
@ -37,7 +37,6 @@ class DisplayLayoutView {
    this.options = options;

    this.component = null;
-    this.app = null;
  }

  show(container, isEditing) {
@ -51,7 +50,6 @@ class DisplayLayoutView {
          openmct: this.openmct,
          objectPath: this.objectPath,
          options: this.options,
-          objectUtils,
          currentView: this
        },
        data: () => {
@ -83,20 +81,17 @@ class DisplayLayoutView {
  getSelectionContext() {
    return {
      item: this.domainObject,
-      supportsMultiSelect: true,
-      addElement: this.component && this.component.$refs.displayLayout.addElement,
-      removeItem: this.component && this.component.$refs.displayLayout.removeItem,
-      orderItem: this.component && this.component.$refs.displayLayout.orderItem,
-      duplicateItem: this.component && this.component.$refs.displayLayout.duplicateItem,
-      switchViewType: this.component && this.component.$refs.displayLayout.switchViewType,
-      mergeMultipleTelemetryViews:
-        this.component && this.component.$refs.displayLayout.mergeMultipleTelemetryViews,
-      mergeMultipleOverlayPlots:
-        this.component && this.component.$refs.displayLayout.mergeMultipleOverlayPlots,
-      toggleGrid: this.component && this.component.$refs.displayLayout.toggleGrid
+      supportsMultiSelect: true
    };
  }

+  contextAction() {
+    const action = arguments[0];
+    if (this.component && this.component.$refs.displayLayout[action]) {
+      this.component.$refs.displayLayout[action](...Array.from(arguments).splice(1));
+    }
+  }
+
  onEditModeChange(isEditing) {
    this.component.isEditing = isEditing;
  }
@ -104,6 +99,7 @@ class DisplayLayoutView {
  destroy() {
    if (this._destroy) {
      this._destroy();
+      this.component = undefined;
    }
  }
 }
--- a/src/plugins/duplicate/DuplicateTask.js
+++ b/src/plugins/duplicate/DuplicateTask.js
@ -221,6 +221,8 @@ export default class DuplicateTask {
      // parse reviver to replace identifiers
      clonedParent = JSON.parse(clonedParent, (key, value) => {
        if (
+          value !== null &&
+          value !== undefined &&
          Object.prototype.hasOwnProperty.call(value, 'key') &&
          Object.prototype.hasOwnProperty.call(value, 'namespace') &&
          value.key === oldId.key &&
--- a/src/plugins/flexibleLayout/components/container.vue
+++ b/src/plugins/flexibleLayout/components/container.vue
@ -122,7 +122,6 @@ export default {
  mounted() {
    let context = {
      item: this.$parent.domainObject,
-      addContainer: this.addContainer,
      type: 'container',
      containerId: this.container.id
    };
--- a/src/plugins/flexibleLayout/components/flexibleLayout.vue
+++ b/src/plugins/flexibleLayout/components/flexibleLayout.vue
@ -37,7 +37,6 @@
      <template v-for="(container, index) in containers" :key="`component-${container.id}`">
        <drop-hint
          v-if="index === 0 && containers.length > 1"
-          :key="`hint-top-${container.id}`"
          class="c-fl-frame__drop-hint"
          :index="-1"
          :allow-drop="allowContainerDrop"
@ -59,7 +58,6 @@

        <resize-handle
          v-if="index !== containers.length - 1"
-          :key="`handle-${container.id}`"
          :index="index"
          :orientation="rowsLayout ? 'vertical' : 'horizontal'"
          :is-editing="isEditing"
@ -70,7 +68,6 @@

        <drop-hint
          v-if="containers.length > 1"
-          :key="`hint-bottom-${container.id}`"
          class="c-fl-frame__drop-hint"
          :index="index"
          :allow-drop="allowContainerDrop"
@ -137,15 +134,16 @@ export default {
    ResizeHandle,
    DropHint
  },
-  inject: ['openmct', 'objectPath', 'layoutObject'],
+  inject: ['openmct', 'objectPath', 'domainObject'],
  props: {
    isEditing: Boolean
  },
  data() {
    return {
-      domainObject: this.layoutObject,
      newFrameLocation: [],
-      identifierMap: {}
+      identifierMap: {},
+      containers: this.domainObject.configuration.containers,
+      rowsLayout: this.domainObject.configuration.rowsLayout
    };
  },
  computed: {
@ -156,26 +154,42 @@ export default {
        return 'Columns';
      }
    },
-    containers() {
-      return this.domainObject.configuration.containers;
-    },
-    rowsLayout() {
-      return this.domainObject.configuration.rowsLayout;
-    },
    allContainersAreEmpty() {
      return this.containers.every((container) => container.frames.length === 0);
    }
  },
-  mounted() {
+  created() {
    this.buildIdentifierMap();
    this.composition = this.openmct.composition.get(this.domainObject);
    this.composition.on('remove', this.removeChildObject);
    this.composition.on('add', this.addFrame);
    this.composition.load();
+    this.unObserveContainers = this.openmct.objects.observe(
+      this.domainObject,
+      'configuration.containers',
+      (containers) => {
+        this.containers = containers;
+      }
+    );
+    this.unObserveRowsLayout = this.openmct.objects.observe(
+      this.domainObject,
+      'configuration.rowsLayout',
+      (rowsLayout) => {
+        this.rowsLayout = rowsLayout;
+      }
+    );
  },
  beforeUnmount() {
    this.composition.off('remove', this.removeChildObject);
    this.composition.off('add', this.addFrame);
+
+    if (this.unObserveContainers) {
+      this.unObserveContainers();
+    }
+
+    if (this.unObserveRowsLayout) {
+      this.unObserveRowsLayout();
+    }
  },
  methods: {
    containsObject(identifier) {
@ -211,20 +225,16 @@ export default {
      let container = this.containers.filter((c) => c.id === containerId)[0];
      let containerIndex = this.containers.indexOf(container);

-      /*
-                remove associated domainObjects from composition
-            */
+      // remove associated domainObjects from composition
      container.frames.forEach((f) => {
        this.removeFromComposition(f.domainObjectIdentifier);
      });

      this.containers.splice(containerIndex, 1);

-      /*
-                add a container when there are no containers in the FL,
-                to prevent user from not being able to add a frame via
-                drag and drop.
-            */
+      // add a container when there are no containers in the FL,
+      // to prevent user from not being able to add a frame via
+      // drag and drop.
      if (this.containers.length === 0) {
        this.containers.push(new Container(100));
      }
--- a/src/plugins/flexibleLayout/components/frame.vue
+++ b/src/plugins/flexibleLayout/components/frame.vue
@ -142,6 +142,9 @@ export default {
          childContext.item = this.domainObject;
          childContext.type = 'frame';
          childContext.frameId = this.frame.id;
+          if (this.unsubscribeSelection) {
+            this.unsubscribeSelection();
+          }
          this.unsubscribeSelection = this.openmct.selection.selectable(
            this.$refs.frame,
            childContext,
--- a/src/plugins/flexibleLayout/components/resizeHandle.vue
+++ b/src/plugins/flexibleLayout/components/resizeHandle.vue
@ -56,7 +56,7 @@ export default {
    document.addEventListener('dragend', this.unsetDragging);
    document.addEventListener('drop', this.unsetDragging);
  },
-  unmounted() {
+  beforeUnmount() {
    document.removeEventListener('dragstart', this.setDragging);
    document.removeEventListener('dragend', this.unsetDragging);
    document.removeEventListener('drop', this.unsetDragging);
--- a/src/plugins/flexibleLayout/flexibleLayoutViewProvider.js
+++ b/src/plugins/flexibleLayout/flexibleLayoutViewProvider.js
@ -47,17 +47,16 @@ export default class FlexibleLayoutViewProvider {
    let component = null;

    return {
-      show: function (element, isEditing) {
+      show(element, isEditing) {
        const { vNode, destroy } = mount(
          {
-            el: element,
            components: {
              FlexibleLayoutComponent
            },
            provide: {
-              openmct: openmct,
+              openmct,
              objectPath,
-              layoutObject: domainObject
+              domainObject
            },
            data() {
              return {
@ -75,19 +74,22 @@ export default class FlexibleLayoutViewProvider {
        component = vNode.componentInstance;
        _destroy = destroy;
      },
-      getSelectionContext: function () {
+      getSelectionContext() {
        return {
          item: domainObject,
-          addContainer: component.$refs.flexibleLayout.addContainer,
-          deleteContainer: component.$refs.flexibleLayout.deleteContainer,
-          deleteFrame: component.$refs.flexibleLayout.deleteFrame,
          type: 'flexible-layout'
        };
      },
-      onEditModeChange: function (isEditing) {
+      contextAction() {
+        const action = arguments[0];
+        if (component && component.$refs.flexibleLayout[action]) {
+          component.$refs.flexibleLayout[action](...Array.from(arguments).splice(1));
+        }
+      },
+      onEditModeChange(isEditing) {
        component.isEditing = isEditing;
      },
-      destroy: function (element) {
+      destroy() {
        if (_destroy) {
          _destroy();
          component = null;
--- a/src/plugins/flexibleLayout/pluginSpec.js
+++ b/src/plugins/flexibleLayout/pluginSpec.js
@ -33,6 +33,10 @@ describe('the plugin', function () {
  let mockComposition;

  const testViewObject = {
+    identifier: {
+      namespace: '',
+      key: 'test-object'
+    },
    id: 'test-object',
    type: 'flexible-layout',
    configuration: {
@ -116,6 +120,10 @@ describe('the plugin', function () {

    beforeEach(() => {
      flexibleLayoutItem = {
+        identifier: {
+          namespace: '',
+          key: 'test-object'
+        },
        id: 'test-object',
        type: 'flexible-layout',
        configuration: {
--- a/src/plugins/flexibleLayout/toolbarProvider.js
+++ b/src/plugins/flexibleLayout/toolbarProvider.js
@ -89,8 +89,6 @@ function ToolbarProvider(openmct) {
          control: 'button',
          domainObject: primary.context.item,
          method: function () {
-            let deleteFrameAction = tertiary.context.deleteFrame;
-
            let prompt = openmct.overlays.dialog({
              iconClass: 'alert',
              message: `This action will remove this frame from this Flexible Layout. Do you want to continue?`,
@ -99,7 +97,11 @@ function ToolbarProvider(openmct) {
                  label: 'OK',
                  emphasis: 'true',
                  callback: function () {
-                    deleteFrameAction(primary.context.frameId);
+                    openmct.objectViews.emit(
+                      'contextAction',
+                      'deleteFrame',
+                      primary.context.frameId
+                    );
                    prompt.dismiss();
                  }
                },
@ -136,7 +138,9 @@ function ToolbarProvider(openmct) {
        addContainer = {
          control: 'button',
          domainObject: tertiary.context.item,
-          method: tertiary.context.addContainer,
+          method: function () {
+            openmct.objectViews.emit('contextAction', 'addContainer', ...arguments);
+          },
          key: 'add',
          icon: 'icon-plus-in-rect',
          title: 'Add Container'
@ -152,7 +156,6 @@ function ToolbarProvider(openmct) {
          control: 'button',
          domainObject: primary.context.item,
          method: function () {
-            let removeContainer = secondary.context.deleteContainer;
            let containerId = primary.context.containerId;

            let prompt = openmct.overlays.dialog({
@ -164,7 +167,7 @@ function ToolbarProvider(openmct) {
                  label: 'OK',
                  emphasis: 'true',
                  callback: function () {
-                    removeContainer(containerId);
+                    openmct.objectViews.emit('contextAction', 'deleteContainer', containerId);
                    prompt.dismiss();
                  }
                },
@ -185,7 +188,9 @@ function ToolbarProvider(openmct) {
        addContainer = {
          control: 'button',
          domainObject: secondary.context.item,
-          method: secondary.context.addContainer,
+          method: function () {
+            openmct.objectViews.emit('contextAction', 'addContainer', ...arguments);
+          },
          key: 'add',
          icon: 'icon-plus-in-rect',
          title: 'Add Container'
@ -198,7 +203,9 @@ function ToolbarProvider(openmct) {
        addContainer = {
          control: 'button',
          domainObject: primary.context.item,
-          method: primary.context.addContainer,
+          method: function () {
+            openmct.objectViews.emit('contextAction', 'addContainer', ...arguments);
+          },
          key: 'add',
          icon: 'icon-plus-in-rect',
          title: 'Add Container'
--- a/src/plugins/gauge/GaugePlugin.js
+++ b/src/plugins/gauge/GaugePlugin.js
@ -167,9 +167,11 @@ export default function () {
  };

  function getGaugeFormController(openmct) {
+    let destroyComponent;
+
    return {
      show(element, model, onChange) {
-        const { vNode } = mount(
+        const { vNode, destroy } = mount(
          {
            el: element,
            components: {
@ -191,8 +193,12 @@ export default function () {
            element
          }
        );
+        destroyComponent = destroy;

        return vNode.componentInstance;
+      },
+      destroy() {
+        destroyComponent();
      }
    };
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shefali Joshi	133e7c3071	cherry-pick(#7096 ): Catchall for bug fix PRs and add performance category (#7100 ) cherry-pick(7096): Catchall for bug fix PRs and add performance category (#7096) * Catchall for bug fix PRs and add performance category * Move Bug fixes to the bottom * Fix performance label	2023-09-29 10:46:08 -07:00
Jesse Mazzella	f13ed680c2	cherry-pick(#7090 ): chore: add `release.yml` (#7095 ) Co-authored-by: Shefali Joshi <simplyrender@gmail.com>	2023-09-27 14:59:22 -07:00
Jesse Mazzella	23b7e92836	cherry-pick(#7075 ): 🙅🚮␡ Remove`openmct.components` ␡🚮🙅 (#7079 ) 🙅🚮␡`openmct.components`␡🚮🙅 Co-authored-by: Andrew Henry <akhenry@gmail.com> Co-authored-by: Shefali Joshi <simplyrender@gmail.com>	2023-09-21 22:23:56 +00:00
Jesse Mazzella	d4e2716298	cherry-pick(#7065 ): Have annotations work with domain objects that ha… (#7078 ) cherry-pick(#7065): Have annotations work with domain objects that have dots * migrating to new structure - wip * notebooks work, now to plots and images * resolve conflicts * fix search * add to readme * spelling * fix unit test * add search by view for big search speedup * spelling * fix out of order search * improve reliability of plot tagging tests	2023-09-21 15:13:57 -07:00
Andrew Henry	af4ef8c0ba	cherry pick(#7073 ): Fix Mojibake (#7076 ) Fix mojibake (#7073) Add charset preamble to generated css	2023-09-21 18:05:39 +00:00
Jesse Mazzella	28e4453218	chore: bump version to `3.0.2` (#7071 )	2023-09-20 11:31:41 -07:00
Jesse Mazzella	97deec2c92	cherry-pick(#7057 ): Memory leak fixes for several views (#7070 ) * Change the mount utility to use Vue's createApp and defineComponent methods * Fix display layout memory leaks caused by `getSelectionContext` * fix some display layout leaks due to use of slots * Fix imagery memory leak (removed span tag). NOTE: CompassRose svg leaks memory - must test on firefox to see if this is a Chrome leak. * Fix ActionsAPI action collection and applicable actions leak. * Fix flexible layout memory leaks - remove listeners on unmount. NOTE: One type of overlay plot (Rover Yaw) is still leaking. * pass in the el on mount * e2e test config and spec changes * Remove mounting of limit lines. Use components directly * test: remove `.only()` * Fix display layout memory leaks * Enable passing tests * e2e README and appActions should be what master has. * lint: add word to cspell list * lint: fixes * lint:fix * fix: revert `el` change * fix: remove empty span * fix: creating shapes in displayLayout * fix: avoid `splice` as it loses reactivity * test: reduce timeout time * quick fixes * add prod mode and convert the test config to select the correct mode * Fix webpack prod config * Add launch flag for exposing window.gc * never worked * explicit naming * rename * We don't need to destroy view providers * test: increase timeout time * test: unskip all mem tests * fix(vue-loader): disable static hoisting * chore: run `test:perf:memory` * Don't destroy view providers * Move context menu once listener to beforeUnmount instead. * Disconnect all resize observers on unmount * Delete Test vue component * Use beforeUnmount and remove splice(0) in favor of [] for emptying arrays * re-structure * fix: unregister listener in pane.vue * test: tweak timeouts * chore: lint:fix * test: unskip perf tests * fix: unregister events properly * fix: unregister listener * fix: unregister listener * fix: unregister listener * fix: use `unmounted()` * fix: unregister listeners * fix: unregister listener properly * chore: lint:fix * test: fix imagery layer toggle test * test: increase timeout * Don't use anonymous functions for listeners * Destroy objects and event listeners properly * Delete config stores that are created by components * Use the right unmount hook. Destroy mounted view on unmount. * Use unmounted, not beforeUnmounted * Lint fixes * Fix time strip memory leak * Undo unneeded change for memory leaks. * chore: combine common webpack configs --------- Co-authored-by: Shefali Joshi <simplyrender@gmail.com> Co-authored-by: John Hill <john.c.hill@nasa.gov>	2023-09-20 10:59:15 -07:00
Andrew Henry	4f559fdccf	cherry-pick(#7052 ): Allow Data Visualization in inspector based on current selection (#7062 ) Allow Data Visualization in inspector based on current selection (#7052) * visualize data in inspector per selection --------- Co-authored-by: David Tsay <3614296+davetsay@users.noreply.github.com> Co-authored-by: Khalid Adil <khalidadil29@gmail.com> Co-authored-by: John Hill <john.c.hill@nasa.gov>	2023-09-18 17:12:18 -05:00
Jesse Mazzella	b923af8705	cherry-pick(#6990 ): Fix and re-enable disabled unit test suites (#7049 ) * fix: register event listeners etc in `created()` hook * fix: initialize `stalenessSubscription` before composition load and in `created()` hook * refactor(test): make `openmct` const * refactor: update overlayPlot spec to Vue 3 and fix tests * refactor: fix eslint errors * refactor: move initialization steps to `created()` hook * test: re-enable and fix stackedPlot test suite * fix: `hideTree=true` hides the tree again * fix: add back in check on mount * test: fix Layout tests * fix: BarGraph test * fix: plot inspector tests * fix: reenable grand search tests * fix: inspectorStyles test suite * fix: re-enable most timeline tests * fix: no need to hideTree in appactions * fix: re-enable more tests * test: re-enable more tests * test: re-enable most plot tests * chore: `lint:fix` * test: re-enable timelist suite * fix(#7016): timers count down or up to a target date * test: add regression tests to cover disabled unit tests * refactor: lint:fix * refactor: no need for momentjs here * fix: timerAction missed refactor * fix: ensure timestamp is always UTC string * test: use role selectors * docs: add instructions for clock override in e2e * docs: update * Update readme * lint * spelling fixes --------- Co-authored-by: Scott Bell <scott@traclabs.com> Co-authored-by: John Hill <john.c.hill@nasa.gov>	2023-09-12 10:54:19 -07:00
Jesse Mazzella	cbe49674e3	cherry-pick(#6901 ): chore: bump Playwright to `1.36.2` (#7051 ) * chore: bump Playwright to `1.36.2` * chore: remove `playwright/core` dependency * chore: temporarily disable cacheing step * chore: temp disable cacheing for e2e-couchdb run * chore: restore cacheing step * chore: remove `--prefer-offline` option	2023-09-12 17:32:39 +00:00
Jesse Mazzella	1f7dd12315	cherry-pick(#5585 ): Light refactor of visual tests (#7044 ) Co-authored-by: John Hill <john.c.hill@nasa.gov>	2023-09-11 15:02:25 -07:00
Jesse Mazzella	0b949d16f0	chore: bump version to `3.0.1` (#7013 )	2023-08-28 21:15:33 -07:00
Shefali Joshi	1423c23297	cherry-pick(#7003 ): Imagery layer checkbox should match layer visibility (#7004 ) cherry-pick(6266): Imagery layer checkbox should match layer visiblity (#7003) Set layer visibility to false if layer visibility cannot be persisted	2023-08-28 10:48:10 -07:00
Shefali Joshi	b043f26e49	cherry-pick(#6960 ): Add strategy latest and timeContext to auto flow tabular and gauge views (#6981 ) cherry-pick(#6960): Add strategy latest and timeContext to auto flow tabular and gauge views (#6960)	2023-08-21 17:45:55 -07:00
Shefali Joshi	856d88597e	cherry-pick(#6948 ): Ensure that dynamically created vue components are destroyed (#6958 ) cherry-pick(6984): Ensure that dynamically created vue components are destroyed. (#6948) Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>	2023-08-21 11:41:06 -07:00
Shefali Joshi	c3ac07ebaf	cherry-pick(#6929 ): Condition sets now provide the timeContext they're using when sending requests (#6959 ) cherry-pick(6929): Condition sets now provide the timeContext they're using when sending requests (#6929) * Send in the timeContext for requests * Fix failing test --------- Co-authored-by: Scott Bell <scott@traclabs.com>	2023-08-21 11:31:15 -07:00
Khalid Adil	2002396d0e	cherry-pick(#6916 ): [Tooltips] Fixes for dictionary objects and self-referential objects (#6950 ) [Tooltips] Fixes for dictionary objects and self-referential objects (#6916) * Fix getTelemetryPath to handle cases where parent is the same as the child, handle yamcs aggregate telemetry, and fix how identifiers are passed in * Cleanup getTelemetryPath * Switch to filter instead of forEach * Get path item names * Remove tooltips on scroll of tree * Remove handing for scroll * Allow break-words * Cleanup	2023-08-17 10:19:42 -07:00
Scott Bell	7980abcb38	cherry-pick(#6927 ): Recent objects do not update when object names are changed (#6949 ) Recent objects do not update when object names are changed (#6927) * fix tree name issue * add name to key, and name observers to recent objects * no need to change key * make more of app reactive to name changes * fix browse bar and document title * listen in properties for name changes * add tests for renaming * yeah spelling linter * add semantic tags to forms and fixup tests * change purpose * actually delete the listener * ensuring deletion --------- Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>	2023-08-17 09:13:11 -07:00
Jesse Mazzella	dedfd3b6f7	cherry-pick(#6933 ): fix(e2e): Stabilize ITC tests (#6947 ) * cherry-pick(#6933): fix(e2e): Stabilize ITC tests * fix(ITC): initialize ITC in `created()` hook * fix(e2e): stabilize ITC tests * docs: add JSDocs * refactor: lint:fix * test(e2e): add comment and assertion * refactor: lint:fix * fix: cherry-pick over existing tagging fixes * fix: cherry-pick over more test fixes --------- Co-authored-by: John Hill <john.c.hill@nasa.gov>	2023-08-16 16:32:32 -07:00
Jesse Mazzella	5b7b722ae8	cherry-pick(#6910 ): chore: add vue3 to eslint, fix errors, and modify lint script (#6935 ) * cherry-pick(#6910): chore: add vue3 to eslint, fix errors, and modify lint script * refactor: lint:fix --------- Co-authored-by: John Hill <john.c.hill@nasa.gov>	2023-08-16 22:51:43 +00:00
Jesse Mazzella	f5433c0d3b	cherry-pick(#6919 ): Fix remote clock subscription (#6934 ) * If there are no listeners for this clock then don't bother subscribing after getting the domain object details * Comment explaining the fix Co-authored-by: Shefali Joshi <simplyrender@gmail.com>	2023-08-16 15:41:28 -07:00
Jesse Mazzella	5619994e83	cherry-pick(#6943 ): fix(#6942 ): Toggling FlexibleLayout toolbar options reflects immediately in the view (#6945 ) * fix: restore reactivity of config settings - move initialization steps to `created()` hook - remove unnecessary `:key` binds - fix comments * refactor: clean up * refactor: clean up * refactor: lint:fix * test(e2e): add regression test and cleanup suite * refactor: consistency is key! * test(fix): fix unit tests, further cleanup	2023-08-16 13:51:17 -07:00
Jesse Mazzella	339640e0d6	cherry-pick(#6904 ): Check for null in DuplicateAction (#6911 ) check for null before checking before hasOwnProperty Co-authored-by: Scott Bell <scott@traclabs.com>	2023-08-09 14:42:09 -07:00
Scott Bell	32b68cf0df	cherry-pick(#6866 ): Only load annotations in fixed time mode or frozen (#6902 ) Only load annotations in fixed time mode or frozen (#6866) * fix annotations load to not happen on start * remove range checking per annotated point * back to local variable * reduce tagging size to improve reliability of test * remove .only * remove .only * reduce hz rate for functional test and keep high frequency test in performance * remove console.debugs * this test runs pretty fast now * fix network request tests to match new behavior	2023-08-08 09:49:39 -07:00
Shefali Joshi	60e5bbc590	Remove snapshot (#6887 )	2023-08-03 07:25:33 -07:00
Jesse Mazzella	492e8055e5	cherry-pick(#6885 ): Synchronize timers between multiple users (#6886 ) * created a throttle util and using it in timer plugin to throttle refreshing the timer domain object * Simplify timer logic * Clarify code a little * refactor: lint:fix * Fix linting issue --------- Co-authored-by: Andrew Henry <akhenry@gmail.com> Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>	2023-08-02 16:45:47 -07:00
Jesse Mazzella	796616fe3f	cherry-pick(#6877 ): Set the raw series limits so that we can get the raw series limits (#6883 ) * Set the raw series limits so that we can get the raw series limits * fix: `toRaw()` the other gets/sets/deletes --------- Co-authored-by: Shefali Joshi <simplyrender@gmail.com>	2023-08-02 17:00:51 +00:00
Andrew Henry	0f5d3afc4a	cherry pick (#6875 ) suppress deprecation warnings to once per unique args (#6881 ) fix: suppress deprecation warnings to once per unique args (#6875) Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>	2023-08-02 09:50:29 -07:00
Jesse Mazzella	44415b3769	cherry-pick(#6868 ): fix: toggling markers, alarm markers, marker style + update `Vue.extend()` usage to Vue 3 (#6873 ) * fix: update to `defineComponent` from `Vue.extend()` * fix: unwrap Proxy arg before WeakMap.get() * refactor: `defineComponent` not needed here	2023-08-01 14:16:20 -07:00