only clear data

index.html

@@ -37,7 +37,6 @@
         const FIVE_MINUTES = 5 * 60 * 1000;
         const THIRTY_MINUTES = 30 * 60 * 1000;
 
-        openmct.install(openmct.plugins.Themes());
         [
             'example/eventGenerator',
             'example/styleguide'

karma.conf.js

@@ -23,9 +23,9 @@
 /*global module,process*/
 
 const devMode = process.env.NODE_ENV !== 'production';
-const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
 
 module.exports = (config) => {
+
     const webpackConfig = require('./webpack.config.js');
     delete webpackConfig.output;
 
@@ -50,17 +50,11 @@ module.exports = (config) => {
             'coverage',
             'html'
         ],
-        browsers: browsers,
-        customLaunchers: {
-            ChromeDebugging: {
-                base: 'Chrome',
-                flags: ['--remote-debugging-port=9222'],
-                debug: true
-            }
-        },
+        browsers: ['ChromeHeadless'],
         colors: true,
         logLevel: config.LOG_INFO,
         autoWatch: true,
+
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
@@ -72,18 +66,22 @@ module.exports = (config) => {
                 }
             }
         },
+
         // HTML test reporting.
         htmlReporter: {
             outputDir: "dist/reports/tests",
             preserveDescribeNesting: true,
             foldAll: false
         },
+
         preprocessors: {
             // add webpack as preprocessor
-            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
-            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
+            'platform/**/*Spec.js': [ 'webpack' ],
+            'src/**/*Spec.js': [ 'webpack' ]
         },
+
         webpack: webpackConfig,
+
         webpackMiddleware: {
             stats: 'errors-only',
             logLevel: 'warn'
@@ -91,3 +89,4 @@ module.exports = (config) => {
         singleRun: true
     });
 }
+

openmct.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global module*/
+/*global module,BUILD_CONSTANTS*/
 
 const matcher = /\/openmct.js$/;
 if (document.currentScript) {

package.json

@@ -27,7 +27,6 @@
     "exports-loader": "^0.7.0",
     "express": "^4.13.1",
     "fast-sass-loader": "1.4.6",
-    "fibers": "^4.0.2",
     "file-loader": "^1.1.11",
     "file-saver": "^1.3.8",
     "git-rev-sync": "^1.4.0",
@@ -44,7 +43,6 @@
     "karma-coverage": "^1.1.2",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^1.1.2",
-    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^3.0.0",
     "location-bar": "^3.0.1",
     "lodash": "^3.10.1",
@@ -61,10 +59,8 @@
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
-    "sass": "^1.23.7",
-    "sass-loader": "^8.0.0",
     "split": "^1.0.0",
-    "style-loader": "^1.0.1",
+    "style-loader": "^0.21.0",
     "v8-compile-cache": "^1.1.0",
     "vue": "2.5.6",
     "vue-loader": "^15.2.6",
@@ -83,7 +79,6 @@
     "build:dev": "webpack",
     "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "test-debug": "NODE_ENV=debug karma start --no-single-run",
     "test:watch": "karma start --no-single-run",
     "verify": "concurrently 'npm:test' 'npm:lint'",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",

platform/commonUI/browse/bundle.js

@@ -21,6 +21,12 @@
  *****************************************************************************/
 
 define([
+    "./src/BrowseController",
+    "./src/PaneController",
+    "./src/InspectorPaneController",
+    "./src/BrowseObjectController",
+    "./src/MenuArrowController",
+    "./src/ObjectHeaderController",
     "./src/navigation/NavigationService",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
@@ -35,6 +41,12 @@ define([
     "./res/templates/browse/inspector-region.html",
     'legacyRegistry'
 ], function (
+    BrowseController,
+    PaneController,
+    InspectorPaneController,
+    BrowseObjectController,
+    MenuArrowController,
+    ObjectHeaderController,
     NavigationService,
     NavigateAction,
     OrphanNavigationHandler,
@@ -61,6 +73,70 @@ define([
                     "priority": "fallback"
                 }
             ],
+            "controllers": [
+                {
+                    "key": "BrowseController",
+                    "implementation": BrowseController,
+                    "depends": [
+                        "$scope",
+                        "$route",
+                        "$location",
+                        "objectService",
+                        "navigationService",
+                        "urlService",
+                        "DEFAULT_PATH"
+                    ]
+                },
+                {
+                    "key": "PaneController",
+                    "implementation": PaneController,
+                    "priority": "preferred",
+                    "depends": [
+                        "$scope",
+                        "agentService",
+                        "$window",
+                        "$location",
+                        "$attrs",
+                        "navigationService"
+                    ]
+                },
+                {
+                    "key": "BrowseObjectController",
+                    "implementation": BrowseObjectController,
+                    "depends": [
+                        "$scope",
+                        "$location",
+                        "$route"
+                    ]
+                },
+                {
+                    "key": "MenuArrowController",
+                    "implementation": MenuArrowController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "InspectorPaneController",
+                    "implementation": InspectorPaneController,
+                    "priority": "preferred",
+                    "depends": [
+                        "$scope",
+                        "agentService",
+                        "$window",
+                        "navigationService",
+                        "$location",
+                        "$attrs"
+                    ]
+                },
+                {
+                    "key": "ObjectHeaderController",
+                    "implementation": ObjectHeaderController,
+                    "depends": [
+                        "$scope"
+                    ]
+                }
+            ],
             "representations": [
                 {
                     "key": "browse-object",

platform/commonUI/browse/src/BrowseController.js

@@ -0,0 +1,215 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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 bundle implements Browse mode.
+ * @namespace platform/commonUI/browse
+ */
+define(
+    ['lodash'],
+    function (_) {
+
+        /**
+         * The BrowseController is used to populate the initial scope in Browse
+         * mode. It loads the root object from the objectService and makes it
+         * available in the scope for Angular template's; this is the point at
+         * which Angular templates first have access to the domain object
+         * hierarchy.
+         *
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function BrowseController(
+            $scope,
+            $route,
+            $location,
+            objectService,
+            navigationService,
+            urlService,
+            defaultPath
+        ) {
+            window.browseScope = $scope;
+            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
+                currentIds;
+
+            $scope.treeModel = {
+                selectedObject: undefined,
+                onSelection: function (object) {
+                    navigationService.setNavigation(object, true);
+                },
+                allowSelection: function (object) {
+                    var domainObjectInView = navigationService.getNavigation(),
+                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
+
+                    if (isInEditMode) {
+
+                        var actions = object.getCapability('action'),
+                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
+
+                        if (previewAction && previewAction.perform) {
+                            previewAction.perform();
+                            return false;
+                        } else {
+                            return navigationService.shouldNavigate();
+                        }
+
+                    } else {
+                        return true;
+                    }
+                }
+            };
+
+            function idsForObject(domainObject) {
+                return urlService
+                    .urlForLocation("", domainObject)
+                    .replace('/', '');
+            }
+
+            // Find an object in an array of objects.
+            function findObject(domainObjects, id) {
+                var i;
+                for (i = 0; i < domainObjects.length; i += 1) {
+                    if (domainObjects[i].getId() === id) {
+                        return domainObjects[i];
+                    }
+                }
+            }
+
+            // helper, fetch a single object from the object service.
+            function getObject(id) {
+                return objectService.getObjects([id])
+                    .then(function (results) {
+                        return results[id];
+                    });
+            }
+
+            // recursively locate and return an object inside of a container
+            // via a path.  If at any point in the recursion it fails to find
+            // the next object, it will return the parent.
+            function findViaComposition(containerObject, path) {
+                var nextId = path.shift();
+                if (!nextId) {
+                    return containerObject;
+                }
+                return containerObject.useCapability('composition')
+                    .then(function (composees) {
+                        var nextObject = findObject(composees, nextId);
+                        if (!nextObject) {
+                            return containerObject;
+                        }
+                        if (!nextObject.hasCapability('composition')) {
+                            return nextObject;
+                        }
+                        return findViaComposition(nextObject, path);
+                    });
+            }
+
+            function navigateToObject(desiredObject) {
+                $scope.navigatedObject = desiredObject;
+                $scope.treeModel.selectedObject = desiredObject;
+                currentIds = idsForObject(desiredObject);
+                $route.current.pathParams.ids = currentIds;
+                $location.path('/browse/' + currentIds);
+            }
+
+            function getLastChildIfRoot(object) {
+                if (object.getId() !== 'ROOT') {
+                    return object;
+                }
+                return object.useCapability('composition')
+                    .then(function (composees) {
+                        return composees[composees.length - 1];
+                    });
+            }
+
+            function navigateToPath(path) {
+                return getObject('ROOT')
+                    .then(function (root) {
+                        return findViaComposition(root, path);
+                    })
+                    .then(getLastChildIfRoot)
+                    .then(function (object) {
+                        navigationService.setNavigation(object);
+                    });
+            }
+
+            getObject('ROOT')
+                .then(function (root) {
+                    $scope.domainObject = root;
+                    navigateToPath(initialPath);
+                });
+
+            // Handle navigation events from view service.  Only navigates
+            // if path has changed.
+            function navigateDirectlyToModel(domainObject) {
+                var newIds = idsForObject(domainObject);
+                if (currentIds !== newIds) {
+                    currentIds = newIds;
+                    navigateToObject(domainObject);
+                }
+            }
+
+            // Listen for changes in navigation state.
+            navigationService.addListener(navigateDirectlyToModel);
+
+            // Listen for route changes which are caused by browser events
+            // (e.g. bookmarks to pages in OpenMCT) and prevent them.  Instead,
+            // navigate to the path ourselves, which results in it being
+            // properly set.
+            $scope.$on('$routeChangeStart', function (event, route, oldRoute) {
+                if (route.$$route === $route.current.$$route) {
+                    if (route.pathParams.ids &&
+                        route.pathParams.ids !== $route.current.pathParams.ids) {
+
+                        var otherParams = _.omit(route.params, 'ids');
+                        var oldOtherParams = _.omit(oldRoute.params, 'ids');
+                        var deletedParams = _.omit(oldOtherParams, _.keys(otherParams));
+
+                        event.preventDefault();
+
+                        navigateToPath(route.pathParams.ids.split('/'))
+                            .then(function () {
+                                if (!_.isEqual(otherParams, oldOtherParams)) {
+                                    _.forEach(otherParams, function (v, k) {
+                                        $location.search(k, v);
+                                    });
+                                    _.forEach(deletedParams, function (k) {
+                                        $location.search(k, null);
+                                    });
+                                }
+                            });
+                    } else {
+                        navigateToPath([]);
+                    }
+                }
+            });
+
+            // Clean up when the scope is destroyed
+            $scope.$on("$destroy", function () {
+                navigationService.removeListener(navigateDirectlyToModel);
+            });
+        }
+
+        return BrowseController;
+    }
+);
+

platform/commonUI/browse/src/BrowseObjectController.js

@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Controller for the `browse-object` representation of a domain
+         * object (the right-hand side of Browse mode.)
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function BrowseObjectController($scope, $location, $route) {
+            function setViewForDomainObject(domainObject) {
+
+                var locationViewKey = $location.search().view;
+
+                function selectViewIfMatching(view) {
+                    if (view.key === locationViewKey) {
+                        $scope.representation = $scope.representation || {};
+                        $scope.representation.selected = view;
+                    }
+                }
+
+                if (locationViewKey) {
+                    ((domainObject && domainObject.useCapability('view')) || [])
+                        .forEach(selectViewIfMatching);
+                }
+            }
+
+            function updateQueryParam(viewKey) {
+                if (viewKey && $location.search().view !== viewKey) {
+                    $location.search('view', viewKey);
+                }
+            }
+
+            $scope.$watch('domainObject', setViewForDomainObject);
+            $scope.$watch('representation.selected.key', updateQueryParam);
+            $scope.$on('$locationChangeSuccess', function () {
+                setViewForDomainObject($scope.domainObject);
+            });
+
+            $scope.doAction = function (action) {
+                return $scope[action] && $scope[action]();
+            };
+
+        }
+
+        return BrowseObjectController;
+    }
+);
+

platform/commonUI/browse/src/InspectorPaneController.js

@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web 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 Web 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.
+ *****************************************************************************/
+
+
+define(
+    ["./PaneController"],
+    function (PaneController) {
+
+        /**
+         * Pane controller that reveals inspector, if hidden, when object
+         * switches to edit mode.
+         *
+         * @param $scope
+         * @param agentService
+         * @param $window
+         * @param navigationService
+         * @constructor
+         */
+        function InspectorPaneController($scope, agentService, $window, navigationService, $location, $attrs) {
+            PaneController.call(this, $scope, agentService, $window, $location, $attrs);
+            var statusListener,
+                self = this;
+
+            function showInspector(statuses) {
+                if (statuses.indexOf('editing') !== -1 && !self.visible()) {
+                    self.toggle();
+                }
+            }
+
+            function attachStatusListener(domainObject) {
+                // Remove existing status listener if existing
+                if (statusListener) {
+                    statusListener();
+                }
+
+                if (domainObject.hasCapability("status")) {
+                    statusListener = domainObject.getCapability("status").listen(showInspector);
+                }
+                return statusListener;
+            }
+
+            var domainObject = navigationService.getNavigation();
+            if (domainObject) {
+                attachStatusListener(domainObject);
+            }
+
+            navigationService.addListener(attachStatusListener);
+
+            $scope.$on("$destroy", function () {
+                statusListener();
+                navigationService.removeListener(attachStatusListener);
+            });
+        }
+
+        InspectorPaneController.prototype = Object.create(PaneController.prototype);
+
+        return InspectorPaneController;
+    }
+);

platform/commonUI/browse/src/MenuArrowController.js

@@ -20,27 +20,40 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
- @import "vendor/normalize-min";
- // Imports only constants, mixins, etc.
- // Meant for use as a single line import in Vue SFC's.
- // Do not include anything that renders to CSS!
- @import "constants";
- @import "constants-mobile.scss";
- @import "constants-snow";
- 
- @import "mixins";
- @import "animations";
- 
- /******************** RENDERS CSS */
- @import "about";
- @import "glyphs";
- @import "global";
- @import "status";
- @import "controls";
- @import "forms";
- @import "table";
- @import "legacy";
- @import "legacy-plots";
- @import "plotly";
- @import "legacy-messages";
- 
+/**
+ * Module defining MenuArrowController. Created by shale on 06/30/2015.
+ */
+define(
+    [],
+    function () {
+
+        /**
+         * A left-click on the menu arrow should display a
+         * context menu. This controller launches the context
+         * menu.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function MenuArrowController($scope) {
+            this.$scope = $scope;
+        }
+
+        /**
+         * Show a context menu for the domain object in this scope.
+         *
+         * @param event the browser event which caused this (used to
+         *        position the menu)
+         */
+        MenuArrowController.prototype.showMenu = function (event) {
+            var actionContext = {
+                key: 'menu',
+                domainObject: this.$scope.domainObject,
+                event: event
+            };
+
+            this.$scope.domainObject.getCapability('action').perform(actionContext);
+        };
+
+        return MenuArrowController;
+    }
+);

platform/commonUI/browse/src/ObjectHeaderController.js

@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Controller to provide the ability to inline edit an object name.
+         *
+         * @constructor
+         * @memberof platform/commonUI/browse
+         */
+        function ObjectHeaderController($scope) {
+            this.$scope = $scope;
+            this.domainObject = $scope.domainObject;
+            this.editable = this.allowEdit();
+        }
+
+        /**
+         * Updates the object name on blur and enter keypress events.
+         *
+         * @param event the mouse event
+         */
+        ObjectHeaderController.prototype.updateName = function (event) {
+            if (!event || !event.currentTarget) {
+                return;
+            }
+
+            if (event.type === 'blur') {
+                this.updateModel(event);
+            } else if (event.which === 13) {
+                this.updateModel(event);
+                event.currentTarget.blur();
+                window.getSelection().removeAllRanges();
+            }
+        };
+
+        /**
+         * Updates the model.
+         *
+         * @param event the mouse event
+         * @param private
+         */
+        ObjectHeaderController.prototype.updateModel = function (event) {
+            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
+
+            if (name.length === 0) {
+                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
+                event.currentTarget.textContent = name;
+            }
+
+            if (name !== this.domainObject.getModel().name) {
+                this.domainObject.getCapability('mutation').mutate(function (model) {
+                    model.name = name;
+                });
+            }
+        };
+
+        /**
+         * Checks if the domain object is editable.
+         *
+         * @private
+         * @return true if object is editable
+         */
+        ObjectHeaderController.prototype.allowEdit = function () {
+            var type = this.domainObject && this.domainObject.getCapability('type');
+            return !!(type && type.hasFeature('creation'));
+        };
+
+        return ObjectHeaderController;
+    }
+);

platform/commonUI/browse/src/PaneController.js

@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+
+define(
+    [],
+    function () {
+        var navigationListenerAdded = false;
+        /**
+         * Controller to provide the ability to show/hide the tree in
+         * Browse mode.
+         * @constructor
+         * @memberof platform/commonUI/browse
+         */
+        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
+            var self = this;
+            this.agentService = agentService;
+            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
+
+            if ($attrs.hideParameter && hideParameterPresent) {
+                this.state = false;
+                $location.search($attrs.hideParameter, undefined);
+            } else {
+                this.state = true;
+            }
+
+            /**
+             * Callback to invoke when any selection occurs in the tree.
+             * This controller can be passed in as the `parameters` object
+             * to the tree representation.
+             *
+             * @property {Function} callback
+             * @memberof platform/commonUI/browse.PaneController#
+             */
+            this.callback = function () {
+                // Note that, since this is a callback to pass, this is not
+                // declared as a method but as a property which happens to
+                // be a function.
+                if (agentService.isPhone() && agentService.isPortrait()) {
+                    // On phones, trees should collapse in portrait mode
+                    // when something is navigated-to.
+                    self.state = false;
+                }
+            };
+
+            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
+                navigationService.addListener(this.callback);
+                navigationListenerAdded = true;
+            }
+        }
+
+        /**
+         * Toggle the visibility of the pane.
+         */
+        PaneController.prototype.toggle = function () {
+            this.state = !this.state;
+        };
+
+        /**
+         * Get the desired visibility state of the pane.
+         * @returns {boolean} true when visible
+         */
+        PaneController.prototype.visible = function () {
+            return !!this.state;
+        };
+
+        return PaneController;
+    }
+);

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -0,0 +1,266 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global console*/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    [
+        "../src/BrowseController",
+        "../src/navigation/NavigationService"
+    ],
+    function (
+        BrowseController,
+        NavigationService
+    ) {
+
+        describe("The browse controller", function () {
+            var mockScope,
+                mockRoute,
+                mockLocation,
+                mockObjectService,
+                mockNavigationService,
+                mockRootObject,
+                mockUrlService,
+                mockDefaultRootObject,
+                mockOtherDomainObject,
+                mockNextObject,
+                testDefaultRoot,
+                controller;
+
+            function waitsForNavigation() {
+                return new Promise(function (resolve) {
+                    mockNavigationService.setNavigation.and.callFake(function (obj) {
+                        var returnValue;
+                        try {
+                            returnValue = NavigationService.prototype.setNavigation.call(mockNavigationService, obj);
+                        } catch (err) {
+                            console.error(err);
+                            //Not rejecting because 'setNavigation' has been called, which is what's being tested here.
+                            //Rejecting will fail tests.
+                        }
+                        resolve();
+                        return returnValue;
+                    });
+                });
+            }
+
+            function instantiateController() {
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService,
+                    mockUrlService,
+                    testDefaultRoot
+                );
+            }
+
+            beforeEach(function () {
+                testDefaultRoot = "some-root-level-domain-object";
+
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    ["$on", "$watch"]
+                );
+                mockRoute = { current: { params: {}, pathParams: {} } };
+                mockUrlService = jasmine.createSpyObj(
+                    "urlService",
+                    ["urlForLocation"]
+                );
+                mockUrlService.urlForLocation.and.callFake(function (mode, object) {
+                    if (object === mockDefaultRootObject) {
+                        return [mode, testDefaultRoot].join('/');
+                    }
+                    if (object === mockOtherDomainObject) {
+                        return [mode, 'other'].join('/');
+                    }
+                    if (object === mockNextObject) {
+                        return [mode, testDefaultRoot, 'next'].join('/');
+                    }
+                    throw new Error('Tried to get url for unexpected object');
+                });
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    ["path"]
+                );
+                mockObjectService = jasmine.createSpyObj(
+                    "objectService",
+                    ["getObjects"]
+                );
+                mockNavigationService = new NavigationService({});
+                [
+                    "getNavigation",
+                    "setNavigation",
+                    "addListener",
+                    "removeListener"
+                ].forEach(function (method) {
+                    spyOn(mockNavigationService, method)
+                        .and.callThrough();
+                });
+                mockRootObject = jasmine.createSpyObj(
+                    "rootObjectContainer",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockDefaultRootObject = jasmine.createSpyObj(
+                    "defaultRootObject",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockOtherDomainObject = jasmine.createSpyObj(
+                    "otherDomainObject",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockNextObject = jasmine.createSpyObj(
+                    "nestedDomainObject",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockObjectService.getObjects.and.returnValue(Promise.resolve({
+                    ROOT: mockRootObject
+                }));
+                mockRootObject.useCapability.and.returnValue(Promise.resolve([
+                    mockOtherDomainObject,
+                    mockDefaultRootObject
+                ]));
+                mockRootObject.hasCapability.and.returnValue(true);
+                mockDefaultRootObject.useCapability.and.returnValue(Promise.resolve([
+                    mockNextObject
+                ]));
+                mockDefaultRootObject.hasCapability.and.returnValue(true);
+                mockOtherDomainObject.hasCapability.and.returnValue(false);
+                mockNextObject.useCapability.and.returnValue(undefined);
+                mockNextObject.hasCapability.and.returnValue(false);
+                mockNextObject.getId.and.returnValue("next");
+                mockDefaultRootObject.getId.and.returnValue(testDefaultRoot);
+
+                instantiateController();
+                return waitsForNavigation();
+            });
+
+            it("uses composition to set the navigated object, if there is none", function () {
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                });
+            });
+
+            it("navigates to a root-level object, even when default path is not found", function () {
+                mockDefaultRootObject.getId
+                    .and.returnValue("something-other-than-the-" + testDefaultRoot);
+                instantiateController();
+
+                return waitsForNavigation().then(function () {
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                });
+            });
+
+            it("does not try to override navigation", function () {
+                mockNavigationService.getNavigation.and.returnValue(mockDefaultRootObject);
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                });
+            });
+
+            it("updates scope when navigated object changes", function () {
+                // Should have registered a listener - call it
+                mockNavigationService.addListener.calls.mostRecent().args[0](
+                    mockOtherDomainObject
+                );
+                expect(mockScope.navigatedObject).toEqual(mockOtherDomainObject);
+            });
+
+
+            it("releases its navigation listener when its scope is destroyed", function () {
+                expect(mockScope.$on).toHaveBeenCalledWith(
+                    "$destroy",
+                    jasmine.any(Function)
+                );
+                mockScope.$on.calls.mostRecent().args[1]();
+
+                // Should remove the listener it added earlier
+                expect(mockNavigationService.removeListener).toHaveBeenCalledWith(
+                    mockNavigationService.addListener.calls.mostRecent().args[0]
+                );
+            });
+
+            it("uses route parameters to choose initially-navigated object", function () {
+                mockRoute.current.params.ids = testDefaultRoot + "/next";
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockNextObject);
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockNextObject);
+                });
+            });
+
+            it("handles invalid IDs by going as far as possible", function () {
+                // Idea here is that if we get a bad path of IDs,
+                // browse controller should traverse down it until
+                // it hits an invalid ID.
+                mockRoute.current.params.ids = testDefaultRoot + "/junk";
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                });
+            });
+
+            it("handles compositionless objects by going as far as possible", function () {
+                // Idea here is that if we get a path which passes
+                // through an object without a composition, browse controller
+                // should stop at it since remaining IDs cannot be loaded.
+                mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockNextObject);
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockNextObject);
+                });
+            });
+
+            it("updates the displayed route to reflect current navigation", function () {
+                // In order to trigger a route update and not a route change,
+                // the current route must be updated before location.path is
+                // called.
+                expect(mockRoute.current.pathParams.ids)
+                    .not
+                    .toBe(testDefaultRoot + '/next');
+                mockLocation.path.and.callFake(function () {
+                    expect(mockRoute.current.pathParams.ids)
+                        .toBe(testDefaultRoot + '/next');
+                });
+                mockNavigationService.addListener.calls.mostRecent().args[0](
+                    mockNextObject
+                );
+                expect(mockLocation.path).toHaveBeenCalledWith(
+                    '/browse/' + testDefaultRoot + '/next'
+                );
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+define(
+    ["../src/BrowseObjectController"],
+    function (BrowseObjectController) {
+
+        describe("The browse object controller", function () {
+            var mockScope,
+                mockLocation,
+                mockRoute,
+                controller;
+
+            // Utility function; look for a $watch on scope and fire it
+            function fireWatch(expr, value) {
+                mockScope.$watch.calls.all().forEach(function (call) {
+                    if (call.args[0] === expr) {
+                        call.args[1](value);
+                    }
+                });
+            }
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    ["$on", "$watch"]
+                );
+                mockRoute = { current: { params: {} } };
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    ["path", "search"]
+                );
+                mockLocation.search.and.returnValue({});
+
+                controller = new BrowseObjectController(
+                    mockScope,
+                    mockLocation,
+                    mockRoute
+                );
+            });
+
+            it("updates query parameters when selected view changes", function () {
+                fireWatch("representation.selected.key", "xyz");
+                expect(mockLocation.search).toHaveBeenCalledWith('view', "xyz");
+
+                // Allows the path index to be checked
+                // prior to setting $route.current
+                mockLocation.path.and.returnValue("/browse/");
+            });
+
+            it("sets the active view from query parameters", function () {
+                var mockDomainObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ['getId', 'getModel', 'getCapability', 'useCapability']
+                    ),
+                    testViews = [
+                        { key: 'abc' },
+                        { key: 'def', someKey: 'some value' },
+                        { key: 'xyz' }
+                    ];
+
+                mockDomainObject.useCapability.and.callFake(function (c) {
+                    return (c === 'view') && testViews;
+                });
+                mockLocation.search.and.returnValue({ view: 'def' });
+
+                fireWatch('domainObject', mockDomainObject);
+                expect(mockScope.representation.selected)
+                    .toEqual(testViews[1]);
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/InspectorPaneControllerSpec.js

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web 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 Web 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.
+ *****************************************************************************/
+
+define(
+    ["../src/InspectorPaneController"],
+    function (InspectorPaneController) {
+
+        describe("The InspectorPaneController", function () {
+            var mockScope,
+                mockAgentService,
+                mockDomainObject,
+                mockWindow,
+                mockStatusCapability,
+                mockNavigationService,
+                mockNavigationUnlistener,
+                mockStatusUnlistener,
+                controller,
+                mockLocation,
+                mockAttrs;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+                mockAgentService = jasmine.createSpyObj(
+                    "agentService",
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                );
+
+                mockNavigationUnlistener = jasmine.createSpy("navigationUnlistener");
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    ["getNavigation", "addListener"]
+                );
+                mockNavigationService.addListener.and.returnValue(mockNavigationUnlistener);
+
+                mockStatusUnlistener = jasmine.createSpy("statusUnlistener");
+                mockStatusCapability = jasmine.createSpyObj(
+                    "statusCapability",
+                    ["listen"]
+                );
+                mockStatusCapability.listen.and.returnValue(mockStatusUnlistener);
+
+                mockDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    [
+                        'getId',
+                        'getModel',
+                        'getCapability',
+                        'hasCapability'
+                    ]
+                );
+                mockDomainObject.getId.and.returnValue("domainObject");
+                mockDomainObject.getModel.and.returnValue({});
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.returnValue(mockStatusCapability);
+
+                mockLocation = jasmine.createSpyObj('location', ['search']);
+                mockLocation.search.and.returnValue({});
+
+                mockAttrs = {};
+
+                controller = new InspectorPaneController(mockScope, mockAgentService, mockWindow, mockNavigationService, mockLocation, mockAttrs);
+            });
+
+            it("listens for changes to navigation and attaches a status" +
+                " listener", function () {
+                expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function));
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                expect(mockStatusCapability.listen).toHaveBeenCalledWith(jasmine.any(Function));
+            });
+
+            it("if hidden, shows the inspector when domain object switches to" +
+                " edit mode", function () {
+                controller.toggle();
+                // test pre-condition that inspector is hidden
+                expect(controller.visible()).toBe(false);
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                mockStatusCapability.listen.calls.mostRecent().args[0](["editing"]);
+                expect(controller.visible()).toBe(true);
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/MenuArrowControllerSpec.js

@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+/**
+ * MenuArrowControllerSpec. Created by shale on 07/02/2015.
+ */
+define(
+    ["../src/MenuArrowController"],
+    function (MenuArrowController) {
+
+        describe("The menu arrow controller ", function () {
+            var mockScope,
+                mockDomainObject,
+                mockEvent,
+                mockContextMenuAction,
+                mockActionContext,
+                controller;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    [""]
+                );
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getCapability"]
+                );
+                mockEvent = jasmine.createSpyObj(
+                    "event",
+                    ["preventDefault"]
+                );
+                mockContextMenuAction = jasmine.createSpyObj(
+                    "action",
+                    ["perform", "getActions"]
+                );
+                mockActionContext = jasmine.createSpyObj(
+                    "actionContext",
+                    [""]
+                );
+
+                mockActionContext.domainObject = mockDomainObject;
+                mockActionContext.event = mockEvent;
+                mockScope.domainObject = mockDomainObject;
+                mockDomainObject.getCapability.and.returnValue(mockContextMenuAction);
+                mockContextMenuAction.perform.and.returnValue(jasmine.any(Function));
+
+                controller = new MenuArrowController(mockScope);
+            });
+
+            it("calls the context menu action when clicked", function () {
+                // Simulate a click on the menu arrow
+                controller.showMenu(mockEvent);
+
+                // Expect the menu action to be performed
+                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('action');
+                expect(mockContextMenuAction.perform).toHaveBeenCalled();
+            });
+        });
+    }
+);

platform/commonUI/browse/test/ObjectHeaderControllerSpec.js

@@ -0,0 +1,137 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+define(
+    ["../src/ObjectHeaderController"],
+    function (ObjectHeaderController) {
+
+        describe("The object header controller", function () {
+            var mockScope,
+                mockDomainObject,
+                mockCapabilities,
+                mockMutationCapability,
+                mockTypeCapability,
+                mockEvent,
+                mockCurrentTarget,
+                model,
+                controller;
+
+            beforeEach(function () {
+                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
+                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
+                mockTypeCapability.typeDef = { name: ""};
+                mockTypeCapability.hasFeature.and.callFake(function (feature) {
+                    return feature === 'creation';
+                });
+
+                mockCapabilities = {
+                    mutation: mockMutationCapability,
+                    type: mockTypeCapability
+                };
+
+                model = {
+                    name: "Test name"
+                };
+                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
+                mockDomainObject.getModel.and.returnValue(model);
+                mockDomainObject.getCapability.and.callFake(function (key) {
+                    return mockCapabilities[key];
+                });
+
+                mockScope = {
+                    domainObject: mockDomainObject
+                };
+
+                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
+                mockCurrentTarget.blur.and.returnValue(mockCurrentTarget);
+
+                mockEvent = {
+                    which: {},
+                    type: {},
+                    currentTarget: mockCurrentTarget
+                };
+
+                controller = new ObjectHeaderController(mockScope);
+            });
+
+            it("updates the model with new name on blur", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = "New name";
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).toHaveBeenCalled();
+            });
+
+            it("updates the model with a default for blank names", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = "";
+                controller.updateName(mockEvent);
+
+                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
+                expect(mockMutationCapability.mutate).toHaveBeenCalled();
+            });
+
+            it("does not update the model if the same name", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
+            });
+
+            it("updates the model on enter keypress event only", function () {
+                mockCurrentTarget.textContent = "New name";
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
+
+                mockEvent.which = 13;
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
+
+                mockMutationCapability.mutate.calls.mostRecent().args[0](model);
+
+                expect(mockDomainObject.getModel().name).toBe("New name");
+            });
+
+            it("blurs the field on enter key press", function () {
+                mockCurrentTarget.textContent = "New name";
+                mockEvent.which = 13;
+                controller.updateName(mockEvent);
+
+                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
+            });
+
+            it("allows editting name when object is creatable", function () {
+                expect(controller.allowEdit()).toBe(true);
+            });
+
+            it("disallows editting name when object is non-creatable", function () {
+                mockTypeCapability.hasFeature.and.returnValue(false);
+
+                expect(controller.allowEdit()).toBe(false);
+
+            });
+        });
+    }
+);

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+define(
+    ["../src/PaneController"],
+    function (PaneController) {
+
+        describe("The PaneController", function () {
+            var mockScope,
+                mockAgentService,
+                mockWindow,
+                controller,
+                mockLocation,
+                mockAttrs;
+
+            // We want to reinstantiate for each test case
+            // because device state can influence constructor-time behavior
+            function instantiateController() {
+                return new PaneController(
+                    mockScope,
+                    mockAgentService,
+                    mockWindow,
+                    mockLocation,
+                    mockAttrs
+                );
+            }
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockAgentService = jasmine.createSpyObj(
+                    "agentService",
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                );
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+
+                mockLocation = jasmine.createSpyObj('location', ['search']);
+                mockLocation.search.and.returnValue({});
+
+                mockAttrs = {};
+            });
+
+            it("is initially visible", function () {
+                expect(instantiateController().visible()).toBeTruthy();
+            });
+
+            it("allows visibility to be toggled", function () {
+                controller = instantiateController();
+                controller.toggle();
+                expect(controller.visible()).toBeFalsy();
+                controller.toggle();
+                expect(controller.visible()).toBeTruthy();
+            });
+
+            it("collapses on navigation changes on portrait-oriented phones", function () {
+                mockAgentService.isMobile.and.returnValue(true);
+                mockAgentService.isPhone.and.returnValue(true);
+                mockAgentService.isPortrait.and.returnValue(true);
+                controller = instantiateController();
+                expect(controller.visible()).toBeTruthy();
+
+                // Simulate a change from the tree by invoking controller's
+                controller.callback();
+
+                // Tree should have collapsed
+                expect(controller.visible()).toBeFalsy();
+            });
+
+            describe("specifying hideParameter", function () {
+                beforeEach(function () {
+                    mockAttrs = {hideParameter: 'hideTree'};
+                });
+
+                it("sets pane state to false when in location.search", function () {
+                    mockLocation.search.and.returnValue({'hideTree': true});
+                    expect(instantiateController().visible()).toBe(false);
+                    expect(mockLocation.search).toHaveBeenCalledWith('hideTree', undefined);
+                });
+
+                it("sets state to true when not found in location.search", function () {
+                    mockLocation.search.and.returnValue({});
+                    expect(instantiateController().visible()).toBe(true);
+                    expect(mockLocation.search).not.toHaveBeenCalledWith('hideTree', undefined);
+                });
+            });
+        });
+    }
+);

platform/commonUI/edit/bundle.js

@@ -27,6 +27,7 @@ define([
     "./src/actions/EditAndComposeAction",
     "./src/actions/EditAction",
     "./src/actions/PropertiesAction",
+    "./src/actions/RemoveAction",
     "./src/actions/SaveAction",
     "./src/actions/SaveAndStopEditingAction",
     "./src/actions/SaveAsAction",
@@ -57,6 +58,7 @@ define([
     EditAndComposeAction,
     EditAction,
     PropertiesAction,
+    RemoveAction,
     SaveAction,
     SaveAndStopEditingAction,
     SaveAsAction,
@@ -156,6 +158,18 @@ define([
                         "dialogService"
                     ]
                 },
+                {
+                    "key": "remove",
+                    "category": "legacy",
+                    "implementation": RemoveAction,
+                    "cssClass": "icon-trash",
+                    "name": "Remove",
+                    "description": "Remove this object from its containing object.",
+                    "depends": [
+                        "openmct",
+                        "navigationService"
+                    ]
+                },
                 {
                     "key": "save-and-stop-editing",
                     "category": "save",

platform/commonUI/edit/src/actions/RemoveAction.js

@@ -0,0 +1,131 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+/**
+ * Module defining RemoveAction. Created by vwoeltje on 11/17/14.
+ */
+define([], function () {
+
+    /**
+     * Construct an action which will remove the provided object manifestation.
+     * The object will be removed from its parent's composition; the parent
+     * is looked up via the "context" capability (so this will be the
+     * immediate ancestor by which this specific object was reached.)
+     *
+     * @param {DialogService} dialogService a service which will show the dialog
+     * @param {NavigationService} navigationService a service that maintains the current navigation state
+     * @param {ActionContext} context the context in which this action is performed
+     * @memberof platform/commonUI/edit
+     * @constructor
+     * @implements {Action}
+     */
+    function RemoveAction(openmct, navigationService, context) {
+        this.domainObject = (context || {}).domainObject;
+        this.openmct = openmct;
+        this.navigationService = navigationService;
+    }
+
+    /**
+     * Perform this action.
+     */
+    RemoveAction.prototype.perform = function () {
+        var dialog,
+            domainObject = this.domainObject,
+            navigationService = this.navigationService;
+        /*
+         * Check whether an object ID matches the ID of the object being
+         * removed (used to filter a parent's composition to handle the
+         * removal.)
+         */
+        function isNotObject(otherObjectId) {
+            return otherObjectId !== domainObject.getId();
+        }
+
+        /*
+         * Mutate a parent object such that it no longer contains the object
+         * which is being removed.
+         */
+        function doMutate(model) {
+            model.composition = model.composition.filter(isNotObject);
+        }
+
+        /*
+         * Checks current object and ascendants of current
+         * object with object being removed, if the current
+         * object or any in the current object's path is being removed,
+         * navigate back to parent of removed object.
+         */
+        function checkObjectNavigation(object, parentObject) {
+            // Traverse object starts at current location
+            var traverseObject = (navigationService).getNavigation(),
+                context;
+
+            // Stop when object is not defined (above ROOT)
+            while (traverseObject) {
+                // If object currently traversed to is object being removed
+                // navigate to parent of current object and then exit loop
+                if (traverseObject.getId() === object.getId()) {
+                    navigationService.setNavigation(parentObject);
+                    return;
+                }
+                // Traverses to parent of current object, moving
+                // up the ascendant path
+                context = traverseObject.getCapability('context');
+                traverseObject = context && context.getParent();
+            }
+        }
+
+        /*
+         * Remove the object from its parent, as identified by its context
+         * capability. Based on object's location and selected object's location
+         * user may be navigated to existing parent object
+         */
+        function removeFromContext() {
+            var contextCapability = domainObject.getCapability('context'),
+                parent = contextCapability.getParent();
+
+            // If currently within path of removed object(s),
+            // navigates to existing object up tree
+            checkObjectNavigation(domainObject, parent);
+
+            return parent.useCapability('mutation', doMutate);
+        }
+
+        removeFromContext();
+    };
+
+    // Object needs to have a parent for Remove to be applicable
+    RemoveAction.appliesTo = function (context) {
+        var object = (context || {}).domainObject,
+            contextCapability = object && object.getCapability("context"),
+            parent = contextCapability && contextCapability.getParent(),
+            parentType = parent && parent.getCapability('type'),
+            parentCreatable = parentType && parentType.hasFeature('creation');
+
+        // Only creatable types should be modifiable
+        return parent !== undefined &&
+                Array.isArray(parent.getModel().composition) &&
+                parentCreatable;
+    };
+
+    return RemoveAction;
+});

platform/commonUI/edit/src/actions/SaveInProgressDialog.js

@@ -6,7 +6,7 @@ define([], function () {
 
     SaveInProgressDialog.prototype.show = function () {
         this.dialog = this.dialogService.showBlockingMessage({
-            title: "Saving",
+            title: "Saving...",
             hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
             unknownProgress: true,
             severity: "info",

platform/commonUI/edit/test/actions/RemoveActionSpec.js

@@ -0,0 +1,255 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+define(
+    ["../../src/actions/RemoveAction"],
+    function (RemoveAction) {
+
+        describe("The Remove action", function () {
+            var action,
+                actionContext,
+                capabilities,
+                mockContext,
+                mockOverlayAPI,
+                mockDomainObject,
+                mockMutation,
+                mockNavigationService,
+                mockParent,
+                mockType,
+                model;
+
+            beforeEach(function () {
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getId", "getCapability", "getModel"]
+                );
+
+                mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
+                mockType = jasmine.createSpyObj("type", ["hasFeature"]);
+                mockType.hasFeature.and.returnValue(true);
+
+                capabilities = {
+                    mutation: mockMutation,
+                    type: mockType
+                };
+
+                model = {
+                    composition: ["a", "test", "b"]
+                };
+
+                mockParent = {
+                    getModel: function () {
+                        return model;
+                    },
+                    getCapability: function (k) {
+                        return capabilities[k];
+                    },
+                    useCapability: function (k, v) {
+                        return capabilities[k].invoke(v);
+                    }
+                };
+
+                mockOverlayAPI = jasmine.createSpyObj(
+                    "overlayAPI",
+                    ["dialog"]
+                );
+
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    [
+                        "getNavigation",
+                        "setNavigation",
+                        "addListener",
+                        "removeListener"
+                    ]
+                );
+                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
+
+                mockContext = jasmine.createSpyObj("context", ["getParent"]);
+                mockContext.getParent.and.returnValue(mockParent);
+
+                mockDomainObject.getId.and.returnValue("test");
+                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockDomainObject.getModel.and.returnValue({name: 'test object'});
+
+                mockContext.getParent.and.returnValue(mockParent);
+                mockType.hasFeature.and.returnValue(true);
+
+                actionContext = { domainObject: mockDomainObject };
+
+                action = new RemoveAction({overlays: mockOverlayAPI}, mockNavigationService, actionContext);
+            });
+
+            it("only applies to objects with parents", function () {
+                expect(RemoveAction.appliesTo(actionContext)).toBeTruthy();
+
+                mockContext.getParent.and.returnValue(undefined);
+
+                expect(RemoveAction.appliesTo(actionContext)).toBeFalsy();
+
+                // Also verify that creatability was checked
+                expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
+            });
+
+            it("shows a blocking message dialog", function () {
+                mockParent = jasmine.createSpyObj(
+                    "parent",
+                    ["getModel", "getCapability", "useCapability"]
+                );
+
+                action.perform();
+
+                expect(mockOverlayAPI.dialog).toHaveBeenCalled();
+
+                // Also check that no mutation happens at this point
+                expect(mockParent.useCapability).not.toHaveBeenCalledWith("mutation", jasmine.any(Function));
+            });
+
+            describe("after the remove callback is triggered", function () {
+                var mockChildContext,
+                    mockChildObject,
+                    mockDialogHandle,
+                    mockGrandchildContext,
+                    mockGrandchildObject,
+                    mockRootContext,
+                    mockRootObject;
+
+                beforeEach(function () {
+                    mockChildObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ["getId", "getCapability"]
+                    );
+
+                    mockDialogHandle = jasmine.createSpyObj(
+                        "dialogHandle",
+                        ["dismiss"]
+                    );
+
+                    mockGrandchildObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ["getId", "getCapability"]
+                    );
+
+                    mockRootObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ["getId", "getCapability"]
+                    );
+
+                    mockChildContext = jasmine.createSpyObj("context", ["getParent"]);
+                    mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
+                    mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
+
+                    mockOverlayAPI.dialog.and.returnValue(mockDialogHandle);
+                });
+
+                it("mutates the parent when performed", function () {
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    expect(mockMutation.invoke)
+                        .toHaveBeenCalledWith(jasmine.any(Function));
+                });
+
+                it("changes composition from its mutation function", function () {
+                    var mutator, result;
+
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    mutator = mockMutation.invoke.calls.mostRecent().args[0];
+                    result = mutator(model);
+
+                    // Should not have cancelled the mutation
+                    expect(result).not.toBe(false);
+
+                    // Simulate mutate's behavior (remove can either return a
+                    // new model or modify this one in-place)
+                    result = result || model;
+
+                    // Should have removed "test" - that was our
+                    // mock domain object's id.
+                    expect(result.composition).toEqual(["a", "b"]);
+                });
+
+                it("removes parent of object currently navigated to", function () {
+                    // Navigates to child object
+                    mockNavigationService.getNavigation.and.returnValue(mockChildObject);
+
+                    // Test is id of object being removed
+                    // Child object has different id
+                    mockDomainObject.getId.and.returnValue("test");
+                    mockChildObject.getId.and.returnValue("not test");
+
+                    // Sets context for the child and domainObject
+                    mockDomainObject.getCapability.and.returnValue(mockContext);
+                    mockChildObject.getCapability.and.returnValue(mockChildContext);
+
+                    // Parents of child and domainObject are set
+                    mockContext.getParent.and.returnValue(mockParent);
+                    mockChildContext.getParent.and.returnValue(mockDomainObject);
+
+                    mockType.hasFeature.and.returnValue(true);
+
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    // Expects navigation to parent of domainObject (removed object)
+                    expect(mockNavigationService.setNavigation).toHaveBeenCalledWith(mockParent);
+                });
+
+                it("checks if removing object not in ascendent path (reaches ROOT)", function () {
+                    // Navigates to grandchild of ROOT
+                    mockNavigationService.getNavigation.and.returnValue(mockGrandchildObject);
+
+                    // domainObject (grandparent) is set as ROOT, child and grandchild
+                    // are set objects not being removed
+                    mockDomainObject.getId.and.returnValue("test 1");
+                    mockRootObject.getId.and.returnValue("ROOT");
+                    mockChildObject.getId.and.returnValue("not test 2");
+                    mockGrandchildObject.getId.and.returnValue("not test 3");
+
+                    // Sets context for the grandchild, child, and domainObject
+                    mockRootObject.getCapability.and.returnValue(mockRootContext);
+                    mockChildObject.getCapability.and.returnValue(mockChildContext);
+                    mockGrandchildObject.getCapability.and.returnValue(mockGrandchildContext);
+
+                    // Parents of grandchild and child are set
+                    mockChildContext.getParent.and.returnValue(mockRootObject);
+                    mockGrandchildContext.getParent.and.returnValue(mockChildObject);
+
+                    mockType.hasFeature.and.returnValue(true);
+
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    // Expects no navigation to occur
+                    expect(mockNavigationService.setNavigation).not.toHaveBeenCalled();
+                });
+
+            });
+        });
+    }
+);

platform/commonUI/edit/test/actions/SaveAsActionSpec.js

@@ -25,7 +25,7 @@ define(
     ["../../src/actions/SaveAsAction"],
     function (SaveAsAction) {
 
-        xdescribe("The Save As action", function () {
+        describe("The Save As action", function () {
             var mockDomainObject,
                 mockClonedObject,
                 mockEditorCapability,

platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js

@@ -24,7 +24,7 @@ define(
     ["../../src/capabilities/EditorCapability"],
     function (EditorCapability) {
 
-        xdescribe("The editor capability", function () {
+        describe("The editor capability", function () {
             var mockDomainObject,
                 capabilities,
                 mockParentObject,

platform/commonUI/edit/test/creation/CreateActionSpec.js

@@ -27,7 +27,7 @@ define(
     ["../../src/creation/CreateAction"],
     function (CreateAction) {
 
-        xdescribe("The create action", function () {
+        describe("The create action", function () {
             var mockType,
                 mockParent,
                 mockContext,

platform/commonUI/edit/test/creation/CreateWizardSpec.js

@@ -27,7 +27,7 @@ define(
     ["../../src/creation/CreateWizard"],
     function (CreateWizard) {
 
-        xdescribe("The create wizard", function () {
+        describe("The create wizard", function () {
             var mockType,
                 mockParent,
                 mockProperties,

platform/commonUI/general/test/ui/TreeViewSpec.js

@@ -26,7 +26,7 @@ define([
     'zepto'
 ], function (TreeView, $) {
 
-    xdescribe("TreeView", function () {
+    describe("TreeView", function () {
         var mockGestureService,
             mockGestureHandle,
             mockDomainObject,

platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js

@@ -24,7 +24,7 @@ define(
     ['../src/NotificationIndicatorController'],
     function (NotificationIndicatorController) {
 
-        xdescribe("The notification indicator controller ", function () {
+        describe("The notification indicator controller ", function () {
             var mockNotificationService,
                 mockScope,
                 mockDialogService,

platform/containment/test/ComposeActionPolicySpec.js

@@ -23,7 +23,7 @@
 define(
     ["../src/ComposeActionPolicy"],
     function (ComposeActionPolicy) {
-        xdescribe("The compose action policy", function () {
+        describe("The compose action policy", function () {
             var mockInjector,
                 mockPolicyService,
                 mockTypes,

platform/entanglement/test/services/CopyServiceSpec.js

@@ -42,7 +42,7 @@ define(
             return promise;
         }
 
-        xdescribe("CopyService", function () {
+        describe("CopyService", function () {
             var policyService;
 
             beforeEach(function () {

platform/entanglement/test/services/LinkServiceSpec.js

@@ -29,7 +29,7 @@ define(
     ],
     function (LinkService, domainObjectFactory, ControlledPromise) {
 
-        xdescribe("LinkService", function () {
+        describe("LinkService", function () {
 
             var linkService,
                 mockPolicyService;

platform/entanglement/test/services/MoveServiceSpec.js

@@ -34,7 +34,7 @@ define(
         ControlledPromise
     ) {
 
-        xdescribe("MoveService", function () {
+        describe("MoveService", function () {
 
             var moveService,
                 policyService,

platform/features/clock/test/indicators/FollowIndicatorSpec.js

@@ -31,7 +31,7 @@ define([
     MCT,
     $
 ) {
-    xdescribe("The timer-following indicator", function () {
+    describe("The timer-following indicator", function () {
         var timerService;
         var openmct;
 

platform/features/imagery/test/controllers/ImageryControllerSpec.js

@@ -30,7 +30,7 @@ define(
         var MOCK_ELEMENT_TEMPLATE =
             '<div class="l-image-thumbs-wrapper"></div>';
 
-        xdescribe("The Imagery controller", function () {
+        describe("The Imagery controller", function () {
             var $scope,
                 openmct,
                 oldDomainObject,

platform/forms/test/MCTFileInputSpec.js

@@ -24,7 +24,7 @@ define(
     ["../src/MCTFileInput"],
     function (MCTFileInput) {
 
-        xdescribe("The mct-file-input directive", function () {
+        describe("The mct-file-input directive", function () {
 
             var mockScope,
                 mockFileInputService,

platform/framework/src/FrameworkLayer.js

@@ -55,13 +55,13 @@ define([
 
     FrameworkLayer.prototype.initializeApplication = function (
         angular,
-        openmct,
+        legacyRegistry,
         logLevel
     ) {
         var $http = this.$http,
             $log = this.$log,
             app = angular.module(Constants.MODULE_NAME, ["ngRoute"]),
-            loader = new BundleLoader($http, $log, openmct.legacyRegistry),
+            loader = new BundleLoader($http, $log, legacyRegistry),
             resolver = new BundleResolver(
                 new ExtensionResolver(
                     new ImplementationLoader({}),
@@ -77,7 +77,7 @@ define([
             ),
             bootstrapper = new ApplicationBootstrapper(
                 angular,
-                openmct.element,
+                window.document,
                 $log
             ),
             initializer = new FrameworkInitializer(

platform/framework/src/Main.js

@@ -41,7 +41,7 @@ define(
         function Main() {
         }
 
-        Main.prototype.run = function (openmct) {
+        Main.prototype.run = function (legacyRegistry) {
             // Get a reference to Angular's injector, so we can get $http and $log
             // services, which are useful to the framework layer.
             var injector = angular.injector(['ng']);
@@ -53,7 +53,7 @@ define(
             }
 
             return injector.instantiate(['$http', '$log', FrameworkLayer])
-                .initializeApplication(angular, openmct, logLevel());
+                .initializeApplication(angular, legacyRegistry, logLevel());
         };
 
         return Main;

platform/import-export/bundle.js

@@ -72,7 +72,6 @@ define([
                     ]
                 }
             });
-
             openmct.legacyRegistry.enable('platform/import-export');
         };
     };

platform/import-export/src/actions/ImportAsJSONAction.js

@@ -19,7 +19,8 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, objectUtils) {
+
+define(['zepto'], function ($) {
 
     /**
      * The ImportAsJSONAction is available from context menus and allows a user
@@ -60,15 +61,9 @@ define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, ob
 
     ImportAsJSONAction.prototype.importObjectTree = function (objTree) {
         var parent = this.context.domainObject;
-        var namespace = parent.useCapability('adapter').identifier.namespace;
-
-        var tree = this.generateNewIdentifiers(objTree, namespace);
+        var tree = this.generateNewIdentifiers(objTree);
         var rootId = tree.rootId;
-
-        var rootModel = tree.openmct[rootId];
-        delete rootModel.persisted;
-
-        var rootObj = this.instantiate(rootModel, rootId);
+        var rootObj = this.instantiate(tree.openmct[rootId], rootId);
         var newStyleParent = parent.useCapability('adapter');
         var newStyleRootObj = rootObj.useCapability('adapter');
 
@@ -110,10 +105,8 @@ define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, ob
                 if (!tree[keystring] || seen.includes(keystring)) {
                     return;
                 }
-                let newModel = tree[keystring];
-                delete newModel.persisted;
 
-                newObj = this.instantiate(newModel, keystring);
+                newObj = this.instantiate(tree[keystring], keystring);
                 newObj.getCapability("location")
                     .setPrimaryLocation(tree[keystring].location);
                 this.deepInstantiate(newObj, tree, seen);
@@ -121,17 +114,11 @@ define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, ob
         }
     };
 
-    ImportAsJSONAction.prototype.generateNewIdentifiers = function (tree, namespace) {
+    ImportAsJSONAction.prototype.generateNewIdentifiers = function (tree) {
         // For each domain object in the file, generate new ID, replace in tree
         Object.keys(tree.openmct).forEach(function (domainObjectId) {
-            let newId = {
-                namespace: namespace,
-                key: this.identifierService.generate()
-            };
-
-            let oldId = objectUtils.parseKeyString(domainObjectId);
-
-            tree = this.rewriteId(oldId, newId, tree);
+            var newId = this.identifierService.generate();
+            tree = this.rewriteId(domainObjectId, newId, tree);
         }, this);
         return tree;
     };
@@ -142,21 +129,9 @@ define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, ob
      *
      * @private
      */
-    ImportAsJSONAction.prototype.rewriteId = function (oldId, newId, tree) {
-        let newIdKeyString = this.openmct.objects.makeKeyString(newId);
-        let oldIdKeyString = this.openmct.objects.makeKeyString(oldId);
-        tree = JSON.stringify(tree).replace(new RegExp(oldIdKeyString, 'g'), newIdKeyString);
-
-        return JSON.parse(tree, (key, value) => {
-            if (Object.prototype.hasOwnProperty.call(value, 'key') &&
-                Object.prototype.hasOwnProperty.call(value, 'namespace') &&
-                value.key === oldId.key &&
-                value.namespace === oldId.namespace) {
-                return newId
-            } else {
-                return value;
-            }
-        });
+    ImportAsJSONAction.prototype.rewriteId = function (oldID, newID, tree) {
+        tree = JSON.stringify(tree).replace(new RegExp(oldID, 'g'), newID);
+        return JSON.parse(tree);
     };
 
     ImportAsJSONAction.prototype.getFormModel = function () {

platform/import-export/test/actions/ExportAsJSONActionSpec.js

@@ -29,7 +29,7 @@ define(
     ],
     function (ExportAsJSONAction, domainObjectFactory, MCT, AdapterCapability) {
 
-        xdescribe("The export JSON action", function () {
+        describe("The export JSON action", function () {
 
             var context,
                 action,

platform/import-export/test/actions/ImportAsJSONActionSpec.js

@@ -27,7 +27,7 @@ define(
     ],
     function (ImportAsJSONAction, domainObjectFactory) {
 
-        xdescribe("The import JSON action", function () {
+        describe("The import JSON action", function () {
 
             var context = {};
             var action,

platform/persistence/couch/test/CouchIndicatorSpec.js

@@ -24,7 +24,7 @@ define(
     ["../src/CouchIndicator"],
     function (CouchIndicator) {
 
-        xdescribe("The CouchDB status indicator", function () {
+        describe("The CouchDB status indicator", function () {
             var mockHttp,
                 mockInterval,
                 testPath,

platform/persistence/elastic/test/ElasticIndicatorSpec.js

@@ -24,7 +24,7 @@ define(
     ["../src/ElasticIndicator"],
     function (ElasticIndicator) {
 
-        xdescribe("The ElasticSearch status indicator", function () {
+        describe("The ElasticSearch status indicator", function () {
             var mockHttp,
                 mockInterval,
                 testPath,

platform/persistence/local/test/LocalStorageIndicatorSpec.js

@@ -24,7 +24,7 @@ define(
     ["../src/LocalStorageIndicator"],
     function (LocalStorageIndicator) {
 
-        xdescribe("The local storage status indicator", function () {
+        describe("The local storage status indicator", function () {
             var indicator;
 
             beforeEach(function () {

platform/persistence/queue/test/PersistenceFailureHandlerSpec.js

@@ -32,6 +32,14 @@ define(
                 mockPromise,
                 handler;
 
+            function asPromise(value) {
+                return (value || {}).then ? value : {
+                    then: function (callback) {
+                        return asPromise(callback(value));
+                    }
+                };
+            }
+
             function makeMockFailure(id, index) {
                 var mockFailure = jasmine.createSpyObj(
                         'failure-' + id,

platform/search/bundle.js

@@ -29,7 +29,6 @@ define([
     "./res/templates/search.html",
     "./res/templates/search-menu.html",
     "raw-loader!./src/services/GenericSearchWorker.js",
-    "raw-loader!./src/services/BareBonesSearchWorker.js",
     'legacyRegistry'
 ], function (
     SearchController,
@@ -40,7 +39,6 @@ define([
     searchTemplate,
     searchMenuTemplate,
     searchWorkerText,
-    BareBonesSearchWorkerText,
     legacyRegistry
 ) {
 
@@ -55,11 +53,6 @@ define([
                         "ROOT"
                     ],
                     "priority": "fallback"
-                },
-                {
-                    "key": "USE_LEGACY_INDEXER",
-                    "value": false,
-                    "priority": 2
                 }
             ],
             "controllers": [
@@ -108,7 +101,6 @@ define([
                         "workerService",
                         "topic",
                         "GENERIC_SEARCH_ROOTS",
-                        "USE_LEGACY_INDEXER",
                         "openmct"
                     ]
                 },
@@ -123,10 +115,6 @@ define([
                 }
             ],
             "workers": [
-                {
-                    "key": "bareBonesSearchWorker",
-                    "scriptText": BareBonesSearchWorkerText
-                },
                 {
                     "key": "genericSearchWorker",
                     "scriptText": searchWorkerText

platform/search/src/services/BareBonesSearchWorker.js

@@ -1,80 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*global self*/
-
-/**
- * Module defining BareBonesSearchWorker. Created by deeptailor on 10/03/2019.
- */
-(function () {
-
-    // An array of objects composed of domain object IDs and names
-    // {id: domainObject's ID, name: domainObject's name}
-    var indexedItems = [];
-
-    function indexItem(id, model) {
-        indexedItems.push({
-            id: id,
-            name: model.name.toLowerCase()
-        });
-    }
-
-    /**
-     * Gets search results from the indexedItems based on provided search
-     *   input. Returns matching results from indexedItems
-     *
-     * @param data An object which contains:
-     *           * input: The original string which we are searching with
-     *           * maxResults: The maximum number of search results desired
-     *           * queryId: an id identifying this query, will be returned.
-     */
-    function search(data) {
-        // This results dictionary will have domain object ID keys which
-        // point to the value the domain object's score.
-        var results,
-            input = data.input.trim().toLowerCase(),
-            message = {
-                request: 'search',
-                results: {},
-                total: 0,
-                queryId: data.queryId
-            };
-
-        results = indexedItems.filter((indexedItem) => {
-            return indexedItem.name.includes(input);
-        });
-
-        message.total = results.length;
-        message.results = results
-            .slice(0, data.maxResults);
-
-        return message;
-    }
-
-    self.onmessage = function (event) {
-        if (event.data.request === 'index') {
-            indexItem(event.data.id, event.data.model);
-        } else if (event.data.request === 'search') {
-            self.postMessage(search(event.data));
-        }
-    };
-}());

platform/search/src/services/GenericSearchProvider.js

@@ -44,7 +44,7 @@ define([
      * @param {TopicService} topic the topic service.
      * @param {Array} ROOTS An array of object Ids to begin indexing.
      */
-    function GenericSearchProvider($q, $log, modelService, workerService, topic, ROOTS, USE_LEGACY_INDEXER, openmct) {
+    function GenericSearchProvider($q, $log, modelService, workerService, topic, ROOTS, openmct) {
         var provider = this;
         this.$q = $q;
         this.$log = $log;
@@ -58,8 +58,6 @@ define([
 
         this.pendingQueries = {};
 
-        this.USE_LEGACY_INDEXER = USE_LEGACY_INDEXER;
-
         this.worker = this.startWorker(workerService);
         this.indexOnMutation(topic);
 
@@ -103,14 +101,8 @@ define([
      * @returns worker the created search worker.
      */
     GenericSearchProvider.prototype.startWorker = function (workerService) {
-        var provider = this,
-            worker;
-
-        if (this.USE_LEGACY_INDEXER) {
-            worker = workerService.run('genericSearchWorker');
-        } else {
-            worker = workerService.run('bareBonesSearchWorker');
-        }
+        var worker = workerService.run('genericSearchWorker'),
+            provider = this;
 
         worker.addEventListener('message', function (messageEvent) {
             provider.onWorkerMessage(messageEvent);
@@ -250,34 +242,18 @@ define([
             return;
         }
 
-        var pendingQuery,
-            modelResults;
-
-        if (this.USE_LEGACY_INDEXER) {
-            pendingQuery = this.pendingQueries[event.data.queryId];
+        var pendingQuery = this.pendingQueries[event.data.queryId],
             modelResults = {
                 total: event.data.total
             };
 
-            modelResults.hits = event.data.results.map(function (hit) {
-                return {
-                    id: hit.item.id,
-                    model: hit.item.model,
-                    score: hit.matchCount
-                };
-            });
-        } else {
-            pendingQuery = this.pendingQueries[event.data.queryId];
-            modelResults = {
-                total: event.data.total
+        modelResults.hits = event.data.results.map(function (hit) {
+            return {
+                id: hit.item.id,
+                model: hit.item.model,
+                score: hit.matchCount
             };
-
-            modelResults.hits = event.data.results.map(function (hit) {
-                return {
-                    id: hit.id
-                };
-            });
-        }
+        });
 
         pendingQuery.resolve(modelResults);
         delete this.pendingQueries[event.data.queryId];

platform/search/test/services/GenericSearchProviderSpec.js

@@ -29,7 +29,7 @@ define([
     GenericSearchProvider
 ) {
 
-    xdescribe('GenericSearchProvider', function () {
+    describe('GenericSearchProvider', function () {
         var $q,
             $log,
             modelService,

src/MCT.js

@@ -95,15 +95,12 @@ define([
      */
     function MCT() {
         EventEmitter.call(this);
-        /* eslint-disable no-undef */
         this.buildInfo = {
             version: __OPENMCT_VERSION__,
             buildDate: __OPENMCT_BUILD_DATE__,
             revision: __OPENMCT_REVISION__,
             branch: __OPENMCT_BUILD_BRANCH__
         };
-        /* eslint-enable no-undef */
-
 
         this.legacyBundle = { extensions: {
             services: [
@@ -263,6 +260,10 @@ define([
         this.install(this.plugins.Tabs());
         this.install(this.plugins.FlexibleLayout());
         this.install(this.plugins.GoToOriginalAction());
+
+        if (typeof BUILD_CONSTANTS !== 'undefined') {
+            this.install(buildInfoPlugin(BUILD_CONSTANTS));
+        }
     }
 
     MCT.prototype = Object.create(EventEmitter.prototype);
@@ -343,8 +344,6 @@ define([
             domElement = document.body;
         }
 
-        this.element = domElement;
-
         this.legacyExtension('runs', {
             depends: ['navigationService'],
             implementation: function (navigationService) {
@@ -374,8 +373,7 @@ define([
          * @event start
          * @memberof module:openmct.MCT~
          */
-        const startPromise = new Main()
-        startPromise.run(this)
+        var startPromise = new Main().run(this.legacyRegistry)
             .then(function (angular) {
                 this.$angular = angular;
                 // OpenMCT Object provider doesn't operate properly unless

src/MCTSpec.js

@@ -25,7 +25,7 @@ define([
     './plugins/plugins',
     'legacyRegistry'
 ], function (MCT, plugins, legacyRegistry) {
-    xdescribe("MCT", function () {
+    describe("MCT", function () {
         var openmct;
         var mockPlugin;
         var mockPlugin2;

src/adapter/indicators/legacy-indicators-pluginSpec.js

@@ -37,7 +37,7 @@ define(
         var legacyExtensionFunction = MCT.prototype.legacyExtension;
         var legacyIndicatorsRunsFunction;
 
-        xdescribe('The legacy indicators plugin', function () {
+        describe('The legacy indicators plugin', function () {
             beforeEach(function () {
                 mockLegacyExtensionFunction();
 

src/adapter/policies/LegacyCompositionPolicyAdapter.js

@@ -21,13 +21,13 @@
  *****************************************************************************/
 
 export default function legacyCompositionPolicyAdapter(openmct) {
-    const instantiate = openmct.$injector.get('instantiate');
-    const policyService = openmct.$injector.get('policyService');
+    const instantiate = this.openmct.$injector.get('instantiate');
+    const policyService = this.openmct.$injector.get('policyService');
 
     openmct.composition.addPolicy((parent, child) => {
 
-        let parentId = openmct.objects.makeKeyString(parent.identifier);
-        let childId = openmct.objects.makeKeyString(child.identifier);
+        let parentId = this.openmct.objects.makeKeyString(parent.identifier);
+        let childId = this.openmct.objects.makeKeyString(child.identifier);
 
         let legacyParent = instantiate(parent, parentId);
         let legacyChild = instantiate(child, childId);

src/adapter/views/TypeInspectorViewProvider.js

@@ -3,6 +3,17 @@ define([
 ], function (
 
 ) {
+    const DEFAULT_VIEW_PRIORITY = 100;
+
+    const PRIORITY_LEVELS = {
+        "fallback": Number.NEGATIVE_INFINITY,
+        "default": -100,
+        "none": 0,
+        "optional": DEFAULT_VIEW_PRIORITY,
+        "preferred": 1000,
+        "mandatory": Number.POSITIVE_INFINITY
+    };
+
     function TypeInspectorViewProvider(typeDefinition, openmct, convertToLegacyObject) {
         console.warn(`DEPRECATION WARNING: Migrate ${typeDefinition.key} from ${typeDefinition.bundle.path} to use the new Inspector View APIs.  Legacy Inspector view support will be removed soon.`);
         let representation = openmct.$injector.get('representations[]')

src/api/indicators/IndicatorAPISpec.js

@@ -29,7 +29,7 @@ define(
         MCT,
         MCTIndicators
     ) {
-        xdescribe("The Indicator API", function () {
+        describe("The Indicator API", function () {
             var openmct;
             var directive;
             var holderElement;

src/api/overlays/ProgressDialog.js

@@ -1,31 +1,25 @@
-import ProgressDialogComponent from './components/ProgressDialogComponent.vue';
+import ProgressComponent from '../../ui/components/ProgressBar.vue';
 import Overlay from './Overlay';
 import Vue from 'vue';
 
 var component;
 
 class ProgressDialog extends Overlay {
-    constructor({progressPerc, progressText, iconClass, message, title, hint, timestamp, ...options}) {
+    constructor({progressPerc, progressText, ...options}) {
+
         component = new Vue({
-            provide: {
-                iconClass,
-                message,
-                title,
-                hint,
-                timestamp
-            },
             components: {
-                ProgressDialogComponent: ProgressDialogComponent
+                ProgressComponent: ProgressComponent
             },
             data() {
                 return {
                     model: {
                         progressPerc: progressPerc || 0,
-                        progressText
+                        progressText: progressText
                     }
                 }
             },
-            template: '<progress-dialog-component :model="model"></progress-dialog-component>'
+            template: '<progress-component :model="model"></progress-component>'
         }).$mount();
 
         super({

src/api/overlays/components/DialogComponent.vue

@@ -20,12 +20,13 @@
                  v-if="message">
                 {{message}}
             </div>
-            <slot></slot>
         </div>
     </div>
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     @mixin legacyMessage() {
         flex: 0 1 auto;
         font-family: symbolsfont;
@@ -43,7 +44,7 @@
 
         &__icon {
             // Holds a background SVG graphic
-            $s: 80px;
+            $s: 50px;
             flex: 0 0 auto;
             min-width: $s;
             min-height: $s;
@@ -60,13 +61,9 @@
         }
 
         // __text elements
+        &__title,
         &__action-text {
-            font-size: 1.2em;
-        }
-
-        &__title {
-            font-size: 1.5em;
-            font-weight: bold;
+            font-size: 1.2em; // TEMP
         }
 
         &--simple {

src/api/overlays/components/OverlayComponent.vue

@@ -8,15 +8,12 @@
                 v-if="dismissable"
                 @click="destroy">
             </button>
-            <div class="c-overlay__contents" ref="element" tabindex="0"></div>
+            <div class="c-overlay__contents" ref="element"></div>
             <div class="c-overlay__button-bar" v-if="buttons">
                 <button class="c-button"
-                        tabindex="0"
-                        ref="buttons"
                         v-for="(button, index) in buttons"
                         :key="index"
-                        @focus="focusIndex=index"
-                        :class="{'c-button--major': focusIndex===index}"
+                        :class="{'c-button--major': button.emphasis}"
                         @click="buttonClickHandler(button.callback)">
                     {{button.label}}
                 </button>
@@ -26,6 +23,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     @mixin overlaySizing($marginTB: 5%, $marginLR: $marginTB, $width: auto, $height: auto) {
         position: absolute;
         top: $marginTB; right: $marginLR; bottom: $marginTB; left: $marginLR;
@@ -70,7 +69,6 @@
             flex: 1 1 auto;
             display: flex;
             flex-direction: column;
-            outline: none;
             overflow: hidden;
         }
 
@@ -173,19 +171,9 @@
 
 <script>
     export default {
-        data: function () {
-            return {
-                focusIndex: -1
-            };
-        },
         inject: ['dismiss', 'element', 'buttons', 'dismissable'],
         mounted() {
-            const element = this.$refs.element;
-            element.appendChild(this.element);
-            const elementForFocus = this.getElementForFocus() || element;
-            this.$nextTick(() => {
-                elementForFocus.focus();
-            });
+            this.$refs.element.appendChild(this.element);
         },
         methods: {
             destroy: function () {
@@ -196,25 +184,6 @@
             buttonClickHandler: function (method) {
                 method();
                 this.$emit('destroy');
-            },
-            getElementForFocus: function () {
-                const defaultElement = this.$refs.element;;
-                if (!this.$refs.buttons) {
-                    return defaultElement;
-                }
-
-                const focusButton = this.$refs.buttons.filter((button, index) => {
-                    if (this.buttons[index].emphasis) {
-                        this.focusIndex = index;
-                    }
-                    return this.buttons[index].emphasis;
-                });
-
-                if (!focusButton.length) {
-                    return defaultElement;
-                }
-
-                return focusButton[0];
             }
         }
     }

src/api/overlays/components/ProgressDialogComponent.vue

@@ -1,22 +0,0 @@
-<template>
-    <dialog-component>
-        <progress-component :model="model"></progress-component>
-    </dialog-component>
-</template>
-
-<style lang="scss">
-</style>
-
-<script>
-import ProgressComponent from '../../../ui/components/ProgressBar.vue';
-import DialogComponent from './DialogComponent.vue';
-
-export default {
-    components: {
-        DialogComponent: DialogComponent,
-        ProgressComponent: ProgressComponent,
-    },
-    inject:['iconClass', 'title', 'hint', 'timestamp', 'message'],
-    props:['model']
-}
-</script>

src/api/telemetry/TelemetryAPISpec.js

@@ -25,7 +25,7 @@ define([
 ], function (
     TelemetryAPI
 ) {
-    xdescribe('Telemetry API', function () {
+    describe('Telemetry API', function () {
         var openmct;
         var telemetryAPI;
         var mockTypeService;

src/plugins/LADTable/LADTableSetViewProvider.js

@@ -38,7 +38,7 @@ define([
             canEdit: function (domainObject) {
                 return domainObject.type === 'LadTableSet';
             },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                 let component;
 
                 return {

src/plugins/LADTable/LADTableViewProvider.js

@@ -38,7 +38,7 @@ define([
             canEdit: function (domainObject) {
                 return domainObject.type === 'LadTable';
             },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                 let component;
 
                 return {

src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -35,7 +35,7 @@ define(
     ) {
         var defaultAjaxFunction = $.ajax;
 
-        xdescribe("The URLIndicator", function () {
+        describe("The URLIndicator", function () {
             var openmct;
             var indicatorElement;
             var pluginOptions;

src/plugins/autoflow/AutoflowTabularPluginSpec.js

@@ -27,7 +27,7 @@ define([
     'zepto',
     './dom-observer'
 ], function (AutoflowTabularPlugin, AutoflowTabularConstants, MCT, $, DOMObserver) {
-    xdescribe("AutoflowTabularPlugin", function () {
+    describe("AutoflowTabularPlugin", function () {
         var testType;
         var testObject;
         var mockmct;

src/plugins/displayLayout/AlphanumericFormatViewProvider.js

@@ -46,7 +46,7 @@ define([
 
                 return selection.every(isTelemetryObject);
             },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                 let component;
                 return {
                     show: function (element) {

src/plugins/displayLayout/DisplayLayoutToolbar.js

@@ -20,7 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(['lodash'], function (_) {
+define([], function () {
+
     function DisplayLayoutToolbar(openmct) {
         return {
             name: "Display Layout Toolbar",
@@ -39,7 +40,7 @@ define(['lodash'], function (_) {
                 return (selectedParent && selectedParent.context.item && selectedParent.context.item.type === 'layout') ||
                     (selectedObject.context.item && selectedObject.context.item.type === 'layout');
             },
-            toolbar: function (selectedObjects) {
+            toolbar: function (selection) {
                 const DIALOG_FORM = {
                     'text': {
                         name: "Text Element Properties",
@@ -221,7 +222,7 @@ define(['lodash'], function (_) {
                             }
                         ],
                         method: function (option) {
-                            selectionPath[1].context.orderItem(option.value, getAllTypes(selectedObjects));
+                            selectionPath[1].context.orderItem(option.value, getAllTypes(selection));
                         }
                     };
                 }
@@ -440,11 +441,11 @@ define(['lodash'], function (_) {
                         return {
                             control: "select-menu",
                             domainObject: selectionPath[1].context.item,
-                            applicableSelectedItems: selection.filter(path => {
-                                return path[0].context.layoutItem.type === 'telemetry-view';
+                            applicableSelectedItems: selection.filter(selectionPath => {
+                                return selectionPath[0].context.layoutItem.type === 'telemetry-view';
                             }),
-                            property: function (path) {
-                                return getPath(path) + ".value";
+                            property: function (selectionPath) {
+                                return getPath(selectionPath) + ".value";
                             },
                             title: "Set value",
                             options: openmct.telemetry.getMetadata(selectionPath[0].context.item).values().map(value => {
@@ -499,8 +500,8 @@ define(['lodash'], function (_) {
                         !selectionPath[0].context.layoutItem;
                 }
 
-                if (isMainLayoutSelected(selectedObjects[0])) {
-                    return [getAddButton(selectedObjects)];
+                if (isMainLayoutSelected(selection[0])) {
+                    return [getAddButton(selection)];
                 }
 
                 let toolbar = {
@@ -516,145 +517,145 @@ define(['lodash'], function (_) {
                     'remove': []
                 };
 
-                selectedObjects.forEach(selectionPath => {
+                selection.forEach(selectionPath => {
                     let selectedParent = selectionPath[1].context.item;
                     let layoutItem = selectionPath[0].context.layoutItem;
 
                     if (layoutItem.type === 'subobject-view') {
                         if (toolbar['add-menu'].length === 0 && selectionPath[0].context.item.type === 'layout') {
-                            toolbar['add-menu'] = [getAddButton(selectedObjects, selectionPath)];
+                            toolbar['add-menu'] = [getAddButton(selection, selectionPath)];
                         }
                         if (toolbar['toggle-frame'].length === 0) {
-                            toolbar['toggle-frame'] = [getToggleFrameButton(selectedParent, selectedObjects)];
+                            toolbar['toggle-frame'] = [getToggleFrameButton(selectedParent, selection)];
                         }
                         if (toolbar.position.length === 0) {
                             toolbar.position = [
                                 getStackOrder(selectedParent, selectionPath),
-                                getXInput(selectedParent, selectedObjects),
-                                getYInput(selectedParent, selectedObjects),
-                                getHeightInput(selectedParent, selectedObjects),
-                                getWidthInput(selectedParent, selectedObjects)
+                                getXInput(selectedParent, selection),
+                                getYInput(selectedParent, selection),
+                                getHeightInput(selectedParent, selection),
+                                getWidthInput(selectedParent, selection)
                             ];
                         }
                         if (toolbar.remove.length === 0) {
-                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
+                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                         }
                     } else if (layoutItem.type === 'telemetry-view') {
                         if (toolbar['display-mode'].length === 0) {
-                            toolbar['display-mode'] = [getDisplayModeMenu(selectedParent, selectedObjects)];
+                            toolbar['display-mode'] = [getDisplayModeMenu(selectedParent, selection)];
                         }
                         if (toolbar['telemetry-value'].length === 0) {
-                            toolbar['telemetry-value'] = [getTelemetryValueMenu(selectionPath, selectedObjects)];
+                            toolbar['telemetry-value'] = [getTelemetryValueMenu(selectionPath, selection)];
                         }
                         if (toolbar.style.length < 2) {
                             toolbar.style = [
-                                getFillMenu(selectedParent, selectedObjects),
-                                getStrokeMenu(selectedParent, selectedObjects)
+                                getFillMenu(selectedParent, selection),
+                                getStrokeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar['text-style'].length === 0) {
                             toolbar['text-style'] = [
-                                getTextColorMenu(selectedParent, selectedObjects),
-                                getTextSizeMenu(selectedParent, selectedObjects)
+                                getTextColorMenu(selectedParent, selection),
+                                getTextSizeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar.position.length === 0) {
                             toolbar.position = [
                                 getStackOrder(selectedParent, selectionPath),
-                                getXInput(selectedParent, selectedObjects),
-                                getYInput(selectedParent, selectedObjects),
-                                getHeightInput(selectedParent, selectedObjects),
-                                getWidthInput(selectedParent, selectedObjects)
+                                getXInput(selectedParent, selection),
+                                getYInput(selectedParent, selection),
+                                getHeightInput(selectedParent, selection),
+                                getWidthInput(selectedParent, selection)
                             ];
                         }
                         if (toolbar.remove.length === 0) {
-                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
+                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                         }
                     } else if (layoutItem.type === 'text-view') {
                         if (toolbar.style.length < 2) {
                             toolbar.style = [
-                                getFillMenu(selectedParent, selectedObjects),
-                                getStrokeMenu(selectedParent, selectedObjects)
+                                getFillMenu(selectedParent, selection),
+                                getStrokeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar['text-style'].length === 0) {
                             toolbar['text-style'] = [
-                                getTextColorMenu(selectedParent, selectedObjects),
-                                getTextSizeMenu(selectedParent, selectedObjects)
+                                getTextColorMenu(selectedParent, selection),
+                                getTextSizeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar.position.length === 0) {
                             toolbar.position = [
                                 getStackOrder(selectedParent, selectionPath),
-                                getXInput(selectedParent, selectedObjects),
-                                getYInput(selectedParent, selectedObjects),
-                                getHeightInput(selectedParent, selectedObjects),
-                                getWidthInput(selectedParent, selectedObjects)
+                                getXInput(selectedParent, selection),
+                                getYInput(selectedParent, selection),
+                                getHeightInput(selectedParent, selection),
+                                getWidthInput(selectedParent, selection)
                             ];
                         }
                         if (toolbar.text.length === 0) {
-                            toolbar.text = [getTextButton(selectedParent, selectedObjects)];
+                            toolbar.text = [getTextButton(selectedParent, selection)];
                         }
                         if (toolbar.remove.length === 0) {
-                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
+                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                         }
                     } else if (layoutItem.type === 'box-view') {
                         if (toolbar.style.length < 2) {
                             toolbar.style = [
-                                getFillMenu(selectedParent, selectedObjects),
-                                getStrokeMenu(selectedParent, selectedObjects)
+                                getFillMenu(selectedParent, selection),
+                                getStrokeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar.position.length === 0) {
                             toolbar.position = [
                                 getStackOrder(selectedParent, selectionPath),
-                                getXInput(selectedParent, selectedObjects),
-                                getYInput(selectedParent, selectedObjects),
-                                getHeightInput(selectedParent, selectedObjects),
-                                getWidthInput(selectedParent, selectedObjects)
+                                getXInput(selectedParent, selection),
+                                getYInput(selectedParent, selection),
+                                getHeightInput(selectedParent, selection),
+                                getWidthInput(selectedParent, selection)
                             ];
                         }
                         if (toolbar.remove.length === 0) {
-                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
+                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                         }
                     } else if (layoutItem.type === 'image-view') {
                         if (toolbar.style.length === 0) {
                             toolbar.style = [
-                                getStrokeMenu(selectedParent, selectedObjects)
+                                getStrokeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar.position.length === 0) {
                             toolbar.position = [
                                 getStackOrder(selectedParent, selectionPath),
-                                getXInput(selectedParent, selectedObjects),
-                                getYInput(selectedParent, selectedObjects),
-                                getHeightInput(selectedParent, selectedObjects),
-                                getWidthInput(selectedParent, selectedObjects)
+                                getXInput(selectedParent, selection),
+                                getYInput(selectedParent, selection),
+                                getHeightInput(selectedParent, selection),
+                                getWidthInput(selectedParent, selection)
                             ];
                         }
                         if (toolbar.url.length === 0) {
-                            toolbar.url = [getURLButton(selectedParent, selectedObjects)];
+                            toolbar.url = [getURLButton(selectedParent, selection)];
                         }
                         if (toolbar.remove.length === 0) {
-                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
+                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                         }
                     } else if (layoutItem.type === 'line-view') {
                         if (toolbar.style.length === 0) {
                             toolbar.style = [
-                                getStrokeMenu(selectedParent, selectedObjects)
+                                getStrokeMenu(selectedParent, selection)
                             ];
                         }
                         if (toolbar.position.length === 0) {
                             toolbar.position = [
                                 getStackOrder(selectedParent, selectionPath),
-                                getXInput(selectedParent, selectedObjects),
-                                getYInput(selectedParent, selectedObjects),
-                                getX2Input(selectedParent, selectedObjects),
-                                getY2Input(selectedParent, selectedObjects)
+                                getXInput(selectedParent, selection),
+                                getYInput(selectedParent, selection),
+                                getX2Input(selectedParent, selection),
+                                getY2Input(selectedParent, selection)
                             ];
                         }
                         if (toolbar.remove.length === 0) {
-                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
+                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)];
                         }
                     }
                 });

src/plugins/displayLayout/components/BoxView.vue

@@ -32,6 +32,8 @@
  </template>
 
 <style lang="scss">
+    @import '~styles/sass-base';
+
     .c-box-view {
         display: flex;
         align-items: stretch;

src/plugins/displayLayout/components/DisplayLayout.vue

@@ -60,6 +60,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     @mixin displayMarquee($c) {
         > .c-frame-edit {
             // All other frames

src/plugins/displayLayout/components/EditMarquee.vue

@@ -35,6 +35,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     .c-frame-edit {
         // In Layouts, this is the editing rect and handles
         display: none; // Set to display: block in DisplayLayout.vue

src/plugins/displayLayout/components/ImageView.vue

@@ -32,6 +32,7 @@
  </template>
 
 <style lang="scss">
+    @import '~styles/sass-base';
 
     .c-image-view {
         background-size: cover;

src/plugins/displayLayout/components/LayoutFrame.vue

@@ -37,6 +37,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     /******************* FRAME */
     .c-frame {
         display: flex;

src/plugins/displayLayout/components/TelemetryView.vue

@@ -45,6 +45,7 @@
  </template>
 
 <style lang="scss">
+    @import '~styles/sass-base';
 
     .c-telemetry-view {
         display: flex;

src/plugins/displayLayout/components/TextView.vue

@@ -33,6 +33,7 @@
  </template>
 
 <style lang="scss">
+    @import '~styles/sass-base';
 
     .c-text-view {
         display: flex;

src/plugins/displayLayout/plugin.js

@@ -37,7 +37,7 @@ export default function DisplayLayoutPlugin(options) {
             canEdit: function (domainObject) {
                 return domainObject.type === 'layout';
             },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                 let component;
                 return {
                     show(container) {

src/plugins/filters/components/FiltersView.vue

@@ -20,6 +20,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     .c-inspector {
         .c-filter-indication {
             border-radius: $smallCr;

src/plugins/filters/components/GlobalFilters.vue

@@ -26,7 +26,9 @@
     </li>
 </template>
 
-<style lang="scss">    .c-filter-indication {
+<style lang="scss">
+    @import "~styles/sass-base";
+    .c-filter-indication {
         // Appears as a block element beneath tables
         @include userSelectNone();
         background: $colorFilterBg;
@@ -51,7 +53,6 @@
         &__filter-indicator {
             color: $colorFilter;
             width: 1.2em; // Set width explicitly for layout reasons: will either have class icon-filter, or none.
-            flex: 0 0 auto;
         }
     }
 </style>
@@ -130,4 +131,4 @@
             }
         }
     }
-</script>
+</script>

src/plugins/flexibleLayout/components/flexibleLayout.vue

@@ -85,6 +85,7 @@
 </template>
 
 <style lang="scss">
+    @import '~styles/sass-base';
     
     @mixin containerGrippy($headerSize, $dir) {
         position: absolute;

src/plugins/folderView/components/GridItem.vue

@@ -23,6 +23,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     /******************************* GRID ITEMS */
     .c-grid-item {
         // Mobile-first

src/plugins/folderView/components/GridView.vue

@@ -9,6 +9,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     /******************************* GRID VIEW */
     .l-grid-view {
         display: flex;

src/plugins/folderView/components/ListItem.vue

@@ -15,6 +15,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     /******************************* LIST ITEM */
     .c-list-item {
         &__name a {

src/plugins/folderView/components/ListView.vue

@@ -53,6 +53,8 @@
 </template>
 
 <style lang="scss">
+    @import "~styles/sass-base";
+
     /******************************* LIST VIEW */
     .c-list-view {
         overflow-x: auto !important;

src/plugins/notebook/src/controllers/NotebookController.js

@@ -83,7 +83,7 @@ function (
             mounted: self.focusOnEntry
         };
 
-        var NotebookVue = Vue.extend({
+        var notebookVue = Vue.extend({
             template: NotebookTemplate,
             provide: {openmct: self.openmct, domainObject: self.domainObject},
             components: {
@@ -114,7 +114,7 @@ function (
             }
         });
 
-        this.NotebookVue =  new NotebookVue();
+        this.NotebookVue =  new notebookVue();
         container.appendChild(this.NotebookVue.$mount().$el);
     };
 

src/plugins/objectMigration/Migrations.js

@@ -63,10 +63,10 @@ define([
 
             Object.keys(panels).forEach(key => {
                 let panel = panels[key];
-                let childDomainObject = childObjects[key];
+                let domainObject = childObjects[key];
                 let identifier = undefined;
 
-                if (isTelemetry(childDomainObject)) {
+                if (isTelemetry(domainObject)) {
                     // If object is a telemetry point, convert it to a plot and
                     // replace the object in migratedObject composition with the plot.
                     identifier = {
@@ -75,19 +75,19 @@ define([
                     };
                     let plotObject = {
                         identifier: identifier,
-                        location: childDomainObject.location,
-                        name: childDomainObject.name,
+                        location: domainObject.location,
+                        name: domainObject.name,
                         type: "telemetry.plot.overlay"
                     };
                     let plotType = openmct.types.get('telemetry.plot.overlay');
                     plotType.definition.initialize(plotObject);
-                    plotObject.composition.push(childDomainObject.identifier);
+                    plotObject.composition.push(domainObject.identifier);
                     openmct.objects.mutate(plotObject, 'persisted', Date.now());
 
-                    let keyString = openmct.objects.makeKeyString(childDomainObject.identifier);
+                    let keyString = openmct.objects.makeKeyString(domainObject.identifier);
                     let clonedComposition = Object.assign([], migratedObject.composition);
-                    clonedComposition.forEach((objIdentifier, index) => {
-                        if (openmct.objects.makeKeyString(objIdentifier) === keyString) {
+                    clonedComposition.forEach((identifier, index) => {
+                        if (openmct.objects.makeKeyString(identifier) === keyString) {
                             migratedObject.composition[index] = plotObject.identifier;
                         }
                     });
@@ -98,7 +98,7 @@ define([
                     height: panel.dimensions[1],
                     x: panel.position[0],
                     y: panel.position[1],
-                    identifier: identifier || childDomainObject.identifier,
+                    identifier: identifier || domainObject.identifier,
                     id: uuid(),
                     type: 'subobject-view',
                     hasFrame: panel.hasFrame

src/plugins/plot/res/templates/mct-plot.html

@@ -20,97 +20,92 @@
  at runtime from the About dialog for additional information.
 -->
 <div class="gl-plot plot-legend-{{legend.get('position')}} {{legend.get('expanded')? 'plot-legend-expanded' : 'plot-legend-collapsed'}}">
-    <div class="c-plot-legend gl-plot-legend"
+    <div class="gl-plot-legend"
          ng-class="{ 'hover-on-plot': !!highlights.length }"
          ng-show="legend.get('position') !== 'hidden'">
-        <div class="c-plot-legend__view-control gl-plot-legend__view-control c-disclosure-triangle is-enabled"
+        <div class="gl-plot-legend__view-control c-disclosure-triangle is-enabled"
             ng-class="{ 'c-disclosure-triangle--expanded': legend.get('expanded') }"
             ng-click="legend.set('expanded', !legend.get('expanded'));">
         </div>
 
-        <div class="c-plot-legend__wrapper">
+        <!-- COLLAPSED PLOT LEGEND -->
+        <div class="plot-wrapper-collapsed-legend">
+            <div class="plot-legend-item"
+                  ng-repeat="series in series track by $index">
+                <div class="plot-series-swatch-and-name">
+                    <span class="plot-series-color-swatch"
+                          ng-style="{ 'background-color': series.get('color').asHexString() }">
+                    </span>
+                    <span class="plot-series-name">{{ series.get('name') }}</span>
+                </div>
+                <div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}"
+                     ng-class="{ 'cursor-hover': (legend.get('valueToShowWhenCollapsed').indexOf('nearest') != -1) }"
+                     ng-show="!!highlights.length && legend.get('valueToShowWhenCollapsed') !== 'none'">
+                    {{ legend.get('valueToShowWhenCollapsed') === 'nearestValue' ?
+                        series.formatY(series.closest) :
+                        legend.get('valueToShowWhenCollapsed') === 'nearestTimestamp' ?
+                             series.closest && series.formatX(series.closest) :
+                             series.formatY(series.get('stats')[legend.get('valueToShowWhenCollapsed') + 'Point']);
+                    }}
+                </div>
+            </div>
+        </div>
 
-            <!-- COLLAPSED PLOT LEGEND -->
-            <div class="plot-wrapper-collapsed-legend"
-                 ng-class="{'icon-cursor-lock': !!lockHighlightPoint}">
-                <div class="plot-legend-item"
-                      ng-repeat="series in series track by $index">
-                    <div class="plot-series-swatch-and-name">
+        <!-- EXPANDED PLOT LEGEND -->
+        <div class="plot-wrapper-expanded-legend">
+            <table>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th ng-if="legend.get('showTimestampWhenExpanded')">
+                            Timestamp
+                        </th>
+                        <th ng-if="legend.get('showValueWhenExpanded')">
+                            Value
+                        </th>
+                        <th ng-if="legend.get('showMinimumWhenExpanded')"
+                            class="mobile-hide">
+                            Min
+                        </th>
+                        <th ng-if="legend.get('showMaximumWhenExpanded')"
+                            class="mobile-hide">
+                            Max
+                        </th>
+                    </tr>
+                </thead>
+                <tr ng-repeat="series in series" class="plot-legend-item">
+                    <td class="plot-series-swatch-and-name">
                         <span class="plot-series-color-swatch"
                               ng-style="{ 'background-color': series.get('color').asHexString() }">
                         </span>
                         <span class="plot-series-name">{{ series.get('name') }}</span>
-                    </div>
-                    <div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}"
-                         ng-class="{ 'cursor-hover': (legend.get('valueToShowWhenCollapsed').indexOf('nearest') != -1) }"
-                         ng-show="!!highlights.length && legend.get('valueToShowWhenCollapsed') !== 'none'">
-                        {{ legend.get('valueToShowWhenCollapsed') === 'nearestValue' ?
-                            series.formatY(series.closest) :
-                            legend.get('valueToShowWhenCollapsed') === 'nearestTimestamp' ?
-                                 series.closest && series.formatX(series.closest) :
-                                 series.formatY(series.get('stats')[legend.get('valueToShowWhenCollapsed') + 'Point']);
-                        }}
-                    </div>
-                </div>
-            </div>
+                    </td>
 
-            <!-- EXPANDED PLOT LEGEND -->
-            <div class="plot-wrapper-expanded-legend">
-                <table>
-                    <thead>
-                        <tr>
-                            <th>Name</th>
-                            <th ng-if="legend.get('showTimestampWhenExpanded')">
-                                Timestamp
-                            </th>
-                            <th ng-if="legend.get('showValueWhenExpanded')">
-                                Value
-                            </th>
-                            <th ng-if="legend.get('showMinimumWhenExpanded')"
-                                class="mobile-hide">
-                                Min
-                            </th>
-                            <th ng-if="legend.get('showMaximumWhenExpanded')"
-                                class="mobile-hide">
-                                Max
-                            </th>
-                        </tr>
-                    </thead>
-                    <tr ng-repeat="series in series" class="plot-legend-item">
-                        <td class="plot-series-swatch-and-name"
-                            ng-class="{'icon-cursor-lock': !!lockHighlightPoint}">
-                            <span class="plot-series-color-swatch"
-                                  ng-style="{ 'background-color': series.get('color').asHexString() }">
-                            </span>
-                            <span class="plot-series-name">{{ series.get('name') }}</span>
-                        </td>
-
-                        <td ng-if="legend.get('showTimestampWhenExpanded')">
-                            <span class="plot-series-value cursor-hover hover-value-enabled">
-                                {{ series.closest && series.formatX(series.closest) }}
-                            </span>
-                        </td>
-                        <td ng-if="legend.get('showValueWhenExpanded')">
-                            <span class="plot-series-value cursor-hover hover-value-enabled"
-                                  ng-class="series.closest.mctLimitState.cssClass">
-                                {{ series.formatY(series.closest) }}
-                            </span>
-                        </td>
-                        <td ng-if="legend.get('showMinimumWhenExpanded')"
-                            class="mobile-hide">
-                            <span class="plot-series-value">
-                                {{ series.formatY(series.get('stats').minPoint) }}
-                            </span>
-                        </td>
-                        <td ng-if="legend.get('showMaximumWhenExpanded')"
-                            class="mobile-hide">
-                            <span class="plot-series-value">
-                                {{ series.formatY(series.get('stats').maxPoint) }}
-                            </span>
-                        </td>
-                    </tr>
-                </table>
-            </div>
+                    <td ng-if="legend.get('showTimestampWhenExpanded')">
+                        <span class="plot-series-value cursor-hover hover-value-enabled">
+                            {{ series.closest && series.formatX(series.closest) }}
+                        </span>
+                    </td>
+                    <td ng-if="legend.get('showValueWhenExpanded')">
+                        <span class="plot-series-value cursor-hover hover-value-enabled"
+                              ng-class="series.closest.mctLimitState.cssClass">
+                            {{ series.formatY(series.closest) }}
+                        </span>
+                    </td>
+                    <td ng-if="legend.get('showMinimumWhenExpanded')"
+                        class="mobile-hide">
+                        <span class="plot-series-value">
+                            {{ series.formatY(series.get('stats').minPoint) }}
+                        </span>
+                    </td>
+                    <td ng-if="legend.get('showMaximumWhenExpanded')"
+                        class="mobile-hide">
+                        <span class="plot-series-value">
+                            {{ series.formatY(series.get('stats').maxPoint) }}
+                        </span>
+                    </td>
+                </tr>
+            </table>
         </div>
     </div>
 
@@ -122,7 +117,7 @@
 
             <div class="gl-plot-label gl-plot-y-label"
                 ng-class="{'icon-gear': (yKeyOptions.length > 1 && series.length === 1)}"
-                >{{yAxis.get('label')}}
+                ng-bind="yAxisLabel">
             </div>
 
             <select  class="gl-plot-y-label__select local-controls--hidden"
@@ -137,7 +132,7 @@
             
 
             <mct-ticks axis="yAxis">
-                <div ng-repeat="tick in ticks track by tick.value"
+                <div ng-repeat="tick in ticks track by tick.text"
                      class="gl-plot-tick gl-plot-y-tick-label"
                      ng-style="{ top: (100 * (max - tick.value) / interval) + '%' }"
                      title="{{:: tick.fullText || tick.text }}"
@@ -150,14 +145,9 @@
              ng-style="{
                      left: (tickWidth + 30) + 'px'
                  }">
-            <div class="l-state-indicators">
-                <span class="l-state-indicators__alert-no-lad t-object-alert t-alert-unsynced icon-alert-triangle"
-                      title="This plot is not currently displaying the latest data. Reset pan/zoom to view latest data."></span>
-                <span class="l-state-indicators__alert-cursor-lock icon-cursor-lock"
-                      title="Telemetry point selection is locked. Click anywhere in the plot to unlock."
-                      ng-if="lockHighlightPoint"></span>
-            </div>
-
+            <span class="t-object-alert t-alert-unsynced"
+                  title="This plot is not currently displaying the latest data.
+                Reset Pan/zoom to return to view latest data."></span>
             <div class="gl-plot-display-area has-local-controls has-cursor-guides">
                 <mct-ticks axis="xAxis">
                     <div class="gl-plot-hash hash-v"
@@ -217,9 +207,13 @@
                 </div>
             </div>
 
-            <div class="gl-plot-axis-area gl-plot-x">
+            <div class="gl-plot-axis-area gl-plot-x"
+                 ng-style="{
+                     left: (tickWidth - 30) + 'px'
+                 }">
+
                 <mct-ticks axis="xAxis">
-                     <div ng-repeat="tick in ticks track by tick.value"
+                     <div ng-repeat="tick in ticks track by tick.text"
                           class="gl-plot-tick gl-plot-x-tick-label"
                           ng-style="{
                               left: (100 * (tick.value - min) / interval) + '%'

src/plugins/plot/src/configuration/PlotSeries.js

@@ -140,8 +140,7 @@ define([
          * @returns {Promise}
          */
         fetch: function (options) {
-            const strategy = options.shouldUseMinMax ? 'minMax' : undefined;
-            options = _.extend({}, { size: 1000, strategy, filters: this.filters }, options || {});
+            options = _.extend({}, {size: 1000, strategy: 'minmax', filters: this.filters}, options || {});
             if (!this.unsubscribe) {
                 this.unsubscribe = this.openmct
                     .telemetry
@@ -161,7 +160,7 @@ define([
                     var newPoints = _(this.data)
                         .concat(points)
                         .sortBy(this.getXVal)
-                        .uniq(true, point => [this.getXVal(point), this.getYVal(point)].join())
+                        .uniq(true, this.getXVal)
                         .value();
                     this.reset(newPoints);
                 }.bind(this));

src/plugins/plot/src/configuration/XAxisModel.js

@@ -31,7 +31,6 @@ define([
     var XAxisModel = Model.extend({
         initialize: function (options) {
             this.plot = options.plot;
-            this.set('label', options.model.name || '');
             this.on('change:range', function (newValue, oldValue, model) {
                 if (!model.get('frozen')) {
                     model.set('displayRange', newValue);

src/plugins/plot/src/plot/MCTPlotController.js

@@ -65,7 +65,6 @@ define([
         }
         this.$canvas = this.$element.find('canvas');
 
-        this.listenTo(this.$canvas, 'click', this.onMouseClick, this);
         this.listenTo(this.$canvas, 'mousemove', this.trackMousePosition, this);
         this.listenTo(this.$canvas, 'mouseleave', this.untrackMousePosition, this);
         this.listenTo(this.$canvas, 'mousedown', this.onMouseDown, this);
@@ -76,7 +75,6 @@ define([
     MCTPlotController.prototype.initialize = function () {
         this.$canvas = this.$element.find('canvas');
 
-        this.listenTo(this.$canvas, 'click', this.onMouseClick, this);
         this.listenTo(this.$canvas, 'mousemove', this.trackMousePosition, this);
         this.listenTo(this.$canvas, 'mouseleave', this.untrackMousePosition, this);
         this.listenTo(this.$canvas, 'mousedown', this.onMouseDown, this);
@@ -208,30 +206,9 @@ define([
         this.highlightValues(point);
     };
 
-    MCTPlotController.prototype.onMouseClick = function ($event) {
-        const isClick = this.isMouseClick();
-        if (this.pan) {
-            this.endPan($event);
-        }
-        if (this.marquee) {
-            this.endMarquee($event);
-        }
-        this.$scope.$apply();
-
-        if (!this.$scope.highlights.length || !isClick) {
-            return;
-        }
-
-        this.$scope.lockHighlightPoint = !this.$scope.lockHighlightPoint;
-    };
-
     MCTPlotController.prototype.highlightValues = function (point) {
         this.highlightPoint = point;
         this.$scope.$emit('plot:highlight:update', point);
-        if (this.$scope.lockHighlightPoint) {
-            return;
-        }
-
         if (!point) {
             this.$scope.highlights = [];
             this.$scope.series.map(function (series) {
@@ -272,17 +249,14 @@ define([
     MCTPlotController.prototype.onMouseUp = function ($event) {
         this.stopListening(this.$window, 'mouseup', this.onMouseUp, this);
         this.stopListening(this.$window, 'mousemove', this.trackMousePosition, this);
-    };
-
-    MCTPlotController.prototype.isMouseClick = function () {
-        if (!this.marquee) {
-            return;
+        if (this.pan) {
+            this.endPan($event);
         }
-
-        const { start, end } = this.marquee;
-
-        return start.x === end.x && start.y === end.y;
-    }
+        if (this.marquee) {
+            this.endMarquee($event);
+        }
+        this.$scope.$apply();
+    };
 
     MCTPlotController.prototype.updateMarquee = function () {
         if (!this.marquee) {
@@ -552,7 +526,6 @@ define([
 
         if (yAxisObject) {
             series.emit('change:yKey', yAxisObject.key);
-            this.config.yAxis.set('label', label);
             this.$scope.yAxisLabel = label;
         }
     };

src/plugins/plot/src/telemetry/PlotController.js

@@ -102,8 +102,7 @@ define([
         this.startLoading();
         var options = {
             size: this.$element[0].offsetWidth,
-            domain: this.config.xAxis.get('key'),
-            shouldUseMinMax: this.shouldUseMinMax(series)
+            domain: this.config.xAxis.get('key')
         };
 
         series.load(options)
@@ -134,11 +133,6 @@ define([
         this.listenTo(series, 'change:yKey', function () {
             this.loadSeriesData(series);
         }, this);
-
-        this.listenTo(series, 'change:interpolate', function () {
-            this.loadSeriesData(series);
-        }, this);
-
         this.loadSeriesData(series);
     };
 
@@ -161,10 +155,6 @@ define([
         return config;
     };
 
-    PlotController.prototype.shouldUseMinMax = function (series) {
-        return series.model.interpolate !== 'none';
-    };
-
     PlotController.prototype.onTimeSystemChange = function (timeSystem) {
         this.config.xAxis.set('key', timeSystem.key);
     };

src/plugins/plugins.js

@@ -22,7 +22,6 @@
 
 define([
     'lodash',
-    './themes/plugin',
     './utcTimeSystem/plugin',
     './localTimeSystem/plugin',
     '../../example/generator/plugin',
@@ -48,7 +47,6 @@ define([
     './clearData/plugin'
 ], function (
     _,
-    ThemesPlugin,
     UTCTimeSystem,
     LocalTimeSystem,
     GeneratorPlugin,
@@ -75,8 +73,7 @@ define([
 ) {
     var bundleMap = {
         LocalStorage: 'platform/persistence/local',
-        MyItems: 'platform/features/my-items',
-        CouchDB: 'platform/persistence/couch'
+        MyItems: 'platform/features/my-items'
     };
 
     var plugins = _.mapValues(bundleMap, function (bundleName, pluginName) {
@@ -87,7 +84,6 @@ define([
         };
     });
 
-    plugins.Themes = ThemesPlugin.default;
     plugins.UTCTimeSystem = UTCTimeSystem;
     plugins.LocalTimeSystem = LocalTimeSystem;
 

src/plugins/summaryWidget/src/Condition.js

@@ -180,7 +180,7 @@ define([
 
         inputArea.html('');
         this.valueInputs = [];
-        this.config.values = this.config.values || [];
+        this.config.values = [];
 
         if (evaluator.getInputCount(operation)) {
             inputCount = evaluator.getInputCount(operation);
@@ -191,10 +191,8 @@ define([
                     newInput = $('<select>' + this.generateSelectOptions() + '</select>');
                     emitChange = true;
                 } else {
-                    const defaultValue = inputType === 'number' ? 0 : '';
-                    const value = this.config.values[index] || defaultValue;
-                    this.config.values[index] = value;
-                    newInput = $('<input type = "' + inputType + '" value = "' + value + '"></input>');
+                    this.config.values[index] = inputType === 'number' ? 0 : '';
+                    newInput = $('<input type = "' + inputType + '" value = "' + this.config.values[index] + '"> </input>');
                 }
 
                 this.valueInputs.push(newInput.get(0));

src/plugins/summaryWidget/src/SummaryWidget.js

@@ -215,7 +215,9 @@ define([
      * Update the widget's appearance from the configuration of the active rule
      */
     SummaryWidget.prototype.updateWidget = function () {
-        const WIDGET_ICON_CLASS = 'c-sw__icon js-sw__icon';
+        const WIDGET_CLASS = 'c-sw js-sw',
+            WIDGET_LABEL_CLASS = 'c-sw__label js-sw__label',
+            WIDGET_ICON_CLASS = 'c-sw__icon js-sw__icon';
         var activeRule = this.rulesById[this.activeId];
         this.applyStyle($('#widget', this.domElement), activeRule.getProperty('style'));
         $('#widget', this.domElement).prop('title', activeRule.getProperty('message'));
@@ -250,8 +252,8 @@ define([
         ruleOrder.push(ruleId);
         this.domainObject.configuration.ruleOrder = ruleOrder;
 
-        this.initRule(ruleId, 'Rule');
         this.updateDomainObject();
+        this.initRule(ruleId, 'Rule');
         this.refreshRules();
     };
 
@@ -279,8 +281,8 @@ define([
         ruleOrder.splice(ruleOrder.indexOf(sourceRuleId) + 1, 0, ruleId);
         this.domainObject.configuration.ruleOrder = ruleOrder;
         this.domainObject.configuration.ruleConfigById[ruleId] = sourceConfig;
-        this.initRule(ruleId, sourceConfig.name);
         this.updateDomainObject();
+        this.initRule(ruleId, sourceConfig.name);
         this.refreshRules();
     };
 

src/plugins/summaryWidget/src/telemetry/SummaryWidgetTelemetryProviderSpec.js

@@ -1,32 +1,10 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, 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.
- *****************************************************************************/
-
 define([
     './SummaryWidgetTelemetryProvider'
 ], function (
     SummaryWidgetTelemetryProvider
 ) {
 
-    xdescribe('SummaryWidgetTelemetryProvider', function () {
+    describe('SummaryWidgetTelemetryProvider', function () {
         var telemObjectA;
         var telemObjectB;
         var summaryWidgetObject;

src/plugins/summaryWidget/test/ConditionManagerSpec.js

@@ -1,27 +1,5 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, 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.
- *****************************************************************************/
-
 define(['../src/ConditionManager'], function (ConditionManager) {
-    xdescribe('A Summary Widget Condition Manager', function () {
+    describe('A Summary Widget Condition Manager', function () {
         var conditionManager,
             mockDomainObject,
             mockCompObject1,

src/plugins/summaryWidget/test/ConditionSpec.js

@@ -1,27 +1,5 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, 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.
- *****************************************************************************/
-
 define(['../src/Condition', 'zepto'], function (Condition, $) {
-    xdescribe('A summary widget condition', function () {
+    describe('A summary widget condition', function () {
         var testCondition,
             mockConfig,
             mockConditionManager,

src/plugins/summaryWidget/test/SummaryWidgetSpec.js

@@ -1,27 +1,5 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, 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.
- *****************************************************************************/
-
 define(['../src/SummaryWidget', 'zepto'], function (SummaryWidget, $) {
-    xdescribe('The Summary Widget', function () {
+    describe('The Summary Widget', function () {
         var summaryWidget,
             mockDomainObject,
             mockOldDomainObject,

src/plugins/tabs/components/tabs.vue

@@ -42,6 +42,8 @@
 </template>
 
 <style lang="scss">
+    @import '~styles/sass-base.scss';
+
     .c-tabs-view {
         $h: 20px;
         @include abs();

src/plugins/telemetryTable/TelemetryTable.js

@@ -190,7 +190,6 @@ define([
         clearData() {
             this.filteredRows.clear();
             this.boundedRows.clear();
-            this.emit('refresh');
         }
 
         getColumnMapForObject(objectKeyString) {

src/plugins/telemetryTable/TelemetryTableViewProvider.js

@@ -48,7 +48,7 @@ define([
             canEdit(domainObject) {
                 return domainObject.type === 'table';
             },
-            view(domainObject, objectPath) {
+            view(domainObject, isEditing, objectPath) {
                 let table = new TelemetryTable(domainObject, openmct);
                 let component;
                 return {

src/plugins/telemetryTable/collections/FilteredTableRowCollection.js

@@ -86,18 +86,15 @@ define(
              */
             matchesFilters(row) {
                 let doesMatchFilters = true;
-                Object.keys(this.columnFilters).forEach((key) => {
-                    if (!doesMatchFilters || !this.rowHasColumn(row, key)) {
+                for (const key in this.columnFilters) {
+                    if (!this.rowHasColumn(row, key)) {
                         return false;
+                    } else {
+                        let formattedValue = row.getFormattedValue(key).toLowerCase();
+                        doesMatchFilters = doesMatchFilters &&
+                            formattedValue.indexOf(this.columnFilters[key]) !== -1;
                     }
-
-                    let formattedValue = row.getFormattedValue(key);
-                    if (formattedValue === undefined) {
-                        return false;
-                    }
-
-                    doesMatchFilters = formattedValue.toLowerCase().indexOf(this.columnFilters[key]) !== -1;
-                });
+                }
                 return doesMatchFilters;
             }
 

src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue

@@ -11,7 +11,9 @@
     </div>
 </template>
 
-<style lang="scss">    .c-filter-indication {
+<style lang="scss">
+    @import "~styles/sass-base";
+    .c-filter-indication {
         @include userSelectNone();
         background: $colorFilterBg;
         color: $colorFilterFg;

src/plugins/telemetryTable/components/table-row.vue

@@ -169,7 +169,7 @@ export default {
         rowOffset: 'calculateRowTop',
         row: {
             handler: 'formatRow',
-            deep: true
+            deep: false
         }
     },
     components: {