Revert "do not use dev source maps in prod (#6007)"

This reverts commit 625205f24b.

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 executors:
   pw-focal-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.0-focal
+      - image: mcr.microsoft.com/playwright:v1.25.2-focal
     environment:
       NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
       PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps

.github/workflows/e2e-couchdb.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
-      - run: npx playwright@1.29.0 install
+      - run: npx playwright@1.25.2 install
       - run: npm install
       - run: sh src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
       - run: npm run test:e2e:couchdb

.github/workflows/e2e-pr.yml

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

.webpack/webpack.common.js

@@ -1,175 +0,0 @@
-/* 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)
- - webpack.dev.js - the development configuration for OpenMCT
- - webpack.coverage.js - imports webpack.dev.js and adds code coverage
-There are separate npm scripts to use these configurations, though simply running `npm install`
-will use the default production configuration.
-*/
-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");
-
-const { VueLoaderPlugin } = require("vue-loader");
-let gitRevision = "error-retrieving-revision";
-let gitBranch = "error-retrieving-branch";
-
-try {
-    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 = path.resolve(__dirname, "..");
-
-/** @type {import('webpack').Configuration} */
-const config = {
-    context: projectRootDir,
-    entry: {
-        openmct: "./openmct.js",
-        generatorWorker: "./example/generator/generatorWorker.js",
-        couchDBChangesFeed:
-            "./src/plugins/persistence/couch/CouchChangesFeed.js",
-        inMemorySearchWorker: "./src/api/objects/InMemorySearchWorker.js",
-        espressoTheme: "./src/plugins/themes/espresso-theme.scss",
-        snowTheme: "./src/plugins/themes/snow-theme.scss"
-    },
-    output: {
-        globalObject: "this",
-        filename: "[name].js",
-        path: path.resolve(projectRootDir, "dist"),
-        library: "openmct",
-        libraryTarget: "umd",
-        publicPath: "",
-        hashFunction: "xxhash64",
-        clean: true
-    },
-    resolve: {
-        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",
-            "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")
-        }
-    },
-    plugins: [
-        new webpack.DefinePlugin({
-            __OPENMCT_VERSION__: `'${packageDefinition.version}'`,
-            __OPENMCT_BUILD_DATE__: `'${new Date()}'`,
-            __OPENMCT_REVISION__: `'${gitRevision}'`,
-            __OPENMCT_BUILD_BRANCH__: `'${gitBranch}'`
-        }),
-        new VueLoaderPlugin(),
-        new CopyWebpackPlugin({
-            patterns: [
-                {
-                    from: "src/images/favicons",
-                    to: "favicons"
-                },
-                {
-                    from: "./index.html",
-                    transform: function (content) {
-                        return content.toString().replace(/dist\//g, "");
-                    }
-                },
-                {
-                    from: "src/plugins/imagery/layers",
-                    to: "imagery"
-                }
-            ]
-        }),
-        new MiniCssExtractPlugin({
-            filename: "[name].css",
-            chunkFilename: "[name].css"
-        })
-    ],
-    module: {
-        rules: [
-            {
-                test: /\.(sc|sa|c)ss$/,
-                use: [
-                    MiniCssExtractPlugin.loader,
-                    {
-                        loader: "css-loader"
-                    },
-                    {
-                        loader: "resolve-url-loader"
-                    },
-                    {
-                        loader: "sass-loader",
-                        options: { sourceMap: true }
-                    }
-                ]
-            },
-            {
-                test: /\.vue$/,
-                use: "vue-loader"
-            },
-            {
-                test: /\.html$/,
-                type: "asset/source"
-            },
-            {
-                test: /\.(jpg|jpeg|png|svg)$/,
-                type: "asset/resource",
-                generator: {
-                    filename: "images/[name][ext]"
-                }
-            },
-            {
-                test: /\.ico$/,
-                type: "asset/resource",
-                generator: {
-                    filename: "icons/[name][ext]"
-                }
-            },
-            {
-                test: /\.(woff|woff2?|eot|ttf)$/,
-                type: "asset/resource",
-                generator: {
-                    filename: "fonts/[name][ext]"
-                }
-            }
-        ]
-    },
-    stats: "errors-warnings",
-    performance: {
-        // We should eventually consider chunking to decrease
-        // these values
-        maxEntrypointSize: 25000000,
-        maxAssetSize: 25000000
-    }
-};
-
-module.exports = config;

e2e/README.md

@@ -8,7 +8,7 @@ This document is designed to capture on the What, Why, and How's of writing and
 
 1. [Getting Started](#getting-started)
 2. [Types of Testing](#types-of-e2e-testing)
-3. [Architecture](#test-architecture-and-ci)
+3. [Architecture](#architecture)
 
 ## Getting Started
 
@@ -276,36 +276,14 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p
   - Leverage `await page.goto('./', { waitUntil: 'networkidle' });`
   - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.
 
-### How to write a great test (WIP)
-
-- Use our [App Actions](./appActions.js) for performing common actions whenever applicable.
-- 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`:
-
-  ```js
-  // Fill the "Notes" section with information about the
-  // currently running test and its project.
-  const { testNotes } = page;
-  const notesInput = page.locator('form[name="mctForm"] #notes-textarea');
-  await notesInput.fill(testNotes);
-  ```
+### How to write a great test (TODO)
 
 #### How to write a great visual test (TODO)
 
-#### How to write a great network test
-
-- Where possible, it is best to mock out third-party network activity to ensure we are testing application behavior of Open MCT.
-- It is best to be as specific as possible about the expected network request/response structures in creating your mocks.
-- Make sure to only mock requests which are relevant to the specific behavior being tested.
-- Where possible, network requests and responses should be treated in an order-agnostic manner, as the order in which certain requests/responses happen is dynamic and subject to change.
-
-Some examples of mocking network responses in regards to CouchDB can be found in our [couchdb.e2e.spec.js](./tests/functional/couchdb.e2e.spec.js) test file.
-
 ### Best Practices
 
 For now, our best practices exist as self-tested, living documentation in our [exampleTemplate.e2e.spec.js](./tests/framework/exampleTemplate.e2e.spec.js) file.
 
-For best practices with regards to mocking network responses, see our [couchdb.e2e.spec.js](./tests/functional/couchdb.e2e.spec.js) file.
-
 ### Tips & Tricks (TODO)
 
 The following contains a list of tips and tricks which don't exactly fit into a FAQ or Best Practices doc.
@@ -400,23 +378,3 @@ A single e2e test in Open MCT is extended to run:
 - 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```
-
-### Upgrading Playwright
-
-In order to upgrade from one version of Playwright to another, the version should be updated in several places in both `openmct` and `openmct-yamcs` repos. An easy way to identify these locations is to search for the current version in all files and find/replace.
-
-For reference, all of the locations where the version should be updated are listed below:
-
-#### **In `openmct`:**
-
-- `package.json`
-  - Both packages `@playwright/test` and `playwright-core` should be updated to the same target version.
-- `.circleci/config.yml`
-- `.github/workflows/e2e-couchdb.yml`
-- `.github/workflows/e2e-pr.yml`
-
-#### **In `openmct-yamcs`:**
-
-- `package.json`
-  - `@playwright/test` should be updated to the target version.
-- `.github/workflows/yamcs-quickstart-e2e.yml`

e2e/appActions.js

@@ -45,14 +45,6 @@
  * @property {string} url the relative url to the object (for use with `page.goto()`)
  */
 
-/**
- * Defines parameters to be used in the creation of a notification.
- * @typedef {Object} CreateNotificationOptions
- * @property {string} message the message
- * @property {'info' | 'alert' | 'error'} severity the severity
- * @property {import('../src/api/notifications/NotificationAPI').NotificationOptions} [notificationOptions] additional options
- */
-
 const Buffer = require('buffer').Buffer;
 const genUuid = require('uuid').v4;
 
@@ -120,25 +112,6 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
     };
 }
 
-/**
- * Generate a notification with the given options.
- * @param {import('@playwright/test').Page} page
- * @param {CreateNotificationOptions} createNotificationOptions
- */
-async function createNotification(page, createNotificationOptions) {
-    await page.evaluate((_createNotificationOptions) => {
-        const { message, severity, options } = _createNotificationOptions;
-        const notificationApi = window.openmct.notifications;
-        if (severity === 'info') {
-            notificationApi.info(message, options);
-        } else if (severity === 'alert') {
-            notificationApi.alert(message, options);
-        } else {
-            notificationApi.error(message, options);
-        }
-    }, createNotificationOptions);
-}
-
 /**
  * @param {import('@playwright/test').Page} page
  * @param {string} name
@@ -360,7 +333,6 @@ async function setEndOffset(page, offset) {
 // eslint-disable-next-line no-undef
 module.exports = {
     createDomainObjectWithDefaults,
-    createNotification,
     expandTreePaneItemByName,
     createPlanFromJSON,
     openObjectTreeContextMenu,

e2e/helper/addInitFileInputObject.js

@@ -1,76 +0,0 @@
-class DomainObjectViewProvider {
-    constructor(openmct) {
-        this.key = 'doViewProvider';
-        this.name = 'Domain Object View Provider';
-        this.openmct = openmct;
-    }
-
-    canView(domainObject) {
-        return domainObject.type === 'imageFileInput'
-            || domainObject.type === 'jsonFileInput';
-    }
-
-    view(domainObject, objectPath) {
-        let content;
-
-        return {
-            show: function (element) {
-                const body = domainObject.selectFile.body;
-                const type = typeof body;
-
-                content = document.createElement('div');
-                content.id = 'file-input-type';
-                content.textContent = JSON.stringify(type);
-                element.appendChild(content);
-            },
-            destroy: function (element) {
-                element.removeChild(content);
-                content = undefined;
-            }
-        };
-    }
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-    const openmct = window.openmct;
-
-    openmct.types.addType('jsonFileInput', {
-        key: 'jsonFileInput',
-        name: "JSON File Input Object",
-        creatable: true,
-        form: [
-            {
-                name: 'Upload File',
-                key: 'selectFile',
-                control: 'file-input',
-                required: true,
-                text: 'Select File...',
-                type: 'application/json',
-                property: [
-                    "selectFile"
-                ]
-            }
-        ]
-    });
-
-    openmct.types.addType('imageFileInput', {
-        key: 'imageFileInput',
-        name: "Image File Input Object",
-        creatable: true,
-        form: [
-            {
-                name: 'Upload File',
-                key: 'selectFile',
-                control: 'file-input',
-                required: true,
-                text: 'Select File...',
-                type: 'image/*',
-                property: [
-                    "selectFile"
-                ]
-            }
-        ]
-    });
-
-    openmct.objectViews.addProvider(new DomainObjectViewProvider(openmct));
-});

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

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 const { test, expect } = require('../../pluginFixtures.js');
-const { createDomainObjectWithDefaults, createNotification } = require('../../appActions.js');
+const { createDomainObjectWithDefaults } = require('../../appActions.js');
 
 test.describe('AppActions', () => {
     test('createDomainObjectsWithDefaults', async ({ page }) => {
@@ -85,28 +85,4 @@ test.describe('AppActions', () => {
             expect(folder3.url).toBe(`${e2eFolder.url}/${folder1.uuid}/${folder2.uuid}/${folder3.uuid}`);
         });
     });
-    test("createNotification", async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-        await createNotification(page, {
-            message: 'Test info notification',
-            severity: 'info'
-        });
-        await expect(page.locator('.c-message-banner__message')).toHaveText('Test info notification');
-        await expect(page.locator('.c-message-banner')).toHaveClass(/info/);
-        await page.locator('[aria-label="Dismiss"]').click();
-        await createNotification(page, {
-            message: 'Test alert notification',
-            severity: 'alert'
-        });
-        await expect(page.locator('.c-message-banner__message')).toHaveText('Test alert notification');
-        await expect(page.locator('.c-message-banner')).toHaveClass(/alert/);
-        await page.locator('[aria-label="Dismiss"]').click();
-        await createNotification(page, {
-            message: 'Test error notification',
-            severity: 'error'
-        });
-        await expect(page.locator('.c-message-banner__message')).toHaveText('Test error notification');
-        await expect(page.locator('.c-message-banner')).toHaveClass(/error/);
-        await page.locator('[aria-label="Dismiss"]').click();
-    });
 });

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

@@ -27,7 +27,7 @@
 
 const { test, expect } = require('../../pluginFixtures');
 
-test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
+test.describe("CouchDB Status Indicator @couchdb", () => {
     test.use({ failOnConsoleError: false });
     //TODO BeforeAll Verify CouchDB Connectivity with APIContext
     test('Shows green if connected', async ({ page }) => {
@@ -71,41 +71,38 @@ test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
     });
 });
 
-test.describe("CouchDB initialization with mocked responses @couchdb", () => {
+test.describe("CouchDB initialization @couchdb", () => {
     test.use({ failOnConsoleError: false });
     test("'My Items' folder is created if it doesn't exist", async ({ page }) => {
-        const mockedMissingObjectResponsefromCouchDB = {
-            status: 404,
-            contentType: 'application/json',
-            body: JSON.stringify({})
-        };
+        // Store any relevant PUT requests that happen on the page
+        const createMineFolderRequests = [];
+        page.on('request', req => {
+            // eslint-disable-next-line playwright/no-conditional-in-test
+            if (req.method() === 'PUT' && req.url().endsWith('openmct/mine')) {
+                createMineFolderRequests.push(req);
+            }
+        });
 
-        // Override the first request to GET openmct/mine to return a 404.
-        // This simulates the case of starting Open MCT with a fresh database
-        // and no "My Items" folder created yet.
-        await page.route('**/mine', route => {
-            route.fulfill(mockedMissingObjectResponsefromCouchDB);
+        // Override the first request to GET openmct/mine to return a 404
+        await page.route('**/openmct/mine', route => {
+            route.fulfill({
+                status: 404,
+                contentType: 'application/json',
+                body: JSON.stringify({})
+            });
         }, { times: 1 });
 
-        // Set up promise to verify that a PUT request to create "My Items"
-        // folder was made.
-        const putMineFolderRequest = page.waitForRequest(req =>
-            req.url().endsWith('/mine')
-            && req.method() === 'PUT');
-
-        // Set up promise to verify that a GET request to retrieve "My Items"
-        // folder was made.
-        const getMineFolderRequest = page.waitForRequest(req =>
-            req.url().endsWith('/mine')
-            && req.method() === 'GET');
-
-        // Go to baseURL.
+        // Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        // Wait for both requests to resolve.
-        await Promise.all([
-            putMineFolderRequest,
-            getMineFolderRequest
-        ]);
+        // Verify that error banner is displayed
+        const bannerMessage = await page.locator('.c-message-banner__message').innerText();
+        expect(bannerMessage).toEqual('Failed to retrieve object mine');
+
+        // Verify that a PUT request to create "My Items" folder was made
+        await expect.poll(() => createMineFolderRequests.length, {
+            message: 'Verify that PUT request to create "mine" folder was made',
+            timeout: 1000
+        }).toBeGreaterThanOrEqual(1);
     });
 });

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

@@ -24,14 +24,11 @@
 This test suite is dedicated to tests which verify form functionality in isolation
 */
 
-const { test, expect } = require('../../pluginFixtures');
+const { test, expect } = require('../../baseFixtures');
 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';
-const imageFilePath = 'e2e/test-data/rick.jpg';
 
 test.describe('Form Validation Behavior', () => {
     test('Required Field indicators appear if title is empty and can be corrected', async ({ page }) => {
@@ -70,41 +67,6 @@ test.describe('Form Validation Behavior', () => {
     });
 });
 
-test.describe('Form File Input Behavior', () => {
-    test.beforeEach(async ({ page }) => {
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../helper', 'addInitFileInputObject.js') });
-    });
-
-    test('Can select a JSON file type', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        await page.getByRole('button', { name: ' Create ' }).click();
-        await page.getByRole('menuitem', { name: 'JSON File Input Object' }).click();
-
-        await page.setInputFiles('#fileElem', jsonFilePath);
-
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        const type = await page.locator('#file-input-type').textContent();
-        await expect(type).toBe(`"string"`);
-    });
-
-    test('Can select an image file type', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        await page.getByRole('button', { name: ' Create ' }).click();
-        await page.getByRole('menuitem', { name: 'Image File Input Object' }).click();
-
-        await page.setInputFiles('#fileElem', imageFilePath);
-
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        const type = await page.locator('#file-input-type').textContent();
-        await expect(type).toBe(`"object"`);
-    });
-});
-
 test.describe('Persistence operations @addInit', () => {
     // add non persistable root item
     test.beforeEach(async ({ page }) => {
@@ -166,108 +128,6 @@ test.describe('Persistence operations @couchdb', () => {
             timeout: 1000
         }).toEqual(1);
     });
-    test('Can create an object after a conflict error @couchdb @2p', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/5982'
-        });
-
-        const page2 = await page.context().newPage();
-
-        // Both pages: Go to baseURL
-        await Promise.all([
-            page.goto('./', { waitUntil: 'networkidle' }),
-            page2.goto('./', { waitUntil: 'networkidle' })
-        ]);
-
-        // Both pages: Click the Create button
-        await Promise.all([
-            page.click('button:has-text("Create")'),
-            page2.click('button:has-text("Create")')
-        ]);
-
-        // Both pages: Click "Clock" in the Create menu
-        await Promise.all([
-            page.click(`li[role='menuitem']:text("Clock")`),
-            page2.click(`li[role='menuitem']:text("Clock")`)
-        ]);
-
-        // Generate unique names for both objects
-        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-        const nameInput2 = page2.locator('form[name="mctForm"] .first input[type="text"]');
-
-        // Both pages: Fill in the 'Name' form field.
-        await Promise.all([
-            nameInput.fill(""),
-            nameInput.fill(`Clock:${genUuid()}`),
-            nameInput2.fill(""),
-            nameInput2.fill(`Clock:${genUuid()}`)
-        ]);
-
-        // Both pages: Fill the "Notes" section with information about the
-        // currently running test and its project.
-        const testNotes = page.testNotes;
-        const notesInput = page.locator('form[name="mctForm"] #notes-textarea');
-        const notesInput2 = page2.locator('form[name="mctForm"] #notes-textarea');
-        await Promise.all([
-            notesInput.fill(testNotes),
-            notesInput2.fill(testNotes)
-        ]);
-
-        // Page 2: Click "OK" to create the domain object and wait for navigation.
-        // This will update the composition of the parent folder, setting the
-        // conditions for a conflict error from the first page.
-        await Promise.all([
-            page2.waitForLoadState(),
-            page2.click('[aria-label="Save"]'),
-            // Wait for Save Banner to appear
-            page2.waitForSelector('.c-message-banner__message')
-        ]);
-
-        // Close Page 2, we're done with it.
-        await page2.close();
-
-        // Page 1: Click "OK" to create the domain object and wait for navigation.
-        // This will trigger a conflict error upon attempting to update
-        // the composition of the parent folder.
-        await Promise.all([
-            page.waitForLoadState(),
-            page.click('[aria-label="Save"]'),
-            // Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-
-        // Page 1: Verify that the conflict has occurred and an error notification is displayed.
-        await expect(page.locator('.c-message-banner__message', {
-            hasText: "Conflict detected while saving mine"
-        })).toBeVisible();
-
-        // Page 1: Start logging console errors from this point on
-        let errors = [];
-        page.on('console', (msg) => {
-            if (msg.type() === 'error') {
-                errors.push(msg.text());
-            }
-        });
-
-        // Page 1: Try to create a clock with the page that received the conflict.
-        const clockAfterConflict = await createDomainObjectWithDefaults(page, {
-            type: 'Clock'
-        });
-
-        // Page 1: Wait for save progress dialog to appear/disappear
-        await page.locator('.c-message-banner__message', {
-            hasText: 'Do not navigate away from this page or close this browser tab while this message is displayed.',
-            state: 'visible'
-        }).waitFor({ state: 'hidden' });
-
-        // Page 1: Navigate to 'My Items' and verify that the second clock was created
-        await page.goto('./#/browse/mine');
-        await expect(page.locator(`.c-grid-item__name[title="${clockAfterConflict.name}"]`)).toBeVisible();
-
-        // Verify no console errors occurred
-        expect(errors).toHaveLength(0);
-    });
 });
 
 test.describe('Form Correctness by Object Type', () => {

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

@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which verify Open MCT's Notification functionality
-*/
-
-// FIXME: Remove this eslint exception once tests are implemented
-// eslint-disable-next-line no-unused-vars
-const { test, expect } = require('../../pluginFixtures');
-
-test.describe('Notifications List', () => {
-    test.fixme('Notifications can be dismissed individually', async ({ page }) => {
-        // Create some persistent notifications
-        // Verify that they are present in the notifications list
-        // Dismiss one of the notifications
-        // Verify that it is no longer present in the notifications list
-        // Verify that the other notifications are still present in the notifications list
-    });
-});

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

@@ -44,7 +44,6 @@ async function createNotebookAndEntry(page, iterations = 1) {
         const entryLocator = `[aria-label="Notebook Entry Input"] >> nth = ${iteration}`;
         await page.locator(entryLocator).click();
         await page.locator(entryLocator).fill(`Entry ${iteration}`);
-        await page.locator(entryLocator).press('Enter');
     }
 
     return notebook;

e2e/tests/visual/notification.visual.spec.js

@@ -1,58 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * This test is dedicated to test notification banner functionality and its accessibility attributes.
- */
-
-const { test, expect } = require('../../pluginFixtures');
-const percySnapshot = require('@percy/playwright');
-const { createDomainObjectWithDefaults } = require('../../appActions');
-
-test.describe('Visual - Check Notification Info Banner of \'Save successful\'', () => {
-    test.beforeEach(async ({ page }) => {
-        // Go to baseURL and Hide Tree
-        await page.goto('./', { waitUntil: 'networkidle' });
-    });
-
-    test('Create a clock, click on \'Save successful\' banner and dismiss it', async ({ page }) => {
-        // Create a clock domain object
-        await createDomainObjectWithDefaults(page, { type: 'Clock' });
-        // Verify there is a button with aria-label="Review 1 Notification"
-        expect(await page.locator('button[aria-label="Review 1 Notification"]').isVisible()).toBe(true);
-        // Verify there is a button with aria-label="Clear all notifications"
-        expect(await page.locator('button[aria-label="Clear all notifications"]').isVisible()).toBe(true);
-        // Click on the div with role="alert" that has "Save successful" text
-        await page.locator('div[role="alert"]:has-text("Save successful")').click();
-        // Verify there is a div with role="dialog"
-        expect(await page.locator('div[role="dialog"]').isVisible()).toBe(true);
-        // Verify the div with role="dialog" contains text "Save successful"
-        expect(await page.locator('div[role="dialog"]').innerText()).toContain('Save successful');
-        await percySnapshot(page, 'Notification banner');
-        // Verify there is a button with text "Dismiss"
-        expect(await page.locator('button:has-text("Dismiss")').isVisible()).toBe(true);
-        // Click on button with text "Dismiss"
-        await page.locator('button:has-text("Dismiss")').click();
-        // Verify there is no div with role="dialog"
-        expect(await page.locator('div[role="dialog"]').isVisible()).toBe(false);
-    });
-});

karma.conf.js

@@ -28,12 +28,12 @@ module.exports = (config) => {
     let singleRun;
 
     if (process.env.KARMA_DEBUG) {
-        webpackConfig = require("./.webpack/webpack.dev.js");
-        browsers = ["ChromeDebugging"];
+        webpackConfig = require('./webpack.dev.js');
+        browsers = ['ChromeDebugging'];
         singleRun = false;
     } else {
-        webpackConfig = require("./.webpack/webpack.coverage.js");
-        browsers = ["ChromeHeadless"];
+        webpackConfig = require('./webpack.coverage.js');
+        browsers = ['ChromeHeadless'];
         singleRun = true;
     }
 
@@ -42,28 +42,28 @@ module.exports = (config) => {
     delete webpackConfig.entry;
 
     config.set({
-        basePath: "",
-        frameworks: ["jasmine", "webpack"],
+        basePath: '',
+        frameworks: ['jasmine', 'webpack'],
         files: [
-            "indexTest.js",
+            'indexTest.js',
             // included means: should the files be included in the browser using <script> tag?
             // We don't want them as a <script> because the shared worker source
             // needs loaded remotely by the shared worker process.
             {
-                pattern: "dist/couchDBChangesFeed.js*",
+                pattern: 'dist/couchDBChangesFeed.js*',
                 included: false
             },
             {
-                pattern: "dist/inMemorySearchWorker.js*",
+                pattern: 'dist/inMemorySearchWorker.js*',
                 included: false
             },
             {
-                pattern: "dist/generatorWorker.js*",
+                pattern: 'dist/generatorWorker.js*',
                 included: false
             }
         ],
         port: 9876,
-        reporters: ["spec", "junit", "coverage-istanbul"],
+        reporters: ['spec', 'junit', 'coverage-istanbul'],
         browsers,
         client: {
             jasmine: {
@@ -73,8 +73,8 @@ module.exports = (config) => {
         },
         customLaunchers: {
             ChromeDebugging: {
-                base: "Chrome",
-                flags: ["--remote-debugging-port=9222"],
+                base: 'Chrome',
+                flags: ['--remote-debugging-port=9222'],
                 debug: true
             }
         },
@@ -90,7 +90,7 @@ module.exports = (config) => {
             fixWebpackSourcePaths: true,
             skipFilesWithNoCoverage: true,
             dir: "coverage/unit", //Sets coverage file to be consumed by codecov.io
-            reports: ["lcovonly"]
+            reports: ['lcovonly']
         },
         specReporter: {
             maxLogLines: 5,
@@ -102,11 +102,11 @@ module.exports = (config) => {
             failFast: false
         },
         preprocessors: {
-            "indexTest.js": ["webpack", "sourcemap"]
+            'indexTest.js': ['webpack', 'sourcemap']
         },
         webpack: webpackConfig,
         webpackMiddleware: {
-            stats: "errors-warnings"
+            stats: 'errors-warnings'
         },
         concurrency: 1,
         singleRun,

package.json

@@ -1,14 +1,13 @@
 {
   "name": "openmct",
-  "version": "2.1.6-SNAPSHOT",
+  "version": "2.1.5-SNAPSHOT",
   "description": "The Open MCT core platform",
   "devDependencies": {
     "@babel/eslint-parser": "7.18.9",
     "@braintree/sanitize-url": "6.0.2",
-    "@percy/cli": "1.17.0",
+    "@percy/cli": "1.16.0",
     "@percy/playwright": "1.0.4",
-    "@playwright/test": "1.29.0",
-    "@types/eventemitter3": "1.2.0",
+    "@playwright/test": "1.25.2",
     "@types/jasmine": "4.3.1",
     "@types/lodash": "4.14.191",
     "babel-loader": "9.1.0",
@@ -16,14 +15,14 @@
     "codecov": "3.8.3",
     "comma-separated-values": "3.6.4",
     "copy-webpack-plugin": "11.0.0",
-    "css-loader": "6.7.3",
+    "css-loader": "6.7.1",
     "d3-axis": "3.0.0",
     "d3-scale": "3.3.0",
     "d3-selection": "3.0.0",
-    "eslint": "8.32.0",
+    "eslint": "8.30.0",
     "eslint-plugin-compat": "4.0.2",
     "eslint-plugin-playwright": "0.11.2",
-    "eslint-plugin-vue": "9.9.0",
+    "eslint-plugin-vue": "9.8.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
     "eventemitter3": "1.2.0",
     "file-saver": "2.0.5",
@@ -39,23 +38,23 @@
     "karma-jasmine": "5.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-sourcemap-loader": "0.3.8",
-    "karma-spec-reporter": "0.0.36",
+    "karma-spec-reporter": "0.0.34",
     "karma-webpack": "5.0.0",
     "location-bar": "3.0.1",
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.7.2",
     "moment": "2.29.4",
     "moment-duration-format": "2.3.2",
-    "moment-timezone": "0.5.40",
+    "moment-timezone": "0.5.38",
     "nyc": "15.1.0",
     "painterro": "1.2.78",
-    "playwright-core": "1.29.0",
-    "plotly.js-basic-dist": "2.17.0",
-    "plotly.js-gl2d-dist": "2.17.1",
+    "playwright-core": "1.25.2",
+    "plotly.js-basic-dist": "2.14.0",
+    "plotly.js-gl2d-dist": "2.14.0",
     "printj": "1.3.1",
     "resolve-url-loader": "5.0.0",
-    "sass": "1.57.1",
-    "sass-loader": "13.2.0",
+    "sass": "1.56.1",
+    "sass-loader": "13.0.2",
     "sinon": "15.0.1",
     "style-loader": "^3.3.1",
     "typescript": "4.9.4",
@@ -72,14 +71,14 @@
   "scripts": {
     "clean": "rm -rf ./dist ./node_modules ./package-lock.json",
     "clean-test-lint": "npm run clean; npm install; npm run test; npm run lint",
-    "start": "npx webpack serve --config ./.webpack/webpack.dev.js",
-    "start:coverage": "npx webpack serve --config ./.webpack/webpack.coverage.js",
+    "start": "npx webpack serve --config ./webpack.dev.js",
+    "start:coverage": "npx webpack serve --config ./webpack.coverage.js",
     "lint": "eslint example src e2e --ext .js,.vue openmct.js --max-warnings=0",
     "lint:fix": "eslint example src e2e --ext .js,.vue openmct.js --fix",
-    "build:prod": "webpack --config ./.webpack/webpack.prod.js",
-    "build:dev": "webpack --config ./.webpack/webpack.dev.js",
-    "build:coverage": "webpack --config ./.webpack/webpack.coverage.js",
-    "build:watch": "webpack --config ./.webpack/webpack.dev.js --watch",
+    "build:prod": "webpack --config webpack.prod.js",
+    "build:dev": "webpack --config webpack.dev.js",
+    "build:coverage": "webpack --config webpack.coverage.js",
+    "build:watch": "webpack --config webpack.dev.js --watch",
     "info": "npx envinfo --system --browsers --npmPackages --binaries --languages --markdown",
     "test": "karma start",
     "test:debug": "KARMA_DEBUG=true karma start",

src/api/Editor.js

@@ -73,10 +73,6 @@ export default class Editor extends EventEmitter {
 
         return new Promise((resolve, reject) => {
             const transaction = this.openmct.objects.getActiveTransaction();
-            if (!transaction) {
-                return resolve();
-            }
-
             transaction.cancel()
                 .then(resolve)
                 .catch(reject)

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

@@ -30,7 +30,7 @@
             id="fileElem"
             ref="fileInput"
             type="file"
-            :accept="acceptableFileTypes"
+            accept=".json"
             style="display:none"
         >
         <button
@@ -72,13 +72,6 @@ export default {
         },
         removable() {
             return (this.fileInfo || this.model.value) && this.model.removable;
-        },
-        acceptableFileTypes() {
-            if (this.model.type) {
-                return this.model.type;
-            }
-
-            return 'application/json';
         }
     },
     mounted() {
@@ -87,13 +80,7 @@ export default {
     methods: {
         handleFiles() {
             const fileList = this.$refs.fileInput.files;
-            const file = fileList[0];
-
-            if (this.acceptableFileTypes === 'application/json') {
-                this.readFile(file);
-            } else {
-                this.handleRawFile(file);
-            }
+            this.readFile(fileList[0]);
         },
         readFile(file) {
             const self = this;
@@ -117,21 +104,6 @@ export default {
 
             fileReader.readAsText(file);
         },
-        handleRawFile(file) {
-            const fileInfo = {
-                name: file.name,
-                body: file
-            };
-
-            this.fileInfo = Object.assign({}, fileInfo);
-
-            const data = {
-                model: this.model,
-                value: fileInfo
-            };
-
-            this.$emit('onChange', data);
-        },
         selectFile() {
             this.$refs.fileInput.click();
         },

src/api/notifications/NotificationAPI.js

@@ -31,31 +31,7 @@
  * @namespace platform/api/notifications
  */
 import moment from 'moment';
-import EventEmitter from 'eventemitter3';
-
-/**
- * @typedef {object} NotificationProperties
- * @property {function} dismiss Dismiss the notification
- * @property {NotificationModel} model The Notification model
- * @property {(progressPerc: number, progressText: string) => void} [progress] Update the progress of the notification
- */
-
-/**
- * @typedef {EventEmitter & NotificationProperties} Notification
- */
-
-/**
- * @typedef {object} NotificationLink
- * @property {function} onClick The function to be called when the link is clicked
- * @property {string} cssClass A CSS class name to style the link
- * @property {string} text The text to be displayed for the link
- */
-
-/**
- * @typedef {object} NotificationOptions
- * @property {number} [autoDismissTimeout] Milliseconds to wait before automatically dismissing the notification
- * @property {NotificationLink} [link] A link for the notification
- */
+import EventEmitter from 'EventEmitter';
 
 /**
  * A representation of a banner notification. Banner notifications
@@ -64,17 +40,13 @@ import EventEmitter from 'eventemitter3';
  * dialogs so that the same information can be provided in a dialog
  * and then minimized to a banner notification if needed, or vice-versa.
  *
- * @see DialogModel
  * @typedef {object} NotificationModel
  * @property {string} message The message to be displayed by the notification
  * @property {number | 'unknown'} [progress] The progress of some ongoing task. Should be a number between 0 and 100, or
  * with the string literal 'unknown'.
  * @property {string} [progressText] A message conveying progress of some ongoing task.
- * @property {string} [severity] The severity of the notification. Should be one of 'info', 'alert', or 'error'.
- * @property {string} [timestamp] The time at which the notification was created. Should be a string in ISO 8601 format.
- * @property {boolean} [minimized] Whether or not the notification has been minimized
- * @property {boolean} [autoDismiss] Whether the notification should be automatically dismissed after a short period of time.
- * @property {NotificationOptions} options The notification options
+
+ * @see DialogModel
  */
 
 const DEFAULT_AUTO_DISMISS_TIMEOUT = 3000;
@@ -83,19 +55,18 @@ const MINIMIZE_ANIMATION_TIMEOUT = 300;
 /**
  * The notification service is responsible for informing the user of
  * events via the use of banner notifications.
-*/
+ * @memberof ui/notification
+ * @constructor */
+
 export default class NotificationAPI extends EventEmitter {
     constructor() {
         super();
-        /** @type {Notification[]} */
         this.notifications = [];
-        /** @type {{severity: "info" | "alert" | "error"}} */
         this.highest = { severity: "info" };
 
-        /**
+        /*
         * A context in which to hold the active notification and a
         * handle to its timeout.
-        * @type {Notification | undefined}
         */
         this.activeNotification = undefined;
     }
@@ -104,12 +75,16 @@ export default class NotificationAPI extends EventEmitter {
      * Info notifications are low priority informational messages for the user. They will be auto-destroy after a brief
      * period of time.
      * @param {string} message The message to display to the user
-     * @param {NotificationOptions} [options] The notification options
-     * @returns {Notification}
+     * @param {Object} [options] object with following properties
+     *      autoDismissTimeout: {number} in miliseconds to automatically dismisses notification
+     *      link: {Object} Add a link to notifications for navigation
+     *              onClick: callback function
+     *              cssClass: css class name to add style on link
+     *              text: text to display for link
+     * @returns {InfoNotification}
      */
     info(message, options = {}) {
-        /** @type {NotificationModel} */
-        const notificationModel = {
+        let notificationModel = {
             message: message,
             autoDismiss: true,
             severity: "info",
@@ -122,7 +97,7 @@ export default class NotificationAPI extends EventEmitter {
     /**
      * Present an alert to the user.
      * @param {string} message The message to display to the user.
-     * @param {NotificationOptions} [options] object with following properties
+     * @param {Object} [options] object with following properties
      *      autoDismissTimeout: {number} in milliseconds to automatically dismisses notification
      *      link: {Object} Add a link to notifications for navigation
      *              onClick: callback function
@@ -131,7 +106,7 @@ export default class NotificationAPI extends EventEmitter {
      * @returns {Notification}
      */
     alert(message, options = {}) {
-        const notificationModel = {
+        let notificationModel = {
             message: message,
             severity: "alert",
             options
@@ -172,8 +147,7 @@ export default class NotificationAPI extends EventEmitter {
             message: message,
             progressPerc: progressPerc,
             progressText: progressText,
-            severity: "info",
-            options: {}
+            severity: "info"
         };
 
         return this._notify(notificationModel);
@@ -191,13 +165,8 @@ export default class NotificationAPI extends EventEmitter {
      * dismissed.
      *
      * @private
-     * @param {Notification | undefined} notification
      */
     _minimize(notification) {
-        if (!notification) {
-            return;
-        }
-
         //Check this is a known notification
         let index = this.notifications.indexOf(notification);
 
@@ -235,13 +204,8 @@ export default class NotificationAPI extends EventEmitter {
      * dismiss
      *
      * @private
-     * @param {Notification | undefined} notification
      */
     _dismiss(notification) {
-        if (!notification) {
-            return;
-        }
-
         //Check this is a known notification
         let index = this.notifications.indexOf(notification);
 
@@ -272,11 +236,10 @@ export default class NotificationAPI extends EventEmitter {
      * dismiss or minimize where appropriate.
      *
      * @private
-     * @param {Notification | undefined} notification
      */
     _dismissOrMinimize(notification) {
-        let model = notification?.model;
-        if (model?.severity === "info") {
+        let model = notification.model;
+        if (model.severity === "info") {
             this._dismiss(notification);
         } else {
             this._minimize(notification);
@@ -288,11 +251,10 @@ export default class NotificationAPI extends EventEmitter {
      */
     _setHighestSeverity() {
         let severity = {
-            info: 1,
-            alert: 2,
-            error: 3
+            "info": 1,
+            "alert": 2,
+            "error": 3
         };
-
         this.highest.severity = this.notifications.reduce((previous, notification) => {
             if (severity[notification.model.severity] > severity[previous]) {
                 return notification.model.severity;
@@ -350,11 +312,8 @@ export default class NotificationAPI extends EventEmitter {
 
     /**
      * @private
-     * @param {NotificationModel} notificationModel
-     * @returns {Notification}
      */
     _createNotification(notificationModel) {
-        /** @type {Notification} */
         let notification = new EventEmitter();
         notification.model = notificationModel;
         notification.dismiss = () => {
@@ -374,7 +333,6 @@ export default class NotificationAPI extends EventEmitter {
 
     /**
      * @private
-     * @param {Notification | undefined} notification
      */
     _setActiveNotification(notification) {
         this.activeNotification = notification;

src/api/objects/ObjectAPI.js

@@ -193,27 +193,23 @@ export default class ObjectAPI {
      * @memberof module:openmct.ObjectProvider#
      * @param {string} key the key for the domain object to load
      * @param {AbortController.signal} abortSignal (optional) signal to abort fetch requests
-     * @param {boolean} forceRemote defaults to false. If true, will skip cached and
-     *          dirty/in-transaction objects use and the provider.get method
      * @returns {Promise} a promise which will resolve when the domain object
      *          has been saved, or be rejected if it cannot be saved
      */
-    get(identifier, abortSignal, forceRemote = false) {
+    get(identifier, abortSignal) {
         let keystring = this.makeKeyString(identifier);
 
-        if (!forceRemote) {
-            if (this.cache[keystring] !== undefined) {
-                return this.cache[keystring];
-            }
+        if (this.cache[keystring] !== undefined) {
+            return this.cache[keystring];
+        }
 
-            identifier = utils.parseKeyString(identifier);
+        identifier = utils.parseKeyString(identifier);
 
-            if (this.isTransactionActive()) {
-                let dirtyObject = this.transaction.getDirtyObject(identifier);
+        if (this.isTransactionActive()) {
+            let dirtyObject = this.transaction.getDirtyObject(identifier);
 
-                if (dirtyObject) {
-                    return Promise.resolve(dirtyObject);
-                }
+            if (dirtyObject) {
+                return Promise.resolve(dirtyObject);
             }
         }
 
@@ -395,6 +391,7 @@ export default class ObjectAPI {
                 lastPersistedTime = domainObject.persisted;
                 const persistedTime = Date.now();
                 this.#mutate(domainObject, 'persisted', persistedTime);
+
                 savedObjectPromise = provider.update(domainObject);
             }
 
@@ -402,7 +399,7 @@ export default class ObjectAPI {
                 savedObjectPromise.then(response => {
                     savedResolve(response);
                 }).catch((error) => {
-                    if (!isNewObject) {
+                    if (lastPersistedTime !== undefined) {
                         this.#mutate(domainObject, 'persisted', lastPersistedTime);
                     }
 
@@ -413,20 +410,9 @@ export default class ObjectAPI {
             }
         }
 
-        return result.catch(async (error) => {
+        return result.catch((error) => {
             if (error instanceof this.errors.Conflict) {
-                // Synchronized objects will resolve their own conflicts
-                if (this.SYNCHRONIZED_OBJECT_TYPES.includes(domainObject.type)) {
-                    this.openmct.notifications.info(`Conflict detected while saving "${this.makeKeyString(domainObject.name)}", attempting to resolve`);
-                } else {
-                    this.openmct.notifications.error(`Conflict detected while saving ${this.makeKeyString(domainObject.identifier)}`);
-
-                    if (this.isTransactionActive()) {
-                        this.endTransaction();
-                    }
-
-                    await this.refresh(domainObject);
-                }
+                this.openmct.notifications.error(`Conflict detected while saving ${this.makeKeyString(domainObject.identifier)}`);
             }
 
             throw error;

src/api/overlays/components/OverlayComponent.vue

@@ -15,8 +15,6 @@
             ref="element"
             class="c-overlay__contents js-notebook-snapshot-item-wrapper"
             tabindex="0"
-            aria-modal="true"
-            role="dialog"
         ></div>
         <div
             v-if="buttons"

src/plugins/formActions/CreateAction.js

@@ -73,21 +73,19 @@ export default class CreateAction extends PropertiesAction {
             title: 'Saving'
         });
 
-        try {
-            await this.openmct.objects.save(this.domainObject);
+        const success = await this.openmct.objects.save(this.domainObject);
+        if (success) {
             const compositionCollection = await this.openmct.composition.get(parentDomainObject);
             compositionCollection.add(this.domainObject);
 
             this._navigateAndEdit(this.domainObject, parentDomainObjectPath);
 
             this.openmct.notifications.info('Save successful');
-        } catch (err) {
-            console.error(err);
-            this.openmct.notifications.error(`Error saving objects: ${err}`);
-        } finally {
-            dialog.dismiss();
+        } else {
+            this.openmct.notifications.error('Error saving objects');
         }
 
+        dialog.dismiss();
     }
 
     /**

src/plugins/imagery/components/ImageryView.vue

@@ -788,7 +788,7 @@ export default {
             }
         },
         persistVisibleLayers() {
-            if (this.domainObject.configuration && this.openmct.objects.supportsMutation(this.domainObject.identifier)) {
+            if (this.domainObject.configuration) {
                 this.openmct.objects.mutate(this.domainObject, 'configuration.layers', this.layers);
             }
 

src/plugins/imagery/components/RelatedTelemetry/RelatedTelemetry.js

@@ -28,7 +28,6 @@ function copyRelatedMetadata(metadata) {
     return copiedMetadata;
 }
 
-import IndependentTimeContext from "@/api/time/IndependentTimeContext";
 export default class RelatedTelemetry {
 
     constructor(openmct, domainObject, telemetryKeys) {
@@ -89,31 +88,9 @@ export default class RelatedTelemetry {
             this[key].historicalDomainObject = await this._openmct.objects.get(this[key].historical.telemetryObjectId);
 
             this[key].requestLatestFor = async (datum) => {
-                // We need to create a throwaway time context and pass it along
-                // as a request option. We do this to "trick" the Time API
-                // into thinking we are in fixed time mode in order to bypass this logic:
-                // https://github.com/akhenry/openmct-yamcs/blob/1060d42ebe43bf346dac0f6a8068cb288ade4ba4/src/providers/historical-telemetry-provider.js#L59
-                // Context: https://github.com/akhenry/openmct-yamcs/pull/217
-                const ephemeralContext = new IndependentTimeContext(
-                    this._openmct,
-                    this._openmct.time,
-                    [this[key].historicalDomainObject]
-                );
-
-                // Stop following the global context, stop the clock,
-                // and set bounds.
-                ephemeralContext.resetContext();
-                const newBounds = {
-                    start: this._openmct.time.bounds().start,
-                    end: this._parseTime(datum)
-                };
-                ephemeralContext.stopClock();
-                ephemeralContext.bounds(newBounds);
-
                 const options = {
-                    start: newBounds.start,
-                    end: newBounds.end,
-                    timeContext: ephemeralContext,
+                    start: this._openmct.time.bounds().start,
+                    end: this._parseTime(datum),
                     strategy: 'latest'
                 };
                 let results = await this._openmct.telemetry

src/plugins/notebook/components/Notebook.vue

@@ -50,7 +50,7 @@
         <Sidebar
             ref="sidebar"
             class="c-notebook__nav c-sidebar c-drawer c-drawer--align-left"
-            :class="sidebarClasses"
+            :class="[{'is-expanded': showNav}, {'c-drawer--push': !sidebarCoversEntries}, {'c-drawer--overlays': sidebarCoversEntries}]"
             :default-page-id="defaultPageId"
             :selected-page-id="getSelectedPageId()"
             :default-section-id="defaultSectionId"
@@ -123,7 +123,6 @@
             </div>
             <div
                 v-if="selectedPage && !selectedPage.isLocked"
-                :class="{ 'disabled': activeTransaction }"
                 class="c-notebook__drag-area icon-plus"
                 @click="newEntry()"
                 @dragover="dragOver"
@@ -134,11 +133,6 @@
                     To start a new entry, click here or drag and drop any object
                 </span>
             </div>
-            <progress-bar
-                v-if="savingTransaction"
-                class="c-telemetry-table__progress-bar"
-                :model="{ progressPerc: undefined }"
-            />
             <div
                 v-if="selectedPage && selectedPage.isLocked"
                 class="c-notebook__page-locked"
@@ -189,7 +183,6 @@ import NotebookEntry from './NotebookEntry.vue';
 import Search from '@/ui/components/search.vue';
 import SearchResults from './SearchResults.vue';
 import Sidebar from './Sidebar.vue';
-import ProgressBar from '../../../ui/components/ProgressBar.vue';
 import { clearDefaultNotebook, getDefaultNotebook, setDefaultNotebook, setDefaultNotebookSectionId, setDefaultNotebookPageId } from '../utils/notebook-storage';
 import { addNotebookEntry, createNewEmbed, getEntryPosById, getNotebookEntries, mutateObject } from '../utils/notebook-entries';
 import { saveNotebookImageDomainObject, updateNamespaceOfDomainObject } from '../utils/notebook-image';
@@ -207,8 +200,7 @@ export default {
         NotebookEntry,
         Search,
         SearchResults,
-        Sidebar,
-        ProgressBar
+        Sidebar
     },
     inject: ['agent', 'openmct', 'snapshotContainer'],
     props: {
@@ -233,9 +225,7 @@ export default {
             showNav: false,
             sidebarCoversEntries: false,
             filteredAndSortedEntries: [],
-            notebookAnnotations: {},
-            activeTransaction: false,
-            savingTransaction: false
+            notebookAnnotations: {}
         };
     },
     computed: {
@@ -280,20 +270,6 @@ export default {
 
             return this.sections[0];
         },
-        sidebarClasses() {
-            let sidebarClasses = [];
-            if (this.showNav) {
-                sidebarClasses.push('is-expanded');
-            }
-
-            if (this.sidebarCoversEntries) {
-                sidebarClasses.push('c-drawer--overlays');
-            } else {
-                sidebarClasses.push('c-drawer--push');
-            }
-
-            return sidebarClasses;
-        },
         showLockButton() {
             const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
 
@@ -321,8 +297,6 @@ export default {
         this.formatSidebar();
         this.setSectionAndPageFromUrl();
 
-        this.transaction = null;
-
         window.addEventListener('orientationchange', this.formatSidebar);
         window.addEventListener('hashchange', this.setSectionAndPageFromUrl);
         this.filterAndSortEntries();
@@ -775,7 +749,6 @@ export default {
             return section.id;
         },
         async newEntry(embed = null) {
-            this.startTransaction();
             this.resetSearch();
             const notebookStorage = this.createNotebookStorageObject();
             this.updateDefaultNotebook(notebookStorage);
@@ -918,34 +891,20 @@ export default {
         },
         startTransaction() {
             if (!this.openmct.objects.isTransactionActive()) {
-                this.activeTransaction = true;
                 this.transaction = this.openmct.objects.startTransaction();
             }
         },
         async saveTransaction() {
-            if (this.transaction !== null) {
-                this.savingTransaction = true;
-                try {
-                    await this.transaction.commit();
-                } finally {
-                    this.endTransaction();
-                }
+            if (this.transaction !== undefined) {
+                await this.transaction.commit();
+                this.openmct.objects.endTransaction();
             }
         },
         async cancelTransaction() {
-            if (this.transaction !== null) {
-                try {
-                    await this.transaction.cancel();
-                } finally {
-                    this.endTransaction();
-                }
+            if (this.transaction !== undefined) {
+                await this.transaction.cancel();
+                this.openmct.objects.endTransaction();
             }
-        },
-        endTransaction() {
-            this.openmct.objects.endTransaction();
-            this.transaction = null;
-            this.savingTransaction = false;
-            this.activeTransaction = false;
         }
     }
 };

src/plugins/notebook/monkeyPatchObjectAPIForNotebooks.js

@@ -74,22 +74,19 @@ async function resolveNotebookTagConflicts(localAnnotation, openmct) {
 
 async function resolveNotebookEntryConflicts(localMutable, openmct) {
     if (localMutable.configuration.entries) {
-        const FORCE_REMOTE = true;
         const localEntries = structuredClone(localMutable.configuration.entries);
-        const remoteObject = await openmct.objects.get(localMutable.identifier, undefined, FORCE_REMOTE);
-
-        return applyLocalEntries(remoteObject, localEntries, openmct);
+        const remoteMutable = await openmct.objects.getMutable(localMutable.identifier);
+        applyLocalEntries(remoteMutable, localEntries, openmct);
+        openmct.objects.destroyMutable(remoteMutable);
     }
 
     return true;
 }
 
-function applyLocalEntries(remoteObject, entries, openmct) {
-    let shouldSave = false;
-
+function applyLocalEntries(mutable, entries, openmct) {
     Object.entries(entries).forEach(([sectionKey, pagesInSection]) => {
         Object.entries(pagesInSection).forEach(([pageKey, localEntries]) => {
-            const remoteEntries = remoteObject.configuration.entries[sectionKey][pageKey];
+            const remoteEntries = mutable.configuration.entries[sectionKey][pageKey];
             const mergedEntries = [].concat(remoteEntries);
             let shouldMutate = false;
 
@@ -113,13 +110,8 @@ function applyLocalEntries(remoteObject, entries, openmct) {
             });
 
             if (shouldMutate) {
-                shouldSave = true;
-                openmct.objects.mutate(remoteObject, `configuration.entries.${sectionKey}.${pageKey}`, mergedEntries);
+                openmct.objects.mutate(mutable, `configuration.entries.${sectionKey}.${pageKey}`, mergedEntries);
             }
         });
     });
-
-    if (shouldSave) {
-        return openmct.objects.save(remoteObject);
-    }
 }

src/plugins/notificationIndicator/components/NotificationIndicator.vue

@@ -5,16 +5,10 @@
     :class="[severityClass]"
 >
     <span class="c-indicator__label">
-        <button
-            :aria-label="'Review ' + notificationsCountMessage(notifications.length)"
-            @click="toggleNotificationsList(true)"
-        >
+        <button @click="toggleNotificationsList(true)">
             {{ notificationsCountMessage(notifications.length) }}
         </button>
-        <button
-            aria-label="Clear all notifications"
-            @click="dismissAllNotifications()"
-        >
+        <button @click="dismissAllNotifications()">
             Clear All
         </button>
     </span>

src/plugins/notificationIndicator/components/NotificationMessage.vue

@@ -1,7 +1,6 @@
 <template>
 <div
     class="c-message"
-    role="listitem"
     :class="'message-severity-' + notification.model.severity"
 >
     <div class="c-ne__time-and-content">
@@ -21,11 +20,6 @@
                 </div>
             </div>
         </div>
-        <button
-            :aria-label="'Dismiss notification of ' + notification.model.message"
-            class="c-click-icon c-overlay__close-button icon-x"
-            @click="dismiss()"
-        ></button>
         <div class="c-overlay__button-bar">
             <button
                 v-for="(dialogOption, index) in notification.model.options"
@@ -58,14 +52,6 @@ export default {
         notification: {
             type: Object,
             required: true
-        },
-        closeOverlay: {
-            type: Function,
-            required: true
-        },
-        notificationsCount: {
-            type: Number,
-            required: true
         }
     },
     data() {
@@ -93,12 +79,6 @@ export default {
         updateProgressBar(progressPerc, progressText) {
             this.progressPerc = progressPerc;
             this.progressText = progressText;
-        },
-        dismiss() {
-            this.notification.dismiss();
-            if (this.notificationsCount === 1) {
-                this.closeOverlay();
-            }
         }
     }
 };

src/plugins/notificationIndicator/components/NotificationsList.vue

@@ -6,16 +6,11 @@
             {{ notificationsCountDisplayMessage(notifications.length) }}
         </div>
     </div>
-    <div
-        role="list"
-        class="w-messages c-overlay__messages"
-    >
+    <div class="w-messages c-overlay__messages">
         <notification-message
             v-for="notification in notifications"
             :key="notification.model.timestamp"
-            :close-overlay="closeOverlay"
             :notification="notification"
-            :notifications-count="notifications.length"
         />
     </div>
 </div>
@@ -62,9 +57,6 @@ export default {
                 }
             });
         },
-        closeOverlay() {
-            this.overlay.dismiss();
-        },
         notificationsCountDisplayMessage(count) {
             if (count > 1 || count === 0) {
                 return `Displaying ${count} notifications`;

src/plugins/objectMigration/plugin.js

@@ -36,8 +36,8 @@ export default function () {
         }
 
         let wrappedFunction = openmct.objects.get;
-        openmct.objects.get = function migrate() {
-            return wrappedFunction.apply(openmct.objects, [...arguments])
+        openmct.objects.get = function migrate(identifier) {
+            return wrappedFunction.apply(openmct.objects, [identifier])
                 .then(function (object) {
                     if (needsMigration(object)) {
                         migrateObject(object)

src/plugins/persistence/couch/CouchChangesFeed.js

@@ -28,7 +28,6 @@
                 connected = false;
                 // stop listening for events
                 couchEventSource.removeEventListener('message', self.onCouchMessage);
-                couchEventSource.close();
                 console.debug('🚪 Closed couch connection 🚪');
 
                 return;

src/plugins/persistence/couch/CouchObjectProvider.js

@@ -96,13 +96,8 @@ class CouchObjectProvider {
             let keyString = this.openmct.objects.makeKeyString(objectIdentifier);
             //TODO: Optimize this so that we don't 'get' the object if it's current revision (from this.objectQueue) is the same as the one we already have.
             let observersForObject = this.observers[keyString];
-            let isInTransaction = false;
 
-            if (this.openmct.objects.isTransactionActive()) {
-                isInTransaction = this.openmct.objects.transaction.getDirtyObject(objectIdentifier);
-            }
-
-            if (observersForObject && !isInTransaction) {
+            if (observersForObject) {
                 observersForObject.forEach(async (observer) => {
                     const updatedObject = await this.get(objectIdentifier);
                     if (this.isSynchronizedObject(updatedObject)) {
@@ -224,12 +219,7 @@ class CouchObjectProvider {
                 console.error(error.message);
                 throw new Error(`CouchDB Error - No response"`);
             } else {
-                if (body?.model && isNotebookOrAnnotationType(body.model)) {
-                    // warn since we handle conflicts for notebooks
-                    console.warn(error.message);
-                } else {
-                    console.error(error.message);
-                }
+                console.error(error.message);
 
                 throw error;
             }
@@ -244,8 +234,7 @@ class CouchObjectProvider {
     #handleResponseCode(status, json, fetchOptions) {
         this.indicator.setIndicatorToState(this.#statusCodeToIndicatorState(status));
         if (status === CouchObjectProvider.HTTP_CONFLICT) {
-            const objectName = JSON.parse(fetchOptions.body)?.model?.name;
-            throw new this.openmct.objects.errors.Conflict(`Conflict persisting "${objectName}"`);
+            throw new this.openmct.objects.errors.Conflict(`Conflict persisting ${fetchOptions.body.name}`);
         } else if (status >= CouchObjectProvider.HTTP_BAD_REQUEST) {
             if (!json.error || !json.reason) {
                 throw new Error(`CouchDB Error ${status}`);

src/plugins/remoteClock/RemoteClock.js

@@ -62,8 +62,8 @@ export default class RemoteClock extends DefaultClock {
     }
 
     start() {
+        this.openmct.time.on('timeSystem', this._timeSystemChange);
         this.openmct.objects.get(this.identifier).then((domainObject) => {
-            this.openmct.time.on('timeSystem', this._timeSystemChange);
             this.timeTelemetryObject = domainObject;
             this.metadata = this.openmct.telemetry.getMetadata(domainObject);
             this._timeSystemChange();

src/plugins/remoteClock/RemoteClockSpec.js

@@ -71,10 +71,7 @@ describe("the RemoteClock plugin", () => {
             parse: (datum) => datum.key
         };
 
-        let objectPromise;
-        let requestPromise;
-
-        beforeEach(() => {
+        beforeEach(async () => {
             openmct.install(openmct.plugins.RemoteClock(TIME_TELEMETRY_ID));
 
             let clocks = openmct.time.getAllClocks();
@@ -92,9 +89,7 @@ describe("the RemoteClock plugin", () => {
             spyOn(metadata, 'value').and.callThrough();
 
             let requestPromiseResolve;
-            let objectPromiseResolve;
-
-            requestPromise = new Promise((resolve) => {
+            let requestPromise = new Promise((resolve) => {
                 requestPromiseResolve = resolve;
             });
             spyOn(openmct.telemetry, 'request').and.callFake(() => {
@@ -103,7 +98,8 @@ describe("the RemoteClock plugin", () => {
                 return requestPromise;
             });
 
-            objectPromise = new Promise((resolve) => {
+            let objectPromiseResolve;
+            let objectPromise = new Promise((resolve) => {
                 objectPromiseResolve = resolve;
             });
             spyOn(openmct.objects, 'get').and.callFake(() => {
@@ -116,48 +112,39 @@ describe("the RemoteClock plugin", () => {
                 start: OFFSET_START,
                 end: OFFSET_END
             });
+
+            await Promise.all([objectPromiseResolve, requestPromise]);
         });
 
-        it("Does not throw error if time system is changed before remote clock initialized", () => {
-            expect(() => openmct.time.timeSystem('utc')).not.toThrow();
+        it('is available and sets up initial values and listeners', () => {
+            expect(remoteClock.key).toEqual(REMOTE_CLOCK_KEY);
+            expect(remoteClock.identifier).toEqual(TIME_TELEMETRY_ID);
+            expect(openmct.time.on).toHaveBeenCalledWith('timeSystem', remoteClock._timeSystemChange);
+            expect(remoteClock._timeSystemChange).toHaveBeenCalled();
         });
 
-        describe('once resolved', () => {
-            beforeEach(async () => {
-                await Promise.all([objectPromise, requestPromise]);
-            });
-
-            it('is available and sets up initial values and listeners', () => {
-                expect(remoteClock.key).toEqual(REMOTE_CLOCK_KEY);
-                expect(remoteClock.identifier).toEqual(TIME_TELEMETRY_ID);
-                expect(openmct.time.on).toHaveBeenCalledWith('timeSystem', remoteClock._timeSystemChange);
-                expect(remoteClock._timeSystemChange).toHaveBeenCalled();
-            });
-
-            it('will request/store the object based on the identifier passed in', () => {
-                expect(remoteClock.timeTelemetryObject).toEqual(object);
-            });
-
-            it('will request metadata and set up formatters', () => {
-                expect(remoteClock.metadata).toEqual(metadata);
-                expect(metadata.value).toHaveBeenCalled();
-                expect(openmct.telemetry.getValueFormatter).toHaveBeenCalledWith(metadataValue);
-            });
-
-            it('will request the latest datum for the object it received and process the datum returned', () => {
-                expect(openmct.telemetry.request).toHaveBeenCalledWith(remoteClock.timeTelemetryObject, REQ_OPTIONS);
-                expect(boundsCallback).toHaveBeenCalledWith({
-                    start: TIME_VALUE + OFFSET_START,
-                    end: TIME_VALUE + OFFSET_END
-                }, true);
-            });
-
-            it('will set up subscriptions correctly', () => {
-                expect(remoteClock._unsubscribe).toBeDefined();
-                expect(openmct.telemetry.subscribe).toHaveBeenCalledWith(remoteClock.timeTelemetryObject, remoteClock._processDatum);
-            });
+        it('will request/store the object based on the identifier passed in', () => {
+            expect(remoteClock.timeTelemetryObject).toEqual(object);
         });
 
+        it('will request metadata and set up formatters', () => {
+            expect(remoteClock.metadata).toEqual(metadata);
+            expect(metadata.value).toHaveBeenCalled();
+            expect(openmct.telemetry.getValueFormatter).toHaveBeenCalledWith(metadataValue);
+        });
+
+        it('will request the latest datum for the object it received and process the datum returned', () => {
+            expect(openmct.telemetry.request).toHaveBeenCalledWith(remoteClock.timeTelemetryObject, REQ_OPTIONS);
+            expect(boundsCallback).toHaveBeenCalledWith({
+                start: TIME_VALUE + OFFSET_START,
+                end: TIME_VALUE + OFFSET_END
+            }, true);
+        });
+
+        it('will set up subscriptions correctly', () => {
+            expect(remoteClock._unsubscribe).toBeDefined();
+            expect(openmct.telemetry.subscribe).toHaveBeenCalledWith(remoteClock.timeTelemetryObject, remoteClock._processDatum);
+        });
     });
 
 });

src/ui/components/TimeSystemAxis.vue

@@ -101,8 +101,7 @@ export default {
                 if (nowMarker) {
                     nowMarker.classList.remove('hidden');
                     nowMarker.style.height = this.contentHeight + 'px';
-                    const nowTimeStamp = this.openmct.time.clock().currentValue();
-                    const now = this.xScale(nowTimeStamp);
+                    const now = this.xScale(Date.now());
                     nowMarker.style.left = now + this.offset + 'px';
                 }
             }

src/ui/layout/BrowseBar.vue

@@ -335,7 +335,6 @@ export default {
                 dialog.dismiss();
                 this.openmct.notifications.error('Error saving objects');
                 console.error(error);
-                this.openmct.editor.cancel();
             });
         },
         saveAndContinueEditing() {

src/ui/layout/mct-tree.vue

@@ -174,7 +174,8 @@ export default {
             itemOffset: 0,
             activeSearch: false,
             mainTreeTopMargin: undefined,
-            selectedItem: {}
+            selectedItem: {},
+            observers: {}
         };
     },
     computed: {
@@ -276,13 +277,10 @@ export default {
             this.treeResizeObserver.disconnect();
         }
 
-        this.destroyObservers();
-        this.destroyMutables();
+        this.destroyObservers(this.observers);
     },
     methods: {
         async initialize() {
-            this.observers = {};
-            this.mutables = {};
             this.isLoading = true;
             this.getSavedOpenItems();
             this.treeResizeObserver = new ResizeObserver(this.handleTreeResize);
@@ -357,15 +355,8 @@ export default {
             }
 
             this.treeItems = this.treeItems.filter((checkItem) => {
-                if (checkItem.navigationPath !== path
-                    && checkItem.navigationPath.includes(path)) {
-                    this.destroyObserverByPath(checkItem.navigationPath);
-                    this.destroyMutableByPath(checkItem.navigationPath);
-
-                    return false;
-                }
-
-                return true;
+                return checkItem.navigationPath === path
+                    || !checkItem.navigationPath.includes(path);
             });
             this.openTreeItems.splice(pathIndex, 1);
             this.removeCompositionListenerFor(path);
@@ -445,17 +436,7 @@ export default {
 
             }, Promise.resolve()).then(() => {
                 if (this.isSelectorTree) {
-                    // If item is missing due to error in object creation,
-                    // walk up the navigationPath until we find an item
-                    let item = this.getTreeItemByPath(navigationPath);
-                    while (!item) {
-                        const startIndex = 0;
-                        const endIndex = navigationPath.lastIndexOf('/');
-                        navigationPath = navigationPath.substring(startIndex, endIndex);
-                        item = this.getTreeItemByPath(navigationPath);
-                    }
-
-                    this.treeItemSelection(item);
+                    this.treeItemSelection(this.getTreeItemByPath(navigationPath));
                 }
             });
         },
@@ -556,7 +537,7 @@ export default {
                 composition = sortedComposition;
             }
 
-            if (parentObjectPath.length && !this.isSelectorTree) {
+            if (parentObjectPath.length) {
                 let navigationPath = this.buildNavigationPath(parentObjectPath);
 
                 if (this.compositionCollections[navigationPath]) {
@@ -575,15 +556,7 @@ export default {
             }
 
             return composition.map((object) => {
-                // Only add observers and mutables if this is NOT a selector tree
-                if (!this.isSelectorTree) {
-                    if (this.openmct.objects.supportsMutation(object.identifier)) {
-                        object = this.openmct.objects.toMutable(object);
-                        this.addMutable(object, parentObjectPath);
-                    }
-
-                    this.addTreeItemObserver(object, parentObjectPath);
-                }
+                this.addTreeItemObserver(object, parentObjectPath);
 
                 return this.buildTreeItem(object, parentObjectPath);
             });
@@ -601,15 +574,6 @@ export default {
                 navigationPath
             };
         },
-        addMutable(mutableDomainObject, parentObjectPath) {
-            const objectPath = [mutableDomainObject].concat(parentObjectPath);
-            const navigationPath = this.buildNavigationPath(objectPath);
-
-            // If the mutable already exists, destroy it.
-            this.destroyMutableByPath(navigationPath);
-
-            this.mutables[navigationPath] = () => this.openmct.objects.destroyMutable(mutableDomainObject);
-        },
         addTreeItemObserver(domainObject, parentObjectPath) {
             const objectPath = [domainObject].concat(parentObjectPath);
             const navigationPath = this.buildNavigationPath(objectPath);
@@ -624,6 +588,30 @@ export default {
                 this.sortTreeItems.bind(this, parentObjectPath)
             );
         },
+        async updateTreeItems(parentObjectPath) {
+            let children;
+
+            if (parentObjectPath.length) {
+                const parentItem = this.treeItems.find(item => item.objectPath === parentObjectPath);
+                const descendants = this.getChildrenInTreeFor(parentItem, true);
+                const parentIndex = this.treeItems.map(e => e.object).indexOf(parentObjectPath[0]);
+
+                children = await this.loadAndBuildTreeItemsFor(parentItem.object, parentItem.objectPath);
+
+                this.treeItems.splice(parentIndex + 1, descendants.length, ...children);
+            } else {
+                const root = await this.openmct.objects.get('ROOT');
+                children = await this.loadAndBuildTreeItemsFor(root, []);
+
+                this.treeItems = [...children];
+            }
+
+            for (let item of children) {
+                if (this.isTreeItemOpen(item)) {
+                    this.openTreeItem(item);
+                }
+            }
+        },
         sortTreeItems(parentObjectPath) {
             const navigationPath = this.buildNavigationPath(parentObjectPath);
             const parentItem = this.getTreeItemByPath(navigationPath);
@@ -674,10 +662,6 @@ export default {
                 const descendants = this.getChildrenInTreeFor(parentItem, true);
                 const directDescendants = this.getChildrenInTreeFor(parentItem);
 
-                if (domainObject.isMutable) {
-                    this.addMutable(domainObject, parentItem.objectPath);
-                }
-
                 this.addTreeItemObserver(domainObject, parentItem.objectPath);
 
                 if (directDescendants.length === 0) {
@@ -708,15 +692,13 @@ export default {
         },
         compositionRemoveHandler(navigationPath) {
             return (identifier) => {
-                const removeKeyString = this.openmct.objects.makeKeyString(identifier);
-                const parentItem = this.getTreeItemByPath(navigationPath);
-                const directDescendants = this.getChildrenInTreeFor(parentItem);
-                const removeItem = directDescendants.find(item => item.id === removeKeyString);
+                let removeKeyString = this.openmct.objects.makeKeyString(identifier);
+                let parentItem = this.getTreeItemByPath(navigationPath);
+                let directDescendants = this.getChildrenInTreeFor(parentItem);
+                let removeItem = directDescendants.find(item => item.id === removeKeyString);
 
-                // Remove the item from the tree, unobserve it, and clean up any mutables
                 this.removeItemFromTree(removeItem);
-                this.destroyObserverByPath(removeItem.navigationPath);
-                this.destroyMutableByPath(removeItem.navigationPath);
+                this.removeItemFromObservers(removeItem);
             };
         },
         removeCompositionListenerFor(navigationPath) {
@@ -738,6 +720,13 @@ export default {
             const removeIndex = this.getTreeItemIndex(item.navigationPath);
             this.treeItems.splice(removeIndex, 1);
         },
+        removeItemFromObservers(item) {
+            if (this.observers[item.id]) {
+                this.observers[item.id]();
+
+                delete this.observers[item.id];
+            }
+        },
         addItemToTreeBefore(addItem, beforeItem) {
             const addIndex = this.getTreeItemIndex(beforeItem.navigationPath);
 
@@ -975,46 +964,13 @@ export default {
         handleTreeResize() {
             this.calculateHeights();
         },
-        /**
-         * Destroy an observer for the given navigationPath.
-         */
-        destroyObserverByPath(navigationPath) {
-            if (this.observers[navigationPath]) {
-                this.observers[navigationPath]();
-                delete this.observers[navigationPath];
-            }
-        },
-        /**
-         * Destroy all observers.
-         */
-        destroyObservers() {
-            Object.entries(this.observers).forEach(([key, unobserve]) => {
-                if (unobserve) {
+        destroyObservers(observers) {
+            Object.entries(observers).forEach(([keyString, unobserve]) => {
+                if (typeof unobserve === 'function') {
                     unobserve();
                 }
 
-                delete this.observers[key];
-            });
-        },
-        /**
-         * Destroy a mutable for the given navigationPath.
-         */
-        destroyMutableByPath(navigationPath) {
-            if (this.mutables[navigationPath]) {
-                this.mutables[navigationPath]();
-                delete this.mutables[navigationPath];
-            }
-        },
-        /**
-         * Destroy all mutables.
-         */
-        destroyMutables() {
-            Object.entries(this.mutables).forEach(([key, destroyMutable]) => {
-                if (destroyMutable) {
-                    destroyMutable();
-                }
-
-                delete this.mutables[key];
+                delete observers[keyString];
             });
         }
     }

src/ui/layout/status-bar/NotificationBanner.vue

@@ -20,8 +20,6 @@
 <div
     v-if="activeModel.message"
     class="c-message-banner"
-    role="alert"
-    :aria-live="activeModel.severity === 'error' ? 'assertive' : 'polite'"
     :class="[
         activeModel.severity,
         {
@@ -44,7 +42,6 @@
     />
     <button
         class="c-message-banner__close-button c-click-icon icon-x-in-circle"
-        aria-label="Dismiss"
         @click.stop="dismiss()"
     ></button>
 </div>

webpack.common.js

@@ -0,0 +1,160 @@
+/* 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)
+ - webpack.dev.js - the development configuration for OpenMCT
+ - webpack.coverage.js - imports webpack.dev.js and adds code coverage
+There are separate npm scripts to use these configurations, though simply running `npm install`
+will use the default production configuration.
+*/
+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");
+
+const {VueLoaderPlugin} = require('vue-loader');
+let gitRevision = 'error-retrieving-revision';
+let gitBranch = 'error-retrieving-branch';
+
+try {
+    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);
+}
+
+/** @type {import('webpack').Configuration} */
+const config = {
+    entry: {
+        openmct: './openmct.js',
+        generatorWorker: './example/generator/generatorWorker.js',
+        couchDBChangesFeed: './src/plugins/persistence/couch/CouchChangesFeed.js',
+        inMemorySearchWorker: './src/api/objects/InMemorySearchWorker.js',
+        espressoTheme: './src/plugins/themes/espresso-theme.scss',
+        snowTheme: './src/plugins/themes/snow-theme.scss',
+    },
+    output: {
+        globalObject: 'this',
+        filename: '[name].js',
+        path: path.resolve(__dirname, 'dist'),
+        library: 'openmct',
+        libraryTarget: 'umd',
+        publicPath: '',
+        hashFunction: 'xxhash64',
+        clean: true
+    },
+    resolve: {
+        alias: {
+            "@": path.join(__dirname, "src"),
+            "legacyRegistry": path.join(__dirname, "src/legacyRegistry"),
+            "saveAs": "file-saver/src/FileSaver.js",
+            "csv": "comma-separated-values",
+            "EventEmitter": "eventemitter3",
+            "bourbon": "bourbon.scss",
+            "plotly-basic": "plotly.js-basic-dist",
+            "plotly-gl2d": "plotly.js-gl2d-dist",
+            "d3-scale": path.join(__dirname, "node_modules/d3-scale/dist/d3-scale.min.js"),
+            "printj": path.join(__dirname, "node_modules/printj/dist/printj.min.js"),
+            "styles": path.join(__dirname, "src/styles"),
+            "MCT": path.join(__dirname, "src/MCT"),
+            "testUtils": path.join(__dirname, "src/utils/testUtils.js"),
+            "objectUtils": path.join(__dirname, "src/api/objects/object-utils.js"),
+            "utils": path.join(__dirname, "src/utils")
+        }
+    },
+    plugins: [
+        new webpack.DefinePlugin({
+            __OPENMCT_VERSION__: `'${packageDefinition.version}'`,
+            __OPENMCT_BUILD_DATE__: `'${new Date()}'`,
+            __OPENMCT_REVISION__: `'${gitRevision}'`,
+            __OPENMCT_BUILD_BRANCH__: `'${gitBranch}'`
+        }),
+        new VueLoaderPlugin(),
+        new CopyWebpackPlugin({
+            patterns: [
+                {
+                    from: 'src/images/favicons',
+                    to: 'favicons'
+                },
+                {
+                    from: './index.html',
+                    transform: function (content) {
+                        return content.toString().replace(/dist\//g, '');
+                    }
+                },
+                {
+                    from: 'src/plugins/imagery/layers',
+                    to: 'imagery'
+                }
+            ]
+        }),
+        new MiniCssExtractPlugin({
+            filename: '[name].css',
+            chunkFilename: '[name].css'
+        })
+    ],
+    module: {
+        rules: [
+            {
+                test: /\.(sc|sa|c)ss$/,
+                use: [
+                    MiniCssExtractPlugin.loader,
+                    {
+                        loader: 'css-loader'
+                    },
+                    {
+                        loader: 'resolve-url-loader'
+                    },
+                    {
+                        loader: 'sass-loader',
+                        options: {sourceMap: true }
+                    }
+                ]
+            },
+            {
+                test: /\.vue$/,
+                use: 'vue-loader'
+            },
+            {
+                test: /\.html$/,
+                type: 'asset/source'
+            },
+            {
+                test: /\.(jpg|jpeg|png|svg)$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: 'images/[name][ext]'
+                }
+            },
+            {
+                test: /\.ico$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: 'icons/[name][ext]'
+                }
+            },
+            {
+                test: /\.(woff|woff2?|eot|ttf)$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: 'fonts/[name][ext]'
+                }
+            }
+        ]
+    },
+    stats: 'errors-warnings',
+    performance: {
+        // We should eventually consider chunking to decrease
+        // these values
+        maxEntrypointSize: 25000000,
+        maxAssetSize: 25000000
+    }
+};
+
+module.exports = config;

webpack.coverage.js

@@ -6,9 +6,9 @@ OpenMCT Continuous Integration servers use this configuration to add code covera
 information to pull requests.
 */
 
-const config = require("./webpack.dev");
+const config = require('./webpack.dev');
 // eslint-disable-next-line no-undef
-const CI = process.env.CI === "true";
+const CI = process.env.CI === 'true';
 
 config.devtool = CI ? false : undefined;
 
@@ -18,18 +18,13 @@ config.module.rules.push({
     test: /\.js$/,
     exclude: /(Spec\.js$)|(node_modules)/,
     use: {
-        loader: "babel-loader",
+        loader: 'babel-loader',
         options: {
             retainLines: true,
             // eslint-disable-next-line no-undef
-            plugins: [
-                [
-                    "babel-plugin-istanbul",
-                    {
-                        extension: [".js", ".vue"]
-                    }
-                ]
-            ]
+            plugins: [['babel-plugin-istanbul', {
+                extension: ['.js', '.vue']
+            }]]
         }
     }
 });

webpack.dev.js

@@ -5,29 +5,28 @@ This configuration should be used for development purposes. It contains full sou
 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.
 */
-const path = require("path");
-const webpack = require("webpack");
-const { merge } = require("webpack-merge");
+const { merge } = require('webpack-merge');
+const common = require('./webpack.common');
 
-const common = require("./webpack.common");
-const projectRootDir = path.resolve(__dirname, "..");
+const path = require('path');
+const webpack = require('webpack');
 
 module.exports = merge(common, {
-    mode: "development",
+    mode: 'development',
     watchOptions: {
         // Since we use require.context, webpack is watching the entire directory.
         // We need to exclude any files we don't want webpack to watch.
         // See: https://webpack.js.org/configuration/watch/#watchoptions-exclude
         ignored: [
-            "**/{node_modules,dist,docs,e2e}", // All files in node_modules, dist, docs, e2e,
-            "**/{*.yml,Procfile,webpack*.js,babel*.js,package*.json,tsconfig.json}", // Config files
-            "**/*.{sh,md,png,ttf,woff,svg}", // Non source files
-            "**/.*" // dotfiles and dotfolders
+            '**/{node_modules,dist,docs,e2e}', // All files in node_modules, dist, docs, e2e,
+            '**/{*.yml,Procfile,webpack*.js,babel*.js,package*.json,tsconfig.json}', // Config files
+            '**/*.{sh,md,png,ttf,woff,svg}', // Non source files
+            '**/.*' // dotfiles and dotfolders
         ]
     },
     resolve: {
         alias: {
-            vue: path.join(projectRootDir, "node_modules/vue/dist/vue.js")
+            "vue": path.join(__dirname, "node_modules/vue/dist/vue.js")
         }
     },
     plugins: [
@@ -35,20 +34,20 @@ module.exports = merge(common, {
             __OPENMCT_ROOT_RELATIVE__: '"dist/"'
         })
     ],
-    devtool: "eval-source-map",
+    devtool: 'eval-source-map',
     devServer: {
         devMiddleware: {
             writeToDisk: (filePathString) => {
                 const filePath = path.parse(filePathString);
-                const shouldWrite = !filePath.base.includes("hot-update");
+                const shouldWrite = !(filePath.base.includes('hot-update'));
 
                 return shouldWrite;
             }
         },
-        watchFiles: ["**/*.css"],
+        watchFiles: ['**/*.css'],
         static: {
-            directory: path.join(__dirname, "..", "/dist"),
-            publicPath: "/dist",
+            directory: path.join(__dirname, '/dist'),
+            publicPath: '/dist',
             watch: false
         },
         client: {

webpack.prod.js

@@ -4,18 +4,17 @@
 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");
+const { merge } = require('webpack-merge');
+const common = require('./webpack.common');
 
-const common = require("./webpack.common");
-const projectRootDir = path.resolve(__dirname, "..");
+const path = require('path');
+const webpack = require('webpack');
 
 module.exports = merge(common, {
-    mode: "production",
+    mode: 'production',
     resolve: {
         alias: {
-            vue: path.join(projectRootDir, "node_modules/vue/dist/vue.min.js")
+            "vue": path.join(__dirname, "node_modules/vue/dist/vue.min.js")
         }
     },
     plugins: [
@@ -23,5 +22,5 @@ module.exports = merge(common, {
             __OPENMCT_ROOT_RELATIVE__: '""'
         })
     ],
-    devtool: "source-map"
+    devtool: 'eval-source-map'
 });