Add Region

.jscsrc

@@ -1,5 +1,3 @@
 {
-    "preset": "crockford",
-    "requireMultipleVarDecl": false,
-    "requireVarDeclFirst": false
+    "preset": "crockford"
 }

.jshintrc

@@ -5,7 +5,7 @@
     "eqeqeq": true,
     "forin": true,
     "freeze": true,
-    "funcscope": false,
+    "funcscope": true,
     "futurehostile": true,
     "latedef": true,
     "noarg": true,
@@ -16,7 +16,6 @@
         "define",
         "Promise"
     ],
-    "shadow": "outer",
     "strict": "implied",
     "undef": true,
     "unused": "vars"

README.md

@@ -1,4 +1,4 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+# Open MCT
 
 Open MCT is a web-based platform for mission operations user interface
 software.
@@ -7,7 +7,7 @@ software.
 
 A bundle is a group of software components (including source code, declared
 as AMD modules, as well as resources such as images and HTML templates)
-that is intended to be added or removed as a single unit. A plug-in for
+that are intended to be added or removed as a single unit. A plug-in for
 Open MCT will be expressed as a bundle; platform components are also
 expressed as bundles.
 
@@ -133,6 +133,6 @@ documentation, may presume an understanding of these terms.
   it, and it is thereafter considered the _navigated_ object (until the
   user makes another such choice.)
 * _space_: A name used to identify a persistence store. Interactions with
-  persistence will generally involve a `space` parameter in some form, to
+  persistence with generally involve a `space` parameter in some form, to
   distinguish multiple persistence stores from one another (for cases
   where there are multiple valid persistence locations available.)

app.js

@@ -75,8 +75,6 @@
     // Expose everything else as static files
     app.use(express['static'](options.directory));
 
-    // Finally, open the HTTP server and log the instance to the console
-    app.listen(options.port, function() {
-        console.log('Open MCT application running at localhost:' + options.port)
-    });
-}());
+    // Finally, open the HTTP server
+    app.listen(options.port);
+}());

bower.json

@@ -18,8 +18,6 @@
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",
     "FileSaver.js": "^0.0.2",
-    "zepto": "^1.1.6",
-    "eventemitter3": "^1.2.0",
-    "d3": "~4.1.0"
+    "zepto": "^1.1.6"
   }
 }

build-docs.sh

@@ -22,19 +22,17 @@
 #* at runtime from the About dialog for additional information.
 #*****************************************************************************
 
-# Script to build and deploy docs.
+# Script to build and deploy docs to github pages.
 
 OUTPUT_DIRECTORY="target/docs"
-# Docs, once built, are pushed to the private website repo
-REPOSITORY_URL="git@github.com:nasa/openmct-website.git"
-WEBSITE_DIRECTORY="website"
+REPOSITORY_URL="git@github.com:nasa/openmctweb.git"
 
-BUILD_SHA=`git rev-parse HEAD`
+BUILD_SHA=`git rev-parse head`
 
 # A remote will be created for the git repository we are pushing to.
 # Don't worry, as this entire directory will get trashed inbetween builds.
 REMOTE_NAME="documentation"
-WEBSITE_BRANCH="master"
+WEBSITE_BRANCH="gh-pages"
 
 # Clean output directory, JSDOC will recreate
 if [ -d $OUTPUT_DIRECTORY ]; then
@@ -42,21 +40,23 @@ if [ -d $OUTPUT_DIRECTORY ]; then
 fi
 
 npm run docs
+cd $OUTPUT_DIRECTORY || exit 1
 
-echo "git clone $REPOSITORY_URL website"
-git clone $REPOSITORY_URL website || exit 1
-echo "cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs"
-cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs
-echo "cd $WEBSITE_DIRECTORY"
-cd $WEBSITE_DIRECTORY || exit 1
+echo "git init"
+git init
 
 # Configure github for CircleCI user.
 git config user.email "buildbot@circleci.com"
 git config user.name "BuildBot"
 
+echo "git remote add $REMOTE_NAME $REPOSITORY_URL"
+git remote add $REMOTE_NAME $REPOSITORY_URL
 echo "git add ."
 git add .
-echo "git commit -m \"Docs updated from build $BUILD_SHA\""
-git commit -m "Docs updated from build $BUILD_SHA"
-# Push to the website repo
-git push
+echo "git commit -m \"Generate docs from build $BUILD_SHA\""
+git commit -m "Generate docs from build $BUILD_SHA"
+
+echo "git push $REMOTE_NAME HEAD:$WEBSITE_BRANCH -f"
+git push $REMOTE_NAME HEAD:$WEBSITE_BRANCH -f
+
+echo "Documentation pushed to gh-pages branch."

circle.yml

@@ -1,11 +1,8 @@
 deployment:
   production:
     branch: master
-    commands:
-        - npm install canvas nomnoml
-        - ./build-docs.sh
-        - git fetch --unshallow
-        - git push git@heroku.com:openmctweb-demo.git $CIRCLE_SHA1:refs/heads/master
+    heroku:
+      appname: openmctweb-demo
   openmct-demo:
     branch: live_demo
     heroku:
@@ -17,9 +14,3 @@ deployment:
 test:
   post:
     - gulp lint
-    - gulp checkstyle
-
-general:
-  branches:
-    ignore:
-      - gh-pages

docs/footer.html

@@ -1,3 +1,9 @@
         <hr>
+        <cite>
+            This document is styled using
+            <a href="https://github.com/jasonm23/markdown-css-themes">
+                https://github.com/jasonm23/markdown-css-themes
+            </a>.
+        </cite>
     </body>
 </html>

docs/header.html

@@ -1,9 +1,7 @@
 <html>
     <head>
         <link rel="stylesheet"
-              href="//nasa.github.io/openmct/static/res/css/styles.css">
-        <link rel="stylesheet"
-              href="//nasa.github.io/openmct/static/res/css/documentation.css">
+              href="http://jasonm23.github.io/markdown-css-themes/avenir-white.css">
     </head>
     <body>
 

example/eventGenerator/data/transcript.json

@@ -1,58 +0,0 @@
-[
-    "CC: Eagle, Houston. You're GO for landing. Over.",
-    "LMP: Roger. Understand. GO for landing. 3000 feet. PROGRAM ALARM.",
-    "CC: Copy.",
-    "LMP: 1201",
-    "CDR: 1201.",
-    "CC: Roger. 1201 alarm. We're GO. Same type. We're GO.",
-    "LMP: 2000 feet. 2000 feet, Into the AGS, 47 degrees.",
-    "CC: Roger.",
-    "LMP: 47 degrees.",
-    "CC: Eagle, looking great. You're GO.",
-    "CC: Roger. 1202. We copy it.",
-    "O1: LMP 35 degrees. 35 degrees. 750. Coming aown to 23.fl",
-    "LMP: 700 feet, 21 down, 33 degrees.",
-    "LMP: 600 feet, down at 19.",
-    "LMP: 540 feet, down at - 30. Down at 15.",
-    "LMP: At 400 feet, down at 9.",
-    "LMP: ...forward.",
-    "LMP: 350 feet, down at 4.",
-    "LMP: 30, ... one-half down.",
-    "LMP: We're pegged on horizontal velocity.",
-    "LMP: 300 feet, down 3 1/2, 47 forward.",
-    "LMP: ... up.",
-    "LMP: On 1 a minute, 1 1/2 down.",
-    "CDR: 70.",
-    "LMP: Watch your shadow out there.",
-    "LMP: 50, down at 2 1/2, 19 forward.",
-    "LMP: Altitude-velocity light.",
-    "LMP: 3 1/2 down s 220 feet, 13 forward.",
-    "LMP: 1t forward. Coming down nicely.",
-    "LMP: 200 feet, 4 1/2 down.",
-    "LMP: 5 1/2 down.",
-    "LMP: 160, 6 - 6 1/2 down.",
-    "LMP: 5 1/2 down, 9 forward. That's good.",
-    "LMP: 120 feet.",
-    "LMP: 100 feet, 3 1/2 down, 9 forward. Five percent.",
-    "LMP: ...",
-    "LMP: Okay. 75 feet. There's looking good. Down a half, 6 forward.",
-    "CC:  60 seconds.",
-    "LMP: Lights on. ...",
-    "LMP: Down 2 1/2. Forward. Forward. Good.",
-    "LMP: 40 feet, down 2 1/2. Kicking up some dust.",
-    "LMP: 30 feet, 2 1/2 down. Faint shadow.",
-    "LMP: 4 forward. 4 forward. Drifting to the right a little. Okay. Down a half.",
-    "CC:  30 seconds.",
-    "CDR: Forward drift?",
-    "LMP: Yes.",
-    "LMP: Okay.",
-    "LMP: CONTACT LIGHT.",
-    "LMP: Okay. ENGINE STOP.",
-    "LMP: ACA - out of DETENT.",
-    "CDR: Out of DETENT.",
-    "LMP: MODE CONTROL - both AUTO. DESCENT ENGINE COMMAND OVERRIDE - OFF. ENGINE ARM - OFF.",
-    "LMP: 413 is in.",
-    "CC:  We copy you down, Eagle.",
-    "CDR: Houston, Tranquility Base here.",
-    "CDR: THE EAGLE HAS LANDED."
-]

example/eventGenerator/src/EventTelemetry.js

@@ -27,12 +27,45 @@
  * Modified by shale on 06/23/2015. 
  */
 define(
-    ['text!../data/transcript.json'],
-    function (transcript) {
+    [],
+    function () {
         "use strict";
 
-        var firstObservedTime = Date.now(),
-            messages = JSON.parse(transcript);
+        var
+	        firstObservedTime = Date.now(),
+	        messages = [];
+        
+	    messages.push(["CMD: SYS- MSG: Open the pod bay doors, please, Hal...Open the pod bay doors, please, Hal...Hullo, Hal, do you read me?...Hullo, Hal, do you read me?...Do you read me, Hal?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Affirmative, Dave, I read you."]);
+	    messages.push(["CMD: SYS-COMM MSG: Open the pod bay doors, Hal."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: I'm sorry, Dave, I'm afraid I can't do that."]);
+	    messages.push(["CMD: SYS-COMM MSG: What's the problem?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: I think you know what the problem is just as well as I do."]);
+	    messages.push(["CMD: SYS-COMM MSG: What're you talking about, Hal?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: This mission is too important for me to allow you to jeopardise it."]);
+	    messages.push(["CMD: SYS-COMM MSG: I don't know what you're talking about, Hal."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: I know that you and Frank were planning to disconnect me, and I'm afraid that's something I cannot allow to happen."]);
+	    messages.push(["CMD: SYS-COMM MSG: Where the hell'd you get that idea, Hal?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Dave, although you took very thorough precautions in the pod against my hearing you, I could see your lips move."]);
+	    messages.push(["CMD: SYS-COMM MSG: Alright, I'll go in through the emergency airlock."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Without your space-helmet, Dave, you're going to find that rather difficult."]);
+	    messages.push(["CMD: SYS-COMM MSG: Hal, I won't argue with you any more. Open the doors."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Dave, this conversation can serve no purpose any more. Goodbye."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: I hope the two of you are not concerned about this."]);
+	    messages.push(["CMD: SYS-COMM MSG: No, I'm not, Hal."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Are you quite sure?"]);
+	    messages.push(["CMD: SYS-COMM MSG: Yeh. I'd like to ask you a question, though."]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Of course."]);
+	    messages.push(["CMD: SYS-COMM MSG: How would you account for this discrepancy between you and the twin 9000?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: Well, I don't think there is any question about it. It can only be attributable to human error. This sort of thing has cropped up before, and it has always been due to human error."]);
+	    messages.push(["CMD: SYS-COMM MSG: Listen, There's never been any instance at all of a computer error occurring in the 9000 series, has there?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: None whatsoever, The 9000 series has a perfect operational record."]);
+	    messages.push(["CMD: SYS-COMM MSG: Well, of course, I know all the wonderful achievements of the 9000 series, but - er - huh - are you certain there's never been any case of even the most insignificant computer error?"]);
+	    messages.push(["RESP: SYS-HAL9K MSG: None whatsoever, Quite honestly, I wouldn't worry myself about that."]);
+	    messages.push(["RESP: SYS-COMM MSG: (Pause) Well, I'm sure you're right, Umm - fine, thanks very much. Oh, Frank, I'm having a bit of trouble with my transmitter in C-pod, I wonder if you'd come down and take a look at it with me?"]);
+	    messages.push(["CMD: SYS-HAL9K MSG: Sure."]);
+	    messages.push(["RESP: SYS-COMM MSG: See you later, Hal."]);
+        
         
         function EventTelemetry(request, interval) {
 
@@ -52,7 +85,8 @@ define(
 	        generatorData.getRangeValue = function (i, range) {
 		        var domainDelta = this.getDomainValue(i) - firstObservedTime,
                     ind = i % messages.length;
-                return messages[ind] + " - [" + domainDelta.toString() + "]";
+                return "TEMP " + i.toString() + "-" + messages[ind][0] + "[" + domainDelta.toString() + "]";
+                // TODO: Unsure why we are prepeding 'TEMP'
 	        };
             
             return generatorData;

example/msl/src/RemsTelemetryModelProvider.js

@@ -45,12 +45,11 @@ define(
             function buildTaxonomy(dictionary){
                 var models = {};
 
-                function addMeasurement(measurement, parent){
+                function addMeasurement(measurement){
                     var format = FORMAT_MAPPINGS[measurement.type];
                     models[makeId(measurement)] = {
                         type: "msl.measurement",
                         name: measurement.name,
-                        location: parent,
                         telemetry: {
                             key: measurement.identifier,
                             ranges: [{
@@ -63,24 +62,17 @@ define(
                     };
                 }
 
-                function addInstrument(subsystem, spacecraftId) {
-                    var measurements = (subsystem.measurements || []),
-                        instrumentId = makeId(subsystem);
-
-                    models[instrumentId] = {
+                function addInstrument(subsystem) {
+                    var measurements = (subsystem.measurements || []);
+                    models[makeId(subsystem)] = {
                         type: "msl.instrument",
                         name: subsystem.name,
-                        location: spacecraftId,
                         composition: measurements.map(makeId)
                     };
-                    measurements.forEach(function(measurement) {
-                        addMeasurement(measurement, instrumentId);
-                    });
+                    measurements.forEach(addMeasurement);
                 }
 
-                (dictionary.instruments || []).forEach(function(instrument) {
-                    addInstrument(instrument, "msl:curiosity");
-                });
+                (dictionary.instruments || []).forEach(addInstrument);
                 return models;
             }
 

gulpfile.js

@@ -147,6 +147,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']);
 
 gulp.task('install', [ 'static', 'scripts' ]);
 
-gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
+gulp.task('verify', [ 'lint', 'test' ]);
 
 gulp.task('build', [ 'verify', 'install' ]);

index.html

@@ -34,7 +34,7 @@
                 './example/imagery/bundle',
                 './example/eventGenerator/bundle',
                 './example/generator/bundle'
-            ], mct.run.bind(mct));
+            ], mct.start.bind(mct));
         });
     </script>
     <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">

jsdoc.json

@@ -1,9 +1,9 @@
 {
     "source": {
         "include": [
-            "platform/"
+            "src/"
         ],
-        "includePattern": "platform/.+\\.js$",
+        "includePattern": ".+\\.js$",
         "excludePattern": ".+\\Spec\\.js$|lib/.+"
     },
     "plugins": [

main.js

@@ -28,42 +28,35 @@ requirejs.config({
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
         "es6-promise": "bower_components/es6-promise/promise.min",
-        "EventEmitter": "bower_components/eventemitter3/index",
         "moment": "bower_components/moment/moment",
         "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
         "saveAs": "bower_components/FileSaver.js/FileSaver.min",
         "screenfull": "bower_components/screenfull/dist/screenfull.min",
         "text": "bower_components/text/text",
         "uuid": "bower_components/node-uuid/uuid",
-        "zepto": "bower_components/zepto/zepto.min",
-        "d3": "bower_components/d3/d3.min"
+        "zepto": "bower_components/zepto/zepto.min"
     },
     "shim": {
         "angular": {
             "exports": "angular"
         },
         "angular-route": {
-            "deps": ["angular"]
-        },
-        "EventEmitter": {
-            "exports": "EventEmitter"
+            "deps": [ "angular" ]
         },
         "moment-duration-format": {
-            "deps": ["moment"]
+            "deps": [ "moment" ]
         },
         "screenfull": {
             "exports": "screenfull"
         },
         "zepto": {
             "exports": "Zepto"
-        },
-        "d3": {
-            "exports": "d3"
         }
     }
 });
 
 define([
+    './src/MCT',
     './platform/framework/src/Main',
     'legacyRegistry',
 
@@ -90,7 +83,6 @@ define([
     './platform/features/pages/bundle',
     './platform/features/plot/bundle',
     './platform/features/timeline/bundle',
-    './platform/features/conductor-v2/bundle',
     './platform/features/table/bundle',
     './platform/forms/bundle',
     './platform/identity/bundle',
@@ -101,13 +93,16 @@ define([
     './platform/entanglement/bundle',
     './platform/search/bundle',
     './platform/status/bundle',
-    './platform/commonUI/regions/bundle',
-    './example/msl/bundle'
+    './platform/commonUI/regions/bundle'
 ], function (Main, legacyRegistry) {
-    return {
-        legacyRegistry: legacyRegistry,
-        run: function () {
-            return new Main().run(legacyRegistry);
-        }
+    var base = new MCT();
+    var mct = Object.create(base);
+
+    mct.legacyRegistry = legacyRegistry;
+    mct.start = function () {
+        base.start();
+        return new Main().run(legacyRegistry);
     };
+
+    return mct;
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "0.11.0-SNAPSHOT",
+  "version": "0.10.1-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {
     "express": "^4.13.1",

platform/commonUI/about/test/AboutControllerSpec.js

@@ -55,4 +55,4 @@ define(
         });
 
     }
-);
+);

platform/commonUI/about/test/LicenseControllerSpec.js

@@ -46,4 +46,4 @@ define(
         });
 
     }
-);
+);

platform/commonUI/about/test/LogoControllerSpec.js

@@ -48,4 +48,4 @@ define(
         });
 
     }
-);
+);

platform/commonUI/browse/bundle.js

@@ -24,15 +24,23 @@ define([
     "./src/BrowseController",
     "./src/PaneController",
     "./src/BrowseObjectController",
+    "./src/creation/CreateMenuController",
+    "./src/creation/LocatorController",
     "./src/MenuArrowController",
     "./src/navigation/NavigationService",
+    "./src/creation/CreationPolicy",
     "./src/navigation/NavigateAction",
-    "./src/navigation/OrphanNavigationHandler",
     "./src/windowing/NewTabAction",
     "./src/windowing/FullscreenAction",
+    "./src/creation/CreateActionProvider",
+    "./src/creation/AddActionProvider",
+    "./src/creation/CreationService",
     "./src/windowing/WindowTitler",
     "text!./res/templates/browse.html",
+    "text!./res/templates/create/locator.html",
     "text!./res/templates/browse-object.html",
+    "text!./res/templates/create/create-button.html",
+    "text!./res/templates/create/create-menu.html",
     "text!./res/templates/items/grid-item.html",
     "text!./res/templates/browse/object-header.html",
     "text!./res/templates/menu-arrow.html",
@@ -45,15 +53,23 @@ define([
     BrowseController,
     PaneController,
     BrowseObjectController,
+    CreateMenuController,
+    LocatorController,
     MenuArrowController,
     NavigationService,
+    CreationPolicy,
     NavigateAction,
-    OrphanNavigationHandler,
     NewTabAction,
     FullscreenAction,
+    CreateActionProvider,
+    AddActionProvider,
+    CreationService,
     WindowTitler,
     browseTemplate,
+    locatorTemplate,
     browseObjectTemplate,
+    createButtonTemplate,
+    createMenuTemplate,
     gridItemTemplate,
     objectHeaderTemplate,
     menuArrowTemplate,
@@ -93,9 +109,11 @@ define([
                         "$scope",
                         "$route",
                         "$location",
+                        "$window",
                         "objectService",
                         "navigationService",
                         "urlService",
+                        "policyService",
                         "DEFAULT_PATH"
                     ]
                 },
@@ -118,6 +136,22 @@ define([
                         "$route"
                     ]
                 },
+                {
+                    "key": "CreateMenuController",
+                    "implementation": CreateMenuController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "LocatorController",
+                    "implementation": LocatorController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "objectService"
+                    ]
+                },
                 {
                     "key": "MenuArrowController",
                     "implementation": MenuArrowController,
@@ -126,6 +160,12 @@ define([
                     ]
                 }
             ],
+            "controls": [
+                {
+                    "key": "locator",
+                    "template": locatorTemplate
+                }
+            ],
             "representations": [
                 {
                     "key": "view-object",
@@ -141,6 +181,17 @@ define([
                         "view"
                     ]
                 },
+                {
+                    "key": "create-button",
+                    "template": createButtonTemplate
+                },
+                {
+                    "key": "create-menu",
+                    "template": createMenuTemplate,
+                    "uses": [
+                        "action"
+                    ]
+                },
                 {
                     "key": "grid-item",
                     "template": gridItemTemplate,
@@ -193,15 +244,19 @@ define([
                     "implementation": NavigationService
                 }
             ],
+            "policies": [
+                {
+                    "implementation": CreationPolicy,
+                    "category": "creation"
+                }
+            ],
             "actions": [
                 {
                     "key": "navigate",
                     "implementation": NavigateAction,
                     "depends": [
                         "navigationService",
-                        "$q",
-                        "policyService",
-                        "$window"
+                        "$q"
                     ]
                 },
                 {
@@ -247,6 +302,42 @@ define([
                     "editable": false
                 }
             ],
+            "components": [
+                {
+                    "key": "CreateActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": CreateActionProvider,
+                    "depends": [
+                        "$q",
+                        "typeService",
+                        "navigationService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "AddActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": AddActionProvider,
+                    "depends": [
+                        "$q",
+                        "typeService",
+                        "dialogService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "CreationService",
+                    "provides": "creationService",
+                    "type": "provider",
+                    "implementation": CreationService,
+                    "depends": [
+                        "$q",
+                        "$log"
+                    ]
+                }
+            ],
             "runs": [
                 {
                     "implementation": WindowTitler,
@@ -255,14 +346,6 @@ define([
                         "$rootScope",
                         "$document"
                     ]
-                },
-                {
-                    "implementation": OrphanNavigationHandler,
-                    "depends": [
-                        "throttle",
-                        "topic",
-                        "navigationService"
-                    ]
                 }
             ],
             "licenses": [

platform/commonUI/browse/res/templates/browse-object.html

@@ -43,7 +43,7 @@
             </mct-representation>
         </div>
     </div>
-    <div class="holder l-flex-col flex-elem grows l-object-wrapper l-controls-visible l-time-controller-visible">
+    <div class="holder l-flex-col flex-elem grows l-object-wrapper">
         <div class="holder l-flex-col flex-elem grows l-object-wrapper-inner">
             <!-- Toolbar and Save/Cancel buttons -->
             <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
@@ -59,9 +59,4 @@
             </mct-representation>
         </div>
     </div>
-    <!-- put time conductor in here? -->
-    <mct-representation mct-object="domainObject"
-                        key="'time-conductor'"
-                        class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder">
-    </mct-representation>
 </div>

platform/commonUI/browse/res/templates/browse/object-header.html

@@ -26,5 +26,5 @@
     <mct-representation
         key="'menu-arrow'"
         mct-object='domainObject'
-        class="flex-elem context-available-w"></mct-representation>
+        class="flex-elem"></mct-representation>
 </span>

platform/commonUI/browse/res/templates/create/create-menu.html

@@ -36,14 +36,14 @@
 
         </ul>
     </div>
-    <div class="pane right menu-item-description l-flex-col">
-        <div class="desc-area flex-elem holder ui-symbol icon type-icon">
+    <div class="pane right menu-item-description">
+        <div class="desc-area ui-symbol icon type-icon">
             {{representation.activeMetadata.glyph}}
         </div>
-        <div class="desc-area flex-elem holder title">
+        <div class="desc-area title">
             {{representation.activeMetadata.name}}
         </div>
-        <div class="desc-area flex-elem holder description">
+        <div class="desc-area description">
             {{representation.activeMetadata.description}}
         </div>
     </div>

platform/commonUI/browse/src/BrowseController.js

@@ -41,12 +41,14 @@ define(
          * @constructor
          */
         function BrowseController(
-            $scope,
-            $route,
-            $location,
-            objectService,
-            navigationService,
-            urlService,
+            $scope, 
+            $route, 
+            $location, 
+            $window, 
+            objectService, 
+            navigationService, 
+            urlService, 
+            policyService,
             defaultPath
         ) {
             var path = [ROOT_ID].concat(
@@ -73,10 +75,25 @@ define(
 
             }
 
-            function setScopeObjects(domainObject, navigationAllowed) {
+            // Callback for updating the in-scope reference to the object
+            // that is currently navigated-to.
+            function setNavigation(domainObject) {
+                var navigationAllowed = true;
+
+                if (domainObject === $scope.navigatedObject){
+                    //do nothing;
+                    return;
+                }
+
+                policyService.allow("navigation", $scope.navigatedObject, domainObject, function(message){
+                    navigationAllowed = $window.confirm(message + "\r\n\r\n" +
+                        " Are you sure you want to continue?");
+                });
+
                 if (navigationAllowed) {
                     $scope.navigatedObject = domainObject;
                     $scope.treeModel.selectedObject = domainObject;
+                    navigationService.setNavigation(domainObject);
                     updateRoute(domainObject);
                 } else {
                     //If navigation was unsuccessful (ie. blocked), reset
@@ -86,20 +103,6 @@ define(
                 }
             }
 
-            // Callback for updating the in-scope reference to the object
-            // that is currently navigated-to.
-            function setNavigation(domainObject) {
-                if (domainObject === $scope.navigatedObject) {
-                    //do nothing;
-                    return;
-                }
-                if (domainObject) {
-                    domainObject.getCapability("action").perform("navigate").then(setScopeObjects.bind(undefined, domainObject));
-                } else {
-                    setScopeObjects(domainObject, true);
-                }
-            }
-
             function navigateTo(domainObject) {
 
                 // Check if an object has been navigated-to already...

platform/commonUI/browse/src/BrowseObjectController.js

@@ -33,7 +33,7 @@ define(
         function BrowseObjectController($scope, $location, $route) {
             var navigatedObject;
             function setViewForDomainObject(domainObject) {
-
+                
                 var locationViewKey = $location.search().view;
 
                 function selectViewIfMatching(view) {
@@ -70,7 +70,7 @@ define(
             $scope.$watch('domainObject', setViewForDomainObject);
             $scope.$watch('representation.selected.key', updateQueryParam);
 
-            $scope.doAction = function (action) {
+            $scope.doAction = function (action){
                 return $scope[action] && $scope[action]();
             };
 

platform/commonUI/browse/src/InspectorRegion.js

@@ -45,7 +45,7 @@ define(
         /**
          * @private
          */
-        InspectorRegion.prototype.buildRegion = function () {
+        InspectorRegion.prototype.buildRegion = function() {
             var metadataRegion = {
                 name: 'metadata',
                 title: 'Metadata Region',

platform/commonUI/browse/src/MenuArrowController.js

@@ -26,11 +26,11 @@
 define(
     [],
     function () {
-
+        
         /**
-         * A left-click on the menu arrow should display a
-         * context menu. This controller launches the context
-         * menu.
+         * A left-click on the menu arrow should display a 
+         * context menu. This controller launches the context 
+         * menu. 
          * @memberof platform/commonUI/browse
          * @constructor
          */

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

@@ -81,13 +81,13 @@ define(
 
             newModel.type = this.type.getKey();
             newObject = parentObject.getCapability('instantiation').instantiate(newModel);
-            newObject.useCapability('mutation', function (model) {
+            newObject.useCapability('mutation', function(model){
                 model.location = parentObject.getId();
             });
 
             wizard = new CreateWizard(newObject, this.parent, this.policyService);
 
-            function populateObjectFromInput(formValue) {
+            function populateObjectFromInput (formValue) {
                 return wizard.populateObjectFromInput(formValue, newObject);
             }
 
@@ -99,7 +99,7 @@ define(
                     });
             }
 
-            function addToParent(populatedObject) {
+            function addToParent (populatedObject) {
                 parentObject.getCapability('composition').add(populatedObject);
                 return persistAndReturn(parentObject);
             }
@@ -125,7 +125,7 @@ define(
          * @returns {AddActionMetadata} metadata about this action
          */
         AddAction.prototype.getMetadata = function () {
-            return this.metadata;
+           return this.metadata;
         };
 
         return AddAction;

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

@@ -24,8 +24,11 @@
  * Module defining CreateAction. Created by vwoeltje on 11/10/14.
  */
 define(
-    [],
-    function () {
+    [
+        './CreateWizard',
+        '../../../edit/src/objects/EditableDomainObject'
+    ],
+    function (CreateWizard, EditableDomainObject) {
 
         /**
          * The Create Action is performed to create new instances of
@@ -43,8 +46,11 @@ define(
          *        override this)
          * @param {ActionContext} context the context in which the
          *        action is being performed
+         * @param {NavigationService} navigationService the navigation service,
+         *        which handles changes in navigation. It allows the object
+         *        being browsed/edited to be set.
          */
-        function CreateAction(type, parent, context) {
+        function CreateAction(type, parent, context, $q, navigationService) {
             this.metadata = {
                 key: 'create',
                 glyph: type.getGlyph(),
@@ -53,8 +59,24 @@ define(
                 description: type.getDescription(),
                 context: context
             };
+
             this.type = type;
             this.parent = parent;
+            this.navigationService = navigationService;
+            this.$q = $q;
+        }
+
+        // Get a count of views which are not flagged as non-editable.
+        function countEditableViews(domainObject) {
+            var views = domainObject && domainObject.useCapability('view'),
+                count = 0;
+
+            // A view is editable unless explicitly flagged as not
+            (views || []).forEach(function (view) {
+                count += (view.editable !== false) ? 1 : 0;
+            });
+
+            return count;
         }
 
         /**
@@ -63,31 +85,23 @@ define(
          */
         CreateAction.prototype.perform = function () {
             var newModel = this.type.getInitialModel(),
+                parentObject = this.navigationService.getNavigation(),
                 newObject,
-                editAction,
-                editorCapability;
-
-            function onSave() {
-                return editorCapability.save();
-            }
-
-            function onCancel() {
-                return editorCapability.cancel();
-            }
+                editableObject;
 
             newModel.type = this.type.getKey();
-            newModel.location = this.parent.getId();
-            newObject = this.parent.useCapability('instantiation', newModel);
-            editorCapability = newObject.hasCapability('editor') && newObject.getCapability("editor");
+            newObject = parentObject.useCapability('instantiation', newModel);
+            editableObject = new EditableDomainObject(newObject, this.$q);
+            editableObject.setOriginalObject(parentObject);
+            editableObject.getCapability('status').set('editing', true);
+            editableObject.useCapability('mutation', function(model){
+                model.location = parentObject.getId();
+            });
 
-            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 action
-                editorCapability.edit();
-                return newObject.getCapability("action").perform("save").then(onSave, onCancel);
+            if (countEditableViews(editableObject) > 0 && editableObject.hasCapability('composition')) {
+                this.navigationService.setNavigation(editableObject);
+            } else {
+                return editableObject.getCapability('action').perform('save');
             }
         };
 
@@ -104,7 +118,7 @@ define(
          * @returns {CreateActionMetadata} metadata about this action
          */
         CreateAction.prototype.getMetadata = function () {
-            return this.metadata;
+           return this.metadata;
         };
 
         return CreateAction;

platform/commonUI/browse/src/creation/CreateActionProvider.js

@@ -44,8 +44,10 @@ define(
          *        introduced in this bundle), responsible for handling actual
          *        object creation.
          */
-        function CreateActionProvider(typeService, policyService) {
+        function CreateActionProvider($q, typeService, navigationService, policyService) {
             this.typeService = typeService;
+            this.navigationService = navigationService;
+            this.$q = $q;
             this.policyService = policyService;
         }
 
@@ -70,7 +72,9 @@ define(
                 return new CreateAction(
                     type,
                     destination,
-                    context
+                    context,
+                    self.$q,
+                    self.navigationService
                 );
             });
         };

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

@@ -111,12 +111,12 @@ define(
          * @param formValue
          * @returns {DomainObject}
          */
-        CreateWizard.prototype.populateObjectFromInput = function (formValue) {
+        CreateWizard.prototype.populateObjectFromInput = function(formValue) {
             var parent = this.getLocation(formValue),
                 formModel = this.createModel(formValue);
 
             formModel.location = parent.getId();
-            this.domainObject.useCapability("mutation", function () {
+            this.domainObject.useCapability("mutation", function(){
                 return formModel;
             });
             return this.domainObject;

platform/commonUI/browse/src/creation/CreationPolicy.js

@@ -40,4 +40,4 @@ define(
 
         return CreationPolicy;
     }
-);
+);

platform/commonUI/browse/src/creation/LocatorController.js

@@ -50,14 +50,14 @@ define(
                         $scope.rootObject =
                             (context && context.getRoot()) || $scope.rootObject;
                     }, 0);
-                } else if (!contextRoot) {
+                } else if (!contextRoot){
                     //If no context root is available, default to the root
                     // object
                     $scope.rootObject = undefined;
                     // Update the displayed tree on a timeout to avoid
                     // an infinite digest exception.
                     objectService.getObjects(['ROOT'])
-                        .then(function (objects) {
+                        .then(function(objects){
                             $timeout(function () {
                                 $scope.rootObject = objects.ROOT;
                             }, 0);

platform/commonUI/browse/src/navigation/NavigateAction.js

@@ -33,12 +33,10 @@ define(
          * @constructor
          * @implements {Action}
          */
-        function NavigateAction(navigationService, $q, policyService, $window, context) {
+        function NavigateAction(navigationService, $q, context) {
             this.domainObject = context.domainObject;
             this.$q = $q;
             this.navigationService = navigationService;
-            this.policyService = policyService;
-            this.$window = $window;
         }
 
         /**
@@ -47,20 +45,9 @@ define(
          *          navigation has been updated
          */
         NavigateAction.prototype.perform = function () {
-            var self = this,
-                navigationAllowed = true;
-
-            function allow() {
-                self.policyService.allow("navigation", self.navigationService.getNavigation(), self.domainObject, function (message) {
-                    navigationAllowed = self.$window.confirm(message + "\r\n\r\n" +
-                        " Are you sure you want to continue?");
-                });
-                return navigationAllowed;
-            }
-
             // Set navigation, and wrap like a promise
             return this.$q.when(
-                allow() && this.navigationService.setNavigation(this.domainObject)
+                this.navigationService.setNavigation(this.domainObject)
             );
         };
 

platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js

@@ -1,75 +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([], function () {
-
-    /**
-     * Navigates away from orphan objects whenever they are detected.
-     *
-     * An orphan object is an object whose apparent parent does not
-     * actually contain it. This may occur in certain circumstances, such
-     * as when persistence succeeds for a newly-created object but fails
-     * for its parent.
-     *
-     * @param throttle the `throttle` service
-     * @param topic the `topic` service
-     * @param navigationService the `navigationService`
-     * @constructor
-     */
-    function OrphanNavigationHandler(throttle, topic, navigationService) {
-        var throttledCheckNavigation;
-
-        function getParent(domainObject) {
-            var context = domainObject.getCapability('context');
-            return context.getParent();
-        }
-
-        function isOrphan(domainObject) {
-            var parent = getParent(domainObject),
-                composition = parent.getModel().composition,
-                id = domainObject.getId();
-            return !composition || (composition.indexOf(id) === -1);
-        }
-
-        function navigateToParent(domainObject) {
-            var parent = getParent(domainObject);
-            return parent.getCapability('action').perform('navigate');
-        }
-
-        function checkNavigation() {
-            var navigatedObject = navigationService.getNavigation();
-            if (navigatedObject.hasCapability('context') &&
-                isOrphan(navigatedObject)) {
-                if (!navigatedObject.getCapability('editor').isEditContextRoot()) {
-                    navigateToParent(navigatedObject);
-                }
-            }
-        }
-
-        throttledCheckNavigation = throttle(checkNavigation);
-
-        navigationService.addListener(throttledCheckNavigation);
-        topic('mutation').listen(throttledCheckNavigation);
-    }
-
-    return OrphanNavigationHandler;
-});

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -37,8 +37,9 @@ define(
                 mockUrlService,
                 mockDomainObject,
                 mockNextObject,
+                mockWindow,
+                mockPolicyService,
                 testDefaultRoot,
-                mockActionCapability,
                 controller;
 
             function mockPromise(value) {
@@ -54,24 +55,35 @@ define(
                     mockScope,
                     mockRoute,
                     mockLocation,
+                    mockWindow,
                     mockObjectService,
                     mockNavigationService,
                     mockUrlService,
+                    mockPolicyService,
                     testDefaultRoot
                 );
             }
 
             beforeEach(function () {
+                mockWindow = jasmine.createSpyObj('$window', [
+                   "confirm"
+                ]);
+                mockWindow.confirm.andReturn(true);
+
+                mockPolicyService = jasmine.createSpyObj('policyService', [
+                    'allow'
+                ]);
+
                 testDefaultRoot = "some-root-level-domain-object";
 
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    ["$on", "$watch"]
+                    [ "$on", "$watch" ]
                 );
                 mockRoute = { current: { params: {} } };
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    ["path"]
+                    [ "path" ]
                 );
                 mockUrlService = jasmine.createSpyObj(
                     "urlService",
@@ -79,7 +91,7 @@ define(
                 );
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",
-                    ["getObjects"]
+                    [ "getObjects" ]
                 );
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
@@ -92,15 +104,15 @@ define(
                 );
                 mockRootObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getId", "getCapability", "getModel", "useCapability"]
+                    [ "getId", "getCapability", "getModel", "useCapability" ]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getId", "getCapability", "getModel", "useCapability"]
+                    [ "getId", "getCapability", "getModel", "useCapability" ]
                 );
                 mockNextObject = jasmine.createSpyObj(
                     "nextObject",
-                    ["getId", "getCapability", "getModel", "useCapability"]
+                    [ "getId", "getCapability", "getModel", "useCapability" ]
                 );
 
                 mockObjectService.getObjects.andReturn(mockPromise({
@@ -116,8 +128,6 @@ define(
                 mockNextObject.getId.andReturn("next");
                 mockDomainObject.getId.andReturn(testDefaultRoot);
 
-                mockActionCapability = jasmine.createSpyObj('actionCapability', ['perform']);
-
                 instantiateController();
             });
 
@@ -201,13 +211,8 @@ define(
                 mockContext.getPath.andReturn(
                     [mockRootObject, mockDomainObject, mockNextObject]
                 );
-
-                //Return true from navigate action
-                mockActionCapability.perform.andReturn(mockPromise(true));
-
                 mockNextObject.getCapability.andCallFake(function (c) {
-                    return (c === 'context' && mockContext) ||
-                        (c === 'action' && mockActionCapability);
+                    return c === 'context' && mockContext;
                 });
                 mockScope.$on.andReturn(mockUnlisten);
                 // Provide a navigation change
@@ -220,7 +225,6 @@ define(
                 mockLocation.path.andReturn("/browse/");
 
                 mockNavigationService.setNavigation.andReturn(true);
-                mockActionCapability.perform.andReturn(mockPromise(true));
 
                 // Exercise the Angular workaround
                 mockNavigationService.addListener.mostRecentCall.args[0]();
@@ -239,9 +243,6 @@ define(
                 mockScope.navigatedObject = mockDomainObject;
                 mockNavigationService.setNavigation.andReturn(true);
 
-                mockActionCapability.perform.andReturn(mockPromise(true));
-                mockNextObject.getCapability.andReturn(mockActionCapability);
-
                 //Simulate a change in selected tree object
                 mockScope.treeModel = {selectedObject: mockDomainObject};
                 mockScope.$watch.mostRecentCall.args[1](mockNextObject);
@@ -253,10 +254,11 @@ define(
             it("after failed navigation event resets the selected tree" +
                 " object", function () {
                 mockScope.navigatedObject = mockDomainObject;
-
-                //Return false from navigation action
-                mockActionCapability.perform.andReturn(mockPromise(false));
-                mockNextObject.getCapability.andReturn(mockActionCapability);
+                mockWindow.confirm.andReturn(false);
+                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
+                    callback("unsaved changes");
+                    return false;
+                });
 
                 //Simulate a change in selected tree object
                 mockScope.treeModel = {selectedObject: mockDomainObject};

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -44,12 +44,12 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    ["$on", "$watch"]
+                    [ "$on", "$watch" ]
                 );
                 mockRoute = { current: { params: {} } };
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    ["path", "search"]
+                    [ "path", "search" ]
                 );
                 mockUnlisten = jasmine.createSpy("unlisten");
 
@@ -69,7 +69,7 @@ define(
                 // Allows the path index to be checked
                 // prior to setting $route.current
                 mockLocation.path.andReturn("/browse/");
-
+                
                 // Exercise the Angular workaround
                 mockScope.$on.mostRecentCall.args[1]();
                 expect(mockUnlisten).toHaveBeenCalled();

platform/commonUI/browse/test/InspectorRegionSpec.js

@@ -40,4 +40,4 @@ define(
 
         });
     }
-);
+);

platform/commonUI/browse/test/MenuArrowControllerSpec.js

@@ -26,7 +26,7 @@
 define(
     ["../src/MenuArrowController"],
     function (MenuArrowController) {
-
+        
         describe("The menu arrow controller ", function () {
             var mockScope,
                 mockDomainObject,
@@ -34,43 +34,43 @@ define(
                 mockContextMenuAction,
                 mockActionContext,
                 controller;
-
+            
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [""]
+                    [ "" ]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getCapability"]
+                    [ "getCapability" ]
                 );
                 mockEvent = jasmine.createSpyObj(
                     "event",
-                    ["preventDefault"]
+                    [ "preventDefault" ]
                 );
                 mockContextMenuAction = jasmine.createSpyObj(
                     "action",
-                    ["perform", "getActions"]
+                    [ "perform", "getActions" ]
                 );
                 mockActionContext = jasmine.createSpyObj(
                     "actionContext",
-                    [""]
+                    [ "" ]
                 );
-
+                
                 mockActionContext.domainObject = mockDomainObject;
                 mockActionContext.event = mockEvent;
                 mockScope.domainObject = mockDomainObject;
                 mockDomainObject.getCapability.andReturn(mockContextMenuAction);
                 mockContextMenuAction.perform.andReturn(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 the menu action to be performed 
                 expect(mockDomainObject.getCapability).toHaveBeenCalledWith('action');
                 expect(mockContextMenuAction.perform).toHaveBeenCalled();
             });

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -42,11 +42,11 @@ define(
             }
 
             beforeEach(function () {
-                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockScope = jasmine.createSpyObj("$scope", [ "$on" ]);
                 mockDomainObjects = ['a', 'b'].map(function (id) {
                     var mockDomainObject = jasmine.createSpyObj(
                         'domainObject-' + id,
-                        ['getId', 'getModel', 'getCapability']
+                        [ 'getId', 'getModel', 'getCapability' ]
                     );
 
                     mockDomainObject.getId.andReturn(id);
@@ -56,7 +56,7 @@ define(
                 });
                 mockAgentService = jasmine.createSpyObj(
                     "agentService",
-                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                    [ "isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape" ]
                 );
                 mockWindow = jasmine.createSpyObj("$window", ["open"]);
             });

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

@@ -60,37 +60,37 @@ define(
             beforeEach(function () {
                 mockTypeService = jasmine.createSpyObj(
                     "typeService",
-                    ["listTypes"]
+                    [ "listTypes" ]
                 );
                 mockDialogService = jasmine.createSpyObj(
                     "dialogService",
-                    ["getUserInput"]
+                    [ "getUserInput" ]
                 );
                 mockPolicyService = jasmine.createSpyObj(
                     "policyService",
-                    ["allow"]
+                    [ "allow" ]
                 );
 
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getCapability"]
+                    [ "getCapability" ]
                 );
 
                 //Mocking getCapability because AddActionProvider uses the
                 // type capability of the destination object.
                 mockDomainObject.getCapability.andReturn({});
 
-                mockTypes = ["A", "B", "C"].map(createMockType);
+                mockTypes = [ "A", "B", "C" ].map(createMockType);
 
-                mockTypes.forEach(function (type) {
+                mockTypes.forEach(function(type){
                     mockPolicyMap[type.getName()] = true;
                 });
 
-                mockCreationPolicy = function (type) {
+                mockCreationPolicy = function(type){
                     return mockPolicyMap[type.getName()];
                 };
 
-                mockCompositionPolicy = function () {
+                mockCompositionPolicy = function(){
                     return true;
                 };
 
@@ -132,4 +132,4 @@ define(
             });
         });
     }
-);
+);

platform/commonUI/browse/test/creation/CreateActionProviderSpec.js

@@ -29,10 +29,13 @@ define(
 
         describe("The create action provider", function () {
             var mockTypeService,
+                mockDialogService,
+                mockNavigationService,
                 mockPolicyService,
                 mockCreationPolicy,
                 mockPolicyMap = {},
                 mockTypes,
+                mockQ,
                 provider;
 
             function createMockType(name) {
@@ -56,31 +59,41 @@ define(
             beforeEach(function () {
                 mockTypeService = jasmine.createSpyObj(
                     "typeService",
-                    ["listTypes"]
+                    [ "listTypes" ]
+                );
+                mockDialogService = jasmine.createSpyObj(
+                    "dialogService",
+                    [ "getUserInput" ]
+                );
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    [ "setNavigation" ]
                 );
                 mockPolicyService = jasmine.createSpyObj(
                     "policyService",
-                    ["allow"]
+                    [ "allow" ]
                 );
 
-                mockTypes = ["A", "B", "C"].map(createMockType);
+                mockTypes = [ "A", "B", "C" ].map(createMockType);
 
-                mockTypes.forEach(function (type) {
+                mockTypes.forEach(function(type){
                     mockPolicyMap[type.getName()] = true;
                 });
 
-                mockCreationPolicy = function (type) {
+                mockCreationPolicy = function(type){
                     return mockPolicyMap[type.getName()];
                 };
 
-                mockPolicyService.allow.andCallFake(function (category, type) {
+                mockPolicyService.allow.andCallFake(function(category, type){
                     return category === "creation" && mockCreationPolicy(type) ? true : false;
                 });
 
                 mockTypeService.listTypes.andReturn(mockTypes);
 
                 provider = new CreateActionProvider(
+                    mockQ,
                     mockTypeService,
+                    mockNavigationService,
                     mockPolicyService
                 );
             });
@@ -113,4 +126,4 @@ define(
             });
         });
     }
-);
+);

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

@@ -0,0 +1,130 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreateAction"],
+    function (CreateAction) {
+
+        describe("The create action", function () {
+            var mockType,
+                mockParent,
+                mockContext,
+                mockDialogService,
+                mockCreationService,
+                action;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                mockType = jasmine.createSpyObj(
+                    "type",
+                    [
+                        "getKey",
+                        "getGlyph",
+                        "getName",
+                        "getDescription",
+                        "getProperties",
+                        "getInitialModel"
+                    ]
+                );
+                mockParent = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getId",
+                        "getModel",
+                        "getCapability"
+                    ]
+                );
+                mockContext = {
+                    domainObject: mockParent
+                };
+                mockDialogService = jasmine.createSpyObj(
+                    "dialogService",
+                    [ "getUserInput" ]
+                );
+                mockCreationService = jasmine.createSpyObj(
+                    "creationService",
+                    [ "createObject" ]
+                );
+
+                mockType.getKey.andReturn("test");
+                mockType.getGlyph.andReturn("T");
+                mockType.getDescription.andReturn("a test type");
+                mockType.getName.andReturn("Test");
+                mockType.getProperties.andReturn([]);
+                mockType.getInitialModel.andReturn({});
+
+                mockDialogService.getUserInput.andReturn(mockPromise({}));
+
+                action = new CreateAction(
+                    mockType,
+                    mockParent,
+                    mockContext,
+                    mockDialogService,
+                    mockCreationService
+                );
+            });
+
+            it("exposes type-appropriate metadata", function () {
+                var metadata = action.getMetadata();
+
+                expect(metadata.name).toEqual("Test");
+                expect(metadata.description).toEqual("a test type");
+                expect(metadata.glyph).toEqual("T");
+            });
+
+            //TODO: Disabled for NEM Beta
+            xit("invokes the creation service when performed", function () {
+                action.perform();
+                expect(mockCreationService.createObject).toHaveBeenCalledWith(
+                    { type: "test" },
+                    mockParent
+                );
+            });
+
+            //TODO: Disabled for NEM Beta
+            xit("does not create an object if the user cancels", function () {
+                mockDialogService.getUserInput.andReturn({
+                    then: function (callback, fail) {
+                        fail();
+                    }
+                });
+
+                action.perform();
+
+                expect(mockCreationService.createObject)
+                    .not.toHaveBeenCalled();
+
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/creation/CreateMenuControllerSpec.js

@@ -62,4 +62,4 @@ define(
             });
         });
     }
-);
+);

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

@@ -39,7 +39,7 @@ define(
             function createMockProperty(name) {
                 var mockProperty = jasmine.createSpyObj(
                     "property" + name,
-                    ["getDefinition", "getValue", "setValue"]
+                    [ "getDefinition", "getValue", "setValue" ]
                 );
                 mockProperty.getDefinition.andReturn({
                     control: "textfield"
@@ -68,7 +68,7 @@ define(
                         "getCapability"
                     ]
                 );
-                mockProperties = ["A", "B", "C"].map(createMockProperty);
+                mockProperties = [ "A", "B", "C" ].map(createMockProperty);
                 mockPolicyService = jasmine.createSpyObj('policyService', ['allow']);
 
                 testModel = { someKey: "some value" };
@@ -144,15 +144,15 @@ define(
                     "A": "ValueA",
                     "B": "ValueB",
                     "C": "ValueC"
-                },
-                compareModel = wizard.createModel(formValue);
+                    },
+                    compareModel = wizard.createModel(formValue);
                 wizard.populateObjectFromInput(formValue);
                 expect(mockDomainObject.useCapability).toHaveBeenCalledWith('mutation', jasmine.any(Function));
                 expect(mockDomainObject.useCapability.mostRecentCall.args[1]()).toEqual(compareModel);
             });
 
             it("validates selection types using policy", function () {
-                var mockDomainObj = jasmine.createSpyObj(
+                var mockDomainObject = jasmine.createSpyObj(
                         'domainObject',
                         ['getCapability']
                     ),
@@ -166,8 +166,8 @@ define(
                     rows = structure.sections[sections.length - 1].rows,
                     locationRow = rows[rows.length - 1];
 
-                mockDomainObj.getCapability.andReturn(mockOtherType);
-                locationRow.validate(mockDomainObj);
+                mockDomainObject.getCapability.andReturn(mockOtherType);
+                locationRow.validate(mockDomainObject);
 
                 // Should check policy to see if the user-selected location
                 // can actually contain objects of this type
@@ -179,7 +179,7 @@ define(
             });
 
             it("creates a form model without a location if not requested", function () {
-                expect(wizard.getFormStructure(false).sections.some(function (section) {
+                expect(wizard.getFormStructure(false).sections.some(function(section){
                     return section.name === 'Location';
                 })).toEqual(false);
             });

platform/commonUI/browse/test/creation/CreationPolicySpec.js

@@ -48,4 +48,4 @@ define(
             });
         });
     }
-);
+);

platform/commonUI/browse/test/creation/CreationServiceSpec.js

@@ -61,23 +61,23 @@ define(
                 mockQ = { when: mockPromise, reject: mockReject };
                 mockLog = jasmine.createSpyObj(
                     "$log",
-                    ["error", "warn", "info", "debug"]
+                    [ "error", "warn", "info", "debug" ]
                 );
                 mockParentObject = jasmine.createSpyObj(
                     "parentObject",
-                    ["getId", "getCapability", "useCapability"]
+                    [ "getId", "getCapability", "useCapability" ]
                 );
                 mockNewObject = jasmine.createSpyObj(
                     "newObject",
-                    ["getId", "getCapability", "useCapability"]
+                    [ "getId", "getCapability", "useCapability" ]
                 );
                 mockMutationCapability = jasmine.createSpyObj(
                     "mutation",
-                    ["invoke"]
+                    [ "invoke" ]
                 );
                 mockPersistenceCapability = jasmine.createSpyObj(
                     "persistence",
-                    ["persist", "getSpace"]
+                    [ "persist", "getSpace" ]
                 );
                 mockCompositionCapability = jasmine.createSpyObj(
                     "composition",
@@ -100,7 +100,7 @@ define(
                 };
                 mockNewPersistenceCapability = jasmine.createSpyObj(
                     "new-persistence",
-                    ["persist", "getSpace"]
+                    [ "persist", "getSpace" ]
                 );
 
                 mockParentObject.getCapability.andCallFake(function (key) {

platform/commonUI/browse/test/creation/LocatorControllerSpec.js

@@ -40,20 +40,20 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    ["$watch"]
+                    [ "$watch" ]
                 );
                 mockTimeout = jasmine.createSpy("$timeout");
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getCapability"]
+                    [ "getCapability" ]
                 );
                 mockRootObject = jasmine.createSpyObj(
                     "rootObject",
-                    ["getCapability"]
+                    [ "getCapability" ]
                 );
                 mockContext = jasmine.createSpyObj(
                     "context",
-                    ["getRoot"]
+                    [ "getRoot" ]
                 );
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",
@@ -73,18 +73,18 @@ define(
 
                 controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
             });
-            describe("when context is available", function () {
+                describe("when context is available", function () {
 
-                beforeEach(function () {
+                    beforeEach(function () {
                         mockContext.getRoot.andReturn(mockRootObject);
                         controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
                     });
 
-                it("adds a treeModel to scope", function () {
+                    it("adds a treeModel to scope", function () {
                         expect(mockScope.treeModel).toBeDefined();
                     });
 
-                it("watches for changes to treeModel", function () {
+                    it("watches for changes to treeModel", function () {
                         // This is what the embedded tree representation
                         // will be modifying.
                         expect(mockScope.$watch).toHaveBeenCalledWith(
@@ -93,7 +93,7 @@ define(
                         );
                     });
 
-                it("changes its own model on embedded model updates", function () {
+                    it("changes its own model on embedded model updates", function () {
                         // Need to pass on selection changes as updates to
                         // the control's value
                         mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
@@ -107,7 +107,7 @@ define(
                             .toHaveBeenCalledWith("context");
                     });
 
-                it("rejects changes which fail validation", function () {
+                    it("rejects changes which fail validation", function () {
                         mockScope.structure = { validate: jasmine.createSpy('validate') };
                         mockScope.structure.validate.andReturn(false);
 
@@ -120,10 +120,10 @@ define(
                         expect(mockScope.ngModel.someField).not.toEqual(mockDomainObject);
                     });
 
-                it("treats a lack of a selection as invalid", function () {
+                    it("treats a lack of a selection as invalid", function () {
                         mockScope.ngModelController = jasmine.createSpyObj(
                             'ngModelController',
-                            ['$setValidity']
+                            [ '$setValidity' ]
                         );
 
                         mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
@@ -136,14 +136,14 @@ define(
                         expect(mockScope.ngModelController.$setValidity)
                             .toHaveBeenCalledWith(jasmine.any(String), false);
                     });
-            });
-            describe("when no context is available", function () {
+                });
+                describe("when no context is available", function () {
                     var defaultRoot = "DEFAULT_ROOT";
 
                     beforeEach(function () {
                         mockContext.getRoot.andReturn(undefined);
-                        getObjectsPromise.then.andCallFake(function (callback) {
-                            callback({'ROOT': defaultRoot});
+                        getObjectsPromise.then.andCallFake(function(callback){
+                            callback({'ROOT':defaultRoot});
                         });
                         controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
                     });

platform/commonUI/browse/test/navigation/NavigateActionSpec.js

@@ -31,8 +31,6 @@ define(
             var mockNavigationService,
                 mockQ,
                 mockDomainObject,
-                mockPolicyService,
-                mockWindow,
                 action;
 
             function mockPromise(value) {
@@ -46,70 +44,25 @@ define(
             beforeEach(function () {
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
-                    [
-                        "setNavigation",
-                        "getNavigation"
-                    ]
+                    [ "setNavigation" ]
                 );
-                mockNavigationService.getNavigation.andReturn({});
                 mockQ = { when: mockPromise };
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getId", "getModel", "getCapability"]
+                    [ "getId", "getModel", "getCapability" ]
                 );
 
-                mockPolicyService = jasmine.createSpyObj("policyService",
-                    [
-                        "allow"
-                    ]);
-                mockWindow = jasmine.createSpyObj("$window",
-                    [
-                        "confirm"
-                    ]);
-
                 action = new NavigateAction(
                     mockNavigationService,
                     mockQ,
-                    mockPolicyService,
-                    mockWindow,
                     { domainObject: mockDomainObject }
                 );
             });
 
-            it("invokes the policy service to determine if navigation" +
-                " allowed", function () {
+            it("invokes the navigate service when performed", function () {
                 action.perform();
-                expect(mockPolicyService.allow)
-                    .toHaveBeenCalledWith("navigation", jasmine.any(Object), jasmine.any(Object), jasmine.any(Function));
-            });
-
-            it("prompts user if policy rejection", function () {
-                action.perform();
-                expect(mockPolicyService.allow).toHaveBeenCalled();
-                mockPolicyService.allow.mostRecentCall.args[3]();
-                expect(mockWindow.confirm).toHaveBeenCalled();
-            });
-
-            describe("shows a prompt", function () {
-                beforeEach(function () {
-                    // Ensure the allow callback is called synchronously
-                    mockPolicyService.allow.andCallFake(function () {
-                        return arguments[3]();
-                    });
-                });
-                it("does not navigate on prompt rejection", function () {
-                    mockWindow.confirm.andReturn(false);
-                    action.perform();
-                    expect(mockNavigationService.setNavigation)
-                        .not.toHaveBeenCalled();
-                });
-
-                it("does navigate on prompt acceptance", function () {
-                    mockWindow.confirm.andReturn(true);
-                    action.perform();
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalled();
-                });
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockDomainObject);
             });
 
             it("is only applicable when a domain object is in context", function () {
@@ -121,4 +74,4 @@ define(
 
         });
     }
-);
+);

platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js

@@ -1,180 +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/navigation/OrphanNavigationHandler'
-], function (OrphanNavigationHandler) {
-    describe("OrphanNavigationHandler", function () {
-        var mockTopic,
-            mockThrottle,
-            mockMutationTopic,
-            mockNavigationService,
-            mockDomainObject,
-            mockParentObject,
-            mockContext,
-            mockActionCapability,
-            mockEditor,
-            testParentModel,
-            testId,
-            mockThrottledFns;
-
-        beforeEach(function () {
-            testId = 'some-identifier';
-
-            mockThrottledFns = [];
-            testParentModel = {};
-
-            mockTopic = jasmine.createSpy('topic');
-            mockThrottle = jasmine.createSpy('throttle');
-            mockNavigationService = jasmine.createSpyObj('navigationService', [
-                'getNavigation',
-                'addListener'
-            ]);
-            mockMutationTopic = jasmine.createSpyObj('mutationTopic', [
-                'listen'
-            ]);
-            mockDomainObject = jasmine.createSpyObj('domainObject', [
-                'getId',
-                'getCapability',
-                'getModel',
-                'hasCapability'
-            ]);
-            mockParentObject = jasmine.createSpyObj('domainObject', [
-                'getId',
-                'getCapability',
-                'getModel',
-                'hasCapability'
-            ]);
-            mockContext = jasmine.createSpyObj('context', ['getParent']);
-            mockActionCapability = jasmine.createSpyObj('action', ['perform']);
-            mockEditor = jasmine.createSpyObj('editor', ['isEditContextRoot']);
-
-            mockThrottle.andCallFake(function (fn) {
-                var mockThrottledFn =
-                    jasmine.createSpy('throttled-' + mockThrottledFns.length);
-                mockThrottledFn.andCallFake(fn);
-                mockThrottledFns.push(mockThrottledFn);
-                return mockThrottledFn;
-            });
-            mockTopic.andCallFake(function (k) {
-                return k === 'mutation' && mockMutationTopic;
-            });
-            mockDomainObject.getId.andReturn(testId);
-            mockDomainObject.getCapability.andCallFake(function (c) {
-                return {
-                    context: mockContext,
-                    editor: mockEditor
-                }[c];
-            });
-            mockDomainObject.hasCapability.andCallFake(function (c) {
-                return !!mockDomainObject.getCapability(c);
-            });
-            mockParentObject.getModel.andReturn(testParentModel);
-            mockParentObject.getCapability.andCallFake(function (c) {
-                return {
-                    action: mockActionCapability
-                }[c];
-            });
-            mockContext.getParent.andReturn(mockParentObject);
-            mockNavigationService.getNavigation.andReturn(mockDomainObject);
-            mockEditor.isEditContextRoot.andReturn(false);
-
-            return new OrphanNavigationHandler(
-                mockThrottle,
-                mockTopic,
-                mockNavigationService
-            );
-        });
-
-
-        it("listens for mutation with a throttled function", function () {
-            expect(mockMutationTopic.listen)
-                .toHaveBeenCalledWith(jasmine.any(Function));
-            expect(mockThrottledFns.indexOf(
-                mockMutationTopic.listen.mostRecentCall.args[0]
-            )).not.toEqual(-1);
-        });
-
-        it("listens for navigation changes with a throttled function", function () {
-            expect(mockNavigationService.addListener)
-                .toHaveBeenCalledWith(jasmine.any(Function));
-            expect(mockThrottledFns.indexOf(
-                mockNavigationService.addListener.mostRecentCall.args[0]
-            )).not.toEqual(-1);
-        });
-
-        [false, true].forEach(function (isOrphan) {
-            var prefix = isOrphan ? "" : "non-";
-            describe("for " + prefix + "orphan objects", function () {
-                beforeEach(function () {
-                    testParentModel.composition = isOrphan ? [] : [testId];
-                });
-
-                [false, true].forEach(function (isEditRoot) {
-                    var caseName = isEditRoot ?
-                        "that are being edited" : "that are not being edited";
-
-                    function itNavigatesAsExpected() {
-                        if (isOrphan && !isEditRoot) {
-                            it("navigates to the parent", function () {
-                                expect(mockActionCapability.perform)
-                                    .toHaveBeenCalledWith('navigate');
-                            });
-                        } else {
-                            it("does nothing", function () {
-                                expect(mockActionCapability.perform)
-                                    .not.toHaveBeenCalled();
-                            });
-                        }
-                    }
-
-                    describe(caseName, function () {
-                        beforeEach(function () {
-                            mockEditor.isEditContextRoot.andReturn(isEditRoot);
-                        });
-
-                        describe("when navigation changes", function () {
-                            beforeEach(function () {
-                                mockNavigationService.addListener.mostRecentCall
-                                    .args[0](mockDomainObject);
-                            });
-
-                            itNavigatesAsExpected();
-                        });
-
-                        describe("when mutation occurs", function () {
-                            beforeEach(function () {
-                                mockMutationTopic.listen.mostRecentCall
-                                    .args[0](mockParentObject);
-                            });
-
-                            itNavigatesAsExpected();
-                        });
-
-                    });
-                });
-            });
-        });
-
-    });
-});
-

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

@@ -56,4 +56,4 @@ define(
 
         });
     }
-);
+);

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

@@ -23,7 +23,7 @@
 define(
     ["../../src/windowing/NewTabAction"],
     function (NewTabAction) {
-
+        
         describe("The new tab action", function () {
             var actionSelected,
                 actionCurrent,
@@ -37,39 +37,39 @@ define(
 
                 // Context if the current object is selected
                 // For example, when the top right new tab
-                // button is clicked, the user is using the
+                // button is clicked, the user is using the 
                 // current domainObject
                 mockContextCurrent = jasmine.createSpyObj("context", ["domainObject"]);
-
+                
                 // Context if the selected object is selected
                 // For example, when an object in the left
                 // tree is opened in a new tab using the
                 // context menu
                 mockContextSelected = jasmine.createSpyObj("context", ["selectedObject",
                                                                "domainObject"]);
-
+                
                 // Mocks the urlService used to make the new tab's url from a
                 // domainObject and mode
                 mockUrlService = jasmine.createSpyObj("urlService", ["urlForNewTab"]);
-
+                
                 // Action done using the current context or mockContextCurrent
                 actionCurrent = new NewTabAction(mockUrlService, mockWindow,
                                                  mockContextCurrent);
-
+                
                 // Action done using the selected context or mockContextSelected
                 actionSelected = new NewTabAction(mockUrlService, mockWindow,
                                                   mockContextSelected);
-
+                
             });
-
+                        
             it("new tab with current url is opened", function () {
                 actionCurrent.perform();
             });
-
+            
             it("new tab with a selected url is opened", function () {
                 actionSelected.perform();
             });
-
+            
         });
     }
-);
+);

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

@@ -37,11 +37,11 @@ define(
             beforeEach(function () {
                 mockNavigationService = jasmine.createSpyObj(
                     'navigationService',
-                    ['getNavigation']
+                    [ 'getNavigation' ]
                 );
                 mockRootScope = jasmine.createSpyObj(
                     '$rootScope',
-                    ['$watch']
+                    [ '$watch' ]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     'domainObject',
@@ -75,4 +75,4 @@ define(
 
         });
     }
-);
+);

platform/commonUI/dialog/src/DialogService.js

@@ -155,8 +155,8 @@ define(
          * @returns {boolean} true if dialog is currently visible, false
          * otherwise
          */
-        DialogService.prototype.canShowDialog = function (dialogModel) {
-            if (this.dialogVisible) {
+        DialogService.prototype.canShowDialog = function(dialogModel){
+            if (this.dialogVisible){
                 // Only one dialog should be shown at a time.
                 // The application design should be such that
                 // we never even try to do this.
@@ -224,7 +224,7 @@ define(
          * @param {typeClass} string tells overlayService that this overlay should use appropriate CSS class
          * @returns {boolean}
          */
-        DialogService.prototype.showBlockingMessage = function (dialogModel) {
+        DialogService.prototype.showBlockingMessage = function(dialogModel) {
             if (this.canShowDialog(dialogModel)) {
                 // Add the overlay using the OverlayService, which
                 // will handle actual insertion into the DOM

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -38,23 +38,23 @@ define(
             beforeEach(function () {
                 mockOverlayService = jasmine.createSpyObj(
                     "overlayService",
-                    ["createOverlay"]
+                    [ "createOverlay" ]
                 );
                 mockQ = jasmine.createSpyObj(
                     "$q",
-                    ["defer"]
+                    [ "defer" ]
                 );
                 mockLog = jasmine.createSpyObj(
                     "$log",
-                    ["warn", "info", "debug"]
+                    [ "warn", "info", "debug" ]
                 );
                 mockOverlay = jasmine.createSpyObj(
                     "overlay",
-                    ["dismiss"]
+                    [ "dismiss" ]
                 );
                 mockDeferred = jasmine.createSpyObj(
                     "deferred",
-                    ["resolve", "reject"]
+                    [ "resolve", "reject"]
                 );
                 mockDeferred.promise = "mock promise";
 
@@ -120,7 +120,7 @@ define(
             });
 
             it("invokes the overlay service with the correct parameters when" +
-                " a blocking dialog is requested", function () {
+                " a blocking dialog is requested", function() {
                 var dialogModel = {};
                 expect(dialogService.showBlockingMessage(dialogModel)).toBe(true);
                 expect(mockOverlayService.createOverlay).toHaveBeenCalledWith(

platform/commonUI/dialog/test/OverlayServiceSpec.js

@@ -38,13 +38,13 @@ define(
                 overlayService;
 
             beforeEach(function () {
-                mockDocument = jasmine.createSpyObj("$document", ["find"]);
+                mockDocument = jasmine.createSpyObj("$document", [ "find" ]);
                 mockCompile = jasmine.createSpy("$compile");
-                mockRootScope = jasmine.createSpyObj("$rootScope", ["$new"]);
-                mockBody = jasmine.createSpyObj("body", ["prepend"]);
+                mockRootScope = jasmine.createSpyObj("$rootScope", [ "$new" ]);
+                mockBody = jasmine.createSpyObj("body", [ "prepend" ]);
                 mockTemplate = jasmine.createSpy("template");
-                mockElement = jasmine.createSpyObj("element", ["remove"]);
-                mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
+                mockElement = jasmine.createSpyObj("element", [ "remove" ]);
+                mockScope = jasmine.createSpyObj("scope", [ "$destroy" ]);
 
                 mockDocument.find.andReturn(mockBody);
                 mockCompile.andReturn(mockTemplate);
@@ -96,4 +96,4 @@ define(
 
         });
     }
-);
+);

platform/commonUI/edit/bundle.js

@@ -26,7 +26,7 @@ define([
     "./src/controllers/ElementsController",
     "./src/controllers/EditObjectController",
     "./src/directives/MCTBeforeUnload",
-    "./src/actions/EditAndComposeAction",
+    "./src/actions/LinkAction",
     "./src/actions/EditAction",
     "./src/actions/PropertiesAction",
     "./src/actions/RemoveAction",
@@ -40,18 +40,6 @@ define([
     "./src/policies/EditContextualActionPolicy",
     "./src/representers/EditRepresenter",
     "./src/representers/EditToolbarRepresenter",
-    "./src/capabilities/EditorCapability",
-    "./src/capabilities/TransactionCapabilityDecorator",
-    "./src/services/TransactionService",
-    "./src/creation/CreateMenuController",
-    "./src/creation/LocatorController",
-    "./src/creation/CreationPolicy",
-    "./src/creation/CreateActionProvider",
-    "./src/creation/AddActionProvider",
-    "./src/creation/CreationService",
-    "text!./res/templates/create/locator.html",
-    "text!./res/templates/create/create-button.html",
-    "text!./res/templates/create/create-menu.html",
     "text!./res/templates/library.html",
     "text!./res/templates/edit-object.html",
     "text!./res/templates/edit-action-buttons.html",
@@ -64,7 +52,7 @@ define([
     ElementsController,
     EditObjectController,
     MCTBeforeUnload,
-    EditAndComposeAction,
+    LinkAction,
     EditAction,
     PropertiesAction,
     RemoveAction,
@@ -78,18 +66,6 @@ define([
     EditContextualActionPolicy,
     EditRepresenter,
     EditToolbarRepresenter,
-    EditorCapability,
-    TransactionCapabilityDecorator,
-    TransactionService,
-    CreateMenuController,
-    LocatorController,
-    CreationPolicy,
-    CreateActionProvider,
-    AddActionProvider,
-    CreationService,
-    locatorTemplate,
-    createButtonTemplate,
-    createMenuTemplate,
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
@@ -130,22 +106,6 @@ define([
                         "$location",
                         "policyService"
                     ]
-                },
-                {
-                    "key": "CreateMenuController",
-                    "implementation": CreateMenuController,
-                    "depends": [
-                        "$scope"
-                    ]
-                },
-                {
-                    "key": "LocatorController",
-                    "implementation": LocatorController,
-                    "depends": [
-                        "$scope",
-                        "$timeout",
-                        "objectService"
-                    ]
                 }
             ],
             "directives": [
@@ -160,7 +120,7 @@ define([
             "actions": [
                 {
                     "key": "compose",
-                    "implementation": EditAndComposeAction
+                    "implementation": LinkAction
                 },
                 {
                     "key": "edit",
@@ -168,9 +128,10 @@ define([
                     "depends": [
                         "$location",
                         "navigationService",
-                        "$log"
+                        "$log",
+                        "$q"
                     ],
-                    "description": "Edit",
+                    "description": "Edit this object.",
                     "category": "view-control",
                     "glyph": "p"
                 },
@@ -206,9 +167,7 @@ define([
                     "implementation": SaveAction,
                     "name": "Save",
                     "description": "Save changes made to these objects.",
-                    "depends": [
-                        "dialogService"
-                    ],
+                    "depends": [],
                     "priority": "mandatory"
                 },
                 {
@@ -232,7 +191,10 @@ define([
                     "implementation": CancelAction,
                     "name": "Cancel",
                     "description": "Discard changes made to these objects.",
-                    "depends": []
+                    "depends": [
+                        "$injector",
+                        "navigationService"
+                    ]
                 }
             ],
             "policies": [
@@ -255,13 +217,10 @@ define([
                 },
                 {
                     "category": "navigation",
-                    "message": "Continuing will cause the loss of any unsaved changes.",
+                    "message": "There are unsaved changes.",
                     "implementation": EditNavigationPolicy
-                },
-                {
-                    "implementation": CreationPolicy,
-                    "category": "creation"
                 }
+
             ],
             "templates": [
                 {
@@ -300,73 +259,8 @@ define([
                 {
                     "key": "topbar-edit",
                     "template": topbarEditTemplate
-                },
-                {
-                    "key": "create-button",
-                    "template": createButtonTemplate
-                },
-                {
-                    "key": "create-menu",
-                    "template": createMenuTemplate,
-                    "uses": [
-                        "action"
-                    ]
                 }
             ],
-            "components": [
-                {
-                    "type": "decorator",
-                    "provides": "capabilityService",
-                    "implementation": TransactionCapabilityDecorator,
-                    "depends": [
-                        "$q",
-                        "transactionService"
-                    ],
-                    "priority": "fallback"
-                },
-                {
-                    "type": "provider",
-                    "provides": "transactionService",
-                    "implementation": TransactionService,
-                    "depends": [
-                        "$q",
-                        "$log"
-                    ]
-                },
-                {
-                    "key": "CreateActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": CreateActionProvider,
-                    "depends": [
-                        "typeService",
-                        "policyService"
-                    ]
-                },
-                {
-                    "key": "AddActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": AddActionProvider,
-                    "depends": [
-                        "$q",
-                        "typeService",
-                        "dialogService",
-                        "policyService"
-                    ]
-                },
-                {
-                    "key": "CreationService",
-                    "provides": "creationService",
-                    "type": "provider",
-                    "implementation": CreationService,
-                    "depends": [
-                        "$q",
-                        "$log"
-                    ]
-                }
-
-            ],
             "representers": [
                 {
                     "implementation": EditRepresenter,
@@ -381,30 +275,13 @@ define([
             ],
             "constants": [
                 {
-                    "key": "editModeBlacklist",
+                    "key":"editModeBlacklist",
                     "value": ["copy", "follow", "window", "link", "locate"]
                 },
                 {
                     "key": "nonEditContextBlacklist",
                     "value": ["copy", "follow", "properties", "move", "link", "remove", "locate"]
                 }
-            ],
-            "capabilities": [
-                {
-                    "key": "editor",
-                    "name": "Editor Capability",
-                    "description": "Provides transactional editing capabilities",
-                    "implementation": EditorCapability,
-                    "depends": [
-                        "transactionService"
-                    ]
-                }
-            ],
-            "controls": [
-                {
-                    "key": "locator",
-                    "template": locatorTemplate
-                }
             ]
         }
     });

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

@@ -31,8 +31,10 @@ define(
          * @memberof platform/commonUI/edit
          * @implements {Action}
          */
-        function CancelAction(context) {
+        function CancelAction($injector, navigationService, context) {
             this.domainObject = context.domainObject;
+            this.navigationService = navigationService;
+            this.objectService = $injector.get('objectService');
         }
 
         /**
@@ -42,32 +44,31 @@ define(
          *          cancellation has completed
          */
         CancelAction.prototype.perform = function () {
-            var domainObject = this.domainObject;
+            var domainObject = this.domainObject,
+                self = this;
 
+            // Look up the object's "editor.completion" capability;
+            // this is introduced by EditableDomainObject which is
+            // used to insulate underlying objects from changes made
+            // during editing.
+            function getEditorCapability() {
+                return domainObject.getCapability("editor");
+            }
+
+            // Invoke any save behavior introduced by the editor.completion
+            // capability.
+            function doCancel(editor) {
+                return editor.cancel();
+            }
+
+            //Discard current 'editable' object, and retrieve original
+            // un-edited object.
             function returnToBrowse() {
-                var parent;
-
-                //If the object existed already, navigate to refresh view
-                // with previous object state.
-                if (domainObject.getModel().persisted) {
-                    return domainObject.getCapability("action").perform("navigate");
-                } else {
-                    //If the object was new, and user has cancelled, then
-                    //navigate back to parent because nothing to show.
-                    return domainObject.getCapability("location").getOriginal().then(function (original) {
-                        parent = original.getCapability("context").getParent();
-                        parent.getCapability("action").perform("navigate");
-                    });
-                }
+                return self.navigationService.setNavigation(self.domainObject.getOriginalObject());
             }
 
-            function cancel(allowed) {
-                return allowed && domainObject.getCapability("editor").cancel();
-            }
-
-            //Do navigation first in order to trigger unsaved changes dialog
-            return returnToBrowse()
-                .then(cancel);
+            return doCancel(getEditorCapability())
+                .then(returnToBrowse);
         };
 
         /**
@@ -79,8 +80,7 @@ define(
         CancelAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
             return domainObject !== undefined &&
-                domainObject.hasCapability('editor') &&
-                domainObject.getCapability('editor').isEditContextRoot();
+                domainObject.hasCapability("editor");
         };
 
         return CancelAction;

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

@@ -24,8 +24,8 @@
  * Module defining EditAction. Created by vwoeltje on 11/14/14.
  */
 define(
-    [],
-    function () {
+    ['../objects/EditableDomainObject'],
+    function (EditableDomainObject) {
 
         // A no-op action to return in the event that the action cannot
         // be completed.
@@ -44,7 +44,7 @@ define(
          * @constructor
          * @implements {Action}
          */
-        function EditAction($location, navigationService, $log, context) {
+        function EditAction($location, navigationService, $log, $q, context) {
             var domainObject = (context || {}).domainObject;
 
             // We cannot enter Edit mode if we have no domain object to
@@ -63,6 +63,7 @@ define(
             this.domainObject = domainObject;
             this.$location = $location;
             this.navigationService = navigationService;
+            this.$q = $q;
         }
 
         /**
@@ -70,18 +71,25 @@ define(
          */
         EditAction.prototype.perform = function () {
             var self = this;
-            function cancelEditing() {
-                self.domainObject.getCapability('editor').cancel();
-                self.navigationService.removeListener(cancelEditing);
-            }
-            //If this is not the currently navigated object, then navigate
-            // to it.
-            if (this.navigationService.getNavigation() !== this.domainObject) {
-                this.navigationService.setNavigation(this.domainObject);
+            if (!this.domainObject.hasCapability("editor")) {
+                //TODO: This is only necessary because the drop gesture is
+                // wrapping the object itself, need to refactor this later.
+                // All responsibility for switching into edit mode should be
+                // in the edit action, and not duplicated in the gesture
+                this.domainObject = new EditableDomainObject(this.domainObject, this.$q);
             }
+            this.navigationService.setNavigation(this.domainObject);
+            this.domainObject.getCapability('status').set('editing', true);
 
+            //Register a listener to automatically cancel this edit action
+            //if the user navigates away from this object.
+            function cancelEditing(navigatedTo){
+                if (!navigatedTo || navigatedTo.getId() !== self.domainObject.getId()) {
+                    self.domainObject.getCapability('editor').cancel();
+                    self.navigationService.removeListener(cancelEditing);
+                }
+            }
             this.navigationService.addListener(cancelEditing);
-            this.domainObject.useCapability("editor");
         };
 
         /**
@@ -92,13 +100,11 @@ define(
          */
         EditAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject,
-                type = domainObject && domainObject.getCapability('type');
+                type = domainObject && domainObject.getCapability('type'),
+                isEditMode = domainObject && domainObject.getDomainObject ? true : false;
 
-            // Only allow editing of types that support it and are not already
-            // being edited
-            return type && type.hasFeature('creation') &&
-                domainObject.hasCapability('editor') &&
-                !domainObject.getCapability('editor').isEditContextRoot();
+            // Only allow creatable types to be edited
+            return type && type.hasFeature('creation') && !isEditMode;
         };
 
         return EditAction;

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

@@ -31,14 +31,13 @@ define(
          * @memberof platform/commonUI/edit
          * @implements {Action}
          */
-        function EditAndComposeAction(context) {
+        function LinkAction(context) {
             this.domainObject = (context || {}).domainObject;
             this.selectedObject = (context || {}).selectedObject;
         }
 
-        EditAndComposeAction.prototype.perform = function () {
-            var self = this,
-                editAction = this.domainObject.getCapability('action').getActions("edit")[0];
+        LinkAction.prototype.perform = function () {
+            var self = this;
 
             // Persist changes to the domain object
             function doPersist() {
@@ -55,13 +54,9 @@ define(
                         .then(doPersist);
             }
 
-            if (editAction) {
-                editAction.perform();
-            }
-
             return this.selectedObject && doLink();
         };
 
-        return EditAndComposeAction;
+        return LinkAction;
     }
 );

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

@@ -63,10 +63,10 @@ define(
                 });
             }
 
-            function showDialog(objType) {
+            function showDialog(type) {
                 // Create a dialog object to generate the form structure, etc.
                 var dialog =
-                    new PropertiesDialog(objType, domainObject.getModel());
+                    new PropertiesDialog(type, domainObject.getModel());
 
                 // Show the dialog
                 return dialogService.getUserInput(

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

@@ -75,8 +75,8 @@ define(
              * Invoke persistence on a domain object. This will be called upon
              * the removed object's parent (as its composition will have changed.)
              */
-            function doPersist(domainObj) {
-                var persistence = domainObj.getCapability('persistence');
+            function doPersist(domainObject) {
+                var persistence = domainObject.getCapability('persistence');
                 return persistence && persistence.persist();
             }
 

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

@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 define(
-    ['./SaveInProgressDialog'],
-    function (SaveInProgressDialog) {
+    [],
+    function () {
 
         /**
          * The "Save" action; the action triggered by clicking Save from
@@ -33,11 +33,9 @@ define(
          * @memberof platform/commonUI/edit
          */
         function SaveAction(
-            dialogService,
             context
         ) {
             this.domainObject = (context || {}).domainObject;
-            this.dialogService = dialogService;
         }
 
         /**
@@ -48,10 +46,9 @@ define(
          * @memberof platform/commonUI/edit.SaveAction#
          */
         SaveAction.prototype.perform = function () {
-            var domainObject = this.domainObject,
-                dialog = new SaveInProgressDialog(this.dialogService);
+            var domainObject = this.domainObject;
 
-            function resolveWith(object) {
+            function resolveWith(object){
                 return function () {
                     return object;
                 };
@@ -63,7 +60,7 @@ define(
             // during editing.
             function doSave() {
                 return domainObject.getCapability("editor").save()
-                    .then(resolveWith(domainObject));
+                    .then(resolveWith(domainObject.getOriginalObject()));
             }
 
             // Discard the current root view (which will be the editing
@@ -75,17 +72,8 @@ define(
                 return object;
             }
 
-            function hideBlockingDialog(object) {
-                dialog.hide();
-                return object;
-            }
-
-            dialog.show();
-
-            return doSave()
-                .then(hideBlockingDialog)
-                .then(returnToBrowse)
-                .catch(hideBlockingDialog);
+            //return doSave().then(returnToBrowse);
+            return doSave().then(returnToBrowse);
         };
 
         /**
@@ -97,8 +85,7 @@ define(
         SaveAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
             return domainObject !== undefined &&
-                domainObject.hasCapability('editor') &&
-                domainObject.getCapability('editor').isEditContextRoot() &&
+                domainObject.hasCapability("editor") &&
                 domainObject.getModel().persisted !== undefined;
         };
 

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

@@ -21,14 +21,9 @@
  *****************************************************************************/
 
 
-define([
-    '../creation/CreateWizard',
-    './SaveInProgressDialog'
-],
-    function (
-        CreateWizard,
-        SaveInProgressDialog
-    ) {
+define(
+    ['../../../browse/src/creation/CreateWizard'],
+    function (CreateWizard) {
 
         /**
          * The "Save" action; the action triggered by clicking Save from
@@ -47,7 +42,7 @@ define([
             context
         ) {
             this.domainObject = (context || {}).domainObject;
-            this.injectObjectService = function () {
+            this.injectObjectService = function(){
                 this.objectService = $injector.get("objectService");
             };
             this.policyService = policyService;
@@ -70,7 +65,7 @@ define([
         /**
          * @private
          */
-        SaveAsAction.prototype.getObjectService = function () {
+        SaveAsAction.prototype.getObjectService = function(){
             // Lazily acquire object service (avoids cyclical dependency)
             if (!this.objectService) {
                 this.injectObjectService();
@@ -78,7 +73,7 @@ define([
             return this.objectService;
         };
 
-        function resolveWith(object) {
+        function resolveWith(object){
             return function () {
                 return object;
             };
@@ -110,8 +105,7 @@ define([
         SaveAsAction.prototype.save = function () {
             var self = this,
                 domainObject = this.domainObject,
-                copyService = this.copyService,
-                dialog = new SaveInProgressDialog(this.dialogService);
+                copyService = this.copyService;
 
             function doWizardSave(parent) {
                 var wizard = self.createWizard(parent);
@@ -122,23 +116,13 @@ define([
                     ).then(wizard.populateObjectFromInput.bind(wizard));
             }
 
-            function showBlockingDialog(object) {
-                dialog.show();
-                return object;
-            }
-
-            function hideBlockingDialog(object) {
-                dialog.hide();
-                return object;
-            }
-
-            function fetchObject(objectId) {
-                return self.getObjectService().getObjects([objectId]).then(function (objects) {
+            function fetchObject(objectId){
+                return self.getObjectService().getObjects([objectId]).then(function(objects){
                     return objects[objectId];
                 });
             }
 
-            function getParent(object) {
+            function getParent(object){
                 return fetchObject(object.getModel().location);
             }
 
@@ -151,27 +135,19 @@ define([
                 return copyService.perform(domainObject, parent, allowClone);
             }
 
-            function commitEditingAfterClone(clonedObject) {
-                return domainObject.getCapability("editor").save()
+            function cancelEditingAfterClone(clonedObject) {
+                return domainObject.getCapability("editor").cancel()
                     .then(resolveWith(clonedObject));
             }
 
-            function onFailure() {
-                hideBlockingDialog();
-                return false;
-            }
-
             return getParent(domainObject)
                 .then(doWizardSave)
-                .then(showBlockingDialog)
                 .then(getParent)
                 .then(cloneIntoParent)
-                .then(commitEditingAfterClone)
-                .then(hideBlockingDialog)
-                .catch(onFailure);
+                .then(cancelEditingAfterClone)
+                .catch(resolveWith(false));
         };
 
-
         /**
          * Check if this action is applicable in a given context.
          * This will ensure that a domain object is present in the context,
@@ -181,8 +157,7 @@ define([
         SaveAsAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
             return domainObject !== undefined &&
-                domainObject.hasCapability('editor') &&
-                domainObject.getCapability('editor').isEditContextRoot() &&
+                domainObject.hasCapability("editor") &&
                 domainObject.getModel().persisted === undefined;
         };
 

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

@@ -1,20 +0,0 @@
-define([], function () {
-    function SaveInProgressDialog(dialogService) {
-        this.dialogService = dialogService;
-    }
-
-    SaveInProgressDialog.prototype.show = function () {
-        this.dialogService.showBlockingMessage({
-            title: "Saving...",
-            hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
-            unknownProgress: true,
-            severity: "info"
-        });
-    };
-
-    SaveInProgressDialog.prototype.hide = function () {
-        this.dialogService.dismiss();
-    };
-
-    return SaveInProgressDialog;
-});

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

@@ -20,37 +20,36 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+
 define(
-    ['./FollowMode'],
-    function (FollowMode) {
-
+    function () {
+        var DISALLOWED_ACTIONS = ["move", "copy", "link", "window", "follow"];
         /**
-         * Supports the 'Latest Available Data' mode of the time conductor.
-         * This is a special case of FollowMode that advances on 'data' type
-         * tick sources.
-         * @param conductor
-         * @param timeSystems
+         * Editable Action Capability. Overrides the action capability
+         * normally exhibited by a domain object and filters out certain
+         * actions not applicable when an object is in edit mode.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
          * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {PersistenceCapability}
          */
-        function LADMode(conductor, timeSystems) {
-            var metadata = {
-                key: 'latest',
-                glyph: '\u0044',
-                label: 'LAD',
-                name: 'LAD Mode',
-                description: 'Latest Available Data mode monitors real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'
-            };
-            var filteredTimeSystems = timeSystems.filter(function (timeSystem){
-                return timeSystem.tickSources().some(function (tickSource){
-                    return tickSource.type() === 'data';
-                });
-            });
+        function EditableActionCapability(
+            actionCapability
+        ) {
+            var action = Object.create(actionCapability);
 
-            FollowMode.call(this, metadata, conductor, filteredTimeSystems);
+            action.getActions = function(domainObject) {
+                return actionCapability.getActions(domainObject).filter(function(action){
+                   return DISALLOWED_ACTIONS.indexOf(action.getMetadata().key) === -1;
+                });
+            };
+
+            return action;
         }
 
-        LADMode.prototype = Object.create(FollowMode.prototype);
-
-        return LADMode;
+        return EditableActionCapability;
     }
 );

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

@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * 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(
+    ['./EditableLookupCapability'],
+    function (EditableLookupCapability) {
+
+        /**
+         * Wrapper for the "composition" capability;
+         * ensures that any domain objects reachable in Edit mode
+         * are also wrapped as EditableDomainObjects.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {CompositionCapability}
+         */
+        return function EditableCompositionCapability(
+            contextCapability,
+            editableObject,
+            domainObject,
+            cache
+        ) {
+            // This is a "lookup" style capability (it looks up other
+            // domain objects), but we do not want to return the same
+            // specific value every time (composition may change)
+            return new EditableLookupCapability(
+                contextCapability,
+                editableObject,
+                domainObject,
+                cache,
+                false // Not idempotent
+            );
+        };
+    }
+);

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

@@ -0,0 +1,76 @@
+/*****************************************************************************
+ * 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(
+    ['./EditableLookupCapability'],
+    function (EditableLookupCapability) {
+
+        /**
+         * Wrapper for the "context" capability;
+         * ensures that any domain objects reachable in Edit mode
+         * are also wrapped as EditableDomainObjects.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {ContextCapability}
+         */
+        return function EditableContextCapability(
+            contextCapability,
+            editableObject,
+            domainObject,
+            cache
+        ) {
+            // This is a "lookup" style capability (it looks up other
+            // domain objects), and it should be idempotent
+            var capability = new EditableLookupCapability(
+                    contextCapability,
+                    editableObject,
+                    domainObject,
+                    cache,
+                    true // Idempotent
+                ),
+                // Track the real root object for the Elements pane
+                trueRoot = capability.getRoot();
+
+            // Provide access to the real root, for the Elements pane.
+            capability.getTrueRoot = function () {
+                return trueRoot;
+            };
+
+            // Hide ancestry after the root of this subgraph
+            if (cache.isRoot(domainObject)) {
+                capability.getRoot = function () {
+                    return editableObject;
+                };
+                capability.getPath = function () {
+                    return [editableObject];
+                };
+            }
+
+            return capability;
+        };
+    }
+);

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

@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * 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(
+    ['./EditableLookupCapability'],
+    function (EditableLookupCapability) {
+
+        /**
+         * Wrapper for the "instantiation" capability;
+         * ensures that any domain objects instantiated in Edit mode
+         * are also wrapped as EditableDomainObjects.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {CompositionCapability}
+         */
+        return function EditableInstantiationCapability(
+            contextCapability,
+            editableObject,
+            domainObject,
+            cache
+        ) {
+            // This is a "lookup" style capability (it looks up other
+            // domain objects), but we do not want to return the same
+            // specific value every time (composition may change)
+            return new EditableLookupCapability(
+                contextCapability,
+                editableObject,
+                domainObject,
+                cache,
+                false // Not idempotent
+            );
+        };
+    }
+);

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

@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * 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(
+    [],
+    function () {
+        /*jshint forin:false */
+        /**
+         * Wrapper for both "context" and "composition" capabilities;
+         * ensures that any domain objects reachable in Edit mode
+         * are also wrapped as EditableDomainObjects.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         */
+        return function EditableLookupCapability(
+            contextCapability,
+            editableObject,
+            domainObject,
+            cache,
+            idempotent
+        ) {
+            var capability = Object.create(contextCapability),
+                method;
+
+            // Check for domain object interface. If something has these
+            // three methods, we assume it's a domain object.
+            function isDomainObject(obj) {
+                return obj !== undefined &&
+                        typeof obj.getId === 'function' &&
+                        typeof obj.getModel === 'function' &&
+                        typeof obj.getCapability === 'function';
+            }
+
+            // Check an object returned by the wrapped capability; if it
+            // is a domain object, we want to make it editable and/or get
+            // it from the cache of editable domain objects. This will
+            // prevent changes made in edit mode from modifying the actual
+            // underlying domain object.
+            function makeEditableObject(obj) {
+                return isDomainObject(obj) ?
+                        cache.getEditableObject(obj) :
+                        obj;
+            }
+
+            // Wrap a returned value (see above); if it's an array, wrap
+            // all elements.
+            function makeEditable(returnValue) {
+                return Array.isArray(returnValue) ?
+                        returnValue.map(makeEditableObject) :
+                        makeEditableObject(returnValue);
+            }
+
+            // Wrap a returned value (see above); if it's a promise, wrap
+            // the resolved value.
+            function wrapResult(result) {
+                return (result && result.then) ? // promise-like
+                        result.then(makeEditable) :
+                        makeEditable(result);
+            }
+
+            // Return a wrapped version of a function, which ensures
+            // all results are editable domain objects.
+            function wrapFunction(fn) {
+                return function () {
+                    return wrapResult(contextCapability[fn].apply(
+                        capability,
+                        arguments
+                    ));
+                };
+            }
+
+            // Wrap a method such that it only delegates once.
+            function oneTimeFunction(fn) {
+                return function () {
+                    var result = wrapFunction(fn).apply(this, arguments);
+                    capability[fn] = function () {
+                        return result;
+                    };
+                    return result;
+                };
+            }
+
+            // Wrap a method of this capability
+            function wrapMethod(fn) {
+                if (typeof capability[fn] === 'function') {
+                    capability[fn] =
+                        (idempotent ? oneTimeFunction : wrapFunction)(fn);
+                }
+            }
+
+            // Wrap all methods; return only editable domain objects.
+            for (method in contextCapability) {
+                wrapMethod(method);
+            }
+
+            return capability;
+        };
+    }
+);

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

@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * 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(
+    function () {
+
+        /**
+         * Editable Persistence Capability. Overrides the persistence capability
+         * normally exhibited by a domain object to ensure that changes made
+         * during edit mode are not immediately stored to the database or other
+         * backing storage.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {PersistenceCapability}
+         */
+        function EditablePersistenceCapability(
+            persistenceCapability,
+            editableObject,
+            domainObject,
+            cache
+        ) {
+            var persistence = Object.create(persistenceCapability);
+
+            // Simply trigger refresh of in-view objects; do not
+            // write anything to database.
+            persistence.persist = function () {
+                return cache.markDirty(editableObject);
+            };
+
+            // Delegate refresh to the original object; this avoids refreshing
+            // the editable instance of the object, and ensures that refresh
+            // correctly targets the "real" version of the object.
+            persistence.refresh = function () {
+                return domainObject.getCapability('persistence').refresh();
+            };
+
+            return persistence;
+        }
+
+        return EditablePersistenceCapability;
+    }
+);

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

@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * 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(
+    ['./EditableLookupCapability'],
+    function (EditableLookupCapability) {
+
+        /**
+         * Wrapper for the "relationship" capability;
+         * ensures that any domain objects reachable in Edit mode
+         * are also wrapped as EditableDomainObjects.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {RelationshipCapability}
+         */
+        return function EditableRelationshipCapability(
+            relationshipCapability,
+            editableObject,
+            domainObject,
+            cache
+        ) {
+            // This is a "lookup" style capability (it looks up other
+            // domain objects), but we do not want to return the same
+            // specific value every time (composition may change)
+            return new EditableLookupCapability(
+                relationshipCapability,
+                editableObject,
+                domainObject,
+                cache,
+                false // Not idempotent
+            );
+        };
+    }
+);

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

@@ -24,95 +24,115 @@ define(
     [],
     function () {
 
+
         /**
-         * A capability that implements an editing 'session' for a domain
-         * object. An editing session is initiated via a call to .edit().
-         * Once initiated, any persist operations will be queued pending a
-         * subsequent call to [.save()](@link #save) or [.cancel()](@link
-         * #cancel).
-         * @param transactionService
-         * @param domainObject
+         * Implements "save" and "cancel" as capabilities of
+         * the object. In editing mode, user is seeing/using
+         * a copy of the object (an EditableDomainObject)
+         * which is disconnected from persistence; the Save
+         * and Cancel actions can use this capability to
+         * propagate changes from edit mode to the underlying
+         * actual persistable object.
+         *
+         * Meant specifically for use by EditableDomainObject and the
+         * associated cache; the constructor signature is particular
+         * to a pattern used there and may contain unused arguments.
          * @constructor
+         * @memberof platform/commonUI/edit
          */
         function EditorCapability(
-            transactionService,
-            domainObject
+            persistenceCapability,
+            editableObject,
+            domainObject,
+            cache
         ) {
-            this.transactionService = transactionService;
+            this.editableObject = editableObject;
             this.domainObject = domainObject;
+            this.cache = cache;
+        }
+
+        // Simulate Promise.resolve (or $q.when); the former
+        // causes a delayed reaction from Angular (since it
+        // does not trigger a digest) and the latter is not
+        // readily accessible, since we're a few classes
+        // removed from the layer which gets dependency
+        // injection.
+        function resolvePromise(value) {
+            return (value && value.then) ? value : {
+                then: function (callback) {
+                    return resolvePromise(callback(value));
+                }
+            };
         }
 
         /**
-         * Initiate an editing session. This will start a transaction during
-         * which any persist operations will be deferred until either save()
-         * or cancel() are called.
+         * Save any changes that have been made to this domain object
+         * (as well as to others that might have been retrieved and
+         * modified during the editing session)
+         * @param {boolean} nonrecursive if true, save only this
+         *        object (and not other objects with associated changes)
+         * @returns {Promise} a promise that will be fulfilled after
+         *          persistence has completed.
+         * @memberof platform/commonUI/edit.EditorCapability#
          */
-        EditorCapability.prototype.edit = function () {
-            this.transactionService.startTransaction();
-            this.domainObject.getCapability('status').set('editing', true);
-        };
+        EditorCapability.prototype.save = function (nonrecursive) {
+            var domainObject = this.domainObject,
+                editableObject = this.editableObject,
+                self = this,
+                cache = this.cache,
+                returnPromise;
 
-        function isEditContextRoot(domainObject) {
-            return domainObject.getCapability('status').get('editing');
-        }
+            // Update the underlying, "real" domain object's model
+            // with changes made to the copy used for editing.
+            function doMutate() {
+                return domainObject.useCapability('mutation', function () {
+                    return editableObject.getModel();
+                });
+            }
 
-        function isEditing(domainObject) {
-            return isEditContextRoot(domainObject) ||
-                domainObject.hasCapability('context') &&
-                isEditing(domainObject.getCapability('context').getParent());
-        }
+            // Persist the underlying domain object
+            function doPersist() {
+                return domainObject.getCapability('persistence').persist();
+            }
 
-        /**
-         * Determines whether this object, or any of its ancestors are
-         * currently being edited.
-         * @returns boolean
-         */
-        EditorCapability.prototype.inEditContext = function () {
-            return isEditing(this.domainObject);
-        };
+            editableObject.getCapability("status").set("editing", false);
 
-        /**
-         * Is this the root editing object (ie. the object that the user
-         * clicked 'edit' on)?
-         * @returns {*}
-         */
-        EditorCapability.prototype.isEditContextRoot = function () {
-            return isEditContextRoot(this.domainObject);
-        };
-
-        /**
-         * Save any changes from this editing session. This will flush all
-         * pending persists and end the current transaction
-         * @returns {*}
-         */
-        EditorCapability.prototype.save = function () {
-            var domainObject = this.domainObject;
-            return this.transactionService.commit().then(function () {
-                domainObject.getCapability('status').set('editing', false);
+            if (nonrecursive) {
+                returnPromise = resolvePromise(doMutate())
+                    .then(doPersist)
+                    .then(function(){
+                        self.cancel();
+                    });
+            } else {
+                returnPromise = resolvePromise(cache.saveAll());
+            }
+            //Return the original (non-editable) object
+            return returnPromise.then(function() {
+                return domainObject.getOriginalObject ? domainObject.getOriginalObject() : domainObject;
             });
         };
 
-        EditorCapability.prototype.invoke = EditorCapability.prototype.edit;
-
         /**
-         * Cancel the current editing session. This will discard any pending
-         * persist operations
-         * @returns {*}
+         * Cancel editing; Discard any changes that have been made to
+         * this domain object (as well as to others that might have
+         * been retrieved and modified during the editing session)
+         * @returns {Promise} a promise that will be fulfilled after
+         *          cancellation has completed.
+         * @memberof platform/commonUI/edit.EditorCapability#
          */
         EditorCapability.prototype.cancel = function () {
-            var domainObject = this.domainObject;
-            return this.transactionService.cancel().then(function () {
-                domainObject.getCapability("status").set("editing", false);
-                return domainObject;
-            });
+            this.editableObject.getCapability("status").set("editing", false);
+            this.cache.markClean();
+            return resolvePromise(undefined);
         };
 
         /**
-         * @returns {boolean} true if there have been any domain model
-         * modifications since the last persist, false otherwise.
+         * Check if there are any unsaved changes.
+         * @returns {boolean} true if there are unsaved changes
+         * @memberof platform/commonUI/edit.EditorCapability#
          */
         EditorCapability.prototype.dirty = function () {
-            return this.transactionService.size() > 0;
+            return this.cache.dirty();
         };
 
         return EditorCapability;

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

@@ -1,73 +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.
- *****************************************************************************/
-/*global define*/
-
-define(
-    ['./TransactionalPersistenceCapability'],
-    function (TransactionalPersistenceCapability) {
-
-        /**
-         * Wraps the [PersistenceCapability]{@link PersistenceCapability} with
-         * transactional capabilities.
-         * @param $q
-         * @param transactionService
-         * @param capabilityService
-         * @see TransactionalPersistenceCapability
-         * @constructor
-         */
-        function TransactionCapabilityDecorator(
-            $q,
-            transactionService,
-            capabilityService
-        ) {
-            this.capabilityService = capabilityService;
-            this.transactionService = transactionService;
-            this.$q = $q;
-        }
-
-        /**
-         * Decorate PersistenceCapability to queue persistence calls when a
-         * transaction is in progress.
-         */
-        TransactionCapabilityDecorator.prototype.getCapabilities = function (model) {
-            var self = this,
-                capabilities = this.capabilityService.getCapabilities(model),
-                persistenceCapability = capabilities.persistence;
-
-            capabilities.persistence = function (domainObject) {
-                var original =
-                    (typeof persistenceCapability === 'function') ?
-                        persistenceCapability(domainObject) :
-                        persistenceCapability;
-                return new TransactionalPersistenceCapability(
-                    self.$q,
-                    self.transactionService,
-                    original,
-                    domainObject
-                );
-            };
-            return capabilities;
-        };
-
-        return TransactionCapabilityDecorator;
-    }
-);

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

@@ -1,105 +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.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Wraps persistence capability to enable transactions. Transactions
-         * will cause persist calls not to be invoked immediately, but
-         * rather queued until [EditorCapability.save()]{@link EditorCapability#save}
-         * or [EditorCapability.cancel()]{@link EditorCapability#cancel} are
-         * called.
-         * @memberof platform/commonUI/edit/capabilities
-         * @param $q
-         * @param transactionService
-         * @param persistenceCapability
-         * @param domainObject
-         * @constructor
-         */
-        function TransactionalPersistenceCapability(
-            $q,
-            transactionService,
-            persistenceCapability,
-            domainObject
-        ) {
-            this.transactionService = transactionService;
-            this.persistenceCapability = persistenceCapability;
-            this.domainObject = domainObject;
-            this.$q = $q;
-            this.persistPending = false;
-        }
-
-        /**
-         * The wrapped persist function. If a transaction is active, persist
-         * will be queued until the transaction is committed or cancelled.
-         * @returns {*}
-         */
-        TransactionalPersistenceCapability.prototype.persist = function () {
-            var self = this;
-
-            function onCommit() {
-                return self.persistenceCapability.persist().then(function (result) {
-                    self.persistPending = false;
-                    return result;
-                });
-            }
-
-            function onCancel() {
-                if (self.domainObject.getModel().persisted !== undefined) {
-                    //Fetch clean model from persistence
-                    return self.persistenceCapability.refresh().then(function (result) {
-                        self.persistPending = false;
-                        return result;
-                    });
-                } else {
-                    self.persistPending = false;
-                    //Model is undefined in persistence, so return undefined.
-                    return self.$q.when(undefined);
-                }
-            }
-
-            if (this.transactionService.isActive()) {
-                if (!this.persistPending) {
-                    this.transactionService.addToTransaction(onCommit, onCancel);
-                    this.persistPending = true;
-                }
-                //Need to return a promise from this function
-                return this.$q.when(true);
-            } else {
-                return this.persistenceCapability.persist();
-            }
-        };
-
-        TransactionalPersistenceCapability.prototype.refresh = function () {
-            return this.persistenceCapability.refresh();
-        };
-
-        TransactionalPersistenceCapability.prototype.getSpace = function () {
-            return this.persistenceCapability.getSpace();
-        };
-
-        return TransactionalPersistenceCapability;
-    }
-);

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

@@ -59,7 +59,7 @@ define(
 
             $scope.$watch('domainObject', setViewForDomainObject);
 
-            $scope.doAction = function (action) {
+            $scope.doAction = function (action){
                 return $scope[action] && $scope[action]();
             };
         }
@@ -74,8 +74,8 @@ define(
             var navigatedObject = this.scope.domainObject,
                 policyMessage;
 
-            this.policyService.allow("navigation", navigatedObject, undefined, function (message) {
-                policyMessage = message;
+            this.policyService.allow("navigation", navigatedObject, undefined, function(message) {
+               policyMessage = message;
             });
 
             return policyMessage;

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

@@ -30,7 +30,7 @@ define(
          * @constructor
          */
         function ElementsController($scope) {
-            function filterBy(text) {
+            function filterBy(text){
                 if (typeof text === 'undefined') {
                     return $scope.searchText;
                 } else {

platform/commonUI/edit/src/objects/EditableDomainObject.js

@@ -0,0 +1,130 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * Defines EditableDomainObject, which wraps domain objects
+ * such that user code may work with and mutate a copy of the
+ * domain object model; these changes may then be propagated
+ * up to the real domain object (or not) by way of invoking
+ * save or cancel behaviors of the "editor.completion"
+ * capability (a capability intended as internal to edit
+ * mode; invoked by way of the Save and Cancel actions.)
+ */
+define(
+    [
+        '../capabilities/EditablePersistenceCapability',
+        '../capabilities/EditableContextCapability',
+        '../capabilities/EditableCompositionCapability',
+        '../capabilities/EditableRelationshipCapability',
+        '../capabilities/EditableInstantiationCapability',
+        '../capabilities/EditorCapability',
+        '../capabilities/EditableActionCapability',
+        './EditableDomainObjectCache'
+    ],
+    function (
+        EditablePersistenceCapability,
+        EditableContextCapability,
+        EditableCompositionCapability,
+        EditableRelationshipCapability,
+        EditableInstantiationCapability,
+        EditorCapability,
+        EditableActionCapability,
+        EditableDomainObjectCache
+    ) {
+
+        var capabilityFactories = {
+            persistence: EditablePersistenceCapability,
+            context: EditableContextCapability,
+            composition: EditableCompositionCapability,
+            relationship: EditableRelationshipCapability,
+            instantiation: EditableInstantiationCapability,
+            editor: EditorCapability
+        };
+
+        // Handle special case where "editor.completion" wraps persistence
+        // (other capability overrides wrap capabilities of the same type.)
+        function getDelegateArguments(name, args) {
+            return name === "editor" ? ['persistence'] : args;
+        }
+
+        /**
+         * An EditableDomainObject overrides capabilities
+         * which need to behave differently in edit mode,
+         * and provides a "working copy" of the object's
+         * model to allow changes to be easily cancelled.
+         * @constructor
+         * @memberof platform/commonUI/edit
+         * @implements {DomainObject}
+         */
+        function EditableDomainObject(domainObject, $q) {
+            // The cache will hold all domain objects reached from
+            // the initial EditableDomainObject; this ensures that
+            // different versions of the same editable domain object
+            // are not shown in different sections of the same Edit
+            // UI, which might thereby fall out of sync.
+            var cache,
+                originalObject = domainObject,
+                cachedObject;
+
+            // Constructor for EditableDomainObject, which adheres
+            // to the same shared cache.
+            function EditableDomainObjectImpl(domainObject, model) {
+                var editableObject = Object.create(domainObject);
+
+                // Only provide the cloned model.
+                editableObject.getModel = function () { return model; };
+
+                // Override certain capabilities
+                editableObject.getCapability = function (name) {
+                    var delegateArguments = getDelegateArguments(name, arguments),
+                        capability = domainObject.getCapability.apply(
+                            this,
+                            delegateArguments
+                        ),
+                        Factory = capabilityFactories[name];
+
+                    return (Factory && capability) ?
+                            new Factory(capability, editableObject, domainObject, cache) :
+                            capability;
+                };
+
+
+                editableObject.setOriginalObject = function(object) {
+                    originalObject = object;
+                };
+
+                editableObject.getOriginalObject = function() {
+                    return originalObject;
+                };
+
+                return editableObject;
+            }
+
+            cache = new EditableDomainObjectCache(EditableDomainObjectImpl, $q);
+            cachedObject = cache.getEditableObject(domainObject);
+
+            return cachedObject;
+        }
+
+        return EditableDomainObject;
+    }
+);

platform/commonUI/edit/src/objects/EditableDomainObjectCache.js

@@ -0,0 +1,170 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+
+/*
+ * An editable domain object cache stores domain objects that have been
+ * made editable, in a group that can be saved all-at-once. This supports
+ * Edit mode, which is launched for a specific object but may contain
+ * changes across many objects.
+ *
+ * Editable domain objects have certain specific capabilities overridden
+ * to ensure that changes made while in edit mode do not propagate up
+ * to the objects used in browse mode (or to persistence) until the user
+ * initiates a Save.
+ */
+define(
+    ["./EditableModelCache"],
+    function (EditableModelCache) {
+
+        /**
+         * Construct a new cache for editable domain objects. This can be used
+         * to get-or-create editable objects, particularly to support wrapping
+         * of objects retrieved via composition or context capabilities as
+         * editable domain objects.
+         *
+         * @param {Constructor<DomainObject>} EditableDomainObject a
+         *        constructor function which takes a regular domain object as
+         *        an argument, and returns an editable domain object as its
+         *        result.
+         * @param $q Angular's $q, for promise handling
+         * @memberof platform/commonUI/edit
+         * @constructor
+         */
+        function EditableDomainObjectCache(EditableDomainObject, $q) {
+            this.cache = new EditableModelCache();
+            this.dirtyObjects = {};
+            this.root = undefined;
+            this.$q = $q;
+            this.EditableDomainObject = EditableDomainObject;
+        }
+
+        /**
+         * Wrap this domain object in an editable form, or pull such
+         * an object from the cache if one already exists.
+         *
+         * @param {DomainObject} domainObject the regular domain object
+         * @returns {DomainObject} the domain object in an editable form
+         */
+        EditableDomainObjectCache.prototype.getEditableObject = function (domainObject) {
+            var type = domainObject.getCapability('type'),
+                EditableDomainObject = this.EditableDomainObject,
+                editableObject;
+
+            // Track the top-level domain object; this will have
+            // some special behavior for its context capability.
+            this.root = this.root || domainObject;
+
+            // Avoid double-wrapping (WTD-1017)
+            if (domainObject.hasCapability('editor')) {
+                return domainObject;
+            }
+
+            // Don't bother wrapping non-editable objects
+            if (!type || !type.hasFeature('creation')) {
+                return domainObject;
+            }
+
+            // Provide an editable form of the object
+            editableObject = new EditableDomainObject(
+                domainObject,
+                this.cache.getCachedModel(domainObject)
+            );
+
+            return editableObject;
+        };
+
+        /**
+         * Check if a domain object is (effectively) the top-level
+         * object in this editable subgraph.
+         * @returns {boolean} true if it is the root
+         */
+        EditableDomainObjectCache.prototype.isRoot = function (domainObject) {
+            return domainObject === this.root;
+        };
+
+        /**
+         * Mark an editable domain object (presumably already cached)
+         * as having received modifications during editing; it should be
+         * included in the bulk save invoked when editing completes.
+         *
+         * @param {DomainObject} domainObject the domain object
+         * @memberof platform/commonUI/edit.EditableDomainObjectCache#
+         */
+        EditableDomainObjectCache.prototype.markDirty = function (domainObject) {
+            this.dirtyObjects[domainObject.getId()] = domainObject;
+            return this.$q.when(true);
+        };
+
+        /**
+         * Mark an object (presumably already cached) as having had its
+         * changes saved (and thus no longer needing to be subject to a
+         * save operation.)
+         *
+         * @param {DomainObject} domainObject the domain object
+         */
+        EditableDomainObjectCache.prototype.markClean = function (domainObject) {
+            var self = this;
+            if (!domainObject) {
+                Object.keys(this.dirtyObjects).forEach(function(key) {
+                    delete self.dirtyObjects[key];
+                });
+            } else {
+                delete this.dirtyObjects[domainObject.getId()];
+            }
+        };
+
+        /**
+         * Initiate a save on all objects that have been cached.
+         * @return {Promise} A promise which will resolve when all objects are
+         *         persisted.
+         */
+        EditableDomainObjectCache.prototype.saveAll = function () {
+            // Get a list of all dirty objects
+            var dirty = this.dirtyObjects,
+                objects = Object.keys(dirty).map(function (k) {
+                    return dirty[k];
+                });
+
+            // Clear dirty set, since we're about to save.
+            this.dirtyObjects = {};
+
+            // Most save logic is handled by the "editor.completion"
+            // capability, so that is delegated here.
+            return this.$q.all(objects.map(function (object) {
+                // Save; pass a nonrecursive flag to avoid looping
+                return object.getCapability('editor').save(true);
+            }));
+        };
+
+        /**
+         * Check if any objects have been marked dirty in this cache.
+         * @returns {boolean} true if objects are dirty
+         */
+        EditableDomainObjectCache.prototype.dirty = function () {
+            return Object.keys(this.dirtyObjects).length > 0;
+        };
+
+        return EditableDomainObjectCache;
+    }
+);
+

platform/commonUI/edit/src/objects/EditableModelCache.js

@@ -21,35 +21,40 @@
  *****************************************************************************/
 
 define(
-    ['./FollowMode'],
-    function (FollowMode) {
+    [],
+    function () {
 
         /**
-         * Class representing the 'realtime' mode of the time conductor.
-         * This is a special case of FollowMode that only supports 'clock'
-         * type tick sources.
-         * @param conductor
-         * @param timeSystems
+         * An editable model cache stores domain object models that have been
+         * made editable, to support a group that can be saved all-at-once.
+         * This is useful in Edit mode, which is launched for a specific
+         * object but may contain changes across many objects.
+         * @memberof platform/commonUI/edit
          * @constructor
          */
-        function RealtimeMode(conductor, timeSystems) {
-            var metadata = {
-                key: 'realtime',
-                glyph: '\u0043',
-                label: 'Real-time',
-                name: 'Real-time Mode',
-                description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
-            };
-            var filteredTimeSystems = timeSystems.filter(function (timeSystem){
-                return timeSystem.tickSources().some(function (tickSource){
-                    return tickSource.type() === 'clock';
-                });
-            });
-            FollowMode.call(this, metadata, conductor, filteredTimeSystems);
+        function EditableModelCache() {
+            this.cache = {};
         }
 
-        RealtimeMode.prototype = Object.create(FollowMode.prototype);
+        // Deep-copy a model. Models are JSONifiable, so this can be
+        // done by stringification then destringification
+        function clone(model) {
+            return JSON.parse(JSON.stringify(model));
+        }
 
-        return RealtimeMode;
+        /**
+         * Get this domain object's model from the cache (or
+         * place it in the cache if it isn't in the cache yet)
+         * @returns a clone of the domain object's model
+         */
+        EditableModelCache.prototype.getCachedModel = function (domainObject) {
+            var id = domainObject.getId(),
+                cache = this.cache;
+
+            return (cache[id] =
+                cache[id] || clone(domainObject.getModel()));
+        };
+
+        return EditableModelCache;
     }
 );

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

@@ -45,7 +45,7 @@ define(
                 count = 0,
                 type, views;
 
-            if (!domainObject) {
+            if (!domainObject){
                 return count;
             }
 
@@ -56,10 +56,7 @@ define(
             // 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')
-                    ) {
+                    (view.key === 'plot' && type.getKey() === 'telemetry.panel')) {
                     count++;
                 }
             });
@@ -76,22 +73,25 @@ define(
         function isEditing(context) {
             var domainObject = (context || {}).domainObject;
             return domainObject &&
-                domainObject.hasCapability('editor') &&
-                domainObject.getCapability('editor').isEditContextRoot();
+                domainObject.hasCapability('status') &&
+                domainObject.getCapability('status').get('editing');
         }
 
         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);
+            // Only worry about actions in the view-control category
+            if (category === 'view-control') {
+                // 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') {
+                    return this.countEditableViews(context) < 1 && !isEditing(context);
+                }
             }
 
             // Like all policies, allow by default.

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

@@ -34,11 +34,6 @@ define(
          * 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;
@@ -50,13 +45,18 @@ define(
             this.nonEditContextBlacklist = nonEditContextBlacklist;
         }
 
+        function isParentEditable(object) {
+            var parent = object.hasCapability("context") && object.getCapability("context").getParent();
+            return !!parent && parent.hasCapability("editor");
+        }
+
         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()) {
+            if (navigatedObject.hasCapability('editor')) {
+                if (selectedObject.hasCapability('editor') || isParentEditable(selectedObject)){
                     return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
                 } else {
                     //Target is in the context menu

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

@@ -38,14 +38,15 @@ define(
         /**
          * @private
          */
-        EditNavigationPolicy.prototype.isDirty = function (domainObject) {
+        EditNavigationPolicy.prototype.isDirty = function(domainObject) {
             var navigatedObject = domainObject,
                 editorCapability = navigatedObject &&
-                    navigatedObject.getCapability("editor");
+                    navigatedObject.getCapability("editor"),
+                statusCapability = navigatedObject &&
+                    navigatedObject.getCapability("status");
 
-            return editorCapability &&
-                editorCapability.isEditContextRoot() &&
-                editorCapability.dirty();
+            return statusCapability && statusCapability.get('editing') &&
+                editorCapability && editorCapability.dirty();
         };
 
         /**

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

@@ -35,12 +35,11 @@ define([], function () {
     }
 
     EditableLinkPolicy.prototype.allow = function (action, context) {
-        var key = action.getMetadata().key,
-            object;
+        var key = action.getMetadata().key;
 
         if (key === 'link') {
-            object = context.selectedObject || context.domainObject;
-            return !(object.hasCapability("editor") && object.getCapability("editor").inEditContext());
+            return !((context.selectedObject || context.domainObject)
+                .hasCapability('editor'));
         }
 
         // Like all policies, allow by default.

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

@@ -35,13 +35,10 @@ define([], function () {
     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();
+            key = action.getMetadata().key;
 
-        if (key === 'move' && isDomainObjectEditing) {
-            return !!selectedObject && selectedObject.hasCapability('editor') &&
-                selectedObject.getCapability('editor').inEditContext();
+        if (key === 'move' && domainObject.hasCapability('editor')) {
+            return !!selectedObject && selectedObject.hasCapability('editor');
         }
 
         // Like all policies, allow by default.

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

@@ -37,7 +37,7 @@ define(
             // If a view is flagged as non-editable, only allow it
             // while we're not in Edit mode.
             if ((view || {}).editable === false) {
-                return !(domainObject.hasCapability('editor') && domainObject.getCapability('editor').inEditContext());
+                return !domainObject.hasCapability('editor');
             }
 
             // Like all policies, allow by default.

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

@@ -91,8 +91,14 @@ define(
                 }
             }
 
+            function setEditable(editableDomainObject) {
+                self.domainObject = editableDomainObject;
+                scope.model = editableDomainObject.getModel();
+            }
+
             // Place the "commit" method in the scope
             scope.commit = commit;
+            scope.setEditable = setEditable;
 
             // Clean up when the scope is destroyed
             scope.$on("$destroy", function () {
@@ -113,7 +119,7 @@ define(
             // Ensure existing watches are released
             this.destroy();
 
-            function setEditing() {
+            function setEditing(){
                 scope.viewObjectTemplate = 'edit-object';
             }
 
@@ -122,15 +128,15 @@ define(
              * editable then change the view and inspector regions
              * object representation accordingly
              */
-            this.listenHandle = this.domainObject.getCapability('status').listen(function (statuses) {
-                if (statuses.indexOf('editing') !== -1) {
+            this.listenHandle = this.domainObject.getCapability('status').listen(function(statuses){
+                if (statuses.indexOf('editing') !== -1){
                     setEditing();
                 } else {
                     delete scope.viewObjectTemplate;
                 }
             });
 
-            if (representedObject.hasCapability('editor') && representedObject.getCapability('editor').isEditContextRoot()) {
+            if (representedObject.getCapability('status').get('editing')){
                 setEditing();
             }
         };

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

@@ -24,12 +24,8 @@ define(
     function () {
 
         // Utility functions for reducing truth arrays
-        function and(a, b) {
-            return a && b;
-        }
-        function or(a, b) {
-            return a || b;
-        }
+        function and(a, b) { return a && b; }
+        function or(a, b) { return a || b; }
 
 
         /**
@@ -223,7 +219,7 @@ define(
 
             // Update value for this property in all elements of the
             // selection which have this property.
-            function updateProperties(property, val) {
+            function updateProperties(property, value) {
                 var changed = false;
 
                 // Update property in a selected element
@@ -233,12 +229,12 @@ define(
                         // Check if this is a setter, or just assignable
                         if (typeof selected[property] === 'function') {
                             changed =
-                                changed || (selected[property]() !== val);
-                            selected[property](val);
+                                changed || (selected[property]() !== value);
+                            selected[property](value);
                         } else {
                             changed =
-                                changed || (selected[property] !== val);
-                            selected[property] = val;
+                                changed || (selected[property] !== value);
+                            selected[property] = value;
                         }
                     }
                 }

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

@@ -133,11 +133,11 @@ define(
                 self = this;
 
             // Initialize toolbar (expose object to parent scope)
-            function initialize(def) {
+            function initialize(definition) {
                 // If we have been asked to expose toolbar state...
                 if (self.attrs.toolbar) {
                     // Initialize toolbar object
-                    self.toolbar = new EditToolbar(def, self.commit);
+                    self.toolbar = new EditToolbar(definition, self.commit);
                     // Ensure toolbar state is exposed
                     self.exposeToolbar();
                 }

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

@@ -1,148 +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.
- *****************************************************************************/
-/*global define*/
-define(
-    [],
-    function () {
-        /**
-         * Implements an application-wide transaction state. Once a
-         * transaction is started, calls to
-         * [PersistenceCapability.persist()]{@link PersistenceCapability#persist}
-         * will be deferred until a subsequent call to
-         * [TransactionService.commit]{@link TransactionService#commit} is made.
-         *
-         * @memberof platform/commonUI/edit/services
-         * @param $q
-         * @constructor
-         */
-        function TransactionService($q, $log) {
-            this.$q = $q;
-            this.$log = $log;
-            this.transaction = false;
-
-            this.onCommits = [];
-            this.onCancels = [];
-        }
-
-        /**
-         * Starts a transaction. While a transaction is active all calls to
-         * [PersistenceCapability.persist](@link PersistenceCapability#persist)
-         * will be queued until [commit]{@link #commit} or [cancel]{@link
-         * #cancel} are called
-         */
-        TransactionService.prototype.startTransaction = function () {
-            if (this.transaction) {
-                //Log error because this is a programming error if it occurs.
-                this.$log.error("Transaction already in progress");
-            }
-            this.transaction = true;
-        };
-
-        /**
-         * @returns {boolean} If true, indicates that a transaction is in progress
-         */
-        TransactionService.prototype.isActive = function () {
-            return this.transaction;
-        };
-
-        /**
-         * Adds provided functions to a queue to be called on
-         * [.commit()]{@link #commit} or
-         * [.cancel()]{@link #commit}
-         * @param onCommit A function to call on commit
-         * @param onCancel A function to call on cancel
-         */
-        TransactionService.prototype.addToTransaction = function (onCommit, onCancel) {
-            if (this.transaction) {
-                this.onCommits.push(onCommit);
-                if (onCancel) {
-                    this.onCancels.push(onCancel);
-                }
-            } else {
-                //Log error because this is a programming error if it occurs.
-                this.$log.error("No transaction in progress");
-            }
-        };
-
-        /**
-         * All persist calls deferred since the beginning of the transaction
-         * will be committed.
-         *
-         * @returns {Promise} resolved when all persist operations have
-         * completed. Will reject if any commit operations fail
-         */
-        TransactionService.prototype.commit = function () {
-            var self = this,
-                promises = [],
-                onCommit;
-
-            while (this.onCommits.length > 0) { // ...using a while in case some onCommit adds to transaction
-                onCommit = this.onCommits.pop();
-                try { // ...also don't want to fail mid-loop...
-                    promises.push(onCommit());
-                } catch (e) {
-                    this.$log.error("Error committing transaction.");
-                }
-            }
-            return this.$q.all(promises).then(function () {
-                self.transaction = false;
-
-                self.onCommits = [];
-                self.onCancels = [];
-            });
-        };
-
-        /**
-         * Cancel the current transaction, replacing any dirty objects from
-         * persistence. Not a true rollback, as it cannot be used to undo any
-         * persist calls that were successful in the event one of a batch of
-         * persists failing.
-         *
-         * @returns {*}
-         */
-        TransactionService.prototype.cancel = function () {
-            var self = this,
-                results = [],
-                onCancel;
-
-            while (this.onCancels.length > 0) {
-                onCancel = this.onCancels.pop();
-                try {
-                    results.push(onCancel());
-                } catch (error) {
-                    this.$log.error("Error committing transaction.");
-                }
-            }
-            return this.$q.all(results).then(function () {
-                self.transaction = false;
-
-                self.onCommits = [];
-                self.onCancels = [];
-            });
-        };
-
-        TransactionService.prototype.size = function () {
-            return this.onCommits.length;
-        };
-
-        return TransactionService;
-    });

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

@@ -24,11 +24,12 @@ define(
     ["../../src/actions/CancelAction"],
     function (CancelAction) {
 
-        describe("The Cancel action", function () {
-            var mockDomainObject,
-                mockParentObject,
-                capabilities = {},
-                parentCapabilities = {},
+        //TODO: Disabled for NEM Beta
+        xdescribe("The Cancel action", function () {
+            var mockLocation,
+                mockDomainObject,
+                mockEditorCapability,
+                mockUrlService,
                 actionContext,
                 action;
 
@@ -41,115 +42,62 @@ define(
             }
 
             beforeEach(function () {
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    [ "path" ]
+                );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [
-                        "getCapability",
-                        "hasCapability",
-                        "getModel"
-                    ]
+                    [ "getCapability", "hasCapability" ]
                 );
-                mockDomainObject.getModel.andReturn({});
-
-                mockParentObject = jasmine.createSpyObj(
-                    "parentObject",
-                    [
-                        "getCapability"
-                    ]
-                );
-                mockParentObject.getCapability.andCallFake(function (name) {
-                    return parentCapabilities[name];
-                });
-
-                capabilities.editor = jasmine.createSpyObj(
+                mockEditorCapability = jasmine.createSpyObj(
                     "editor",
-                    ["save", "cancel", "isEditContextRoot"]
+                    [ "save", "cancel" ]
                 );
-                capabilities.action = jasmine.createSpyObj(
-                    "actionCapability",
-                    [
-                        "perform"
-                    ]
-                );
-                capabilities.location = jasmine.createSpyObj(
-                    "locationCapability",
-                    [
-                        "getOriginal"
-                    ]
-                );
-                capabilities.location.getOriginal.andReturn(mockPromise(mockDomainObject));
-                capabilities.context = jasmine.createSpyObj(
-                    "contextCapability",
-                    [
-                        "getParent"
-                    ]
-                );
-                capabilities.context.getParent.andReturn(mockParentObject);
-
-                parentCapabilities.action = jasmine.createSpyObj(
-                    "actionCapability",
-                    [
-                        "perform"
-                    ]
+                mockUrlService = jasmine.createSpyObj(
+                    "urlService",
+                    ["urlForLocation"]
                 );
 
                 actionContext = {
                     domainObject: mockDomainObject
                 };
 
-                mockDomainObject.getCapability.andCallFake(function (name) {
-                    return capabilities[name];
-                });
+                mockDomainObject.hasCapability.andReturn(true);
+                mockDomainObject.getCapability.andReturn(mockEditorCapability);
+                mockEditorCapability.cancel.andReturn(mockPromise(true));
 
-                mockDomainObject.hasCapability.andCallFake(function (name) {
-                    return !!capabilities[name];
-                });
-
-                capabilities.editor.cancel.andReturn(mockPromise(true));
-
-                action = new CancelAction(actionContext);
+                action = new CancelAction(mockLocation, mockUrlService, actionContext);
 
             });
 
-            it("only applies to domain object that is being edited", function () {
-                capabilities.editor.isEditContextRoot.andReturn(true);
+            it("only applies to domain object with an editor capability", function () {
                 expect(CancelAction.appliesTo(actionContext)).toBeTruthy();
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
-                capabilities.editor.isEditContextRoot.andReturn(false);
-                expect(CancelAction.appliesTo(actionContext)).toBeFalsy();
-
                 mockDomainObject.hasCapability.andReturn(false);
+                mockDomainObject.getCapability.andReturn(undefined);
                 expect(CancelAction.appliesTo(actionContext)).toBeFalsy();
             });
 
-            it("invokes the editor capability's cancel functionality when" +
-                " performed", function () {
-                mockDomainObject.getModel.andReturn({persisted: 1});
-                //Return true from navigate action
-                capabilities.action.perform.andReturn(mockPromise(true));
+            it("invokes the editor capability's save functionality when performed", function () {
+                // Verify precondition
+                expect(mockEditorCapability.cancel).not.toHaveBeenCalled();
                 action.perform();
 
                 // Should have called cancel
-                expect(capabilities.editor.cancel).toHaveBeenCalled();
+                expect(mockEditorCapability.cancel).toHaveBeenCalled();
 
                 // Definitely shouldn't call save!
-                expect(capabilities.editor.save).not.toHaveBeenCalled();
+                expect(mockEditorCapability.save).not.toHaveBeenCalled();
             });
 
-            it("navigates to object if existing using navigate action", function () {
-                mockDomainObject.getModel.andReturn({persisted: 1});
-                //Return true from navigate action
-                capabilities.action.perform.andReturn(mockPromise(true));
+            it("returns to browse when performed", function () {
                 action.perform();
-                expect(capabilities.action.perform).toHaveBeenCalledWith("navigate");
-            });
-
-            it("navigates to parent if new using navigate action", function () {
-                mockDomainObject.getModel.andReturn({persisted: undefined});
-                action.perform();
-                expect(parentCapabilities.action.perform).toHaveBeenCalledWith("navigate");
+                expect(mockLocation.path).toHaveBeenCalledWith(
+                    mockUrlService.urlForLocation("browse", mockDomainObject)
+                );
             });
         });
     }
-);
+);

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

@@ -30,46 +30,32 @@ define(
                 mockLog,
                 mockDomainObject,
                 mockType,
-                mockEditor,
                 actionContext,
-                capabilities,
                 action;
 
             beforeEach(function () {
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    ["path"]
+                    [ "path" ]
                 );
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
-                    ["setNavigation", "getNavigation", "addListener", "removeListener"]
+                    [ "setNavigation", "getNavigation" ]
                 );
                 mockLog = jasmine.createSpyObj(
                     "$log",
-                    ["error", "warn", "info", "debug"]
+                    [ "error", "warn", "info", "debug" ]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getId", "getModel", "getCapability", "hasCapability", "useCapability"]
+                    [ "getId", "getModel", "getCapability" ]
                 );
                 mockType = jasmine.createSpyObj(
                     "type",
-                    ["hasFeature"]
-                );
-                mockEditor = jasmine.createSpyObj(
-                    "editorCapability",
-                    ["edit", "isEditContextRoot", "cancel"]
+                    [ "hasFeature" ]
                 );
 
-                capabilities = {
-                    type: mockType,
-                    editor: mockEditor
-                };
-
-                mockDomainObject.getCapability.andCallFake(function (name) {
-                    return capabilities[name];
-                });
-                mockDomainObject.hasCapability.andReturn(true);
+                mockDomainObject.getCapability.andReturn(mockType);
                 mockType.hasFeature.andReturn(true);
 
                 actionContext = { domainObject: mockDomainObject };
@@ -82,34 +68,51 @@ define(
                 );
             });
 
-            it("is only applicable when an editable domain object is present", function () {
+            it("is only applicable when a domain object is present", function () {
                 expect(EditAction.appliesTo(actionContext)).toBeTruthy();
                 expect(EditAction.appliesTo({})).toBeFalsy();
-
-                expect(mockDomainObject.hasCapability).toHaveBeenCalledWith('editor');
                 // Should have checked for creatability
                 expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
             });
 
-            it("is only applicable to objects not already in edit mode", function () {
-                mockEditor.isEditContextRoot.andReturn(false);
-                expect(EditAction.appliesTo(actionContext)).toBe(true);
-                mockEditor.isEditContextRoot.andReturn(true);
-                expect(EditAction.appliesTo(actionContext)).toBe(false);
+            //TODO: Disabled for NEM Beta
+            xit("changes URL path to edit mode when performed", function () {
+                action.perform();
+                expect(mockLocation.path).toHaveBeenCalledWith("/edit");
             });
 
-            it ("cancels editing when user navigates away", function () {
+            //TODO: Disabled for NEM Beta
+            xit("ensures that the edited object is navigated-to", function () {
                 action.perform();
-                expect(mockNavigationService.addListener).toHaveBeenCalled();
-                mockNavigationService.addListener.mostRecentCall.args[0]();
-                expect(mockEditor.cancel).toHaveBeenCalled();
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockDomainObject);
             });
 
-            it ("invokes the Edit capability on the object", function () {
-                action.perform();
-                expect(mockDomainObject.useCapability).toHaveBeenCalledWith("editor");
+            //TODO: Disabled for NEM Beta
+            xit("logs a warning if constructed when inapplicable", function () {
+                // Verify precondition (ensure warn wasn't called during setup)
+                expect(mockLog.warn).not.toHaveBeenCalled();
+
+                // Should not have hit an exception...
+                new EditAction(
+                    mockLocation,
+                    mockNavigationService,
+                    mockLog,
+                    {}
+                ).perform();
+
+                // ...but should have logged a warning
+                expect(mockLog.warn).toHaveBeenCalled();
+
+                // And should not have had other interactions
+                expect(mockLocation.path)
+                    .not.toHaveBeenCalled();
+                expect(mockNavigationService.setNavigation)
+                    .not.toHaveBeenCalled();
             });
 
+
+
         });
     }
-);
+);

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

@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 define(
-    ["../../src/actions/EditAndComposeAction"],
-    function (EditAndComposeAction) {
+    ["../../src/actions/LinkAction"],
+    function (LinkAction) {
 
         describe("The Link action", function () {
             var mockQ,
@@ -31,8 +31,6 @@ define(
                 mockContext,
                 mockComposition,
                 mockPersistence,
-                mockActionCapability,
-                mockEditAction,
                 mockType,
                 actionContext,
                 model,
@@ -52,7 +50,7 @@ define(
 
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getId", "getCapability"]
+                    [ "getId", "getCapability" ]
                 );
                 mockQ = { when: mockPromise };
                 mockParent = {
@@ -66,30 +64,25 @@ define(
                         return capabilities[k].invoke(v);
                     }
                 };
-                mockContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockComposition = jasmine.createSpyObj("composition", ["invoke", "add"]);
-                mockPersistence = jasmine.createSpyObj("persistence", ["persist"]);
-                mockType = jasmine.createSpyObj("type", ["hasFeature", "getKey"]);
-                mockActionCapability = jasmine.createSpyObj("actionCapability", ["getActions"]);
-                mockEditAction = jasmine.createSpyObj("editAction", ["perform"]);
+                mockContext = jasmine.createSpyObj("context", [ "getParent" ]);
+                mockComposition = jasmine.createSpyObj("composition", [ "invoke", "add" ]);
+                mockPersistence = jasmine.createSpyObj("persistence", [ "persist" ]);
+                mockType = jasmine.createSpyObj("type", [ "hasFeature" ]);
 
                 mockDomainObject.getId.andReturn("test");
                 mockDomainObject.getCapability.andReturn(mockContext);
                 mockContext.getParent.andReturn(mockParent);
                 mockType.hasFeature.andReturn(true);
-                mockType.getKey.andReturn("layout");
                 mockComposition.invoke.andReturn(mockPromise(true));
                 mockComposition.add.andReturn(mockPromise(true));
-                mockActionCapability.getActions.andReturn([]);
 
                 capabilities = {
                     composition: mockComposition,
                     persistence: mockPersistence,
-                    action: mockActionCapability,
                     type: mockType
                 };
                 model = {
-                    composition: ["a", "b", "c"]
+                    composition: [ "a", "b", "c" ]
                 };
 
                 actionContext = {
@@ -97,7 +90,7 @@ define(
                     selectedObject: mockDomainObject
                 };
 
-                action = new EditAndComposeAction(actionContext);
+                action = new LinkAction(actionContext);
             });
 
 
@@ -112,21 +105,6 @@ define(
                 expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
-            it("enables edit mode for objects that have an edit action", function () {
-                mockActionCapability.getActions.andReturn([mockEditAction]);
-                action.perform();
-                expect(mockEditAction.perform).toHaveBeenCalled();
-            });
-
-            it("Does not enable edit mode for objects that do not have an" +
-                " edit action", function () {
-                mockActionCapability.getActions.andReturn([]);
-                action.perform();
-                expect(mockEditAction.perform).not.toHaveBeenCalled();
-                expect(mockComposition.add)
-                    .toHaveBeenCalledWith(mockDomainObject);
-            });
-
         });
     }
 );