Plot uses range defined in telemetry for autoscaling

Update the TransactingMutationListener to add items to a transaction
using the transactionManager so that they can be properly removed
from the transaction at a later date.

Prevents showing error dialogs during successful save, and also
prevents persisting duplicate objects.

.circleci/config.yml

@@ -11,20 +11,24 @@ jobs:
             name: Update npm
             command: 'sudo npm install -g npm@latest'
         - restore_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
+            key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "bower.json" }}
         - run:
             name: Installing dependencies (npm install)
             command: npm install
         - save_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
+            key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "bower.json" }}
             paths:
               - node_modules
+              - bower_components
         - run:
             name: npm run test
             command: npm run test
         - run:
             name: npm run lint
             command: npm run lint
+        - run:
+            name: npm run checkstyle
+            command: npm run checkstyle
         - store_artifacts:
             path: dist
             prefix: dist

.eslintrc.js

@@ -1,79 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "jasmine": true,
-        "amd": true
-    },
-    "extends": "eslint:recommended",
-    "parser": "babel-eslint",
-    "parserOptions": {
-        "allowImportExportEverywhere": true,
-        "ecmaVersion": 2015,
-        "ecmaFeatures": {
-            "impliedStrict": true
-        }
-    },
-    "rules": {
-        "no-bitwise": "error",
-        "curly": "error",
-        "eqeqeq": "error",
-        "guard-for-in": "error",
-        "no-extend-native": "error",
-        "no-inner-declarations": "off",
-        "no-use-before-define": ["error", "nofunc"],
-        "no-caller": "error",
-        "no-sequences": "error",
-        "no-irregular-whitespace": "error",
-        "no-new": "error",
-        "no-shadow": "error",
-        "no-undef": "error",
-        "no-unused-vars": [
-            "error",
-            {
-                "vars": "all",
-                "args": "none"
-            }
-        ],
-        "no-console": "off",
-        "no-trailing-spaces": "error",
-        "space-before-function-paren": [
-            "error",
-            {
-                "anonymous": "always",
-                "asyncArrow": "always",
-                "named": "never",
-            }
-        ],
-        "array-bracket-spacing": "error",
-        "space-in-parens": "error",
-        "space-before-blocks": "error",
-        "comma-dangle": "error",
-        "eol-last": "error",
-        "new-cap": [
-            "error",
-            {
-                "capIsNew": false,
-                "properties": false
-            }
-        ],
-        "dot-notation": "error",
-        "indent": ["error", 4]
-    },
-    "overrides": [
-        {
-            "files": ["*Spec.js"],
-            "rules": {
-                "no-unused-vars": [
-                    "warn",
-                    {
-                        "vars": "all",
-                        "args": "none",
-                        "varsIgnorePattern": "controller",
-
-                    }
-                ]
-            }
-        }
-    ]
-};

.jscsrc

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

.jshintrc

@@ -0,0 +1,26 @@
+{
+    "bitwise": true,
+    "browser": true,
+    "curly": true,
+    "eqeqeq": true,
+    "forin": true,
+    "freeze": true,
+    "funcscope": false,
+    "futurehostile": true,
+    "latedef": true,
+    "noarg": true,
+    "nocomma": true,
+    "nonbsp": true,
+    "nonew": true,
+    "predef": [
+        "define",
+        "Promise",
+        "WeakMap",
+        "Map"
+    ],
+    "shadow": "outer",
+    "strict": "implied",
+    "undef": true,
+    "unused": "vars",
+    "latedef": "nofunc"
+}

API.md

@@ -52,7 +52,6 @@
     - [The URL Status Indicator](#the-url-status-indicator)
     - [Creating a Simple Indicator](#creating-a-simple-indicator)
     - [Custom Indicators](#custom-indicators)
-  - [Included Plugins](#included-plugins)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -994,7 +993,7 @@ A common use case for indicators is to convey the state of some external system
 persistence backend or HTTP server. So long as this system is accessible via HTTP request, 
 Open MCT provides a general purpose indicator to show whether the server is available and 
 returing a 2xx status code. The URL Status Indicator is made available as a default plugin. See
-[Included Plugins](#included-plugins) below for details on how to install and configure the 
+the [documentation](./src/plugins/URLIndicatorPlugin) for details on how to install and configure the 
 URL Status Indicator.
 
 ### Creating a Simple Indicator
@@ -1045,60 +1044,4 @@ A completely custom indicator can be added by simple providing a DOM element to
     openmct.indicators.add({
         element: domNode
     });
-```
-
-## Included Plugins
-
-Open MCT is packaged along with a few general-purpose plugins:
-
-* `openmct.plugins.Conductor` provides a user interface for working with time
-within the application. If activated, configuration must be provided. This is 
-detailed in the section on [Time Conductor Configuration](#time-conductor-configuration).
-* `openmct.plugins.CouchDB` is an adapter for using CouchDB for persistence
-  of user-created objects. This is a constructor that takes the URL for the
-  CouchDB database as a parameter, e.g.
-```javascript
-openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
-```
-* `openmct.plugins.Elasticsearch` is an adapter for using Elasticsearch for
-  persistence of user-created objects. This is a
-  constructor that takes the URL for the Elasticsearch instance as a
-  parameter. eg.
-```javascript
-openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
-```
-* `openmct.plugins.Espresso` and `openmct.plugins.Snow` are two different
-  themes (dark and light) available for Open MCT. Note that at least one
-  of these themes must be installed for Open MCT to appear correctly.
-* `openmct.plugins.URLIndicator` adds an indicator which shows the
-availability of a URL with the following options: 
-  - `url` : URL to indicate the status of
-  - `iconClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
-  - `interval`: Interval between checking the connection, defaults to `10000`
-  - `label` Name showing up as text in the status bar, defaults to url
-```javascript
-openmct.install(openmct.plugins.URLIndicator({
-  url: 'http://localhost:8080',
-    iconClass: 'check',
-    interval: 10000,
-    label: 'Localhost'
- })
-);
-```
-* `openmct.plugins.LocalStorage` provides persistence of user-created
-  objects in browser-local storage. This is particularly useful in
-  development environments.
-* `openmct.plugins.MyItems` adds a top-level folder named "My Items"
-  when the application is first started, providing a place for a
-  user to store created items.
-* `openmct.plugins.UTCTimeSystem` provides a default time system for Open MCT.
-
-Generally, you will want to either install these plugins, or install
-different plugins that provide persistence and an initial folder
-hierarchy.
-
-eg.
-```javascript
-openmct.install(openmct.plugins.LocalStorage());
-openmct.install(openmct.plugins.MyItems());
-```
+```

LICENSE.md

@@ -0,0 +1,7 @@
+# Open MCT License
+
+Open MCT, Copyright (c) 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+
+Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

LICENSES.md

@@ -1,691 +0,0 @@
-# Open MCT Licenses
-
-Open MCT, Copyright (c) 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
-
-Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-Open MCT includes source code licensed under additional open source licenses as follows.
-
-## Software Components Licenses
-
-This software includes components released under the following licenses:
-
----
-
-### SuperSocket
-
-#### Info
-
-* Link: https://supersocket.codeplex.com/
-
-* Version: 0.9.0.2
-
-* Author: Kerry Jiang
-
-* Description: Supports SuperWebSocket
-
-#### License
-
-Copyright 2012 Kerry Jiang (kerry-jiang@hotmail.com)
-
-SuperSocket 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.
-
----
-
-### SuperWebSocket
-
-#### Info
-
-* Link: https://superswebocket.codeplex.com/
-
-* Version: 0.9.0.2
-
-* Author: Kerry Jiang
-
-* Description: WebSocket implementation for client-server communication
-
-#### License
-
-Copyright 2010-2013 Kerry Jiang (kerry-jiang@hotmail.com)
-
-SuperWebSocket 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.
-
-
----
-
-### log4net
-
-#### Info
-
-* Link: http://logging.apache.org/log4net/
-
-* Version: 1.2.13
-
-* Author: Apache Software Foundation
-
-* Description: Logging.
-
-#### License
-
-Copyright © 2004-2015 Apache Software Foundation.
-
-log4net 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.
-
----
-
-### Blanket.js
-
-#### Info
-
-* Link: http://blanketjs.org/
-
-* Version: 1.1.5
-
-* Author: Alex Seville
-
-* Description: Code coverage measurement and reporting
-
-#### License
-
-Copyright (c) 2013 Alex Seville
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Jasmine
-
-#### Info
-
-* Link: http://jasmine.github.io/
-
-* Version: 1.3.1
-
-* Author: Pivotal Labs
-
-* Description: Unit testing
-
-#### License
-
-Copyright (c) 2008-2011 Pivotal Labs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### RequireJS
-
-#### Info
-
-* Link: http://requirejs.org/
-
-* Version: 2.1.22
-
-* Author: The Dojo Foundation
-
-* Description: Script loader
-
-#### License
-
-Copyright (c) 2010-2015, The Dojo Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### requirejs-text
-
-#### Info
-
-* Link: https://github.com/requirejs/text
-
-* Version: 2.0.14
-
-* Author: The Dojo Foundation
-
-* Description: Text loading plugin for RequireJS
-
-#### License
-
-Copyright (c) 2010-2014, The Dojo Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-### AngularJS
-
-#### Info
-
-* Link: http://angularjs.org/
-
-* Version: 1.4.4
-
-* Author: Google
-
-* Description: Client-side web application framework
-
-#### License
-
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Angular-Route
-
-#### Info
-
-* Link: http://angularjs.org/
-
-* Version: 1.4.4
-
-* Author: Google
-
-* Description: Client-side view routing
-
-#### License
-
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### ES6-Promise
-
-#### Info
-
-* Link: https://github.com/jakearchibald/es6-promise
-
-* Version: 3.0.2
-
-* Authors: Yehuda Katz, Tom Dale, Stefan Penner and contributors
-
-* Description: Promise polyfill for pre-ECMAScript 6 browsers
-
-#### License
-
-Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### screenfull.js
-
-#### Info
-
-* Link: https://github.com/sindresorhus/screenfull.js/
-
-* Version: 3.0.0
-
-* Author: Sindre Sorhus
-
-* Description: Wrapper for cross-browser usage of fullscreen API
-
-#### License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Math.uuid.js
-
-#### Info
-
-* Link: https://github.com/broofa/node-uuid
-
-* Version: 1.4.7
-
-* Author: Robert Kieffer
-
-* Description: Unique identifer generation.
-
-#### License
-
-Copyright (c) 2010-2012 Robert Kieffer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Normalize.css
-
-#### Info
-
-* Link: https://github.com/necolas/normalize.css
-
-* Version: 1.1.2
-
-* Authors: Nicolas Gallagher, Jonathan Neal
-
-* Description: Browser style normalization
-
-#### License
-
-Copyright (c) Nicolas Gallagher and Jonathan Neal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Moment.js
-
-#### Info
-
-* Link: http://momentjs.com
-
-* Version: 2.11.1
-
-* Authors: Tim Wood, Iskren Chernev, Moment.js contributors
-
-* Description: Time/date parsing/formatting
-
-#### License
-
-Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### moment-duration-format
-
-#### Info
-
-* Link: https://github.com/jsmreese/moment-duration-format
-
-* Version: 1.3.0
-
-* Authors: John Madhavan-Reese
-
-* Description: Duration parsing/formatting
-
-#### License
-
-Copyright 2014 John Madhavan-Reese
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### CSV.js
-
-#### Info
-
-* Link: https://github.com/knrz/CSV.js
-
-* Version: 3.6.4
-
-* Authors: Kash Nouroozi
-
-* Description: Encoder for CSV (comma separated values) export
-
-#### License
-
-Copyright (c) 2014 Kash Nouroozi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-### FileSaver.js
-
-#### Info
-
-* Link: https://github.com/eligrey/FileSaver.js/
-
-* Version: 0.0.2
-
-* Authors: Eli Grey
-
-* Description: File download initiator (for file exports)
-
-#### License
-
-Copyright © 2015 Eli Grey.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Zepto
-
-#### Info
-
-* Link: http://zeptojs.com/
-
-* Version: 1.1.6
-
-* Authors: Thomas Fuchs
-
-* Description: DOM manipulation
-
-#### License
-
-Copyright (c) 2010-2016 Thomas Fuchs
-http://zeptojs.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Json.NET
-
-#### Info
-
-* Link: http://www.newtonsoft.com/json
-
-* Version: 6.0.8
-
-* Author: Newtonsoft
-
-* Description: JSON serialization/deserialization
-
-#### License
-
-Copyright (c) 2007 James Newton-King
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Nancy
-
-#### Info
-
-* Link: http://nancyfx.org
-
-* Version: 0.23.2
-
-* Author: Andreas Håkansson, Steven Robbins and contributors
-
-* Description: Embedded web server
-
-#### License
-
-Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Nancy.Hosting.Self
-
-#### Info
-
-* Link: http://nancyfx.org
-
-* Version: 0.23.2
-
-* Author: Andreas Håkansson, Steven Robbins and contributors
-
-* Description: Embedded web server
-
-#### License
-
-Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Almond
-
-* Link: https://github.com/requirejs/almond
-
-* Version: 0.3.3
-
-* Author: jQuery Foundation
-
-* Description: Lightweight RequireJS replacement for builds
-
-#### License
-
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/requirejs/almond
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules directory, and certain utilities used
-to build or test the software in the test and dist directories, are
-externally maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.
-
-
-### Lodash
-
-* Link: https://lodash.com
-
-* Version: 3.10.1
-
-* Author: Dojo Foundation
-
-* Description: Utility functions
-
-#### License
-
-Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-### EventEmitter3
-
-* Link: https://github.com/primus/eventemitter3
-
-* Version: 1.2.0
-
-* Author: Arnout Kazemier
-
-* Description: Event-driven programming support
-
-#### License
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Arnout Kazemier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -20,14 +20,8 @@ API. Open MCT is also being refactored to minimize the dependencies that using
 Open MCT imposes on developers, such as the current requirement to use
 AngularJS.
 
-This new API has not yet been heavily used and is likely to contain defects.
-You can help by trying it out, and reporting any issues you encounter
-using our GitHub issue tracker. Such issues may include bugs, suggestions,
-missing documentation, or even just requests for help if you're having
-trouble.
-
 We want Open MCT to be as easy to use, install, run, and develop for as
-possible, and your feedback will help us get there!
+possible, and your feedback will help us get there! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
 
 ## Building and Running Open MCT Locally
 
@@ -84,6 +78,7 @@ Documentation will be generated in `target/docs`.
 ## Deploying Open MCT
 
 Open MCT is built using [`npm`](http://npmjs.com/)
+and [`gulp`](http://gulpjs.com/).
 
 To build Open MCT for deployment:
 
@@ -93,13 +88,32 @@ This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT
 instance (e.g. by starting an HTTP server in that directory), including:
 
-* `openmct.js` - Open MCT source code.
-* `openmct.css` - Basic styles to load to prevent a FOUC.
-* `index.html`, an example to run Open MCT in the basic configuration.
+* A `main.js` file containing Open MCT source code.
+* Various assets in the `example` and `platform` directories.
+* An `index.html` that runs Open MCT in its default configuration.
+
+Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+
+## Bundles
+
+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
+Open MCT will be expressed as a bundle; platform components are also
+expressed as bundles.
+
+A bundle is also just a directory which contains a file `bundle.json`,
+which declares its contents.
+
+The file `bundles.json` (note the plural), at the top level of the
+repository, is a JSON file containing an array of all bundles (expressed as
+directory names) to include in a running instance of Open MCT. Adding or
+removing paths from this list will add or remove bundles from the running
+application.
 
 ## Tests
 
-Tests are written for [Jasmine 3](http://jasmine.github.io/)
+Tests are written for [Jasmine 1.3](http://jasmine.github.io/1.3/introduction.html)
 and run by [Karma](http://karma-runner.github.io). To run:
 
 `npm test`

app.js

@@ -7,72 +7,79 @@
  * node app.js [options]
  */
 
+(function () {
+    "use strict";
 
-const options = require('minimist')(process.argv.slice(2));
-const express = require('express');
-const app = express();
-const fs = require('fs');
-const request = require('request');
+    var BUNDLE_FILE = 'bundles.json',
+        options = require('minimist')(process.argv.slice(2)),
+        express = require('express'),
+        app = express(),
+        fs = require('fs'),
+        request = require('request');
 
-// Defaults
-options.port = options.port || options.p || 8080;
-options.host = options.host || options.h || 'localhost';
-options.directory = options.directory || options.D || '.';
+    // Defaults
+    options.port = options.port || options.p || 8080;
+    options.host = options.host || options.h || 'localhost'
+    options.directory = options.directory || options.D || '.';
+    ['include', 'exclude', 'i', 'x'].forEach(function (opt) {
+        options[opt] = options[opt] || [];
+        // Make sure includes/excludes always end up as arrays
+        options[opt] = Array.isArray(options[opt]) ?
+                options[opt] : [options[opt]];
+    });
+    options.include = options.include.concat(options.i);
+    options.exclude = options.exclude.concat(options.x);
 
-// Show command line options
-if (options.help || options.h) {
-    console.log("\nUsage: node app.js [options]\n");
-    console.log("Options:");
-    console.log("  --help, -h               Show this message.");
-    console.log("  --port, -p <number>      Specify port.");
-    console.log("  --directory, -D <bundle>   Serve files from specified directory.");
-    console.log("");
-    process.exit(0);
-}
-
-app.disable('x-powered-by');
-
-app.use('/proxyUrl', function proxyRequest(req, res, next) {
-    console.log('Proxying request to: ', req.query.url);
-    req.pipe(request({
-        url: req.query.url,
-        strictSSL: false
-    }).on('error', next)).pipe(res);
-});
-
-const webpack = require('webpack');
-const webpackConfig = require('./webpack.config.js');
-webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
-webpackConfig.plugins.push(function() { this.plugin('watch-run', function(watching, callback) { console.log('Begin compile at ' + new Date()); callback(); }) });
-
-webpackConfig.entry.openmct = [
-    'webpack-hot-middleware/client?reload=true',
-    webpackConfig.entry.openmct
-];
-
-const compiler = webpack(webpackConfig);
-
-app.use(require('webpack-dev-middleware')(
-    compiler,
-    {
-        publicPath: '/dist',
-        logLevel: 'warn'
+    // Show command line options
+    if (options.help || options.h) {
+        console.log("\nUsage: node app.js [options]\n");
+        console.log("Options:");
+        console.log("  --help, -h               Show this message.");
+        console.log("  --port, -p <number>      Specify port.");
+        console.log("  --include, -i <bundle>   Include the specified bundle.");
+        console.log("  --exclude, -x <bundle>   Exclude the specified bundle.");
+        console.log("  --directory, -D <bundle>   Serve files from specified directory.");
+        console.log("");
+        process.exit(0);
     }
-));
 
-app.use(require('webpack-hot-middleware')(
-    compiler,
-    {
+    app.disable('x-powered-by');
 
-    }
-));
+    // Override bundles.json for HTTP requests
+    app.use('/' + BUNDLE_FILE, function (req, res) {
+        var bundles;
 
-// Expose index.html for development users.
-app.get('/', function (req, res) {
-    fs.createReadStream('index.html').pipe(res);
-});
+        try {
+            bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
+        } catch (e) {
+            bundles = [];
+        }
 
-// Finally, open the HTTP server and log the instance to the console
-app.listen(options.port, options.host, function() {
-    console.log('Open MCT application running at %s:%s', options.host, options.port)
-});
+        // Handle command line inclusions/exclusions
+        bundles = bundles.concat(options.include);
+        bundles = bundles.filter(function (bundle) {
+            return options.exclude.indexOf(bundle) === -1;
+        });
+        bundles = bundles.filter(function (bundle, index) { // Uniquify
+            return bundles.indexOf(bundle) === index;
+        });
+
+        res.send(JSON.stringify(bundles));
+    });
+
+    app.use('/proxyUrl', function proxyRequest(req, res, next) {
+        console.log('Proxying request to: ', req.query.url);
+        req.pipe(request({
+            url: req.query.url,
+            strictSSL: false
+        }).on('error', next)).pipe(res);
+    });
+
+    // 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, options.host, function() {
+        console.log('Open MCT application running at %s:%s', options.host, options.port)
+    });
+}());

bower.json

@@ -0,0 +1,27 @@
+{
+  "name": "openmct",
+  "description": "The Open MCT core platform",
+  "main": "",
+  "license": "Apache-2.0",
+  "moduleType": [],
+  "homepage": "http://nasa.github.io/openmct/",
+  "private": true,
+  "dependencies": {
+    "angular": "1.4.4",
+    "angular-route": "1.4.4",
+    "moment": "^2.11.1",
+    "moment-duration-format": "^1.3.0",
+    "requirejs": "~2.1.22",
+    "text": "requirejs-text#^2.0.14",
+    "es6-promise": "^3.3.0",
+    "screenfull": "^3.0.0",
+    "node-uuid": "^1.4.7",
+    "comma-separated-values": "^3.6.4",
+    "file-saver": "1.3.3",
+    "zepto": "^1.1.6",
+    "eventemitter3": "^1.2.0",
+    "lodash": "3.10.1",
+    "almond": "~0.3.2",
+    "moment-timezone": "^0.5.13"
+  }
+}

copyright-notice.js

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

example/builtins/README.md

@@ -0,0 +1,8 @@
+This bundle is intended to serve as an example of registering
+extensions which are mapped directly to built-in Angular features.
+
+These are:
+* Controllers
+* Directives
+* Routes
+* Services

example/builtins/bundle.js

@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/ExampleController",
+    "./src/ExampleDirective",
+    "./src/ExampleService",
+    'legacyRegistry'
+], function (
+    ExampleController,
+    ExampleDirective,
+    ExampleService,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/builtins", {
+        "name": "Angular Built-ins Example",
+        "description": "Example showing how to declare extensions with built-in support from Angular.",
+        "sources": "src",
+        "extensions": {
+            "controllers": [
+                {
+                    "key": "ExampleController",
+                    "implementation": ExampleController,
+                    "depends": [
+                        "$scope",
+                        "exampleService"
+                    ]
+                }
+            ],
+            "directives": [
+                {
+                    "key": "exampleDirective",
+                    "implementation": ExampleDirective,
+                    "depends": [
+                        "examples[]"
+                    ]
+                }
+            ],
+            "routes": [
+                {
+                    "templateUrl": "templates/example.html"
+                }
+            ],
+            "services": [
+                {
+                    "key": "exampleService",
+                    "implementation": ExampleService
+                }
+            ]
+        }
+    });
+});

example/builtins/res/templates/example.html

@@ -0,0 +1,24 @@
+<!--
+ Open MCT, Copyright (c) 2014-2017, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<p>Hello, world! I am the default route.</p>
+<p ng-controller="ExampleController">My controller has told me: "{{phrase}}"</p>
+<span example-directive></span>

example/builtins/src/ExampleController.js

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining ExampleController. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleController($scope, exampleService) {
+            $scope.phrase = exampleService.getMessage();
+        }
+
+        return ExampleController;
+    }
+);

example/builtins/src/ExampleDirective.js

@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining ExampleDirective. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        var HAS_EXTENSIONS = "A directive loaded these message from " +
+                    "example extensions.",
+            NO_EXTENSIONS = "A directive tried to load example extensions," +
+                    " but found none.",
+            MESSAGE = "I heard this from my partial constructor.";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleDirective(examples) {
+            // Build up a template from example extensions
+            var template = examples.length > 0 ?
+                    HAS_EXTENSIONS : NO_EXTENSIONS;
+
+            template += "<ul>";
+            examples.forEach(function (E) {
+                template += "<li>";
+                if (typeof E === 'function') {
+                    template += (new E(MESSAGE)).getText();
+                } else {
+                    template += E.text;
+                }
+                template += "</li>";
+            });
+            template += "</ul>";
+
+            return {
+                template: template
+            };
+        }
+
+        return ExampleDirective;
+    }
+);

example/builtins/src/ExampleService.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,19 +19,28 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,Promise*/
 
-define(function () {
-    return {
-        name: 'Telemetry Table',
-        description: 'Display telemetry values for the current time bounds in tabular form. Supports filtering and sorting.',
-        creatable: true,
-        cssClass: 'icon-tabular-realtime',
-        initialize(domainObject) {
-            domainObject.composition = [];
-            domainObject.configuration = {
-                columnWidths: {},
-                hiddenColumns: {}
+/**
+ * Module defining ExampleService. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleService() {
+            return {
+                getMessage: function () {
+                    return "I heard this from a service";
+                }
             };
         }
-    };
-});
+
+        return ExampleService;
+    }
+);

example/composite/bundle.js

@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/SomeProvider",
+    "./src/SomeOtherProvider",
+    "./src/SomeDecorator",
+    "./src/SomeOtherDecorator",
+    "./src/SomeAggregator",
+    "./src/SomeOtherExample",
+    'legacyRegistry'
+], function (
+    SomeProvider,
+    SomeOtherProvider,
+    SomeDecorator,
+    SomeOtherDecorator,
+    SomeAggregator,
+    SomeOtherExample,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/composite", {
+        "extensions": {
+            "components": [
+                {
+                    "implementation": SomeProvider,
+                    "provides": "someService",
+                    "type": "provider"
+                },
+                {
+                    "implementation": SomeOtherProvider,
+                    "provides": "someService",
+                    "type": "provider"
+                },
+                {
+                    "implementation": SomeDecorator,
+                    "provides": "someService",
+                    "type": "decorator"
+                },
+                {
+                    "implementation": SomeOtherDecorator,
+                    "provides": "someService",
+                    "type": "decorator"
+                },
+                {
+                    "implementation": SomeAggregator,
+                    "provides": "someService",
+                    "type": "aggregator"
+                }
+            ],
+            "examples": [
+                {
+                    "implementation": SomeOtherExample,
+                    "depends": [
+                        "someService"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/composite/src/SomeAggregator.js

@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeAggregator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeAggregator(someProviders) {
+            return {
+                getMessages: function () {
+                    return someProviders.map(function (provider) {
+                        return provider.getMessages();
+                    }).reduce(function (a, b) {
+                        return a.concat(b);
+                    }, []);
+                }
+            };
+        }
+
+        return SomeAggregator;
+    }
+);

example/composite/src/SomeDecorator.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeDecorator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeDecorator(someProvider) {
+            return {
+                getMessages: function () {
+                    return someProvider.getMessages().map(function (msg) {
+                        return msg.toLocaleUpperCase();
+                    });
+                }
+            };
+        }
+
+        return SomeDecorator;
+    }
+);

example/composite/src/SomeOtherDecorator.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeOtherDecorator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherDecorator(someProvider) {
+            return {
+                getMessages: function () {
+                    return someProvider.getMessages().map(function (msg) {
+                        return msg + "...";
+                    });
+                }
+            };
+        }
+
+        return SomeOtherDecorator;
+    }
+);

example/composite/src/SomeOtherExample.js

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeOtherExample. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherExample(someService) {
+            return {
+                getText: function () {
+                    return someService.getMessages().join(" | ");
+                }
+            };
+        }
+
+        return SomeOtherExample;
+    }
+);

example/composite/src/SomeOtherProvider.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeOtherProvider. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherProvider() {
+            return {
+                getMessages: function () {
+                    return [
+                        "I am a message from some other provider."
+                    ];
+                }
+            };
+        }
+
+        return SomeOtherProvider;
+    }
+);

example/composite/src/SomeProvider.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeProvider. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeProvider() {
+            return {
+                getMessages: function () {
+                    return [
+                        "I am a message from some provider."
+                    ];
+                }
+            };
+        }
+
+        return SomeProvider;
+    }
+);

example/eventGenerator/bundle.js

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

example/eventGenerator/src/EventTelemetry.js

@@ -22,23 +22,24 @@
 /*global define */
 
 /**
- * Module defining EventTelemetry.
+ * Module defining EventTelemetry. 
  * Created by chacskaylo on 06/18/2015.
- * Modified by shale on 06/23/2015.
+ * Modified by shale on 06/23/2015. 
  */
 define(
-    ['../data/transcript.json'],
-    function (messages) {
+    ['text!../data/transcript.json'],
+    function (transcript) {
         "use strict";
 
-        var firstObservedTime = Date.now();
-
+        var firstObservedTime = Date.now(),
+            messages = JSON.parse(transcript);
+        
         function EventTelemetry(request, interval) {
 
             var latestObservedTime = Date.now(),
                 count = Math.floor((latestObservedTime - firstObservedTime) / interval),
                 generatorData = {};
-
+            
             generatorData.getPointCount = function () {
                 return count;
             };
@@ -47,13 +48,13 @@ define(
                 return i * interval +
                         (domain !== 'delta' ? firstObservedTime : 0);
             };
-
+            
 	        generatorData.getRangeValue = function (i, range) {
 		        var domainDelta = this.getDomainValue(i) - firstObservedTime,
                     ind = i % messages.length;
                 return messages[ind] + " - [" + domainDelta.toString() + "]";
 	        };
-
+            
             return generatorData;
         }
 

example/extensions/bundle.js

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/SomeExample",
+    'legacyRegistry'
+], function (
+    SomeExample,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/extensions", {
+        "name": "Custom Extensions Examples",
+        "description": "Example showing how to declare custom extensions.",
+        "sources": "src",
+        "extensions": {
+            "examples": [
+                {
+                    "text": "I came from example/extensions"
+                },
+                {
+                    "implementation": SomeExample,
+                    "depends": [
+                        "exampleService"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/extensions/src/SomeExample.js

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeExample. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeExample(exampleService, message) {
+            return {
+                getText: function () {
+                    return [
+                        '"',
+                        exampleService.getMessage(),
+                        '" and "',
+                        message,
+                        '"'
+                    ].join("");
+                }
+            };
+        }
+
+        return SomeExample;
+    }
+);

example/generator/GeneratorMetadataProvider.js

@@ -72,6 +72,10 @@ define([
                         {
                             value: 1,
                             string: "ON"
+                        },
+                        {
+                            value: 2,
+                            string: "FAULT"
                         }
                     ],
                     hints: {
@@ -99,10 +103,10 @@ define([
 
     GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
         return _.extend(
-            {},
-            domainObject.telemetry,
-            METADATA_BY_TYPE[domainObject.type]
-        );
+                {},
+                domainObject.telemetry,
+                METADATA_BY_TYPE[domainObject.type]
+            );
     };
 
     return GeneratorMetadataProvider;

example/generator/SinewaveLimitProvider.js

@@ -27,35 +27,29 @@ define([
 
 ) {
 
-    var RED = {
-            sin: 0.9, 
-            cos: 0.9
-        },
-        YELLOW = {
-            sin: 0.5,
-            cos: 0.5
-        },
+    var RED = 0.9,
+        YELLOW = 0.5,
         LIMITS = {
             rh: {
-                cssClass: "is-limit--upr is-limit--red",
+                cssClass: "s-limit-upr s-limit-red",
                 low: RED,
                 high: Number.POSITIVE_INFINITY,
                 name: "Red High"
             },
             rl: {
-                cssClass: "is-limit--lwr is-limit--red",
+                cssClass: "s-limit-lwr s-limit-red",
                 high: -RED,
                 low: Number.NEGATIVE_INFINITY,
                 name: "Red Low"
             },
             yh: {
-                cssClass: "is-limit--upr is-limit--yellow",
+                cssClass: "s-limit-upr s-limit-yellow",
                 low: YELLOW,
                 high: RED,
                 name: "Yellow High"
             },
             yl: {
-                cssClass: "is-limit--lwr is-limit--yellow",
+                cssClass: "s-limit-lwr s-limit-yellow",
                 low: -RED,
                 high: -YELLOW,
                 name: "Yellow Low"
@@ -73,18 +67,17 @@ define([
     SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
         return {
             evaluate: function (datum, valueMetadata) {
-                var range = valueMetadata && valueMetadata.key;
-                
-                if (datum[range] > RED[range]) {
+                var range = valueMetadata ? valueMetadata.key : 'sin'
+                if (datum[range] > RED) {
                     return LIMITS.rh;
                 }
-                if (datum[range] < -RED[range]) {
+                if (datum[range] < -RED) {
                     return LIMITS.rl;
                 }
-                if (datum[range] > YELLOW[range]) {
+                if (datum[range] > YELLOW) {
                     return LIMITS.yh;
                 }
-                if (datum[range] < -YELLOW[range]) {
+                if (datum[range] < -YELLOW) {
                     return LIMITS.yl;
                 }
             }

example/generator/WorkerInterface.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'raw-loader!./generatorWorker.js',
+    'text!./generatorWorker.js',
     'uuid'
 ], function (
     workerText,

example/generator/plugin.js

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

example/notifications/bundle.js

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

example/notifications/res/dialog-launch.html

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

example/notifications/res/notification-launch.html

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

example/notifications/src/NotificationLaunchController.js

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

example/simpleVuePlugin/HelloWorld.vue

@@ -1,19 +0,0 @@
-<template>
-  <div class="example">{{ msg }}</div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      msg: 'Hello world!'
-    }
-  }
-}
-</script>
-
-<style>
-.example {
-  color: red;
-}
-</style>

example/simpleVuePlugin/plugin.js

@@ -1,37 +0,0 @@
-import Vue from 'Vue';
-import HelloWorld from './HelloWorld.vue';
-
-function SimpleVuePlugin () {
-    return function install(openmct) {
-        var views = (openmct.mainViews || openmct.objectViews);
-
-        openmct.types.addType('hello-world', {
-            name: 'Hello World',
-            description: 'An introduction object',
-            creatable: true
-        });
-        openmct.objectViews.addProvider({
-            name: "demo-provider",
-            key: "hello-world",
-            cssClass: "icon-packet",
-            canView: function (d) {
-                return d.type === 'hello-world';
-            },
-            view: function (domainObject) {
-                var vm;
-                return {
-                    show: function (container) {
-                        vm = new Vue(HelloWorld);
-                        container.appendChild(vm.$mount().$el);
-                    },
-                    destroy: function (container) {
-                        vm.$destroy();
-                    }
-                };
-            }
-        });
-
-    }
-}
-
-export default SimpleVuePlugin

example/styleguide/bundle.js

@@ -1,26 +1,10 @@
 define([
     "./src/ExampleStyleGuideModelProvider",
     "./src/MCTExample",
-    "./res/templates/intro.html",
-    "./res/templates/standards.html",
-    "./res/templates/colors.html",
-    "./res/templates/status.html",
-    "./res/templates/glyphs.html",
-    "./res/templates/controls.html",
-    "./res/templates/input.html",
-    "./res/templates/menus.html",
     'legacyRegistry'
 ], function (
     ExampleStyleGuideModelProvider,
     MCTExample,
-    introTemplate,
-    standardsTemplate,
-    colorsTemplate,
-    statusTemplate,
-    glyphsTemplate,
-    controlsTemplate,
-    inputTemplate,
-    menusTemplate,
     legacyRegistry
 ) {
     legacyRegistry.register("example/styleguide", {
@@ -39,14 +23,14 @@ define([
                 { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
             ],
             "views": [
-                { "key": "styleguide.intro", "type": "styleguide.intro", "template": introTemplate, "editable": false },
-                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
-                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
-                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
-                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "template": glyphsTemplate, "editable": false },
-                { "key": "styleguide.controls", "type": "styleguide.controls", "template": controlsTemplate, "editable": false },
-                { "key": "styleguide.input", "type": "styleguide.input", "template": inputTemplate, "editable": false },
-                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
+                { "key": "styleguide.intro", "type": "styleguide.intro", "templateUrl": "templates/intro.html", "editable": false },
+                { "key": "styleguide.standards", "type": "styleguide.standards", "templateUrl": "templates/standards.html", "editable": false },
+                { "key": "styleguide.colors", "type": "styleguide.colors", "templateUrl": "templates/colors.html", "editable": false },
+                { "key": "styleguide.status", "type": "styleguide.status", "templateUrl": "templates/status.html", "editable": false },
+                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "templateUrl": "templates/glyphs.html", "editable": false },
+                { "key": "styleguide.controls", "type": "styleguide.controls", "templateUrl": "templates/controls.html", "editable": false },
+                { "key": "styleguide.input", "type": "styleguide.input", "templateUrl": "templates/input.html", "editable": false },
+                { "key": "styleguide.menus", "type": "styleguide.menus", "templateUrl": "templates/menus.html", "editable": false }
             ],
             "roots": [
                 {
@@ -101,6 +85,16 @@ define([
                         "$q"
                     ]
                 }
+            ],
+            "stylesheets": [
+                {
+                    "stylesheetUrl": "css/style-guide-espresso.css",
+                    "theme": "espresso"
+                },
+                {
+                    "stylesheetUrl": "css/style-guide-snow.css",
+                    "theme": "snow"
+                }
             ]
         }
     });

example/styleguide/res/sass/_style-guide-base.scss

@@ -0,0 +1,210 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+.l-style-guide {
+    font-size: 0.9em;
+    text-align: justify;
+    margin: auto 10%;
+
+    a.link {
+        color: $colorKey;
+    }
+
+    h1, h2, strong, b {
+        color: pullForward($colorBodyFg, 50%);
+    }
+
+    h2 {
+        font-size: 1.25em;
+    }
+
+    h3 {
+        font-size: 0.9em;
+        margin: $interiorMargin 0;
+        &:not(:first-child) {
+            margin-top: $interiorMarginLg * 2;
+        }
+        text-transform: uppercase;
+    }
+
+    strong, b {
+        font-weight: normal;
+    }
+
+    .w-markup {
+        //Wrap markup example "pre" element
+        background-color: $colorCode;
+        border-radius: $interiorMargin;
+        display: block;
+        padding: $interiorMarginLg $interiorMarginLg;
+        position: relative;
+    }
+
+    .w-mct-example {
+        color: #ccc;
+        > div { margin-bottom: $interiorMarginLg; }
+    }
+
+    code,
+    pre {
+        font-size: 0.8rem;
+    }
+
+    code {
+        background-color: $colorCode;
+        border-radius: $controlCr;
+        display: inline-block;
+        padding: 1px $interiorMargin;
+    }
+
+    pre {
+        display: block;
+        margin: 0;
+        max-height: 300px;
+        overflow: auto;
+        padding-bottom: $interiorMarginLg;
+        white-space: pre;
+    }
+
+    table, ul {
+        margin-bottom: $interiorMarginLg;
+        width: auto;
+    }
+
+    .themed {
+        display: none; // Each themed styleguide file will set this to block.
+    }
+
+    .doc-title {
+        color: rgba(#fff, 0.3);
+        text-transform: uppercase;
+    }
+
+    .l-section {
+        border-top: 1px solid rgba(#999, 0.3);
+        margin-top: 2em;
+        padding-top: 1em;
+
+        .cols {
+            display: flex;
+            flex-direction: row;
+
+            .col {
+                flex: 1 1 auto;
+                &:not(:last-child) {
+                    $v: $interiorMargin * 4;
+                    border-right: 1px solid $colorInteriorBorder;
+                    margin-right: $v;
+                    padding-right: $v;
+                }
+                min-width: 300px;
+                img {
+                    width: 100%;
+                }
+            }
+
+            &.cols1-1 {
+                // 2 cols, equal width
+                .col {
+                    width: 50%;
+                }
+            }
+
+            &.cols1-2 {
+                // 3 cols, first is 1/3 of the width
+                .col:first-child {
+                    width: 33%;
+                }
+                .col:last-child {
+                    width: 66%;
+                }
+            }
+
+            &.cols2-1 {
+                // 3 cols, first is 2/3 of the width
+                .col:first-child {
+                    width: 66%;
+                }
+                .col:last-child {
+                    width: 33%;
+                }
+            }
+        }
+    }
+
+    // Example grid of glyphs
+    .items-holder.grid {
+        table.details {
+            width: 100%;
+            td {
+                font-size: inherit;
+                &.label {
+                    color: pushBack($colorBodyFg, 10%);
+                    text-transform: uppercase;
+                    white-space: nowrap;
+                }
+            }
+        }
+        .item.glyph-item,
+        .item.swatch-item {
+            margin-bottom: 50px;
+            margin-right: 10px;
+            position: relative;
+            text-align: left;
+            .glyph {
+                color: $colorGlyphExample;
+                font-size: 5em;
+                margin: $interiorMarginLg 0;
+                text-align: center;
+            }
+        }
+
+        .item.glyph-item {
+            width: 225px;
+            height: 200px;
+        }
+
+        .item.swatch-item {
+            $h: 150px;
+            $d: 75px;
+            width: 200px;
+            height: $h;
+            .glyph {
+                text-shadow: 0px 1px 10px rgba(black, 0.3);
+            }
+
+            .h-swatch {
+                position: relative;
+                height: $d + $interiorMarginLg;
+            }
+
+            .swatch {
+                height: $d; width: $d;
+                border: 1px solid $colorInteriorBorder;
+                border-radius: 15%;
+                position: absolute;
+                left: 50%;
+                transform: translateX(-50%);
+            }
+        }
+    }
+}
+

example/styleguide/res/sass/style-guide-espresso.scss

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+@import "bourbon";
+@import "../../../../platform/commonUI/general/res/sass/constants";
+@import "../../../../platform/commonUI/general/res/sass/mixins";
+@import "../../../../platform/commonUI/themes/espresso/res/sass/constants";
+@import "../../../../platform/commonUI/themes/espresso/res/sass/mixins";
+@import "../../../../platform/commonUI/general/res/sass/glyphs";
+@import "../../../../platform/commonUI/general/res/sass/icons";
+
+// Thematic constants
+$colorCode: rgba(black, 0.2);
+$colorGlyphExample: #fff;
+
+@import "style-guide-base";
+
+div.themed.espresso { display: block; }
+span.themed.espresso { display: inline; }

example/styleguide/res/sass/style-guide-snow.scss

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+@import "bourbon";
+@import "../../../../platform/commonUI/general/res/sass/constants";
+@import "../../../../platform/commonUI/general/res/sass/mixins";
+@import "../../../../platform/commonUI/themes/snow/res/sass/constants";
+@import "../../../../platform/commonUI/themes/snow/res/sass/mixins";
+@import "../../../../platform/commonUI/general/res/sass/glyphs";
+@import "../../../../platform/commonUI/general/res/sass/icons";
+
+// Thematic constants
+$colorCode: rgba(black, 0.1);
+$colorGlyphExample: darken($colorBodyBg, 30%);
+
+@import "style-guide-base";
+
+div.themed.snow { display: block; }
+span.themed.snow { display: inline; }

example/styleguide/res/templates/intro.html

@@ -34,7 +34,7 @@
             <p>As you develop plugins for Open MCT, consider how a generalized component might be combined with others when designing to create a rich and powerful larger object, rather than adding a single monolithic, non-modular plugin. To solve a particular problem or allow a new feature in Open MCT, you may need to introduce more than just one new object type.</p>
             </div>
             <div class="col">
-                <img src="../images/diagram-objects.svg" />
+                <img src="/example/styleguide/res/images/diagram-objects.svg" />
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
             <p>The types of objects that a container can hold should be based on the purpose of the container and the views that it affords. For example, a Folder’s purpose is to allow a user to conceptually organize objects of all other types; a Folder must therefore be able to contain an object of any type.</p>
             </div>
             <div class="col">
-                <img src="../images/diagram-containment.svg" />
+                <img src="/example/styleguide/res/images/diagram-containment.svg" />
             </div>
         </div>
     </div>
@@ -60,7 +60,7 @@
                 <p>Views are simply different ways to view the content of a given object. For example, telemetry data could be viewed as a plot or a table. A clock can display its time in analog fashion or with digital numbers. In each view, all of the content is present; it’s just represented differently. When providing views for an object, all the content of the object should be present in each view.</p>
             </div>
             <div class="col">
-                <img src="../images/diagram-views.svg" />
+                <img src="/example/styleguide/res/images/diagram-views.svg" />
             </div>
         </div>
     </div>
@@ -70,4 +70,4 @@
     <p></p>
     <p></p>
     <p></p>
-</div>
+</div>

example/styleguide/src/MCTExample.js

@@ -1,5 +1,5 @@
 define([
-    '../res/templates/mct-example.html'
+    'text!../res/templates/mct-example.html'
 ], function (
     MCTExampleTemplate
 ) {

example/taxonomy/bundle.js

@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/ExampleTaxonomyModelProvider",
+    'legacyRegistry'
+], function (
+    ExampleTaxonomyModelProvider,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/taxonomy", {
+        "name": "Example taxonomy",
+        "description": "Example illustrating the addition of a static top-level hierarchy",
+        "extensions": {
+            "roots": [
+                {
+                    "id": "exampleTaxonomy"
+                }
+            ],
+            "models": [
+                {
+                    "id": "exampleTaxonomy",
+                    "model": {
+                        "type": "folder",
+                        "name": "Stub Subsystems",
+                        "composition": [
+                            "examplePacket0",
+                            "examplePacket1",
+                            "examplePacket2"
+                        ]
+                    }
+                }
+            ],
+            "components": [
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": ExampleTaxonomyModelProvider,
+                    "depends": [
+                        "$q"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/taxonomy/src/ExampleTaxonomyModelProvider.js

@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        function ExampleTaxonomyModelProvider($q) {
+            var models = {},
+                packetId,
+                telemetryId,
+                i,
+                j;
+
+            // Add some "subsystems"
+            for (i = 0; i < 3; i += 1) {
+                packetId = "examplePacket" + i;
+
+                models[packetId] = {
+                    name: "Stub Subsystem " + (i + 1),
+                    type: "telemetry.panel",
+                    composition: []
+                };
+
+                // Add some "telemetry points"
+                for (j = 0; j < 100 * (i + 1); j += 1) {
+                    telemetryId = "exampleTelemetry" + j;
+                    models[telemetryId] = {
+                        name: "SWG" + i + "." + j,
+                        type: "generator",
+                        telemetry: {
+                            period: 10 + i + j
+                        }
+                    };
+                    models[packetId].composition.push(telemetryId);
+                }
+            }
+
+            return {
+                getModels: function () {
+                    return $q.when(models);
+                }
+            };
+        }
+
+        return ExampleTaxonomyModelProvider;
+    }
+);

example/worker/README.md

@@ -0,0 +1 @@
+Example of running a Web Worker using the `workerService`.

example/worker/bundle.js

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/FibonacciIndicator",
+    'legacyRegistry'
+], function (
+    FibonacciIndicator,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/worker", {
+        "extensions": {
+            "indicators": [
+                {
+                    "implementation": FibonacciIndicator,
+                    "depends": [
+                        "workerService",
+                        "$rootScope"
+                    ]
+                }
+            ],
+            "workers": [
+                {
+                    "key": "example.fibonacci",
+                    "scriptUrl": "FibonacciWorker.js"
+                }
+            ]
+        }
+    });
+});

example/worker/src/FibonacciIndicator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,44 +19,49 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-<template>
-    <div class="l-shell__app-logo" @click="launchAbout" ref="aboutLogo"></div>
-</template>
-<style lang="scss">
-.l-shell__app-logo {
-    cursor: pointer;
-    width: 70px;
-    height: 20px;
-    background: url('assets/images/logo-openmct.svg') center no-repeat;
-}
-</style>
-<script>
-import AboutDialog from './AboutDialog.vue';
-import Vue from 'vue';
+/*global define*/
 
-export default {
-    inject: ['openmct'],
-    mounted() {
-        let branding = this.openmct.branding();
-        if (branding.smallLogoImage){
-            this.$refs.aboutLogo.style.backgroundImage = `url('${branding.smallLogoImage}')`
-        }
-    },
-    methods: {
-        launchAbout(){
-            let vm = new Vue({
-                provide: {
-                    openmct: this.openmct
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         * Displays Fibonacci numbers in the status area.
+         * @constructor
+         */
+        function FibonacciIndicator(workerService, $rootScope) {
+            var latest,
+                counter = 0,
+                worker = workerService.run('example.fibonacci');
+
+            function requestNext() {
+                worker.postMessage([counter]);
+                counter += 1;
+            }
+
+            function handleResponse(event) {
+                latest = event.data;
+                $rootScope.$apply();
+                requestNext();
+            }
+
+            worker.onmessage = handleResponse;
+            requestNext();
+
+            return {
+                getCssClass: function () {
+                    return "icon-object-unknown";
                 },
-                components: {AboutDialog},
-                template: '<about-dialog></about-dialog>'
-            }).$mount();
-
-            this.openmct.overlays.overlay({
-                element: vm.$el,
-                size: 'large'
-            });
+                getText: function () {
+                    return "" + latest;
+                },
+                getDescription: function () {
+                    return "";
+                }
+            };
         }
+
+        return FibonacciIndicator;
     }
-}
-</script>
+);

example/worker/src/FibonacciWorker.js

@@ -0,0 +1,15 @@
+/*global self*/
+(function () {
+    "use strict";
+
+    // Calculate fibonacci numbers inefficiently.
+    // We can do this because we're on a background thread, and
+    // won't halt the UI.
+    function fib(n) {
+        return n < 2 ? n : (fib(n - 1) + fib(n - 2));
+    }
+
+    self.onmessage = function (event) {
+        self.postMessage(fib(event.data));
+    };
+}());

gulpfile.js

@@ -0,0 +1,181 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*global require,__dirname*/
+
+require("v8-compile-cache");
+
+var gulp = require('gulp'),
+    sourcemaps = require('gulp-sourcemaps'),
+    path = require('path'),
+    fs = require('fs'),
+    git = require('git-rev-sync'),
+    moment = require('moment'),
+    project = require('./package.json'),
+    paths = {
+        main: 'openmct.js',
+        dist: 'dist',
+        reports: 'dist/reports',
+        scss: ['./platform/**/*.scss', './example/**/*.scss'],
+        assets: [
+            './{example,platform}/**/*.{css,css.map,png,svg,ico,woff,eot,ttf}'
+        ],
+        scripts: [ 'openmct.js', 'platform/**/*.js', 'src/**/*.js' ],
+        specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ],
+    },
+    options = {
+        requirejsOptimize: {
+            name: 'bower_components/almond/almond.js',
+            include: paths.main.replace('.js', ''),
+            wrap: {
+                start: (function () {
+                    var buildVariables = {
+                        version: project.version,
+                        timestamp: moment.utc(Date.now()).format(),
+                        revision: fs.existsSync('.git') ? git.long() : 'Unknown',
+                        branch: fs.existsSync('.git') ? git.branch() : 'Unknown'
+                    };
+                    return fs.readFileSync("src/start.frag", 'utf-8')
+                        .replace(/@@(\w+)/g, function (match, key) {
+                            return buildVariables[key];
+                        });;
+                }()),
+                endFile: "src/end.frag"
+            },
+            optimize: 'uglify2',
+            uglify2: { output: { comments: /@preserve/ } },
+            mainConfigFile: paths.main,
+            wrapShim: true
+        },
+        karma: {
+            configFile: path.resolve(__dirname, 'karma.conf.js'),
+            singleRun: true
+        },
+        sass: {
+            sourceComments: true
+        }
+    };
+
+if (process.env.NODE_ENV === 'development') {
+    options.requirejsOptimize.optimize = 'none';
+}
+
+
+gulp.task('scripts', function () {
+    var requirejsOptimize = require('gulp-requirejs-optimize');
+
+    return gulp.src(paths.main)
+        .pipe(sourcemaps.init())
+        .pipe(requirejsOptimize(options.requirejsOptimize))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('test', function (done) {
+    var karma = require('karma');
+    new karma.Server(options.karma, done).start();
+});
+
+gulp.task('stylesheets', function () {
+    var sass = require('gulp-sass');
+    var rename = require('gulp-rename');
+    var bourbon = require('node-bourbon');
+    options.sass.includePaths = bourbon.includePaths;
+
+    return gulp.src(paths.scss, {base: '.'})
+        .pipe(sourcemaps.init())
+        .pipe(sass(options.sass).on('error', sass.logError))
+        .pipe(rename(function (file) {
+            file.dirname =
+                file.dirname.replace(path.sep + 'sass', path.sep + 'css');
+            return file;
+        }))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(__dirname));
+});
+
+gulp.task('lint', function () {
+    var jshint = require('gulp-jshint');
+    var merge = require('merge-stream');
+
+    var nonspecs = paths.specs.map(function (glob) {
+            return "!" + glob;
+        }),
+        scriptLint = gulp.src(paths.scripts.concat(nonspecs))
+            .pipe(jshint()),
+        specLint = gulp.src(paths.specs)
+            .pipe(jshint({ jasmine: true }));
+
+    return merge(scriptLint, specLint)
+        .pipe(jshint.reporter('gulp-jshint-html-reporter', {
+            filename: paths.reports + '/lint/jshint-report.html',
+            createMissingFolders : true
+        }))
+        .pipe(jshint.reporter('default'))
+        .pipe(jshint.reporter('fail'));
+});
+
+gulp.task('checkstyle', function () {
+    var jscs = require('gulp-jscs');
+    var mkdirp = require('mkdirp');
+    var reportName = 'jscs-html-report.html';
+    var reportPath = path.resolve(paths.reports, 'checkstyle', reportName);
+    var moveReport = fs.rename.bind(fs, reportName, reportPath, function () {});
+
+    mkdirp.sync(path.resolve(paths.reports, 'checkstyle'));
+
+    return gulp.src(paths.scripts)
+        .pipe(jscs())
+        .pipe(jscs.reporter())
+        .pipe(jscs.reporter('jscs-html-reporter')).on('finish', moveReport)
+        .pipe(jscs.reporter('fail'));
+});
+
+gulp.task('fixstyle', function () {
+    var jscs = require('gulp-jscs');
+
+    return gulp.src(paths.scripts, { base: '.' })
+        .pipe(jscs({ fix: true }))
+        .pipe(gulp.dest('.'));
+});
+
+gulp.task('assets', ['stylesheets'], function () {
+    return gulp.src(paths.assets)
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('watch', function () {
+    return gulp.watch(paths.scss, ['stylesheets', 'assets']);
+});
+
+gulp.task('serve', function () {
+    console.log('Running development server with all defaults');
+    var app = require('./app.js');
+});
+
+gulp.task('develop', ['serve', 'stylesheets', 'watch']);
+
+gulp.task('install', [ 'assets', 'scripts' ]);
+
+gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
+
+gulp.task('build', [ 'verify', 'install' ]);

index.html

@@ -26,61 +26,66 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <title></title>
-        <script src="dist/openmct.js"></script>
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
+        <script src="bower_components/requirejs/require.js"> </script>
+        <script>
+            var THIRTY_MINUTES = 30 * 60 * 1000;
+
+            require(['openmct'], function (openmct) {
+                [
+                    'example/eventGenerator',
+                    'example/styleguide'
+                ].forEach(
+                    openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
+                );
+                openmct.install(openmct.plugins.MyItems());
+                openmct.install(openmct.plugins.LocalStorage());
+                openmct.install(openmct.plugins.Espresso());
+                openmct.install(openmct.plugins.Generator());
+                openmct.install(openmct.plugins.ExampleImagery());
+                openmct.install(openmct.plugins.UTCTimeSystem());
+                openmct.install(openmct.plugins.ImportExport());
+                openmct.install(openmct.plugins.AutoflowView({
+                    type: "telemetry.panel"
+                }));
+                openmct.install(openmct.plugins.Conductor({
+                    menuOptions: [
+                        {
+                            name: "Fixed",
+                            timeSystem: 'utc',
+                            bounds: {
+                                start: Date.now() - THIRTY_MINUTES,
+                                end: Date.now()
+                            }
+                        },
+                        {
+                            name: "Realtime",
+                            timeSystem: 'utc',
+                            clock: 'local',
+                            clockOffsets: {
+                                start: -25 * 60 * 1000,
+                                end: 5 * 60 * 1000
+                            }
+                        }
+                    ]
+                }));
+                openmct.install(openmct.plugins.SummaryWidget());
+                openmct.install(openmct.plugins.Notebook());
+                openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
+                openmct.time.timeSystem('utc');
+                openmct.start();
+                window.openmct = openmct;
+            });
+        </script>
+        <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
+        <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
+        <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
     </head>
     <body>
+        <div class="l-splash-holder s-splash-holder">
+            <div class="l-splash s-splash"></div>
+        </div>
     </body>
-    <script>
-        const FIVE_MINUTES = 5 * 60 * 1000;
-        const THIRTY_MINUTES = 30 * 60 * 1000;
-
-        [
-            'example/eventGenerator',
-            'example/styleguide'
-        ].forEach(
-            openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-        );
-        openmct.install(openmct.plugins.MyItems());
-        openmct.install(openmct.plugins.LocalStorage());
-        openmct.install(openmct.plugins.Generator());
-        openmct.install(openmct.plugins.ExampleImagery());
-        openmct.install(openmct.plugins.UTCTimeSystem());
-        openmct.install(openmct.plugins.AutoflowView({
-            type: "telemetry.panel"
-        }));
-        openmct.install(openmct.plugins.DisplayLayout({
-            showAsView: ['summary-widget', 'example.imagery']
-        }));
-        openmct.install(openmct.plugins.Conductor({
-            menuOptions: [
-                {
-                    name: "Fixed",
-                    timeSystem: 'utc',
-                    bounds: {
-                        start: Date.now() - THIRTY_MINUTES,
-                        end: Date.now()
-                    }
-                },
-                {
-                    name: "Realtime",
-                    timeSystem: 'utc',
-                    clock: 'local',
-                    clockOffsets: {
-                        start: - THIRTY_MINUTES,
-                        end: FIVE_MINUTES
-                    }
-                }
-            ]
-        }));
-        openmct.install(openmct.plugins.SummaryWidget());
-        openmct.install(openmct.plugins.Notebook());
-        openmct.install(openmct.plugins.LADTable());
-        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
-        openmct.install(openmct.plugins.ObjectMigration());
-        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
-        openmct.start();
-    </script>
 </html>

karma.conf.js

@@ -21,46 +21,70 @@
  *****************************************************************************/
 
 /*global module,process*/
-
-const devMode = process.env.NODE_ENV !== 'production';
-const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
-
-module.exports = (config) => {
-    const webpackConfig = require('./webpack.config.js');
-    delete webpackConfig.output;
-
-    if (!devMode) {
-        webpackConfig.module.rules.push({
-            test: /\.js$/,
-            exclude: /node_modules|example/,
-            use: 'istanbul-instrumenter-loader'
-        });
-    }
-
+module.exports = function(config) {
     config.set({
+
+        // Base path that will be used to resolve all file patterns.
         basePath: '',
-        frameworks: ['jasmine'],
+
+        // Frameworks to use
+        // Available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['jasmine', 'requirejs'],
+
+        // List of files / patterns to load in the browser.
+        // By default, files are also included in a script tag.
         files: [
-            'platform/**/*Spec.js',
-            'src/**/*Spec.js'
+            {pattern: 'bower_components/**/*.js', included: false},
+            {pattern: 'node_modules/d3-*/**/*.js', included: false},
+            {pattern: 'node_modules/vue/**/*.js', included: false},
+            {pattern: 'node_modules/printj/dist/*.js', included: false},
+            {pattern: 'src/**/*', included: false},
+            {pattern: 'node_modules/painterro/build/*.js', included: false},
+            {pattern: 'node_modules/html2canvas/dist/*', included: false},
+            {pattern: 'example/**/*.html', included: false},
+            {pattern: 'example/**/*.js', included: false},
+            {pattern: 'example/**/*.json', included: false},
+            {pattern: 'platform/**/*.js', included: false},
+            {pattern: 'warp/**/*.js', included: false},
+            {pattern: 'platform/**/*.html', included: false},
+            'test-main.js'
         ],
-        port: 9876,
-        reporters: [
-            'progress',
-            'coverage',
-            'html'
+
+        // List of files to exclude.
+        exclude: [
+            'platform/framework/src/Main.js'
         ],
-        browsers: browsers,
-        customLaunchers: {
-            ChromeDebugging: {
-                base: 'Chrome',
-                flags: ['--remote-debugging-port=9222'],
-                debug: true
-            }
+
+        // Preprocess matching files before serving them to the browser.
+        // https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {
+            'src/**/!(*Spec).js': [ 'coverage' ],
+            'platform/**/src/**/!(*Spec).js': [ 'coverage' ]
         },
+
+        // Test results reporter to use
+        // Possible values: 'dots', 'progress'
+        // Available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ['progress', 'coverage', 'html'],
+
+        // Web server port.
+        port: 9876,
+
+        // Wnable / disable colors in the output (reporters and logs).
         colors: true,
+
         logLevel: config.LOG_INFO,
+
+        // Rerun tests when any file changes.
         autoWatch: true,
+
+        // Specify browsers to run tests in.
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: [
+            'ChromeHeadless'
+        ],
+
+        // Code coverage reporting.
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
@@ -72,22 +96,16 @@ module.exports = (config) => {
                 }
             }
         },
+
         // HTML test reporting.
         htmlReporter: {
             outputDir: "dist/reports/tests",
             preserveDescribeNesting: true,
             foldAll: false
         },
-        preprocessors: {
-            // add webpack as preprocessor
-            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
-            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
-        },
-        webpack: webpackConfig,
-        webpackMiddleware: {
-            stats: 'errors-only',
-            logLevel: 'warn'
-        },
+
+        // Continuous Integration mode.
+        // If true, Karma captures browsers, runs the tests and exits.
         singleRun: true
     });
-}
+};

openmct.js

@@ -19,19 +19,102 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global module*/
+/*global requirejs,BUILD_CONSTANTS*/
 
-const matcher = /\/openmct.js$/;
-if (document.currentScript) {
-    let src = document.currentScript.src;
-    if (src && matcher.test(src)) {
-        // eslint-disable-next-line no-undef
-        __webpack_public_path__ = src.replace(matcher, '') + '/';
+requirejs.config({
+    "paths": {
+        "legacyRegistry": "src/legacyRegistry",
+        "angular": "bower_components/angular/angular.min",
+        "angular-route": "bower_components/angular-route/angular-route.min",
+        "csv": "bower_components/comma-separated-values/csv.min",
+        "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
+        "moment": "bower_components/moment/moment",
+        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
+        "moment-timezone": "bower_components/moment-timezone/builds/moment-timezone-with-data",
+        "saveAs": "bower_components/file-saver/FileSaver.min",
+        "screenfull": "bower_components/screenfull/dist/screenfull.min",
+        "text": "bower_components/text/text",
+        "uuid": "bower_components/node-uuid/uuid",
+        "vue": "node_modules/vue/dist/vue.min",
+        "zepto": "bower_components/zepto/zepto.min",
+        "lodash": "bower_components/lodash/lodash",
+        "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
+        "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
+        "d3-axis": "node_modules/d3-axis/dist/d3-axis.min",
+        "d3-array": "node_modules/d3-array/dist/d3-array.min",
+        "d3-collection": "node_modules/d3-collection/dist/d3-collection.min",
+        "d3-color": "node_modules/d3-color/build/d3-color.min",
+        "d3-format": "node_modules/d3-format/build/d3-format.min",
+        "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
+        "d3-time": "node_modules/d3-time/dist/d3-time.min",
+        "d3-time-format": "node_modules/d3-time-format/dist/d3-time-format.min",
+        "html2canvas": "node_modules/html2canvas/dist/html2canvas.min",
+        "painterro": "node_modules/painterro/build/painterro.min",
+        "printj": "node_modules/printj/dist/printj.min"
+    },
+    "shim": {
+        "angular": {
+            "exports": "angular"
+        },
+        "angular-route": {
+            "deps": ["angular"]
+        },
+        "EventEmitter": {
+            "exports": "EventEmitter"
+        },
+        "moment-duration-format": {
+            "deps": ["moment"]
+        },
+        "painterro": {
+            "exports": "Painterro"
+        },
+        "saveAs": {
+            "exports": "saveAs"
+        },
+        "screenfull": {
+            "exports": "screenfull"
+        },
+        "zepto": {
+            "exports": "Zepto"
+        },
+        "lodash": {
+            "exports": "lodash"
+        },
+        "d3-selection": {
+            "exports": "d3-selection"
+        },
+        "d3-scale": {
+            "deps": ["d3-array", "d3-collection", "d3-color", "d3-format", "d3-interpolate", "d3-time", "d3-time-format"],
+            "exports": "d3-scale"
+        },
+        "d3-axis": {
+            "exports": "d3-axis"
+        },
+        "dom-to-image": {
+            "exports": "domtoimage"
+        }
     }
-}
+});
 
-const MCT = require('./src/MCT');
+define([
+    './platform/framework/src/Main',
+    './src/defaultRegistry',
+    './src/MCT',
+    './src/plugins/buildInfo/plugin'
+], function (Main, defaultRegistry, MCT, buildInfo) {
+    var openmct = new MCT();
 
-var openmct = new MCT();
+    openmct.legacyRegistry = defaultRegistry;
+    openmct.install(openmct.plugins.Plot());
 
-module.exports = openmct;
+    if (typeof BUILD_CONSTANTS !== 'undefined') {
+        openmct.install(buildInfo(BUILD_CONSTANTS));
+    }
+
+    openmct.on('start', function () {
+        return new Main().run(defaultRegistry);
+    });
+
+    return openmct;
+});

package.json

@@ -1,17 +1,8 @@
 {
   "name": "openmct",
-  "version": "1.0.0-beta",
-  "description": "The Open MCT core platform",
-  "dependencies": {},
-  "devDependencies": {
-    "acorn": "6.2.0",
-    "angular": "1.4.14",
-    "angular-route": "1.4.14",
-    "babel-eslint": "8.2.6",
-    "comma-separated-values": "^3.6.4",
-    "concurrently": "^3.6.1",
-    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^1.0.0",
+  "version": "0.14.0-SNAPSHOT",
+  "description": "The Open MCT core platform.",
+  "dependencies": {
     "d3-array": "1.2.x",
     "d3-axis": "1.0.x",
     "d3-collection": "1.0.x",
@@ -22,71 +13,58 @@
     "d3-selection": "1.3.x",
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
-    "eslint": "5.2.0",
-    "eventemitter3": "^1.2.0",
-    "exports-loader": "^0.7.0",
     "express": "^4.13.1",
-    "fast-sass-loader": "1.4.6",
-    "file-loader": "^1.1.11",
-    "file-saver": "^1.3.8",
+    "minimist": "^1.1.1",
+    "painterro": "^0.2.65",
+    "request": "^2.69.0",
+    "vue": "^2.5.6"
+  },
+  "devDependencies": {
+    "bower": "^1.7.7",
     "git-rev-sync": "^1.4.0",
     "glob": ">= 3.0.0",
-    "html-loader": "^0.5.5",
+    "gulp": "^3.9.1",
+    "gulp-jscs": "^3.0.2",
+    "gulp-jshint": "^2.0.0",
+    "gulp-jshint-html-reporter": "^0.1.3",
+    "gulp-rename": "^1.2.2",
+    "gulp-requirejs-optimize": "^0.3.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-sourcemaps": "^1.6.0",
     "html2canvas": "^1.0.0-alpha.12",
-    "imports-loader": "^0.8.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
+    "jscs-html-reporter": "^0.1.0",
     "jsdoc": "^3.3.2",
+    "jshint": "^2.7.0",
     "karma": "^2.0.3",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^1.1.2",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^3.0.0",
-    "location-bar": "^3.0.1",
-    "lodash": "^3.10.1",
+    "karma-requirejs": "^1.1.0",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
-    "mini-css-extract-plugin": "^0.4.1",
-    "minimist": "^1.1.1",
+    "merge-stream": "^1.0.0",
+    "mkdirp": "^0.5.1",
     "moment": "^2.11.1",
-    "moment-duration-format": "^2.2.2",
-    "moment-timezone": "^0.5.21",
     "node-bourbon": "^4.2.3",
-    "node-sass": "^4.9.2",
-    "painterro": "^0.2.65",
-    "printj": "^1.2.1",
-    "raw-loader": "^0.5.1",
-    "request": "^2.69.0",
+    "printj": "^1.1.0",
+    "requirejs": "2.1.x",
     "split": "^1.0.0",
-    "style-loader": "^0.21.0",
-    "v8-compile-cache": "^1.1.0",
-    "vue": "2.5.6",
-    "vue-loader": "^15.2.6",
-    "vue-template-compiler": "2.5.6",
-    "webpack": "^4.16.2",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-middleware": "^3.1.3",
-    "webpack-hot-middleware": "^2.22.3",
-    "zepto": "^1.2.0"
+    "v8-compile-cache": "^1.1.0"
   },
   "scripts": {
     "start": "node app.js",
-    "lint": "eslint platform src openmct.js",
-    "lint:fix": "eslint platform src openmct.js --fix",
-    "build:prod": "NODE_ENV=production webpack",
-    "build:dev": "webpack",
-    "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "test-debug": "NODE_ENV=debug karma start --no-single-run",
-    "test:watch": "karma start --no-single-run",
-    "verify": "concurrently 'npm:test' 'npm:lint'",
+    "jshint": "jshint platform example",
+    "lint": "./node_modules/gulp/bin/gulp.js lint",
+    "checkstyle": "./node_modules/gulp/bin/gulp.js checkstyle",
+    "watch": "karma start",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepare": "npm run build:prod"
+    "prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
   },
   "repository": {
     "type": "git",

platform/commonUI/about/bundle.js

@@ -21,17 +21,17 @@
  *****************************************************************************/
 
 define([
-    "./res/templates/about-dialog.html",
+    "text!./res/templates/about-dialog.html",
     "./src/LogoController",
     "./src/AboutController",
     "./src/LicenseController",
-    "./res/templates/app-logo.html",
-    "./res/templates/about-logo.html",
-    "./res/templates/overlay-about.html",
-    "./res/templates/license-apache.html",
-    "./res/templates/license-mit.html",
-    "./res/templates/licenses.html",
-    "./res/templates/licenses-export-md.html",
+    "text!./res/templates/app-logo.html",
+    "text!./res/templates/about-logo.html",
+    "text!./res/templates/overlay-about.html",
+    "text!./res/templates/license-apache.html",
+    "text!./res/templates/license-mit.html",
+    "text!./res/templates/licenses.html",
+    "text!./res/templates/licenses-export-md.html",
     'legacyRegistry'
 ], function (
     aboutDialogTemplate,

platform/commonUI/browse/bundle.js

@@ -21,30 +21,50 @@
  *****************************************************************************/
 
 define([
+    "./src/BrowseController",
+    "./src/PaneController",
+    "./src/InspectorPaneController",
+    "./src/BrowseObjectController",
+    "./src/MenuArrowController",
+    "./src/ObjectHeaderController",
     "./src/navigation/NavigationService",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
     "./src/windowing/NewTabAction",
-    "./res/templates/browse.html",
-    "./res/templates/browse-object.html",
-    "./res/templates/browse/object-header.html",
-    "./res/templates/browse/object-header-frame.html",
-    "./res/templates/menu-arrow.html",
-    "./res/templates/back-arrow.html",
-    "./res/templates/browse/object-properties.html",
-    "./res/templates/browse/inspector-region.html",
+    "./src/windowing/FullscreenAction",
+    "./src/windowing/WindowTitler",
+    "text!./res/templates/browse.html",
+    "text!./res/templates/browse-object.html",
+    "text!./res/templates/items/grid-item.html",
+    "text!./res/templates/browse/object-header.html",
+    "text!./res/templates/browse/object-header-frame.html",
+    "text!./res/templates/menu-arrow.html",
+    "text!./res/templates/back-arrow.html",
+    "text!./res/templates/items/items.html",
+    "text!./res/templates/browse/object-properties.html",
+    "text!./res/templates/browse/inspector-region.html",
     'legacyRegistry'
 ], function (
+    BrowseController,
+    PaneController,
+    InspectorPaneController,
+    BrowseObjectController,
+    MenuArrowController,
+    ObjectHeaderController,
     NavigationService,
     NavigateAction,
     OrphanNavigationHandler,
     NewTabAction,
+    FullscreenAction,
+    WindowTitler,
     browseTemplate,
     browseObjectTemplate,
+    gridItemTemplate,
     objectHeaderTemplate,
     objectHeaderFrameTemplate,
     menuArrowTemplate,
     backArrowTemplate,
+    itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
     legacyRegistry
@@ -53,6 +73,15 @@ define([
     legacyRegistry.register("platform/commonUI/browse", {
         "extensions": {
             "routes": [
+                {
+                    "when": "/browse/:ids*?",
+                    "template": browseTemplate,
+                    "reloadOnSearch": false
+                },
+                {
+                    "when": "",
+                    "redirectTo": "/browse/"
+                }
             ],
             "constants": [
                 {
@@ -61,6 +90,70 @@ define([
                     "priority": "fallback"
                 }
             ],
+            "controllers": [
+                {
+                    "key": "BrowseController",
+                    "implementation": BrowseController,
+                    "depends": [
+                        "$scope",
+                        "$route",
+                        "$location",
+                        "objectService",
+                        "navigationService",
+                        "urlService",
+                        "DEFAULT_PATH"
+                    ]
+                },
+                {
+                    "key": "PaneController",
+                    "implementation": PaneController,
+                    "priority": "preferred",
+                    "depends": [
+                        "$scope",
+                        "agentService",
+                        "$window",
+                        "$location",
+                        "$attrs",
+                        "navigationService"
+                    ]
+                },
+                {
+                    "key": "BrowseObjectController",
+                    "implementation": BrowseObjectController,
+                    "depends": [
+                        "$scope",
+                        "$location",
+                        "$route"
+                    ]
+                },
+                {
+                    "key": "MenuArrowController",
+                    "implementation": MenuArrowController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "InspectorPaneController",
+                    "implementation": InspectorPaneController,
+                    "priority": "preferred",
+                    "depends": [
+                        "$scope",
+                        "agentService",
+                        "$window",
+                        "navigationService",
+                        "$location",
+                        "$attrs"
+                    ]
+                },
+                {
+                    "key": "ObjectHeaderController",
+                    "implementation": ObjectHeaderController,
+                    "depends": [
+                        "$scope"
+                    ]
+                }
+            ],
             "representations": [
                 {
                     "key": "browse-object",
@@ -72,6 +165,19 @@ define([
                         "view"
                     ]
                 },
+                {
+                    "key": "grid-item",
+                    "template": gridItemTemplate,
+                    "uses": [
+                        "type",
+                        "action",
+                        "location"
+                    ],
+                    "gestures": [
+                        "info",
+                        "menu"
+                    ]
+                },
                 {
                     "key": "object-header",
                     "template": objectHeaderTemplate,
@@ -145,9 +251,41 @@ define([
                     "group": "windowing",
                     "cssClass": "icon-new-window",
                     "priority": "preferred"
+                },
+                {
+                    "key": "fullscreen",
+                    "implementation": FullscreenAction,
+                    "category": "view-control",
+                    "group": "windowing",
+                    "priority": "default"
+                }
+            ],
+            "views": [
+                {
+                    "key": "items",
+                    "name": "Grid",
+                    "cssClass": "icon-thumbs-strip",
+                    "description": "Grid of available items",
+                    "template": itemsTemplate,
+                    "uses": [
+                        "composition"
+                    ],
+                    "gestures": [
+                        "drop"
+                    ],
+                    "type": "folder",
+                    "editable": false
                 }
             ],
             "runs": [
+                {
+                    "implementation": WindowTitler,
+                    "depends": [
+                        "navigationService",
+                        "$rootScope",
+                        "$document"
+                    ]
+                },
                 {
                     "implementation": OrphanNavigationHandler,
                     "depends": [
@@ -157,18 +295,16 @@ define([
                     ]
                 }
             ],
-            "templates": [
+            "licenses": [
                 {
-                    key: "browseRoot",
-                    template: browseTemplate
-                },
-                {
-                    key: "browseObject",
-                    template: browseObjectTemplate
-                },
-                {
-                    key: "inspectorRegion",
-                    template: inspectorRegionTemplate
+                    "name": "screenfull.js",
+                    "version": "1.2.0",
+                    "description": "Wrapper for cross-browser usage of fullscreen API",
+                    "author": "Sindre Sorhus",
+                    "website": "https://github.com/sindresorhus/screenfull.js/",
+                    "copyright": "Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
+                    "license": "license-mit",
+                    "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
                 }
             ]
         }

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

@@ -66,4 +66,5 @@
             </mct-representation>
         </div>
     </div>
+    <mct-include key="'conductor'" class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder"></mct-include>
 </div>

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

@@ -0,0 +1,45 @@
+<!--
+ Open MCT, Copyright (c) 2014-2018, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<!-- For selected, add class 'selected' to outer div -->
+<div class='item grid-item' ng-click='action.perform("navigate")'>
+    <div class='contents abs'>
+        <div class='top-bar bar abs'>
+            <span class='icon-people' title='Shared'></span>
+            <mct-representation class="desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
+        </div>
+        <div class='item-main abs lg'>
+            <span class="t-item-icon" ng-class="{ 'l-icon-link':location.isLink() }">
+                <span class="t-item-icon-glyph ng-binding {{type.getCssClass()}}"></span>
+            </span>
+            <div class='abs item-open icon-pointer-right'></div>
+        </div>
+        <div class='bottom-bar bar abs'>
+            <div class='title'>{{model.name}}</div>
+            <div class='details'>
+                <span>{{type.getName()}}</span>
+                <span ng-show="model.composition !== undefined">
+                    - {{model.composition.length}} Item<span ng-show="model.composition.length > 1">s</span>
+                </span>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,27 @@
+<!--
+ Open MCT, Copyright (c) 2014-2018, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div class='items-holder grid abs'>
+    <mct-representation key="'grid-item'"
+                        ng-repeat="childObject in composition"
+                        mct-object="childObject">
+    </mct-representation>
+</div>

platform/commonUI/browse/src/BrowseController.js

@@ -0,0 +1,214 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * This bundle implements Browse mode.
+ * @namespace platform/commonUI/browse
+ */
+define(
+    ['lodash'],
+    function (_) {
+
+        /**
+         * The BrowseController is used to populate the initial scope in Browse
+         * mode. It loads the root object from the objectService and makes it
+         * available in the scope for Angular template's; this is the point at
+         * which Angular templates first have access to the domain object
+         * hierarchy.
+         *
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function BrowseController(
+            $scope,
+            $route,
+            $location,
+            objectService,
+            navigationService,
+            urlService,
+            defaultPath
+        ) {
+            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
+                currentIds;
+
+            $scope.treeModel = {
+                selectedObject: undefined,
+                onSelection: function (object) {
+                    navigationService.setNavigation(object, true);
+                },
+                allowSelection: function (object) {
+                    var domainObjectInView = navigationService.getNavigation(),
+                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
+
+                    if (isInEditMode) {
+
+                        var actions = object.getCapability('action'),
+                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
+
+                        if (previewAction && previewAction.perform) {
+                            previewAction.perform();
+                            return false;
+                        } else {
+                            return navigationService.shouldNavigate();
+                        }
+
+                    } else {
+                        return true;
+                    }
+                }
+            };
+
+            function idsForObject(domainObject) {
+                return urlService
+                    .urlForLocation("", domainObject)
+                    .replace('/', '');
+            }
+
+            // Find an object in an array of objects.
+            function findObject(domainObjects, id) {
+                var i;
+                for (i = 0; i < domainObjects.length; i += 1) {
+                    if (domainObjects[i].getId() === id) {
+                        return domainObjects[i];
+                    }
+                }
+            }
+
+            // helper, fetch a single object from the object service.
+            function getObject(id) {
+                return objectService.getObjects([id])
+                    .then(function (results) {
+                        return results[id];
+                    });
+            }
+
+            // recursively locate and return an object inside of a container
+            // via a path.  If at any point in the recursion it fails to find
+            // the next object, it will return the parent.
+            function findViaComposition(containerObject, path) {
+                var nextId = path.shift();
+                if (!nextId) {
+                    return containerObject;
+                }
+                return containerObject.useCapability('composition')
+                    .then(function (composees) {
+                        var nextObject = findObject(composees, nextId);
+                        if (!nextObject) {
+                            return containerObject;
+                        }
+                        if (!nextObject.hasCapability('composition')) {
+                            return nextObject;
+                        }
+                        return findViaComposition(nextObject, path);
+                    });
+            }
+
+            function navigateToObject(desiredObject) {
+                $scope.navigatedObject = desiredObject;
+                $scope.treeModel.selectedObject = desiredObject;
+                currentIds = idsForObject(desiredObject);
+                $route.current.pathParams.ids = currentIds;
+                $location.path('/browse/' + currentIds);
+            }
+
+            function getLastChildIfRoot(object) {
+                if (object.getId() !== 'ROOT') {
+                    return object;
+                }
+                return object.useCapability('composition')
+                    .then(function (composees) {
+                        return composees[composees.length - 1];
+                    });
+            }
+
+            function navigateToPath(path) {
+                return getObject('ROOT')
+                    .then(function (root) {
+                        return findViaComposition(root, path);
+                    })
+                    .then(getLastChildIfRoot)
+                    .then(function (object) {
+                        navigationService.setNavigation(object);
+                    });
+            }
+
+            getObject('ROOT')
+                .then(function (root) {
+                    $scope.domainObject = root;
+                    navigateToPath(initialPath);
+                });
+
+            // Handle navigation events from view service.  Only navigates
+            // if path has changed.
+            function navigateDirectlyToModel(domainObject) {
+                var newIds = idsForObject(domainObject);
+                if (currentIds !== newIds) {
+                    currentIds = newIds;
+                    navigateToObject(domainObject);
+                }
+            }
+
+            // Listen for changes in navigation state.
+            navigationService.addListener(navigateDirectlyToModel);
+
+            // Listen for route changes which are caused by browser events
+            // (e.g. bookmarks to pages in OpenMCT) and prevent them.  Instead,
+            // navigate to the path ourselves, which results in it being
+            // properly set.
+            $scope.$on('$routeChangeStart', function (event, route, oldRoute) {
+                if (route.$$route === $route.current.$$route) {
+                    if (route.pathParams.ids &&
+                        route.pathParams.ids !== $route.current.pathParams.ids) {
+
+                        var otherParams = _.omit(route.params, 'ids');
+                        var oldOtherParams = _.omit(oldRoute.params, 'ids');
+                        var deletedParams = _.omit(oldOtherParams, _.keys(otherParams));
+
+                        event.preventDefault();
+
+                        navigateToPath(route.pathParams.ids.split('/'))
+                            .then(function () {
+                                if (!_.isEqual(otherParams, oldOtherParams)) {
+                                    _.forEach(otherParams, function (v, k) {
+                                        $location.search(k, v);
+                                    });
+                                    _.forEach(deletedParams, function (k) {
+                                        $location.search(k, null);
+                                    });
+                                }
+                            });
+                    } else {
+                        navigateToPath([]);
+                    }
+                }
+            });
+
+            // Clean up when the scope is destroyed
+            $scope.$on("$destroy", function () {
+                navigationService.removeListener(navigateDirectlyToModel);
+            });
+        }
+
+        return BrowseController;
+    }
+);
+

platform/commonUI/browse/src/BrowseObjectController.js

@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Controller for the `browse-object` representation of a domain
+         * object (the right-hand side of Browse mode.)
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function BrowseObjectController($scope, $location, $route) {
+            var navigatedObject;
+            function setViewForDomainObject(domainObject) {
+
+                var locationViewKey = $location.search().view;
+
+                function selectViewIfMatching(view) {
+                    if (view.key === locationViewKey) {
+                        $scope.representation = $scope.representation || {};
+                        $scope.representation.selected = view;
+                    }
+                }
+
+                if (locationViewKey) {
+                    ((domainObject && domainObject.useCapability('view')) || [])
+                        .forEach(selectViewIfMatching);
+                }
+                navigatedObject = domainObject;
+            }
+
+            function updateQueryParam(viewKey) {
+                if (viewKey && $location.search().view !== viewKey) {
+                    $location.search('view', viewKey);
+                }
+            }
+
+            $scope.$watch('domainObject', setViewForDomainObject);
+            $scope.$watch('representation.selected.key', updateQueryParam);
+            $scope.$on('$locationChangeSuccess', function () {
+                setViewForDomainObject($scope.domainObject);
+            });
+
+            $scope.doAction = function (action) {
+                return $scope[action] && $scope[action]();
+            };
+
+        }
+
+        return BrowseObjectController;
+    }
+);
+

platform/commonUI/browse/src/InspectorPaneController.js

@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+
+define(
+    ["./PaneController"],
+    function (PaneController) {
+
+        /**
+         * Pane controller that reveals inspector, if hidden, when object
+         * switches to edit mode.
+         *
+         * @param $scope
+         * @param agentService
+         * @param $window
+         * @param navigationService
+         * @constructor
+         */
+        function InspectorPaneController($scope, agentService, $window, navigationService, $location, $attrs) {
+            PaneController.call(this, $scope, agentService, $window, $location, $attrs);
+            var statusListener,
+                self = this;
+
+            function showInspector(statuses) {
+                if (statuses.indexOf('editing') !== -1 && !self.visible()) {
+                    self.toggle();
+                }
+            }
+
+            function attachStatusListener(domainObject) {
+                // Remove existing status listener if existing
+                if (statusListener) {
+                    statusListener();
+                }
+
+                if (domainObject.hasCapability("status")) {
+                    statusListener = domainObject.getCapability("status").listen(showInspector);
+                }
+                return statusListener;
+            }
+
+            var domainObject = navigationService.getNavigation();
+            if (domainObject) {
+                attachStatusListener(domainObject);
+            }
+
+            navigationService.addListener(attachStatusListener);
+
+            $scope.$on("$destroy", function () {
+                statusListener();
+                navigationService.removeListener(attachStatusListener);
+            });
+        }
+
+        InspectorPaneController.prototype = Object.create(PaneController.prototype);
+
+        return InspectorPaneController;
+    }
+);

platform/commonUI/browse/src/MenuArrowController.js

@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining MenuArrowController. Created by shale on 06/30/2015.
+ */
+define(
+    [],
+    function () {
+
+        /**
+         * A left-click on the menu arrow should display a
+         * context menu. This controller launches the context
+         * menu.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function MenuArrowController($scope) {
+            this.$scope = $scope;
+        }
+
+        /**
+         * Show a context menu for the domain object in this scope.
+         *
+         * @param event the browser event which caused this (used to
+         *        position the menu)
+         */
+        MenuArrowController.prototype.showMenu = function (event) {
+            var actionContext = {
+                key: 'menu',
+                domainObject: this.$scope.domainObject,
+                event: event
+            };
+
+            this.$scope.domainObject.getCapability('action').perform(actionContext);
+        };
+
+        return MenuArrowController;
+    }
+);

platform/commonUI/browse/src/ObjectHeaderController.js

@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Controller to provide the ability to inline edit an object name.
+         *
+         * @constructor
+         * @memberof platform/commonUI/browse
+         */
+        function ObjectHeaderController($scope) {
+            this.$scope = $scope;
+            this.domainObject = $scope.domainObject;
+            this.editable = this.allowEdit();
+        }
+
+        /**
+         * Updates the object name on blur and enter keypress events.
+         *
+         * @param event the mouse event
+         */
+        ObjectHeaderController.prototype.updateName = function (event) {
+            if (!event || !event.currentTarget) {
+                return;
+            }
+
+            if (event.type === 'blur') {
+                this.updateModel(event);
+            } else if (event.which === 13) {
+                this.updateModel(event);
+                event.currentTarget.blur();
+                window.getSelection().removeAllRanges();
+            }
+        };
+
+        /**
+         * Updates the model.
+         *
+         * @param event the mouse event
+         * @param private
+         */
+        ObjectHeaderController.prototype.updateModel = function (event) {
+            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
+
+            if (name.length === 0) {
+                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
+                event.currentTarget.textContent = name;
+            }
+
+            if (name !== this.domainObject.getModel().name) {
+                this.domainObject.getCapability('mutation').mutate(function (model) {
+                    model.name = name;
+                });
+            }
+        };
+
+        /**
+         * Checks if the domain object is editable.
+         *
+         * @private
+         * @return true if object is editable
+         */
+        ObjectHeaderController.prototype.allowEdit = function () {
+            var type = this.domainObject && this.domainObject.getCapability('type');
+            return !!(type && type.hasFeature('creation'));
+        };
+
+        return ObjectHeaderController;
+    }
+);

platform/commonUI/browse/src/PaneController.js

@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+
+define(
+    [],
+    function () {
+        var navigationListenerAdded = false;
+        /**
+         * Controller to provide the ability to show/hide the tree in
+         * Browse mode.
+         * @constructor
+         * @memberof platform/commonUI/browse
+         */
+        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
+            var self = this;
+            this.agentService = agentService;
+            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
+
+            if ($attrs.hideParameter && hideParameterPresent) {
+                this.state = false;
+                $location.search($attrs.hideParameter, undefined);
+            } else {
+                this.state = true;
+            }
+
+            /**
+             * Callback to invoke when any selection occurs in the tree.
+             * This controller can be passed in as the `parameters` object
+             * to the tree representation.
+             *
+             * @property {Function} callback
+             * @memberof platform/commonUI/browse.PaneController#
+             */
+            this.callback = function () {
+                // Note that, since this is a callback to pass, this is not
+                // declared as a method but as a property which happens to
+                // be a function.
+                if (agentService.isPhone() && agentService.isPortrait()) {
+                    // On phones, trees should collapse in portrait mode
+                    // when something is navigated-to.
+                    self.state = false;
+                }
+            };
+
+            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
+                navigationService.addListener(this.callback);
+                navigationListenerAdded = true;
+            }
+        }
+
+        /**
+         * Toggle the visibility of the pane.
+         */
+        PaneController.prototype.toggle = function () {
+            this.state = !this.state;
+        };
+
+        /**
+         * Get the desired visibility state of the pane.
+         * @returns {boolean} true when visible
+         */
+        PaneController.prototype.visible = function () {
+            return !!this.state;
+        };
+
+        return PaneController;
+    }
+);

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

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

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

@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining FullscreenAction. Created by vwoeltje on 11/18/14.
+ */
+define(
+    ["screenfull"],
+    function (screenfull) {
+
+        var ENTER_FULLSCREEN = "Enter full screen mode",
+            EXIT_FULLSCREEN = "Exit full screen mode";
+
+        /**
+         * The fullscreen action toggles between fullscreen display
+         * and regular in-window display.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         * @implements {Action}
+         */
+        function FullscreenAction(context) {
+            this.context = context;
+        }
+
+        FullscreenAction.prototype.perform = function () {
+            screenfull.toggle();
+        };
+
+        FullscreenAction.prototype.getMetadata = function () {
+            // We override getMetadata, because the icon cssClass and
+            // description need to be determined at run-time
+            // based on whether or not we are currently
+            // full screen.
+            var metadata = Object.create(FullscreenAction);
+            metadata.cssClass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
+            metadata.description = screenfull.isFullscreen ?
+                EXIT_FULLSCREEN : ENTER_FULLSCREEN;
+            metadata.group = "windowing";
+            metadata.context = this.context;
+            return metadata;
+        };
+
+        return FullscreenAction;
+    }
+);

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

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Updates the title of the current window to reflect the name
+         * of the currently navigated-to domain object.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function WindowTitler(navigationService, $rootScope, $document) {
+            // Look up name of the navigated domain object...
+            function getNavigatedObjectName() {
+                var navigatedObject = navigationService.getNavigation();
+                return navigatedObject && navigatedObject.getModel().name;
+            }
+
+            // Set the window title...
+            function setTitle(name) {
+                $document[0].title = name;
+            }
+
+            // Watch the former, and invoke the latter
+            $rootScope.$watch(getNavigatedObjectName, setTitle);
+        }
+
+        return WindowTitler;
+    }
+);

platform/commonUI/browse/test/BrowseControllerSpec.js

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

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/BrowseObjectController"],
+    function (BrowseObjectController) {
+
+        describe("The browse object controller", function () {
+            var mockScope,
+                mockLocation,
+                mockRoute,
+                controller;
+
+            // Utility function; look for a $watch on scope and fire it
+            function fireWatch(expr, value) {
+                mockScope.$watch.calls.all().forEach(function (call) {
+                    if (call.args[0] === expr) {
+                        call.args[1](value);
+                    }
+                });
+            }
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    ["$on", "$watch"]
+                );
+                mockRoute = { current: { params: {} } };
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    ["path", "search"]
+                );
+                mockLocation.search.and.returnValue({});
+
+                controller = new BrowseObjectController(
+                    mockScope,
+                    mockLocation,
+                    mockRoute
+                );
+            });
+
+            it("updates query parameters when selected view changes", function () {
+                fireWatch("representation.selected.key", "xyz");
+                expect(mockLocation.search).toHaveBeenCalledWith('view', "xyz");
+
+                // Allows the path index to be checked
+                // prior to setting $route.current
+                mockLocation.path.and.returnValue("/browse/");
+            });
+
+            it("sets the active view from query parameters", function () {
+                var mockDomainObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ['getId', 'getModel', 'getCapability', 'useCapability']
+                    ),
+                    testViews = [
+                        { key: 'abc' },
+                        { key: 'def', someKey: 'some value' },
+                        { key: 'xyz' }
+                    ];
+
+                mockDomainObject.useCapability.and.callFake(function (c) {
+                    return (c === 'view') && testViews;
+                });
+                mockLocation.search.and.returnValue({ view: 'def' });
+
+                fireWatch('domainObject', mockDomainObject);
+                expect(mockScope.representation.selected)
+                    .toEqual(testViews[1]);
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/InspectorPaneControllerSpec.js

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/InspectorPaneController"],
+    function (InspectorPaneController) {
+
+        describe("The InspectorPaneController", function () {
+            var mockScope,
+                mockAgentService,
+                mockDomainObject,
+                mockWindow,
+                mockStatusCapability,
+                mockNavigationService,
+                mockNavigationUnlistener,
+                mockStatusUnlistener,
+                controller,
+                mockLocation,
+                mockAttrs;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+                mockAgentService = jasmine.createSpyObj(
+                    "agentService",
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                );
+
+                mockNavigationUnlistener = jasmine.createSpy("navigationUnlistener");
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    ["getNavigation", "addListener"]
+                );
+                mockNavigationService.addListener.and.returnValue(mockNavigationUnlistener);
+
+                mockStatusUnlistener = jasmine.createSpy("statusUnlistener");
+                mockStatusCapability = jasmine.createSpyObj(
+                    "statusCapability",
+                    ["listen"]
+                );
+                mockStatusCapability.listen.and.returnValue(mockStatusUnlistener);
+
+                mockDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    [
+                        'getId',
+                        'getModel',
+                        'getCapability',
+                        'hasCapability'
+                    ]
+                );
+                mockDomainObject.getId.and.returnValue("domainObject");
+                mockDomainObject.getModel.and.returnValue({});
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.returnValue(mockStatusCapability);
+
+                mockLocation = jasmine.createSpyObj('location', ['search']);
+                mockLocation.search.and.returnValue({});
+
+                mockAttrs = {};
+
+                controller = new InspectorPaneController(mockScope, mockAgentService, mockWindow, mockNavigationService, mockLocation, mockAttrs);
+            });
+
+            it("listens for changes to navigation and attaches a status" +
+                " listener", function () {
+                expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function));
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                expect(mockStatusCapability.listen).toHaveBeenCalledWith(jasmine.any(Function));
+            });
+
+            it("if hidden, shows the inspector when domain object switches to" +
+                " edit mode", function () {
+                controller.toggle();
+                // test pre-condition that inspector is hidden
+                expect(controller.visible()).toBe(false);
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                mockStatusCapability.listen.calls.mostRecent().args[0](["editing"]);
+                expect(controller.visible()).toBe(true);
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/MenuArrowControllerSpec.js

@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * MenuArrowControllerSpec. Created by shale on 07/02/2015.
+ */
+define(
+    ["../src/MenuArrowController"],
+    function (MenuArrowController) {
+
+        describe("The menu arrow controller ", function () {
+            var mockScope,
+                mockDomainObject,
+                mockEvent,
+                mockContextMenuAction,
+                mockActionContext,
+                controller;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    [""]
+                );
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getCapability"]
+                );
+                mockEvent = jasmine.createSpyObj(
+                    "event",
+                    ["preventDefault"]
+                );
+                mockContextMenuAction = jasmine.createSpyObj(
+                    "action",
+                    ["perform", "getActions"]
+                );
+                mockActionContext = jasmine.createSpyObj(
+                    "actionContext",
+                    [""]
+                );
+
+                mockActionContext.domainObject = mockDomainObject;
+                mockActionContext.event = mockEvent;
+                mockScope.domainObject = mockDomainObject;
+                mockDomainObject.getCapability.and.returnValue(mockContextMenuAction);
+                mockContextMenuAction.perform.and.returnValue(jasmine.any(Function));
+
+                controller = new MenuArrowController(mockScope);
+            });
+
+            it("calls the context menu action when clicked", function () {
+                // Simulate a click on the menu arrow
+                controller.showMenu(mockEvent);
+
+                // Expect the menu action to be performed
+                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('action');
+                expect(mockContextMenuAction.perform).toHaveBeenCalled();
+            });
+        });
+    }
+);

platform/commonUI/browse/test/ObjectHeaderControllerSpec.js

@@ -0,0 +1,137 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/ObjectHeaderController"],
+    function (ObjectHeaderController) {
+
+        describe("The object header controller", function () {
+            var mockScope,
+                mockDomainObject,
+                mockCapabilities,
+                mockMutationCapability,
+                mockTypeCapability,
+                mockEvent,
+                mockCurrentTarget,
+                model,
+                controller;
+
+            beforeEach(function () {
+                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
+                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
+                mockTypeCapability.typeDef = { name: ""};
+                mockTypeCapability.hasFeature.and.callFake(function (feature) {
+                    return feature === 'creation';
+                });
+
+                mockCapabilities = {
+                    mutation: mockMutationCapability,
+                    type: mockTypeCapability
+                };
+
+                model = {
+                    name: "Test name"
+                };
+                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
+                mockDomainObject.getModel.and.returnValue(model);
+                mockDomainObject.getCapability.and.callFake(function (key) {
+                    return mockCapabilities[key];
+                });
+
+                mockScope = {
+                    domainObject: mockDomainObject
+                };
+
+                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
+                mockCurrentTarget.blur.and.returnValue(mockCurrentTarget);
+
+                mockEvent = {
+                    which: {},
+                    type: {},
+                    currentTarget: mockCurrentTarget
+                };
+
+                controller = new ObjectHeaderController(mockScope);
+            });
+
+            it("updates the model with new name on blur", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = "New name";
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).toHaveBeenCalled();
+            });
+
+            it("updates the model with a default for blank names", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = "";
+                controller.updateName(mockEvent);
+
+                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
+                expect(mockMutationCapability.mutate).toHaveBeenCalled();
+            });
+
+            it("does not update the model if the same name", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
+            });
+
+            it("updates the model on enter keypress event only", function () {
+                mockCurrentTarget.textContent = "New name";
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
+
+                mockEvent.which = 13;
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
+
+                mockMutationCapability.mutate.calls.mostRecent().args[0](model);
+
+                expect(mockDomainObject.getModel().name).toBe("New name");
+            });
+
+            it("blurs the field on enter key press", function () {
+                mockCurrentTarget.textContent = "New name";
+                mockEvent.which = 13;
+                controller.updateName(mockEvent);
+
+                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
+            });
+
+            it("allows editting name when object is creatable", function () {
+                expect(controller.allowEdit()).toBe(true);
+            });
+
+            it("disallows editting name when object is non-creatable", function () {
+                mockTypeCapability.hasFeature.and.returnValue(false);
+
+                expect(controller.allowEdit()).toBe(false);
+
+            });
+        });
+    }
+);

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/PaneController"],
+    function (PaneController) {
+
+        describe("The PaneController", function () {
+            var mockScope,
+                mockAgentService,
+                mockDomainObjects,
+                mockWindow,
+                controller,
+                mockLocation,
+                mockAttrs;
+
+            // We want to reinstantiate for each test case
+            // because device state can influence constructor-time behavior
+            function instantiateController() {
+                return new PaneController(
+                    mockScope,
+                    mockAgentService,
+                    mockWindow,
+                    mockLocation,
+                    mockAttrs
+                );
+            }
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockDomainObjects = ['a', 'b'].map(function (id) {
+                    var mockDomainObject = jasmine.createSpyObj(
+                        'domainObject-' + id,
+                        ['getId', 'getModel', 'getCapability']
+                    );
+
+                    mockDomainObject.getId.and.returnValue(id);
+                    mockDomainObject.getModel.and.returnValue({});
+
+                    return mockDomainObject;
+                });
+                mockAgentService = jasmine.createSpyObj(
+                    "agentService",
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                );
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+
+                mockLocation = jasmine.createSpyObj('location', ['search']);
+                mockLocation.search.and.returnValue({});
+
+                mockAttrs = {};
+            });
+
+            it("is initially visible", function () {
+                expect(instantiateController().visible()).toBeTruthy();
+            });
+
+            it("allows visibility to be toggled", function () {
+                controller = instantiateController();
+                controller.toggle();
+                expect(controller.visible()).toBeFalsy();
+                controller.toggle();
+                expect(controller.visible()).toBeTruthy();
+            });
+
+            it("collapses on navigation changes on portrait-oriented phones", function () {
+                mockAgentService.isMobile.and.returnValue(true);
+                mockAgentService.isPhone.and.returnValue(true);
+                mockAgentService.isPortrait.and.returnValue(true);
+                controller = instantiateController();
+                expect(controller.visible()).toBeTruthy();
+
+                // Simulate a change from the tree by invoking controller's
+                controller.callback();
+
+                // Tree should have collapsed
+                expect(controller.visible()).toBeFalsy();
+            });
+
+            describe("specifying hideParameter", function () {
+                beforeEach(function () {
+                    mockAttrs = {hideParameter: 'hideTree'};
+                });
+
+                it("sets pane state to false when in location.search", function () {
+                    mockLocation.search.and.returnValue({'hideTree': true});
+                    expect(instantiateController().visible()).toBe(false);
+                    expect(mockLocation.search).toHaveBeenCalledWith('hideTree', undefined);
+                });
+
+                it("sets state to true when not found in location.search", function () {
+                    mockLocation.search.and.returnValue({});
+                    expect(instantiateController().visible()).toBe(true);
+                    expect(mockLocation.search).not.toHaveBeenCalledWith('hideTree', undefined);
+                });
+            });
+        });
+    }
+);

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

@@ -56,7 +56,7 @@ define([
             return action.perform()
                 .then(function () {
                     expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDomainObject, true);
+                    .toHaveBeenCalledWith(mockDomainObject, true);
                 });
         });
 

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

@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/windowing/FullscreenAction", "screenfull"],
+    function (FullscreenAction, screenfull) {
+
+        describe("The fullscreen action", function () {
+            var action,
+                oldToggle;
+
+            beforeEach(function () {
+                // Screenfull is not shimmed or injected, so
+                // we need to spy on it in the global scope.
+                oldToggle = screenfull.toggle;
+
+                screenfull.toggle = jasmine.createSpy("toggle");
+
+                action = new FullscreenAction({});
+            });
+
+            afterEach(function () {
+                screenfull.toggle = oldToggle;
+            });
+
+            it("toggles fullscreen mode when performed", function () {
+                action.perform();
+                expect(window.screenfull.toggle).toHaveBeenCalled();
+            });
+
+            it("provides displayable metadata", function () {
+                expect(action.getMetadata().cssClass).toBeDefined();
+            });
+
+        });
+    }
+);

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

@@ -46,7 +46,7 @@ define(
                 // tree is opened in a new tab using the
                 // context menu
                 mockContextSelected = jasmine.createSpyObj("context", ["selectedObject",
-                    "domainObject"]);
+                                                               "domainObject"]);
 
                 // Mocks the urlService used to make the new tab's url from a
                 // domainObject and mode
@@ -54,11 +54,11 @@ define(
 
                 // Action done using the current context or mockContextCurrent
                 actionCurrent = new NewTabAction(mockUrlService, mockWindow,
-                    mockContextCurrent);
+                                                 mockContextCurrent);
 
                 // Action done using the selected context or mockContextSelected
                 actionSelected = new NewTabAction(mockUrlService, mockWindow,
-                    mockContextSelected);
+                                                  mockContextSelected);
 
             });
 

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

@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * WindowTitlerSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/windowing/WindowTitler"],
+    function (WindowTitler) {
+
+        describe("The window titler", function () {
+            var mockNavigationService,
+                mockRootScope,
+                mockDocument,
+                mockDomainObject,
+                titler;
+
+            beforeEach(function () {
+                mockNavigationService = jasmine.createSpyObj(
+                    'navigationService',
+                    ['getNavigation']
+                );
+                mockRootScope = jasmine.createSpyObj(
+                    '$rootScope',
+                    ['$watch']
+                );
+                mockDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    ['getModel']
+                );
+                mockDocument = [{}];
+
+                mockDomainObject.getModel.and.returnValue({ name: 'Test name' });
+                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
+
+                titler = new WindowTitler(
+                    mockNavigationService,
+                    mockRootScope,
+                    mockDocument
+                );
+            });
+
+            it("listens for changes to the name of the navigated object", function () {
+                expect(mockRootScope.$watch).toHaveBeenCalledWith(
+                    jasmine.any(Function),
+                    jasmine.any(Function)
+                );
+                expect(mockRootScope.$watch.calls.mostRecent().args[0]())
+                    .toEqual('Test name');
+            });
+
+            it("sets the title to the name of the navigated object", function () {
+                mockRootScope.$watch.calls.mostRecent().args[1]("Some name");
+                expect(mockDocument[0].title).toEqual("Some name");
+            });
+
+        });
+    }
+);

platform/commonUI/dialog/bundle.js

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

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

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

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

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

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

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

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

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

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

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

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

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

platform/commonUI/dialog/src/OverlayService.js

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

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -59,8 +59,8 @@ define(
                     ["resolve", "reject"]
                 );
                 mockDocument = jasmine.createSpyObj(
-                    "$document",
-                    ["find"]
+                  "$document",
+                  ["find"]
                 );
                 mockBody = jasmine.createSpyObj('body', ['on', 'off']);
                 mockDocument.find.and.returnValue(mockBody);

platform/commonUI/dialog/test/OverlayServiceSpec.js

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

platform/commonUI/edit/bundle.js

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

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

@@ -0,0 +1,49 @@
+<!--
+ Open MCT, Copyright (c) 2014-2018, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="ElementsController" class="flex-elem l-flex-col holder grows">
+    <mct-include key="'input-filter'"
+                 class="flex-elem holder"
+                 ng-model="filterBy">
+    </mct-include>
+    <div class="flex-elem grows vscroll scroll-pad">
+        <ul class="tree" id="inspector-elements-tree"
+            ng-if="composition.length > 0">
+            <li ng-repeat="containedObject in composition | filter:searchElements">
+                <span class="tree-item">
+                    <span class="grippy-sm"
+                          ng-if="composition.length > 1"
+                          data-id="{{ containedObject.id }}"
+                          mct-drag-down="dragDown($event)"
+                          mct-drag="drag($event)"
+                          mct-drag-up="dragUp($event)">
+                    </span>
+                    <mct-representation
+                            class="rep-object-label"
+                            key="'label'"
+                            mct-object="containedObject">
+                    </mct-representation>
+                </span>
+            </li>
+        </ul>
+        <div ng-if="composition.length === 0">No contained elements</div>    
+    </div>
+</div>

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

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

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

@@ -0,0 +1,147 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining RemoveAction. Created by vwoeltje on 11/17/14.
+ */
+define([
+    './RemoveDialog'
+], function (
+    RemoveDialog
+) {
+
+    /**
+     * Construct an action which will remove the provided object manifestation.
+     * The object will be removed from its parent's composition; the parent
+     * is looked up via the "context" capability (so this will be the
+     * immediate ancestor by which this specific object was reached.)
+     *
+     * @param {DialogService} dialogService a service which will show the dialog
+     * @param {NavigationService} navigationService a service that maintains the current navigation state
+     * @param {ActionContext} context the context in which this action is performed
+     * @memberof platform/commonUI/edit
+     * @constructor
+     * @implements {Action}
+     */
+    function RemoveAction(dialogService, navigationService, context) {
+        this.domainObject = (context || {}).domainObject;
+        this.dialogService = dialogService;
+        this.navigationService = navigationService;
+    }
+
+    /**
+     * Perform this action.
+     */
+    RemoveAction.prototype.perform = function (skipWarning) {
+        var dialog,
+            dialogService = this.dialogService,
+            domainObject = this.domainObject,
+            navigationService = this.navigationService;
+        /*
+         * Check whether an object ID matches the ID of the object being
+         * removed (used to filter a parent's composition to handle the
+         * removal.)
+         */
+        function isNotObject(otherObjectId) {
+            return otherObjectId !== domainObject.getId();
+        }
+
+        /*
+         * Mutate a parent object such that it no longer contains the object
+         * which is being removed.
+         */
+        function doMutate(model) {
+            model.composition = model.composition.filter(isNotObject);
+        }
+
+        /*
+         * Checks current object and ascendants of current
+         * object with object being removed, if the current
+         * object or any in the current object's path is being removed,
+         * navigate back to parent of removed object.
+         */
+        function checkObjectNavigation(object, parentObject) {
+            // Traverse object starts at current location
+            var traverseObject = (navigationService).getNavigation(),
+                context;
+
+            // Stop when object is not defined (above ROOT)
+            while (traverseObject) {
+                // If object currently traversed to is object being removed
+                // navigate to parent of current object and then exit loop
+                if (traverseObject.getId() === object.getId()) {
+                    navigationService.setNavigation(parentObject);
+                    return;
+                }
+                // Traverses to parent of current object, moving
+                // up the ascendant path
+                context = traverseObject.getCapability('context');
+                traverseObject = context && context.getParent();
+            }
+        }
+
+        /*
+         * Remove the object from its parent, as identified by its context
+         * capability. Based on object's location and selected object's location
+         * user may be navigated to existing parent object
+         */
+        function removeFromContext(object) {
+            var contextCapability = object.getCapability('context'),
+                parent = contextCapability.getParent();
+
+            // If currently within path of removed object(s),
+            // navigates to existing object up tree
+            checkObjectNavigation(object, parent);
+
+            return parent.useCapability('mutation', doMutate);
+        }
+
+        if (skipWarning) {
+
+            removeFromContext(domainObject);
+
+        } else {
+            /*
+            * Pass in the function to remove the domain object so it can be
+            * associated with an 'OK' button press
+            */
+            dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
+            dialog.show();
+        }
+    };
+
+    // Object needs to have a parent for Remove to be applicable
+    RemoveAction.appliesTo = function (context) {
+        var object = (context || {}).domainObject,
+            contextCapability = object && object.getCapability("context"),
+            parent = contextCapability && contextCapability.getParent(),
+            parentType = parent && parent.getCapability('type'),
+            parentCreatable = parentType && parentType.hasFeature('creation');
+
+        // Only creatable types should be modifiable
+        return parent !== undefined &&
+                Array.isArray(parent.getModel().composition) &&
+                parentCreatable;
+    };
+
+    return RemoveAction;
+});

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

@@ -0,0 +1,77 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([], function () {
+
+    /**
+     * @callback removeCallback
+     * @param {DomainObject} domainObject the domain object to be removed
+     */
+
+    /**
+     * Construct a new Remove dialog.
+     *
+     * @param {DialogService} dialogService the service that shows the dialog
+     * @param {DomainObject} domainObject the domain object to be removed
+     * @param {removeCallback} removeCallback callback that handles removal of the domain object
+     * @memberof platform/commonUI/edit
+     * @constructor
+     */
+    function RemoveDialog(dialogService, domainObject, removeCallback) {
+        this.dialogService = dialogService;
+        this.domainObject = domainObject;
+        this.removeCallback = removeCallback;
+    }
+
+    /**
+     * Display a dialog to confirm the removal of a domain object.
+     */
+    RemoveDialog.prototype.show = function () {
+        var dialog,
+            domainObject = this.domainObject,
+            removeCallback = this.removeCallback,
+            model = {
+                title: 'Remove ' + domainObject.getModel().name,
+                actionText: 'Warning! This action will permanently remove this object. Are you sure you want to continue?',
+                severity: 'alert',
+                primaryOption: {
+                    label: 'OK',
+                    callback: function () {
+                        removeCallback(domainObject);
+                        dialog.dismiss();
+                    }
+                },
+                options: [
+                    {
+                        label: 'Cancel',
+                        callback: function () {
+                            dialog.dismiss();
+                        }
+                    }
+                ]
+            };
+
+        dialog = this.dialogService.showBlockingMessage(model);
+    };
+
+    return RemoveDialog;
+});

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

@@ -25,12 +25,12 @@ define([
     '../creation/CreateWizard',
     './SaveInProgressDialog'
 ],
-function (
-    CreateWizard,
-    SaveInProgressDialog
-) {
+    function (
+        CreateWizard,
+        SaveInProgressDialog
+    ) {
 
-    /**
+        /**
          * The "Save" action; the action triggered by clicking Save from
          * Edit Mode. Exits the editing user interface and invokes object
          * capabilities to persist the changes that have been made.
@@ -38,188 +38,190 @@ function (
          * @implements {Action}
          * @memberof platform/commonUI/edit
          */
-    function SaveAsAction(
-        $injector,
-        dialogService,
-        copyService,
-        notificationService,
-        openmct,
-        context
-    ) {
-        this.domainObject = (context || {}).domainObject;
-        this.injectObjectService = function () {
-            this.objectService = $injector.get("objectService");
-        };
-        this.dialogService = dialogService;
-        this.copyService = copyService;
-        this.notificationService = notificationService;
-        this.openmct = openmct;
-    }
-
-    /**
-         * @private
-         */
-    SaveAsAction.prototype.createWizard = function (parent) {
-        return new CreateWizard(
-            this.domainObject,
-            parent,
-            this.openmct
-        );
-    };
-
-    /**
-         * @private
-         */
-    SaveAsAction.prototype.getObjectService = function () {
-        // Lazily acquire object service (avoids cyclical dependency)
-        if (!this.objectService) {
-            this.injectObjectService();
+        function SaveAsAction(
+            $injector,
+            policyService,
+            dialogService,
+            copyService,
+            notificationService,
+            context
+        ) {
+            this.domainObject = (context || {}).domainObject;
+            this.injectObjectService = function () {
+                this.objectService = $injector.get("objectService");
+            };
+            this.$injector = $injector;
+            this.policyService = policyService;
+            this.dialogService = dialogService;
+            this.copyService = copyService;
+            this.notificationService = notificationService;
         }
-        return this.objectService;
-    };
 
-    function resolveWith(object) {
-        return function () {
-            return object;
+        /**
+         * @private
+         */
+        SaveAsAction.prototype.createWizard = function (parent) {
+            return new CreateWizard(
+                this.domainObject,
+                parent,
+                this.policyService
+            );
         };
-    }
 
-    /**
+        /**
+         * @private
+         */
+        SaveAsAction.prototype.getObjectService = function () {
+            // Lazily acquire object service (avoids cyclical dependency)
+            if (!this.objectService) {
+                this.injectObjectService();
+            }
+            return this.objectService;
+        };
+
+        function resolveWith(object) {
+            return function () {
+                return object;
+            };
+        }
+
+        /**
          * Save changes and conclude editing.
          *
          * @returns {Promise} a promise that will be fulfilled when
          *          cancellation has completed
          * @memberof platform/commonUI/edit.SaveAction#
          */
-    SaveAsAction.prototype.perform = function () {
-        return this.save();
-    };
+        SaveAsAction.prototype.perform = function () {
+            // Discard the current root view (which will be the editing
+            // UI, which will have been pushed atop the Browse UI.)
+            function returnToBrowse(object) {
+                if (object) {
+                    object.getCapability("action").perform("navigate");
+                }
+                return object;
+            }
 
-    /**
+            return this.save().then(returnToBrowse);
+        };
+
+        /**
          * @private
          */
-    SaveAsAction.prototype.save = function () {
-        var self = this,
-            domainObject = this.domainObject,
-            copyService = this.copyService,
-            dialog = new SaveInProgressDialog(this.dialogService),
-            toUndirty = [];
+        SaveAsAction.prototype.save = function () {
+            var self = this,
+                domainObject = this.domainObject,
+                copyService = this.copyService,
+                dialog = new SaveInProgressDialog(this.dialogService),
+                toUndirty = [];
 
-        function doWizardSave(parent) {
-            var wizard = self.createWizard(parent);
+            function doWizardSave(parent) {
+                var wizard = self.createWizard(parent);
 
-            return self.dialogService
-                .getUserInput(wizard.getFormStructure(true),
-                    wizard.getInitialFormValue())
-                .then(wizard.populateObjectFromInput.bind(wizard), function (failureReason) {
-                    return Promise.reject("user canceled");
+                return self.dialogService
+                    .getUserInput(wizard.getFormStructure(true),
+                        wizard.getInitialFormValue())
+                    .then(wizard.populateObjectFromInput.bind(wizard), function (failureReason) {
+                        return Promise.reject("user canceled");
+                    });
+            }
+
+            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) {
+                    return objects[objectId];
                 });
-        }
+            }
 
-        function showBlockingDialog(object) {
-            dialog.show();
-            return object;
-        }
+            function getParent(object) {
+                return fetchObject(object.getModel().location);
+            }
 
-        function hideBlockingDialog(object) {
-            dialog.hide();
-            return object;
-        }
-
-        function fetchObject(objectId) {
-            return self.getObjectService().getObjects([objectId]).then(function (objects) {
-                return objects[objectId];
-            });
-        }
-
-        function getParent(object) {
-            return fetchObject(object.getModel().location);
-        }
-
-        function allowClone(objectToClone) {
-            var allowed =
+            function allowClone(objectToClone) {
+                var allowed =
                     (objectToClone.getId() === domainObject.getId()) ||
                         objectToClone.getCapability('location').isOriginal();
-            if (allowed) {
-                toUndirty.push(objectToClone);
+                if (allowed) {
+                    toUndirty.push(objectToClone);
+                }
+                return allowed;
             }
-            return allowed;
-        }
 
-        function cloneIntoParent(parent) {
-            return copyService.perform(domainObject, parent, allowClone);
-        }
-
-        function undirty(object) {
-            return object.getCapability('persistence').refresh();
-        }
-
-        function undirtyOriginals(object) {
-            return Promise.all(toUndirty.map(undirty))
-                .then(resolveWith(object));
-        }
-
-        function saveAfterClone(clonedObject) {
-            return this.openmct.editor.save().then(() => {
-                // Force mutation for search indexing
-                return clonedObject;
-            })
-        }
-
-        function finishEditing(clonedObject) {
-            return fetchObject(clonedObject.getId())
-        }
-
-        function indexForSearch(savedObject) {
-            savedObject.useCapability('mutation', (model) => {
-                return model;
-            });
-
-            return savedObject;
-        }
-
-        function onSuccess(object) {
-            self.notificationService.info("Save Succeeded");
-            return object;
-        }
-
-        function onFailure(reason) {
-            hideBlockingDialog();
-            if (reason !== "user canceled") {
-                self.notificationService.error("Save Failed");
+            function cloneIntoParent(parent) {
+                return copyService.perform(domainObject, parent, allowClone);
             }
-            throw reason;
-        }
 
-        return getParent(domainObject)
-            .then(doWizardSave)
-            .then(showBlockingDialog)
-            .then(getParent)
-            .then(cloneIntoParent)
-            .then(undirtyOriginals)
-            .then(saveAfterClone)
-            .then(finishEditing)
-            .then(indexForSearch)
-            .then(hideBlockingDialog)
-            .then(onSuccess)
-            .catch(onFailure);
-    };
+            function undirty(object) {
+                return object.getCapability('persistence').refresh();
+            }
+
+            function undirtyOriginals(object) {
+                return Promise.all(toUndirty.map(undirty))
+                    .then(resolveWith(object));
+            }
+
+            function saveAfterClone(clonedObject) {
+                return domainObject.getCapability("editor").save()
+                    .then(resolveWith(clonedObject));
+            }
+
+            function finishEditing(clonedObject) {
+                return domainObject.getCapability("editor").finish()
+                    .then(function () {
+                        return fetchObject(clonedObject.getId());
+                    });
+            }
+
+            function onSuccess(object) {
+                self.notificationService.info("Save Succeeded");
+                return object;
+            }
+
+            function onFailure(reason) {
+                hideBlockingDialog();
+                if (reason !== "user canceled") {
+                    self.notificationService.error("Save Failed");
+                }
+                return false;
+            }
+
+            return getParent(domainObject)
+                .then(doWizardSave)
+                .then(showBlockingDialog)
+                .then(getParent)
+                .then(cloneIntoParent)
+                .then(undirtyOriginals)
+                .then(saveAfterClone)
+                .then(finishEditing)
+                .then(hideBlockingDialog)
+                .then(onSuccess)
+                .catch(onFailure);
+        };
 
 
-    /**
+        /**
          * Check if this action is applicable in a given context.
          * This will ensure that a domain object is present in the context,
          * and that this domain object is in Edit mode.
          * @returns true if applicable
          */
-    SaveAsAction.appliesTo = function (context) {
-        var domainObject = (context || {}).domainObject;
-        return domainObject !== undefined &&
+        SaveAsAction.appliesTo = function (context) {
+            var domainObject = (context || {}).domainObject;
+            return domainObject !== undefined &&
                 domainObject.hasCapability('editor') &&
                 domainObject.getCapability('editor').isEditContextRoot() &&
                 domainObject.getModel().persisted === undefined;
-    };
+        };
 
-    return SaveAsAction;
-}
+        return SaveAsAction;
+    }
 );

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

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

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

@@ -49,8 +49,8 @@ define(
             // present context.
             function updateActions() {
                 $scope.saveActions = $scope.action ?
-                    $scope.action.getActions(SAVE_ACTION_CONTEXT) :
-                    [];
+                        $scope.action.getActions(SAVE_ACTION_CONTEXT) :
+                        [];
 
                 $scope.saveActionsAsMenuOptions = $scope.saveActions.map(actionToMenuOption);
 
@@ -59,8 +59,8 @@ define(
                 };
 
                 $scope.otherEditActions = $scope.action ?
-                    $scope.action.getActions(OTHERS_ACTION_CONTEXT) :
-                    [];
+                        $scope.action.getActions(OTHERS_ACTION_CONTEXT) :
+                        [];
 
                 // Required because Angular does not allow 'bind'
                 // in expressions.

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

@@ -0,0 +1,197 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ['zepto'],
+    function ($) {
+
+        /**
+         * The ElementsController prepares the elements view for display
+         *
+         * @constructor
+         */
+        function ElementsController($scope, openmct) {
+            this.scope = $scope;
+            this.scope.composition = [];
+            this.openmct = openmct;
+            this.dragDown = this.dragDown.bind(this);
+            this.dragUp = this.dragUp.bind(this);
+
+            var self = this;
+
+            function filterBy(text) {
+                if (typeof text === 'undefined') {
+                    return $scope.searchText;
+                } else {
+                    $scope.searchText = text;
+                }
+            }
+
+            function searchElements(value) {
+                if ($scope.searchText) {
+                    return value.getModel().name.toLowerCase().search(
+                            $scope.searchText.toLowerCase()) !== -1;
+                } else {
+                    return true;
+                }
+            }
+
+            function setSelection(selection) {
+                if (!selection[0]) {
+                    return;
+                }
+
+                if (self.mutationListener) {
+                    self.mutationListener();
+                    delete self.mutationListener;
+                }
+
+                var domainObject = selection[0].context.oldItem;
+                self.refreshComposition(domainObject);
+
+                if (domainObject) {
+
+                    self.mutationListener = domainObject.getCapability('mutation')
+                        .listen(self.refreshComposition.bind(self, domainObject));
+                }
+            }
+
+            $scope.filterBy = filterBy;
+            $scope.searchElements = searchElements;
+
+            openmct.selection.on('change', setSelection);
+            setSelection(openmct.selection.get());
+
+            $scope.dragDown = this.dragDown;
+            $scope.drag = this.drag;
+            $scope.dragUp = this.dragUp;
+
+            $scope.$on("$destroy", function () {
+                openmct.selection.off("change", setSelection);
+            });
+        }
+
+        /**
+         * Invoked on DragStart - Adds reordering class to parent UL element
+         * Sets selected object ID, to be used on Drag End
+         *
+         * @param {object} event | Mouse Event
+         */
+        ElementsController.prototype.dragDown = function (event) {
+            if (!this.parentUL) {
+                this.parentUL = $(document).find('#inspector-elements-tree');
+            }
+
+            this.selectedTreeItem = $(event.target).parent();
+            this.selectedObjectId = event.target.getAttribute('data-id');
+
+            this.parentUL.addClass('reordering');
+            this.selectedTreeItem.addClass('reorder-actor');
+        };
+
+        /**
+         * Invoked on dragEnd - Removes selected object from position in composition
+         * and replaces it at the target position. Composition is then updated with current
+         * scope
+         *
+         * @param {object} event - Mouse Event
+         */
+        ElementsController.prototype.dragUp = function (event) {
+            this.targetObjectId = event.target.getAttribute('data-id');
+
+            if (this.targetObjectId && this.selectedObjectId) {
+                var selectedObjectPosition,
+                    targetObjectPosition;
+
+                selectedObjectPosition = findObjectInCompositionFromId(this.selectedObjectId, this.scope.composition);
+                targetObjectPosition = findObjectInCompositionFromId(this.targetObjectId, this.scope.composition);
+
+                if ((selectedObjectPosition !== -1) && (targetObjectPosition !== -1)) {
+                    var selectedObject = this.scope.composition.splice(selectedObjectPosition, 1),
+                        selection = this.openmct.selection.get(),
+                        domainObject = selection ? selection[0].context.oldItem : undefined;
+
+                    this.scope.composition.splice(targetObjectPosition, 0, selectedObject[0]);
+
+                    if (domainObject) {
+                        domainObject.getCapability('mutation').mutate(function (model) {
+                            model.composition = this.scope.composition.map(function (dObject) {
+                                return dObject.id;
+                            });
+                        }.bind(this));
+                    }
+                }
+            }
+
+            if (this.parentUL) {
+                this.parentUL.removeClass('reordering');
+            }
+
+            if (this.selectedTreeItem) {
+                this.selectedTreeItem.removeClass('reorder-actor');
+            }
+        };
+
+        ElementsController.prototype.drag = function (event) {
+
+        };
+
+        /**
+         * Gets the composition for the selected object and populates the scope with it.
+         *
+         * @param domainObject the selected object
+         * @private
+         */
+        ElementsController.prototype.refreshComposition = function (domainObject) {
+            var refreshTracker = {};
+            this.currentRefresh = refreshTracker;
+
+            var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
+            if (selectedObjectComposition) {
+                selectedObjectComposition.then(function (composition) {
+                    if (this.currentRefresh === refreshTracker) {
+                        this.scope.composition = composition;
+                    }
+                }.bind(this));
+            } else {
+                this.scope.composition = [];
+            }
+        };
+
+        /**
+         * Finds position of object with given ID in Composition
+         *
+         * @param {String} id
+         * @param {Array} composition
+         * @private
+         */
+        function findObjectInCompositionFromId(id, composition) {
+            var mapped = composition.map(function (element) {
+                return element.id;
+            });
+
+            return mapped.indexOf(id);
+        }
+
+        return ElementsController;
+    }
+);

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

@@ -0,0 +1,133 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining AddAction. Created by ahenry on 01/21/16.
+ */
+define(
+    [
+        './CreateWizard'
+    ],
+    function (CreateWizard) {
+
+        /**
+         * The Add Action is performed to create new instances of
+         * domain objects of a specific type that are subobjects of an
+         * object being edited. This is the action that is performed when a
+         * user uses the Add menu option.
+         *
+         * @memberof platform/commonUI/browse
+         * @implements {Action}
+         * @constructor
+         *
+         * @param {Type} type the type of domain object to create
+         * @param {DomainObject} parent the domain object that should
+         *        act as a container for the newly-created object
+         *        (note that the user will have an opportunity to
+         *        override this)
+         * @param {ActionContext} context the context in which the
+         *        action is being performed
+         * @param {DialogService} dialogService
+         */
+        function AddAction(type, parent, context, $q, dialogService, policyService) {
+            this.metadata = {
+                key: 'add',
+                cssClass: type.getCssClass(),
+                name: type.getName(),
+                type: type.getKey(),
+                description: type.getDescription(),
+                context: context
+            };
+
+            this.type = type;
+            this.parent = parent;
+            this.$q = $q;
+            this.dialogService = dialogService;
+            this.policyService = policyService;
+        }
+
+        /**
+         *
+         * Create a new object of the given type.
+         * This will prompt for user input first.
+         *
+         * @returns {Promise} that will be resolved with the object that the
+         * action was originally invoked on (ie. the 'parent')
+         */
+        AddAction.prototype.perform = function () {
+            var newModel = this.type.getInitialModel(),
+                newObject,
+                parentObject = this.parent,
+                wizard;
+
+            newModel.type = this.type.getKey();
+            newObject = parentObject.getCapability('instantiation').instantiate(newModel);
+            newObject.useCapability('mutation', function (model) {
+                model.location = parentObject.getId();
+            });
+
+            wizard = new CreateWizard(newObject, this.parent, this.policyService);
+
+            function populateObjectFromInput(formValue) {
+                return wizard.populateObjectFromInput(formValue, newObject);
+            }
+
+            function persistAndReturn(domainObject) {
+                return domainObject.getCapability('persistence')
+                    .persist()
+                    .then(function () {
+                        return domainObject;
+                    });
+            }
+
+            function addToParent(populatedObject) {
+                parentObject.getCapability('composition').add(populatedObject);
+                return persistAndReturn(parentObject);
+            }
+
+            return this.dialogService
+                .getUserInput(wizard.getFormStructure(false), wizard.getInitialFormValue())
+                .then(populateObjectFromInput)
+                .then(persistAndReturn)
+                .then(addToParent);
+
+        };
+
+
+        /**
+         * Metadata associated with a Add action.
+         * @typedef {ActionMetadata} AddActionMetadata
+         * @property {string} type the key for the type of domain object
+         *           to be created
+         */
+
+        /**
+         * Get metadata about this action.
+         * @returns {AddActionMetadata} metadata about this action
+         */
+        AddAction.prototype.getMetadata = function () {
+            return this.metadata;
+        };
+
+        return AddAction;
+    }
+);

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

@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining AddActionProvider.js. Created by ahenry on 01/21/16.
+ */
+define(
+    ["./AddAction"],
+    function (AddAction) {
+
+        /**
+         * The AddActionProvider is an ActionProvider which introduces
+         * an Add action for creating sub objects.
+         *
+         * @memberof platform/commonUI/browse
+         * @constructor
+         * @implements {ActionService}
+         *
+         * @param {TypeService} typeService the type service, used to discover
+         *        available types
+         * @param {DialogService} dialogService the dialog service, used by
+         *        specific Create actions to get user input to populate the
+         *        model of the newly-created domain object.
+         * @param {CreationService} creationService the creation service (also
+         *        introduced in this bundle), responsible for handling actual
+         *        object creation.
+         */
+        function AddActionProvider($q, typeService, dialogService, policyService) {
+            this.typeService = typeService;
+            this.dialogService = dialogService;
+            this.$q = $q;
+            this.policyService = policyService;
+        }
+
+        AddActionProvider.prototype.getActions = function (actionContext) {
+            var context = actionContext || {},
+                key = context.key,
+                destination = context.domainObject;
+
+            // We only provide Add actions, and we need a
+            // domain object to serve as the container for the
+            // newly-created object (although the user may later
+            // make a different selection)
+            if (key !== 'add' || !destination) {
+                return [];
+            }
+
+            // Introduce one create action per type
+            return ['timeline', 'activity'].map(function (type) {
+                return new AddAction(
+                    this.typeService.getType(type),
+                    destination,
+                    context,
+                    this.$q,
+                    this.dialogService,
+                    this.policyService
+                );
+            }, this);
+        };
+
+        return AddActionProvider;
+    }
+);