[Plot] Remove x-axis tick ellipses

Remove ellipses from x-axis ticks and reversal of tick text.  This
allows PNG export to export ticks correctly instead of reversed.

Fixes #2177

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());
-```
+```

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@nasa.gov](mailto:arc-dl-openmct@nasa.gov).
 
 ## Building and Running Open MCT Locally
 

gulpfile.js

@@ -31,7 +31,6 @@ var gulp = require('gulp'),
     git = require('git-rev-sync'),
     moment = require('moment'),
     project = require('./package.json'),
-    _ = require('lodash'),
     paths = {
         main: 'openmct.js',
         dist: 'dist',
@@ -140,7 +139,7 @@ gulp.task('checkstyle', function () {
     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, _.noop);
+    var moveReport = fs.rename.bind(fs, reportName, reportPath, function () {});
 
     mkdirp.sync(path.resolve(paths.reports, 'checkstyle'));
 
@@ -179,4 +178,4 @@ gulp.task('install', [ 'assets', 'scripts' ]);
 
 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 
-gulp.task('build', [ 'verify', 'install' ]);
+gulp.task('build', [ 'verify', 'install' ]);

openmct.js

@@ -41,14 +41,14 @@ requirejs.config({
         "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/build/d3-axis.min",
-        "d3-array": "node_modules/d3-array/build/d3-array.min",
-        "d3-collection": "node_modules/d3-collection/build/d3-collection.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/build/d3-time.min",
-        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.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"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openmct",
   "version": "0.14.0-SNAPSHOT",
-  "description": "The Open MCT core platform",
+  "description": "The Open MCT core platform.",
   "dependencies": {
     "d3-array": "1.2.x",
     "d3-axis": "1.0.x",
@@ -43,7 +43,6 @@
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^1.1.2",
     "karma-requirejs": "^1.1.0",
-    "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "merge-stream": "^1.0.0",

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

@@ -51,7 +51,7 @@ define([
     /**
      * Perform this action.
      */
-    RemoveAction.prototype.perform = function () {
+    RemoveAction.prototype.perform = function (skipWarning) {
         var dialog,
             dialogService = this.dialogService,
             domainObject = this.domainObject,
@@ -115,12 +115,18 @@ define([
             return parent.useCapability('mutation', doMutate);
         }
 
-        /*
-         * Pass in the function to remove the domain object so it can be
-         * associated with an 'OK' button press
-         */
-        dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
-        dialog.show();
+        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

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

@@ -124,6 +124,17 @@ define(
                 expect(mockParent.useCapability).not.toHaveBeenCalledWith("mutation", jasmine.any(Function));
             });
 
+            it("does not show a blocking message dialog when true is passed to perform", function () {
+                mockParent = jasmine.createSpyObj(
+                    "parent",
+                    ["getModel", "getCapability", "useCapability"]
+                );
+
+                action.perform(true);
+
+                expect(mockDialogService.showBlockingMessage).not.toHaveBeenCalled();
+            });
+
             describe("after the remove callback is triggered", function () {
                 var mockChildContext,
                     mockChildObject,

platform/commonUI/general/res/sass/plots/_plots-main.scss

@@ -268,7 +268,6 @@
 
 .gl-plot-tick,
 .tick-label {
-    @include reverseEllipsis();
     font-size: 0.7rem;
     position: absolute;
     &.gl-plot-x-tick-label,

platform/commonUI/themes/espresso/README.md

@@ -0,0 +1,7 @@
+# Espresso Theme
+Dark theme for the Open MCT user interface.
+
+## Installation
+```js
+openmct.install(openmct.plugins.Espresso());
+```

platform/commonUI/themes/snow/README.md

@@ -0,0 +1,7 @@
+# Espresso Theme
+A light colored theme for the Open MCT user interface.
+
+## Installation
+```js
+openmct.install(openmct.plugins.Snow());
+```

platform/core/src/actions/ActionCapability.js

@@ -102,14 +102,14 @@ define(
          * @returns {Action[]} an array of matching actions
          * @memberof platform/core.ActionCapability#
          */
-        ActionCapability.prototype.perform = function (context) {
+        ActionCapability.prototype.perform = function (context, flag) {
             // Alias to getActions(context)[0].perform, with a
             // check for empty arrays.
             var actions = this.getActions(context);
 
             return this.$q.when(
                 (actions && actions.length > 0) ?
-                    actions[0].perform() :
+                    actions[0].perform(flag) :
                     undefined
             );
         };

platform/entanglement/src/services/MoveService.js

@@ -92,7 +92,7 @@ define(
                 .then(function () {
                     return object
                         .getCapability('action')
-                        .perform('remove');
+                        .perform('remove', true);
                 });
         };
 

platform/entanglement/test/services/MoveServiceSpec.js

@@ -224,10 +224,11 @@ define(
                             locationPromise.resolve();
                         });
 
-                        it("removes object from parent", function () {
+                        it("removes object from parent without user warning dialog", function () {
                             expect(actionCapability.perform)
-                                .toHaveBeenCalledWith('remove');
+                                .toHaveBeenCalledWith('remove', true);
                         });
+
                     });
 
                 });
@@ -244,9 +245,9 @@ define(
                             .toHaveBeenCalled();
                     });
 
-                    it("removes object from parent", function () {
+                    it("removes object from parent without user warning dialog", function () {
                         expect(actionCapability.perform)
-                            .toHaveBeenCalledWith('remove');
+                            .toHaveBeenCalledWith('remove', true);
                     });
                 });
 

platform/features/layout/src/FixedController.js

@@ -87,7 +87,8 @@ define(
                 'setDisplayedValue',
                 'subscribeToObject',
                 'unsubscribe',
-                'updateView'
+                'updateView',
+                'setSelection'
             ].forEach(function (name) {
                 self[name] = self[name].bind(self);
             });
@@ -224,7 +225,7 @@ define(
             // Respond to external bounds changes
             this.openmct.time.on("bounds", updateDisplayBounds);
 
-            this.openmct.selection.on('change', this.setSelection.bind(this));
+            this.openmct.selection.on('change', this.setSelection);
             this.$element.on('click', this.bypassSelection.bind(this));
             this.unlisten = this.openmct.objects.observe(this.newDomainObject, '*', function (obj) {
                 this.newDomainObject = JSON.parse(JSON.stringify(obj));
@@ -233,6 +234,9 @@ define(
 
             this.updateElementPositions(this.newDomainObject.layoutGrid);
             refreshElements();
+
+            //force a click, to initialize Fixed Position Controller on SelectionAPI
+            $element[0].click();
         }
 
         FixedController.prototype.updateElementPositions = function (layoutGrid) {

platform/features/my-items/README.md

@@ -0,0 +1,8 @@
+# My Items plugin
+Defines top-level folder named "My Items" to store user-created items. Enabled by default, this can be disabled in a 
+read-only deployment with no user-editable objects.
+
+## Installation
+```js
+openmct.install(openmct.plugins.MyItems());
+```

platform/features/table/res/sass/table.scss

@@ -35,28 +35,30 @@ mct-table {
     }
 
     .mct-table {
+        tr {
+            display: flex; // flex-flow defaults to row nowrap (which is what we want) so no need to define
+            height: 18px; // Needed when a row has empty values in its cells
+            align-items: stretch;
+        }
+
+        td, th {
+            box-sizing: border-box;
+            display: block;
+            flex: 1 0 auto;
+            white-space: nowrap;
+        }
+
         thead {
             display: block;
-            tr {
-                display: block;
-                white-space: nowrap;
-                th {
-                    display: inline-block;
-                    box-sizing: border-box;
-                }
-            }
         }
+
         tbody {
             tr {
                 position: absolute;
-                white-space: nowrap;
-                display: block;
             }
+
             td {
-                white-space: nowrap;
                 overflow: hidden;
-                box-sizing: border-box;
-                display: inline-block;
             }
         }
     }

platform/import-export/README.md

@@ -0,0 +1,14 @@
+# Import / Export Plugin
+The Import/Export plugin allows objects to be exported as JSON files. This allows for sharing of objects between users 
+who are not using a shared persistence store. It also allows object trees to be backed up. Additionally, object trees 
+exported using this tool can then be exposed as read-only static root trees using the 
+[Static Root Plugin](../../src/plugins/staticRootPlugin/README.md).
+
+Upon installation it will add two new context menu actions to allow import and export of objects. Initiating the Export 
+action on an object will produce a JSON file that includes the object and all of its composed children. Selecting Import 
+on an object will allow the user to import a previously exported object tree as a child of the selected object.
+
+## Installation
+```js
+openmct.install(openmct.plugins.ImportExport())
+```

platform/import-export/src/actions/ExportAsJSONAction.js

@@ -133,7 +133,7 @@ define(['lodash'], function (_) {
         copyOfChild.location = parentId;
         parent.composition[index] = copyOfChild.identifier;
         this.tree[newIdString] = copyOfChild;
-        this.tree[parentId].composition[index] = newIdString;
+        this.tree[parentId].composition[index] = copyOfChild.identifier;
 
         return copyOfChild;
     };

platform/import-export/src/actions/ImportAsJSONAction.js

@@ -79,16 +79,18 @@ define(['zepto'], function ($) {
             var parentModel = parent.getModel();
             var newObj;
 
-            seen.push(parent.getId());
+            seen.push(this.getKeyString(parent.getId()));
             parentModel.composition.forEach(function (childId, index) {
-                if (!tree[childId] || seen.includes(childId)) {
+                var childIdString = this.getKeyString(childId);
+                if (!tree[childIdString] || seen.includes(childIdString)) {
                     return;
                 }
 
-                newObj = this.instantiate(tree[childId], childId);
-                parent.getCapability("composition").add(newObj);
-                newObj.getCapability("location")
-                    .setPrimaryLocation(tree[childId].location);
+                newObj = this.instantiate(tree[childIdString], childIdString);
+                // New object has not been persisted yet so clear persisted
+                // timestamp from copied model.
+                delete newObj.getModel().persisted;
+                newObj.getCapability('persistence').persist();
                 this.deepInstantiate(newObj, tree, seen);
             }, this);
         }
@@ -103,6 +105,10 @@ define(['zepto'], function ($) {
         return tree;
     };
 
+    ImportAsJSONAction.prototype.getKeyString = function (identifier) {
+        return this.openmct.objects.makeKeyString(identifier);
+    };
+
     /**
      * Rewrites all instances of a given id in the tree with a newly generated
      * replacement to prevent collision.

platform/import-export/test/actions/ImportAsJSONActionSpec.js

@@ -47,7 +47,12 @@ define(
                 uniqueId = 0;
                 newObjects = [];
                 openmct = {
-                    $injector: jasmine.createSpyObj('$injector', ['get'])
+                    $injector: jasmine.createSpyObj('$injector', ['get']),
+                    objects: {
+                        makeKeyString: function (identifier) {
+                            return identifier.key;
+                        }
+                    }
                 };
                 mockInstantiate = jasmine.createSpy('instantiate').and.callFake(
                     function (model, id) {
@@ -154,7 +159,7 @@ define(
                             body: JSON.stringify({
                                 "openmct": {
                                     "infiniteParent": {
-                                        "composition": ["infinteChild"],
+                                        "composition": [{key: "infinteChild", namespace: ""}],
                                         "name": "1",
                                         "type": "folder",
                                         "modified": 1503598129176,
@@ -162,7 +167,7 @@ define(
                                         "persisted": 1503598129176
                                     },
                                     "infinteChild": {
-                                        "composition": ["infiniteParent"],
+                                        "composition": [{key: "infinteParent", namespace: ""}],
                                         "name": "2",
                                         "type": "folder",
                                         "modified": 1503598132428,

platform/persistence/couch/README.md

@@ -1,2 +1,8 @@
-This bundle implements a connection to an external CouchDB persistence 
-store in Open MCT.
+# Couch DB Persistence Plugin
+An adapter for using CouchDB for persistence of user-created objects. The plugin installation function takes the URL 
+for the CouchDB database as a parameter.
+
+## Installation
+```js
+openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
+```

platform/persistence/elastic/README.md

@@ -1,2 +1,8 @@
-This bundle implements a connection to an external ElasticSearch persistence 
-store in Open MCT.
+# Elasticsearch Persistence Provider
+An adapter for using Elastic for persistence of user-created objects. The installation function takes the URL for an 
+Elasticsearch server as a parameter.
+
+## Installation
+```js
+openmct.install(openmct.plugins.Elasticsearch('http://localhost:9200'))
+```

platform/persistence/local/README.md

@@ -0,0 +1,9 @@
+# Local Storage Plugin
+Provides persistence of user-created objects in browser Local Storage. Objects persisted in this way will only be 
+available from the browser and machine on which they were persisted. For shared persistence, consider the 
+[Elasticsearch](../elastic/) and [CouchDB](../couch/) persistence plugins.
+
+## Installation
+```js
+openmct.install(openmct.plugins.LocalStorage());
+```

scripts/migrate-for-jshint.js

@@ -1,49 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-// Converts all templateUrl references in bundle.js files to
-// plain template references, loading said templates with the
-// RequireJS text plugin.
-
-var glob = require('glob'),
-    fs = require('fs');
-
-function migrate(file) {
-    var sourceCode = fs.readFileSync(file, 'utf8'),
-        lines = sourceCode.split('\n')
-            .filter(function (line) {
-                return !(/^\W*['"]use strict['"];\W*$/.test(line));
-            })
-            .filter(function (line) {
-                return line.indexOf("/*global") !== 0;
-            });
-    fs.writeFileSync(file, lines.join('\n'));
-}
-
-glob('@(src|platform)/**/*.js', {}, function (err, files) {
-    if (err) {
-        console.log(err);
-        return;
-    }
-
-    files.forEach(migrate);
-});

scripts/migrate-templates.js

@@ -1,106 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-// Converts all templateUrl references in bundle.js files to
-// plain template references, loading said templates with the
-// RequireJS text plugin.
-
-var glob = require('glob'),
-    fs = require('fs'),
-    path = require('path'),
-    _ = require('lodash');
-
-function toTemplateName(templateUrl) {
-    var parts = templateUrl.split('/');
-    return _.camelCase(parts[parts.length - 1].replace(".html", "")) +
-            "Template";
-}
-
-function getTemplateUrl(sourceLine) {
-    return _.trim(sourceLine.split(":")[1], "\", ");
-}
-
-function hasTemplateUrl(sourceLine) {
-    return sourceLine.indexOf("templateUrl") !== -1;
-}
-
-function findTemplateURLs(sourceCode) {
-    return sourceCode.split('\n')
-        .map(_.trim)
-        .filter(hasTemplateUrl)
-        .map(getTemplateUrl);
-}
-
-function injectRequireArgument(sourceCode, templateUrls) {
-    var lines = sourceCode.split('\n'),
-        index;
-
-    templateUrls = _.uniq(templateUrls);
-
-    // Add arguments for source paths...
-    index = lines.map(_.trim).indexOf("'legacyRegistry'");
-    lines = lines.slice(0, index).concat(templateUrls.map(function (url) {
-        return "    \"text!./res/" + url + "\",";
-    }).concat(lines.slice(index)));
-
-    /// ...and for arguments
-    index = lines.map(_.trim).indexOf("legacyRegistry");
-    lines = lines.slice(0, index).concat(templateUrls.map(function (url) {
-        return "    " + toTemplateName(url) + ",";
-    }).concat(lines.slice(index)));
-
-    return lines.join('\n');
-}
-
-function rewriteUrl(sourceLine) {
-    return [
-        sourceLine.substring(0, sourceLine.indexOf(sourceLine.trim())),
-        "\"template\": " + toTemplateName(getTemplateUrl(sourceLine)),
-        _.endsWith(sourceLine, ",") ? "," : ""
-    ].join('');
-}
-
-function rewriteLine(sourceLine) {
-    return hasTemplateUrl(sourceLine) ?
-        rewriteUrl(sourceLine.replace("templateUrl", "template")) :
-        sourceLine;
-}
-
-function rewriteTemplateUrls(sourceCode) {
-    return sourceCode.split('\n').map(rewriteLine).join('\n');
-}
-
-function migrate(file) {
-    var sourceCode = fs.readFileSync(file, 'utf8');
-    fs.writeFileSync(file, rewriteTemplateUrls(
-        injectRequireArgument(sourceCode, findTemplateURLs(sourceCode))
-    ), 'utf8');
-}
-
-glob('platform/**/bundle.js', {}, function (err, files) {
-    if (err) {
-        console.log(err);
-        return;
-    }
-
-    files.forEach(migrate);
-});

scripts/rebundle-template.txt

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

scripts/rebundle.js

@@ -1,72 +0,0 @@
-// Temporary utility script to rewrite bundle.json
-// files as bundle.js files.
-
-var glob = require('glob'),
-    fs = require('fs'),
-    path = require('path'),
-    _ = require('lodash'),
-    template = _.template(
-        fs.readFileSync(path.resolve(__dirname, 'rebundle-template.txt'), 'utf8')
-    );
-
-function indent(str, depth) {
-    return _.trimLeft(str.split('\n').map(function (line) {
-        return _.repeat('    ', depth || 1) + line;
-    }).filter(function (line) {
-        return line.trim().length > 0;
-    }).join('\n'));
-}
-
-function findImpls(bundleContents) {
-    return _(bundleContents.extensions || {})
-        .map()
-        .flatten()
-        .pluck('implementation')
-        .filter()
-        .uniq()
-        .value();
-}
-
-function toIdentifier(impl) {
-    var parts = impl.replace(".js", "").split('/');
-    return parts[parts.length - 1];
-}
-
-function toPath(impl) {
-    return "\"./src/" + impl.replace(".js", "") + "\"";
-}
-
-function replaceImpls(bundleText) {
-    var rx = /"implementation": "([^"]*)"/;
-    return bundleText.split('\n').map(function (line) {
-        var m = line.match(rx);
-        return m !== null ?
-                line.replace(rx, '"implementation": ' + toIdentifier(m[1])) :
-                line;
-    }).join('\n');
-}
-
-function rebundle(file) {
-    var plainJson = fs.readFileSync(file, 'utf8'),
-        bundleContents = JSON.parse(plainJson),
-        impls = findImpls(bundleContents),
-        bundleName = file.replace("/bundle.json", ""),
-        outputFile = file.replace(".json", ".js"),
-        contents = template({
-            bundleName: bundleName,
-            implPaths: indent(impls.map(toPath).concat([""]).join(",\n")),
-            implNames: indent(impls.map(toIdentifier).concat([""]).join(",\n")),
-            bundleContents: indent(replaceImpls(JSON.stringify(bundleContents, null, 4)))
-        });
-    fs.writeFileSync(outputFile, contents, 'utf8');
-}
-
-glob('**/bundle.json', {}, function (err, files) {
-    if (err) {
-        console.log(err);
-        return;
-    }
-
-    files.forEach(rebundle);
-});
-

src/api/composition/CompositionCollection.js

@@ -177,7 +177,15 @@ define([
     CompositionCollection.prototype.load = function () {
         return this.provider.load(this.domainObject)
             .then(function (children) {
-                return Promise.all(children.map(this.onProviderAdd, this));
+                return Promise.all(children.map(function (c) {
+                    return this.publicAPI.objects.get(c);
+                }, this));
+            }.bind(this))
+            .then(function (childObjects) {
+                childObjects.forEach(function (c) {
+                    this.add(c, true);
+                }, this);
+                return childObjects;
             }.bind(this))
             .then(function (children) {
                 this.emit('load');

src/plugins/URLIndicatorPlugin/README.md

@@ -0,0 +1,21 @@
+# URL Indicator
+Adds an indicator which shows the availability of a URL, with success based on receipt of a 200 HTTP code. Can be used 
+for monitoring the availability of web services.
+
+## Installation
+```js
+openmct.install(openmct.plugins.URLIndicator({
+  url: 'http://localhost:8080',
+    iconClass: 'check',
+    interval: 10000,
+    label: 'Localhost'
+ })
+);
+```
+
+## Options
+* __url__: URL to indicate the status of
+* __iconClass__: Icon to show in the status bar, defaults to icon-database. See the [Style Guide](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home/glyphs?view=styleguide.glyphs) for more icon options.
+* __interval__: Interval between checking the connection, defaults to 10000
+* __label__: Name showing up as text in the status bar, defaults to url
+

src/plugins/autoflow/AutoflowTabularPlugin.js

@@ -25,15 +25,6 @@ define([
 ], function (
     AutoflowTabularView
 ) {
-    /**
-     * This plugin provides an Autoflow Tabular View for domain objects
-     * in Open MCT.
-     *
-     * @param {Object} options
-     * @param {String} [options.type] the domain object type for which
-     *        this view should be available; if omitted, this view will
-     *        be available for all objects
-     */
     return function (options) {
         return function (openmct) {
             var views = (openmct.mainViews || openmct.objectViews);

src/plugins/autoflow/README.md

@@ -0,0 +1,15 @@
+# Autoflow View
+
+This plugin provides the Autoflow View for domain objects in Open MCT. This view allows users to visualize the latest 
+values of a collection of telemetry points in a condensed list.
+
+## Installation
+``` js
+    openmct.install(openmct.plugins.AutoflowView({
+        type: "telemetry.fixed"
+    }));
+```
+
+## Options
+* `type`: The object type to add the Autoflow View to. Currently supports a single value. If not provided, will make the 
+Autoflow view available for all objects (which is probably not what you want).

src/plugins/plot/README.md

@@ -0,0 +1,10 @@
+# Plot Plugin
+
+Enables plot visualization of telemetry data. This plugin adds a plot view that is available from the view switcher for 
+all telemetry objects. Two user createble objects are also added by this plugin, for Overlay and Stacked Plots. 
+Telemetry objects can be added to Overlay and Stacked Plots via drag and drop.
+
+## Installation
+``` js
+openmct.install(openmct.plugins.Plot());
+```

src/plugins/plot/res/templates/mct-plot.html

@@ -193,7 +193,7 @@
                               left: (100 * (tick.value - min) / interval) + '%'
                           }"
                           ng-title=":: tick.fullText || tick.text">
-                         {{:: tick.text | reverse}}
+                         {{:: tick.text }}
                      </div>
                 </mct-ticks>
 

src/plugins/plot/src/inspector/PlotYAxisFormController.js

@@ -46,7 +46,7 @@ define([
             },
             {
                 modelProp: 'range',
-                objectPath: 'form.yAxis.range',
+                objectPath: 'configuration.yAxis.range',
                 coerce: function coerceRange(range) {
                     if (!range) {
                         return {

src/plugins/staticRootPlugin/README.md

@@ -0,0 +1,19 @@
+# Static Root Plugin
+
+This plugin takes an object tree as JSON and exposes it as a non-editable root level tree. This can be useful if you 
+have static non-editable content that you wish to expose, such as a standard set of displays that should not be edited 
+(but which can be copied and then modified if desired).
+
+Any object tree in Open MCT can be exported as JSON after installing the 
+[Import/Export plugin](../../../platform/import-export/README.md).
+
+## Installation
+``` js
+openmct.install(openmct.plugins.StaticRootPlugin('mission', 'data/static-objects.json'));
+```
+
+## Parameters
+The StaticRootPlugin takes two parameters:
+1. __namespace__: This should be a name that uniquely identifies this collection of objects.
+2. __path__: The file that the static tree should be exposed from. This will need to be a path that is reachable by a web 
+browser, ie not a path on the local file system.

src/plugins/summaryWidget/README.md

@@ -0,0 +1,10 @@
+# Summary Widget Plugin
+Summary widgets can be used to provide visual indication of state based on telemetry data. They allow rules to be 
+defined that can then be used to change the appearance of the summary widget element based on data. For example, a 
+summary widget could be defined that is green when a temparature reading is between `0` and `100` centigrade, red when 
+it's above `100`, and orange when it's below `0`.
+
+## Installation
+```js
+openmct.install(openmct.plugins.SummaryWidget());
+```

test-main.js

@@ -67,14 +67,14 @@ requirejs.config({
         "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/build/d3-axis.min",
-        "d3-array": "node_modules/d3-array/build/d3-array.min",
-        "d3-collection": "node_modules/d3-collection/build/d3-collection.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/build/d3-time.min",
-        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.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"