Adapter consolidation & fix incorrect export to window (#2114)

* Merge adapter bundles Merge adapter bundles into consistent location. Update telemetry API to not incorrectly expose the format service on window. * openmct available on window for developers * remove offending comma
nasa · Jul 17, 2018 · 4a046b3 · 4a046b3
1 parent b0702ce
commit 4a046b3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 114 deletions.
diff --git a/index.html b/index.html
@@ -73,6 +73,7 @@
                 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">

diff --git a/src/adapter/bundle.js b/src/adapter/bundle.js
@@ -32,7 +32,9 @@ define([
     './policies/AdaptedViewPolicy',
     './runs/AlternateCompositionInitializer',
     './runs/TimeSettingsURLHandler',
-    './runs/TypeDeprecationChecker'
+    './runs/TypeDeprecationChecker',
+    './runs/LegacyTelemetryProvider',
+    './services/LegacyObjectAPIInterceptor'
 ], function (
     legacyRegistry,
     ActionDialogDecorator,
@@ -45,7 +47,9 @@ define([
     AdaptedViewPolicy,
     AlternateCompositionInitializer,
     TimeSettingsURLHandler,
-    TypeDeprecationChecker
+    TypeDeprecationChecker,
+    LegacyTelemetryProvider,
+    LegacyObjectAPIInterceptor
 ) {
     legacyRegistry.register('src/adapter', {
         "extensions": {
@@ -94,6 +98,18 @@ define([
                     provides: "modelService",
                     implementation: MissingModelCompatibilityDecorator,
                     depends: ["openmct"]
+                },
+                {
+                    provides: "objectService",
+                    type: "decorator",
+                    priority: "mandatory",
+                    implementation: LegacyObjectAPIInterceptor,
+                    depends: [
+                        "openmct",
+                        "roots[]",
+                        "instantiate",
+                        "topic"
+                    ]
                 }
             ],
             policies: [
@@ -126,6 +142,13 @@ define([
                         );
                     },
                     depends: ["openmct", "$location", "$rootScope"]
+                },
+                {
+                    implementation: LegacyTelemetryProvider,
+                    depends: [
+                        "openmct",
+                        "instantiate"
+                    ]
                 }
             ],
             licenses: [

diff --git a/src/api/telemetry/LegacyTelemetryProvider.js → src/adapter/runs/LegacyTelemetryProvider.js b/src/api/telemetry/LegacyTelemetryProvider.js → src/adapter/runs/LegacyTelemetryProvider.js
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    '../objects/object-utils'
+    '../../api/objects/object-utils'
 ], function (
     utils
 ) {

diff --git a/...api/objects/LegacyObjectAPIInterceptor.js → ...er/services/LegacyObjectAPIInterceptor.js b/...api/objects/LegacyObjectAPIInterceptor.js → ...er/services/LegacyObjectAPIInterceptor.js
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    './object-utils'
+    '../../api/objects/object-utils'
 ], function (
     utils
 ) {

diff --git a/src/api/objects/bundle.js b/src/api/objects/bundle.js
diff --git a/src/api/telemetry/bundle.js b/src/api/telemetry/bundle.js
diff --git a/src/defaultRegistry.js b/src/defaultRegistry.js
@@ -24,8 +24,6 @@ define([
     'legacyRegistry',
 
     '../src/adapter/bundle',
-    '../src/api/objects/bundle',
-    '../src/api/telemetry/bundle',
 
     '../example/builtins/bundle',
     '../example/composite/bundle',
@@ -93,8 +91,6 @@ define([
 
     var DEFAULTS = [
         'src/adapter',
-        'src/api/objects',
-        'src/api/telemetry',
         'platform/framework',
         'platform/core',
         'platform/representation',