Fix the composition ids to be openmct identifiers (not keystrings) on load.

Track the domainobject name nested within a treeitem node

.circleci/config.yml

@@ -2,23 +2,23 @@ version: 2.1
 executors:
   pw-focal-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.39.0-focal
+      - image: mcr.microsoft.com/playwright:v1.32.3-focal
     environment:
       NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
-      PERCY_POSTINSTALL_BROWSER: "true" # Needed to store the percy browser in cache deps
-      PERCY_LOGLEVEL: "debug" # Enable DEBUG level logging for Percy (Issue: https://github.com/nasa/openmct/issues/5742)
+      PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps
+      PERCY_LOGLEVEL: 'debug' # Enable DEBUG level logging for Percy (Issue: https://github.com/nasa/openmct/issues/5742)
   ubuntu:
     machine:
       image: ubuntu-2204:current
       docker_layer_caching: true
 parameters:
   BUST_CACHE:
-    description: "Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!"
+    description: 'Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!'
     default: false
     type: boolean
 commands:
   build_and_install:
-    description: "All steps used to build and install. Will use cache if found"
+    description: 'All steps used to build and install. Will use cache if found'
     parameters:
       node-version:
         type: string
@@ -30,7 +30,7 @@ commands:
           node-version: << parameters.node-version >>
       - run: npm install --no-audit --progress=false
   restore_cache_cmd:
-    description: "Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache"
+    description: 'Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache'
     parameters:
       node-version:
         type: string
@@ -42,7 +42,7 @@ commands:
             - restore_cache:
                 key: deps--{{ arch }}--{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
   save_cache_cmd:
-    description: "Custom command for saving cache."
+    description: 'Custom command for saving cache.'
     parameters:
       node-version:
         type: string
@@ -53,7 +53,7 @@ commands:
             - ~/.npm
             - node_modules
   generate_and_store_version_and_filesystem_artifacts:
-    description: "Track important packages and files"
+    description: 'Track important packages and files'
     steps:
       - run: |
           [[ $EUID -ne 0 ]] && (sudo mkdir -p /tmp/artifacts && sudo chmod 777 /tmp/artifacts) || (mkdir -p /tmp/artifacts && chmod 777 /tmp/artifacts)
@@ -64,7 +64,7 @@ commands:
       - store_artifacts:
           path: /tmp/artifacts/
   generate_e2e_code_cov_report:
-    description: "Generate e2e code coverage artifacts and publish to codecov.io. Needed to that we can ignore the exit code status of the npm run test"
+    description: 'Generate e2e code coverage artifacts and publish to codecov.io. Needed to that we can ignore the exit code status of the npm run test'
     parameters:
       suite:
         type: string
@@ -105,11 +105,7 @@ jobs:
           node-version: <<parameters.node-version>>
       - browser-tools/install-chrome:
           replace-existing: false
-      - run:
-          command: |
-            mkdir -p dist/reports/tests/
-            TESTFILES=$(circleci tests glob "src/**/*Spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test" --verbose
+      - run: npm run test
       - run: npm run cov:unit:publish
       - save_cache_cmd:
           node-version: <<parameters.node-version>>
@@ -124,23 +120,21 @@ jobs:
             - generate_and_store_version_and_filesystem_artifacts
   e2e-test:
     parameters:
+      node-version:
+        type: string
       suite: #stable or full
         type: string
     executor: pw-focal-development
-    parallelism: 7
+    parallelism: 4
     steps:
       - build_and_install:
-          node-version: lts/hydrogen
+          node-version: <<parameters.node-version>>
       - when: #Only install chrome-beta when running the 'full' suite to save $$$
           condition:
-            equal: ["full", <<parameters.suite>>]
+            equal: ['full', <<parameters.suite>>]
           steps:
             - run: npx playwright install chrome-beta
-      - run:
-          command: |
-            mkdir test-results
-            TESTFILES=$(circleci tests glob "e2e/**/*.spec.js")
-            echo "$TESTFILES" | circleci tests run --command="xargs npm run test:e2e:<<parameters.suite>>" --verbose --split-by=timings
+      - run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; npm run test:e2e:<<parameters.suite>> -- --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
       - when:
           condition:
             equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
@@ -160,37 +154,15 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  e2e-mobile:
-    executor: pw-focal-development
-    steps:
-      - build_and_install:
-          node-version: lts/hydrogen
-      - run: npm run test:e2e:mobile
-      - when:
-          condition:
-            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
-          steps:
-            - generate_e2e_code_cov_report:
-                suite: full
-      - store_test_results:
-          path: test-results/results.xml
-      - store_artifacts:
-          path: test-results
-      - store_artifacts:
-          path: coverage
-      - store_artifacts:
-          path: html-test-results
-      - when:
-          condition:
-            equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
-          steps:
-            - generate_and_store_version_and_filesystem_artifacts
   e2e-couchdb:
+    parameters:
+      node-version:
+        type: string
     executor: ubuntu
     steps:
       - build_and_install:
-          node-version: lts/hydrogen
-      - run: npx playwright@1.39.0 install #Necessary for bare ubuntu machine
+          node-version: <<parameters.node-version>>
+      - run: npx playwright@1.32.3 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
@@ -217,30 +189,15 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  mem-test:
-    executor: pw-focal-development
-    steps:
-      - build_and_install:
-          node-version: lts/hydrogen
-      - run: npm run test:perf:memory
-      - store_test_results:
-          path: test-results/results.xml
-      - store_artifacts:
-          path: test-results
-      - store_artifacts:
-          path: html-test-results
-      - when:
-          condition:
-            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
-          steps:
-            - generate_and_store_version_and_filesystem_artifacts
   perf-test:
+    parameters:
+      node-version:
+        type: string
     executor: pw-focal-development
     steps:
       - build_and_install:
-          node-version: lts/hydrogen
-      - run: npm run test:perf:localhost
-      - run: npm run test:perf:contract
+          node-version: <<parameters.node-version>>
+      - run: npm run test:perf
       - store_test_results:
           path: test-results/results.xml
       - store_artifacts:
@@ -252,15 +209,15 @@ jobs:
             equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  visual-a11y-tests:
+  visual-test:
     parameters:
-      suite:
-        type: string # ci or full
+      node-version:
+        type: string
     executor: pw-focal-development
     steps:
       - build_and_install:
-          node-version: lts/hydrogen
-      - run: npm run test:e2e:visual:<<parameters.suite>>
+          node-version: <<parameters.node-version>>
+      - run: npm run test:e2e:visual
       - store_test_results:
           path: test-results/results.xml
       - store_artifacts:
@@ -272,29 +229,25 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-
 workflows:
   overall-circleci-commit-status: #These jobs run on every commit
     jobs:
       - lint:
-          name: node20-lint
-          node-version: lts/iron
+          name: node16-lint
+          node-version: lts/gallium
       - unit-test:
           name: node18-chrome
           node-version: lts/hydrogen
       - e2e-test:
           name: e2e-stable
+          node-version: lts/hydrogen
           suite: stable
-      - e2e-mobile
-      - visual-a11y-tests:
-          name: visual-a11y-test-ci
-          suite: ci
 
   the-nightly: #These jobs do not run on PRs, but against master at night
     jobs:
       - unit-test:
-          name: node20-chrome-nightly
-          node-version: lts/iron
+          name: node16-chrome-nightly
+          node-version: lts/gallium
       - unit-test:
           name: node18-chrome
           node-version: lts/hydrogen
@@ -302,17 +255,17 @@ workflows:
           node-version: lts/hydrogen
       - e2e-test:
           name: e2e-full-nightly
+          node-version: lts/hydrogen
           suite: full
-      - e2e-mobile
-      - perf-test
-      - mem-test
-      - visual-a11y-tests:
-          name: visual-a11y-test-nightly
-          suite: full
-      - e2e-couchdb
+      - perf-test:
+          node-version: lts/hydrogen
+      - visual-test:
+          node-version: lts/hydrogen
+      - e2e-couchdb:
+          node-version: lts/hydrogen
     triggers:
       - schedule:
-          cron: "0 0 * * *"
+          cron: '0 0 * * *'
           filters:
             branches:
               only:

.cspell.json

@@ -1,513 +0,0 @@
-{
-  "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",
-    "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",
-    "blockquote",
-    "blockquotes",
-    "Blockquote",
-    "Blockquotes",
-    "oger",
-    "lcovonly",
-    "gcov",
-    "WCAG",
-    "stackedplot",
-    "Andale",
-    "unnormalized",
-    "checksnapshots",
-    "specced",
-    "composables",
-    "countup"
-  ],
-  "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US", "en-gb", "misc"],
-  "ignorePaths": [
-    "package.json",
-    "dist/**",
-    "package-lock.json",
-    "node_modules",
-    "coverage",
-    "*.log",
-    "html-test-results",
-    "test-results"
-  ]
-}

.eslintrc.js

@@ -9,14 +9,13 @@ module.exports = {
   globals: {
     _: 'readonly'
   },
-  plugins: ['prettier', 'unicorn', 'simple-import-sort'],
+  plugins: ['prettier'],
   extends: [
     'eslint:recommended',
     'plugin:compat/recommended',
-    'plugin:vue/vue3-recommended',
+    'plugin:vue/recommended',
     'plugin:you-dont-need-lodash-underscore/compatible',
-    'plugin:prettier/recommended',
-    'plugin:no-unsanitized/DOM'
+    'plugin:prettier/recommended'
   ],
   parser: 'vue-eslint-parser',
   parserOptions: {
@@ -29,10 +28,6 @@ module.exports = {
     }
   },
   rules: {
-    'simple-import-sort/imports': 'warn',
-    'simple-import-sort/exports': 'warn',
-    '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',
@@ -146,26 +141,18 @@ module.exports = {
     'no-implicit-coercion': 'error',
     //https://eslint.org/docs/rules/no-unneeded-ternary
     'no-unneeded-ternary': 'error',
-    'unicorn/filename-case': [
-      'error',
-      {
-        cases: {
-          pascalCase: true
-        },
-        ignore: ['^.*\\.js$']
-      }
-    ],
     'vue/first-attribute-linebreak': 'error',
     'vue/multiline-html-element-content-newline': 'off',
     'vue/singleline-html-element-content-newline': 'off',
-    'vue/no-mutating-props': 'off' // TODO: Remove this rule and fix resulting errors
+    'vue/multi-word-component-names': 'off', // TODO enable, align with conventions
+    'vue/no-mutating-props': 'off'
   },
   overrides: [
     {
       files: LEGACY_FILES,
       rules: {
         'no-unused-vars': [
-          'error',
+          'warn',
           {
             vars: 'all',
             args: 'none',

.git-blame-ignore-revs

@@ -4,10 +4,6 @@
 # Requires Git > 2.23
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
-# vue-eslint update 2019
-14a0f84c1bcd56886d7c9e4e6afa8f7d292734e5
-# eslint changes 2022
-d80b6923541704ab925abf0047cbbc58735c27e2
 # Copyright year update 2022
 4a9744e916d24122a81092f6b7950054048ba860
 # Copyright year update 2023

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,16 +8,14 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 
 * [ ] Have you followed the guidelines in our [Contributing document](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md)?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/openmct/pulls) for the same update/change?
-* [ ] Is this a notable change that will require a special callout in the release notes [Notable Change](../docs/src/process/release.md) ? For example, will this break compatibility with existing APIs or projects which source these plugins?
+* [ ] Is this change backwards compatible? For example, developers won't need to change how they are calling the API or how they've extended core plugins such as Tables or Plots.
 
 ### Author Checklist
 
 * [ ] Changes address original issue?
 * [ ] Tests included and/or updated with changes?
+* [ ] Command line build passes?
 * [ ] Has this been smoke tested?
-* [ ] Have you associated this PR with a `type:` label? Note: this is not necessarily the same as the original issue.
-* [ ] Have you associated a milestone with this PR? Note: leave blank if unsure.
-* [ ] Is this a breaking change to be called out in the release notes?
 * [ ] Testing instructions included in associated issue OR is this a dependency/testcase change?
 
 ### Reviewer Checklist
@@ -27,3 +25,5 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 * [ ] Changes appear not to be breaking changes?
 * [ ] Appropriate automated tests included?
 * [ ] Code style and in-line documentation are appropriate?
+* [ ] Has associated issue been labelled unverified? (only applicable if this PR closes the issue)
+* [ ] Has associated issue been labelled bug? (only applicable if this PR is for a bug fix)

.github/dependabot.yml

@@ -5,7 +5,6 @@ updates:
     schedule:
       interval: 'weekly'
     open-pull-requests-limit: 10
-    rebase-strategy: 'disabled'
     labels:
       - 'pr:daveit'
       - 'pr:e2e'
@@ -29,13 +28,10 @@ updates:
         update-types: ['version-update:semver-patch']
       - dependency-name: '@types/lodash'
         update-types: ['version-update:semver-patch']
-      - dependency-name: 'marked'
-        update-types: ['version-update:semver-patch']
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
       interval: 'daily'
-    rebase-strategy: 'disabled'
     labels:
       - 'pr:daveit'
       - 'type:maintenance'

.github/release.yml

@@ -1,26 +0,0 @@
-changelog:
-  categories:
-    - title: 💥 Notable Changes
-      labels:
-        - notable_change
-    - 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:
-        - "*"

.github/workflows/codeql-analysis.yml

@@ -27,18 +27,18 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           config-file: ./.github/codeql/codeql-config.yml
           languages: javascript
           queries: security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2

.github/workflows/e2e-couchdb.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 'lts/hydrogen'
 
@@ -28,16 +28,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
       
-      - run: npm install --cache ~/.npm --no-audit --progress=false
+      - run: npm install --cache ~/.npm --prefer-offline --no-audit --progress=false
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
-        continue-on-error: true
+        uses: docker/login-action@v2 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       
-      - run: npx playwright@1.39.0 install
+      - run: npx playwright@1.32.3 install
 
       - name: Start CouchDB Docker Container and Init with Setup Scripts
         run: |
@@ -47,8 +46,9 @@ jobs:
           bash src/plugins/persistence/couch/setup-couchdb.sh
           bash src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
 
-      - name: Run CouchDB Tests
+      - name: Run CouchDB Tests and publish to deploysentinel
         env:
+          DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
           COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha }}
         run: npm run test:e2e:couchdb
 

.github/workflows/e2e-flakefinder.yml

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

.github/workflows/e2e-perf.yml

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

.github/workflows/e2e-pr.yml

@@ -20,8 +20,8 @@ jobs:
           - ubuntu-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 'lts/hydrogen'
       
@@ -33,9 +33,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
             
-      - run: npx playwright@1.39.0 install
+      - run: npx playwright@1.32.3 install
       - run: npx playwright install chrome-beta
-      - run: npm install --cache ~/.npm --no-audit --progress=false
+      - run: npm install --cache ~/.npm --prefer-offline --no-audit --progress=false
       - run: npm run test:e2e:full -- --max-failures=40
       - run: npm run cov:e2e:report || true
       - shell: bash

.github/workflows/npm-prerelease.yml

@@ -11,8 +11,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: lts/hydrogen
       - run: npm install
@@ -26,8 +26,8 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: lts/hydrogen
           registry-url: https://registry.npmjs.org/

.github/workflows/pr-platform.yml

@@ -22,17 +22,17 @@ jobs:
           - macos-latest
           - windows-latest
         node_version:
-          - lts/iron
+          - lts/gallium
           - lts/hydrogen
         architecture:
           - x64
     
     name: Node ${{ matrix.node_version }} - ${{ matrix.architecture }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}
@@ -45,7 +45,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.node_version }}-
 
-      - run: npm install --cache ~/.npm --no-audit --progress=false
+      - run: npm install --cache ~/.npm --prefer-offline --no-audit --progress=false
       
       - run: npm test
       

.github/workflows/prcop.yml

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

.gitignore

@@ -15,9 +15,6 @@
 *.idea
 *.iml
 
-# VSCode
-.vscode/settings.json
-
 # Build output
 target
 dist

.npmrc

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

.nvmrc

@@ -1 +0,0 @@
-lts/*

.vscode/extensions.json

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

.webpack/webpack.common.js

@@ -1,3 +1,5 @@
+/* global __dirname module */
+
 /*
 This is the OpenMCT common webpack file. It is imported by the other three webpack configurations:
  - webpack.prod.js - the production configuration for OpenMCT (default)
@@ -6,42 +8,31 @@ This is the OpenMCT common webpack file. It is imported by the other three webpa
 There are separate npm scripts to use these configurations, though simply running `npm install`
 will use the default production configuration.
 */
-import { execSync } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
+const path = require('path');
+const packageDefinition = require('../package.json');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const webpack = require('webpack');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import { VueLoaderPlugin } from 'vue-loader';
-import webpack from 'webpack';
+const { VueLoaderPlugin } = require('vue-loader');
 let gitRevision = 'error-retrieving-revision';
 let gitBranch = 'error-retrieving-branch';
 
-const packageDefinition = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
-
 try {
-  gitRevision = execSync('git rev-parse HEAD').toString().trim();
-  gitBranch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+  gitRevision = require('child_process').execSync('git rev-parse HEAD').toString().trim();
+  gitBranch = require('child_process')
+    .execSync('git rev-parse --abbrev-ref HEAD')
+    .toString()
+    .trim();
 } catch (err) {
   console.warn(err);
 }
 
-const projectRootDir = fileURLToPath(new URL('../', import.meta.url));
+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',
@@ -55,7 +46,6 @@ const config = {
     filename: '[name].js',
     path: path.resolve(projectRootDir, 'dist'),
     library: 'openmct',
-    libraryExport: 'default',
     libraryTarget: 'umd',
     publicPath: '',
     hashFunction: 'xxhash64',
@@ -65,18 +55,20 @@ const config = {
     alias: {
       '@': path.join(projectRootDir, 'src'),
       legacyRegistry: path.join(projectRootDir, 'src/legacyRegistry'),
+      saveAs: 'file-saver/src/FileSaver.js',
       csv: 'comma-separated-values',
       EventEmitter: 'eventemitter3',
       bourbon: 'bourbon.scss',
-      'plotly-basic': 'plotly.js-basic-dist-min',
-      'plotly-gl2d': 'plotly.js-gl2d-dist-min',
-      printj: 'printj/printj.mjs',
+      'plotly-basic': 'plotly.js-basic-dist',
+      'plotly-gl2d': 'plotly.js-gl2d-dist',
+      'd3-scale': path.join(projectRootDir, 'node_modules/d3-scale/dist/d3-scale.min.js'),
+      printj: path.join(projectRootDir, 'node_modules/printj/dist/printj.min.js'),
       styles: path.join(projectRootDir, 'src/styles'),
       MCT: path.join(projectRootDir, 'src/MCT'),
       testUtils: path.join(projectRootDir, 'src/utils/testUtils.js'),
       objectUtils: path.join(projectRootDir, 'src/api/objects/object-utils.js'),
       utils: path.join(projectRootDir, 'src/utils'),
-      vue: 'vue/dist/vue.esm-bundler'
+      vue: path.join(projectRootDir, 'node_modules/@vue/compat/dist/vue.esm-bundler.js'),
     }
   },
   plugins: [
@@ -84,9 +76,7 @@ const config = {
       __OPENMCT_VERSION__: `'${packageDefinition.version}'`,
       __OPENMCT_BUILD_DATE__: `'${new Date()}'`,
       __OPENMCT_REVISION__: `'${gitRevision}'`,
-      __OPENMCT_BUILD_BRANCH__: `'${gitBranch}'`,
-      __VUE_OPTIONS_API__: true, // enable/disable Options API support, default: true
-      __VUE_PROD_DEVTOOLS__: false // enable/disable devtools support in production, default: false
+      __OPENMCT_BUILD_BRANCH__: `'${gitBranch}'`
     }),
     new VueLoaderPlugin(),
     new CopyWebpackPlugin({
@@ -110,12 +100,6 @@ 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: {
@@ -141,8 +125,10 @@ const config = {
         loader: 'vue-loader',
         options: {
           compilerOptions: {
-            hoistStatic: false,
-            whitespace: 'preserve'
+            whitespace: 'preserve',
+            compatConfig: {
+              MODE: 2
+            }
           }
         }
       },
@@ -182,4 +168,4 @@ const config = {
   }
 };
 
-export default config;
+module.exports = config;

.webpack/webpack.coverage.js

@@ -1,10 +1,12 @@
+/* global module */
+
 /*
 This file extends the webpack.dev.js config to add babel istanbul coverage.
 OpenMCT Continuous Integration servers use this configuration to add code coverage
 information to pull requests.
 */
 
-import config from './webpack.dev.js';
+const config = require('./webpack.dev');
 // eslint-disable-next-line no-undef
 const CI = process.env.CI === 'true';
 
@@ -32,4 +34,4 @@ config.module.rules.push({
   }
 });
 
-export default config;
+module.exports = config;

.webpack/webpack.dev.js

@@ -1,16 +1,18 @@
+/* global __dirname module */
+
 /*
 This configuration should be used for development purposes. It contains full source map, a
 devServer (which be invoked using by `npm start`), and a non-minified Vue.js distribution.
 If OpenMCT is to be used for a production server, use webpack.prod.js instead.
 */
-import path from 'path';
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-import { fileURLToPath } from 'node:url';
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 
-import common from './webpack.common.js';
+const common = require('./webpack.common');
+const projectRootDir = path.resolve(__dirname, '..');
 
-export default merge(common, {
+module.exports = merge(common, {
   mode: 'development',
   watchOptions: {
     // Since we use require.context, webpack is watching the entire directory.
@@ -40,9 +42,17 @@ export default merge(common, {
     },
     watchFiles: ['**/*.css'],
     static: {
-      directory: fileURLToPath(new URL('../dist', import.meta.url)),
+      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
+      }
     }
   }
 });

.webpack/webpack.prod.js

@@ -1,14 +1,17 @@
+/* global __dirname module */
+
 /*
 This configuration should be used for production installs.
 It is the default webpack configuration.
 */
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
+const common = require('./webpack.common');
+const projectRootDir = path.resolve(__dirname, '..');
 
-import common from './webpack.common.js';
-
-export default merge(common, {
+module.exports = merge(common, {
   mode: 'production',
   plugins: [
     new webpack.DefinePlugin({

API.md

@@ -44,10 +44,8 @@
     - [Clocks](#clocks)
       - [Defining and registering clocks](#defining-and-registering-clocks)
       - [Getting and setting active clock](#getting-and-setting-active-clock)
-      - [⚠️ \[DEPRECATED\] Stopping an active clock](#️-deprecated-stopping-an-active-clock)
+      - [Stopping an active clock](#stopping-an-active-clock)
       - [Clock Offsets](#clock-offsets)
-    - [Time Modes](#time-modes)
-      - [Time Mode Helper Methods](#time-mode-helper-methods)
     - [Time Events](#time-events)
       - [List of Time Events](#list-of-time-events)
     - [The Time Conductor](#the-time-conductor)
@@ -94,9 +92,6 @@ well as assets such as html, css, and images necessary for the UI.
 
 ## Starting an Open MCT application
 
-> [!WARNING]
-> Open MCT provides a development server via `webpack-dev-server` (`npm start`). **This should be used for development purposes only and should never be deployed to a production environment**.
-
 To start a minimally functional Open MCT application, it is necessary to
 include the Open MCT distributable, enable some basic plugins, and bootstrap
 the application. The tutorials walk through the process of getting Open MCT up
@@ -593,105 +588,32 @@ MinMax queries are issued by plots, and may be issued by other types as well.  T
 #### Telemetry Formats
 
 Telemetry format objects define how to interpret and display telemetry data.
-They have a simple structure, provided here as a TypeScript interface:
+They have a simple structure:
 
-```ts
-interface Formatter {
-    key: string; // A string that uniquely identifies this formatter.
-
-    format: (
-        value: any, // The raw telemetry value in its native type.
-        minValue?: number, // An optional argument specifying the minimum displayed value.
-        maxValue?: number, // An optional argument specifying the maximum displayed value.
-        count?: number // An optional argument specifying the number of displayed values.
-    ) => string; // Returns a human-readable string representation of the provided value.
-
-    parse: (
-        value: string | any // A string representation of a telemetry value or an already-parsed value.
-    ) => any; // Returns the value in its native type. This function should be idempotent.
-
-    validate: (value: string) => boolean; // Takes a string representation of a telemetry value and returns a boolean indicating whether the provided string can be parsed.
-}
-```
-
-##### Built-in Formats
-
-Open MCT on its own defines a handful of built-in formats:
-
-###### **Number Format (default):** 
-
-Applied to data with `format: 'number'`
-```js
-valueMetadata = {
-    format: 'number'
-    // ...
-};
-```
-
-```ts
-interface NumberFormatter extends Formatter {
-    parse: (x: any) => number;
-    format: (x: number) => string;
-    validate: (value: any) => boolean;
-}
-```
-###### **String Format**:
-
-Applied to data with `format: 'string'`
-```js
-valueMetadata = {
-    format: 'string'
-    // ...
-};
-```
-```ts
-interface StringFormatter extends Formatter {
-    parse: (value: any) => string;
-    format: (value: string) => string;
-    validate: (value: any) => boolean;
-}
-```
-
-###### **Enum Format**:
-Applied to data with `format: 'enum'`
-```js
-valueMetadata = {
-    format: 'enum',
-    enumerations: [
-    {
-        value: 1,
-        string: 'APPLE'
-    }, 
-    {
-        value: 2,
-        string: 'PEAR',
-    },
-    {
-        value: 3,
-        string: 'ORANGE'
-    }]
-    // ...
-};
-```
-
-Creates a two-way mapping between enum string and value to be used in the `parse` and `format` methods.
-Ex:
-- `formatter.parse('APPLE') === 1;`
-- `formatter.format(1) === 'APPLE';`
-
-```ts
-interface EnumFormatter extends Formatter {
-    parse: (value: string) => string;
-    format: (value: number) => string;
-    validate: (value: any) => boolean;
-}
-```
+- `key`: A `string` that uniquely identifies this formatter.
+- `format`: A `function` that takes a raw telemetry value, and returns a
+  human-readable `string` representation of that value. It has one required
+  argument, and three optional arguments that provide context and can be used
+  for returning scaled representations of a value. An example of this is
+  representing time values in a scale such as the time conductor scale. There
+  are multiple ways of representing a point in time, and by providing a minimum
+  scale value, maximum scale value, and a count, it's possible to provide more
+  useful representations of time given the provided limitations.  
+  - `value`: The raw telemetry value in its native type.
+  - `minValue`: An **optional** argument specifying the minimum displayed
+      value.
+  - `maxValue`: An **optional** argument specifying the maximum displayed
+      value.
+  - `count`: An **optional** argument specifying the number of displayed
+      values.
+- `parse`: A `function` that takes a `string` representation of a telemetry
+  value, and returns the value in its native type. **Note** parse might receive an already-parsed value.  This function should be idempotent.
+- `validate`: A `function` that takes a `string` representation of a telemetry
+  value, and returns a `boolean` value indicating whether the provided string
+  can be parsed.
 
 ##### Registering Formats
 
-Formats implement the following interface (provided here as TypeScript for simplicity):
-
-
 Formats are registered with the Telemetry API using the `addFormat` function. eg.
 
 ``` javascript
@@ -763,9 +685,8 @@ state of the application, and emits events to inform listeners when the state ch
 
 Because the data displayed tends to be time domain data, Open MCT must always
 have at least one time system installed and activated. When you download Open
-MCT, it will be pre-configured to use the UTC time system, which is installed and activated, 
-along with other default plugins, in `index.html`. Installing and activating a time system 
-is simple, and is covered [in the next section](#defining-and-registering-time-systems).
+MCT, it will be pre-configured to use the UTC time system, which is installed and activated, along with other default plugins, in `index.html`. Installing and activating a time system is simple, and is covered
+[in the next section](#defining-and-registering-time-systems).
 
 ### Time Systems and Bounds
 
@@ -816,38 +737,28 @@ numbers in UTC terrestrial time.
 
 #### Getting and Setting the Active Time System
 
-Once registered, a time system can be activated by calling `setTimeSystem` with
-the timeSystem `key` or an instance of the time system.  You can also specify 
-valid [bounds](#time-bounds) for the timeSystem.
+Once registered, a time system can be activated by calling `timeSystem` with
+the timeSystem `key` or an instance of the time system.  If you are not using a
+[clock](#clocks), you must also specify valid [bounds](#time-bounds) for the
+timeSystem.
 
 ```javascript
-openmct.time.setTimeSystem('utc', bounds);
-```
-
-The current time system can be retrieved as well by calling `getTimeSystem`.
-
-```javascript
-openmct.time.getTimeSystem();
+openmct.time.timeSystem('utc', bounds);
 ```
 
 A time system can be immediately activated after registration:
 
 ```javascript
 openmct.time.addTimeSystem(utcTimeSystem);
-openmct.time.setTimeSystem(utcTimeSystem, bounds);
+openmct.time.timeSystem(utcTimeSystem, bounds);
 ```
 
-Setting the active time system will trigger a [`'timeSystemChanged'`](#time-events)
-event.  If you supplied bounds, a [`'boundsChanged'`](#time-events) event will be triggered afterwards with your newly supplied bounds.
-
-> ⚠️ **Deprecated**
-> - The method `timeSystem()` is deprecated. Please use `getTimeSystem()` and `setTimeSystem()` as a replacement.
-
-
+Setting the active time system will trigger a [`'timeSystem'`](#time-events)
+event.  If you supplied bounds, a [`'bounds'`](#time-events) event will be triggered afterwards with your newly supplied bounds.
 
 #### Time Bounds
 
-The TimeAPI provides a getter and setter for querying and setting time bounds. Time
+The TimeAPI provides a getter/setter for querying and setting time bounds. Time
 bounds are simply an object with a `start` and an end `end` attribute.
 
 - `start`: A `number` representing a moment in time in the active [Time System](#defining-and-registering-time-systems).
@@ -857,34 +768,26 @@ telemetry views.
 This will be used as the end of the time period displayed by time-responsive
 telemetry views.
 
-New bounds can be set system wide by calling `setBounds` with [bounds](#time-bounds).
+If invoked with bounds, it will set the new time bounds system-wide. If invoked
+without any parameters, it will return the current application-wide time bounds.
 
 ``` javascript
 const ONE_HOUR = 60 * 60 * 1000;
 let now = Date.now();
-openmct.time.setBounds({start: now - ONE_HOUR, now);
+openmct.time.bounds({start: now - ONE_HOUR, now);
 ```
 
-Calling `getBounds` will return the current application-wide time bounds.
-
-``` javascript
-openmct.time.getBounds();
-```
-
-To respond to bounds change events, listen for the [`'boundsChanged'`](#time-events)
+To respond to bounds change events, listen for the [`'bounds'`](#time-events)
 event.
 
-> ⚠️ **Deprecated**
-> - The method `bounds()` is deprecated and will be removed in a future release. Please use `getBounds()` and `setBounds()` as a replacement.
-
 ### Clocks
 
-The Time API requires a clock source which will cause the bounds to be updated 
-automatically whenever the clock source "ticks". A clock is simply an object that 
-supports registration of listeners and periodically invokes its listeners with a 
-number. Open MCT supports registration of new clock sources that tick on almost 
-anything. A tick occurs when the clock invokes callback functions registered by its 
-listeners with a new time value.
+The Time API can be set to follow a clock source which will cause the bounds
+to be updated automatically whenever the clock source "ticks". A clock is simply
+an object that supports registration of listeners and periodically invokes its
+listeners with a number. Open MCT supports registration of new clock sources that
+tick on almost anything. A tick occurs when the clock invokes callback functions
+registered by its listeners with a new time value.
 
 An example of a clock source is the [LocalClock](https://github.com/nasa/openmct/blob/master/src/plugins/utcTimeSystem/LocalClock.js)
 which emits the current time in UTC every 100ms. Clocks can tick on anything. For
@@ -952,29 +855,23 @@ An example clock implementation is provided in the form of the [LocalClock](http
 
 #### Getting and setting active clock
 
-Once registered a clock can be activated by calling the `setClock` function on the
+Once registered a clock can be activated by calling the `clock` function on the
 Time API passing in the key or instance of a registered clock. Only one clock
 may be active at once, so activating a clock will deactivate any currently
-active clock and start the new clock. [`clockOffsets`](#clock-offsets) must be specified when changing a clock.
+active clock. [`clockOffsets`](#clock-offsets) must be specified when changing a clock.
 
-Setting the clock triggers a [`'clockChanged'`](#time-events) event, followed by a [`'clockOffsetsChanged'`](#time-events) event, and then a [`'boundsChanged'`](#time-events) event as the offsets are applied to the clock's currentValue().
+Setting the clock triggers a [`'clock'`](#time-events) event, followed by a [`'clockOffsets'`](#time-events) event, and then a [`'bounds'`](#time-events) event as the offsets are applied to the clock's currentValue().
 
 ```
-openmct.time.setClock(someClock, clockOffsets);
+openmct.time.clock(someClock, clockOffsets);
 ```
 
 Upon being activated, the time API will listen for tick events on the clock by calling `clock.on`.
 
-The currently active clock can be retrieved by calling `getClock`.
+The currently active clock (if any) can be retrieved by calling the same
+function without any arguments.
 
-```
-openmct.time.getClock();
-```
-
-> ⚠️ **Deprecated**
-> - The method `clock()` is deprecated and will be removed in a future release. Please use `getClock()` and `setClock()` as a replacement.
-
-#### ⚠️ [DEPRECATED] Stopping an active clock
+#### Stopping an active clock
 
 _As of July 2023, this method will be deprecated. Open MCT will always have a ticking clock._
 
@@ -985,14 +882,12 @@ will stop the clock from ticking, and set the active clock to `undefined`.
 openmct.time.stopClock();
 ```
 
-> ⚠️ **Deprecated**
-> - The method `stopClock()` is deprecated and will be removed in a future release.
-
 #### Clock Offsets
 
-When in Real-time [mode](#time-modes), the time bounds of the application will be updated automatically each time the 
-clock "ticks". The bounds are calculated based on the current value provided by 
-the active clock (via its `tick` event, or its `currentValue()` method).
+When a clock is active, the time bounds of the application will be updated
+automatically each time the clock "ticks". The bounds are calculated based on
+the current value provided by the active clock (via its `tick` event, or its
+`currentValue()` method).
 
 Unlike bounds, which represent absolute time values, clock offsets represent
 relative time spans. Offsets are defined as an object with two properties:
@@ -1003,77 +898,21 @@ value provided by a clock's tick callback, or its `currentValue()` function.
 - `end`: A `number` that must be >= 0 and which is used to calculate the end
 bounds on each clock tick.
 
-The `setClockOffsets` function can be used to get or set clock offsets. For example,
+The `clockOffsets` function can be used to get or set clock offsets. For example,
 to show the last fifteen minutes in a ms-based time system:
 
 ```javascript
 var FIFTEEN_MINUTES = 15 * 60 * 1000;
 
-openmct.time.setClockOffsets({
+openmct.time.clockOffsets({
     start: -FIFTEEN_MINUTES,
     end: 0
 })
 ```
 
-The `getClockOffsets` method will return the currently set clock offsets.
-
-```javascript
-openmct.time.getClockOffsets()
-```
-
 **Note:** Setting the clock offsets will trigger an immediate bounds change, as
 new bounds will be calculated based on the `currentValue()` of the active clock.
-Clock offsets are only relevant when in Real-time [mode](#time-modes).
-
-> ⚠️ **Deprecated**
-> - The method `clockOffsets()` is deprecated and will be removed in a future release. Please use `getClockOffsets()` and `setClockOffsets()` as a replacement.
-
-### Time Modes
-
-There are two time modes in Open MCT, "Fixed" and "Real-time". In Real-time mode the 
-time bounds of the application will be updated automatically each time the clock "ticks".
-The bounds are calculated based on the current value provided by the active clock. In 
-Fixed mode, the time bounds are set for a specified time range. When Open MCT is first
-initialized, it will be in Real-time mode.
-
-The `setMode` method can be used to set the current time mode. It accepts a mode argument,
-`'realtime'` or `'fixed'` and it also accepts an optional [offsets](#clock-offsets)/[bounds](#time-bounds) argument dependent
-on the current mode.
-
-``` javascript
-openmct.time.setMode('fixed');
-openmct.time.setMode('fixed', bounds); // with optional bounds
-```
-
-or
-
-``` javascript
-openmct.time.setMode('realtime');
-openmct.time.setMode('realtime', offsets); // with optional offsets
-```
-
-The `getMode` method will return the current time mode, either `'realtime'` or `'fixed'`.
-
-``` javascript
-openmct.time.getMode();
-```
-
-#### Time Mode Helper Methods
-
-There are two methods available to determine the current time mode in Open MCT programmatically,
-`isRealTime` and `isFixed`. Each one will return a boolean value based on the current mode.
-
-``` javascript
-if (openmct.time.isRealTime()) {
-  // do real-time stuff
-}
-```
-
-``` javascript
-if (openmct.time.isFixed()) {
-  // do fixed-time stuff
-}
-```
+Clock offsets are only relevant when a clock source is active.
 
 ### Time Events
 
@@ -1082,7 +921,7 @@ The Time API is a standard event emitter; you can register callbacks for events
 For example:
 
 ``` javascript
-openmct.time.on('boundsChanged', function callback (newBounds, tick) {
+openmct.time.on('bounds', function callback (newBounds, tick) {
     // Do something with new bounds
 });
 ```
@@ -1091,7 +930,7 @@ openmct.time.on('boundsChanged', function callback (newBounds, tick) {
 
 The events emitted by the Time API are:
 
-- `boundsChanged`: emitted whenever the bounds change.  The callback will be invoked
+- `bounds`: emitted whenever the bounds change.  The callback will be invoked
   with two arguments:
   - `bounds`: A [bounds](#getting-and-setting-bounds) bounds object
     representing a new time period bound by the specified start and send times.
@@ -1106,24 +945,15 @@ The events emitted by the Time API are:
     If `tick` is false,then the bounds change was not due to an automatic tick,
     and a query for historical data may be necessary, depending on your data
     caching strategy, and how significantly the start bound has changed.
-- `timeSystemChanged`: emitted whenever the active time system changes.  The callback will be invoked with a single argument:
+- `timeSystem`: emitted whenever the active time system changes.  The callback will be invoked with a single argument:
   - `timeSystem`: The newly active [time system](#defining-and-registering-time-systems).
-- `clockChanged`: emitted whenever the clock changes.  The callback will be invoked
+- `clock`: emitted whenever the clock changes.  The callback will be invoked
   with a single argument:
   - `clock`: The newly active [clock](#clocks), or `undefined` if an active
     clock has been deactivated.
-- `clockOffsetsChanged`: emitted whenever the active clock offsets change.  The
+- `clockOffsets`: emitted whenever the active clock offsets change.  The
   callback will be invoked with a single argument:
   - `clockOffsets`: The new [clock offsets](#clock-offsets).
-- `modeChanged`: emitted whenever the time [mode](#time-modes) changed. The callback will
-  be invoked with one argument:
-  - `mode`: A string representation of the current time mode, either `'realtime'` or `'fixed'`.
-
-> ⚠️ **Deprecated Events** (These will be removed in a future release):
-> - `bounds` → `boundsChanged`
-> - `timeSystem` → `timeSystemChanged`
-> - `clock` → `clockChanged`
-> - `clockOffsets` → `clockOffsetsChanged`
 
 ### The Time Conductor
 
@@ -1304,61 +1134,3 @@ View provider Example:
     }
 }
 ```
-
-## Visibility-Based Rendering in View Providers
-
-To enhance performance and resource efficiency in OpenMCT, a visibility-based rendering feature has been added. This feature is designed to defer the execution of rendering logic for views that are not currently visible. It ensures that views are only updated when they are in the viewport, similar to how modern browsers handle rendering of inactive tabs but optimized for the OpenMCT tabbed display. It also works when views are scrolled outside the viewport (e.g., in a Display Layout).
-
-### Overview
-
-The show function is responsible for the rendering of a view. An [Intersection Observer](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API) is used internally to determine whether the view is visible. This observer drives the visibility-based rendering feature, accessed via the `renderWhenVisible` function provided in the `viewOptions` parameter.
-
-### Implementing Visibility-Based Rendering
-
-The `renderWhenVisible` function is passed to the show function as part of the `viewOptions` object. This function can be used for all rendering logic that would otherwise be executed within a `requestAnimationFrame` call. When called, `renderWhenVisible` will either execute the provided function immediately (via `requestAnimationFrame`) if the view is currently visible, or defer its execution until the view becomes visible.
-
-Additionally, `renderWhenVisible` returns a boolean value indicating whether the provided function was executed immediately (`true`) or deferred (`false`).
-
-Monitoring of visibility begins after the first call to `renderWhenVisible` is made.
-
-Here’s the signature for the show function:
-
-`show(element, isEditing, viewOptions)`
-
-  * `element` (HTMLElement) - The DOM element where the view should be rendered.
-  * `isEditing` (boolean) - Indicates whether the view is in editing mode.
-  * `viewOptions` (Object) - An object with configuration options for the view, including:
-    * `renderWhenVisible` (Function) - This function wraps the `requestAnimationFrame` and only triggers the provided render logic when the view is visible in the viewport.
-
-### Example
-
-An OpenMCT view provider might implement the show function as follows:
-
-```js
-// Define your view provider
-const myViewProvider = {
-  // ... other properties and methods ...
-  show: function (element, isEditing, viewOptions) {
-    // Callback for rendering view content
-    const renderCallback = () => {
-      // Your view rendering logic goes here
-    };
-    
-    // Use the renderWhenVisible function to ensure rendering only happens when view is visible
-    const wasRenderedImmediately = viewOptions.renderWhenVisible(renderCallback);
-
-    // Optionally handle the immediate rendering return value
-    if (wasRenderedImmediately) {
-      console.debug('🪞 Rendering triggered immediately as the view is visible.');
-    } else {
-      console.debug('🛑 Rendering has been deferred until the view becomes visible.');
-    }
-  }
-};
-```
-
-
-Note that `renderWhenVisible` defers rendering while the view is not visible and caters to the latest execution call. This provides responsiveness for dynamic content while ensuring performance optimizations.
-
-Ensure your view logic is prepared to handle potentially multiple deferrals if using this API, as only the last call to renderWhenVisible will be queued for execution upon the view becoming visible.
-

LICENSE.md

@@ -1,6 +1,6 @@
 # Open MCT License
 
-Open MCT, Copyright (c) 2014-2024, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, 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.
 

README.md

@@ -1,10 +1,8 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) ![CodeQL](https://github.com/nasa/openmct/workflows/CodeQL/badge.svg)
+# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) 
 
 Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
 
-> [!NOTE]
-> Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
-
+Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
 
 Once you've created something amazing with Open MCT, showcase your work in our GitHub Discussions [Show and Tell](https://github.com/nasa/openmct/discussions/categories/show-and-tell) section. We love seeing unique and wonderful implementations of Open MCT!
 
@@ -16,32 +14,19 @@ Once you've created something amazing with Open MCT, showcase your work in our G
 Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
 (These instructions assume you are installing as a non-root user; developers have [reported issues](https://github.com/nasa/openmct/issues/1151) running these steps with root privileges.)
 
-1. Clone the source code:
+1. Clone the source code
 
-```
-git clone https://github.com/nasa/openmct.git
-```
+ `git clone https://github.com/nasa/openmct.git`
 
-2. (Optional) Install the correct node version using [nvm](https://github.com/nvm-sh/nvm):
+2. Install development dependencies. Note: Check the package.json engine for our tested and supported node versions.
 
-```
-nvm install
-```
+ `npm install`
 
-3. Install development dependencies (Note: Check the `package.json` engine for our tested and supported node versions): 
+3. Run a local development server
 
-```
-npm install
-```
+ `npm start`
 
-4. Run a local development server:
-
-```
-npm start
-```
-
-> [!IMPORTANT]
-> Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/)
+Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/)
 
 Open MCT is built using [`npm`](http://npmjs.com/) and [`webpack`](https://webpack.js.org/).
 
@@ -55,12 +40,8 @@ The clearest examples for developing Open MCT plugins are in the
 [tutorials](https://github.com/nasa/openmct-tutorial) provided in
 our documentation.
 
-> [!NOTE]
-> We want Open MCT to be as easy to use, install, run, and develop for as
-> possible, and your feedback will help us get there! 
-> Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues/new/choose), 
-> [Starting a GitHub Discussion](https://github.com/nasa/openmct/discussions), 
-> or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
+We want Open MCT to be as easy to use, install, run, and develop for as
+possible, and your feedback will help us get there! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues/new/choose), [Starting a GitHub Discussion](https://github.com/nasa/openmct/discussions), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
 
 ## Developing Applications With Open MCT
 
@@ -70,8 +51,6 @@ For more on developing with Open MCT, see our documentation for a guide on [Deve
 
 This is a fast moving project and we do our best to test and support the widest possible range of browsers, operating systems, and nodejs APIs. We have a published list of support available in our package.json's `browserslist` key.
 
-The project uses `nvm` to ensure the node and npm version used, is coherent in all projects. Install nvm (non-windows), [here](https://github.com/nvm-sh/nvm) or the windows equivalent [here](https://github.com/coreybutler/nvm-windows)
-
 If you encounter an issue with a particular browser, OS, or nodejs API, please file a [GitHub issue](https://github.com/nasa/openmct/issues/new/choose)
 
 ## Plugins
@@ -116,10 +95,10 @@ To run the performance tests:
 
 `npm run test:perf`
 
-The test suite is configured to all tests located in `e2e/tests/` ending in `*.e2e.spec.js`. For more about the e2e test suite, please see the [README](./e2e/README.md)
+The test suite is configured to all tests localed in `e2e/tests/` ending in `*.e2e.spec.js`. For more about the e2e test suite, please see the [README](./e2e/README.md)
 
 ### Security Tests
-Each commit is analyzed for known security vulnerabilities using [CodeQL](https://codeql.github.com/docs/codeql-language-guides/codeql-library-for-javascript/). The list of CWE coverage items is available in the [CodeQL docs](https://codeql.github.com/codeql-query-help/javascript-cwe/). The CodeQL workflow is specified in the [CodeQL analysis file](./.github/workflows/codeql-analysis.yml) and the custom [CodeQL config](./.github/codeql/codeql-config.yml).
+Each commit is analyzed for known security vulnerabilities using [CodeQL](https://codeql.github.com/docs/codeql-language-guides/codeql-library-for-javascript/). The list of CWE coverage items is avaiable in the [CodeQL docs](https://codeql.github.com/codeql-query-help/javascript-cwe/). The CodeQL workflow is specified in the [CodeQL analysis file](./.github/workflows/codeql-analysis.yml) and the custom [CodeQL config](./.github/codeql/codeql-config.yml).
 
 ### Test Reporting and Code Coverage
 
@@ -127,8 +106,6 @@ Each test suite generates a report in CircleCI. For a complete overview of testi
 
 Our code coverage is generated during the runtime of our unit, e2e, and visual tests. The combination of those reports is published to [codecov.io](https://app.codecov.io/gh/nasa/openmct/)
 
-For more on the specifics of our code coverage setup, [see](TESTING.md#code-coverage)
-
 # Glossary
 
 Certain terms are used throughout Open MCT with consistent meanings
@@ -184,17 +161,3 @@ You might still be using legacy API if your source code
 
 ### What should I do if I am using legacy API?
 Please refer to [the modern Open MCT API](https://nasa.github.io/openmct/documentation/). Post any questions to the [Discussions section](https://github.com/nasa/openmct/discussions) of the Open MCT GitHub repository.
-
-## Related Repos
-
-> [!NOTE]
-> Although Open MCT functions as a standalone project, it is primarily an extensible framework intended to be used as a dependency with users' own plugins and packaging. Furthermore, Open MCT is intended to be used with an HTTP server such as Apache or Nginx. A great example of hosting Open MCT with Apache is `openmct-quickstart` and can be found in the table below.
-
-| Repository | Description |
-| --- | --- |
-| [openmct-tutorial](https://github.com/nasa/openmct-tutorial) | A great place for beginners to learn how to use and extend Open MCT. |
-| [openmct-quickstart](https://github.com/scottbell/openmct-quickstart) | A working example of Open MCT integrated with Apache HTTP server, YAMCS telemetry, and Couch DB for persistence.
-| [Open MCT YAMCS Plugin](https://github.com/akhenry/openmct-yamcs) | Plugin for integrating YAMCS telemetry and command server with Open MCT. |
-| [openmct-performance](https://github.com/unlikelyzero/openmct-performance) | Resources for performance testing Open MCT. |
-| [openmct-as-a-dependency](https://github.com/unlikelyzero/openmct-as-a-dependency) | An advanced guide for users on how to build, develop, and test Open MCT when it's used as a dependency. |
-

TESTING.md

@@ -37,84 +37,14 @@ Documentation located [here](./e2e/README.md)
 
 ## Code Coverage
 
-It's up to the individual developer as to whether they want to add line coverage in the form of a unit test or e2e test.
+* 100% statement coverage is achievable and desirable.
 
-Line Code Coverage is generated by our unit tests and e2e tests, then combined by ([Codecov.io Flags](https://docs.codecov.com/docs/flags)), and finally reported in GitHub PRs by Codecov.io's PR Bot. This workflow gives a comprehensive (if flawed) view of line coverage.
-
-### Karma-istanbul
-
-Line coverage is generated by our `karma-coverage-istanbul-reporter` package as defined in our `karma.conf.js` file:
-
-```js
-    coverageIstanbulReporter: {
-      fixWebpackSourcePaths: true,
-      skipFilesWithNoCoverage: true,
-      dir: 'coverage/unit', //Sets coverage file to be consumed by codecov.io
-      reports: ['lcovonly']
-    },
-```
-
-Once the file is generated, it can be published to codecov with
-
-```json
-    "cov:unit:publish": "codecov --disable=gcov -f ./coverage/unit/lcov.info -F unit",
-```
-
-### e2e
-The e2e line coverage is a bit more complex than the karma implementation. This is the general sequence of events:
-
-1. Each e2e suite will start webpack with the ```npm run start:coverage``` command with config `webpack.coverage.js` and the `babel-plugin-istanbul` plugin to generate code coverage during e2e test execution using our custom [baseFixture](./baseFixtures.js). 
-1. During testcase execution, each e2e shard will generate its piece of the larger coverage suite. **This coverage file is not merged**. The raw coverage file is stored in a `.nyc_report` directory.
-1. [nyc](https://github.com/istanbuljs/nyc) converts this directory into a `lcov` file with the following command `npm run cov:e2e:report`
-1. Most of the tests are run in the '@stable' configuration and focus on chrome/ubuntu at a single resolution. This coverage is published to codecov with `npm run cov:e2e:stable:publish`.
-1. The rest of our coverage only appears when run against `@unstable` tests, persistent datastore (couchdb), non-ubuntu machines, and non-chrome browsers with the `npm run cov:e2e:full:publish` flag. Since this happens about once a day, we have leveraged codecov.io's carryforward flag to report on lines covered outside of each commit on an individual PR.
+Codecov.io will combine each of the above commands with [Codecov.io Flags](https://docs.codecov.com/docs/flags). Effectively, this allows us to combine multiple reports which are run at various stages of our CI Pipeline or run as part of a parallel process.
 
+This e2e coverage is combined with our unit test report to give a comprehensive (if flawed) view of line coverage.
 
 ### Limitations in our code coverage reporting
-Our code coverage implementation has some known limitations:
-- [Variability](https://github.com/nasa/openmct/issues/5811)
-- [Accuracy](https://github.com/nasa/openmct/issues/7015)
-- [Vue instrumentation gaps](https://github.com/nasa/openmct/issues/4973)
 
-## Troubleshooting CI
-The following is an evolving guide to troubleshoot CI and PR issues.
-
-### Github Checks failing
-There are a few reasons that your GitHub PR could be failing beyond simple failed tests.
-* Required Checks. We're leveraging required checks in GitHub so that we can quickly and precisely control what becomes and informational failure vs a hard requirement. The only way to determine the difference between a required vs information check is check for the `(Required)` emblem next to the step details in GitHub Checks.
-* Not all required checks are run per commit. You may need to manually trigger addition GitHub checks with a `pr:<label>` label added to your PR.
-
-### Flaky tests
-
-(CircleCI's test insights feature)[https://circleci.com/blog/introducing-test-insights-with-flaky-test-detection/] collects historical data about the individual test results for both unit and e2e tests. Note: only a 14 day window of flake is available.
-
-### Local=Pass and CI=Fail
-Although rare, it is possible that your test can pass locally but fail in CI.
-
-#### Busting Cache
-In certain circumstances, the CircleCI cache can become stale. In order to bust the cache, we've implemented a runtime boolean parameter in Circle CI creatively name BUST_CACHE. To execute:
-1. Navigate to the branch in Circle CI believed to have stale cache.
-1. Click on the 'Trigger Pipeline' button.
-1. Add Parameter -> Parameter Type = boolean , Name = BUST_CACHE ,Value = true
-1. Click 'Trigger Pipeline'
-
-#### Run tests in the same container as CI
-
-In extreme cases, tests can fail due to the constraints of running within a container. To execute tests in exactly the same way as run in CircleCI. 
-
-```sh
-// Replace {X.X.X} with the current Playwright version 
-// from our package.json or circleCI configuration file
-docker run --rm --network host --cpus="2" -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
-npm install
-```
-
-At this point, you're running inside the same container and with 2 cpu cores. You can specify the unit tests:
-```sh
-npm run test
-```
-or e2e tests:
-
-```sh
-npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep <the testcase name>
-```
+Our code coverage implementation has two known limitations:
+- [Variability and accuracy](https://github.com/nasa/openmct/issues/5811)
+- [Vue instrumentation](https://github.com/nasa/openmct/issues/4973)

build-docs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2024, United States Government
+#* Open MCT, Copyright (c) 2014-2023, United States Government
 #* as represented by the Administrator of the National Aeronautics and Space
 #* Administration. All rights reserved.
 #*

copyright-notice.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2024, United States Government
+ Open MCT, Copyright (c) 2014-2023, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

copyright-notice.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

docs/src/process/release.md

@@ -1,126 +0,0 @@
-
-# Release of NASA Open MCT NPM Package
-
-This document outlines the process and key considerations for releasing a new version of the NASA Open MCT project as an NPM (Node Package Manager) package.
-
-## FAQ
-
-1. When do we publish a new version of Open MCT?
-    - At the end of a working sprint (typically) after all blocking issues have been resolved.
-2. Where do we publish?
-    - [NPM](https://www.npmjs.com/package/openmct)
-    - [Github Releases](https://github.com/nasa/openmct/releases)
-2. What do we publish?
-    - What constitutes a "stable" release?
-        - TODO
-    - What constitutes a "latest" release?
-        - The most recently published release.
-    - What constitutes a "nightly" release?
-        - TODO
-4. What necessitates a patch release?
-    - 
-
-## 1. Pre-requisites
-
-Before releasing a new version of Open MCT, ensure that all dependencies are updated, and
-comprehensive testing is performed.
-
-## 2. Versioning
-
-Open MCT follows [Semantic Versioning 2.0.0 (SemVer)](https://semver.org) that consists of three 
-major components: `MAJOR.MINOR.PATCH` (i.e. `1.2.3`).
-
-Major releases are necessitated by fundamental framework changes that are expected to be incompatible
-with previous releases.
-
-Minor releases are necessitated by non-backwards-compatible application, API changes, or new
-features or enhancements.
-
-Patch releases are created for backporting fixes to blocking bugs that were discovered _after_
-the release of a major or minor version. They are not to introduce new features, enhancements, or
-dependency changes.
-
-## 3. Changelog Maintenance
-
-Changelogs can be found in the GitHub releases section of the repository and are auto-generated
-using [GitHub's feature](https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes).
-
-## 4. Pull Request Labeling
-
-Generation of release notes is automated by the use of labels on pull requests. The following
-labels are used to categorize pull requests:
-
-### `type:bug`
-
-Pull requests are to be labeled with `type:bug` if they contain changes that intend to fix a bug.
-
-### `type:enhancement`
-
-Pull requests are to be labeled with `type:enhancement` if they contain changes that intend to
-enhance existing functionality of Open MCT.
-
-### `type:feature`
-
-Pull requests are to be labeled with `type:feature` if they contain changes that intend to introduce
-new functionality to Open MCT.
-
-### `type:maintenance`
-
-Pull requests are to be labeled with `type:maintenance` if they contain changes that introduce
-new tests, documentation, or other maintenance-related changes.
-
-### `performance`
-
-Pull requests are to be labeled with `performance` if they contain changes that are intended to
-improve the performance of Open MCT.
-
-### `notable_change`
-
-Pull requests are to be labeled with `notable_change` if they contain changes that fit any of the 
-following criteria:
-
-- **Breaking Change**
-    - Highlights the integration of changes that are suspected to break, or without a doubt will
-    break, backwards compatibility. These should signal to users the upgrade might be seamless only
-    if dependency and integration factors are properly managed, if not, one should expect to manage
-    atypical technical snags.
-- **API Change**
-    - Signifies any change to the Open MCT API such as the addition of new methods, or the 
-    modification or deprecation of existing methods. API changes may or may not constitute a
-    breaking change.
-- **Default Behavior Change**
-    - Any change to the default behavior of Open MCT, such as the default configuration of a plugin,
-    or the default behavior of a user interface component or feature (i.e.: autoscale being enabled
-    by default on plots). 
-
-## 5. Community & Contributions
-
-Open MCT is an open-source project and contributions are welcome. As such, it is important to
-acknowledge the contributions of the community and contributors. Pull requests by contributors
-will be labeled with `source:community` to signify that the contribution was made by a member of
-the community.
-
-## 6. Release Process
-
-Currently, the release process is manual and requires the following steps:
-
-1. Clone a fresh copy of the repository. 
-    - `git clone git@github.com:nasa/openmct.git`
-2. Check out the appropriate release branch.
-    - `git checkout release/1.2.3`
-3. Ensure that the `package.json` file is updated with the correct version number and does not
-contain the `-next` suffix (which implies a pre-release).
-4. Create a tag for the release if it does not already exist.
-    - `git tag v1.2.3`
-5. Push the tag to the repository.
-    - `git push origin v1.2.3`
-6. Run `npm install` to install dependencies.
-7. Publish the release to NPM (You will need to be logged in to an NPM account with the appropriate permissions).
-    - `npm publish`
-8. Create a release on GitHub.
-    - Navigate to the Releases page on the Open MCT repository.
-    - Click [draft a new release.](https://github.com/nasa/openmct/releases/new)
-    - Choose the tag that was just created for the release.
-    - For "Previous tag", choose the tag that was most recently released.
-    - Click "Generate release notes" to auto-generate release notes.
-    - Click "Publish release" to publish the release.

docs/src/process/version.md

@@ -53,7 +53,7 @@ requirements.
 
 Additionally, the following project-specific standards will be used:
 
-* During development, a "-next" suffix shall be appended to the
+* During development, a "-SNAPSHOT" suffix shall be appended to the
   version number. The version number before the suffix shall reflect
   the next expected version number for release.
 * Prior to a 1.0.0 release, the _minor_ version will be incremented
@@ -93,7 +93,7 @@ numbers by the following process:
 
 1. Update version number in `package.json`
   1. Checkout branch created for the last sprint that has been successfully tested.
-  2. Remove a `-next` suffix from the version in `package.json`.
+  2. Remove a `-SNAPSHOT` suffix from the version in `package.json`.
   3. Verify that resulting version number meets semantic versioning
      requirements relative to previous stable version. Increment the 
      version number if necessary.
@@ -138,7 +138,7 @@ numbers by the following process:
   1. Create a new branch off the `master` branch.
   2. Remove any suffix from the version number, 
      or increment the _patch_ version if there is no suffix.
-  3. Append a `-next` suffix.
+  3. Append a `-SNAPSHOT` suffix.
   4. Commit changes to `package.json` on the `master` branch.
      The commit message should reference the sprint being opened,
      preferably by a URL reference to the associated Milestone in
@@ -150,6 +150,6 @@ numbers by the following process:
 Projects dependent on Open MCT being co-developed by the Open MCT
 team should follow a similar process, except that they should
 additionally update their dependency on Open MCT to point to the
-latest archive when removing their `-next` status, and
+latest archive when removing their `-SNAPSHOT` status, and
 that they should be pointed back to the `master` branch after
 this has completed.

e2e/.percy.ci.yml

@@ -1,33 +0,0 @@
-version: 2
-snapshot:
-  widths: [1024]
-  min-height: 1440 # px
-  percyCSS: |
-    /* Clock indicator... your days are numbered  */
-    .t-indicator-clock > .label {
-      opacity: 0 !important;
-    }
-    .c-input--datetime {
-      opacity: 0 !important;
-    }
-    /* Timer object text */
-    .c-ne__time-and-creator {
-      opacity: 0 !important;
-    }
-    /* Time Conductor ticks */
-    div.c-conductor-axis.c-conductor__ticks > svg {
-      opacity: 0 !important;
-    }
-    /* Embedded timestamp in notebooks */
-    .c-ne__embed__time{
-      opacity: 0 !important;
-    }
-    /* Time Conductor Start Time */
-    .c-compact-tc__setting-value{
-      opacity: 0 !important;
-    }
-    /* Chart Area for Plots */
-    .gl-plot-chart-area{
-      opacity: 0 !important;
-    }
-   

e2e/.percy.nightly.yml

@@ -1,32 +0,0 @@
-version: 2
-snapshot:
-  widths: [1024, 2000]
-  min-height: 1440 # px
-  percyCSS: |
-    /* Clock indicator... your days are numbered  */
-    .t-indicator-clock > .label {
-      opacity: 0 !important;
-    }
-    .c-input--datetime {
-      opacity: 0 !important;
-    }
-    /* Timer object text */
-    .c-ne__time-and-creator {
-      opacity: 0 !important;
-    }
-    /* Time Conductor ticks */
-    div.c-conductor-axis.c-conductor__ticks > svg {
-      opacity: 0 !important;
-    }
-    /* Embedded timestamp in notebooks */
-    .c-ne__embed__time{
-      opacity: 0 !important;
-    }
-    /* Time Conductor Start Time */
-    .c-compact-tc__setting-value{
-      opacity: 0 !important;
-    }
-    /* Chart Area for Plots */
-    .gl-plot-chart-area{
-      opacity: 0 !important;
-    }

e2e/.percy.yml

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

e2e/README.md

@@ -51,13 +51,11 @@ Next, you should walk through our implementation of Playwright in Open MCT:
 
 ## Types of e2e Testing
 
-e2e testing describes the layer at which a test is performed without prescribing the assertions which are made. Generally, when writing an e2e test, we have five choices to make on an assertion strategy:
+e2e testing describes the layer at which a test is performed without prescribing the assertions which are made. Generally, when writing an e2e test, we have three choices to make on an assertion strategy:
 
 1. Functional - Verifies the functional correctness of the application. Sometimes interchanged with e2e or regression testing.
 2. Visual - Verifies the "look and feel" of the application and can only detect _undesirable changes when compared to a previous baseline_.
 3. Snapshot - Similar to Visual in that it captures the "look" of the application and can only detect _undesirable changes when compared to a previous baseline_. **Generally not preferred due to advanced setup necessary.**
-4. Accessibility - Verifies that the application meets the accessibility standards defined by the [WCAG organization](https://www.w3.org/WAI/standards-guidelines/wcag/).
-5. Performance - Verifies that application provides a performant experience. Like Snapshot testing, these tests are generally not recommended due to their difficulty in providing a consistent result.
 
 When choosing between the different testing strategies, think only about the assertion that is made at the end of the series of test steps. "I want to verify that the Timer plugin functions correctly" vs "I want to verify that the Timer plugin does not look different than originally designed".
 
@@ -74,30 +72,19 @@ 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` 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` 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)
 
-At present, we are using percy with two configuration files: `./e2e/.percy.nightly.yml` and `./e2e/.percy.ci.yml`. This is mainly to reduce the number of snapshots. 
+### (Advanced) Snapshot Testing
 
-### Advanced: Snapshot Testing (Not Recommended)
+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.
 
-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.
+To give an example, if a _single_ visual test assertion for an Overlay plot is run through multiple DOM rendering engines at various viewports to see how the Plot looks. If that same test were run as a snapshot test, it could only be executed against a single browser, on a single platform (ubuntu docker container).
 
+Read more about [Playwright Snapshots](https://playwright.dev/docs/test-snapshots)
 
 #### Open MCT's implementation
 
@@ -109,7 +96,7 @@ For those interested in the mechanics of snapshot testing with Playwright, you c
 // from our package.json or circleCI configuration file
 docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
 npm install
-npm run test:e2e:checksnapshots
+npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
 ```
 
 ### Updating Snapshots
@@ -134,56 +121,19 @@ npm install
 npm run test:e2e:updatesnapshots
 ```
 
-Once that's done, you'll need to run the following to verify that the changes do not cause more problems:
-
-```sh
-npm run test:e2e:checksnapshots
-```
-
-## Automated Accessibility (a11y) Testing
-
-Open MCT incorporates accessibility testing through two primary methods to ensure its compliance with accessibility standards:
-
-1. **Usage of Playwright's Locator Strategy**: Open MCT utilizes Playwright's locator strategy, specifically the [page.getByRole('') function](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role), to ensure that web elements are accessible via assistive technologies. This approach focuses on the accessibility of elements rather than full adherence to a11y guidelines, which is covered in the second method.
-
-2. **Enforcing a11y Guidelines with Playwright Axe Plugin**: To rigorously enforce a11y guideline compliance, Open MCT employs the [playwright axe plugin](https://playwright.dev/docs/accessibility-testing). This is achieved through the `scanForA11yViolations` function within the visual testing suite. This method not only benefits from the existing coverage of the visual tests but also targets specific a11y issues, such as `color-contrast` violations, which are particularly pertinent in the context of visual testing.
-
-### a11y Standards (WCAG and Section 508)
-
-Playwright axe supports a wide range of [WCAG Standards](https://playwright.dev/docs/accessibility-testing#scanning-for-wcag-violations) to test against. Open MCT is testing against the [Section 508](https://www.section508.gov/test/testing-overview/) accessibility guidelines with the intent to support higher standards over time. As of 2024, Section508 requirements now map completely to WCAG 2.0 AA. In the future, Section 508 requirements may map to WCAG 2.1 AA.
-
-### Reading an a11y test failure
-
-When an a11y test fails, the result must be interpreted in the html test report or the a11y report json artifact stored in the `/test-results/` folder. The json structure should be parsed for `"violations"` by `"id"` and identified `"target"`. Example provided for the 'color-contrast-enhanced' violation.
-
-```json
-  "violations": 
-    {
-      "id": "color-contrast-enhanced",
-      "impact": "serious",
-      "html": "<span class=\"label c-indicator__label\">0 Snapshots <button aria-label=\"Show Snapshots\">Show</button></span>",
-        "target": [
-          ".s-status-off > .label.c-indicator__label"
-        ],
-        "failureSummary": "Fix any of the following:\n  Element has insufficient color contrast of 6.51 (foreground color: #aaaaaa, background color: #262626, font size: 8.1pt (10.8px), font weight: normal). Expected contrast ratio of 7:1"
-      }
-```
-
 ## Performance Testing
 
-The open source performance tests function in three ways which match their naming and folder structure:
+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.
 
-`./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.
+They're found under `./e2e/tests/performance` and are to be executed with the following npm script:
+
+`npm run test:perf`
 
 These tests are expected to become blocking and gating with assertions as we extend the capabilities of Playwright.
 
-In addition to the explicit definition of performance tests, we also ensure that our test timeout timing is "tight" to catch performance regressions detectable by action timeouts. i.e. [Notebooks load much slower than they used to #6459](https://github.com/nasa/openmct/issues/6459)
-
 ## Test Architecture and CI
 
-### Architecture
+### Architecture (TODO)
 
 ### File Structure
 
@@ -197,11 +147,8 @@ 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 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-a11y/`             | Visual tests and accessibility tests.|
-|`./tests/visual-a11y/component/`             | Visual and accessibility tests which are only run against a single component.|
+|`./tests/performance/`        | Performance tests.|
+|`./tests/visual/`             | Visual tests.|
 |`./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|
 
@@ -218,8 +165,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-a11y.config.js` | Used to run the visual and a11y tests in CI or locally|
+|`./playwright-visual.config.js` | Used to run the visual tests in CI or locally|
 
 #### Test Tags
 
@@ -229,15 +175,13 @@ Current list of test tags:
 
 |Test Tag|Description|
 |:-:|-|
-|`@mobile` | Test case or test suite is compatible with Playwright's iPad support and Open MCT's read-only mobile view (i.e. no create button).|
-|`@a11y` | Test case or test suite to execute playwright-axe accessibility checks and generate a11y reports.|
+|`@ipad` | Test case or test suite is compatible with Playwright's iPad support and Open MCT's read-only mobile view (i.e. no create button).|
 |`@gds` | Denotes a GDS Test Case used in the VIPER Mission.|
 |`@addInit` | Initializes the browser with an injected and artificial state. Useful for loading non-default plugins. Likely will not work outside of `npm start`.|
-|`@localStorage` | Captures or generates session storage to manipulate browser state. Useful for excluding in tests which require a persistent backend (i.e. CouchDB). See [note](#utilizing-localstorage)|
+|`@localStorage` | Captures or generates session storage to manipulate browser state. Useful for excluding in tests which require a persistent backend (i.e. CouchDB).|
 |`@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
 
@@ -256,7 +200,6 @@ CircleCI
 - Stable e2e tests against ubuntu and chrome
 - Performance tests against ubuntu and chrome
 - e2e tests are linted
-- Visual and a11y tests are run in a single resolution on the default `espresso` theme
 
 #### 2. Per-Merge Testing
 
@@ -264,19 +207,18 @@ 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, firefox, and an MMOC resolution profile
+- Full e2e suite against ubuntu and chrome
 - Performance tests against ubuntu and chrome
-- CouchDB suite
-- Visual and a11y Tests are run in the full profile
 
 Github Actions / Workflow
 
-- None at the moment
+- Visual Test baseline generation.
 
 #### Parallelism and Fast Feedback
 
@@ -308,7 +250,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 support macOS, Windows, and ubuntu 20+.
+We are leveraging the `browserslist` project to declare our supported list of browsers.
 
 #### **Where it's tested:**
 
@@ -322,22 +264,10 @@ 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 a Mission-need to support iPad and mobile devices. To run our test suites with mobile devices, please see our `playwright-mobile.config.js` projects.
-
-In general, our test suite is not designed to run against mobile devices as the mobile experience is a focused version of the application. Core functionality is missing (chiefly the 'Create' button). To bypass the object creation, we leverage the `storageState` properties for starting the mobile tests with localstorage.
-
-For now, the mobile tests will exist in the /tests/mobile/ suites and be executed with the
-```sh
-npm run test:e2e:mobile
-```
-command.
+We have the Mission-need to support iPad. To run our iPad suite, please see our `playwright-*.config.js` with the 'iPad' project.
 
 #### **Skipping or executing tests based on browser, os, and/os browser version:**
 
@@ -365,27 +295,14 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p
 
 ## Test Design, Best Practices, and Tips & Tricks
 
-### Test Design
+### Test Design (TODO)
 
-#### Test as the User
+- 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:
 
-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
+  ```javascript
     // You can capture the CreatedObjectInfo returned from this appAction:
     const clock = await createDomainObjectWithDefaults(page, { type: 'Clock' });
 
@@ -393,36 +310,12 @@ By adhering to this principle, we can create tests that are both robust and refl
     await page.goto(clock.url);
   ```
 
-  1. Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });`
+  - Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });`
     - Initial navigation should _almost_ always use the `{ waitUntil: 'domcontentloaded' }` option.
-  1.  Avoid repeated setup to test a single assertion. Write longer tests with multiple soft assertions.
-  This ensures that your changes will be picked up with large refactors.
+  - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.
 
-##### Utilizing LocalStorage
-  1. In order to save test runtime in the case of tests that require a decent amount of initial setup (such as in the case of testing complex displays), you may use [Playwright's `storageState` feature](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state) to generate and load localStorage states.
-  1. To generate a localStorage state to be used in a test:
-    - Add an e2e test to our generateLocalStorageData suite which sets the initial state (creating/configuring objects, etc.), saving it in the `test-data` folder:
-    ```js
-    // Save localStorage for future test execution
-    await context.storageState({
-      path: path.join(__dirname, '../../../e2e/test-data/display_layout_with_child_layouts.json')
-    });
-    ```
-    - Load the state from file at the beginning of the desired test suite (within the `test.describe()`). (NOTE: the storage state will be used for each test in the suite, so you may need to create a new suite):
-    ```js
-      const LOCALSTORAGE_PATH = path.resolve(
-        __dirname,
-        '../../../../test-data/display_layout_with_child_layouts.json'
-      );
-      test.use({
-        storageState: path.resolve(__dirname, LOCALSTORAGE_PATH)
-      }); 
-    ```
+### 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`:
@@ -435,39 +328,7 @@ By adhering to this principle, we can create tests that are both robust and refl
   await notesInput.fill(testNotes);
   ```
 
- #### How to Write a Great Visual Test
-
-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 unless explicitly testing realtime clock
-  - Employ the `createExampleTelemetryObject` appAction to source telemetry and specify a `name` to avoid autogenerated names.
-
-5. **Hide the Tree and Inspector**: Generally, your test will not require comparisons involving the tree and inspector. These aspects are covered in component-specific tests (explained below). To exclude them from the comparison by default, navigate to the root of the main view with the tree and inspector hidden:
-    - `await page.goto('./#/browse/mine?hideTree=true&hideInspector=true')`
-
-6. **Component-Specific Tests**: If you wish to focus on a particular component, use the `/visual-a11y/component/` folder and limit the scope of the comparison to that component. For instance:
-    ```js
-    await percySnapshot(page, `Tree Pane w/ single level expanded (theme: ${theme})`, {
-        scope: treePane
-    });
-    ```
-    - Note: The `scope` variable can be any valid CSS selector.
-
-7. **Write many `percySnapshot` commands in a single test**: In line with our approach to longer functional tests, we recommend that many test percySnapshots are taken in a single test. For instance:
-    ```js
-    //<Some interesting state>
-    await percySnapshot(page, `Before object expanded (theme: ${theme})`);
-    //<Click on object>
-    await percySnapshot(page, `object expanded (theme: ${theme})`);
-    //Select from object
-    await percySnapshot(page, `object selected (theme: ${theme})`)
-    ```
+#### How to write a great visual test (TODO)
 
 #### How to write a great network test
 
@@ -484,35 +345,12 @@ 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
+### Tips & Tricks (TODO)
 
 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
-import { test, expect } from '../../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 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.
+There are instances where multiple browser pages will need to be opened to verify multi-page or multi-tab application behavior.
 
 ### Reporting
 
@@ -536,7 +374,15 @@ Our e2e code coverage is captured and combined with our unit test coverage. For
 
 #### Generating e2e code coverage
 
-Please read more about our code coverage [here](../TESTING.md#code-coverage)
+Code coverage is collected during test execution using our custom [baseFixture](./baseFixtures.js). The raw coverage files are stored in a `.nyc_report` directory to be converted into a lcov file with the following [nyc](https://github.com/istanbuljs/nyc) command:
+
+```npm run cov:e2e:report```
+
+At this point, the nyc linecov report can be published to [codecov.io](https://about.codecov.io/) with the following command:
+
+```npm run cov:e2e:stable:publish``` for the stable suite running in ubuntu.
+or
+```npm run cov:e2e:full:publish``` for the full suite running against all available platforms.
 
 ## Other
 
@@ -586,19 +432,10 @@ A single e2e test in Open MCT is extended to run:
 - How is Open MCT extending default Playwright functionality?
 - What about Component Testing?
 
-### Writing Tests
-
-Playwright provides 3 supported methods of debugging and authoring tests:
-- A 'watch mode' for running tests locally and debugging on the fly
-- A 'debug mode' for debugging tests and writing assertions against tests
-- A 'VSCode plugin' for debugging tests within the VSCode IDE.
-
-Generally, we encourage folks to use the watch mode and provide a script `npm run test:e2e:watch` which launches the launch mode ui and enables hot reloading on the dev server.
-
-### e2e Troubleshooting
-
-Please follow the general guide troubleshooting in [the general troubleshooting doc](../TESTING.md#troubleshooting-ci)
+### Troubleshooting
 
+- Why is my test failing on CI and not locally?
+- How can I view the failing tests on CI?
 - Tests won't start because 'Error: <http://localhost:8080/># is already used...'
 This error will appear when running the tests locally. Sometimes, the webserver is left in an orphaned state and needs to be cleaned up. To clear up the orphaned webserver, execute the following from your Terminal:
 ```lsof -n -i4TCP:8080 | awk '{print$2}' | tail -1 | xargs kill -9```

e2e/appActions.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -35,7 +35,6 @@
  * @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'}
  */
 
 /**
@@ -54,9 +53,9 @@
  * @property {import('../src/api/notifications/NotificationAPI').NotificationOptions} [notificationOptions] additional options
  */
 
-import { expect } from '@playwright/test';
-import { Buffer } from 'buffer';
-import { v4 as genUuid } from 'uuid';
+const Buffer = require('buffer').Buffer;
+const genUuid = require('uuid').v4;
+const { expect } = require('@playwright/test');
 
 /**
  * This common function creates a domain object with the default options. It is the preferred way of creating objects
@@ -66,10 +65,7 @@ import { v4 as genUuid } from 'uuid';
  * @param {CreateObjectOptions} options
  * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
  */
-async function createDomainObjectWithDefaults(
-  page,
-  { type, name, parent = 'mine', customParameters = {} }
-) {
+async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine' }) {
   if (!name) {
     name = `${type}:${genUuid()}`;
   }
@@ -78,10 +74,10 @@ async function createDomainObjectWithDefaults(
 
   // 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}`);
+  await page.goto(`${parentUrl}?hideTree=true`);
 
   //Click the Create button
-  await page.getByRole('button', { name: 'Create' }).click();
+  await page.click('button:has-text("Create")');
 
   // Click the object specified by 'type'
   await page.click(`li[role='menuitem']:text("${type}")`);
@@ -98,17 +94,10 @@ async function createDomainObjectWithDefaults(
     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(),
-    await page.getByRole('button', { name: 'Save' }).click(),
+    page.click('[aria-label="Save"]'),
     // Wait for Save Banner to appear
     page.waitForSelector('.c-message-banner__message')
   ]);
@@ -120,8 +109,8 @@ async function createDomainObjectWithDefaults(
 
   if (await _isInEditMode(page, uuid)) {
     // Save (exit edit mode)
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('button[title="Save"]').click();
+    await page.locator('li[title="Save and Finish Editing"]').click();
   }
 
   return {
@@ -179,16 +168,16 @@ 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}`);
+  await page.goto(`${parentUrl}?hideTree=true`);
 
   // Click the Create button
-  await page.getByRole('button', { name: 'Create' }).click();
+  await page.click('button:has-text("Create")');
 
   // Click 'Plan' menu option
   await page.click(`li:text("Plan")`);
 
   // Modify the name input field of the domain object to accept 'name'
-  const nameInput = page.getByLabel('Title', { exact: true });
+  const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
   await nameInput.fill('');
   await nameInput.fill(name);
 
@@ -219,62 +208,6 @@ 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);
-
-  await page.goto(`${parentUrl}`);
-
-  await page.getByRole('button', { name: 'Create' }).click();
-
-  await page.locator('li:has-text("Sine Wave Generator")').click();
-
-  const name = 'VIPER Rover Heading';
-  await page.getByRole('dialog').locator('input[type="text"]').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.
@@ -284,7 +217,7 @@ async function navigateToObjectWithFixedTimeBounds(page, url, start, end) {
  */
 async function openObjectTreeContextMenu(page, url) {
   await page.goto(url);
-  await page.getByLabel('Show selected item in tree').click();
+  await page.click('button[title="Show selected item in tree"]');
   await page.locator('.is-navigated-object').click({
     button: 'right'
   });
@@ -338,13 +271,13 @@ async function getFocusedObjectUuid(page) {
  * URLs returned will be of the form `'./browse/#/mine/<uuid0>/<uuid1>/...'`
  *
  * @param {import('@playwright/test').Page} page
- * @param {string | import('../src/api/objects/ObjectAPI').Identifier} identifier the uuid or identifier of the object to get the url for
+ * @param {string} uuid the uuid of the object to get the url for
  * @returns {Promise<string>} the url of the object
  */
-async function getHashUrlToDomainObject(page, identifier) {
-  await page.waitForLoadState('load');
-  const hashUrl = await page.evaluate(async (objectIdentifier) => {
-    const path = await window.openmct.objects.getOriginalPath(objectIdentifier);
+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);
     let url =
       './#/browse/' +
       [...path]
@@ -358,7 +291,7 @@ async function getHashUrlToDomainObject(page, identifier) {
     }
 
     return url;
-  }, identifier);
+  }, uuid);
 
   return hashUrl;
 }
@@ -367,7 +300,6 @@ async function getHashUrlToDomainObject(page, identifier) {
  * 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) {
@@ -382,15 +314,15 @@ async function _isInEditMode(page, identifier) {
  */
 async function setTimeConductorMode(page, isFixedTimespan = true) {
   // Click 'mode' button
-  await page.getByRole('button', { name: 'Time Conductor Mode', exact: true }).click();
-  await page.getByRole('button', { name: 'Time Conductor Mode Menu' }).click();
-  // Switch time conductor mode. Note, need to wait here for URL to update as the router is debounced.
+  const timeConductorMode = await page.locator('.c-compact-tc');
+  await timeConductorMode.click();
+  await timeConductorMode.locator('.js-mode-button').click();
+
+  // Switch time conductor mode
   if (isFixedTimespan) {
-    await page.getByRole('menuitem', { name: /Fixed Timespan/ }).click();
-    await page.waitForURL(/tc\.mode=fixed/);
+    await page.locator('data-testid=conductor-modeOption-fixed').click();
   } else {
-    await page.getByRole('menuitem', { name: /Real-Time/ }).click();
-    await page.waitForURL(/tc\.mode=local/);
+    await page.locator('data-testid=conductor-modeOption-realtime').click();
   }
 }
 
@@ -412,12 +344,9 @@ async function setRealTimeMode(page) {
 
 /**
  * @typedef {Object} OffsetValues
- * @property {string | undefined} startHours
- * @property {string | undefined} startMins
- * @property {string | undefined} startSecs
- * @property {string | undefined} endHours
- * @property {string | undefined} endMins
- * @property {string | undefined} endSecs
+ * @property {string | undefined} hours
+ * @property {string | undefined} mins
+ * @property {string | undefined} secs
  */
 
 /**
@@ -426,32 +355,19 @@ async function setRealTimeMode(page) {
  * @param {OffsetValues} offset
  * @param {import('@playwright/test').Locator} offsetButton
  */
-async function setTimeConductorOffset(
-  page,
-  { startHours, startMins, startSecs, endHours, endMins, endSecs }
-) {
-  if (startHours) {
-    await page.getByRole('spinbutton', { name: 'Start offset hours' }).fill(startHours);
+async function setTimeConductorOffset(page, { hours, mins, secs }) {
+  // await offsetButton.click();
+
+  if (hours) {
+    await page.fill('.pr-time-input__hrs', hours);
   }
 
-  if (startMins) {
-    await page.getByRole('spinbutton', { name: 'Start offset minutes' }).fill(startMins);
+  if (mins) {
+    await page.fill('.pr-time-input__mins', mins);
   }
 
-  if (startSecs) {
-    await page.getByRole('spinbutton', { name: 'Start offset seconds' }).fill(startSecs);
-  }
-
-  if (endHours) {
-    await page.getByRole('spinbutton', { name: 'End offset hours' }).fill(endHours);
-  }
-
-  if (endMins) {
-    await page.getByRole('spinbutton', { name: 'End offset minutes' }).fill(endMins);
-  }
-
-  if (endSecs) {
-    await page.getByRole('spinbutton', { name: 'End offset seconds' }).fill(endSecs);
+  if (secs) {
+    await page.fill('.pr-time-input__secs', secs);
   }
 
   // Click the check button
@@ -465,7 +381,8 @@ async function setTimeConductorOffset(
  */
 async function setStartOffset(page, offset) {
   // Click 'mode' button
-  await page.getByRole('button', { name: 'Time Conductor Mode', exact: true }).click();
+  const timeConductorMode = await page.locator('.c-compact-tc');
+  await timeConductorMode.click();
   await setTimeConductorOffset(page, offset);
 }
 
@@ -476,73 +393,21 @@ async function setStartOffset(page, offset) {
  */
 async function setEndOffset(page, offset) {
   // Click 'mode' button
-  await page.getByRole('button', { name: 'Time Conductor Mode', exact: true }).click();
+  const timeConductorMode = await page.locator('.c-compact-tc');
+  await timeConductorMode.click();
   await setTimeConductorOffset(page, offset);
 }
 
 /**
- * Set the time conductor bounds in fixed time mode
+ * Selects an inspector tab based on the provided tab name
  *
- * 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
+ * @param {String} name the name of the tab
  */
-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);
-
-  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')).toBeInViewport();
-
-  await setTimeBounds(page, startDate, endDate);
-
-  await page.keyboard.press('Enter');
-}
-
-/**
- * Set the bounds of the visible conductor in fixed time mode
- * @private
- * @param {import('@playwright/test').Page} page
- * @param {string} startDate
- * @param {string} endDate
- */
-async function setTimeBounds(page, startDate, endDate) {
-  if (startDate) {
-    // Fill start time
-    await page
-      .getByRole('textbox', { name: 'Start date' })
-      .fill(startDate.toString().substring(0, 10));
-    await page
-      .getByRole('textbox', { name: 'Start time' })
-      .fill(startDate.toString().substring(11, 19));
-  }
-
-  if (endDate) {
-    // Fill end time
-    await page.getByRole('textbox', { name: 'End date' }).fill(endDate.toString().substring(0, 10));
-    await page
-      .getByRole('textbox', { name: 'End time' })
-      .fill(endDate.toString().substring(11, 19));
-  }
+async function selectInspectorTab(page, name) {
+  const inspectorTabs = page.getByRole('tablist');
+  const inspectorTab = inspectorTabs.getByTitle(name);
+  await inspectorTab.click();
 }
 
 /**
@@ -629,39 +494,21 @@ 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"]');
-}
-
-export {
+// eslint-disable-next-line no-undef
+module.exports = {
   createDomainObjectWithDefaults,
-  createExampleTelemetryObject,
   createNotification,
   createPlanFromJSON,
   expandEntireTree,
   expandTreePaneItemByName,
   getCanvasPixels,
-  getFocusedObjectUuid,
   getHashUrlToDomainObject,
-  navigateToObjectWithFixedTimeBounds,
+  getFocusedObjectUuid,
   openObjectTreeContextMenu,
-  renameObjectFromContextMenu,
-  setEndOffset,
   setFixedTimeMode,
-  setIndependentTimeConductorBounds,
   setRealTimeMode,
   setStartOffset,
-  setTimeConductorBounds,
+  setEndOffset,
+  selectInspectorTab,
   waitForPlotsToRender
 };

e2e/avpFixtures.js

@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * avpFixtures.js
- *
- * @file This module provides custom fixtures specifically tailored for Accessibility, Visual, and Performance (AVP) tests.
- * These fixtures extend the base functionality of the Playwright fixtures and appActions, and are designed to be
- * generalized across all plugins. They offer functionalities like scanning for accessibility violations, integrating
- * with axe-core, and more.
- *
- * IMPORTANT NOTE: This fixture file is not intended to be extended further by other fixtures. If you find yourself
- * needing to do so, please consult the documentation and consider creating a specialized fixture or modifying the
- * existing ones.
- */
-
-import AxeBuilder from '@axe-core/playwright';
-import fs from 'fs';
-import path from 'path';
-
-import { expect, test } from './pluginFixtures.js';
-
-// Constants for repeated values
-const TEST_RESULTS_DIR = './test-results';
-
-/**
- * Scans for accessibility violations on a page and writes a report to disk if violations are found.
- * Automatically asserts that no violations should be present.
- *
- * @typedef {object} GenerateReportOptions
- * @property {string} [reportName] - The name for the report file.
- *
- * @param {import('playwright').Page} page - The page object from Playwright.
- * @param {string} testCaseName - The name of the test case.
- * @param {GenerateReportOptions} [options={}] - The options for the report generation.
- *
- * @returns {Promise<object|null>} Returns the accessibility scan results if violations are found,
- *                                  otherwise returns null.
- */
-/* eslint-disable no-undef */
-export async function scanForA11yViolations(page, testCaseName, options = {}) {
-  const builder = new AxeBuilder({ page });
-  builder.withTags(['wcag2aa']);
-  // https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-  const accessibilityScanResults = await builder.analyze();
-
-  // Assert that no violations should be present
-  expect(
-    accessibilityScanResults.violations,
-    `Accessibility violations found in test case: ${testCaseName}`
-  ).toEqual([]);
-
-  // Check if there are any violations
-  if (accessibilityScanResults.violations.length > 0) {
-    let reportName = options.reportName || testCaseName;
-    let sanitizedReportName = reportName.replace(/\//g, '_');
-    const reportPath = path.join(TEST_RESULTS_DIR, `${sanitizedReportName}.json`);
-
-    try {
-      if (!fs.existsSync(TEST_RESULTS_DIR)) {
-        fs.mkdirSync(TEST_RESULTS_DIR);
-      }
-
-      fs.writeFileSync(reportPath, JSON.stringify(accessibilityScanResults, null, 2));
-      console.log(`Accessibility report with violations saved successfully as ${reportPath}`);
-      return accessibilityScanResults;
-    } catch (err) {
-      console.error(`Error writing the accessibility report to file ${reportPath}:`, err);
-      throw err;
-    }
-  } else {
-    console.log('No accessibility violations found, no report generated.');
-    return null;
-  }
-}
-
-export { expect, test };

e2e/baseFixtures.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -28,12 +28,12 @@
  * GitHub issues.
  */
 
-import { expect, request, test } from '@playwright/test';
-import fs from 'fs';
-import path from 'path';
-import sinon from 'sinon';
-import { fileURLToPath } from 'url';
-import { v4 as uuid } from 'uuid';
+const base = require('@playwright/test');
+const { expect, request } = base;
+const fs = require('fs');
+const path = require('path');
+const { v4: uuid } = require('uuid');
+const sinon = require('sinon');
 
 /**
  * Takes a `ConsoleMessage` and returns a formatted string. Used to enable console log error detection.
@@ -68,20 +68,15 @@ function waitForAnimations(locator) {
  */
 const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output');
 
-const extendedTest = test.extend({
+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: MISSION_TIME,
+   *       now: 0,
    *       shouldAdvanceTime: true
    * ```
    * If clockOptions are provided, will override the default clock with fake timers provided by SinonJS.
@@ -90,14 +85,13 @@ const extendedTest = 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: [
     async ({ context, clockOptions }, use) => {
       if (clockOptions !== undefined) {
         await context.addInitScript({
-          path: fileURLToPath(new URL('../node_modules/sinon/pkg/sinon.js', import.meta.url))
+          path: path.join(__dirname, '../', './node_modules/sinon/pkg/sinon.js')
         });
         await context.addInitScript((options) => {
           window.__clock = sinon.useFakeTimers(options);
@@ -149,24 +143,7 @@ const extendedTest = 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, 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
-      );
-    }
-
+  page: async ({ page, failOnConsoleError }, use) => {
     // Capture any console errors during test execution
     const messages = [];
     page.on('console', (msg) => messages.push(msg));
@@ -201,4 +178,6 @@ const extendedTest = test.extend({
   }
 });
 
-export { expect, request, extendedTest as test, waitForAnimations };
+exports.expect = expect;
+exports.request = request;
+exports.waitForAnimations = waitForAnimations;

e2e/constants.js

@@ -1,19 +0,0 @@
-/* eslint-disable prettier/prettier */
-/**
- * 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)
-
-/**
- * URL Constants
- * - This is the URL that the browser will be directed to when running visual tests. This URL
- *    - hides the tree and inspector to prevent visual noise
- *    - sets the time bounds to a fixed range
- */
-export const VISUAL_URL =
-  './#/browse/mine?tc.mode=fixed&tc.startBound=1693592063607&tc.endBound=1693593893607&tc.timeSystem=utc&view=grid&hideInspector=true&hideTree=true';

e2e/helper/addInitDataVisualization.js

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

e2e/helper/addInitExampleFaultProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitExampleFaultProviderStatic.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitExampleUser.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitFaultManagementPlugin.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitNotebookWithUrls.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitOperatorStatus.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/addInitRestrictedNotebook.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/helper/faultUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,15 +19,14 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import { fileURLToPath } from 'url';
+/* global __dirname */
+const path = require('path');
 
 /**
  * @param {import('@playwright/test').Page} page
  */
 async function navigateToFaultManagementWithExample(page) {
-  await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitExampleFaultProvider.js', import.meta.url))
-  });
+  await page.addInitScript({ path: path.join(__dirname, './', 'addInitExampleFaultProvider.js') });
 
   await navigateToFaultItemInTree(page);
 }
@@ -37,7 +36,7 @@ async function navigateToFaultManagementWithExample(page) {
  */
 async function navigateToFaultManagementWithStaticExample(page) {
   await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitExampleFaultProviderStatic.js', import.meta.url))
+    path: path.join(__dirname, './', 'addInitExampleFaultProviderStatic.js')
   });
 
   await navigateToFaultItemInTree(page);
@@ -47,9 +46,7 @@ async function navigateToFaultManagementWithStaticExample(page) {
  * @param {import('@playwright/test').Page} page
  */
 async function navigateToFaultManagementWithoutExample(page) {
-  await page.addInitScript({
-    path: fileURLToPath(new URL('./addInitFaultManagementPlugin.js', import.meta.url))
-  });
+  await page.addInitScript({ path: path.join(__dirname, './', 'addInitFaultManagementPlugin.js') });
 
   await navigateToFaultItemInTree(page);
 }
@@ -268,28 +265,29 @@ async function openFaultRowMenu(page, rowNumber) {
     .click();
 }
 
-export {
+// eslint-disable-next-line no-undef
+module.exports = {
+  navigateToFaultManagementWithExample,
+  navigateToFaultManagementWithStaticExample,
+  navigateToFaultManagementWithoutExample,
+  navigateToFaultItemInTree,
   acknowledgeFault,
+  shelveMultipleFaults,
   acknowledgeMultipleFaults,
+  shelveFault,
   changeViewTo,
-  clearSearch,
+  sortFaultsBy,
   enterSearchTerm,
+  clearSearch,
+  selectFaultItem,
+  getHighestSeverity,
+  getLowestSeverity,
+  getFaultResultCount,
   getFault,
   getFaultByName,
   getFaultName,
-  getFaultNamespace,
-  getFaultResultCount,
   getFaultSeverity,
+  getFaultNamespace,
   getFaultTriggerTime,
-  getHighestSeverity,
-  getLowestSeverity,
-  navigateToFaultItemInTree,
-  navigateToFaultManagementWithExample,
-  navigateToFaultManagementWithoutExample,
-  navigateToFaultManagementWithStaticExample,
-  openFaultRowMenu,
-  selectFaultItem,
-  shelveFault,
-  shelveMultipleFaults,
-  sortFaultsBy
+  openFaultRowMenu
 };

e2e/helper/notebookUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,11 +20,9 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { createDomainObjectWithDefaults } from '../appActions.js';
+const { createDomainObjectWithDefaults } = require('../appActions');
 
 const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
-const CUSTOM_NAME = 'CUSTOM_NAME';
-import { fileURLToPath } from 'url';
 
 /**
  * @param {import('@playwright/test').Page} page
@@ -34,7 +32,7 @@ async function enterTextEntry(page, text) {
   await page.locator(NOTEBOOK_DROP_AREA).click();
 
   // enter text
-  await page.getByLabel('Notebook Entry Input').last().fill(text);
+  await page.locator('[aria-label="Notebook Entry"].is-selected div.c-ne__text').fill(text);
   await commitEntry(page);
 }
 
@@ -49,7 +47,7 @@ async function dragAndDropEmbed(page, notebookObject) {
   // Navigate to notebook
   await page.goto(notebookObject.url);
   // Expand the tree to reveal the notebook
-  await page.getByLabel('Show selected item in tree').click();
+  await page.click('button[title="Show selected item in tree"]');
   // Drag and drop the SWG into the notebook
   await page.dragAndDrop(`text=${swg.name}`, NOTEBOOK_DROP_AREA);
   await commitEntry(page);
@@ -64,87 +62,8 @@ 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: fileURLToPath(new URL('./addInitRestrictedNotebook.js', import.meta.url))
-  });
-  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 page.getByRole('tab', { name: 'Annotations' }).click();
-
-  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;
-}
-
-export {
-  createNotebookAndEntry,
-  createNotebookEntryAndTags,
-  dragAndDropEmbed,
+module.exports = {
   enterTextEntry,
-  lockPage,
-  startAndAddRestrictedNotebookObject
+  dragAndDropEmbed
 };

e2e/helper/planningUtils.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { expect } from '../pluginFixtures.js';
+import { expect } from '../pluginFixtures';
 
 /**
  * Asserts that the number of activities in the plan view matches the number of
@@ -81,30 +81,6 @@ function activitiesWithinTimeBounds(start1, end1, start2, end2) {
   );
 }
 
-/**
- * Asserts that the swim lanes / groups in the plan view matches the order of
- * groups in the plan data.
- * @param {import('@playwright/test').Page} page the page
- * @param {object} plan The raw plan json to assert against
- * @param {string} objectUrl The URL of the object to assert against (plan or gantt chart)
- */
-export async function assertPlanOrderedSwimLanes(page, plan, objectUrl) {
-  // Switch to the plan view
-  await page.goto(`${objectUrl}?view=plan.view`);
-  const planGroups = await page
-    .locator('.c-plan__contents > div > .c-swimlane__lane-label .c-object-label__name')
-    .all();
-
-  const groups = plan.Groups;
-
-  for (let i = 0; i < groups.length; i++) {
-    // Assert that the order of groups in the plan view matches the order of
-    // groups in the plan data
-    const groupName = await planGroups[i].innerText();
-    expect(groupName).toEqual(groups[i].name);
-  }
-}
-
 /**
  * Navigate to the plan view, switch to fixed time mode,
  * and set the bounds to span all activities.
@@ -113,62 +89,13 @@ export async function assertPlanOrderedSwimLanes(page, plan, objectUrl) {
  * @param {string} planObjectUrl
  */
 export async function setBoundsToSpanAllActivities(page, planJson, planObjectUrl) {
+  const activities = Object.values(planJson).flat();
   // Get the earliest start value
-  const start = getEarliestStartTime(planJson);
+  const start = Math.min(...activities.map((activity) => activity.start));
   // Get the latest end value
-  const end = getLatestEndTime(planJson);
+  const end = Math.max(...activities.map((activity) => activity.end));
   // Set the start and end bounds to the earliest start and latest end
   await page.goto(
     `${planObjectUrl}?tc.mode=fixed&tc.startBound=${start}&tc.endBound=${end}&tc.timeSystem=utc&view=plan.view`
   );
 }
-
-/**
- * @param {object} planJson
- * @returns {number}
- */
-export function getEarliestStartTime(planJson) {
-  const activities = Object.values(planJson).flat();
-  return Math.min(...activities.map((activity) => activity.start));
-}
-
-/**
- *
- * @param {object} planJson
- * @returns {number}
- */
-export function getLatestEndTime(planJson) {
-  const activities = Object.values(planJson).flat();
-  return Math.max(...activities.map((activity) => activity.end));
-}
-
-/**
- * Uses the Open MCT API to set the status of a plan to 'draft'.
- * @param {import('@playwright/test').Page} page
- * @param {import('../../appActions').CreatedObjectInfo} plan
- */
-export async function setDraftStatusForPlan(page, plan) {
-  await page.evaluate(async (planObject) => {
-    await window.openmct.status.set(planObject.uuid, 'draft');
-  }, plan);
-}
-
-export async function addPlanGetInterceptor(page) {
-  await page.waitForLoadState('load');
-  await page.evaluate(async () => {
-    await window.openmct.objects.addGetInterceptor({
-      appliesTo: (identifier, domainObject) => {
-        return domainObject && domainObject.type === 'plan';
-      },
-      invoke: (identifier, object) => {
-        if (object) {
-          object.sourceMap = {
-            orderedGroups: 'Groups'
-          };
-        }
-
-        return object;
-      }
-    });
-  });
-}

e2e/helper/plotTagsUtils.js

@@ -1,189 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import { waitForPlotsToRender } from '../appActions.js';
-import { expect } from '../pluginFixtures.js';
-
-/**
- * Given a canvas and a set of points, tags the points on the canvas.
- * @param {import('@playwright/test').Page} page
- * @param {HTMLCanvasElement} canvas a telemetry item with a plot
- * @param {Number} xEnd a telemetry item with a plot
- * @param {Number} yEnd a telemetry item with a plot
- * @returns {Promise}
- */
-export async function createTags({ page, canvas, xEnd = 700, yEnd = 520 }) {
-  await canvas.hover({ trial: true });
-
-  //Alt+Shift Drag Start to select some points to tag
-  await page.keyboard.down('Alt');
-  await page.keyboard.down('Shift');
-
-  await canvas.dragTo(canvas, {
-    sourcePosition: {
-      x: 1,
-      y: 1
-    },
-    targetPosition: {
-      x: xEnd,
-      y: yEnd
-    }
-  });
-
-  //Alt Drag End
-  await page.keyboard.up('Alt');
-  await page.keyboard.up('Shift');
-
-  //Wait for canvas to stabilize.
-  await canvas.hover({ trial: true });
-
-  // add some tags
-  await page.getByText('Annotations').click();
-  await page.getByRole('button', { name: /Add Tag/ }).click();
-  await page.getByPlaceholder('Type to select tag').click();
-  await page.getByText('Driving').click();
-
-  await page.getByRole('button', { name: /Add Tag/ }).click();
-  await page.getByPlaceholder('Type to select tag').click();
-  await page.getByText('Science').click();
-}
-
-/**
- * Given a telemetry item (e.g., a Sine Wave Generator) with a plot, tests that the plot can be tagged.
- * @param {import('@playwright/test').Page} page
- * @param {import('../../../../appActions').CreatedObjectInfo} telemetryItem a telemetry item with a plot
- * @returns {Promise}
- */
-export async function testTelemetryItem(page, telemetryItem) {
-  // Check that telemetry item also received the tag
-  await page.goto(telemetryItem.url);
-
-  await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-  const canvas = page.locator('canvas').nth(1);
-  //Wait for canvas to stabilize.
-  await waitForPlotsToRender(page);
-
-  await expect(canvas).toBeInViewport();
-  await canvas.hover({ trial: true });
-
-  // click on the tagged plot point
-  await canvas.click({
-    position: {
-      x: 100,
-      y: 100
-    }
-  });
-
-  await expect(page.getByText('Science')).toBeVisible();
-  await expect(page.getByText('Driving')).toBeHidden();
-}
-
-/**
- * Given a page, tests that tags are searchable, deletable, and persist across reloads.
- * @param {import('@playwright/test').Page} page
- * @returns {Promise}
- */
-export async function basicTagsTests(page) {
-  // Search for Driving
-  await page.getByRole('searchbox', { name: 'Search Input' }).click();
-
-  // Clicking elsewhere should cause annotation selection to be cleared
-  await expect(page.getByText('No tags to display for this item')).toBeVisible();
-  //
-  await page.getByRole('searchbox', { name: 'Search Input' }).fill('driv');
-
-  // Always click on the first Sine Wave result
-  await page
-    .getByLabel('Search Result')
-    .getByText(/Sine Wave/)
-    .first()
-    .click();
-
-  // Delete Driving Tag
-  await page.hover('[aria-label="Tag"]:has-text("Driving")');
-  await page.locator('[aria-label="Remove tag Driving"]').click();
-
-  // Search for Science Tag
-  await page.getByRole('searchbox', { name: 'Search Input' }).click();
-  await page.getByRole('searchbox', { name: 'Search Input' }).fill('sc');
-
-  //Expect Science Tag to be present and and Driving Tags to be deleted
-  await expect(page.getByLabel('Search Result').first()).toContainText('Science');
-  await expect(page.getByLabel('Search Result').first()).not.toContainText('Driving');
-
-  // Search for Driving Tag and expect nothing found
-  await page.getByRole('searchbox', { name: 'Search Input' }).click();
-  await page.getByRole('searchbox', { name: 'Search Input' }).fill('driv');
-  await expect(page.getByText('No results found')).toBeVisible();
-
-  await page.reload({ waitUntil: 'domcontentloaded' });
-
-  await waitForPlotsToRender(page);
-
-  //Navigate to the Inspector and check that all tags have been removed
-  await expect(page.getByRole('tab', { name: 'Annotations' })).not.toHaveClass(/is-current/);
-  await page.getByRole('tab', { name: 'Annotations' }).click();
-  await expect(page.getByRole('tab', { name: 'Annotations' })).toHaveClass(/is-current/);
-  await expect(page.getByText('No tags to display for this item')).toBeVisible();
-
-  const canvas = page.locator('canvas').nth(1);
-  // click on the tagged plot point
-  await canvas.click({
-    position: {
-      x: 100,
-      y: 100
-    }
-  });
-
-  //Expect Science to be visible but Driving to be hidden
-  await expect(page.getByText('Science')).toBeVisible();
-  await expect(page.getByText('Driving')).toBeHidden();
-
-  //Click elsewhere
-  await page.locator('body').click();
-  //Click on tagged plot point again
-  await canvas.click({
-    position: {
-      x: 100,
-      y: 100
-    }
-  });
-
-  // Add Driving Tag again
-  await page.getByText('Annotations').click();
-  await page.getByRole('button', { name: /Add Tag/ }).click();
-  await page.getByPlaceholder('Type to select tag').click();
-  await page.getByText('Driving').click();
-
-  //Science and Driving Tags should be visible
-  await expect(page.getByText('Science')).toBeVisible();
-  await expect(page.getByText('Driving')).toBeVisible();
-
-  // Delete Driving Tag again
-  await page.hover('[aria-label="Tag"]:has-text("Driving")');
-  await page.locator('[aria-label="Remove tag Driving"]').click();
-
-  //Science Tag should be visible and Driving Tag should be hidden
-  await expect(page.getByText('Science')).toBeVisible();
-  await expect(page.getByText('Driving')).toBeHidden();
-}

e2e/helper/stylingUtils.js

@@ -1,104 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import { expect } from '../pluginFixtures.js';
-
-/**
- * Converts a hex color value to its RGB equivalent.
- *
- * @param {string} hex - The hex color value. i.e. '#5b0f00'
- * @returns {string} The RGB equivalent of the hex color.
- */
-function hexToRGB(hex) {
-  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-  return result
-    ? `rgb(${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)})`
-    : null;
-}
-
-/**
- * Sets the background and text color of a given element.
- *
- * @param {import('@playwright/test').Page} page - The Playwright page object.
- * @param {string} borderColorHex - The hex value of the border color to set, or 'No Style'.
- * @param {string} backgroundColorHex - The hex value of the background color to set, or 'No Style'.
- * @param {string} textColorHex - The hex value of the text color to set, or 'No Style'.
- * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be set.
- */
-async function setStyles(page, borderColorHex, backgroundColorHex, textColorHex, locator) {
-  await locator.click(); // Assuming the locator is clickable and opens the style setting UI
-  await page.getByLabel('Set border color').click();
-  await page.getByLabel(borderColorHex).click();
-  await page.getByLabel('Set background color').click();
-  await page.getByLabel(backgroundColorHex).click();
-  await page.getByLabel('Set text color').click();
-  await page.getByLabel(textColorHex).click();
-}
-
-/**
- * Checks if the styles of an element match the expected values.
- *
- * @param {string} expectedBorderColor - The expected border color in RGB format. Default is '#e6b8af' or 'rgb(230, 184, 175)'
- * @param {string} expectedBackgroundColor - The expected background color in RGB format.
- * @param {string} expectedTextColor - The expected text color in RGB format. Default is #aaaaaa or 'rgb(170, 170, 170)'
- * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be checked.
- */
-async function checkStyles(
-  expectedBorderColor,
-  expectedBackgroundColor,
-  expectedTextColor,
-  locator
-) {
-  const layoutStyles = await locator.evaluate((el) => {
-    return {
-      border: window.getComputedStyle(el).getPropertyValue('border-top-color'), //infer the left, right, and bottom
-      background: window.getComputedStyle(el).getPropertyValue('background-color'),
-      fontColor: window.getComputedStyle(el).getPropertyValue('color')
-    };
-  });
-  expect(layoutStyles.border).toContain(expectedBorderColor);
-  expect(layoutStyles.background).toContain(expectedBackgroundColor);
-  expect(layoutStyles.fontColor).toContain(expectedTextColor);
-}
-
-/**
- * Checks if the font Styles of an element match the expected values.
- *
- * @param {string} expectedFontSize - The expected font size in '72px' format. Default is 'Default'
- * @param {string} expectedFontWeight - The expected font Type. Format as '700' for bold. Default is 'Default'
- * @param {string} expectedFontFamily - The expected font Type. Format as "\"Andale Mono\", sans-serif". Default is 'Default'
- * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be checked.
- */
-async function checkFontStyles(expectedFontSize, expectedFontWeight, expectedFontFamily, locator) {
-  const layoutStyles = await locator.evaluate((el) => {
-    return {
-      fontSize: window.getComputedStyle(el).getPropertyValue('font-size'),
-      fontWeight: window.getComputedStyle(el).getPropertyValue('font-weight'),
-      fontFamily: window.getComputedStyle(el).getPropertyValue('font-family')
-    };
-  });
-  expect(layoutStyles.fontSize).toContain(expectedFontSize);
-  expect(layoutStyles.fontWeight).toContain(expectedFontWeight);
-  expect(layoutStyles.fontFamily).toContain(expectedFontFamily);
-}
-
-export { checkFontStyles, checkStyles, hexToRGB, setStyles };

e2e/helper/useSnowTheme.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/playwright-ci.config.js

@@ -1,8 +1,9 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
 // eslint-disable-next-line no-unused-vars
-import { devices } from '@playwright/test';
+const { devices } = require('@playwright/test');
 const MAX_FAILURES = 5;
 const NUM_WORKERS = 2;
 
@@ -10,14 +11,13 @@ const NUM_WORKERS = 2;
 const config = {
   retries: 2, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=5, this should ensure that flake is managed without failing the full suite
   testDir: 'tests',
-  grepInvert: /@mobile/, //Ignore mobile tests
   testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
   timeout: 60 * 1000,
   webServer: {
     command: 'npm run start:coverage',
     url: 'http://localhost:8080/#',
     timeout: 200 * 1000,
-    reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
+    reuseExistingServer: false
   },
   maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
   workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
@@ -76,8 +76,9 @@ const config = {
         outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
       }
     ],
-    ['junit', { outputFile: '../test-results/results.xml' }]
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    ['@deploysentinel/playwright']
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-local.config.js

@@ -1,11 +1,14 @@
+/* eslint-disable no-undef */
 // playwright.config.js
 // @ts-check
 
+// eslint-disable-next-line no-unused-vars
+const { devices } = require('@playwright/test');
+
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
   retries: 0,
   testDir: 'tests',
-  testMatch: '**/*.e2e.spec.js', // only run e2e tests
   testIgnore: '**/*.perf.spec.js',
   timeout: 30 * 1000,
   webServer: {
@@ -33,6 +36,7 @@ const config = {
     },
     {
       name: 'MMOC',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
@@ -44,6 +48,8 @@ const config = {
     },
     {
       name: 'safari',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
+      grep: /@ipad/, // only run ipad tests due to this bug https://github.com/microsoft/playwright/issues/8340
       grepInvert: /@snapshot/,
       use: {
         browserName: 'webkit'
@@ -51,6 +57,7 @@ const config = {
     },
     {
       name: 'firefox',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'firefox'
@@ -58,6 +65,7 @@ const config = {
     },
     {
       name: 'canary',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
@@ -66,11 +74,22 @@ const config = {
     },
     {
       name: 'chrome-beta',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
       grepInvert: /@snapshot/,
       use: {
         browserName: 'chromium',
         channel: 'chrome-beta'
       }
+    },
+    {
+      name: 'ipad',
+      testMatch: '**/*.e2e.spec.js', // only run e2e tests
+      grep: /@ipad/,
+      grepInvert: /@snapshot/,
+      use: {
+        browserName: 'webkit',
+        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
+      }
     }
   ],
   reporter: [
@@ -85,4 +104,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-mobile.config.js

@@ -1,69 +0,0 @@
-// playwright.config.js
-// @ts-check
-
-import { devices } from '@playwright/test';
-const MAX_FAILURES = 5;
-const NUM_WORKERS = 2;
-
-import { fileURLToPath } from 'url';
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-  retries: 1, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=5, this should ensure that flake is managed without failing the full suite
-  testDir: 'tests',
-  testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
-  timeout: 30 * 1000,
-  webServer: {
-    command: 'npm run start:coverage',
-    url: 'http://localhost:8080/#',
-    timeout: 200 * 1000,
-    reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
-  },
-  maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
-  workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
-  use: {
-    baseURL: 'http://localhost:8080/',
-    headless: true,
-    ignoreHTTPSErrors: true,
-    screenshot: 'only-on-failure',
-    trace: 'on-first-retry',
-    video: 'off'
-  },
-  projects: [
-    {
-      name: 'ipad',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    },
-    {
-      name: 'iphone',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPhone 14 Pro'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    }
-  ],
-  reporter: [
-    ['list'],
-    [
-      'html',
-      {
-        open: 'never',
-        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
-      }
-    ],
-    ['junit', { outputFile: '../test-results/results.xml' }]
-  ]
-};
-
-export default config;

e2e/playwright-performance-prod.config.js

@@ -1,59 +0,0 @@
-// 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' }]
-  ]
-};
-
-export default config;

e2e/playwright-performance.config.js

@@ -1,24 +1,26 @@
+/* eslint-disable no-undef */
 // 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', //need development mode for performance.marks and others
+    command: 'npm run start', //coverage not generated
     url: 'http://localhost:8080/#',
     timeout: 200 * 1000,
-    reuseExistingServer: false
+    reuseExistingServer: !CI
   },
   use: {
     browserName: 'chromium',
     baseURL: 'http://localhost:8080/',
-    headless: true,
-    ignoreHTTPSErrors: false, //HTTP performance varies!
+    headless: CI, //Only if running locally
+    ignoreHTTPSErrors: true,
     screenshot: 'off',
     trace: 'on-first-retry',
     video: 'off'
@@ -26,7 +28,6 @@ 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'
       }
@@ -39,4 +40,4 @@ const config = {
   ]
 };
 
-export default config;
+module.exports = config;

e2e/playwright-visual.config.js

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

e2e/playwright-watch.config.js

@@ -1,71 +0,0 @@
-// playwright.config.js
-// @ts-check
-
-import { devices } from '@playwright/test';
-import { fileURLToPath } from 'url';
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-  retries: 0, //Retries are not needed with watch mode
-  testDir: 'tests',
-  timeout: 60 * 1000,
-  webServer: {
-    command: 'npm run start', //Start in dev mode for hot reloading
-    url: 'http://localhost:8080/#',
-    timeout: 200 * 1000,
-    reuseExistingServer: true //This was originally disabled to prevent differences in local debugging vs. CI. However, it significantly speeds up local debugging.
-  },
-  workers: '75%', //Limit to 75% of the CPU to support running with dev server
-  use: {
-    baseURL: 'http://localhost:8080/',
-    headless: true,
-    ignoreHTTPSErrors: true,
-    screenshot: 'only-on-failure',
-    trace: 'on-first-retry',
-    video: 'off'
-  },
-  projects: [
-    {
-      name: 'chrome',
-      testMatch: '**/*.spec.js', // run all tests
-      use: {
-        browserName: 'chromium'
-      }
-    },
-    {
-      name: 'ipad',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPad (gen 7) landscape'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    },
-    {
-      name: 'iphone',
-      grep: /@mobile/,
-      use: {
-        storageState: fileURLToPath(
-          new URL('./test-data/display_layout_with_child_layouts.json', import.meta.url)
-        ),
-        browserName: 'webkit',
-        ...devices['iPhone 14 Pro'] // Complete List https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json
-      }
-    }
-  ],
-  reporter: [
-    ['list'],
-    [
-      'html',
-      {
-        open: 'never',
-        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
-      }
-    ],
-    ['junit', { outputFile: '../test-results/results.xml' }]
-  ]
-};
-
-export default config;

e2e/pluginFixtures.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -26,10 +26,9 @@
  * and appActions. These fixtures should be generalized across all plugins.
  */
 
-// import { createDomainObjectWithDefaults } from './appActions.js';
-import { fileURLToPath } from 'url';
-
-import { expect, request, test } from './baseFixtures.js';
+const { test, expect, request } = require('./baseFixtures');
+// const { createDomainObjectWithDefaults } = require('./appActions');
+const path = require('path');
 
 /**
  * @typedef {Object} ObjectCreateOptions
@@ -46,6 +45,8 @@ import { expect, request, test } from './baseFixtures.js';
 // 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
@@ -64,7 +65,10 @@ import { expect, request, test } from './baseFixtures.js';
 
 //     await createDomainObjectWithDefaults(page, type, name);
 
-//     const uuid = getHashUrlToDomainObject(page);
+//     // 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];
+//     });
 
 //     createdObjects.set(objectName, uuid);
 
@@ -118,7 +122,7 @@ const theme = 'espresso';
  */
 const myItemsFolderName = 'My Items';
 
-const extendedTest = test.extend({
+exports.test = test.extend({
   // This should follow in the Project's configuration. Can be set to 'snow' in playwright config.js
   theme: [theme, { option: true }],
   // eslint-disable-next-line no-shadow
@@ -126,9 +130,7 @@ const extendedTest = test.extend({
     // eslint-disable-next-line playwright/no-conditional-in-test
     if (theme === 'snow') {
       //inject snow theme
-      await page.addInitScript({
-        path: fileURLToPath(new URL('./helper/useSnowTheme.js', import.meta.url))
-      });
+      await page.addInitScript({ path: path.join(__dirname, './helper', './useSnowTheme.js') });
     }
 
     // Attach info about the currently running test and its project.
@@ -144,19 +146,19 @@ const extendedTest = test.extend({
     await use({ myItemsFolderName });
   }
 });
-
-export { expect, request, extendedTest as test };
+exports.expect = expect;
+exports.request = request;
 
 /**
  * Takes a readable stream and returns a string.
  * @param {ReadableStream} readable - the readable stream
  * @return {Promise<String>} the stringified stream
  */
-export async function streamToString(readable) {
+exports.streamToString = async function (readable) {
   let result = '';
   for await (const chunk of readable) {
     result += chunk;
   }
 
   return result;
-}
+};

e2e/test-data/VisualTestData_storage.json

@@ -0,0 +1,22 @@
+{
+  "cookies": [],
+  "origins": [
+    {
+      "origin": "http://localhost:8080",
+      "localStorage": [
+        {
+          "name": "mct",
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},\"58f55f3a-46d9-4c37-a726-27b5d38b895a\":{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400878,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400878},\"19f2e461-190e-4662-8d62-251e90bb7aac\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\",\"infinityValues\":false,\"staleness\":false},\"modified\":1689710400433,\"location\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"created\":1689710400433,\"persisted\":1689710400433}}"
+        },
+        {
+          "name": "mct-recent-objects",
+          "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400435,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400436},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"domainObject\":{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400435,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400436}},{\"objectPath\":[{\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"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\":1689710400433,\"location\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"created\":1689710400433,\"persisted\":1689710400433},{\"identifier\":{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"},\"name\":\"Overlay Plot:b0ba67ab-e383-40c1-a181-82b174e8fdf0\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"namespace\":\"\"}],\"configuration\":{\"series\":[]},\"notes\":\"framework/generateVisualTestData.e2e.spec.js\\nGenerate Visual Test Data @localStorage\\nchrome\",\"modified\":1689710400435,\"location\":\"mine\",\"created\":1689710399651,\"persisted\":1689710400436},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/58f55f3a-46d9-4c37-a726-27b5d38b895a/19f2e461-190e-4662-8d62-251e90bb7aac\",\"domainObject\":{\"identifier\":{\"key\":\"19f2e461-190e-4662-8d62-251e90bb7aac\",\"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\":1689710400433,\"location\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"created\":1689710400433,\"persisted\":1689710400433}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654},{\"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\":\"58f55f3a-46d9-4c37-a726-27b5d38b895a\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1689710399654,\"created\":1689710398656,\"persisted\":1689710399654}}]"
+        },
+        {
+          "name": "mct-tree-expanded",
+          "value": "[]"
+        }
+      ]
+    }
+  ]
+}

e2e/test-data/examplePlans/ExamplePlanWithOrderedLanes.json

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

e2e/test-data/examplePlans/ExamplePlan_Small1.json

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

e2e/test-data/examplePlans/ExamplePlan_Small3.json

@@ -1,42 +0,0 @@
-{
-  "Group 1": [
-    {
-      "name": "Time until birthday",
-      "start": 1650320402000,
-      "end": 1660343797000,
-      "type": "Group 1",
-      "color": "orange",
-      "textColor": "white",
-      "id": 1
-    },
-    {
-      "name": "Time until supper",
-      "start": 1650320402000,
-      "end": 1650420410000,
-      "type": "Group 2",
-      "color": "blue",
-      "textColor": "white",
-      "id": 2
-    }
-  ],
-  "Group 2": [
-    {
-      "name": "Time since the last time I ate",
-      "start": 1650320102001,
-      "end": 1650320102001,
-      "type": "Group 2",
-      "color": "green",
-      "textColor": "white",
-      "id": 3
-    },
-    {
-      "name": "Time since last accident",
-      "start": 1650320102002,
-      "end": 1650320102002,
-      "type": "Group 1",
-      "color": "yellow",
-      "textColor": "white",
-      "id": 4
-    }
-  ]
-}

e2e/test-data/overlay_plot_storage.json

@@ -1,22 +0,0 @@
-{
-  "cookies": [],
-  "origins": [
-    {
-      "origin": "http://localhost:8080",
-      "localStorage": [
-        {
-          "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},\"e78ca721-fb5e-409b-bf6d-597c87cb716f\":{\"identifier\":{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603880,\"location\":\"mine\",\"created\":1732413601740,\"persisted\":1732413603880},\"c6100044-56be-44b3-acca-6b9fddfb3849\":{\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602460,\"location\":\"mine\",\"created\":1732413602460,\"persisted\":1732413602460}}"
-        },
-        {
-          "name": "mct-recent-objects",
-          "value": "[{\"objectPath\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602460,\"location\":\"mine\",\"created\":1732413602460,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/c6100044-56be-44b3-acca-6b9fddfb3849\",\"domainObject\":{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":0,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602460,\"location\":\"mine\",\"created\":1732413602460,\"persisted\":1732413602460}},{\"objectPath\":[{\"identifier\":{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603880,\"location\":\"mine\",\"created\":1732413601740,\"persisted\":1732413603880},{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},{\"identifier\":{\"key\":\"ROOT\",\"namespace\":\"\"},\"name\":\"Open MCT\",\"type\":\"root\",\"composition\":[{\"key\":\"mine\",\"namespace\":\"\"}]}],\"navigationPath\":\"/browse/mine/e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"domainObject\":{\"identifier\":{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},\"name\":\"Overlay Plot with Telemetry Object\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with Telemetry Object\\nchrome\",\"modified\":1732413603880,\"location\":\"mine\",\"created\":1732413601740,\"persisted\":1732413603880}},{\"objectPath\":[{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460},{\"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\":\"e78ca721-fb5e-409b-bf6d-597c87cb716f\",\"namespace\":\"\"},{\"key\":\"c6100044-56be-44b3-acca-6b9fddfb3849\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413602460,\"created\":1732413600960,\"persisted\":1732413602460}}]"
-        },
-        {
-          "name": "mct-tree-expanded",
-          "value": "[]"
-        }
-      ]
-    }
-  ]
-}

e2e/test-data/overlay_plot_with_delay_storage.json

@@ -1,18 +0,0 @@
-{
-  "cookies": [],
-  "origins": [
-    {
-      "origin": "http://localhost:8080",
-      "localStorage": [
-        {
-          "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"modified\":1732413601720,\"created\":1732413600920,\"persisted\":1732413601720},\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\":{\"identifier\":{\"key\":\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\",\"namespace\":\"\"},\"name\":\"Overlay Plot with 5s Delay\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\",\"namespace\":\"\"}}]},\"notes\":\"framework/generateLocalStorageData.e2e.spec.js\\nGenerate Visual Test Data @localStorage @generatedata\\nGenerate Overlay Plot with 5s Delay\\nchrome\",\"modified\":1732413603020,\"location\":\"mine\",\"created\":1732413601720,\"persisted\":1732413603020},\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\":{\"identifier\":{\"key\":\"8f524b49-ad06-47f9-98e0-087b31a2f3e0\",\"namespace\":\"\"},\"name\":\"VIPER Rover Heading\",\"type\":\"generator\",\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":5000,\"infinityValues\":false,\"exceedFloat32\":false,\"staleness\":false},\"modified\":1732413602920,\"location\":\"67ca2e0a-b37e-4eda-86a4-ccdbb228bbc0\",\"created\":1732413602420,\"persisted\":1732413602920}}"
-        },
-        {
-          "name": "mct-tree-expanded",
-          "value": "[]"
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,13 +20,12 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {
+const { test, expect } = require('../../pluginFixtures.js');
+const {
   createDomainObjectWithDefaults,
   createNotification,
-  expandEntireTree,
-  openObjectTreeContextMenu
-} from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+  expandEntireTree
+} = require('../../appActions.js');
 
 test.describe('AppActions', () => {
   test('createDomainObjectsWithDefaults', async ({ page }) => {
@@ -156,7 +155,7 @@ test.describe('AppActions', () => {
 
     await page.goto('./#/browse/mine');
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click the object specified by 'type'
     await page.click(`li[role='menuitem']:text("Clock")`);
@@ -167,13 +166,4 @@ test.describe('AppActions', () => {
     const locatorTreeCollapsedItems = locatorTree.locator('role=treeitem[expanded=false]');
     expect(await locatorTreeCollapsedItems.count()).toBe(0);
   });
-  test('openObjectTreeContextMenu', async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-    const folder = await createDomainObjectWithDefaults(page, {
-      type: 'Folder'
-    });
-    await openObjectTreeContextMenu(page, folder.url);
-    await expect(page.getByLabel('Menu')).toBeVisible();
-  });
 });

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -26,7 +26,7 @@ relates to how we've extended it (i.e. ./e2e/baseFixtures.js) and assumptions ma
 (`npm start` and ./e2e/webpack-dev-middleware.js)
 */
 
-import { test } from '../../baseFixtures.js';
+const { test } = require('../../baseFixtures.js');
 
 test.describe('baseFixtures tests', () => {
   //Skip this test for now https://github.com/nasa/openmct/issues/6785

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,8 +45,8 @@
  */
 
 // Structure: Some standard Imports. Please update the required pathing.
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
 
 /**
  * Structure:
@@ -117,35 +117,6 @@ 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.
@@ -164,7 +135,7 @@ async function renameTimerFrom3DotMenu(page, timerUrl, newNameForTimer) {
   await page.goto(timerUrl);
 
   // Click on 3 Dot Menu
-  await page.locator('button[title="More actions"]').click();
+  await page.locator('button[title="More options"]').click();
 
   // Click text=Edit Properties...
   await page.locator('text=Edit Properties...').click();

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

@@ -1,325 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/**
- * This test suite is dedicated to 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.
- */
-
-import { fileURLToPath } from 'url';
-
-import { createDomainObjectWithDefaults, createExampleTelemetryObject } from '../../appActions.js';
-import { MISSION_TIME } from '../../constants.js';
-import { expect, test } from '../../pluginFixtures.js';
-
-const overlayPlotName = 'Overlay Plot with Telemetry Object';
-
-test.describe('Generate Visual Test Data @localStorage @generatedata', () => {
-  test.use({
-    clockOptions: {
-      now: MISSION_TIME,
-      shouldAdvanceTime: true
-    }
-  });
-
-  test.beforeEach(async ({ page }) => {
-    // Go to baseURL
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-
-  test('Generate display layout with 2 child display layouts', async ({ page, context }) => {
-    const parent = await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Parent Display Layout'
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Child Layout 1',
-      parent: parent.uuid
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Child Layout 2',
-      parent: parent.uuid
-    });
-
-    await page.goto(parent.url, { waitUntil: 'domcontentloaded' });
-    await page.getByLabel('Edit Object').click();
-    await page.getByLabel('Child Layout 2 Layout', { exact: true }).hover();
-    await page.getByLabel('Move Sub-object Frame').nth(1).click();
-    await page.getByLabel('X:').fill('30');
-
-    await page.getByLabel('Child Layout 1 Layout', { exact: true }).hover();
-    await page.getByLabel('Move Sub-object Frame').first().click();
-    await page.getByLabel('Y:').fill('30');
-
-    await page.getByLabel('Save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
-    //Save localStorage for future test execution
-    await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/display_layout_with_child_layouts.json', import.meta.url)
-      )
-    });
-  });
-
-  test('Generate flexible layout with 2 child display layouts', async ({ page, context }) => {
-    // Create Display Layout
-    const parent = await createDomainObjectWithDefaults(page, {
-      type: 'Flexible Layout',
-      name: 'Parent Flexible Layout'
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Child Layout 1',
-      parent: parent.uuid
-    });
-    await createDomainObjectWithDefaults(page, {
-      type: 'Display Layout',
-      name: 'Child Layout 2',
-      parent: parent.uuid
-    });
-
-    await page.goto(parent.url, { waitUntil: 'domcontentloaded' });
-
-    //Save localStorage for future test execution
-    await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/flexible_layout_with_child_layouts.json', import.meta.url)
-      )
-    });
-  });
-
-  // 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 actions"]').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 page.getByRole('tab', { name: 'Config' }).click();
-    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 page.getByRole('tab', { name: 'Properties' }).click();
-
-    // TODO: assert Example Telemetry property values
-    // await page.goto(exampleTelemetry.url);
-
-    // Save localStorage for future test execution
-    await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/overlay_plot_storage.json', import.meta.url)
-      )
-    });
-  });
-  // 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.getByLabel('More actions').click();
-    await page.getByLabel('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', exact: true }).click();
-    //Save localStorage for future test execution
-    await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../e2e/test-data/overlay_plot_with_delay_storage.json', import.meta.url)
-      )
-    });
-  });
-});
-
-test.describe('Validate Overlay Plot with Telemetry Object @localStorage @generatedata', () => {
-  test.use({
-    storageState: fileURLToPath(
-      new URL('../../../e2e/test-data/overlay_plot_storage.json', import.meta.url)
-    )
-  });
-  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 page.getByRole('tab', { name: 'Config' }).click();
-    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: fileURLToPath(
-      new URL('../../../e2e/test-data/overlay_plot_with_delay_storage.json', import.meta.url)
-    )
-  });
-  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 page.getByRole('tab', { name: 'Config' }).click();
-    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();
-  });
-});

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

@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * 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' });
+});

e2e/tests/framework/pluginFixtures.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,7 +25,7 @@ This test suite is dedicated to testing our use of our custom fixtures to verify
 that they are working as expected.
 */
 
-import { test } from '../../pluginFixtures.js';
+const { test } = require('../../pluginFixtures.js');
 
 // eslint-disable-next-line playwright/no-skipped-test
 test.describe.skip('pluginFixtures tests', () => {

e2e/tests/framework/testData.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,24 +20,16 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { ref } from 'vue';
-
-import { useEventEmitter } from './event.js';
-
-/**
- * Provides a reactive `isEditing` property that reflects the current editing state of the
- * application.
- * @param {OpenMCT} openmct the Open MCT API
- * @returns {{
- *  isEditing: import('vue').Ref<boolean>
- * }}
+/*
+ * This test suite template is to be used when verifying Test Data files found in /e2e/test-data/
  */
-export function useIsEditing(openmct) {
-  const isEditing = ref(openmct.editor.isEditing());
 
-  useEventEmitter(openmct.editor, 'isEditing', (_isEditing) => {
-    isEditing.value = _isEditing;
+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' });
+  });
 });
-
-  return { isEditing };
-}

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,36 +24,42 @@
 This test suite is dedicated to tests which verify branding related components.
 */
 
-import { expect, test } from '../../baseFixtures.js';
+const { test, expect } = require('../../baseFixtures.js');
 
 test.describe('Branding tests', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
   test('About Modal launches with basic branding properties', async ({ page }) => {
-    await page.getByLabel('About Modal').click();
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Click About button
+    await page.click('.l-shell__app-logo');
 
     // Verify that the NASA Logo Appears
-    await expect(page.getByAltText('Open MCT Splash Logo')).toBeVisible();
+    await expect(page.locator('.c-about__image')).toBeVisible();
 
     // Modify the Build information in 'about' Modal
-    await expect.soft(page.getByLabel('Version Number')).toContainText(/Version: \d/);
+    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info').first();
+    await expect(versionInformationLocator).toBeEnabled();
+    await expect.soft(versionInformationLocator).toContainText(/Version: \d/);
     await expect
-      .soft(page.getByLabel('Build Date'))
+      .soft(versionInformationLocator)
       .toContainText(/Build Date: ((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun))/);
-    await expect.soft(page.getByLabel('Revision')).toContainText(/Revision: \b[0-9a-f]{5,40}\b/);
-    await expect.soft(page.getByLabel('Branch')).toContainText(/Branch: ./);
+    await expect.soft(versionInformationLocator).toContainText(/Revision: \b[0-9a-f]{5,40}\b/);
+    await expect.soft(versionInformationLocator).toContainText(/Branch: ./);
   });
   test('Verify Links in About Modal @2p', async ({ page }) => {
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
     // Click About button
-    await page.getByLabel('About Modal').click();
+    await page.click('.l-shell__app-logo');
 
     // Verify that clicking on the third party licenses information opens up another tab on licenses url
     const [page2] = await Promise.all([
       page.waitForEvent('popup'),
-      page.getByText('click here for third party licensing information').click()
+      page.locator('text=click here for third party licensing information').click()
     ]);
-    await page2.waitForLoadState('domcontentloaded'); //Avoids timing issues with juggler/firefox
+    await page2.waitForLoadState('networkidle'); //Avoids timing issues with juggler/firefox
     expect(page2.waitForURL('**/licenses**')).toBeTruthy();
   });
 });

e2e/tests/functional/clearDataAction.e2e.spec.js

@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-Verify that the "Clear Data" menu action performs as expected for various object types.
-*/
-
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
-
-const backgroundImageSelector = '.c-imagery__main-image__background-image';
-
-test.describe('Clear Data Action', () => {
-  test.beforeEach(async ({ page }) => {
-    // Go to baseURL
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-    // Create a default 'Example Imagery' object
-    const exampleImagery = await createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
-
-    // Verify that the created object is focused
-    await expect(page.locator('.l-browse-bar__object-name')).toContainText(exampleImagery.name);
-    await page.locator('.c-imagery__main-image__bg').hover({ trial: true });
-    await expect(page.locator(backgroundImageSelector)).toBeVisible();
-  });
-  test('works as expected with Example Imagery', async ({ page }) => {
-    expect(await page.locator('.c-thumb__image').count()).toBeGreaterThan(0);
-    // Click the "Clear Data" menu action
-    await page.getByTitle('More actions').click();
-    await expect(
-      page.getByRole('menuitem', {
-        name: 'Clear Data for Object'
-      })
-    ).toBeEnabled();
-    await page
-      .getByRole('menuitem', {
-        name: 'Clear Data for Object'
-      })
-      .click();
-
-    // Verify that the background image is no longer visible
-    await expect(page.locator(backgroundImageSelector)).toBeHidden();
-    expect(await page.locator('.c-thumb__image').count()).toBe(0);
-  });
-});

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,7 +25,7 @@
  *
  */
 
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
 
 test.describe('CouchDB Status Indicator with mocked responses @couchdb', () => {
   test.use({ failOnConsoleError: false });
@@ -80,7 +80,7 @@ test.describe('CouchDB Status Indicator with mocked responses @couchdb', () => {
 test.describe('CouchDB initialization with mocked responses @couchdb', () => {
   test.use({ failOnConsoleError: false });
   test("'My Items' folder is created if it doesn't exist", async ({ page }) => {
-    const mockedMissingObjectResponseFromCouchDB = {
+    const mockedMissingObjectResponsefromCouchDB = {
       status: 404,
       contentType: 'application/json',
       body: JSON.stringify({})
@@ -92,7 +92,7 @@ test.describe('CouchDB initialization with mocked responses @couchdb', () => {
     await page.route(
       '**/mine',
       (route) => {
-        route.fulfill(mockedMissingObjectResponseFromCouchDB);
+        route.fulfill(mockedMissingObjectResponsefromCouchDB);
       },
       { times: 1 }
     );

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 This test suite is dedicated to tests which verify the basic operations surrounding the example event generator.
 */
 
-import { createDomainObjectWithDefaults } from '../../../appActions.js';
-import { expect, test } from '../../../pluginFixtures.js';
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../appActions');
 
 test.describe('Example Event Generator CRUD Operations', () => {
   test('Can create a Test Event Generator and it results in the table View', async ({ page }) => {
@@ -46,7 +46,7 @@ test.describe('Example Event Generator CRUD Operations', () => {
   });
 });
 
-test.describe('Example Event Generator Telemetry Event Verification', () => {
+test.describe('Example Event Generator Telemetry Event Verficiation', () => {
   test.fixme('telemetry is coming in for test event', async ({ page }) => {
     // Go to object created in step one
     // Verify the telemetry table is filled with > 1 row

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding conditionSets.
 */
 
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Sine Wave Generator', () => {
   test('Create new Sine Wave Generator Object and validate create Form Logic', async ({
@@ -38,7 +38,7 @@ test.describe('Sine Wave Generator', () => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click Sine Wave Generator
     await page.click('text=Sine Wave Generator');

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,16 +19,15 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify form functionality in isolation
 */
 
-import { fileURLToPath } from 'url';
-import { v4 as genUuid } from 'uuid';
-
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
+const genUuid = require('uuid').v4;
+const path = require('path');
 
 const TEST_FOLDER = 'test folder';
 const jsonFilePath = 'e2e/test-data/ExampleLayouts.json';
@@ -41,8 +40,8 @@ test.describe('Form Validation Behavior', () => {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
-    await page.getByRole('menuitem', { name: 'Folder' }).click();
+    await page.click('button:has-text("Create")');
+    await page.getByRole('menuitem', { name: ' Folder' }).click();
 
     // Fill in empty string into title and trigger validation with 'Tab'
     await page.click('text=Properties Title Notes >> input[type="text"]');
@@ -73,14 +72,14 @@ test.describe('Form Validation Behavior', () => {
 test.describe('Form File Input Behavior', () => {
   test.beforeEach(async ({ page }) => {
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addInitFileInputObject.js', import.meta.url))
+      path: path.join(__dirname, '../../helper', 'addInitFileInputObject.js')
     });
   });
 
   test('Can select a JSON file type', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.getByRole('button', { name: ' Create ' }).click();
     await page.getByRole('menuitem', { name: 'JSON File Input Object' }).click();
 
     await page.setInputFiles('#fileElem', jsonFilePath);
@@ -94,7 +93,7 @@ test.describe('Form File Input Behavior', () => {
   test('Can select an image file type', async ({ page }) => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.getByRole('button', { name: ' Create ' }).click();
     await page.getByRole('menuitem', { name: 'Image File Input Object' }).click();
 
     await page.setInputFiles('#fileElem', imageFilePath);
@@ -110,7 +109,7 @@ test.describe('Persistence operations @addInit', () => {
   // add non persistable root item
   test.beforeEach(async ({ page }) => {
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addNoneditableObject.js', import.meta.url))
+      path: path.join(__dirname, '../../helper', 'addNoneditableObject.js')
     });
   });
 
@@ -121,7 +120,7 @@ test.describe('Persistence operations @addInit', () => {
     });
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     await page.click('text=Condition Set');
 
@@ -158,7 +157,7 @@ test.describe('Persistence operations @couchdb', () => {
     });
 
     // Open the edit form for the clock object
-    await page.click('button[title="More actions"]');
+    await page.click('button[title="More options"]');
     await page.click('li[title="Edit properties of this object."]');
 
     // Modify the display format from default 12hr -> 24hr and click 'Save'

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,20 +19,20 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify persistability checks
 */
 
-import { fileURLToPath } from 'url';
+const { test, expect } = require('../../baseFixtures.js');
 
-import { expect, test } from '../../baseFixtures.js';
+const path = require('path');
 
 test.describe('Persistence operations @addInit', () => {
   // add non persistable root item
   test.beforeEach(async ({ page }) => {
     await page.addInitScript({
-      path: fileURLToPath(new URL('../../helper/addNoneditableObject.js', import.meta.url))
+      path: path.join(__dirname, '../../helper', 'addNoneditableObject.js')
     });
   });
 

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

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

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,8 +24,8 @@
 This test suite is dedicated to tests which verify the basic operations surrounding moving & linking objects.
 */
 
-import { createDomainObjectWithDefaults } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
 
 test.describe('Move & link item tests', () => {
   test('Create a basic object and verify that it can be moved to another folder', async ({
@@ -149,7 +149,7 @@ test.describe('Move & link item tests', () => {
 
     // Finish editing and save Telemetry Table
     await page.locator('.c-button--menu.c-button--major.icon-save').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // Create New Folder Basic Domain Object
     let folder = 'Test Folder';
@@ -292,7 +292,7 @@ test.describe('Move & link item tests', () => {
 });
 
 test.fixme(
-  'Cannot move a previously created domain object to non-persistable object in Move Modal',
+  'Cannot move a previously created domain object to non-peristable object in Move Modal',
   async ({ page }) => {
     //Create a domain object
     //Save Domain object

e2e/tests/functional/notification.e2e.spec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,14 +24,14 @@
 This test suite is dedicated to tests which verify Open MCT's Notification functionality
 */
 
-import { createDomainObjectWithDefaults, createNotification } from '../../appActions.js';
-import { expect, test } from '../../pluginFixtures.js';
+const { createDomainObjectWithDefaults, createNotification } = require('../../appActions');
+const { test, expect } = require('../../pluginFixtures');
 
 test.describe('Notifications List', () => {
-  test.fixme('Notifications can be dismissed individually', async ({ page }) => {
+  test('Notifications can be dismissed individually', async ({ page }) => {
     test.info().annotations.push({
       type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/6820'
+      description: 'https://github.com/nasa/openmct/issues/6122'
     });
 
     // Go to baseURL
@@ -91,30 +91,28 @@ test.describe('Notification Overlay', () => {
     // Create a new Display Layout object
     await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
 
-    // Dismiss notification banner
-    await page.getByRole('button', { name: 'Dismiss' }).click();
-
     // Click on the button "Review 1 Notification"
-    await page.getByRole('button', { name: 'Review 1 Notification' }).click();
+    await page.click('button[aria-label="Review 1 Notification"]');
 
     // Verify that Notification List is open
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toBeVisible();
+    expect(await page.locator('div[role="dialog"]').isVisible()).toBe(true);
 
     // Wait until there is no Notification Banner
-    await expect(page.getByRole('alert')).not.toBeAttached();
+    await page.waitForSelector('div[role="alert"]', { state: 'detached' });
 
     // Click on the "Close" button of the Notification List
-    await page.getByRole('button', { name: 'Close' }).click();
+    await page.click('button[aria-label="Close"]');
 
     // On the Display Layout object, click on the "Edit" button
-    await page.getByRole('button', { name: 'Edit Object' }).click();
+    await page.click('button[title="Edit"]');
 
     // Click on the "Save" button
-    await page.getByRole('button', { name: 'Save' }).click();
+    await page.click('button[title="Save"]');
 
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    // Click on the "Save and Finish Editing" option
+    await page.click('li[title="Save and Finish Editing"]');
 
     // Verify that Notification List is NOT open
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toBeHidden();
+    expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
   });
 });

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,26 +19,19 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import fs from 'fs';
-
-import { getPreciseDuration } from '../../../../src/utils/duration.js';
-import { createDomainObjectWithDefaults, createPlanFromJSON } from '../../../appActions.js';
-import {
+const { test, expect } = require('../../../pluginFixtures');
+const {
+  createPlanFromJSON,
+  createDomainObjectWithDefaults,
+  selectInspectorTab
+} = require('../../../appActions');
+const testPlan1 = require('../../../test-data/examplePlans/ExamplePlan_Small1.json');
+const testPlan2 = require('../../../test-data/examplePlans/ExamplePlan_Small2.json');
+const {
   assertPlanActivities,
   setBoundsToSpanAllActivities
-} from '../../../helper/planningUtils.js';
-import { expect, test } from '../../../pluginFixtures.js';
-
-const testPlan1 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small1.json', import.meta.url)
-  )
-);
-const testPlan2 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small2.json', import.meta.url)
-  )
-);
+} = require('../../../helper/planningUtils');
+const { getPreciseDuration } = require('../../../../src/utils/duration');
 
 test.describe('Gantt Chart', () => {
   let ganttChart;
@@ -69,7 +62,7 @@ test.describe('Gantt Chart', () => {
       .getByRole('dialog')
       .filter({ hasText: 'This action will replace the current Plan. Do you want to continue?' });
     await expect(replaceModal).toBeVisible();
-    await page.getByRole('button', { name: 'Ok', exact: true }).click();
+    await page.getByRole('button', { name: 'OK' }).click();
 
     await assertPlanActivities(page, testPlan2, ganttChart.url);
   });
@@ -87,7 +80,7 @@ test.describe('Gantt Chart', () => {
       .locator('g')
       .filter({ hasText: new RegExp(activity.name) })
       .click();
-    await page.getByRole('tab', { name: 'Activity' }).click();
+    await selectInspectorTab(page, 'Activity');
 
     const startDateTime = await page
       .locator(

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,27 +19,10 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import fs from 'fs';
-
-import { createPlanFromJSON } from '../../../appActions.js';
-import {
-  addPlanGetInterceptor,
-  assertPlanActivities,
-  assertPlanOrderedSwimLanes
-} from '../../../helper/planningUtils.js';
-import { expect, test } from '../../../pluginFixtures.js';
-
-const testPlan1 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small1.json', import.meta.url)
-  )
-);
-
-const testPlanWithOrderedLanes = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlanWithOrderedLanes.json', import.meta.url)
-  )
-);
+const { test } = require('../../../pluginFixtures');
+const { createPlanFromJSON } = require('../../../appActions');
+const testPlan1 = require('../../../test-data/examplePlans/ExamplePlan_Small1.json');
+const { assertPlanActivities } = require('../../../helper/planningUtils');
 
 test.describe('Plan', () => {
   let plan;
@@ -53,57 +36,4 @@ test.describe('Plan', () => {
   test('Displays all plan events', async ({ page }) => {
     await assertPlanActivities(page, testPlan1, plan.url);
   });
-
-  test('Displays plans with ordered swim lanes configuration', async ({ page }) => {
-    // Add configuration for swim lanes
-    await addPlanGetInterceptor(page);
-    // Create the plan
-    const planWithSwimLanes = await createPlanFromJSON(page, {
-      json: testPlanWithOrderedLanes
-    });
-    await assertPlanOrderedSwimLanes(page, testPlanWithOrderedLanes, planWithSwimLanes.url);
-  });
-
-  test('Allows setting the state of an activity when selected.', async ({ page }) => {
-    const groups = Object.keys(testPlan1);
-    const firstGroupKey = groups[0];
-    const firstGroupItems = testPlan1[firstGroupKey];
-    const firstActivity = firstGroupItems[0];
-    const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-    const startBound = firstActivity.start;
-    // Set the endBound to the end time of the current activity
-    let endBound = lastActivity.end;
-    // eslint-disable-next-line playwright/no-conditional-in-test
-    if (endBound === startBound) {
-      // Prevent oddities with setting start and end bound equal
-      // via URL params
-      endBound += 1;
-    }
-
-    // Switch to fixed time mode with all plan events within the bounds
-    await page.goto(
-      `${plan.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=plan.view`
-    );
-
-    // select the first activity in the list
-    await page.getByText('Past event 1').click();
-
-    // Find the activity state section in the inspector
-    await page.getByRole('tab', { name: 'Activity' }).click();
-
-    // Check that activity state dropdown selection shows the `set status` option by default
-    await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-      'Not started'
-    );
-
-    // Change the selection of the activity status
-    await page.getByRole('combobox').selectOption({ label: 'Aborted' });
-    // select a different activity and back to the previous one
-    await page.getByText('Past event 2').click();
-    await page.getByText('Past event 1').click();
-    // Check that activity state dropdown selection shows the previously selected option by default
-    await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-      'Aborted'
-    );
-  });
 });

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,34 +19,57 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import fs from 'fs';
 
-import { createDomainObjectWithDefaults, createPlanFromJSON } from '../../../appActions.js';
-import { getEarliestStartTime } from '../../../helper/planningUtils';
-import { expect, test } from '../../../pluginFixtures.js';
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults, createPlanFromJSON } = require('../../../appActions');
 
-const examplePlanSmall3 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small3.json', import.meta.url)
-  )
-);
-const examplePlanSmall1 = JSON.parse(
-  fs.readFileSync(
-    new URL('../../../test-data/examplePlans/ExamplePlan_Small1.json', import.meta.url)
-  )
-);
-// eslint-disable-next-line no-unused-vars
-const START_TIME_COLUMN = 0;
-// eslint-disable-next-line no-unused-vars
-const END_TIME_COLUMN = 1;
-const TIME_TO_FROM_COLUMN = 2;
-// eslint-disable-next-line no-unused-vars
-const ACTIVITY_COLUMN = 3;
-const HEADER_ROW = 0;
-const NUM_COLUMNS = 5;
+const testPlan = {
+  TEST_GROUP: [
+    {
+      name: 'Past event 1',
+      start: 1660320408000,
+      end: 1660343797000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 2',
+      start: 1660406808000,
+      end: 1660429160000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 3',
+      start: 1660493208000,
+      end: 1660503981000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 4',
+      start: 1660579608000,
+      end: 1660624108000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 5',
+      start: 1660666008000,
+      end: 1660681529000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    }
+  ]
+};
 
 test.describe('Time List', () => {
-  test("Create a Time List, add a single Plan to it, verify all the activities are displayed with no milliseconds and selecting an activity shows it's properties", async ({
+  test('Create a Time List, add a single Plan to it and verify all the activities are displayed with no milliseconds', async ({
     page
   }) => {
     // Goto baseURL
@@ -61,18 +84,19 @@ test.describe('Time List', () => {
     });
 
     await test.step('Create a Plan and add it to the timelist', async () => {
-      await createPlanFromJSON(page, {
+      const createdPlan = await createPlanFromJSON(page, {
         name: 'Test Plan',
-        json: examplePlanSmall1,
-        parent: timelist.uuid
+        json: testPlan
       });
-      const groups = Object.keys(examplePlanSmall1);
-      const firstGroupKey = groups[0];
-      const firstGroupItems = examplePlanSmall1[firstGroupKey];
-      const firstActivity = firstGroupItems[0];
-      const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-      const startBound = firstActivity.start;
-      const endBound = lastActivity.end;
+
+      await page.goto(timelist.url);
+      // Expand the tree to show the plan
+      await page.click("button[title='Show selected item in tree']");
+      await page.dragAndDrop(`role=treeitem[name=/${createdPlan.name}/]`, '.c-object-view');
+      await page.click("button[title='Save']");
+      await page.click("li[title='Save and Finish Editing']");
+      const startBound = testPlan.TEST_GROUP[0].start;
+      const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
 
       // Switch to fixed time mode with all plan events within the bounds
       await page.goto(
@@ -80,14 +104,13 @@ test.describe('Time List', () => {
       );
 
       // Verify all events are displayed
-      const eventCount = await page.getByRole('row').count();
-      // subtracting one for the header
-      await expect(eventCount - 1).toEqual(firstGroupItems.length);
+      const eventCount = await page.locator('.js-list-item').count();
+      expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
     });
 
     await test.step('Does not show milliseconds in times', async () => {
-      // Get an activity
-      const row = page.getByRole('row').nth(2);
+      // Get the first activity
+      const row = await page.locator('.js-list-item').first();
       // Verify that none fo the times have milliseconds displayed.
       // Example: 2024-11-17T16:00:00Z is correct and 2024-11-17T16:00:00.000Z is wrong
 
@@ -95,243 +118,5 @@ test.describe('Time List', () => {
       await expect(row.locator('.--end')).not.toContainText('.');
       await expect(row.locator('.--duration')).not.toContainText('.');
     });
-
-    await test.step('Shows activity properties when a row is selected', async () => {
-      await page.getByRole('row').nth(2).click();
-
-      // Find the activity state section in the inspector
-      await page.getByRole('tab', { name: 'Activity' }).click();
-      // Check that activity state label is displayed in the inspector.
-      await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-        'Not started'
-      );
   });
 });
-});
-
-test("View a timelist in expanded view, verify all the activities are displayed and selecting an activity shows it's properties", async ({
-  page
-}) => {
-  // Goto baseURL
-  await page.goto('./', { waitUntil: 'domcontentloaded' });
-
-  const timelist = await test.step('Create a Time List', async () => {
-    const createdTimeList = await createDomainObjectWithDefaults(page, { type: 'Time List' });
-    const objectName = await page.locator('.l-browse-bar__object-name').innerText();
-    expect(objectName).toBe(createdTimeList.name);
-
-    return createdTimeList;
-  });
-
-  await test.step('Create a Plan and add it to the timelist', async () => {
-    await createPlanFromJSON(page, {
-      name: 'Test Plan',
-      json: examplePlanSmall1,
-      parent: timelist.uuid
-    });
-
-    // Ensure that all activities are shown in the expanded view
-    const groups = Object.keys(examplePlanSmall1);
-    const firstGroupKey = groups[0];
-    const firstGroupItems = examplePlanSmall1[firstGroupKey];
-    const firstActivity = firstGroupItems[0];
-    const lastActivity = firstGroupItems[firstGroupItems.length - 1];
-    const startBound = firstActivity.start;
-    const endBound = lastActivity.end;
-
-    // Switch to fixed time mode with all plan events within the bounds
-    await page.goto(
-      `${timelist.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=timelist.view`
-    );
-
-    // Change the object to edit mode
-    await page.getByRole('button', { name: 'Edit Object' }).click();
-
-    // Find the display properties section in the inspector
-    await page.getByRole('tab', { name: 'View Properties' }).click();
-    // Switch to expanded view and save the setting
-    await page.getByLabel('Display Style').selectOption({ label: 'Expanded' });
-
-    // Click on the "Save" button
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
-    // Verify all events are displayed
-    const eventCount = await page.getByRole('row').count();
-    await expect(eventCount).toEqual(firstGroupItems.length);
-  });
-
-  await test.step('Shows activity properties when a row is selected', async () => {
-    await page.getByRole('row').nth(2).click();
-
-    // Find the activity state section in the inspector
-    await page.getByRole('tab', { name: 'Activity' }).click();
-    // Check that activity state label is displayed in the inspector.
-    await expect(page.getByLabel('Activity Status').locator("[aria-selected='true']")).toHaveText(
-      'Not started'
-    );
-  });
-});
-
-/**
- * The regular expression used to parse the countdown string.
- * Some examples of valid Countdown strings:
- * ```
- * '35D 02:03:04'
- * '-1D 01:02:03'
- * '01:02:03'
- * '-05:06:07'
- * ```
- */
-const COUNTDOWN_REGEXP = /(-)?(\d+D\s)?(\d{2}):(\d{2}):(\d{2})/;
-
-/**
- * @typedef {Object} CountdownOrUpObject
- * @property {string} sign - The sign of the countdown ('-' if the countdown is negative, '+' otherwise).
- * @property {string} days - The number of days in the countdown (undefined if there are no days).
- * @property {string} hours - The number of hours in the countdown.
- * @property {string} minutes - The number of minutes in the countdown.
- * @property {string} seconds - The number of seconds in the countdown.
- * @property {string} toString - The countdown string.
- */
-
-/**
- * Object representing the indices of the capture groups in a countdown regex match.
- *
- * @typedef {{ SIGN: number, DAYS: number, HOURS: number, MINUTES: number, SECONDS: number, REGEXP: RegExp }}
- * @property {number} SIGN - The index for the sign capture group (1 if a '-' sign is present, otherwise undefined).
- * @property {number} DAYS - The index for the days capture group (2 for the number of days, otherwise undefined).
- * @property {number} HOURS - The index for the hours capture group (3 for the hour part of the time).
- * @property {number} MINUTES - The index for the minutes capture group (4 for the minute part of the time).
- * @property {number} SECONDS - The index for the seconds capture group (5 for the second part of the time).
- */
-const COUNTDOWN = Object.freeze({
-  SIGN: 1,
-  DAYS: 2,
-  HOURS: 3,
-  MINUTES: 4,
-  SECONDS: 5
-});
-
-test.describe('Time List with controlled clock', () => {
-  test.use({
-    clockOptions: {
-      now: getEarliestStartTime(examplePlanSmall3),
-      shouldAdvanceTime: true
-    }
-  });
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-  });
-  test('Time List shows current events and counts down correctly in real-time mode', async ({
-    page
-  }) => {
-    await test.step('Create a Time List, add a Plan to it, and switch to real-time mode', async () => {
-      // Create Time List
-      const timelist = await createDomainObjectWithDefaults(page, {
-        type: 'Time List'
-      });
-
-      // Create a Plan with events that count down and up.
-      // Add it as a child to the Time List.
-      await createPlanFromJSON(page, {
-        json: examplePlanSmall3,
-        parent: timelist.uuid
-      });
-
-      // Navigate to the Time List in real-time mode
-      await page.goto(
-        `${timelist.url}?tc.mode=local&tc.startDelta=900000&tc.endDelta=1800000&tc.timeSystem=utc&view=grid`
-      );
-    });
-
-    const countUpCells = [
-      getCellByIndex(page, 1, TIME_TO_FROM_COLUMN),
-      getCellByIndex(page, 2, TIME_TO_FROM_COLUMN)
-    ];
-    const countdownCells = [
-      getCellByIndex(page, 3, TIME_TO_FROM_COLUMN),
-      getCellByIndex(page, 4, TIME_TO_FROM_COLUMN)
-    ];
-
-    // Verify that the countdown cells are counting down
-    for (let i = 0; i < countdownCells.length; i++) {
-      await test.step(`Countdown cell ${i + 1} counts down`, async () => {
-        const countdownCell = countdownCells[i];
-        // Get the initial countdown timestamp object
-        const beforeCountdown = await getAndAssertCountdownOrUpObject(page, i + 3);
-        // should not have a '-' sign
-        await expect(countdownCell).not.toHaveText('-');
-        // Wait until it changes
-        await expect(countdownCell).not.toHaveText(beforeCountdown.toString());
-        // Get the new countdown timestamp object
-        const afterCountdown = await getAndAssertCountdownOrUpObject(page, i + 3);
-        // Verify that the new countdown timestamp object is less than the old one
-        expect(Number(afterCountdown.seconds)).toBeLessThan(Number(beforeCountdown.seconds));
-      });
-    }
-
-    // Verify that the count-up cells are counting up
-    for (let i = 0; i < countUpCells.length; i++) {
-      await test.step(`Count-up cell ${i + 1} counts up`, async () => {
-        const countUpCell = countUpCells[i];
-        // Get the initial count-up timestamp object
-        const beforeCountUp = await getAndAssertCountdownOrUpObject(page, i + 1);
-        // should not have a '+' sign
-        await expect(countUpCell).not.toHaveText('+');
-        // Wait until it changes
-        await expect(countUpCell).not.toHaveText(beforeCountUp.toString());
-        // Get the new count-up timestamp object
-        const afterCountUp = await getAndAssertCountdownOrUpObject(page, i + 1);
-        // Verify that the new count-up timestamp object is greater than the old one
-        expect(Number(afterCountUp.seconds)).toBeGreaterThan(Number(beforeCountUp.seconds));
-      });
-    }
-  });
-});
-
-/**
- * Get the cell at the given row and column indices.
- * @param {import('@playwright/test').Page} page
- * @param {number} rowIndex
- * @param {number} columnIndex
- * @returns {import('@playwright/test').Locator} cell
- */
-function getCellByIndex(page, rowIndex, columnIndex) {
-  return page.getByRole('cell').nth(rowIndex * NUM_COLUMNS + columnIndex);
-}
-
-/**
- * Return the innerText of the cell at the given row and column indices.
- * @param {import('@playwright/test').Page} page
- * @param {number} rowIndex
- * @param {number} columnIndex
- * @returns {Promise<string>} text
- */
-async function getCellTextByIndex(page, rowIndex, columnIndex) {
-  const text = await getCellByIndex(page, rowIndex, columnIndex).innerText();
-  return text;
-}
-
-/**
- * Get the text from the countdown (or countup) cell in the given row, assert that it matches the countdown/countup
- * regex, and return an object representing the countdown.
- * @param {import('@playwright/test').Page} page
- * @param {number} rowIndex the row index
- * @returns {Promise<CountdownOrUpObject>} The countdown (or countup) object
- */
-async function getAndAssertCountdownOrUpObject(page, rowIndex) {
-  const timeToFrom = await getCellTextByIndex(page, HEADER_ROW + rowIndex, TIME_TO_FROM_COLUMN);
-
-  expect(timeToFrom).toMatch(COUNTDOWN_REGEXP);
-  const match = timeToFrom.match(COUNTDOWN_REGEXP);
-
-  return {
-    sign: match[COUNTDOWN.SIGN],
-    days: match[COUNTDOWN.DAYS],
-    hours: match[COUNTDOWN.HOURS],
-    minutes: match[COUNTDOWN.MINUTES],
-    seconds: match[COUNTDOWN.SECONDS],
-    toString: () => timeToFrom
-  };
-}

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,12 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {
-  createDomainObjectWithDefaults,
-  createPlanFromJSON,
-  setIndependentTimeConductorBounds
-} from '../../../appActions.js';
-import { expect, test } from '../../../pluginFixtures.js';
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults, createPlanFromJSON } = require('../../../appActions');
 
 const testPlan = {
   TEST_GROUP: [
@@ -73,7 +69,7 @@ const testPlan = {
 };
 
 test.describe('Time Strip', () => {
-  test('Create two Time Strips, add a single Plan to both, and verify they can have separate Independent Time Contexts @unstable', async ({
+  test('Create two Time Strips, add a single Plan to both, and verify they can have separate Indepdenent Time Contexts @unstable', async ({
     page
   }) => {
     test.info().annotations.push({
@@ -82,6 +78,9 @@ test.describe('Time Strip', () => {
     });
 
     // Constant locators
+    const independentTimeConductorInputs = page.locator(
+      '.l-shell__main-independent-time-conductor .c-input--datetime'
+    );
     const activityBounds = page.locator('.activity-bounds');
 
     // Goto baseURL
@@ -123,7 +122,9 @@ test.describe('Time Strip', () => {
     });
 
     await test.step('TimeStrip can use the Independent Time Conductor', async () => {
-      expect(await activityBounds.count()).toEqual(5);
+      // Activate Independent Time Conductor in Fixed Time Mode
+      await page.click('.c-toggle-switch__slider');
+      expect(await activityBounds.count()).toEqual(0);
 
       // Set the independent time bounds so that only one event is shown
       const startBound = testPlan.TEST_GROUP[0].start;
@@ -131,7 +132,12 @@ test.describe('Time Strip', () => {
       const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
       const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
 
-      await setIndependentTimeConductorBounds(page, startBoundString, endBoundString);
+      await independentTimeConductorInputs.nth(0).fill('');
+      await independentTimeConductorInputs.nth(0).fill(startBoundString);
+      await page.keyboard.press('Enter');
+      await independentTimeConductorInputs.nth(1).fill('');
+      await independentTimeConductorInputs.nth(1).fill(endBoundString);
+      await page.keyboard.press('Enter');
       expect(await activityBounds.count()).toEqual(1);
     });
 
@@ -150,6 +156,9 @@ test.describe('Time Strip', () => {
       await page.click("button[title='Save']");
       await page.click("li[title='Save and Finish Editing']");
 
+      // Activate Independent Time Conductor in Fixed Time Mode
+      await page.click('.c-toggle-switch__slider');
+
       // All events should be displayed at this point because the
       // initial independent context bounds will match the global bounds
       expect(await activityBounds.count()).toEqual(5);
@@ -160,7 +169,12 @@ test.describe('Time Strip', () => {
       const startBoundString = new Date(startBound).toISOString().replace('T', ' ');
       const endBoundString = new Date(endBound).toISOString().replace('T', ' ');
 
-      await setIndependentTimeConductorBounds(page, startBoundString, endBoundString);
+      await independentTimeConductorInputs.nth(0).fill('');
+      await independentTimeConductorInputs.nth(0).fill(startBoundString);
+      await page.keyboard.press('Enter');
+      await independentTimeConductorInputs.nth(1).fill('');
+      await independentTimeConductorInputs.nth(1).fill(endBoundString);
+      await page.keyboard.press('Enter');
 
       // Verify that two events are displayed
       expect(await activityBounds.count()).toEqual(2);

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Clock.
 */
 
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Clock Generator CRUD Operations', () => {
   test('Timezone dropdown will collapse when clicked outside or on dropdown icon again', async ({
@@ -38,10 +38,10 @@ test.describe('Clock Generator CRUD Operations', () => {
     await page.goto('./', { waitUntil: 'domcontentloaded' });
 
     //Click the Create button
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     // Click Clock
-    await page.getByRole('menuitem').first().click();
+    await page.click('text=Clock');
 
     // Click .icon-arrow-down
     await page.locator('.icon-arrow-down').click();

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -22,7 +22,7 @@
 
 // FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
-import { expect, test } from '../../../../baseFixtures.js';
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Remote Clock', () => {
   // eslint-disable-next-line require-await

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,62 +19,49 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+
 /*
 This test suite is dedicated to tests which verify the basic operations surrounding conditionSets. Note: this
-suite is sharing state between tests which is considered an anti-pattern. Implementing in this way to
+suite is sharing state between tests which is considered an anti-pattern. Implimenting in this way to
 demonstrate some playwright for test developers. This pattern should not be re-used in other CRUD suites.
 */
 
-import { fileURLToPath } from 'url';
-
-import {
-  createDomainObjectWithDefaults,
-  createExampleTelemetryObject
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures.js');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 let conditionSetUrl;
+let getConditionSetIdentifierFromUrl;
 
-test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () => {
+test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
   test.beforeAll(async ({ browser }) => {
     //TODO: This needs to be refactored
     const context = await browser.newContext();
     const page = await context.newPage();
     await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await page.getByRole('button', { name: 'Create' }).click();
+    await page.click('button:has-text("Create")');
 
     await page.locator('li[role="menuitem"]:has-text("Condition Set")').click();
 
     await Promise.all([page.waitForNavigation(), page.click('button:has-text("OK")')]);
 
     //Save localStorage for future test execution
-    await context.storageState({
-      path: fileURLToPath(
-        new URL('../../../../test-data/recycled_local_storage.json', import.meta.url)
-      )
-    });
+    await context.storageState({ path: './e2e/test-data/recycled_local_storage.json' });
 
     //Set object identifier from url
     conditionSetUrl = page.url();
 
+    getConditionSetIdentifierFromUrl = conditionSetUrl.split('/').pop().split('?')[0];
+    console.debug(`getConditionSetIdentifierFromUrl: ${getConditionSetIdentifierFromUrl}`);
     await page.close();
   });
 
   //Load localStorage for subsequent tests
-  test.use({
-    storageState: fileURLToPath(
-      new URL('../../../../test-data/recycled_local_storage.json', import.meta.url)
-    )
-  });
+  test.use({ storageState: './e2e/test-data/recycled_local_storage.json' });
 
   //Begin suite of tests again localStorage
-  test.fixme(
-    'Condition set object properties persist in main view and inspector @localStorage',
-    async ({ page }) => {
-      test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/7421'
-      });
+  test('Condition set object properties persist in main view and inspector @localStorage', async ({
+    page
+  }) => {
     //Navigate to baseURL with injected localStorage
     await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
 
@@ -95,8 +82,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
       .toContainText('Unnamed Condition Set');
     //Assertions on loaded Condition Set in Inspector
     expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
-    }
-  );
+  });
   test('condition set object can be modified on @localStorage', async ({ page, openmctConfig }) => {
     const { myItemsFolderName } = openmctConfig;
 
@@ -128,7 +114,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
       .nth(1)
       .click();
     // Click Save and Finish Editing Option
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     //Verify Main section reflects updated Name Property
     await expect
@@ -141,7 +127,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
     // Verify Inspector Details has updated Name property
     expect.soft(page.locator('text=Renamed Condition Set').nth(2)).toBeTruthy();
 
-    // Verify Tree reflects updated Name property
+    // Verify Tree reflects updated Name proprety
     // Expand Tree
     await page.locator(`text=Open MCT ${myItemsFolderName} >> span >> nth=3`).click();
     // Verify Condition Set Object is renamed in Tree
@@ -164,7 +150,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
     // Verify Inspector Details has updated Name property
     expect.soft(page.locator('text=Renamed Condition Set').nth(2)).toBeTruthy();
 
-    // Verify Tree reflects updated Name property
+    // Verify Tree reflects updated Name proprety
     // Expand Tree
     await page.locator(`text=Open MCT ${myItemsFolderName} >> span >> nth=3`).click();
     // Verify Condition Set Object is renamed in Tree
@@ -198,7 +184,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
       .first()
       .click();
     // Click hamburger button
-    await page.locator('[title="More actions"]').click();
+    await page.locator('[title="More options"]').click();
 
     // Click 'Remove' and press OK
     await page.locator('li[role="menuitem"]:has-text("Remove")').click();
@@ -219,31 +205,23 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage @2p', () =>
 });
 
 test.describe('Basic Condition Set Use', () => {
-  let conditionSet;
-
   test.beforeEach(async ({ page }) => {
     // Open a browser, navigate to the main page, and wait until all network events to resolve
     await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+  test('Can add a condition', async ({ page }) => {
     // Create a new condition set
-    conditionSet = await createDomainObjectWithDefaults(page, {
+    await createDomainObjectWithDefaults(page, {
       type: 'Condition Set',
       name: 'Test Condition Set'
     });
-  });
-  test('Creating a condition defaults the condition name to "Unnamed Condition"', async ({
-    page
-  }) => {
-    await page.goto(conditionSet.url);
-
     // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Click Add Condition button
     await page.locator('#addCondition').click();
     // Check that the new Unnamed Condition section appears
-    const numOfUnnamedConditions = await page
-      .locator('.c-condition__name', { hasText: 'Unnamed Condition' })
-      .count();
+    const numOfUnnamedConditions = await page.locator('text=Unnamed Condition').count();
     expect(numOfUnnamedConditions).toEqual(1);
   });
   test('ConditionSet should display appropriate view options', async ({ page }) => {
@@ -260,13 +238,16 @@ test.describe('Basic Condition Set Use', () => {
       type: 'Sine Wave Generator',
       name: 'Beta Sine Wave Generator'
     });
-
-    await page.goto(conditionSet.url);
+    const conditionSet1 = await createDomainObjectWithDefaults(page, {
+      type: 'Condition Set',
+      name: 'Test Condition Set'
+    });
 
     // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
+    await page.goto(conditionSet1.url);
     page.click('button[title="Show selected item in tree"]');
     // Add the Alpha & Beta Sine Wave Generator to the Condition Set and save changes
     const treePane = page.getByRole('tree', {
@@ -283,9 +264,9 @@ test.describe('Basic Condition Set Use', () => {
     await alphaGeneratorTreeItem.dragTo(conditionCollection);
     await betaGeneratorTreeItem.dragTo(conditionCollection);
 
-    await page.locator('button[title="Save"]').click();
+    const saveButtonLocator = page.locator('button[title="Save"]');
+    await saveButtonLocator.click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
-
     await page.click('button[title="Change the current view"]');
 
     await expect(page.getByRole('menuitem', { name: /Lad Table/ })).toBeHidden();
@@ -293,89 +274,95 @@ test.describe('Basic Condition Set Use', () => {
     await expect(page.getByRole('menuitem', { name: /Plot/ })).toBeVisible();
     await expect(page.getByRole('menuitem', { name: /Telemetry Table/ })).toBeVisible();
   });
-  test('ConditionSet has correct outputs when telemetry is and is not available', async ({
-    page
-  }) => {
-    const exampleTelemetry = await createExampleTelemetryObject(page);
+  test('ConditionSet should output blank instead of the default value', async ({ page }) => {
+    //Navigate to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
 
-    await page.getByTitle('Show selected item in tree').click();
-    await page.goto(conditionSet.url);
+    //Click the Create button
+    await page.click('button:has-text("Create")');
+
+    // Click the object specified by 'type'
+    await page.click(`li[role='menuitem']:text("Sine Wave Generator")`);
+    await page.getByRole('spinbutton', { name: 'Loading Delay (ms)' }).fill('8000');
+    const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+    await nameInput.fill('Delayed Sine Wave Generator');
+
+    // Click OK button and wait for Navigate event
+    await Promise.all([
+      page.waitForLoadState(),
+      page.click('[aria-label="Save"]'),
+      // Wait for Save Banner to appear
+      page.waitForSelector('.c-message-banner__message')
+    ]);
+
+    // Create a new condition set
+    await createDomainObjectWithDefaults(page, {
+      type: 'Condition Set',
+      name: 'Test Blank Output of Condition Set'
+    });
     // Change the object to edit mode
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
-    // Create two conditions
+    // Click Add Condition button twice
     await page.locator('#addCondition').click();
     await page.locator('#addCondition').click();
     await page.locator('#conditionCollection').getByRole('textbox').nth(0).fill('First Condition');
     await page.locator('#conditionCollection').getByRole('textbox').nth(1).fill('Second Condition');
 
-    // Add Telemetry to ConditionSet
-    const sineWaveGeneratorTreeItem = page
-      .getByRole('tree', {
+    // Expand the 'My Items' folder in the left tree
+    await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
+    // Add the Sine Wave Generator to the Condition Set and save changes
+    const treePane = page.getByRole('tree', {
       name: 'Main Tree'
-      })
-      .getByRole('treeitem', {
-        name: exampleTelemetry.name
     });
-    const conditionCollection = page.locator('#conditionCollection');
+    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: 'Delayed Sine Wave Generator'
+    });
+    const conditionCollection = await page.locator('#conditionCollection');
+
     await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
 
-    // Modify First Criterion
-    const firstCriterionTelemetry = page.locator(
+    const firstCriterionTelemetry = await page.locator(
       '[aria-label="Criterion Telemetry Selection"] >> nth=0'
     );
-    firstCriterionTelemetry.selectOption({ label: exampleTelemetry.name });
-    const firstCriterionMetadata = page.locator(
+    firstCriterionTelemetry.selectOption({ label: 'Delayed Sine Wave Generator' });
+
+    const secondCriterionTelemetry = await page.locator(
+      '[aria-label="Criterion Telemetry Selection"] >> nth=1'
+    );
+    secondCriterionTelemetry.selectOption({ label: 'Delayed Sine Wave Generator' });
+
+    const firstCriterionMetadata = await page.locator(
       '[aria-label="Criterion Metadata Selection"] >> nth=0'
     );
     firstCriterionMetadata.selectOption({ label: 'Sine' });
-    const firstCriterionComparison = page.locator(
-      '[aria-label="Criterion Comparison Selection"] >> nth=0'
-    );
-    firstCriterionComparison.selectOption({ label: 'is greater than or equal to' });
-    const firstCriterionInput = page.locator('[aria-label="Criterion Input"] >> nth=0');
-    await firstCriterionInput.fill('0');
 
-    // Modify First Criterion
-    const secondCriterionTelemetry = page.locator(
-      '[aria-label="Criterion Telemetry Selection"] >> nth=1'
-    );
-    secondCriterionTelemetry.selectOption({ label: exampleTelemetry.name });
-
-    const secondCriterionMetadata = page.locator(
+    const secondCriterionMetadata = await page.locator(
       '[aria-label="Criterion Metadata Selection"] >> nth=1'
     );
     secondCriterionMetadata.selectOption({ label: 'Sine' });
 
-    const secondCriterionComparison = page.locator(
+    const firstCriterionComparison = await page.locator(
+      '[aria-label="Criterion Comparison Selection"] >> nth=0'
+    );
+    firstCriterionComparison.selectOption({ label: 'is greater than or equal to' });
+
+    const secondCriterionComparison = await page.locator(
       '[aria-label="Criterion Comparison Selection"] >> nth=1'
     );
     secondCriterionComparison.selectOption({ label: 'is less than' });
 
-    const secondCriterionInput = page.locator('[aria-label="Criterion Input"] >> nth=1');
+    const firstCriterionInput = await page.locator('[aria-label="Criterion Input"] >> nth=0');
+    await firstCriterionInput.fill('0');
+
+    const secondCriterionInput = await page.locator('[aria-label="Criterion Input"] >> nth=1');
     await secondCriterionInput.fill('0');
 
-    // Save ConditionSet
-    await page.locator('button[title="Save"]').click();
+    const saveButtonLocator = page.locator('button[title="Save"]');
+    await saveButtonLocator.click();
     await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
 
-    // Validate that the condition set is evaluating and outputting
-    // the correct value when the underlying telemetry subscription is active.
-    let outputValue = page.locator('[aria-label="Current Output Value"]');
-    await expect(outputValue).toHaveText('false');
-
-    await page.goto(exampleTelemetry.url);
-
-    // Edit SWG to add 8 second loading delay to simulate the case
-    // where telemetry is not available.
-    await page.getByTitle('More actions').click();
-    await page.getByRole('menuitem', { name: 'Edit Properties...' }).click();
-    await page.getByRole('spinbutton', { name: 'Loading Delay (ms)' }).fill('8000');
-    await page.getByLabel('Save').click();
-
-    // Expect that the output value is blank or '---' if the
-    // underlying telemetry subscription is not active.
-    await page.goto(conditionSet.url);
+    const outputValue = await page.locator('[aria-label="Current Output Value"]');
     await expect(outputValue).toHaveText('---');
   });
 });

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,97 +19,14 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import { fileURLToPath } from 'url';
 
-import {
+const { test, expect } = require('../../../../pluginFixtures');
+const {
   createDomainObjectWithDefaults,
+  setStartOffset,
   setFixedTimeMode,
-  setIndependentTimeConductorBounds,
-  setRealTimeMode,
-  setStartOffset
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-const LOCALSTORAGE_PATH = fileURLToPath(
-  new URL('../../../../test-data/display_layout_with_child_layouts.json', import.meta.url)
-);
-const TINY_IMAGE_BASE64 =
-  'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII';
-
-test.describe('Display Layout Toolbar Actions @localStorage', () => {
-  const PARENT_DISPLAY_LAYOUT_NAME = 'Parent Display Layout';
-  const CHILD_DISPLAY_LAYOUT_NAME1 = 'Child Layout 1';
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await setRealTimeMode(page);
-    await page
-      .locator('a')
-      .filter({ hasText: 'Parent Display Layout Display Layout' })
-      .first()
-      .click();
-    await page.getByLabel('Edit Object').click();
-  });
-  test.use({
-    storageState: LOCALSTORAGE_PATH
-  });
-
-  test('can add/remove Text element to a single layout', async ({ page }) => {
-    const layoutObject = 'Text';
-    await test.step(`Add and remove ${layoutObject} from the parent's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, PARENT_DISPLAY_LAYOUT_NAME);
-    });
-    await test.step(`Add and remove ${layoutObject} from the child's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, CHILD_DISPLAY_LAYOUT_NAME1);
-    });
-  });
-  test('can add/remove Image to a single layout', async ({ page }) => {
-    const layoutObject = 'Image';
-    await test.step("Add and remove image element from the parent's layout", async () => {
-      expect(await page.getByLabel(`Move ${layoutObject} Frame`).count()).toBe(0);
-      await addLayoutObject(page, PARENT_DISPLAY_LAYOUT_NAME, layoutObject);
-      expect(await page.getByLabel(`Move ${layoutObject} Frame`).count()).toBe(1);
-      await removeLayoutObject(page, layoutObject);
-      expect(await page.getByLabel(`Move ${layoutObject} Frame`).count()).toBe(0);
-    });
-    await test.step("Add and remove image from the child's layout", async () => {
-      await addLayoutObject(page, CHILD_DISPLAY_LAYOUT_NAME1, layoutObject);
-      expect(await page.getByLabel(`Move ${layoutObject} Frame`).count()).toBe(1);
-      await removeLayoutObject(page, layoutObject);
-      expect(await page.getByLabel(`Move ${layoutObject} Frame`).count()).toBe(0);
-    });
-  });
-  test(`can add/remove Box to a single layout`, async ({ page }) => {
-    const layoutObject = 'Box';
-    await test.step(`Add and remove ${layoutObject} from the parent's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, PARENT_DISPLAY_LAYOUT_NAME);
-    });
-    await test.step(`Add and remove ${layoutObject} from the child's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, CHILD_DISPLAY_LAYOUT_NAME1);
-    });
-  });
-  test(`can add/remove Line to a single layout`, async ({ page }) => {
-    const layoutObject = 'Line';
-    await test.step(`Add and remove ${layoutObject} from the parent's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, PARENT_DISPLAY_LAYOUT_NAME);
-    });
-    await test.step(`Add and remove ${layoutObject} from the child's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, CHILD_DISPLAY_LAYOUT_NAME1);
-    });
-  });
-  test(`can add/remove Ellipse to a single layout`, async ({ page }) => {
-    const layoutObject = 'Ellipse';
-    await test.step(`Add and remove ${layoutObject} from the parent's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, PARENT_DISPLAY_LAYOUT_NAME);
-    });
-    await test.step(`Add and remove ${layoutObject} from the child's layout`, async () => {
-      await addAndRemoveDrawingObjectAndAssert(page, layoutObject, CHILD_DISPLAY_LAYOUT_NAME1);
-    });
-  });
-  test.fixme('Can switch view types of a single SWG in a layout', async ({ page }) => {});
-  test.fixme('Can merge multiple plots in a layout', async ({ page }) => {});
-  test.fixme('Can adjust stack order of a single object in a layout', async ({ page }) => {});
-  test.fixme('Can duplicate a single object in a layout', async ({ page }) => {});
-});
+  setRealTimeMode
+} = require('../../../../appActions');
 
 test.describe('Display Layout', () => {
   /** @type {import('../../../../appActions').CreatedObjectInfo} */
@@ -123,7 +40,6 @@ test.describe('Display Layout', () => {
       type: 'Sine Wave Generator'
     });
   });
-
   test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in real time', async ({
     page
   }) => {
@@ -133,7 +49,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    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();
@@ -147,7 +63,7 @@ test.describe('Display Layout', () => {
     const layoutGridHolder = page.locator('.l-layout__grid-holder');
     await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // Subscribe to the Sine Wave Generator data
     // On getting data, check if the value found in the  Display Layout is the most recent value
@@ -161,13 +77,6 @@ test.describe('Display Layout', () => {
     const trimmedDisplayValue = displayLayoutValue.trim();
 
     expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
-
-    // ensure we can right click on the alpha-numeric widget and view historical data
-    await page.getByLabel('Sine', { exact: true }).click({
-      button: 'right'
-    });
-    await page.getByLabel('View Historical Data').click();
-    await expect(page.getByLabel('Plot Container Style Target')).toBeVisible();
   });
   test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({
     page
@@ -178,7 +87,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    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();
@@ -192,7 +101,7 @@ test.describe('Display Layout', () => {
     const layoutGridHolder = page.locator('.l-layout__grid-holder');
     await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // Subscribe to the Sine Wave Generator data
     const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
@@ -220,7 +129,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    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();
@@ -234,7 +143,7 @@ test.describe('Display Layout', () => {
     const layoutGridHolder = page.locator('.l-layout__grid-holder');
     await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(1);
 
@@ -262,7 +171,7 @@ test.describe('Display Layout', () => {
       type: 'Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    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();
@@ -276,7 +185,7 @@ test.describe('Display Layout', () => {
     const layoutGridHolder = page.locator('.l-layout__grid-holder');
     await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder);
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     expect.soft(await page.locator('.l-layout .l-layout__frame').count()).toEqual(1);
 
@@ -308,7 +217,7 @@ test.describe('Display Layout', () => {
       type: 'Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    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();
@@ -322,27 +231,20 @@ test.describe('Display Layout', () => {
     let layoutGridHolder = page.locator('.l-layout__grid-holder');
     await exampleImageryTreeItem.dragTo(layoutGridHolder);
 
-    //adjust so that we can see the independent time conductor toggle
-    // Adjust object height
-    await page.locator('div[title="Resize object height"] > input').click();
-    await page.locator('div[title="Resize object height"] > input').fill('70');
-
-    // Adjust object width
-    await page.locator('div[title="Resize object width"] > input').click();
-    await page.locator('div[title="Resize object width"] > input').fill('70');
-
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
-    const startDate = '2021-12-30 01:01:00.000Z';
-    const endDate = '2021-12-30 01:11:00.000Z';
-    await setIndependentTimeConductorBounds(page, startDate, endDate);
+    // flip on independent time conductor
+    await page.getByTitle('Enable independent Time Conductor').first().locator('label').click();
+    await page.getByRole('textbox').nth(1).fill('2021-12-30 01:11:00.000Z');
+    await page.getByRole('textbox').nth(0).fill('2021-12-30 01:01:00.000Z');
+    await page.getByRole('textbox').nth(1).click();
 
     // check image date
     await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();
 
     // flip it off
-    await page.getByRole('switch').click();
+    await page.getByTitle('Disable independent Time Conductor').first().locator('label').click();
     // timestamp shouldn't be in the past anymore
     await expect(page.getByText('2021-12-30 01:11:00.000Z')).toBeHidden();
   });
@@ -350,13 +252,9 @@ 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',
-      customParameters: {
-        '[aria-label="Data Rate (hz)"]': '0.01'
-      }
+      type: 'Sine Wave Generator'
     });
     // Create a Display Layout
     await createDomainObjectWithDefaults(page, {
@@ -364,7 +262,7 @@ test.describe('Display Layout', () => {
       name: 'Test Display Layout'
     });
     // Edit Display Layout
-    await page.getByLabel('Edit Object').click();
+    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();
@@ -394,13 +292,12 @@ test.describe('Display Layout', () => {
     await page.getByText('Overlay Plot').click();
 
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // Time to inspect some network traffic
     let networkRequests = [];
     page.on('request', (request) => {
-      const searchRequest =
-        request.url().endsWith('_find') || request.url().includes('by_keystring');
+      const searchRequest = request.url().endsWith('_find');
       const fetchRequest = request.resourceType() === 'fetch';
       if (searchRequest && fetchRequest) {
         networkRequests.push(request);
@@ -411,77 +308,13 @@ 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);
   });
 });
 
-async function addAndRemoveDrawingObjectAndAssert(page, layoutObject, DISPLAY_LAYOUT_NAME) {
-  expect(await page.getByLabel(layoutObject, { exact: true }).count()).toBe(0);
-  await addLayoutObject(page, DISPLAY_LAYOUT_NAME, layoutObject);
-  expect(
-    await page
-      .getByLabel(layoutObject, {
-        exact: true
-      })
-      .count()
-  ).toBe(1);
-  await removeLayoutObject(page, layoutObject);
-  expect(await page.getByLabel(layoutObject, { exact: true }).count()).toBe(0);
-}
-
-/**
- * Remove the first matching layout object from the layout
- * @param {import('@playwright/test').Page} page
- * @param {'Box' | 'Ellipse' | 'Line' | 'Text' | 'Image'} layoutObject
- */
-async function removeLayoutObject(page, layoutObject) {
-  await page
-    .getByLabel(`Move ${layoutObject} Frame`, { exact: true })
-    .or(page.getByLabel(layoutObject, { exact: true }))
-    .first()
-    // eslint-disable-next-line playwright/no-force-option
-    .click({ force: true });
-  await page.getByTitle('Delete the selected object').click();
-  await page.getByRole('button', { name: 'OK', exact: true }).click();
-}
-
-/**
- * Add a layout object to the specified layout
- * @param {import('@playwright/test').Page} page
- * @param {string} layoutName
- * @param {'Box' | 'Ellipse' | 'Line' | 'Text' | 'Image'} layoutObject
- */
-async function addLayoutObject(page, layoutName, layoutObject) {
-  await page.getByLabel(`${layoutName} Layout`, { exact: true }).click();
-  await page.getByText('Add Drawing Object').click();
-  await page
-    .getByRole('menuitem', {
-      name: layoutObject
-    })
-    .click();
-  if (layoutObject === 'Text') {
-    await page.getByRole('textbox', { name: 'Text' }).fill('Hello, Universe!');
-    await page.getByText('OK').click();
-  } else if (layoutObject === 'Image') {
-    await page.getByLabel('Image URL').fill(TINY_IMAGE_BASE64);
-    await page.getByText('OK').click();
-  }
-}
-
 /**
  * Util for subscribing to a telemetry object by object identifier
  * Limitations: Currently only works to return telemetry once to the node scope

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,8 +20,9 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import * as utils from '../../../../helper/faultUtils.js';
-import { expect, test } from '../../../../pluginFixtures.js';
+const { test, expect } = require('../../../../pluginFixtures');
+const utils = require('../../../../helper/faultUtils');
+const { selectInspectorTab } = require('../../../../appActions');
 
 test.describe('The Fault Management Plugin using example faults', () => {
   test.beforeEach(async ({ page }) => {
@@ -40,7 +41,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
   }) => {
     await utils.selectFaultItem(page, 1);
 
-    await page.getByRole('tab', { name: 'Config' }).click();
+    await selectInspectorTab(page, 'Fault Management Configuration');
     const selectedFaultName = await page
       .locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname')
       .textContent();
@@ -65,7 +66,7 @@ test.describe('The Fault Management Plugin using example faults', () => {
     );
     expect.soft(await selectedRows.count()).toEqual(2);
 
-    await page.getByRole('tab', { name: 'Config' }).click();
+    await selectInspectorTab(page, 'Fault Management Configuration');
     const firstSelectedFaultName = await selectedRows.nth(0).textContent();
     const secondSelectedFaultName = await selectedRows.nth(1).textContent();
     const firstNameInInspectorCount = await page

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

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2024, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,25 +20,12 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { fileURLToPath } from 'url';
-
-import {
-  createDomainObjectWithDefaults,
-  setIndependentTimeConductorBounds
-} from '../../../../appActions.js';
-import { expect, test } from '../../../../pluginFixtures.js';
-
-const LOCALSTORAGE_PATH = fileURLToPath(
-  new URL('../../../../test-data/flexible_layout_with_child_layouts.json', import.meta.url)
-);
+const { test, expect } = require('../../../../pluginFixtures');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 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' });
 
@@ -51,29 +38,25 @@ 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
   }) => {
-    await page.goto(flexibleLayout.url);
+    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'
+    });
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
@@ -87,93 +70,33 @@ test.describe('Flexible Layout', () => {
     await expect(dragWrapper).toHaveAttribute('draggable', 'true');
     // Save Flexible Layout
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
     // Check that panes are not draggable while Flexible Layout is in Browse mode
     dragWrapper = page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
     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
   }) => {
-    await page.goto(flexibleLayout.url);
+    const treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
+    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: new RegExp(sineWaveObject.name)
+    });
+    // Create a Display Layout
+    await createDomainObjectWithDefaults(page, {
+      type: 'Flexible Layout'
+    });
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
     // Add the Sine Wave Generator to the Flexible Layout and save changes
     await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     expect.soft(await page.locator('.c-fl-container__frame').count()).toEqual(1);
 
@@ -195,16 +118,26 @@ test.describe('Flexible Layout', () => {
       type: 'issue',
       description: 'https://github.com/nasa/openmct/issues/3117'
     });
-    await page.goto(flexibleLayout.url);
+    const treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
+    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: new RegExp(sineWaveObject.name)
+    });
+
+    // Create a Flexible Layout
+    const flexibleLayout = await createDomainObjectWithDefaults(page, {
+      type: 'Flexible Layout'
+    });
     // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
     // Add the Sine Wave Generator to the Flexible Layout and save changes
     await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     expect.soft(await page.locator('.c-fl-container__frame').count()).toEqual(1);
 
@@ -231,13 +164,19 @@ test.describe('Flexible Layout', () => {
     const exampleImageryObject = await createDomainObjectWithDefaults(page, {
       type: 'Example Imagery'
     });
-
-    await page.goto(flexibleLayout.url);
-    // Edit Flexible Layout
-    await page.getByLabel('Edit Object').click();
+    // Create a Flexible Layout
+    await createDomainObjectWithDefaults(page, {
+      type: 'Flexible Layout'
+    });
+    // Edit Display Layout
+    await page.locator('[title="Edit"]').click();
 
     // Expand the 'My Items' folder in the left tree
     await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
+    // Add the Sine Wave Generator to the Flexible Layout and save changes
+    const treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
     const exampleImageryTreeItem = treePane.getByRole('treeitem', {
       name: new RegExp(exampleImageryObject.name)
     });
@@ -245,74 +184,20 @@ test.describe('Flexible Layout', () => {
     await exampleImageryTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
 
     await page.locator('button[title="Save"]').click();
-    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.locator('text=Save and Finish Editing').click();
 
     // flip on independent time conductor
-    await setIndependentTimeConductorBounds(
-      page,
-      '2021-12-30 01:01:00.000Z',
-      '2021-12-30 01:11:00.000Z'
-    );
+    await page.getByTitle('Enable independent Time Conductor').first().locator('label').click();
+    await page.getByRole('textbox').nth(1).fill('2021-12-30 01:11:00.000Z');
+    await page.getByRole('textbox').nth(0).fill('2021-12-30 01:01:00.000Z');
+    await page.getByRole('textbox').nth(1).click();
 
     // check image date
     await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();
 
     // flip it off
-    await page.getByRole('switch').click();
+    await page.getByTitle('Disable independent Time Conductor').first().locator('label').click();
     // timestamp shouldn't be in the past anymore
     await expect(page.getByText('2021-12-30 01:11:00.000Z')).toBeHidden();
   });
 });
-
-test.describe('Flexible Layout Toolbar Actions @localStorage', () => {
-  test.use({
-    storageState: LOCALSTORAGE_PATH
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.goto('./', { waitUntil: 'domcontentloaded' });
-    await page
-      .locator('a')
-      .filter({ hasText: 'Parent Flexible Layout Flexible Layout' })
-      .first()
-      .click();
-    await page.getByLabel('Edit Object').click();
-  });
-  test('Add/Remove Container', async ({ page }) => {
-    test.info().annotations.push({
-      type: 'issue',
-      description: 'https://github.com/nasa/openmct/issues/7234'
-    });
-
-    const containerHandles = page.getByRole('columnheader', { name: 'Handle' });
-    expect(await containerHandles.count()).toEqual(2);
-    await page.getByRole('columnheader', { name: 'Container Handle 1' }).click();
-    await page.getByTitle('Add Container').click();
-    expect(await containerHandles.count()).toEqual(3);
-    await page.getByTitle('Remove Container').click();
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toHaveText(
-      'This action will permanently delete this container from this Flexible Layout. Do you want to continue?'
-    );
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
-    expect(await containerHandles.count()).toEqual(2);
-  });
-  test('Remove Frame', async ({ page }) => {
-    expect(await page.getByRole('group', { name: 'Frame' }).count()).toEqual(2);
-    await page.getByRole('group', { name: 'Child Layout 1' }).click();
-    await page.getByTitle('Remove Frame').click();
-    await expect(page.getByRole('dialog', { name: 'Overlay' })).toHaveText(
-      'This action will remove this frame from this Flexible Layout. Do you want to continue?'
-    );
-    await page.getByRole('button', { name: 'OK', exact: true }).click();
-    expect(await page.getByRole('group', { name: 'Frame' }).count()).toEqual(1);
-  });
-  test('Columns/Rows Layout Toggle', async ({ page }) => {
-    await page.getByRole('columnheader', { name: 'Container Handle 1' }).click();
-    const flexRows = page.getByLabel('Flexible Layout Row');
-    expect(await flexRows.count()).toEqual(0);
-    await page.getByTitle('Columns layout').click();
-    expect(await flexRows.count()).toEqual(1);
-    await page.getByTitle('Rows layout').click();
-    expect(await flexRows.count()).toEqual(0);
-  });
-});