Merge pull request #1263 from nasa/revert-1252-async-root-registration

Revert "Async root registration"

Author: VWoeltjen

Diff for: API.md

@@ -118,11 +118,18 @@ To do so, use the [`addRoot`]{@link module:openmct.ObjectAPI#addRoot} method
 of the [object API]{@link module:openmct.ObjectAPI}:
 
 ```
-openmct.objects.addRoot({ key: "my-key", namespace: "my-namespace" });
+openmct.objects.addRoot({
+    identifier: { key: "my-key", namespace: "my-namespace" }
+    name: "My Root-level Object",
+    type: "my-type"
+});
 ```
 
-Root objects are loaded just like any other objects, i.e. via an object
-provider.
+You can also remove this root-level object via its identifier:
+
+```
+openmct.objects.removeRoot({ key: "my-key", namespace: "my-namespace" });
+```
 
 ### Adding Composition Providers
 

Diff for: index.html

@@ -32,8 +32,7 @@
             [
                 'example/imagery',
                 'example/eventGenerator',
-                'example/generator',
-                'platform/features/my-items'
+                'example/generator'
             ].forEach(
                 openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
             );

Diff for: platform/core/bundle.js

@@ -409,6 +409,16 @@ define([
                     ]
                 }
             ],
+            "roots": [
+                {
+                    "id": "mine",
+                    "model": {
+                        "name": "My Items",
+                        "type": "folder",
+                        "composition": []
+                    }
+                }
+            ],
             "runs": [
                 {
                     "implementation": TransactingMutationListener,

Diff for: platform/features/my-items/bundle.js

@@ -23,15 +23,11 @@
 define([
     'lodash',
     './object-utils',
-    './MutableObject',
-    './RootRegistry',
-    './RootObjectProvider'
+    './MutableObject'
 ], function (
     _,
     utils,
-    MutableObject,
-    RootRegistry,
-    RootObjectProvider
+    MutableObject
 ) {
 
 
@@ -44,8 +40,16 @@ define([
 
     function ObjectAPI() {
         this.providers = {};
-        this.rootRegistry = new RootRegistry();
-        this.rootProvider = new RootObjectProvider(this.rootRegistry);
+        this.rootRegistry = [];
+        this.rootProvider = {
+            'get': function () {
+                return Promise.resolve({
+                    name: 'The root object',
+                    type: 'root',
+                    composition: this.rootRegistry
+                });
+            }.bind(this)
+        };
     }
 
     ObjectAPI.prototype.supersecretSetFallbackProvider = function (p) {
@@ -139,14 +143,29 @@ define([
 
     /**
      * Add a root-level object.
-     * @param {module:openmct.ObjectAPI~Identifier|function} an array of
-     *        identifiers for root level objects, or a function that returns a
-     *        promise for an identifier or an array of root level objects.
+     * @param {module:openmct.DomainObject} domainObject the root-level object
+     *        to add.
      * @method addRoot
      * @memberof module:openmct.ObjectAPI#
      */
     ObjectAPI.prototype.addRoot = function (key) {
-        this.rootRegistry.addRoot(key);
+        this.rootRegistry.unshift(key);
+    };
+
+    /**
+     * Remove a root-level object.
+     * @param {module:openmct.ObjectAPI~Identifier} id the identifier of the
+     *        root-level object to remove.
+     * @method removeRoot
+     * @memberof module:openmct.ObjectAPI#
+     */
+    ObjectAPI.prototype.removeRoot = function (key) {
+        this.rootRegistry = this.rootRegistry.filter(function (k) {
+            return (
+                k.identifier !== key.identifier ||
+                k.namespace !== key.namespace
+            );
+        });
     };
 
     /**