Removing star listeners

* Push test

* Enhance plot legend placement for #2486

- Left and right legends now maintain position when expanded;

* Update index.html

- Remove erroneously committed temp change ;

app.js

@@ -16,7 +16,7 @@ const request = require('request');
 
 // Defaults
 options.port = options.port || options.p || 8080;
-options.host = options.host || options.h || 'localhost'
+options.host = options.host || options.h || 'localhost';
 options.directory = options.directory || options.D || '.';
 
 // Show command line options
@@ -46,7 +46,7 @@ webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
 webpackConfig.plugins.push(function() { this.plugin('watch-run', function(watching, callback) { console.log('Begin compile at ' + new Date()); callback(); }) });
 
 webpackConfig.entry.openmct = [
-    'webpack-hot-middleware/client',
+    'webpack-hot-middleware/client?reload=true',
     webpackConfig.entry.openmct
 ];
 

copyright-notice.html

@@ -18,9 +18,4 @@
  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.
--->
-<div
-	class="l-fixed-position-box"
-	ng-style="{ background: ngModel.fill(), border: '1px ' + ngModel.stroke() + ' solid' }"
-	>
-</div>
+-->

copyright-notice.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2015, 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.
  *
@@ -18,7 +18,4 @@
  * 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.
- *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
-@import "bourbon";
-@import "notebook-base";
+ *****************************************************************************/

example/eventGenerator/bundle.js

@@ -49,7 +49,7 @@ define([
                 {
                     "key": "eventGenerator",
                     "name": "Event Message Generator",
-                    "cssClass": "icon-folder-new",
+                    "cssClass": "icon-generator-events",
                     "description": "For development use. Creates sample event message data that mimics a live data stream.",
                     "priority": 10,
                     "features": "creation",

example/generator/GeneratorMetadataProvider.js

@@ -99,10 +99,10 @@ define([
 
     GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
         return _.extend(
-                {},
-                domainObject.telemetry,
-                METADATA_BY_TYPE[domainObject.type]
-            );
+            {},
+            domainObject.telemetry,
+            METADATA_BY_TYPE[domainObject.type]
+        );
     };
 
     return GeneratorMetadataProvider;

example/generator/SinewaveLimitProvider.js

@@ -37,25 +37,25 @@ define([
         },
         LIMITS = {
             rh: {
-                cssClass: "s-limit-upr s-limit-red",
+                cssClass: "is-limit--upr is-limit--red",
                 low: RED,
                 high: Number.POSITIVE_INFINITY,
                 name: "Red High"
             },
             rl: {
-                cssClass: "s-limit-lwr s-limit-red",
+                cssClass: "is-limit--lwr is-limit--red",
                 high: -RED,
                 low: Number.NEGATIVE_INFINITY,
                 name: "Red Low"
             },
             yh: {
-                cssClass: "s-limit-upr s-limit-yellow",
+                cssClass: "is-limit--upr is-limit--yellow",
                 low: YELLOW,
                 high: RED,
                 name: "Yellow High"
             },
             yl: {
-                cssClass: "s-limit-lwr s-limit-yellow",
+                cssClass: "is-limit--lwr is-limit--yellow",
                 low: -RED,
                 high: -YELLOW,
                 name: "Yellow Low"

example/generator/plugin.js

@@ -38,20 +38,19 @@ define([
         openmct.types.addType("example.state-generator", {
             name: "State Generator",
             description: "For development use.  Generates test enumerated telemetry by cycling through a given set of states",
-            cssClass: "icon-telemetry",
+            cssClass: "icon-generator-telemetry",
             creatable: true,
             form: [
                 {
                     name: "State Duration (seconds)",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "duration",
                     required: true,
                     property: [
                         "telemetry",
                         "duration"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 }
             ],
             initialize: function (object) {
@@ -66,7 +65,7 @@ define([
         openmct.types.addType("generator", {
             name: "Sine Wave Generator",
             description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-            cssClass: "icon-telemetry",
+            cssClass: "icon-generator-telemetry",
             creatable: true,
             form: [
                 {

example/notifications/bundle.js

@@ -26,12 +26,16 @@ define([
     "./src/NotificationLaunchController",
     "./src/DialogLaunchIndicator",
     "./src/NotificationLaunchIndicator",
+    "./res/dialog-launch.html",
+    "./res/notification-launch.html",
     'legacyRegistry'
 ], function (
     DialogLaunchController,
     NotificationLaunchController,
     DialogLaunchIndicator,
     NotificationLaunchIndicator,
+    DialogLaunch,
+    NotificationLaunch,
     legacyRegistry
 ) {
     "use strict";
@@ -41,11 +45,11 @@ define([
             "templates": [
                 {
                     "key": "dialogLaunchTemplate",
-                    "templateUrl": "dialog-launch.html"
+                    "template": DialogLaunch
                 },
                 {
                     "key": "notificationLaunchTemplate",
-                    "templateUrl": "notification-launch.html"
+                    "template": NotificationLaunch
                 }
             ],
             "controllers": [

example/notifications/res/dialog-launch.html

@@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="DialogLaunchController">
     <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="ls-indicator icon-box-with-arrow s-status-available"><span class="label">
-        <a ng-click="launchProgress(true)">Known</a>
-        <a ng-click="launchProgress(false)">Unknown</a>
-        <a ng-click="launchError()">Error</a>
-        <a ng-click="launchInfo()">Info</a>
+    <div class="c-indicator c-indicator--clickable icon-box-with-arrow s-status-available"><span class="label c-indicator__label">
+        <button ng-click="launchProgress(true)">Known</button>
+        <button ng-click="launchProgress(false)">Unknown</button>
+        <button ng-click="launchError()">Error</button>
+        <button ng-click="launchInfo()">Info</button>
     </span></div>
 </span>

example/notifications/res/notification-launch.html

@@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="NotificationLaunchController">
     <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="ls-indicator icon-bell s-status-available"><span class="label">
-        <a ng-click="newInfo()">Success</a>
-        <a ng-click="newError()">Error</a>
-        <a ng-click="newAlert()">Alert</a>
-        <a ng-click="newProgress()">Progress</a>
+    <div class="c-indicator c-indicator--clickable icon-bell s-status-available"><span class="label c-indicator__label">
+        <button ng-click="newInfo()">Success</button>
+        <button ng-click="newError()">Error</button>
+        <button ng-click="newAlert()">Alert</button>
+        <button ng-click="newProgress()">Progress</button>
     </span></div>
 </span>

example/notifications/src/NotificationLaunchController.js

@@ -51,76 +51,26 @@ define(
                 return actionTexts[Math.floor(Math.random()*3)];
             }
 
-            function getExampleActions() {
-                var actions = [
-                    {
-                        label: "Try Again",
-                        callback: function () {
-                            $log.debug("Try Again pressed");
-                        }
-                    },
-                    {
-                        label: "Remove",
-                        callback: function () {
-                            $log.debug("Remove pressed");
-                        }
-                    },
-                    {
-                        label: "Cancel",
-                        callback: function () {
-                            $log.debug("Cancel pressed");
-                        }
-                    }
-                ];
-
-                // Randomly remove some actions off the top; leave at least one
-                actions.splice(0,Math.floor(Math.random() * actions.length));
-
-                return actions;
-            }
-
-            function getExampleSeverity() {
-                var severities = [
-                    "info",
-                    "alert",
-                    "error"
-                ];
-                return severities[Math.floor(Math.random() * severities.length)];
-            }
-
             /**
              * Launch a new notification with a severity level of 'Error'.
              */
-            $scope.newError = function(){
-
+            $scope.newError = function () {
                 notificationService.notify({
                     title: "Example error notification " + messageCounter++,
                     hint: "An error has occurred",
-                    severity: "error",
-                    primaryOption: {
-                        label: 'Retry',
-                        callback: function() {
-                            $log.info('Retry clicked');
-                        }
-                    },
-                    options: getExampleActions()});
+                    severity: "error"
+                });
             };
             /**
              * Launch a new notification with a severity of 'Alert'.
              */
-            $scope.newAlert = function(){
-
+            $scope.newAlert = function () {
                 notificationService.notify({
                     title: "Alert notification " + (messageCounter++),
                     hint: "This is an alert message",
                     severity: "alert",
-                    primaryOption: {
-                        label: 'Retry',
-                        callback: function() {
-                            $log.info('Retry clicked');
-                        }
-                    },
-                    options: getExampleActions()});
+                    autoDismiss: true
+                });
             };
 
 
@@ -128,39 +78,42 @@ define(
              * Launch a new notification with a progress bar that is updated
              * periodically, tracking an ongoing process.
              */
-            $scope.newProgress = function(){
-
+            $scope.newProgress = function () {
+                let progress = 0;
                 var notificationModel = {
                     title: "Progress notification example",
                     severity: "info",
-                    progress: 0,
-                    actionText: getExampleActionText(),
-                    unknownProgress: false
+                    progress: progress,
+                    actionText: getExampleActionText()
                 };
+                let notification;
 
                 /**
                  * Simulate an ongoing process and update the progress bar.
                  * @param notification
                  */
-                function incrementProgress(notificationModel) {
-                    notificationModel.progress = Math.min(100, Math.floor(notificationModel.progress + Math.random() * 30));
-                    notificationModel.progressText = ["Estimated time" +
+                function incrementProgress() {
+                    progress = Math.min(100, Math.floor(progress + Math.random() * 30))
+                    let progressText = ["Estimated time" +
                     " remaining:" +
-                    " about ", 60 - Math.floor((notificationModel.progress / 100) * 60), " seconds"].join(" ");
-                    if (notificationModel.progress < 100) {
-                        $timeout(function(){incrementProgress(notificationModel);}, 1000);
+                    " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
+                    notification.progress(progress, progressText);
+
+                    if (progress < 100) {
+                        $timeout(function () {
+                            incrementProgress(notificationModel);
+                        }, 1000);
                     }
                 }
 
-                notificationService.notify(notificationModel);
-                incrementProgress(notificationModel);
+                notification = notificationService.notify(notificationModel);
+                incrementProgress();
             };
 
             /**
              * Launch a new notification with severity level of INFO.
              */
-            $scope.newInfo = function(){
-
+            $scope.newInfo = function () {
                 notificationService.info({
                     title: "Example Info notification " + messageCounter++
                 });

index.html

@@ -27,16 +27,16 @@
         <meta name="apple-mobile-web-app-capable" content="yes">
         <title></title>
         <script src="dist/openmct.js"></script>
-        <link rel="stylesheet" href="dist/openmct.css">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
-        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
     </head>
     <body>
     </body>
     <script>
-        var THIRTY_MINUTES = 30 * 60 * 1000;
+        const FIVE_MINUTES = 5 * 60 * 1000;
+        const THIRTY_MINUTES = 30 * 60 * 1000;
+
         [
             'example/eventGenerator',
             'example/styleguide'
@@ -48,10 +48,12 @@
         openmct.install(openmct.plugins.Generator());
         openmct.install(openmct.plugins.ExampleImagery());
         openmct.install(openmct.plugins.UTCTimeSystem());
-        openmct.install(openmct.plugins.ImportExport());
         openmct.install(openmct.plugins.AutoflowView({
             type: "telemetry.panel"
         }));
+        openmct.install(openmct.plugins.DisplayLayout({
+            showAsView: ['summary-widget', 'example.imagery']
+        }));
         openmct.install(openmct.plugins.Conductor({
             menuOptions: [
                 {
@@ -67,16 +69,18 @@
                     timeSystem: 'utc',
                     clock: 'local',
                     clockOffsets: {
-                        start: -25 * 60 * 1000,
-                        end: 5 * 60 * 1000
+                        start: - THIRTY_MINUTES,
+                        end: FIVE_MINUTES
                     }
                 }
             ]
         }));
         openmct.install(openmct.plugins.SummaryWidget());
         openmct.install(openmct.plugins.Notebook());
-        openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
-        openmct.time.timeSystem('utc');
+        openmct.install(openmct.plugins.LADTable());
+        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
+        openmct.install(openmct.plugins.ObjectMigration());
+        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
         openmct.start();
     </script>
 </html>

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,11 +50,17 @@ module.exports = (config) => {
             'coverage',
             'html'
         ],
-        browsers: ['ChromeHeadless'],
+        browsers: browsers,
+        customLaunchers: {
+            ChromeDebugging: {
+                base: 'Chrome',
+                flags: ['--remote-debugging-port=9222'],
+                debug: true
+            }
+        },
         colors: true,
         logLevel: config.LOG_INFO,
         autoWatch: true,
-
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
@@ -66,22 +72,18 @@ module.exports = (config) => {
                 }
             }
         },
-
         // HTML test reporting.
         htmlReporter: {
             outputDir: "dist/reports/tests",
             preserveDescribeNesting: true,
             foldAll: false
         },
-
         preprocessors: {
             // add webpack as preprocessor
-            'platform/**/*Spec.js': [ 'webpack' ],
-            'src/**/*Spec.js': [ 'webpack' ]
+            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
+            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
         },
-
         webpack: webpackConfig,
-
         webpackMiddleware: {
             stats: 'errors-only',
             logLevel: 'warn'
@@ -89,4 +91,3 @@ 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,BUILD_CONSTANTS*/
+/*global module*/
 
 const matcher = /\/openmct.js$/;
 if (document.currentScript) {

package.json

@@ -1,9 +1,10 @@
 {
   "name": "openmct",
-  "version": "0.14.0-SNAPSHOT",
+  "version": "1.0.0-beta",
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
+    "acorn": "6.2.0",
     "angular": "1.4.14",
     "angular-route": "1.4.14",
     "babel-eslint": "8.2.6",
@@ -25,7 +26,7 @@
     "eventemitter3": "^1.2.0",
     "exports-loader": "^0.7.0",
     "express": "^4.13.1",
-    "fast-sass-loader": "^1.4.5",
+    "fast-sass-loader": "1.4.6",
     "file-loader": "^1.1.11",
     "file-saver": "^1.3.8",
     "git-rev-sync": "^1.4.0",
@@ -42,6 +43,7 @@
     "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",
@@ -55,10 +57,9 @@
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.9.2",
     "painterro": "^0.2.65",
-    "printj": "^1.1.0",
+    "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
-    "screenfull": "^3.3.2",
     "split": "^1.0.0",
     "style-loader": "^0.21.0",
     "v8-compile-cache": "^1.1.0",
@@ -79,6 +80,7 @@
     "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,50 +21,30 @@
  *****************************************************************************/
 
 define([
-    "./src/BrowseController",
-    "./src/PaneController",
-    "./src/InspectorPaneController",
-    "./src/BrowseObjectController",
-    "./src/MenuArrowController",
-    "./src/ObjectHeaderController",
     "./src/navigation/NavigationService",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
     "./src/windowing/NewTabAction",
-    "./src/windowing/FullscreenAction",
-    "./src/windowing/WindowTitler",
     "./res/templates/browse.html",
     "./res/templates/browse-object.html",
-    "./res/templates/items/grid-item.html",
     "./res/templates/browse/object-header.html",
     "./res/templates/browse/object-header-frame.html",
     "./res/templates/menu-arrow.html",
     "./res/templates/back-arrow.html",
-    "./res/templates/items/items.html",
     "./res/templates/browse/object-properties.html",
     "./res/templates/browse/inspector-region.html",
     'legacyRegistry'
 ], function (
-    BrowseController,
-    PaneController,
-    InspectorPaneController,
-    BrowseObjectController,
-    MenuArrowController,
-    ObjectHeaderController,
     NavigationService,
     NavigateAction,
     OrphanNavigationHandler,
     NewTabAction,
-    FullscreenAction,
-    WindowTitler,
     browseTemplate,
     browseObjectTemplate,
-    gridItemTemplate,
     objectHeaderTemplate,
     objectHeaderFrameTemplate,
     menuArrowTemplate,
     backArrowTemplate,
-    itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
     legacyRegistry
@@ -81,70 +61,6 @@ 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",
@@ -156,19 +72,6 @@ define([
                         "view"
                     ]
                 },
-                {
-                    "key": "grid-item",
-                    "template": gridItemTemplate,
-                    "uses": [
-                        "type",
-                        "action",
-                        "location"
-                    ],
-                    "gestures": [
-                        "info",
-                        "menu"
-                    ]
-                },
                 {
                     "key": "object-header",
                     "template": objectHeaderTemplate,
@@ -242,41 +145,9 @@ define([
                     "group": "windowing",
                     "cssClass": "icon-new-window",
                     "priority": "preferred"
-                },
-                {
-                    "key": "fullscreen",
-                    "implementation": FullscreenAction,
-                    "category": "view-control",
-                    "group": "windowing",
-                    "priority": "default"
-                }
-            ],
-            "views": [
-                {
-                    "key": "items",
-                    "name": "Grid",
-                    "cssClass": "icon-thumbs-strip",
-                    "description": "Grid of available items",
-                    "template": itemsTemplate,
-                    "uses": [
-                        "composition"
-                    ],
-                    "gestures": [
-                        "drop"
-                    ],
-                    "type": "folder",
-                    "editable": false
                 }
             ],
             "runs": [
-                {
-                    "implementation": WindowTitler,
-                    "depends": [
-                        "navigationService",
-                        "$rootScope",
-                        "$document"
-                    ]
-                },
                 {
                     "implementation": OrphanNavigationHandler,
                     "depends": [
@@ -299,18 +170,6 @@ define([
                     key: "inspectorRegion",
                     template: inspectorRegionTemplate
                 }
-            ],
-            "licenses": [
-                {
-                    "name": "screenfull.js",
-                    "version": "1.2.0",
-                    "description": "Wrapper for cross-browser usage of fullscreen API",
-                    "author": "Sindre Sorhus",
-                    "website": "https://github.com/sindresorhus/screenfull.js/",
-                    "copyright": "Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
-                    "license": "license-mit",
-                    "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
-                }
             ]
         }
     });

platform/commonUI/browse/res/templates/items/grid-item.html

@@ -1,45 +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.
--->
-<!-- For selected, add class 'selected' to outer div -->
-<div class='item grid-item' ng-click='action.perform("navigate")'>
-    <div class='contents abs'>
-        <div class='top-bar bar abs'>
-            <span class='icon-people' title='Shared'></span>
-            <mct-representation class="desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
-        </div>
-        <div class='item-main abs lg'>
-            <span class="t-item-icon" ng-class="{ 'l-icon-link':location.isLink() }">
-                <span class="t-item-icon-glyph ng-binding {{type.getCssClass()}}"></span>
-            </span>
-            <div class='abs item-open icon-pointer-right'></div>
-        </div>
-        <div class='bottom-bar bar abs'>
-            <div class='title'>{{model.name}}</div>
-            <div class='details'>
-                <span>{{type.getName()}}</span>
-                <span ng-show="model.composition !== undefined">
-                    - {{model.composition.length}} Item<span ng-show="model.composition.length > 1">s</span>
-                </span>
-            </div>
-        </div>
-    </div>
-</div>

platform/commonUI/browse/res/templates/items/items.html

@@ -1,27 +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.
--->
-<div class='items-holder grid abs'>
-    <mct-representation key="'grid-item'"
-                        ng-repeat="childObject in composition"
-                        mct-object="childObject">
-    </mct-representation>
-</div>

platform/commonUI/browse/src/BrowseController.js

@@ -1,215 +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.
- *****************************************************************************/
-
-/**
- * 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

@@ -1,72 +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.
- *****************************************************************************/
-
-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

@@ -1,78 +0,0 @@
-/*****************************************************************************
- * 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

@@ -1,59 +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.
- *****************************************************************************/
-
-/**
- * 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

@@ -1,92 +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.
- *****************************************************************************/
-
-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

@@ -1,88 +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.
- *****************************************************************************/
-
-
-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/src/navigation/OrphanNavigationHandler.js

@@ -58,7 +58,7 @@ define([], function () {
 
         function checkNavigation() {
             var navigatedObject = navigationService.getNavigation();
-            if (navigatedObject.hasCapability('context')) {
+            if (navigatedObject && navigatedObject.hasCapability('context')) {
                 if (!navigatedObject.getCapability('editor').isEditContextRoot()) {
                     preventOrphanNavigation(navigatedObject);
                 }

platform/commonUI/browse/src/windowing/FullscreenAction.js

@@ -1,64 +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.
- *****************************************************************************/
-
-/**
- * Module defining FullscreenAction. Created by vwoeltje on 11/18/14.
- */
-define(
-    ["screenfull"],
-    function (screenfull) {
-
-        var ENTER_FULLSCREEN = "Enter full screen mode",
-            EXIT_FULLSCREEN = "Exit full screen mode";
-
-        /**
-         * The fullscreen action toggles between fullscreen display
-         * and regular in-window display.
-         * @memberof platform/commonUI/browse
-         * @constructor
-         * @implements {Action}
-         */
-        function FullscreenAction(context) {
-            this.context = context;
-        }
-
-        FullscreenAction.prototype.perform = function () {
-            screenfull.toggle();
-        };
-
-        FullscreenAction.prototype.getMetadata = function () {
-            // We override getMetadata, because the icon cssClass and
-            // description need to be determined at run-time
-            // based on whether or not we are currently
-            // full screen.
-            var metadata = Object.create(FullscreenAction);
-            metadata.cssClass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
-            metadata.description = screenfull.isFullscreen ?
-                EXIT_FULLSCREEN : ENTER_FULLSCREEN;
-            metadata.group = "windowing";
-            metadata.context = this.context;
-            return metadata;
-        };
-
-        return FullscreenAction;
-    }
-);

platform/commonUI/browse/src/windowing/WindowTitler.js

@@ -1,51 +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.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Updates the title of the current window to reflect the name
-         * of the currently navigated-to domain object.
-         * @memberof platform/commonUI/browse
-         * @constructor
-         */
-        function WindowTitler(navigationService, $rootScope, $document) {
-            // Look up name of the navigated domain object...
-            function getNavigatedObjectName() {
-                var navigatedObject = navigationService.getNavigation();
-                return navigatedObject && navigatedObject.getModel().name;
-            }
-
-            // Set the window title...
-            function setTitle(name) {
-                $document[0].title = name;
-            }
-
-            // Watch the former, and invoke the latter
-            $rootScope.$watch(getNavigatedObjectName, setTitle);
-        }
-
-        return WindowTitler;
-    }
-);

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -1,266 +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 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

@@ -1,93 +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.
- *****************************************************************************/
-
-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

@@ -1,103 +0,0 @@
-/*****************************************************************************
- * 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

@@ -1,79 +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.
- *****************************************************************************/
-
-/**
- * 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

@@ -1,137 +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.
- *****************************************************************************/
-
-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

@@ -1,106 +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.
- *****************************************************************************/
-
-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/browse/test/windowing/FullscreenActionSpec.js

@@ -1,59 +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.
- *****************************************************************************/
-
-/**
- * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/windowing/FullscreenAction", "screenfull"],
-    function (FullscreenAction, screenfull) {
-
-        describe("The fullscreen action", function () {
-            var action,
-                oldToggle;
-
-            beforeEach(function () {
-                // Screenfull is not shimmed or injected, so
-                // we need to spy on it in the global scope.
-                oldToggle = screenfull.toggle;
-
-                screenfull.toggle = jasmine.createSpy("toggle");
-
-                action = new FullscreenAction({});
-            });
-
-            afterEach(function () {
-                screenfull.toggle = oldToggle;
-            });
-
-            it("toggles fullscreen mode when performed", function () {
-                action.perform();
-                expect(screenfull.toggle).toHaveBeenCalled();
-            });
-
-            it("provides displayable metadata", function () {
-                expect(action.getMetadata().cssClass).toBeDefined();
-            });
-
-        });
-    }
-);

platform/commonUI/browse/test/windowing/WindowTitlerSpec.js

@@ -1,78 +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.
- *****************************************************************************/
-
-/**
- * WindowTitlerSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/windowing/WindowTitler"],
-    function (WindowTitler) {
-
-        describe("The window titler", function () {
-            var mockNavigationService,
-                mockRootScope,
-                mockDocument,
-                mockDomainObject,
-                titler; // eslint-disable-line
-
-            beforeEach(function () {
-                mockNavigationService = jasmine.createSpyObj(
-                    'navigationService',
-                    ['getNavigation']
-                );
-                mockRootScope = jasmine.createSpyObj(
-                    '$rootScope',
-                    ['$watch']
-                );
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    ['getModel']
-                );
-                mockDocument = [{}];
-
-                mockDomainObject.getModel.and.returnValue({ name: 'Test name' });
-                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
-
-                titler = new WindowTitler(
-                    mockNavigationService,
-                    mockRootScope,
-                    mockDocument
-                );
-            });
-
-            it("listens for changes to the name of the navigated object", function () {
-                expect(mockRootScope.$watch).toHaveBeenCalledWith(
-                    jasmine.any(Function),
-                    jasmine.any(Function)
-                );
-                expect(mockRootScope.$watch.calls.mostRecent().args[0]())
-                    .toEqual('Test name');
-            });
-
-            it("sets the title to the name of the navigated object", function () {
-                mockRootScope.$watch.calls.mostRecent().args[1]("Some name");
-                expect(mockDocument[0].title).toEqual("Some name");
-            });
-
-        });
-    }
-);

platform/commonUI/dialog/bundle.js

@@ -28,6 +28,7 @@ define([
     "./res/templates/dialog.html",
     "./res/templates/overlay-blocking-message.html",
     "./res/templates/message.html",
+    "./res/templates/notification-message.html",
     "./res/templates/overlay-message-list.html",
     "./res/templates/overlay.html",
     'legacyRegistry'
@@ -39,6 +40,7 @@ define([
     dialogTemplate,
     overlayBlockingMessageTemplate,
     messageTemplate,
+    notificationMessageTemplate,
     overlayMessageListTemplate,
     overlayTemplate,
     legacyRegistry
@@ -63,7 +65,8 @@ define([
                     "depends": [
                         "$document",
                         "$compile",
-                        "$rootScope"
+                        "$rootScope",
+                        "$timeout"
                     ]
                 }
             ],
@@ -88,6 +91,10 @@ define([
                     "key": "message",
                     "template": messageTemplate
                 },
+                {
+                    "key": "notification-message",
+                    "template": notificationMessageTemplate
+                },
                 {
                     "key": "overlay-message-list",
                     "template": overlayMessageListTemplate

platform/commonUI/dialog/res/templates/dialog.html

@@ -19,24 +19,24 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="abs top-bar">
-    <div class="dialog-title">{{ngModel.title}}</div>
-    <div class="hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
+<div class="c-overlay__top-bar">
+    <div class="c-overlay__dialog-title">{{ngModel.title}}</div>
+    <div class="c-overlay__dialog-hint hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
 </div>
-<div class='abs editor'>
+<div class='c-overlay__contents-main'>
     <mct-form ng-model="ngModel.value"
               structure="ngModel.structure"
               class="validates"
               name="createForm">
     </mct-form>
 </div>
-<div class="abs bottom-bar">
-    <a class='s-button major'
+<div class="c-overlay__button-bar">
+    <a class='c-button c-button--major'
        ng-class="{ disabled: !createForm.$valid }"
        ng-click="ngModel.confirm()">
         OK
     </a>
-    <a class='s-button'
+    <a class='c-button  '
        ng-click="ngModel.cancel()">
         Cancel
     </a>

platform/commonUI/dialog/res/templates/message.html

@@ -1,10 +1,10 @@
-<div class="l-message"
+<div class="c-message"
      ng-class="'message-severity-' + ngModel.severity">
     <div class="w-message-contents">
-        <div class="top-bar">
-            <div class="title">{{ngModel.title}}</div>
+        <div class="c-message__top-bar">
+            <div class="c-message__title">{{ngModel.title}}</div>
         </div>
-        <div class="hint" ng-hide="ngModel.hint === undefined">
+        <div class="c-message__hint" ng-hide="ngModel.hint === undefined">
             {{ngModel.hint}}
             <span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
         </div>
@@ -16,17 +16,17 @@
                          ng-model="ngModel"
                          ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
         </div>
-        <div class="bottom-bar">
-            <a ng-repeat="dialogOption in ngModel.options"
-               class="s-button"
+        <div class="c-overlay__button-bar">
+            <button ng-repeat="dialogOption in ngModel.options"
+               class="c-button"
                ng-click="dialogOption.callback()">
                 {{dialogOption.label}}
-            </a>
-            <a class="s-button major"
+            </button>
+            <button class="c-button c-button--major"
                ng-if="ngModel.primaryOption"
                ng-click="ngModel.primaryOption.callback()">
                 {{ngModel.primaryOption.label}}
-            </a>
+            </button>
         </div>
     </div>
-</div>
+</div>

platform/commonUI/dialog/res/templates/notification-message.html

@@ -0,0 +1,25 @@
+<div class="c-message"
+     ng-class="'message-severity-' + ngModel.severity">
+    <div class="w-message-contents">
+        <div class="c-message__top-bar">
+            <div class="c-message__title">{{ngModel.message}}</div>
+        </div>
+        <div class="message-body">
+            <mct-include key="'progress-bar'"
+                         ng-model="ngModel"
+                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
+        </div>
+    </div>
+    <div class="c-overlay__button-bar">
+        <button ng-repeat="dialogOption in ngModel.options"
+                class="c-button"
+                ng-click="dialogOption.callback()">
+            {{dialogOption.label}}
+        </button>
+        <button class="c-button c-button--major"
+                ng-if="ngModel.primaryOption"
+                ng-click="ngModel.primaryOption.callback()">
+            {{ngModel.primaryOption.label}}
+        </button>
+    </div>
+</div>

platform/commonUI/dialog/res/templates/overlay-message-list.html

@@ -1,22 +1,23 @@
 <mct-container key="overlay">
-    <div class="t-message-list">
-        <div class="top-bar">
-            <div class="dialog-title">{{ngModel.dialog.title}}</div>
-            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1 ||
-                                                                                                  ngModel.dialog.messages.length == 0">s</span>
+    <div class="t-message-list c-overlay__contents">
+        <div class="c-overlay__top-bar">
+            <div class="c-overlay__dialog-title">{{ngModel.dialog.title}}</div>
+            <div class="c-overlay__dialog-hint">Displaying {{ngModel.dialog.messages.length}} message<span
+                    ng-show="ngModel.dialog.messages.length > 1 ||
+                            ngModel.dialog.messages.length == 0">s</span>
             </div>
         </div>
-        <div class="w-messages">
+        <div class="w-messages c-overlay__messages">
             <mct-include
                 ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                key="'message'" ng-model="msg.model"></mct-include>
+                key="'notification-message'" ng-model="msg.model"></mct-include>
         </div>
-        <div class="bottom-bar">
-            <a ng-repeat="dialogAction in ngModel.dialog.actions"
-               class="s-button major"
+        <div class="c-overlay__bottom-bar">
+            <button ng-repeat="dialogAction in ngModel.dialog.actions"
+               class="c-button c-button--major"
                ng-click="dialogAction.action()">
                 {{dialogAction.label}}
-            </a>
+            </button>
         </div>
     </div>
 </mct-container>

platform/commonUI/dialog/res/templates/overlay-options.html

@@ -19,18 +19,18 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<mct-container key="overlay">
-    <div class="abs top-bar">
-        <div class="dialog-title">{{ngModel.dialog.title}}</div>
-        <div class="hint">{{ngModel.dialog.hint}}</div>
+<mct-container key="c-overlay__contents">
+    <div class=c-overlay__top-bar">
+        <div class="c-overlay__dialog-title">{{ngModel.dialog.title}}</div>
+        <div class="c-overlay__dialog-hint hint">{{ngModel.dialog.hint}}</div>
     </div>
-    <div class='abs editor'>
+    <div class='c-overlay__contents-main'>
         <mct-include key="ngModel.dialog.template"
                      parameters="ngModel.dialog.parameters"
                      ng-model="ngModel.dialog.model">
         </mct-include>
     </div>
-    <div class="abs bottom-bar">
+    <div class="c-overlay__button-bar">
         <a ng-repeat="option in ngModel.dialog.options"
            href=''
            class="s-button lg"

platform/commonUI/dialog/res/templates/overlay.html

@@ -19,12 +19,12 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="abs overlay l-dialog" ng-class="{'delayEntry100ms' : ngModel.delay}">
-    <div class="abs blocker"></div>
-    <div class="abs outer-holder">
-        <a ng-click="ngModel.cancel()"
+<div class="c-overlay l-overlay-small" ng-class="{'delayEntry100ms' : ngModel.delay}">
+    <div class="c-overlay__blocker"></div>
+    <div class="c-overlay__outer">
+        <button ng-click="ngModel.cancel()"
            ng-if="ngModel.cancel"
-           class="close icon-x-in-circle"></a>
-        <div class="abs inner-holder contents" ng-transclude></div>
+           class="c-click-icon c-overlay__close-button icon-x-in-circle"></button>
+        <div class="c-overlay__contents" ng-transclude></div>
     </div>
 </div>

platform/commonUI/dialog/src/OverlayService.js

@@ -44,8 +44,9 @@ define(
          * @memberof platform/commonUI/dialog
          * @constructor
          */
-        function OverlayService($document, $compile, $rootScope) {
+        function OverlayService($document, $compile, $rootScope, $timeout) {
             this.$compile = $compile;
+            this.$timeout = $timeout;
 
             // Don't include $document and $rootScope directly;
             // avoids https://docs.angularjs.org/error/ng/cpws
@@ -93,9 +94,14 @@ define(
             scope.key = key;
             scope.typeClass = typeClass || 't-dialog';
 
-            // Create the overlay element and add it to the document's body
-            element = this.$compile(TEMPLATE)(scope);
-            this.findBody().prepend(element);
+            this.$timeout(() => {
+                // Create the overlay element and add it to the document's body
+                element = this.$compile(TEMPLATE)(scope);
+
+                // Append so that most recent dialog is last in DOM. This means the most recent dialog will be on top when
+                // multiple overlays with the same z-index are active.
+                this.findBody().append(element);
+            });
 
             return {
                 dismiss: dismiss

platform/commonUI/dialog/test/OverlayServiceSpec.js

@@ -35,16 +35,20 @@ define(
                 mockTemplate,
                 mockElement,
                 mockScope,
+                mockTimeout,
                 overlayService;
 
             beforeEach(function () {
                 mockDocument = jasmine.createSpyObj("$document", ["find"]);
                 mockCompile = jasmine.createSpy("$compile");
                 mockRootScope = jasmine.createSpyObj("$rootScope", ["$new"]);
-                mockBody = jasmine.createSpyObj("body", ["prepend"]);
+                mockBody = jasmine.createSpyObj("body", ["append"]);
                 mockTemplate = jasmine.createSpy("template");
                 mockElement = jasmine.createSpyObj("element", ["remove"]);
                 mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
+                mockTimeout = function (callback) {
+                    callback();
+                }
 
                 mockDocument.find.and.returnValue(mockBody);
                 mockCompile.and.returnValue(mockTemplate);
@@ -54,7 +58,8 @@ define(
                 overlayService = new OverlayService(
                     mockDocument,
                     mockCompile,
-                    mockRootScope
+                    mockRootScope,
+                    mockTimeout
                 );
             });
 
@@ -67,7 +72,7 @@ define(
 
             it("adds the templated element to the body", function () {
                 overlayService.createOverlay("test", {});
-                expect(mockBody.prepend).toHaveBeenCalledWith(mockElement);
+                expect(mockBody.append).toHaveBeenCalledWith(mockElement);
             });
 
             it("places the provided model/key in its template's scope", function () {

platform/commonUI/edit/bundle.js

@@ -23,21 +23,15 @@
 define([
     "./src/controllers/EditActionController",
     "./src/controllers/EditPanesController",
-    "./src/controllers/ElementsController",
     "./src/controllers/EditObjectController",
     "./src/actions/EditAndComposeAction",
     "./src/actions/EditAction",
     "./src/actions/PropertiesAction",
-    "./src/actions/RemoveAction",
     "./src/actions/SaveAction",
     "./src/actions/SaveAndStopEditingAction",
     "./src/actions/SaveAsAction",
     "./src/actions/CancelAction",
-    "./src/policies/EditActionPolicy",
     "./src/policies/EditPersistableObjectsPolicy",
-    "./src/policies/EditableLinkPolicy",
-    "./src/policies/EditableMovePolicy",
-    "./src/policies/EditContextualActionPolicy",
     "./src/representers/EditRepresenter",
     "./src/capabilities/EditorCapability",
     "./src/capabilities/TransactionCapabilityDecorator",
@@ -47,7 +41,6 @@ define([
     "./src/creation/LocatorController",
     "./src/creation/CreationPolicy",
     "./src/creation/CreateActionProvider",
-    "./src/creation/AddActionProvider",
     "./src/creation/CreationService",
     "./res/templates/create/locator.html",
     "./res/templates/create/create-button.html",
@@ -55,27 +48,20 @@ define([
     "./res/templates/library.html",
     "./res/templates/edit-object.html",
     "./res/templates/edit-action-buttons.html",
-    "./res/templates/elements.html",
     "./res/templates/topbar-edit.html",
     'legacyRegistry'
 ], function (
     EditActionController,
     EditPanesController,
-    ElementsController,
     EditObjectController,
     EditAndComposeAction,
     EditAction,
     PropertiesAction,
-    RemoveAction,
     SaveAction,
     SaveAndStopEditingAction,
     SaveAsAction,
     CancelAction,
-    EditActionPolicy,
     EditPersistableObjectsPolicy,
-    EditableLinkPolicy,
-    EditableMovePolicy,
-    EditContextualActionPolicy,
     EditRepresenter,
     EditorCapability,
     TransactionCapabilityDecorator,
@@ -85,7 +71,6 @@ define([
     LocatorController,
     CreationPolicy,
     CreateActionProvider,
-    AddActionProvider,
     CreationService,
     locatorTemplate,
     createButtonTemplate,
@@ -93,7 +78,6 @@ define([
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
-    elementsTemplate,
     topbarEditTemplate,
     legacyRegistry
 ) {
@@ -115,14 +99,6 @@ define([
                         "$scope"
                     ]
                 },
-                {
-                    "key": "ElementsController",
-                    "implementation": ElementsController,
-                    "depends": [
-                        "$scope",
-                        "openmct"
-                    ]
-                },
                 {
                     "key": "EditObjectController",
                     "implementation": EditObjectController,
@@ -180,18 +156,6 @@ define([
                         "dialogService"
                     ]
                 },
-                {
-                    "key": "remove",
-                    "category": "contextual",
-                    "implementation": RemoveAction,
-                    "cssClass": "icon-trash",
-                    "name": "Remove",
-                    "description": "Remove this object from its containing object.",
-                    "depends": [
-                        "dialogService",
-                        "navigationService"
-                    ]
-                },
                 {
                     "key": "save-and-stop-editing",
                     "category": "save",
@@ -225,10 +189,10 @@ define([
                     "description": "Save changes made to these objects.",
                     "depends": [
                         "$injector",
-                        "policyService",
                         "dialogService",
                         "copyService",
-                        "notificationService"
+                        "notificationService",
+                        "openmct"
                     ],
                     "priority": "mandatory"
                 },
@@ -245,28 +209,11 @@ define([
                 }
             ],
             "policies": [
-                {
-                    "category": "action",
-                    "implementation": EditActionPolicy
-                },
                 {
                     "category": "action",
                     "implementation": EditPersistableObjectsPolicy,
                     "depends": ["openmct"]
                 },
-                {
-                    "category": "action",
-                    "implementation": EditContextualActionPolicy,
-                    "depends": ["navigationService", "editModeBlacklist", "nonEditContextBlacklist"]
-                },
-                {
-                    "category": "action",
-                    "implementation": EditableMovePolicy
-                },
-                {
-                    "category": "action",
-                    "implementation": EditableLinkPolicy
-                },
                 {
                     "implementation": CreationPolicy,
                     "category": "creation"
@@ -296,13 +243,6 @@ define([
                         "action"
                     ]
                 },
-                {
-                    "key": "edit-elements",
-                    "template": elementsTemplate,
-                    "gestures": [
-                        "drop"
-                    ]
-                },
                 {
                     "key": "topbar-edit",
                     "template": topbarEditTemplate
@@ -319,12 +259,6 @@ define([
                     ]
                 }
             ],
-            "templates": [
-                {
-                    key: "elementsPool",
-                    template: elementsTemplate
-                }
-            ],
             "components": [
                 {
                     "type": "decorator",
@@ -356,18 +290,6 @@ define([
                         "policyService"
                     ]
                 },
-                {
-                    "key": "AddActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": AddActionProvider,
-                    "depends": [
-                        "$q",
-                        "typeService",
-                        "dialogService",
-                        "policyService"
-                    ]
-                },
                 {
                     "key": "CreationService",
                     "provides": "creationService",
@@ -388,16 +310,6 @@ define([
                     ]
                 }
             ],
-            "constants": [
-                {
-                    "key": "editModeBlacklist",
-                    "value": ["copy", "follow", "link", "locate"]
-                },
-                {
-                    "key": "nonEditContextBlacklist",
-                    "value": ["copy", "follow", "properties", "move", "link", "remove", "locate"]
-                }
-            ],
             "capabilities": [
                 {
                     "key": "editor",
@@ -405,7 +317,8 @@ define([
                     "description": "Provides transactional editing capabilities",
                     "implementation": EditorCapability,
                     "depends": [
-                        "transactionService"
+                        "transactionService",
+                        "openmct"
                     ]
                 }
             ],

platform/commonUI/edit/res/templates/elements.html

@@ -1,49 +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.
--->
-<div ng-controller="ElementsController" class="flex-elem l-flex-col holder grows">
-    <mct-include key="'input-filter'"
-                 class="flex-elem holder"
-                 ng-model="filterBy">
-    </mct-include>
-    <div class="flex-elem grows vscroll scroll-pad">
-        <ul class="tree" id="inspector-elements-tree"
-            ng-if="composition.length > 0">
-            <li ng-repeat="containedObject in composition | filter:searchElements">
-                <span class="tree-item">
-                    <span class="grippy-sm"
-                          ng-if="composition.length > 1"
-                          data-id="{{ containedObject.id }}"
-                          mct-drag-down="dragDown($event)"
-                          mct-drag="drag($event)"
-                          mct-drag-up="dragUp($event)">
-                    </span>
-                    <mct-representation
-                            class="rep-object-label"
-                            key="'label'"
-                            mct-object="containedObject">
-                    </mct-representation>
-                </span>
-            </li>
-        </ul>
-        <div ng-if="composition.length === 0">No contained elements</div>    
-    </div>
-</div>

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

@@ -49,7 +49,7 @@ define(
                     name: "Properties",
                     rows: this.properties.map(function (property, index) {
                         // Property definition is same as form row definition
-                        var row = Object.create(property.getDefinition());
+                        var row = JSON.parse(JSON.stringify(property.getDefinition()));
                         row.key = index;
                         return row;
                     }).filter(function (row) {

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

@@ -1,141 +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.
- *****************************************************************************/
-
-/**
- * Module defining RemoveAction. Created by vwoeltje on 11/17/14.
- */
-define([
-    './RemoveDialog'
-], function (
-    RemoveDialog
-) {
-
-    /**
-     * 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(dialogService, navigationService, context) {
-        this.domainObject = (context || {}).domainObject;
-        this.dialogService = dialogService;
-        this.navigationService = navigationService;
-    }
-
-    /**
-     * Perform this action.
-     */
-    RemoveAction.prototype.perform = function () {
-        var dialog,
-            dialogService = this.dialogService,
-            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(object) {
-            var contextCapability = object.getCapability('context'),
-                parent = contextCapability.getParent();
-
-            // If currently within path of removed object(s),
-            // navigates to existing object up tree
-            checkObjectNavigation(object, parent);
-
-            return parent.useCapability('mutation', doMutate);
-        }
-
-        /*
-         * Pass in the function to remove the domain object so it can be
-         * associated with an 'OK' button press
-         */
-        dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
-        dialog.show();
-    };
-
-    // 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/RemoveDialog.js

@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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 () {
-
-    /**
-     * @callback removeCallback
-     * @param {DomainObject} domainObject the domain object to be removed
-     */
-
-    /**
-     * Construct a new Remove dialog.
-     *
-     * @param {DialogService} dialogService the service that shows the dialog
-     * @param {DomainObject} domainObject the domain object to be removed
-     * @param {removeCallback} removeCallback callback that handles removal of the domain object
-     * @memberof platform/commonUI/edit
-     * @constructor
-     */
-    function RemoveDialog(dialogService, domainObject, removeCallback) {
-        this.dialogService = dialogService;
-        this.domainObject = domainObject;
-        this.removeCallback = removeCallback;
-    }
-
-    /**
-     * Display a dialog to confirm the removal of a domain object.
-     */
-    RemoveDialog.prototype.show = function () {
-        var dialog,
-            domainObject = this.domainObject,
-            removeCallback = this.removeCallback,
-            model = {
-                title: 'Remove ' + domainObject.getModel().name,
-                actionText: 'Warning! This action will permanently remove this object. Are you sure you want to continue?',
-                severity: 'alert',
-                primaryOption: {
-                    label: 'OK',
-                    callback: function () {
-                        removeCallback(domainObject);
-                        dialog.dismiss();
-                    }
-                },
-                options: [
-                    {
-                        label: 'Cancel',
-                        callback: function () {
-                            dialog.dismiss();
-                        }
-                    }
-                ]
-            };
-
-        dialog = this.dialogService.showBlockingMessage(model);
-    };
-
-    return RemoveDialog;
-});

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

@@ -40,20 +40,20 @@ function (
          */
     function SaveAsAction(
         $injector,
-        policyService,
         dialogService,
         copyService,
         notificationService,
+        openmct,
         context
     ) {
         this.domainObject = (context || {}).domainObject;
         this.injectObjectService = function () {
             this.objectService = $injector.get("objectService");
         };
-        this.policyService = policyService;
         this.dialogService = dialogService;
         this.copyService = copyService;
         this.notificationService = notificationService;
+        this.openmct = openmct;
     }
 
     /**
@@ -63,7 +63,7 @@ function (
         return new CreateWizard(
             this.domainObject,
             parent,
-            this.policyService
+            this.openmct
         );
     };
 
@@ -92,16 +92,7 @@ function (
          * @memberof platform/commonUI/edit.SaveAction#
          */
     SaveAsAction.prototype.perform = function () {
-        // Discard the current root view (which will be the editing
-        // UI, which will have been pushed atop the Browse UI.)
-        function returnToBrowse(object) {
-            if (object) {
-                object.getCapability("action").perform("navigate");
-            }
-            return object;
-        }
-
-        return this.save().then(returnToBrowse);
+        return this.save();
     };
 
     /**
@@ -169,15 +160,22 @@ function (
         }
 
         function saveAfterClone(clonedObject) {
-            return domainObject.getCapability("editor").save()
-                .then(resolveWith(clonedObject));
+            return this.openmct.editor.save().then(() => {
+                // Force mutation for search indexing
+                return clonedObject;
+            })
         }
 
         function finishEditing(clonedObject) {
-            return domainObject.getCapability("editor").finish()
-                .then(function () {
-                    return fetchObject(clonedObject.getId());
-                });
+            return fetchObject(clonedObject.getId())
+        }
+
+        function indexForSearch(savedObject) {
+            savedObject.useCapability('mutation', (model) => {
+                return model;
+            });
+
+            return savedObject;
         }
 
         function onSuccess(object) {
@@ -190,7 +188,7 @@ function (
             if (reason !== "user canceled") {
                 self.notificationService.error("Save Failed");
             }
-            return false;
+            throw reason;
         }
 
         return getParent(domainObject)
@@ -201,6 +199,7 @@ function (
             .then(undirtyOriginals)
             .then(saveAfterClone)
             .then(finishEditing)
+            .then(indexForSearch)
             .then(hideBlockingDialog)
             .then(onSuccess)
             .catch(onFailure);

platform/commonUI/edit/src/capabilities/EditorCapability.js

@@ -36,9 +36,11 @@ define(
          */
         function EditorCapability(
             transactionService,
+            openmct,
             domainObject
         ) {
             this.transactionService = transactionService;
+            this.openmct = openmct;
             this.domainObject = domainObject;
         }
 
@@ -48,27 +50,21 @@ define(
          * or finish() are called.
          */
         EditorCapability.prototype.edit = function () {
-            this.transactionService.startTransaction();
-            this.domainObject.getCapability('status').set('editing', true);
+            console.warn('DEPRECATED: cannot edit via edit capability, use openmct.editor instead.');
+
+            if (!this.openmct.editor.isEditing()) {
+                this.openmct.editor.edit();
+                this.domainObject.getCapability('status').set('editing', true);
+            }
         };
 
-        function isEditContextRoot(domainObject) {
-            return domainObject.getCapability('status').get('editing');
-        }
-
-        function isEditing(domainObject) {
-            return isEditContextRoot(domainObject) ||
-                domainObject.hasCapability('context') &&
-                isEditing(domainObject.getCapability('context').getParent());
-        }
-
         /**
          * Determines whether this object, or any of its ancestors are
          * currently being edited.
          * @returns boolean
          */
         EditorCapability.prototype.inEditContext = function () {
-            return isEditing(this.domainObject);
+            return this.openmct.editor.isEditing();
         };
 
         /**
@@ -77,7 +73,7 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.isEditContextRoot = function () {
-            return isEditContextRoot(this.domainObject);
+            return this.openmct.editor.isEditing();
         };
 
         /**
@@ -86,10 +82,8 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.save = function () {
-            var transactionService = this.transactionService;
-            return transactionService.commit().then(function () {
-                transactionService.startTransaction();
-            });
+            console.warn('DEPRECATED: cannot save via edit capability, use openmct.editor instead.');
+            return Promise.resolve();
         };
 
         EditorCapability.prototype.invoke = EditorCapability.prototype.edit;
@@ -100,16 +94,8 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.finish = function () {
-            var domainObject = this.domainObject;
-
-            if (this.transactionService.isActive()) {
-                return this.transactionService.cancel().then(function () {
-                    domainObject.getCapability("status").set("editing", false);
-                    return domainObject;
-                });
-            } else {
-                return Promise.resolve(domainObject);
-            }
+            console.warn('DEPRECATED: cannot finish via edit capability, use openmct.editor instead.');
+            return Promise.resolve();
         };
 
         /**

platform/commonUI/edit/src/controllers/ElementsController.js

@@ -1,197 +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.
- *****************************************************************************/
-
-define(
-    ['zepto'],
-    function ($) {
-
-        /**
-         * The ElementsController prepares the elements view for display
-         *
-         * @constructor
-         */
-        function ElementsController($scope, openmct) {
-            this.scope = $scope;
-            this.scope.composition = [];
-            this.openmct = openmct;
-            this.dragDown = this.dragDown.bind(this);
-            this.dragUp = this.dragUp.bind(this);
-
-            var self = this;
-
-            function filterBy(text) {
-                if (typeof text === 'undefined') {
-                    return $scope.searchText;
-                } else {
-                    $scope.searchText = text;
-                }
-            }
-
-            function searchElements(value) {
-                if ($scope.searchText) {
-                    return value.getModel().name.toLowerCase().search(
-                        $scope.searchText.toLowerCase()) !== -1;
-                } else {
-                    return true;
-                }
-            }
-
-            function setSelection(selection) {
-                if (!selection[0]) {
-                    return;
-                }
-
-                if (self.mutationListener) {
-                    self.mutationListener();
-                    delete self.mutationListener;
-                }
-
-                var domainObject = selection[0].context.oldItem;
-                self.refreshComposition(domainObject);
-
-                if (domainObject) {
-
-                    self.mutationListener = domainObject.getCapability('mutation')
-                        .listen(self.refreshComposition.bind(self, domainObject));
-                }
-            }
-
-            $scope.filterBy = filterBy;
-            $scope.searchElements = searchElements;
-
-            openmct.selection.on('change', setSelection);
-            setSelection(openmct.selection.get());
-
-            $scope.dragDown = this.dragDown;
-            $scope.drag = this.drag;
-            $scope.dragUp = this.dragUp;
-
-            $scope.$on("$destroy", function () {
-                openmct.selection.off("change", setSelection);
-            });
-        }
-
-        /**
-         * Invoked on DragStart - Adds reordering class to parent UL element
-         * Sets selected object ID, to be used on Drag End
-         *
-         * @param {object} event | Mouse Event
-         */
-        ElementsController.prototype.dragDown = function (event) {
-            if (!this.parentUL) {
-                this.parentUL = $(document).find('#inspector-elements-tree');
-            }
-
-            this.selectedTreeItem = $(event.target).parent();
-            this.selectedObjectId = event.target.getAttribute('data-id');
-
-            this.parentUL.addClass('reordering');
-            this.selectedTreeItem.addClass('reorder-actor');
-        };
-
-        /**
-         * Invoked on dragEnd - Removes selected object from position in composition
-         * and replaces it at the target position. Composition is then updated with current
-         * scope
-         *
-         * @param {object} event - Mouse Event
-         */
-        ElementsController.prototype.dragUp = function (event) {
-            this.targetObjectId = event.target.getAttribute('data-id');
-
-            if (this.targetObjectId && this.selectedObjectId) {
-                var selectedObjectPosition,
-                    targetObjectPosition;
-
-                selectedObjectPosition = findObjectInCompositionFromId(this.selectedObjectId, this.scope.composition);
-                targetObjectPosition = findObjectInCompositionFromId(this.targetObjectId, this.scope.composition);
-
-                if ((selectedObjectPosition !== -1) && (targetObjectPosition !== -1)) {
-                    var selectedObject = this.scope.composition.splice(selectedObjectPosition, 1),
-                        selection = this.openmct.selection.get(),
-                        domainObject = selection ? selection[0].context.oldItem : undefined;
-
-                    this.scope.composition.splice(targetObjectPosition, 0, selectedObject[0]);
-
-                    if (domainObject) {
-                        domainObject.getCapability('mutation').mutate(function (model) {
-                            model.composition = this.scope.composition.map(function (dObject) {
-                                return dObject.id;
-                            });
-                        }.bind(this));
-                    }
-                }
-            }
-
-            if (this.parentUL) {
-                this.parentUL.removeClass('reordering');
-            }
-
-            if (this.selectedTreeItem) {
-                this.selectedTreeItem.removeClass('reorder-actor');
-            }
-        };
-
-        ElementsController.prototype.drag = function (event) {
-
-        };
-
-        /**
-         * Gets the composition for the selected object and populates the scope with it.
-         *
-         * @param domainObject the selected object
-         * @private
-         */
-        ElementsController.prototype.refreshComposition = function (domainObject) {
-            var refreshTracker = {};
-            this.currentRefresh = refreshTracker;
-
-            var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
-            if (selectedObjectComposition) {
-                selectedObjectComposition.then(function (composition) {
-                    if (this.currentRefresh === refreshTracker) {
-                        this.scope.composition = composition;
-                    }
-                }.bind(this));
-            } else {
-                this.scope.composition = [];
-            }
-        };
-
-        /**
-         * Finds position of object with given ID in Composition
-         *
-         * @param {String} id
-         * @param {Array} composition
-         * @private
-         */
-        function findObjectInCompositionFromId(id, composition) {
-            var mapped = composition.map(function (element) {
-                return element.id;
-            });
-
-            return mapped.indexOf(id);
-        }
-
-        return ElementsController;
-    }
-);

platform/commonUI/edit/src/creation/AddAction.js

@@ -1,133 +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.
- *****************************************************************************/
-
-/**
- * Module defining AddAction. Created by ahenry on 01/21/16.
- */
-define(
-    [
-        './CreateWizard'
-    ],
-    function (CreateWizard) {
-
-        /**
-         * The Add Action is performed to create new instances of
-         * domain objects of a specific type that are subobjects of an
-         * object being edited. This is the action that is performed when a
-         * user uses the Add menu option.
-         *
-         * @memberof platform/commonUI/browse
-         * @implements {Action}
-         * @constructor
-         *
-         * @param {Type} type the type of domain object to create
-         * @param {DomainObject} parent the domain object that should
-         *        act as a container for the newly-created object
-         *        (note that the user will have an opportunity to
-         *        override this)
-         * @param {ActionContext} context the context in which the
-         *        action is being performed
-         * @param {DialogService} dialogService
-         */
-        function AddAction(type, parent, context, $q, dialogService, policyService) {
-            this.metadata = {
-                key: 'add',
-                cssClass: type.getCssClass(),
-                name: type.getName(),
-                type: type.getKey(),
-                description: type.getDescription(),
-                context: context
-            };
-
-            this.type = type;
-            this.parent = parent;
-            this.$q = $q;
-            this.dialogService = dialogService;
-            this.policyService = policyService;
-        }
-
-        /**
-         *
-         * Create a new object of the given type.
-         * This will prompt for user input first.
-         *
-         * @returns {Promise} that will be resolved with the object that the
-         * action was originally invoked on (ie. the 'parent')
-         */
-        AddAction.prototype.perform = function () {
-            var newModel = this.type.getInitialModel(),
-                newObject,
-                parentObject = this.parent,
-                wizard;
-
-            newModel.type = this.type.getKey();
-            newObject = parentObject.getCapability('instantiation').instantiate(newModel);
-            newObject.useCapability('mutation', function (model) {
-                model.location = parentObject.getId();
-            });
-
-            wizard = new CreateWizard(newObject, this.parent, this.policyService);
-
-            function populateObjectFromInput(formValue) {
-                return wizard.populateObjectFromInput(formValue, newObject);
-            }
-
-            function persistAndReturn(domainObject) {
-                return domainObject.getCapability('persistence')
-                    .persist()
-                    .then(function () {
-                        return domainObject;
-                    });
-            }
-
-            function addToParent(populatedObject) {
-                parentObject.getCapability('composition').add(populatedObject);
-                return persistAndReturn(parentObject);
-            }
-
-            return this.dialogService
-                .getUserInput(wizard.getFormStructure(false), wizard.getInitialFormValue())
-                .then(populateObjectFromInput)
-                .then(persistAndReturn)
-                .then(addToParent);
-
-        };
-
-
-        /**
-         * Metadata associated with a Add action.
-         * @typedef {ActionMetadata} AddActionMetadata
-         * @property {string} type the key for the type of domain object
-         *           to be created
-         */
-
-        /**
-         * Get metadata about this action.
-         * @returns {AddActionMetadata} metadata about this action
-         */
-        AddAction.prototype.getMetadata = function () {
-            return this.metadata;
-        };
-
-        return AddAction;
-    }
-);

platform/commonUI/edit/src/creation/AddActionProvider.js

@@ -1,82 +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.
- *****************************************************************************/
-
-/**
- * Module defining AddActionProvider.js. Created by ahenry on 01/21/16.
- */
-define(
-    ["./AddAction"],
-    function (AddAction) {
-
-        /**
-         * The AddActionProvider is an ActionProvider which introduces
-         * an Add action for creating sub objects.
-         *
-         * @memberof platform/commonUI/browse
-         * @constructor
-         * @implements {ActionService}
-         *
-         * @param {TypeService} typeService the type service, used to discover
-         *        available types
-         * @param {DialogService} dialogService the dialog service, used by
-         *        specific Create actions to get user input to populate the
-         *        model of the newly-created domain object.
-         * @param {CreationService} creationService the creation service (also
-         *        introduced in this bundle), responsible for handling actual
-         *        object creation.
-         */
-        function AddActionProvider($q, typeService, dialogService, policyService) {
-            this.typeService = typeService;
-            this.dialogService = dialogService;
-            this.$q = $q;
-            this.policyService = policyService;
-        }
-
-        AddActionProvider.prototype.getActions = function (actionContext) {
-            var context = actionContext || {},
-                key = context.key,
-                destination = context.domainObject;
-
-            // We only provide Add actions, and we need a
-            // domain object to serve as the container for the
-            // newly-created object (although the user may later
-            // make a different selection)
-            if (key !== 'add' || !destination) {
-                return [];
-            }
-
-            // Introduce one create action per type
-            return ['timeline', 'activity'].map(function (type) {
-                return new AddAction(
-                    this.typeService.getType(type),
-                    destination,
-                    context,
-                    this.$q,
-                    this.dialogService,
-                    this.policyService
-                );
-            }, this);
-        };
-
-        return AddActionProvider;
-    }
-);

platform/commonUI/edit/src/creation/CreateAction.js

@@ -44,7 +44,7 @@ define(
          * @param {ActionContext} context the context in which the
          *        action is being performed
          */
-        function CreateAction(type, parent, context) {
+        function CreateAction(type, parent, context, openmct) {
             this.metadata = {
                 key: 'create',
                 cssClass: type.getCssClass(),
@@ -55,6 +55,7 @@ define(
             };
             this.type = type;
             this.parent = parent;
+            this.openmct = openmct;
         }
 
         /**
@@ -63,37 +64,44 @@ define(
          */
         CreateAction.prototype.perform = function () {
             var newModel = this.type.getInitialModel(),
-                newObject,
-                editAction,
-                editorCapability;
-
-            function closeEditor() {
-                return editorCapability.finish();
-            }
-
-            function onSave() {
-                return editorCapability.save()
-                    .then(closeEditor);
-            }
+                openmct = this.openmct,
+                newObject;
 
             function onCancel() {
-                return closeEditor();
+                openmct.editor.cancel();
+            }
+
+            function isFirstViewEditable(domainObject) {
+                let firstView = openmct.objectViews.get(domainObject)[0];
+
+                return firstView && firstView.canEdit && firstView.canEdit(domainObject);
+            }
+
+            function navigateAndEdit(object) {
+                let objectPath = object.getCapability('context').getPath(),
+                    url = '#/browse/' + objectPath
+                        .slice(1)
+                        .map(function (o) {
+                            return o && openmct.objects.makeKeyString(o.getId());
+                        })
+                        .join('/');
+
+                window.location.href = url;
+
+                if (isFirstViewEditable(object.useCapability('adapter'))) {
+                    openmct.editor.edit();
+                }
             }
 
             newModel.type = this.type.getKey();
             newModel.location = this.parent.getId();
             newObject = this.parent.useCapability('instantiation', newModel);
-            editorCapability = newObject.hasCapability('editor') && newObject.getCapability("editor");
 
-            editAction = newObject.getCapability("action").getActions("edit")[0];
-            //If an edit action is available, perform it
-            if (editAction) {
-                return editAction.perform();
-            } else if (editorCapability) {
-                //otherwise, use the save as action
-                editorCapability.edit();
-                return newObject.getCapability("action").perform("save-as").then(onSave, onCancel);
-            }
+            openmct.editor.edit();
+            newObject.getCapability("action").perform("save-as").then(navigateAndEdit, onCancel);
+            // TODO: support editing object without saving object first.
+            // Which means we have to toggle createwizard afterwards.  For now,
+            // We will disable this.
         };
 
 

platform/commonUI/edit/src/creation/CreateWizard.js

@@ -34,13 +34,13 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function CreateWizard(domainObject, parent, policyService) {
+        function CreateWizard(domainObject, parent, openmct) {
             this.type = domainObject.getCapability('type');
             this.model = domainObject.getModel();
             this.domainObject = domainObject;
             this.properties = this.type.getProperties();
             this.parent = parent;
-            this.policyService = policyService;
+            this.openmct = openmct;
         }
 
         /**
@@ -56,22 +56,17 @@ define(
          */
         CreateWizard.prototype.getFormStructure = function (includeLocation) {
             var sections = [],
-                domainObject = this.domainObject,
-                policyService = this.policyService;
+                domainObject = this.domainObject;
 
             function validateLocation(parent) {
-                return parent && policyService.allow(
-                    "composition",
-                    parent,
-                    domainObject
-                );
+                return parent && this.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
             }
 
             sections.push({
                 name: "Properties",
                 rows: this.properties.map(function (property, index) {
                     // Property definition is same as form row definition
-                    var row = Object.create(property.getDefinition());
+                    var row = JSON.parse(JSON.stringify(property.getDefinition()));
 
                     // Use index as the key into the formValue;
                     // this correlates to the indexing provided by
@@ -93,7 +88,7 @@ define(
                     rows: [{
                         name: "Save In",
                         control: "locator",
-                        validate: validateLocation,
+                        validate: validateLocation.bind(this),
                         key: "createParent"
                     }]
                 });

platform/commonUI/edit/src/policies/EditActionPolicy.js

@@ -1,103 +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.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Policy controlling when the `edit` and/or `properties` actions
-         * can appear as applicable actions of the `view-control` category
-         * (shown as buttons in the top-right of browse mode.)
-         * @memberof platform/commonUI/edit
-         * @constructor
-         * @implements {Policy.<Action, ActionContext>}
-         */
-        function EditActionPolicy(policyService) {
-            this.policyService = policyService;
-        }
-
-        /**
-         * Get a count of views which are not flagged as non-editable.
-         * @private
-         */
-        EditActionPolicy.prototype.countEditableViews = function (context) {
-            var domainObject = context.domainObject,
-                count = 0,
-                type, views;
-
-            if (!domainObject) {
-                return count;
-            }
-
-            type = domainObject.getCapability('type');
-            views = domainObject.useCapability('view');
-
-
-            // A view is editable unless explicitly flagged as not
-            (views || []).forEach(function (view) {
-                if (view.editable === true ||
-                    (view.key === 'plot' && type.getKey() === 'telemetry.panel') ||
-                    (view.key === 'table' && type.getKey() === 'table') ||
-                    (view.key === 'rt-table' && type.getKey() === 'rttable')
-                ) {
-                    count++;
-                }
-            });
-
-            return count;
-        };
-
-        /**
-         * Checks whether the domain object is currently being edited. If
-         * so, the edit action is not applicable.
-         * @param context
-         * @returns {*|boolean}
-         */
-        function isEditing(context) {
-            var domainObject = (context || {}).domainObject;
-            return domainObject &&
-                domainObject.hasCapability('editor') &&
-                domainObject.getCapability('editor').isEditContextRoot();
-        }
-
-        EditActionPolicy.prototype.allow = function (action, context) {
-            var key = action.getMetadata().key,
-                category = (context || {}).category;
-
-            // Restrict 'edit' to cases where there are editable
-            // views (similarly, restrict 'properties' to when
-            // the converse is true), and where the domain object is not
-            // already being edited.
-            if (key === 'edit') {
-                return this.countEditableViews(context) > 0 && !isEditing(context);
-            } else if (key === 'properties' && category === 'view-control') {
-                return this.countEditableViews(context) < 1 && !isEditing(context);
-            }
-
-            // Like all policies, allow by default.
-            return true;
-        };
-
-        return EditActionPolicy;
-    }
-);

platform/commonUI/edit/src/policies/EditContextualActionPolicy.js

@@ -1,72 +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.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Policy controlling whether the context menu is visible when
-         * objects are being edited
-         * @param navigationService
-         * @param editModeBlacklist A blacklist of actions disallowed from
-         * context menu when navigated object is being edited
-         * @param nonEditContextBlacklist A blacklist of actions disallowed
-         * from context menu of non-editable objects, when navigated object
-         * is being edited
-         * @constructor
-         * @param editModeBlacklist A blacklist of actions disallowed from
-         * context menu when navigated object is being edited
-         * @param nonEditContextBlacklist A blacklist of actions disallowed
-         * from context menu of non-editable objects, when navigated object
-         * @implements {Policy.<Action, ActionContext>}
-         */
-        function EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist) {
-            this.navigationService = navigationService;
-
-            //The list of objects disallowed on target object when in edit mode
-            this.editModeBlacklist = editModeBlacklist;
-            //The list of objects disallowed on target object that is not in
-            // edit mode (ie. the context menu in the tree on the LHS).
-            this.nonEditContextBlacklist = nonEditContextBlacklist;
-        }
-
-        EditContextualActionPolicy.prototype.allow = function (action, context) {
-            var selectedObject = context.domainObject,
-                navigatedObject = this.navigationService.getNavigation(),
-                actionMetadata = action.getMetadata ? action.getMetadata() : {};
-
-            // if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) {
-                if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()) {
-                    return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
-                } else {
-                    //Target is in the context menu
-                    return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1;
-                }
-            // } else {
-            //     return true;
-            // }
-        };
-
-        return EditContextualActionPolicy;
-    }
-);

platform/commonUI/edit/src/policies/EditableLinkPolicy.js

@@ -1,51 +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.
- *****************************************************************************/
-
-define([], function () {
-
-    /**
-     * Policy suppressing links when the linked-to domain object is in
-     * edit mode. Domain objects being edited may not have been persisted,
-     * so creating links to these can result in inconsistent state.
-     *
-     * @memberof platform/commonUI/edit
-     * @constructor
-     * @implements {Policy.<View, DomainObject>}
-     */
-    function EditableLinkPolicy() {
-    }
-
-    EditableLinkPolicy.prototype.allow = function (action, context) {
-        var key = action.getMetadata().key,
-            object;
-
-        if (key === 'link') {
-            object = context.selectedObject || context.domainObject;
-            return !(object.hasCapability("editor") && object.getCapability("editor").inEditContext());
-        }
-
-        // Like all policies, allow by default.
-        return true;
-    };
-
-    return EditableLinkPolicy;
-});

platform/commonUI/edit/src/policies/EditableMovePolicy.js

@@ -1,52 +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.
- *****************************************************************************/
-
-define([], function () {
-
-    /**
-     * Policy suppressing move actions among editable and non-editable
-     * domain objects.
-     * @memberof platform/commonUI/edit
-     * @constructor
-     * @implements {Policy.<View, DomainObject>}
-     */
-    function EditableMovePolicy() {
-    }
-
-    EditableMovePolicy.prototype.allow = function (action, context) {
-        var domainObject = context.domainObject,
-            selectedObject = context.selectedObject,
-            key = action.getMetadata().key,
-            isDomainObjectEditing = domainObject.hasCapability('editor') &&
-                domainObject.getCapability('editor').inEditContext();
-
-        if (key === 'move' && isDomainObjectEditing) {
-            return !!selectedObject && selectedObject.hasCapability('editor') &&
-                selectedObject.getCapability('editor').inEditContext();
-        }
-
-        // Like all policies, allow by default.
-        return true;
-    };
-
-    return EditableMovePolicy;
-});

platform/commonUI/edit/src/representers/EditToolbar.js

@@ -1,254 +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.
- *****************************************************************************/
-define(
-    [
-        '../../../../../src/api/objects/object-utils',
-        'lodash'
-    ],
-    function (
-        objectUtils,
-        _
-    ) {
-
-        /**
-         * Provides initial structure and state (as suitable for provision
-         * to the `mct-toolbar` directive) for a view's toolbar, based on
-         * that view's declaration of what belongs in its toolbar and on
-         * the current selection.
-         *
-         * @param $scope the Angular scope
-         * @param {Object} openmct the openmct object
-         * @param structure the toolbar structure
-         * @memberof platform/commonUI/edit
-         * @constructor
-         */
-        function EditToolbar($scope, openmct, structure) {
-            this.toolbarStructure = [];
-            this.properties = [];
-            this.toolbarState = [];
-            this.openmct = openmct;
-            this.domainObjectsById = {};
-            this.unobserveObjects = [];
-            this.stateTracker = [];
-
-            $scope.$watchCollection(this.getState.bind(this), this.handleStateChanges.bind(this));
-            $scope.$on("$destroy", this.destroy.bind(this));
-
-            this.updateToolbar(structure);
-            this.registerListeners(structure);
-        }
-
-        /**
-         * Updates the toolbar with a new structure.
-         *
-         * @param {Array} structure the toolbar structure
-         */
-        EditToolbar.prototype.updateToolbar = function (structure) {
-            var self = this;
-
-            function addKey(item) {
-                self.stateTracker.push({
-                    id: objectUtils.makeKeyString(item.domainObject.identifier),
-                    domainObject: item.domainObject,
-                    property: item.property
-                });
-                self.properties.push(item.property);
-
-                return self.properties.length - 1; // Return index of property
-            }
-
-            function convertItem(item) {
-                var converted = Object.create(item || {});
-
-                if (item.property) {
-                    converted.key = addKey(item);
-                }
-
-                if (item.method) {
-                    converted.click = function (value) {
-                        item.method(value);
-                    };
-                }
-
-                return converted;
-            }
-
-            // Get initial value for a given property
-            function initializeState(property) {
-                var result;
-                structure.forEach(function (item) {
-                    if (item.property === property) {
-                        result = _.get(item.domainObject, item.property);
-                    }
-                });
-
-                return result;
-            }
-
-            // Tracks the domain object and property for every element in the state array
-            this.stateTracker = [];
-            this.toolbarStructure = structure.map(convertItem);
-            this.toolbarState = this.properties.map(initializeState);
-        };
-
-        /**
-         * Gets the structure of the toolbar, as appropriate to
-         * pass to `mct-toolbar`.
-         *
-         * @returns {Array} the toolbar structure
-         */
-        EditToolbar.prototype.getStructure = function () {
-            return this.toolbarStructure;
-        };
-
-        /**
-         * Gets the current state of the toolbar, as appropriate
-         * to two-way bind to the state handled by `mct-toolbar`.
-         *
-         * @returns {Array} state of the toolbar
-         */
-        EditToolbar.prototype.getState = function () {
-            return this.toolbarState;
-        };
-
-        /**
-         * Mutates the domain object's property with a new value.
-         *
-         * @param {Object} dominObject the domain object
-         * @param {string} property the domain object's property to update
-         * @param value the property's new value
-         */
-        EditToolbar.prototype.updateDomainObject = function (domainObject, property, value) {
-            this.openmct.objects.mutate(domainObject, property, value);
-        };
-
-        /**
-         * Updates state with the new value.
-         *
-         * @param {number} index the index of the corresponding
-         *        element in the state array
-         * @param value the new value to update the state array with
-         */
-        EditToolbar.prototype.updateState = function (index, value) {
-            this.toolbarState[index] = value;
-        };
-
-        /**
-         * Register listeners for domain objects to watch for updates.
-         *
-         * @param {Array} the toolbar structure
-         */
-        EditToolbar.prototype.registerListeners = function (structure) {
-            var self = this;
-
-            function observeObject(domainObject, id) {
-                var unobserveObject = self.openmct.objects.observe(domainObject, '*', function (newObject) {
-                    self.domainObjectsById[id].newObject = JSON.parse(JSON.stringify(newObject));
-                    self.scheduleStateUpdate();
-                });
-                self.unobserveObjects.push(unobserveObject);
-            }
-
-            structure.forEach(function (item) {
-                var domainObject = item.domainObject;
-                var id = objectUtils.makeKeyString(domainObject.identifier);
-
-                if (!self.domainObjectsById[id]) {
-                    self.domainObjectsById[id] = {
-                        domainObject: domainObject,
-                        properties: []
-                    };
-                    observeObject(domainObject, id);
-                }
-
-                self.domainObjectsById[id].properties.push(item.property);
-            });
-        };
-
-        /**
-         * Delays updating the state.
-         */
-        EditToolbar.prototype.scheduleStateUpdate = function () {
-            if (this.stateUpdateScheduled) {
-                return;
-            }
-
-            this.stateUpdateScheduled = true;
-            setTimeout(this.updateStateAfterMutation.bind(this));
-        };
-
-        EditToolbar.prototype.updateStateAfterMutation = function () {
-            this.stateTracker.forEach(function (state, index) {
-                if (!this.domainObjectsById[state.id].newObject) {
-                    return;
-                }
-
-                var domainObject = this.domainObjectsById[state.id].domainObject;
-                var newObject = this.domainObjectsById[state.id].newObject;
-                var currentValue = _.get(domainObject, state.property);
-                var newValue = _.get(newObject, state.property);
-
-                state.domainObject = newObject;
-
-                if (currentValue !== newValue) {
-                    this.updateState(index, newValue);
-                }
-            }, this);
-
-            Object.values(this.domainObjectsById).forEach(function (tracker) {
-                if (tracker.newObject) {
-                    tracker.domainObject = tracker.newObject;
-                }
-                delete tracker.newObject;
-            });
-            this.stateUpdateScheduled = false;
-        };
-
-        /**
-         * Removes the listeners.
-         */
-        EditToolbar.prototype.deregisterListeners = function () {
-            this.unobserveObjects.forEach(function (unobserveObject) {
-                unobserveObject();
-            });
-            this.unobserveObjects = [];
-        };
-
-        EditToolbar.prototype.handleStateChanges = function (state) {
-            (state || []).map(function (newValue, index) {
-                var domainObject = this.stateTracker[index].domainObject;
-                var property = this.stateTracker[index].property;
-                var currentValue = _.get(domainObject, property);
-
-                if (currentValue !== newValue) {
-                    this.updateDomainObject(domainObject, property, newValue);
-                }
-            }, this);
-        };
-
-        EditToolbar.prototype.destroy = function () {
-            this.deregisterListeners();
-        };
-
-        return EditToolbar;
-    }
-);

platform/commonUI/edit/src/services/TransactionManager.js

@@ -77,14 +77,19 @@ define([], function () {
                 return promiseFn().then(nextFn);
             };
         }
-
-        if (!this.isScheduled(id)) {
-            this.clearTransactionFns[id] =
-                this.transactionService.addToTransaction(
-                    chain(onCommit, release),
-                    chain(onCancel, release)
-                );
+        /**
+         * Clear any existing persistence calls for object with given ID. This ensures only the most recent persistence
+         * call is executed. This should prevent stale objects being persisted and overwriting fresh ones.
+         */
+        if (this.isScheduled(id)) {
+            this.clearTransactionsFor(id);
         }
+
+        this.clearTransactionFns[id] =
+            this.transactionService.addToTransaction(
+                chain(onCommit, release),
+                chain(onCancel, release)
+            );
     };
 
     /**

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

@@ -1,255 +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.
- *****************************************************************************/
-
-define(
-    ["../../src/actions/RemoveAction"],
-    function (RemoveAction) {
-
-        describe("The Remove action", function () {
-            var action,
-                actionContext,
-                capabilities,
-                mockContext,
-                mockDialogService,
-                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);
-                    }
-                };
-
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    ["showBlockingMessage"]
-                );
-
-                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(mockDialogService, 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(mockDialogService.showBlockingMessage).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"]);
-
-                    mockDialogService.showBlockingMessage.and.returnValue(mockDialogHandle);
-                });
-
-                it("mutates the parent when performed", function () {
-                    action.perform();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.callback();
-
-                    expect(mockMutation.invoke)
-                        .toHaveBeenCalledWith(jasmine.any(Function));
-                });
-
-                it("changes composition from its mutation function", function () {
-                    var mutator, result;
-
-                    action.perform();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.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();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.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();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.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) {
 
-        describe("The Save As action", function () {
+        xdescribe("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) {
 
-        describe("The editor capability", function () {
+        xdescribe("The editor capability", function () {
             var mockDomainObject,
                 capabilities,
                 mockParentObject,

platform/commonUI/edit/test/controllers/ElementsControllerSpec.js

@@ -1,184 +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 describe,it,expect,beforeEach,jasmine*/
-
-define(
-    ["../../src/controllers/ElementsController"],
-    function (ElementsController) {
-
-        describe("The Elements Pane controller", function () {
-            var mockScope,
-                mockOpenMCT,
-                mockSelection,
-                mockDomainObject,
-                mockMutationCapability,
-                mockCompositionCapability,
-                mockCompositionObjects,
-                mockComposition,
-                mockUnlisten,
-                selectable = [],
-                controller;
-
-            function mockPromise(value) {
-                return {
-                    then: function (thenFunc) {
-                        return mockPromise(thenFunc(value));
-                    }
-                };
-            }
-
-            function createDomainObject() {
-                return {
-                    useCapability: function () {
-                        return mockCompositionCapability;
-                    }
-                };
-            }
-
-            beforeEach(function () {
-                mockComposition = ["a", "b"];
-                mockCompositionObjects = mockComposition.map(createDomainObject);
-                mockCompositionCapability = mockPromise(mockCompositionObjects);
-
-                mockUnlisten = jasmine.createSpy('unlisten');
-                mockMutationCapability = jasmine.createSpyObj("mutationCapability", [
-                    "listen"
-                ]);
-                mockMutationCapability.listen.and.returnValue(mockUnlisten);
-                mockDomainObject = jasmine.createSpyObj("domainObject", [
-                    "getCapability",
-                    "useCapability"
-                ]);
-                mockDomainObject.useCapability.and.returnValue(mockCompositionCapability);
-                mockDomainObject.getCapability.and.returnValue(mockMutationCapability);
-
-                mockScope = jasmine.createSpyObj("$scope", ['$on']);
-                mockSelection = jasmine.createSpyObj("selection", [
-                    'on',
-                    'off',
-                    'get'
-                ]);
-                mockSelection.get.and.returnValue([]);
-                mockOpenMCT = {
-                    selection: mockSelection
-                };
-
-                selectable[0] = {
-                    context: {
-                        oldItem: mockDomainObject
-                    }
-                };
-
-                spyOn(ElementsController.prototype, 'refreshComposition').and.callThrough();
-
-                controller = new ElementsController(mockScope, mockOpenMCT);
-            });
-
-            function getModel(model) {
-                return function () {
-                    return model;
-                };
-            }
-
-            it("filters objects in elements pool based on input text and" +
-                " object name", function () {
-                var objects = [
-                    {
-                        getModel: getModel({name: "first element"})
-                    },
-                    {
-                        getModel: getModel({name: "second element"})
-                    },
-                    {
-                        getModel: getModel({name: "third element"})
-                    },
-                    {
-                        getModel: getModel({name: "THIRD Element 1"})
-                    }
-                ];
-
-                mockScope.filterBy("third element");
-                expect(objects.filter(mockScope.searchElements).length).toBe(2);
-                mockScope.filterBy("element");
-                expect(objects.filter(mockScope.searchElements).length).toBe(4);
-            });
-
-            it("refreshes composition on selection", function () {
-                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
-
-                expect(ElementsController.prototype.refreshComposition).toHaveBeenCalledWith(mockDomainObject);
-            });
-
-            it("listens on mutation and refreshes composition", function () {
-                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
-
-                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('mutation');
-                expect(mockMutationCapability.listen).toHaveBeenCalled();
-                expect(ElementsController.prototype.refreshComposition.calls.count()).toBe(1);
-
-                mockMutationCapability.listen.calls.mostRecent().args[0](mockDomainObject);
-
-                expect(ElementsController.prototype.refreshComposition.calls.count()).toBe(2);
-            });
-
-            it("cleans up mutation listener when selection changes", function () {
-                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
-
-                expect(mockMutationCapability.listen).toHaveBeenCalled();
-
-                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
-
-                expect(mockUnlisten).toHaveBeenCalled();
-            });
-
-            it("does not listen on mutation for element proxy selectable", function () {
-                selectable[0] = {
-                    context: {
-                        elementProxy: {}
-                    }
-                };
-                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
-
-                expect(mockDomainObject.getCapability).not.toHaveBeenCalledWith('mutation');
-            });
-
-            it("checks concurrent changes to composition", function () {
-                var secondMockComposition = ["a", "b", "c"],
-                    secondMockCompositionObjects = secondMockComposition.map(createDomainObject),
-                    firstCompositionCallback,
-                    secondCompositionCallback;
-
-                spyOn(mockCompositionCapability, "then").and.callThrough();
-
-                controller.refreshComposition(mockDomainObject);
-                controller.refreshComposition(mockDomainObject);
-
-                firstCompositionCallback = mockCompositionCapability.then.calls.all()[0].args[0];
-                secondCompositionCallback = mockCompositionCapability.then.calls.all()[1].args[0];
-                secondCompositionCallback(secondMockCompositionObjects);
-                firstCompositionCallback(mockCompositionObjects);
-
-                expect(mockScope.composition).toBe(secondMockCompositionObjects);
-            });
-        });
-    }
-);

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

@@ -1,105 +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.
- *****************************************************************************/
-
-/**
- * MCTRepresentationSpec. Created by ahenry on 01/21/14.
- */
-define(
-    ["../../src/creation/AddActionProvider"],
-    function (AddActionProvider) {
-
-        describe("The add action provider", function () {
-            var mockTypeService,
-                mockDialogService,
-                mockPolicyService,
-                mockTypeMap,
-                mockTypes,
-                mockDomainObject,
-                mockQ,
-                provider;
-
-            function createMockType(name) {
-                var mockType = jasmine.createSpyObj(
-                    "type" + name,
-                    [
-                        "getKey",
-                        "getGlyph",
-                        "getCssClass",
-                        "getName",
-                        "getDescription",
-                        "getProperties",
-                        "getInitialModel",
-                        "hasFeature"
-                    ]
-                );
-                mockType.hasFeature.and.returnValue(true);
-                mockType.getName.and.returnValue(name);
-                mockType.getKey.and.returnValue(name);
-                return mockType;
-            }
-
-            beforeEach(function () {
-                mockTypeService = jasmine.createSpyObj(
-                    "typeService",
-                    ["getType"]
-                );
-                mockDialogService = {};
-                mockPolicyService = {};
-                mockDomainObject = {};
-
-                mockTypes = [
-                    "timeline",
-                    "activity",
-                    "other"
-                ].map(createMockType);
-                mockTypeMap = {};
-
-                mockTypes.forEach(function (type) {
-                    mockTypeMap[type.getKey()] = type;
-                });
-
-                mockTypeService.getType.and.callFake(function (key) {
-                    return mockTypeMap[key];
-                });
-
-                provider = new AddActionProvider(
-                    mockQ,
-                    mockTypeService,
-                    mockDialogService,
-                    mockPolicyService
-                );
-            });
-
-            it("provides actions for timeline and activity", function () {
-                var actions = provider.getActions({
-                    key: "add",
-                    domainObject: mockDomainObject
-                });
-                expect(actions.length).toBe(2);
-                expect(actions[0].metadata.type).toBe('timeline');
-                expect(actions[1].metadata.type).toBe('activity');
-
-                // Make sure it was creation which was used to check
-            });
-        });
-    }
-);

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

@@ -27,7 +27,7 @@ define(
     ["../../src/creation/CreateAction"],
     function (CreateAction) {
 
-        describe("The create action", function () {
+        xdescribe("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) {
 
-        describe("The create wizard", function () {
+        xdescribe("The create wizard", function () {
             var mockType,
                 mockParent,
                 mockProperties,

platform/commonUI/edit/test/policies/EditActionPolicySpec.js

@@ -1,138 +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.
- *****************************************************************************/
-
-define(
-    ["../../src/policies/EditActionPolicy"],
-    function (EditActionPolicy) {
-
-        describe("The Edit action policy", function () {
-            var editableView,
-                nonEditableView,
-                testViews,
-                testContext,
-                mockDomainObject,
-                mockEditAction,
-                mockPropertiesAction,
-                mockTypeCapability,
-                mockEditorCapability,
-                capabilities,
-                plotView,
-                policy;
-
-            beforeEach(function () {
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    [
-                        'useCapability',
-                        'hasCapability',
-                        'getCapability'
-                    ]
-                );
-                mockEditorCapability = jasmine.createSpyObj('editorCapability', ['isEditContextRoot']);
-                mockTypeCapability = jasmine.createSpyObj('type', ['getKey']);
-                capabilities = {
-                    'editor': mockEditorCapability,
-                    'type': mockTypeCapability
-                };
-
-                mockEditAction = jasmine.createSpyObj('edit', ['getMetadata']);
-                mockPropertiesAction = jasmine.createSpyObj('edit', ['getMetadata']);
-
-                mockDomainObject.getCapability.and.callFake(function (capability) {
-                    return capabilities[capability];
-                });
-                mockDomainObject.hasCapability.and.callFake(function (capability) {
-                    return !!capabilities[capability];
-                });
-
-                editableView = { editable: true };
-                nonEditableView = { editable: false };
-                plotView = { key: "plot", editable: false };
-                testViews = [];
-
-                mockDomainObject.useCapability.and.callFake(function (c) {
-                    // Provide test views, only for the view capability
-                    return c === 'view' && testViews;
-                });
-
-                mockEditAction.getMetadata.and.returnValue({ key: 'edit' });
-                mockPropertiesAction.getMetadata.and.returnValue({ key: 'properties' });
-
-                testContext = {
-                    domainObject: mockDomainObject,
-                    category: 'view-control'
-                };
-
-                policy = new EditActionPolicy();
-            });
-
-            it("allows the edit action when there are editable views", function () {
-                testViews = [editableView];
-                expect(policy.allow(mockEditAction, testContext)).toBe(true);
-            });
-
-            it("allows the edit properties action when there are no editable views", function () {
-                testViews = [nonEditableView, nonEditableView];
-                expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
-            });
-
-            it("disallows the edit action when there are no editable views", function () {
-                testViews = [nonEditableView, nonEditableView];
-                expect(policy.allow(mockEditAction, testContext)).toBe(false);
-            });
-
-            it("disallows the edit properties action when there are" +
-                " editable views", function () {
-                testViews = [editableView];
-                expect(policy.allow(mockPropertiesAction, testContext)).toBe(false);
-            });
-
-            it("disallows the edit action when object is already being" +
-                " edited", function () {
-                testViews = [editableView];
-                mockEditorCapability.isEditContextRoot.and.returnValue(true);
-                expect(policy.allow(mockEditAction, testContext)).toBe(false);
-            });
-
-            it("allows editing of panels in plot view", function () {
-                testViews = [plotView];
-                mockTypeCapability.getKey.and.returnValue('telemetry.panel');
-
-                expect(policy.allow(mockEditAction, testContext)).toBe(true);
-            });
-
-            it("disallows editing of plot view when object not a panel type", function () {
-                testViews = [plotView];
-                mockTypeCapability.getKey.and.returnValue('something.else');
-
-                expect(policy.allow(mockEditAction, testContext)).toBe(false);
-            });
-
-
-            it("allows the edit properties outside of the 'view-control' category", function () {
-                testViews = [nonEditableView];
-                testContext.category = "something-else";
-                expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
-            });
-        });
-    }
-);

platform/commonUI/edit/test/policies/EditContextualActionPolicySpec.js

@@ -1,120 +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 describe,it,expect,beforeEach,jasmine*/
-
-define(
-    ["../../src/policies/EditContextualActionPolicy"],
-    function (EditContextualActionPolicy) {
-
-        describe("The Edit contextual action policy", function () {
-            var policy,
-                navigationService,
-                mockAction,
-                context,
-                navigatedObject,
-                mockDomainObject,
-                mockEditorCapability,
-                metadata,
-                editModeBlacklist = ["copy", "follow", "window", "link", "locate"],
-                nonEditContextBlacklist = ["copy", "follow", "properties", "move", "link", "remove", "locate"];
-
-            beforeEach(function () {
-                mockEditorCapability = jasmine.createSpyObj("editorCapability", ["isEditContextRoot", "inEditContext"]);
-
-                navigatedObject = jasmine.createSpyObj("navigatedObject", ["hasCapability", "getCapability"]);
-                navigatedObject.getCapability.and.returnValue(mockEditorCapability);
-                navigatedObject.hasCapability.and.returnValue(false);
-
-
-                mockDomainObject = jasmine.createSpyObj("domainObject", ["hasCapability", "getCapability"]);
-                mockDomainObject.hasCapability.and.returnValue(false);
-                mockDomainObject.getCapability.and.returnValue(mockEditorCapability);
-
-                navigationService = jasmine.createSpyObj("navigationService", ["getNavigation"]);
-                navigationService.getNavigation.and.returnValue(navigatedObject);
-
-                metadata = {key: "move"};
-                mockAction = jasmine.createSpyObj("action", ["getMetadata"]);
-                mockAction.getMetadata.and.returnValue(metadata);
-
-                context = {domainObject: mockDomainObject};
-
-                policy = new EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist);
-            });
-
-            it('Allows all actions when navigated object not in edit mode', function () {
-                expect(policy.allow(mockAction, context)).toBe(true);
-            });
-
-            it('Allows "window" action when navigated object in edit mode,' +
-                ' but selected object not in edit mode ', function () {
-                navigatedObject.hasCapability.and.returnValue(true);
-                mockEditorCapability.isEditContextRoot.and.returnValue(true);
-                metadata.key = "window";
-                expect(policy.allow(mockAction, context)).toBe(true);
-            });
-
-            it('Allows "remove" action when navigated object in edit mode,' +
-                ' and selected object not editable, but its parent is.',
-            function () {
-                var mockParent = jasmine.createSpyObj("parentObject", ["hasCapability"]),
-                    mockContextCapability = jasmine.createSpyObj("contextCapability", ["getParent"]);
-
-                mockParent.hasCapability.and.returnValue(true);
-                mockContextCapability.getParent.and.returnValue(mockParent);
-                navigatedObject.hasCapability.and.returnValue(true);
-
-                mockDomainObject.getCapability.and.returnValue(mockContextCapability);
-                mockDomainObject.hasCapability.and.callFake(function (capability) {
-                    switch (capability) {
-                    case "editor": return false;
-                    case "context": return true;
-                    }
-                });
-                metadata.key = "remove";
-
-                expect(policy.allow(mockAction, context)).toBe(true);
-            });
-
-            it('Disallows "move" action when navigated object in edit mode,' +
-                ' but selected object not in edit mode ', function () {
-                navigatedObject.hasCapability.and.returnValue(true);
-                mockEditorCapability.isEditContextRoot.and.returnValue(true);
-                mockEditorCapability.inEditContext.and.returnValue(false);
-                metadata.key = "move";
-                expect(policy.allow(mockAction, context)).toBe(false);
-            });
-
-            it('Disallows copy action when navigated object and' +
-                ' selected object in edit mode', function () {
-                navigatedObject.hasCapability.and.returnValue(true);
-                mockDomainObject.hasCapability.and.returnValue(true);
-                mockEditorCapability.isEditContextRoot.and.returnValue(true);
-                mockEditorCapability.inEditContext.and.returnValue(true);
-
-                metadata.key = "copy";
-                expect(policy.allow(mockAction, context)).toBe(false);
-            });
-
-        });
-    }
-);

platform/commonUI/edit/test/policies/EditableViewPolicySpec.js

@@ -1,79 +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.
- *****************************************************************************/
-
-define(
-    ["../../src/policies/EditableViewPolicy"],
-    function (EditableViewPolicy) {
-
-        describe("The editable view policy", function () {
-            var mockDomainObject,
-                testMode,
-                policy;
-
-            beforeEach(function () {
-                testMode = true; // Act as if we're in Edit mode by default
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    ['hasCapability', 'getCapability']
-                );
-                mockDomainObject.getCapability.and.returnValue({
-                    inEditContext: function () {
-                        return true;
-                    }
-                });
-                mockDomainObject.hasCapability.and.callFake(function (c) {
-                    return (c === 'editor') && testMode;
-                });
-
-                policy = new EditableViewPolicy();
-            });
-
-            it("disallows views in edit mode that are flagged as non-editable", function () {
-                expect(policy.allow({ editable: false }, mockDomainObject))
-                    .toBeFalsy();
-            });
-
-            it("allows views in edit mode that are flagged as editable", function () {
-                expect(policy.allow({ editable: true }, mockDomainObject))
-                    .toBeTruthy();
-            });
-
-            it("allows any view outside of edit mode", function () {
-                var testViews = [
-                    { editable: false },
-                    { editable: true },
-                    { someKey: "some value" }
-                ];
-                testMode = false; // Act as if we're not in Edit mode
-
-                testViews.forEach(function (testView) {
-                    expect(policy.allow(testView, mockDomainObject)).toBeTruthy();
-                });
-            });
-
-            it("treats views with no defined 'editable' property as editable", function () {
-                expect(policy.allow({ someKey: "some value" }, mockDomainObject))
-                    .toBeTruthy();
-            });
-        });
-    }
-);

platform/commonUI/edit/test/representers/EditToolbarSpec.js

@@ -1,75 +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.
- *****************************************************************************/
-
-define(
-    ['../../src/representers/EditToolbar'],
-    function (EditToolbar) {
-
-        describe("An Edit mode toolbar", function () {
-            var mockOpenMCT,
-                mockScope,
-                mockObjects,
-                mockDomainObject,
-                testStructure,
-                toolbar;
-
-            beforeEach(function () {
-                mockOpenMCT = jasmine.createSpy('openmct', ['objects']);
-                mockObjects = jasmine.createSpyObj('objects', ['observe']);
-                mockObjects.observe.and.returnValue();
-                mockOpenMCT.objects = mockObjects;
-                mockScope = jasmine.createSpyObj("$scope", [
-                    "$watchCollection",
-                    "$on"
-                ]);
-                mockScope.$watchCollection.and.returnValue();
-                mockDomainObject = jasmine.createSpyObj("domainObject", [
-                    'identifier'
-                ]);
-
-                testStructure = [
-                    { name: "A", property: "a", domainObject: mockDomainObject },
-                    { name: "B", property: "b", domainObject: mockDomainObject },
-                    { name: "C", property: "c", domainObject: mockDomainObject },
-                    { name: "X", property: "x", domainObject: mockDomainObject },
-                    { name: "Y", property: "y", domainObject: mockDomainObject },
-                    { name: "Z", property: "z", domainObject: mockDomainObject },
-                    { name: "M", method: "m", domainObject: mockDomainObject }
-                ];
-
-                toolbar = new EditToolbar(mockScope, mockOpenMCT, testStructure);
-            });
-
-            it("adds click functions when a method is specified", function () {
-                var structure = toolbar.getStructure();
-                expect(structure[6].click).toBeDefined();
-            });
-
-            it("adds key for controls that define a property", function () {
-                var structure = toolbar.getStructure();
-                expect(structure[0].key).toEqual(0);
-            });
-        });
-    }
-);
-
-

platform/commonUI/edit/test/services/TransactionManagerSpec.js

@@ -93,24 +93,33 @@ define(
                     expect(mockOnCancel).toHaveBeenCalled();
                 });
 
-                it("ignores subsequent calls for the same object", function () {
-                    manager.addToTransaction(
-                        testId,
-                        jasmine.createSpy(),
-                        jasmine.createSpy()
-                    );
-                    expect(mockTransactionService.addToTransaction.calls.count())
-                        .toEqual(1);
-                });
+                describe("Adds callbacks to transaction", function () {
+                    beforeEach(function () {
+                        spyOn(manager, 'clearTransactionsFor');
+                        manager.clearTransactionsFor.and.callThrough();
+                    });
 
-                it("accepts subsequent calls for other objects", function () {
-                    manager.addToTransaction(
-                        'other-id',
-                        jasmine.createSpy(),
-                        jasmine.createSpy()
-                    );
-                    expect(mockTransactionService.addToTransaction.calls.count())
-                        .toEqual(2);
+                    it("and clears pending calls if same object", function () {
+                        manager.addToTransaction(
+                            testId,
+                            jasmine.createSpy(),
+                            jasmine.createSpy()
+                        );
+                        expect(manager.clearTransactionsFor).toHaveBeenCalledWith(testId);
+                    });
+
+                    it("and does not clear pending calls if different object", function () {
+                        manager.addToTransaction(
+                            'other-id',
+                            jasmine.createSpy(),
+                            jasmine.createSpy()
+                        );
+                        expect(manager.clearTransactionsFor).not.toHaveBeenCalled();
+                    });
+
+                    afterEach(function () {
+                        expect(mockTransactionService.addToTransaction.calls.count()).toEqual(2);
+                    });
                 });
 
                 it("does not remove callbacks from the transaction", function () {

platform/commonUI/formats/src/DurationFormat.js

@@ -56,7 +56,7 @@ define([
     };
 
     DurationFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
+        return moment.utc(text, DATE_FORMATS, true).isValid();
     };
 
     return DurationFormat;

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -29,6 +29,7 @@ define([
     var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
         DATE_FORMATS = [
             DATE_FORMAT,
+            DATE_FORMAT + "Z",
             "YYYY-MM-DD HH:mm:ss",
             "YYYY-MM-DD HH:mm",
             "YYYY-MM-DD"
@@ -52,70 +53,14 @@ define([
         this.key = "utc";
     }
 
-    /**
-     * Returns an appropriate time format based on the provided value and
-     * the threshold required.
-     * @private
-     */
-    function getScaledFormat(d) {
-        var momentified = moment.utc(d);
-        /**
-         * Uses logic from d3 Time-Scales, v3 of the API. See
-         * https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Scales.md
-         *
-         * Licensed
-         */
-        var format = [
-            [".SSS", function (m) {
-                return m.milliseconds();
-            }],
-            [":ss", function (m) {
-                return m.seconds();
-            }],
-            ["HH:mm", function (m) {
-                return m.minutes();
-            }],
-            ["HH", function (m) {
-                return m.hours();
-            }],
-            ["ddd DD", function (m) {
-                return m.days() &&
-                    m.date() !== 1;
-            }],
-            ["MMM DD", function (m) {
-                return m.date() !== 1;
-            }],
-            ["MMMM", function (m) {
-                return m.month();
-            }],
-            ["YYYY", function () {
-                return true;
-            }]
-        ].filter(function (row) {
-            return row[1](momentified);
-        })[0][0];
-
-        if (format !== undefined) {
-            return moment.utc(d).format(format);
-        }
-    }
-
     /**
      * @param {number} value The value to format.
-     * @param {number} [minValue] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. Specifies the smallest number on the scale.
-     * @param {number} [maxValue] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. Specifies the largest number on the scale
-     * @param {number} [count] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. The number of labels on the scale.
      * @returns {string} the formatted date(s). If multiple values were requested, then an array of
      * formatted values will be returned. Where a value could not be formatted, `undefined` will be returned at its position
      * in the array.
      */
     UTCTimeFormat.prototype.format = function (value) {
-        if (arguments.length > 1) {
-            return getScaledFormat(value);
-        } else if (value !== undefined) {
+        if (value !== undefined) {
             return moment.utc(value).format(DATE_FORMAT) + "Z";
         } else {
             return value;
@@ -130,7 +75,7 @@ define([
     };
 
     UTCTimeFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
+        return moment.utc(text, DATE_FORMATS, true).isValid();
     };
 
     return UTCTimeFormat;

platform/commonUI/formats/test/UTCTimeFormatSpec.js

@@ -1,62 +0,0 @@
-/*****************************************************************************
- * 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/UTCTimeFormat",
-    "moment"
-], function (
-    UTCTimeFormat,
-    moment
-) {
-    describe("The UTCTimeFormat class", function () {
-        var format;
-        var scale;
-
-        beforeEach(function () {
-            format = new UTCTimeFormat();
-            scale = {min: 0, max: 0};
-        });
-
-        it("Provides an appropriately scaled time format based on the input" +
-            " time", function () {
-            var TWO_HUNDRED_MS = 200;
-            var THREE_SECONDS = 3000;
-            var FIVE_MINUTES = 5 * 60 * 1000;
-            var ONE_HOUR_TWENTY_MINS = (1 * 60 * 60 * 1000) + (20 * 60 * 1000);
-            var TEN_HOURS = (10 * 60 * 60 * 1000);
-
-            var JUNE_THIRD = moment.utc("2016-06-03", "YYYY-MM-DD");
-            var APRIL = moment.utc("2016-04", "YYYY-MM");
-            var TWENTY_SIXTEEN = moment.utc("2016", "YYYY");
-
-            expect(format.format(TWO_HUNDRED_MS, scale)).toBe(".200");
-            expect(format.format(THREE_SECONDS, scale)).toBe(":03");
-            expect(format.format(FIVE_MINUTES, scale)).toBe("00:05");
-            expect(format.format(ONE_HOUR_TWENTY_MINS, scale)).toBe("01:20");
-            expect(format.format(TEN_HOURS, scale)).toBe("10");
-
-            expect(format.format(JUNE_THIRD, scale)).toBe("Fri 03");
-            expect(format.format(APRIL, scale)).toBe("April");
-            expect(format.format(TWENTY_SIXTEEN, scale)).toBe("2016");
-        });
-    });
-});

platform/commonUI/general/bundle.js

@@ -31,7 +31,6 @@ define([
     "./src/controllers/TreeNodeController",
     "./src/controllers/ActionGroupController",
     "./src/controllers/ToggleController",
-    "./src/controllers/ContextMenuController",
     "./src/controllers/ClickAwayController",
     "./src/controllers/ViewSwitcherController",
     "./src/controllers/GetterSetterController",
@@ -49,8 +48,6 @@ define([
     "./src/directives/MCTSplitter",
     "./src/directives/MCTTree",
     "./src/directives/MCTIndicators",
-    "./src/directives/MCTPreview",
-    "./src/actions/MCTPreviewAction",
     "./src/filters/ReverseFilter",
     "./res/templates/bottombar.html",
     "./res/templates/controls/action-button.html",
@@ -65,13 +62,11 @@ define([
     "./res/templates/tree-node.html",
     "./res/templates/label.html",
     "./res/templates/controls/action-group.html",
-    "./res/templates/menu/context-menu.html",
     "./res/templates/controls/switcher.html",
     "./res/templates/object-inspector.html",
     "./res/templates/controls/selector.html",
     "./res/templates/controls/datetime-picker.html",
     "./res/templates/controls/datetime-field.html",
-    "./res/templates/preview.html",
     'legacyRegistry'
 ], function (
     UrlService,
@@ -84,7 +79,6 @@ define([
     TreeNodeController,
     ActionGroupController,
     ToggleController,
-    ContextMenuController,
     ClickAwayController,
     ViewSwitcherController,
     GetterSetterController,
@@ -102,8 +96,6 @@ define([
     MCTSplitter,
     MCTTree,
     MCTIndicators,
-    MCTPreview,
-    MCTPreviewAction,
     ReverseFilter,
     bottombarTemplate,
     actionButtonTemplate,
@@ -118,13 +110,11 @@ define([
     treeNodeTemplate,
     labelTemplate,
     actionGroupTemplate,
-    contextMenuTemplate,
     switcherTemplate,
     objectInspectorTemplate,
     selectorTemplate,
     datetimePickerTemplate,
     datetimeFieldTemplate,
-    previewTemplate,
     legacyRegistry
 ) {
 
@@ -252,13 +242,6 @@ define([
                     "key": "ToggleController",
                     "implementation": ToggleController
                 },
-                {
-                    "key": "ContextMenuController",
-                    "implementation": ContextMenuController,
-                    "depends": [
-                        "$scope"
-                    ]
-                },
                 {
                     "key": "ClickAwayController",
                     "implementation": ClickAwayController,
@@ -394,31 +377,6 @@ define([
                     "key": "mctIndicators",
                     "implementation": MCTIndicators,
                     "depends": ['openmct']
-                },
-                {
-                    "key": "mctPreview",
-                    "implementation": MCTPreview,
-                    "depends": [
-                        "$document"
-                    ]
-                }
-            ],
-            "actions": [
-                {
-                    "key": "mct-preview-action",
-                    "implementation": MCTPreviewAction,
-                    "name": "Preview",
-                    "cssClass": "hide-in-t-main-view icon-eye-open",
-                    "description": "Preview in large dialog",
-                    "category": [
-                        "contextual",
-                        "view-control"
-                    ],
-                    "depends": [
-                        "$compile",
-                        "$rootScope"
-                    ],
-                    "priority": "preferred"
                 }
             ],
             "constants": [
@@ -517,13 +475,6 @@ define([
                         "action"
                     ]
                 },
-                {
-                    "key": "context-menu",
-                    "template": contextMenuTemplate,
-                    "uses": [
-                        "action"
-                    ]
-                },
                 {
                     "key": "switcher",
                     "template": switcherTemplate,
@@ -534,10 +485,6 @@ define([
                 {
                     "key": "object-inspector",
                     "template": objectInspectorTemplate
-                },
-                {
-                    "key": "mct-preview",
-                    "template": previewTemplate
                 }
             ],
             "controls": [

platform/commonUI/general/res/templates/angular-indicator.html

@@ -20,8 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div class="ls-indicator {{ngModel.getCssClass()}}"
-	 title="{{ngModel.getDescription()}}"
+<div class="c-indicator {{ngModel.getCssClass()}}"
 	 ng-show="ngModel.getText().length > 0">
-	<span class="label">{{ngModel.getText()}}</span>
+	<span class="label c-indicator__label">{{ngModel.getText()}}</span>
 </div>

platform/commonUI/general/res/templates/label.html

@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="t-object-label l-flex-row flex-elem grows">
-    <div class="t-item-icon flex-elem {{type.getCssClass()}}" ng-class="{ 'l-icon-link':location.isLink() }"></div>
-    <div class='t-title-label flex-elem grows'>{{model.name}}</div>
+<div class="c-object-label">
+    <div class="c-object-label__type-icon {{type.getCssClass()}}" ng-class="{ 'l-icon-link':location.isLink() }"></div>
+    <div class='c-object-label__name'>{{model.name}}</div>
 </div>

platform/commonUI/general/res/templates/menu/context-menu.html

@@ -1,33 +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.
--->
-<div class="menu-element context-menu-wrapper mobile-disable-select" ng-controller="ContextMenuController">
-    <div class="menu context-menu">
-        <ul>
-            <li ng-repeat="menuAction in menuActions"
-                ng-click="menuAction.perform()"
-                title="{{menuAction.getMetadata().description}}"
-                class="{{menuAction.getMetadata().cssClass}}">
-                {{menuAction.getMetadata().name}}
-            </li>
-        </ul>
-    </div>
-</div>

platform/commonUI/general/res/templates/message-banner.html

@@ -1,13 +1,13 @@
 <div ng-controller="BannerController" ng-show="active.notification"
-     class="l-message-banner s-message-banner {{active.notification.model.severity}}" ng-class="{
+     class="c-message-banner {{active.notification.model.severity}}" ng-class="{
      'minimized': active.notification.model.minimized,
      'new': !active.notification.model.minimized}"
      ng-click="maximize(active.notification)">
-    <span class="banner-elem label">
+    <span class="c-message-banner__message">
         {{active.notification.model.title}}
     </span>
     <span ng-show="active.notification.model.progress !== undefined || active.notification.model.unknownProgress">
-        <mct-include key="'progress-bar'" class="banner-elem"
+        <mct-include key="'progress-bar'" class="c-message-banner__progress-bar"
                      ng-model="active.notification.model">
         </mct-include>
     </span>
@@ -16,5 +16,5 @@
        ng-click="action(active.notification.model.primaryOption.callback, $event)">
         {{active.notification.model.primaryOption.label}}
     </a>
-    <a class="banner-elem close icon-x" ng-click="dismiss(active.notification, $event)"></a>
+    <button class="c-message-banner__close-button c-click-icon icon-x-in-circle" ng-click="dismiss(active.notification, $event)"></button>
 </div>

platform/commonUI/general/res/templates/preview.html

@@ -1,45 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2017, 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.
--->
-<div class="t-frame-inner abs t-object-type-{{ domainObject.getModel().type }}" mct-preview>
-    <div class="abs object-browse-bar l-flex-row">
-        <div class="left flex-elem l-flex-row grows">
-            <mct-representation
-                    key="'object-header-frame'"
-                    mct-object="domainObject"
-                    class="l-flex-row flex-elem object-header grows">
-            </mct-representation>
-        </div>
-        <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
-            <mct-representation
-                    key="'switcher'"
-                    ng-model="representation"
-                    mct-object="domainObject">
-            </mct-representation>
-        </div>
-    </div>
-    <div class="abs object-holder">
-        <mct-representation
-                key="representation.selected.key"
-                mct-object="representation.selected.key && domainObject">
-        </mct-representation>
-    </div>
-</div>

platform/commonUI/general/res/templates/progress-bar.html

@@ -1,10 +1,10 @@
 <span class="l-progress-bar s-progress-bar"
-      ng-class="{ indeterminate:ngModel.unknownProgress }">
+      ng-class="{ indeterminate:ngModel.progressPerc === 'unknown' }">
     <span class="progress-amt-holder">
-        <span class="progress-amt" style="width: {{ngModel.progress}}%"></span>
+        <span class="progress-amt" style="width: {{ngModel.progressPerc === 'unknown' ? 100 : ngModel.progressPerc}}%"></span>
     </span>
 </span>
 <div class="progress-info hint" ng-hide="ngModel.progressText === undefined">
-    <span class="progress-amt-text" ng-show="ngModel.progress > 0">{{ngModel.progress}}% complete. </span>
+    <span class="progress-amt-text" ng-show="ngModel.progressPerc !== 'unknown' && ngModel.progressPerc > 0">{{ngModel.progressPerc}}% complete. </span>
     {{ngModel.progressText}}
 </div>

platform/commonUI/general/res/templates/tree-node.html

@@ -20,14 +20,11 @@
  at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ToggleController as toggle">
-    <span ng-controller="TreeNodeController as treeNode">
-        <span
-            class="tree-item menus-to-left"
-            ng-class="{selected: treeNode.isSelected()}"
-            >
-            <span
-                class='ui-symbol view-control flex-elem'
-                ng-class="{ 'has-children': model.composition !== undefined, expanded: toggle.isActive() }"
+    <div class="u-contents" ng-controller="TreeNodeController as treeNode">
+        <div class="c-tree__item menus-to-left"
+            ng-class="{selected: treeNode.isSelected()}">
+            <span class='c-disclosure-triangle c-tree__item__view-control'
+                ng-class="{ 'is-enabled': model.composition !== undefined, 'c-disclosure-triangle--expanded': toggle.isActive() }"
                 ng-click="toggle.toggle(); treeNode.trackExpansion()"
                 >
             </span>
@@ -39,19 +36,15 @@
                 ng-click="treeNode.select()"
                 >
             </mct-representation>
-        </span>
-        <span
-            class="tree-item-subtree"
+        </div>
+        <div class="u-contents"
             ng-show="toggle.isActive()"
-            ng-if="model.composition !== undefined"
-            >
-
+            ng-if="model.composition !== undefined">
             <mct-representation key="'subtree'"
                                 ng-model="ngModel"
                                 parameters="parameters"
                                 mct-object="treeNode.hasBeenExpanded() && domainObject">
             </mct-representation>
-
-        </span>
-    </span>
+        </div>
+    </div>
 </span>

platform/commonUI/general/res/templates/tree.html

@@ -19,8 +19,8 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<ul class="tree">
-    <li>
+<ul class="c-tree">
+    <li class="c-tree__item-h">
         <mct-representation key="'tree-node'"
                             mct-object="domainObject"
                             ng-model="ngModel"

platform/commonUI/general/res/templates/tree/node.html

@@ -1,4 +1,2 @@
-<span class="tree-item menus-to-left">
-</span>
-<span class="tree-item-subtree">
-</span>
+<span class="c-tree__item js-tree__item"></span>
+<span class="c-tree__item-subtree"></span>

platform/commonUI/general/res/templates/tree/toggle.html

@@ -1,2 +1 @@
-<span class='ui-symbol view-control flex-elem'>
-</span>
+<span class='c-disclosure-triangle c-tree__item__view-control'></span>

platform/commonUI/general/res/templates/tree/tree-label.html

@@ -1,6 +1,4 @@
-<span class="rep-object-label">
-    <div class="t-object-label l-flex-row flex-elem grows">
-        <div class="t-item-icon flex-elem"></div>
-        <div class='t-title-label flex-elem grows'></div>
-    </div>
-</span>
+<div class="rep-object-label c-object-label c-tree__item__label">
+    <div class="c-object-label__type-icon c-tree__item__type-icon t-item-icon"></div>
+    <div class="c-object-label__name c-tree__item__name t-title-label"></div>
+</div>

platform/commonUI/general/src/actions/MCTPreviewAction.js

@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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 PREVIEW_TEMPLATE = '<mct-representation key="\'mct-preview\'"' +
-                                    'class="t-rep-frame holder"' +
-                                    'mct-object="domainObject">' +
-                                '</mct-representation>';
-
-        function MCTPreviewAction($compile, $rootScope, context) {
-            context = context || {};
-            this.domainObject = context.selectedObject || context.domainObject;
-            this.$rootScope = $rootScope;
-            this.$compile = $compile;
-        }
-
-        MCTPreviewAction.prototype.perform = function () {
-            var newScope = this.$rootScope.$new();
-            newScope.domainObject = this.domainObject;
-
-            this.$compile(PREVIEW_TEMPLATE)(newScope);
-        };
-
-        MCTPreviewAction.appliesTo = function (context) {
-            var domainObject = (context || {}).domainObject,
-                status = domainObject.getCapability('status');
-
-            return !(status && status.get('editing'));
-        };
-
-        return MCTPreviewAction;
-    }
-);

platform/commonUI/general/src/controllers/BannerController.js

@@ -50,7 +50,7 @@ define(
             };
             $scope.dismiss = function (notification, $event) {
                 $event.stopPropagation();
-                notification.dismissOrMinimize();
+                notification.dismiss();
             };
             $scope.maximize = function (notification) {
                 if (notification.model.severity !== "info") {
@@ -60,7 +60,7 @@ define(
                     };
                     //If the notification is dismissed by the user, close
                     // the dialog.
-                    notification.onDismiss(function () {
+                    notification.on('dismiss', function () {
                         dialog.dismiss();
                     });
 

platform/commonUI/general/src/directives/MCTPreview.js

@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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(['zepto', '../services/Overlay'], function ($, Overlay) {
-    function MCTPreview($document) {
-
-        function link($scope, $element) {
-            var actions = $scope.domainObject.getCapability('action'),
-                notebookAction = actions.getActions({key: 'notebook-new-entry'})[0];
-
-            var notebookButton = notebookAction ?
-                [
-                    {
-                        class: 'icon-notebook new-notebook-entry',
-                        title: 'New Notebook Entry',
-                        clickHandler: function (event) {
-                            event.stopPropagation();
-                            notebookAction.perform();
-                        }
-                    }
-                ] : [];
-
-            var overlayService = new Overlay({
-                $document: $document,
-                $element: $element[0],
-                $scope: $scope,
-                browseBarButtons: notebookButton
-            });
-
-            overlayService.toggleOverlay();
-
-            $scope.$on('$destroy', function () {
-                $element.remove();
-            });
-        }
-
-        return {
-            restrict: 'A',
-            link: link
-        };
-    }
-
-    return MCTPreview;
-
-});

platform/commonUI/general/src/directives/MCTSelectable.js

@@ -54,6 +54,7 @@ define(
                     if (isDestroyed) {
                         return;
                     }
+
                     var removeSelectable = openmct.selection.selectable(
                         element[0],
                         scope.$eval(attrs.mctSelectable),

platform/commonUI/general/src/services/UrlService.js

@@ -82,7 +82,7 @@ define(
             }
             var searchPath = "?" + arr.join('&'),
                 newTabPath =
-                    "index.html#" + this.urlForLocation(mode, domainObject) +
+                    "#" + this.urlForLocation(mode, domainObject) +
                             searchPath;
             return newTabPath;
         };

platform/commonUI/general/src/ui/ToggleView.js

@@ -37,9 +37,9 @@ define([
         this.expanded = state;
 
         if (state) {
-            this.el.addClass('expanded');
+            this.el.addClass('c-disclosure-triangle--expanded');
         } else {
-            this.el.removeClass('expanded');
+            this.el.removeClass('c-disclosure-triangle--expanded');
         }
 
         this.callbacks.forEach(function (callback) {

platform/commonUI/general/src/ui/TreeNodeView.js

@@ -28,7 +28,7 @@ define([
 ], function ($, nodeTemplate, ToggleView, TreeLabelView) {
 
     function TreeNodeView(gestureService, subtreeFactory, selectFn, openmct) {
-        this.li = $('<li>');
+        this.li = $('<li class="c-tree__item-h">');
         this.openmct = openmct;
         this.statusClasses = [];
 
@@ -38,7 +38,7 @@ define([
                 if (!this.subtreeView) {
                     this.subtreeView = subtreeFactory();
                     this.subtreeView.model(this.activeObject);
-                    this.li.find('.tree-item-subtree').eq(0)
+                    this.li.find('.c-tree__item-subtree').eq(0)
                         .append($(this.subtreeView.elements()));
                 }
                 $(this.subtreeView.elements()).removeClass('hidden');
@@ -85,9 +85,9 @@ define([
             var obj = domainObject.useCapability('adapter');
             var hasComposition =  this.openmct.composition.get(obj) !== undefined;
             if (hasComposition) {
-                $(this.toggleView.elements()).removeClass('no-children');
+                $(this.toggleView.elements()).addClass('is-enabled');
             } else {
-                $(this.toggleView.elements()).addClass('no-children');
+                $(this.toggleView.elements()).removeClass('is-enabled');
             }
         }
 
@@ -120,7 +120,7 @@ define([
             selectedIdPath = getIdPath(domainObject);
 
         if (this.onSelectionPath) {
-            this.li.find('.tree-item').eq(0).removeClass('selected');
+            this.li.find('.js-tree__item').eq(0).removeClass('is-selected');
             if (this.subtreeView) {
                 this.subtreeView.value(undefined);
             }
@@ -136,7 +136,7 @@ define([
 
         if (this.onSelectionPath) {
             if (activeIdPath.length === selectedIdPath.length) {
-                this.li.find('.tree-item').eq(0).addClass('selected');
+                this.li.find('.js-tree__item').eq(0).addClass('is-selected');
             } else {
                 // Expand to reveal the selection
                 this.toggleView.value(true);

platform/commonUI/general/src/ui/TreeView.js

@@ -27,7 +27,7 @@ define([
 ], function ($, TreeNodeView, spinnerTemplate) {
 
     function TreeView(gestureService, openmct, selectFn) {
-        this.ul = $('<ul class="tree"></ul>');
+        this.ul = $('<ul class="c-tree"></ul>');
         this.nodeViews = [];
         this.callbacks = [];
         this.selectFn = selectFn || this.value.bind(this);

platform/commonUI/general/test/controllers/ContextMenuControllerSpec.js

@@ -1,60 +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.
- *****************************************************************************/
-
-define(
-    ["../../src/controllers/ContextMenuController"],
-    function (ContextMenuController) {
-
-        describe("The context menu controller", function () {
-            var mockScope,
-                mockActions,
-                controller;
-
-            beforeEach(function () {
-                mockActions = jasmine.createSpyObj("action", ["getActions"]);
-                mockScope = jasmine.createSpyObj("$scope", ["$watch"]);
-                controller = new ContextMenuController(mockScope);
-            });
-
-            it("watches scope that may change applicable actions", function () {
-                // The action capability
-                expect(mockScope.$watch).toHaveBeenCalledWith(
-                    "action",
-                    jasmine.any(Function)
-                );
-            });
-
-            it("populates the scope with grouped and ungrouped actions", function () {
-                mockScope.action = mockActions;
-                mockScope.parameters = { category: "test" };
-
-                mockActions.getActions.and.returnValue(["a", "b", "c"]);
-
-                // Call the watch
-                mockScope.$watch.calls.mostRecent().args[1]();
-
-                // Should have grouped and ungrouped actions in scope now
-                expect(mockScope.menuActions.length).toEqual(3);
-            });
-        });
-    }
-);

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

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

platform/commonUI/notification/bundle.js

@@ -36,20 +36,6 @@ define([
 
     legacyRegistry.register("platform/commonUI/notification", {
         "extensions": {
-            "constants": [
-                {
-                    "key": "DEFAULT_AUTO_DISMISS",
-                    "value": 3000
-                },
-                {
-                    "key": "FORCE_AUTO_DISMISS",
-                    "value": 1000
-                },
-                {
-                    "key": "MINIMIZE_TIMEOUT",
-                    "value": 300
-                }
-            ],
             "templates": [
                 {
                     "key": "notificationIndicatorTemplate",
@@ -62,7 +48,7 @@ define([
                     "implementation": NotificationIndicatorController,
                     "depends": [
                         "$scope",
-                        "notificationService",
+                        "openmct",
                         "dialogService"
                     ]
                 }
@@ -76,12 +62,11 @@ define([
             "services": [
                 {
                     "key": "notificationService",
-                    "implementation": NotificationService,
+                    "implementation": function (openmct) {
+                        return new NotificationService.default(openmct);
+                    },
                     "depends": [
-                        "$timeout",
-                        "topic",
-                        "DEFAULT_AUTO_DISMISS",
-                        "MINIMIZE_TIMEOUT"
+                        "openmct"
                     ]
                 }
             ]