Fixes for NIRVSS UI spectral plot view

- Fixed Plotly axis label title font sizing; - Fixed Plotly axis vertical line color; - Removed styling that caused `c-button` within `h-local-controls--overlay-content` to be background on background color;
Version 1.3.0 snapshot (#3307 )
2020-08-19 17:52:26 -07:00 · 2020-08-18 12:19:49 -07:00 · 2020-08-14 10:09:35 -07:00 · 2020-08-13 13:31:08 -07:00 · 2020-08-13 09:52:35 -07:00 · 2020-08-11 13:19:38 -07:00
311 changed files with 2415 additions and 2082 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -120,6 +120,38 @@ module.exports = {
        "no-useless-computed-key": "error",
        // https://eslint.org/docs/rules/rest-spread-spacing
        "rest-spread-spacing": ["error"],
+        // https://eslint.org/docs/rules/no-var
+        "no-var": "error",
+        // https://eslint.org/docs/rules/one-var
+        "one-var": ["error", "never"],
+        // https://eslint.org/docs/rules/default-case-last
+        "default-case-last": "error",
+        // https://eslint.org/docs/rules/default-param-last
+        "default-param-last": "error",
+        // https://eslint.org/docs/rules/grouped-accessor-pairs
+        "grouped-accessor-pairs": "error",
+        // https://eslint.org/docs/rules/no-constructor-return
+        "no-constructor-return": "error",
+        // https://eslint.org/docs/rules/array-callback-return
+        "array-callback-return": "error",
+        // https://eslint.org/docs/rules/no-invalid-this
+        "no-invalid-this": "error", // Believe this one actually surfaces some bugs
+        // https://eslint.org/docs/rules/func-style
+        "func-style": ["error", "declaration"],
+        // https://eslint.org/docs/rules/no-unused-expressions
+        "no-unused-expressions": "error",
+        // https://eslint.org/docs/rules/no-useless-concat
+        "no-useless-concat": "error",
+        // https://eslint.org/docs/rules/radix
+        "radix": "error",
+        // https://eslint.org/docs/rules/require-await
+        "require-await": "error",
+        // https://eslint.org/docs/rules/no-alert
+        "no-alert": "error",
+        // https://eslint.org/docs/rules/no-useless-constructor
+        "no-useless-constructor": "error",
+        // https://eslint.org/docs/rules/no-duplicate-imports
+        "no-duplicate-imports": "error",

        // https://eslint.org/docs/rules/no-implicit-coercion
        "no-implicit-coercion": "error",
@@ -204,28 +236,24 @@ module.exports = {
            }
        }],
        "vue/multiline-html-element-content-newline": "off",
-        "vue/singleline-html-element-content-newline": "off"
+        "vue/singleline-html-element-content-newline": "off",
+
    },
    "overrides": [
        {
-            "files": ["*Spec.js"],
+            "files": LEGACY_FILES,
            "rules": {
                "no-unused-vars": [
                    "warn",
                    {
                        "vars": "all",
                        "args": "none",
-                        "varsIgnorePattern": "controller",
-
+                        "varsIgnorePattern": "controller"
                    }
-                ]
-            }
-        }, {
-            "files": LEGACY_FILES,
-            "rules": {
-                // https://eslint.org/docs/rules/no-nested-ternary
+                ],
                "no-nested-ternary": "off",
-                "no-var": "off"
+                "no-var": "off",
+                "one-var": "off"
            }
        }
    ]
--- a/example/eventGenerator/bundle.js
+++ b/example/eventGenerator/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/EventTelemetryProvider"
--- a/example/eventGenerator/src/EventTelemetry.js
+++ b/example/eventGenerator/src/EventTelemetry.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define */

 /**
 * Module defining EventTelemetry.
--- a/example/eventGenerator/src/EventTelemetryProvider.js
+++ b/example/eventGenerator/src/EventTelemetryProvider.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,Promise*/

 /**
 * Module defining EventTelemetryProvider. Created by chacskaylo on 06/18/2015.
--- a/example/export/ExportTelemetryAsCSVAction.js
+++ b/example/export/ExportTelemetryAsCSVAction.js
@@ -19,7 +19,6 @@
 * 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';
--- a/example/export/bundle.js
+++ b/example/export/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    './ExportTelemetryAsCSVAction'
--- a/example/forms/bundle.js
+++ b/example/forms/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/ExampleFormController"
--- a/example/forms/src/ExampleFormController.js
+++ b/example/forms/src/ExampleFormController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,window*/

 define(
    [],
@@ -80,7 +79,7 @@ define(
                                control: "button",
                                csslass: "icon-save",
                                click: function () {
-                                    window.alert("Save");
+                                    console.log("Save");
                                }
                            },
                            {
@@ -88,7 +87,7 @@ define(
                                csslass: "icon-x",
                                description: "Button B",
                                click: function () {
-                                    window.alert("Cancel");
+                                    console.log("Cancel");
                                }
                            },
                            {
@@ -97,7 +96,7 @@ define(
                                description: "Button C",
                                disabled: true,
                                click: function () {
-                                    window.alert("Delete");
+                                    console.log("Delete");
                                }
                            }
                        ]
--- a/example/generator/GeneratorMetadataProvider.js
+++ b/example/generator/GeneratorMetadataProvider.js
@@ -117,7 +117,7 @@ define([
    }

    GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
+        return Object.prototype.hasOwnProperty.call(METADATA_BY_TYPE, domainObject.type);
    };

    GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@@ -62,15 +62,15 @@ define([
        var workerRequest = {};

        props.forEach(function (prop) {
-            if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
+            if (domainObject.telemetry && Object.prototype.hasOwnProperty.call(domainObject.telemetry, prop)) {
                workerRequest[prop] = domainObject.telemetry[prop];
            }

-            if (request && request.hasOwnProperty(prop)) {
+            if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
                workerRequest[prop] = request[prop];
            }

-            if (!workerRequest.hasOwnProperty(prop)) {
+            if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
                workerRequest[prop] = REQUEST_DEFAULTS[prop];
            }

--- a/example/generator/SinewaveLimitProvider.js
+++ b/example/generator/SinewaveLimitProvider.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([

--- a/example/generator/WorkerInterface.js
+++ b/example/generator/WorkerInterface.js
@@ -72,6 +72,7 @@ define([
        });
        var messageId;

+        let self = this;
        function callback(message) {
            if (message.error) {
                deferred.reject(message.error);
@@ -79,7 +80,8 @@ define([
                deferred.resolve(message.data);
            }

-            delete this.callbacks[messageId];
+            delete self.callbacks[messageId];
+
        }

        messageId = this.dispatch('request', request, callback.bind(this));
--- a/example/generator/generatorWorker.js
+++ b/example/generator/generatorWorker.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global self*/
-
 (function () {

    var FIFTEEN_MINUTES = 15 * 60 * 1000;
--- a/example/generator/plugin.js
+++ b/example/generator/plugin.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./GeneratorProvider",
--- a/example/identity/bundle.js
+++ b/example/identity/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/ExampleIdentityService"
--- a/example/identity/src/ExampleIdentityService.js
+++ b/example/identity/src/ExampleIdentityService.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    function () {
--- a/example/mobile/bundle.js
+++ b/example/mobile/bundle.js
@@ -19,7 +19,6 @@
 * 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";
--- a/example/msl/bundle.js
+++ b/example/msl/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/RemsTelemetryServerAdapter",
--- a/example/msl/src/MSLDataDictionary.js
+++ b/example/msl/src/MSLDataDictionary.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/example/msl/src/RemsTelemetryModelProvider.js
+++ b/example/msl/src/RemsTelemetryModelProvider.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    function () {
--- a/example/msl/src/RemsTelemetryProvider.js
+++ b/example/msl/src/RemsTelemetryProvider.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define */
 define (
    ['./RemsTelemetrySeries'],
    function (RemsTelemetrySeries) {
--- a/example/msl/src/RemsTelemetrySeries.js
+++ b/example/msl/src/RemsTelemetrySeries.js
@@ -19,7 +19,6 @@
 * 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";
--- a/example/msl/src/RemsTelemetryServerAdapter.js
+++ b/example/msl/src/RemsTelemetryServerAdapter.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/
 /*jslint es5: true */

 define(
--- a/example/notifications/bundle.js
+++ b/example/notifications/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/DialogLaunchController",
--- a/example/notifications/src/DialogLaunchController.js
+++ b/example/notifications/src/DialogLaunchController.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/example/notifications/src/DialogLaunchIndicator.js
+++ b/example/notifications/src/DialogLaunchIndicator.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,window*/

 define(
    [],
--- a/example/notifications/src/NotificationLaunchController.js
+++ b/example/notifications/src/NotificationLaunchController.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/example/notifications/src/NotificationLaunchIndicator.js
+++ b/example/notifications/src/NotificationLaunchIndicator.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,window*/

 define(
    [],
--- a/example/persistence/bundle.js
+++ b/example/persistence/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/BrowserPersistenceProvider"
--- a/example/persistence/src/BrowserPersistenceProvider.js
+++ b/example/persistence/src/BrowserPersistenceProvider.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 /**
 * Stubbed implementation of a persistence provider,
--- a/example/policy/bundle.js
+++ b/example/policy/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/ExamplePolicy"
--- a/example/policy/src/ExamplePolicy.js
+++ b/example/policy/src/ExamplePolicy.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/example/profiling/bundle.js
+++ b/example/profiling/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/WatchIndicator",
--- a/example/profiling/src/DigestIndicator.js
+++ b/example/profiling/src/DigestIndicator.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/example/profiling/src/WatchIndicator.js
+++ b/example/profiling/src/WatchIndicator.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/example/scratchpad/bundle.js
+++ b/example/scratchpad/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/ScratchPersistenceProvider"
--- a/example/scratchpad/src/ScratchPersistenceProvider.js
+++ b/example/scratchpad/src/ScratchPersistenceProvider.js
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global define,window*/
-
 define(
    [],
    function () {
--- a/example/styleguide/src/ExampleStyleGuideModelProvider.js
+++ b/example/styleguide/src/ExampleStyleGuideModelProvider.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/openmct.js
+++ b/openmct.js
@@ -32,6 +32,6 @@ if (document.currentScript) {

 const MCT = require('./src/MCT');

-var openmct = new MCT();
+const openmct = new MCT();

 module.exports = openmct;
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
  "name": "openmct",
-  "version": "1.0.0-snapshot",
+  "version": "1.3.0-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
    "angular": ">=1.8.0",
    "angular-route": "1.4.14",
-    "babel-eslint": "8.2.6",
+    "babel-eslint": "10.0.3",
    "comma-separated-values": "^3.6.4",
    "concurrently": "^3.6.1",
    "copy-webpack-plugin": "^4.5.2",
@@ -22,7 +22,7 @@
    "d3-selection": "1.3.x",
    "d3-time": "1.0.x",
    "d3-time-format": "2.1.x",
-    "eslint": "5.2.0",
+    "eslint": "7.0.0",
    "eslint-plugin-vue": "^6.0.0",
    "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
    "eventemitter3": "^1.2.0",
@@ -54,12 +54,12 @@
    "markdown-toc": "^0.11.7",
    "marked": "^0.3.5",
    "mini-css-extract-plugin": "^0.4.1",
-    "minimist": "^1.1.1",
+    "minimist": "^1.2.5",
    "moment": "2.25.3",
    "moment-duration-format": "^2.2.2",
    "moment-timezone": "0.5.28",
    "node-bourbon": "^4.2.3",
-    "node-sass": "^4.9.2",
+    "node-sass": "^4.14.1",
    "painterro": "^1.0.35",
    "printj": "^1.2.1",
    "raw-loader": "^0.5.1",
--- a/platform/commonUI/about/test/AboutControllerSpec.js
+++ b/platform/commonUI/about/test/AboutControllerSpec.js
@@ -25,9 +25,9 @@ define(
    function (AboutController) {

        describe("The About controller", function () {
-            var testVersions,
-                mockWindow,
-                controller;
+            let testVersions;
+            let mockWindow;
+            let controller;

            beforeEach(function () {
                testVersions = [
@@ -56,7 +56,6 @@ define(
                controller.openLicenses();
                expect(mockWindow.open).toHaveBeenCalledWith("#/licenses");
            });
-
        });

    }
--- a/platform/commonUI/edit/src/actions/SaveAsAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAsAction.js
@@ -164,7 +164,7 @@ function (
        }

        function saveAfterClone(clonedObject) {
-            return this.openmct.editor.save().then(() => {
+            return self.openmct.editor.save().then(() => {
                // Force mutation for search indexing
                return clonedObject;
            });
--- a/platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    ['./TransactionalPersistenceCapability'],
--- a/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define(
    [],
--- a/platform/commonUI/edit/src/creation/CreateWizard.js
+++ b/platform/commonUI/edit/src/creation/CreateWizard.js
@@ -56,10 +56,11 @@ define(
         */
        CreateWizard.prototype.getFormStructure = function (includeLocation) {
            var sections = [],
-                domainObject = this.domainObject;
+                domainObject = this.domainObject,
+                self = this;

            function validateLocation(parent) {
-                return parent && this.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
+                return parent && self.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
            }

            sections.push({
--- a/platform/commonUI/edit/src/services/TransactionService.js
+++ b/platform/commonUI/edit/src/services/TransactionService.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/
 define(
    ['./Transaction', './NestedTransaction'],
    function (Transaction, NestedTransaction) {
--- a/platform/commonUI/edit/test/actions/SaveActionSpec.js
+++ b/platform/commonUI/edit/test/actions/SaveActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/

 define(
    ["../../src/actions/SaveAction"],
--- a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js
+++ b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/

 define(
    ["../../src/actions/SaveAndStopEditingAction"],
--- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js
+++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine,spyOn*/

 define(
    ["../../src/actions/SaveAsAction"],
--- a/platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js
+++ b/platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/

 define(
    [
--- a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
+++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/

 define(
    ["../../src/controllers/EditActionController"],
--- a/platform/commonUI/edit/test/services/NestedTransactionSpec.js
+++ b/platform/commonUI/edit/test/services/NestedTransactionSpec.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/

 define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
    var TRANSACTION_METHODS = ['add', 'commit', 'cancel', 'size'];
--- a/platform/commonUI/edit/test/services/TransactionManagerSpec.js
+++ b/platform/commonUI/edit/test/services/TransactionManagerSpec.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/

 define(
    ["../../src/services/TransactionManager"],
--- a/platform/commonUI/edit/test/services/TransactionServiceSpec.js
+++ b/platform/commonUI/edit/test/services/TransactionServiceSpec.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/

 define(
    ["../../src/services/TransactionService"],
--- a/platform/commonUI/edit/test/services/TransactionSpec.js
+++ b/platform/commonUI/edit/test/services/TransactionSpec.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/

 define(
    ["../../src/services/Transaction"],
--- a/platform/commonUI/general/src/directives/MCTSelectable.js
+++ b/platform/commonUI/general/src/directives/MCTSelectable.js
@@ -58,7 +58,8 @@ define(
                    var removeSelectable = openmct.selection.selectable(
                        element[0],
                        scope.$eval(attrs.mctSelectable),
-                        attrs.hasOwnProperty('mctInitSelect') && scope.$eval(attrs.mctInitSelect) !== false
+                        Object.prototype.hasOwnProperty.call(attrs, 'mctInitSelect')
+                        && scope.$eval(attrs.mctInitSelect) !== false
                    );

                    scope.$on("$destroy", function () {
--- a/platform/commonUI/general/src/services/UrlService.js
+++ b/platform/commonUI/general/src/services/UrlService.js
@@ -76,7 +76,7 @@ define(
            var search = this.$location.search(),
                arr = [];
            for (var key in search) {
-                if (search.hasOwnProperty(key)) {
+                if (Object.prototype.hasOwnProperty.call(search, key)) {
                    arr.push(key + '=' + search[key]);
                }
            }
--- a/platform/commonUI/general/test/directives/MCTTreeSpec.js
+++ b/platform/commonUI/general/test/directives/MCTTreeSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/* global console*/

 define([
    '../../src/directives/MCTTree',
--- a/platform/commonUI/general/test/ui/TreeViewSpec.js
+++ b/platform/commonUI/general/test/ui/TreeViewSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global describe,beforeEach,jasmine,it,expect*/

 define([
    '../../src/ui/TreeView',
--- a/platform/commonUI/notification/src/NotificationService.js
+++ b/platform/commonUI/notification/src/NotificationService.js
@@ -27,7 +27,7 @@ export default class NotificationService {
        if (typeof message === 'string') {
            return this.openmct.notifications.info(message);
        } else {
-            if (message.hasOwnProperty('progress')) {
+            if (Object.prototype.hasOwnProperty.call(message, 'progress')) {
                return this.openmct.notifications.progress(message.title, message.progress, message.progressText);
            } else {
                return this.openmct.notifications.info(message.title);
--- a/platform/core/src/models/ModelCacheService.js
+++ b/platform/core/src/models/ModelCacheService.js
@@ -56,7 +56,7 @@ define([], function () {
     * @returns {boolean} true if present; false if not
     */
    ModelCacheService.prototype.has = function (id) {
-        return this.cache.hasOwnProperty(id);
+        return Object.prototype.hasOwnProperty.call(this.cache, id);
    };

    /**
--- a/platform/core/src/runs/TransactingMutationListener.js
+++ b/platform/core/src/runs/TransactingMutationListener.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([], function () {

--- a/platform/core/src/types/MergeModels.js
+++ b/platform/core/src/types/MergeModels.js
@@ -75,13 +75,13 @@ define(
            function mergeObjects(a, b) {
                var result = {};
                Object.keys(a).forEach(function (k) {
-                    result[k] = b.hasOwnProperty(k)
+                    result[k] = Object.prototype.hasOwnProperty.call(b, k)
                        ? mergeModels(a[k], b[k], (merger || {})[k])
                        : a[k];
                });
                Object.keys(b).forEach(function (k) {
                    // Copy any properties not already merged
-                    if (!a.hasOwnProperty(k)) {
+                    if (!Object.prototype.hasOwnProperty.call(a, k)) {
                        result[k] = b[k];
                    }
                });
--- a/platform/entanglement/test/ControlledPromise.js
+++ b/platform/entanglement/test/ControlledPromise.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global spyOn*/
+
 define(
    function () {

--- a/platform/entanglement/test/DomainObjectFactory.js
+++ b/platform/entanglement/test/DomainObjectFactory.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -20,7 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global jasmine*/
 define(
    function () {

@@ -110,7 +109,7 @@ define(
             * @returns {*} capability object
             */
            domainObject.getCapability.and.callFake(function (capability) {
-                if (config.capabilities.hasOwnProperty(capability)) {
+                if (Object.prototype.hasOwnProperty.call(config.capabilities, capability)) {
                    return config.capabilities[capability];
                }
            });
@@ -124,7 +123,7 @@ define(
             * @returns {boolean}
             */
            domainObject.hasCapability.and.callFake(function (capability) {
-                return config.capabilities.hasOwnProperty(capability);
+                return Object.prototype.hasOwnProperty.call(config.capabilities, capability);
            });

            /**
@@ -137,7 +136,7 @@ define(
             * @returns {*} result whatever was returned by `invoke`.
             */
            domainObject.useCapability.and.callFake(function (capability) {
-                if (config.capabilities.hasOwnProperty(capability)) {
+                if (Object.prototype.hasOwnProperty.call(config.capabilities, capability)) {
                    if (!config.capabilities[capability].invoke) {
                        throw new Error(
                            capability + ' missing invoke function.'
--- a/platform/entanglement/test/services/MockCopyService.js
+++ b/platform/entanglement/test/services/MockCopyService.js
@@ -20,7 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global jasmine*/
 define(
    function () {

@@ -60,7 +59,7 @@ define(
                ]
            );

-            mockCopyService.perform.and.callFake(function () {
+            mockCopyService.perform.and.callFake(() => {
                var performPromise,
                    callExtensions,
                    spy;
@@ -79,7 +78,7 @@ define(
                    }
                };

-                spy = this.perform;
+                spy = mockCopyService.perform;

                Object.keys(callExtensions).forEach(function (key) {
                    spy.calls.mostRecent()[key] = callExtensions[key];
--- a/platform/entanglement/test/services/MockLinkService.js
+++ b/platform/entanglement/test/services/MockLinkService.js
@@ -20,7 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global jasmine*/
 define(
    [
        '../ControlledPromise'
@@ -63,11 +62,11 @@ define(
                ]
            );

-            mockLinkService.perform.and.callFake(function (object) {
+            mockLinkService.perform.and.callFake(object => {
                var performPromise = new ControlledPromise();

-                this.perform.calls.mostRecent().promise = performPromise;
-                this.perform.calls.all()[this.perform.calls.count() - 1].promise =
+                mockLinkService.perform.calls.mostRecent().promise = performPromise;
+                mockLinkService.perform.calls.all()[mockLinkService.perform.calls.count() - 1].promise =
                    performPromise;

                return performPromise.then(function (overrideObject) {
--- a/platform/entanglement/test/services/MockMoveService.js
+++ b/platform/entanglement/test/services/MockMoveService.js
@@ -20,7 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global jasmine*/
 define(
    function () {

@@ -60,7 +59,7 @@ define(
                ]
            );

-            mockMoveService.perform.and.callFake(function () {
+            mockMoveService.perform.and.callFake(() => {
                var performPromise,
                    callExtensions,
                    spy;
@@ -79,7 +78,7 @@ define(
                    }
                };

-                spy = this.perform;
+                spy = mockMoveService.perform;

                Object.keys(callExtensions).forEach(function (key) {
                    spy.calls.mostRecent()[key] = callExtensions[key];
--- a/platform/forms/src/FileInputService.js
+++ b/platform/forms/src/FileInputService.js
@@ -47,6 +47,7 @@ define(["zepto"], function ($) {
        return new Promise(function (resolve, reject) {
            input.trigger("click");
            input.on('change', function (event) {
+                // eslint-disable-next-line no-invalid-this
                file = this.files[0];
                input.remove();
                if (file) {
--- a/platform/framework/src/FrameworkLayer.js
+++ b/platform/framework/src/FrameworkLayer.js
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global window*/
-
 define([
    './Constants',
    './FrameworkInitializer',
--- a/platform/framework/src/Main.js
+++ b/platform/framework/src/Main.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global window*/
-
 /**
 * Implements the framework layer, which handles the loading of bundles
 * and the wiring-together of the extensions they expose.
--- a/platform/framework/src/register/CustomRegistrars.js
+++ b/platform/framework/src/register/CustomRegistrars.js
@@ -19,6 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+/* eslint-disable no-invalid-this */

 /**
 * Module defining CustomRegistrars. Created by vwoeltje on 11/3/14.
--- a/platform/import-export/bundle.js
+++ b/platform/import-export/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    "./src/actions/ExportAsJSONAction",
--- a/platform/import-export/src/actions/ExportAsJSONAction.js
+++ b/platform/import-export/src/actions/ExportAsJSONAction.js
@@ -86,7 +86,7 @@ define(['lodash'], function (_) {
                        // Only export if object is creatable
                        if (this.isCreatable(child)) {
                            // Prevents infinite export of self-contained objs
-                            if (!this.tree.hasOwnProperty(this.getId(child))) {
+                            if (!Object.prototype.hasOwnProperty.call(this.tree, this.getId(child))) {
                                // If object is a link to something absent from
                                // tree, generate new id and treat as new object
                                if (this.isExternal(child, parent)) {
--- a/platform/import-export/test/actions/ExportAsJSONActionSpec.js
+++ b/platform/import-export/test/actions/ExportAsJSONActionSpec.js
@@ -144,7 +144,7 @@ define(
                    setTimeout(resolve, 100);
                }).then(function () {
                    expect(Object.keys(action.tree).length).toBe(1);
-                    expect(action.tree.hasOwnProperty("parentId"))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "parentId"))
                        .toBeTruthy();
                });
            });
@@ -184,9 +184,9 @@ define(
                    setTimeout(resolve, 100);
                }).then(function () {
                    expect(Object.keys(action.tree).length).toBe(2);
-                    expect(action.tree.hasOwnProperty("infiniteParentId"))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "infiniteParentId"))
                        .toBeTruthy();
-                    expect(action.tree.hasOwnProperty("infiniteChildId"))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "infiniteChildId"))
                        .toBeTruthy();
                });
            });
@@ -224,9 +224,9 @@ define(
                    setTimeout(resolve, 100);
                }).then(function () {
                    expect(Object.keys(action.tree).length).toBe(2);
-                    expect(action.tree.hasOwnProperty('parentId'))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "parentId"))
                        .toBeTruthy();
-                    expect(action.tree.hasOwnProperty('brandNewId'))
+                    expect(Object.prototype.hasOwnProperty.call(action.tree, "brandNewId"))
                        .toBeTruthy();
                    expect(action.tree.brandNewId.location).toBe('parentId');
                });
@@ -239,8 +239,8 @@ define(
                    setTimeout(resolve, 100);
                }).then(function () {
                    expect(Object.keys(exportedTree).length).toBe(2);
-                    expect(exportedTree.hasOwnProperty('openmct')).toBeTruthy();
-                    expect(exportedTree.hasOwnProperty('rootId')).toBeTruthy();
+                    expect(Object.prototype.hasOwnProperty.call(exportedTree, "openmct")).toBeTruthy();
+                    expect(Object.prototype.hasOwnProperty.call(exportedTree, "rootId")).toBeTruthy();
                });
            });

--- a/platform/search/src/services/BareBonesSearchWorker.js
+++ b/platform/search/src/services/BareBonesSearchWorker.js
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global self*/
-
 /**
 * Module defining BareBonesSearchWorker. Created by deeptailor on 10/03/2019.
 */
--- a/platform/search/src/services/GenericSearchProvider.js
+++ b/platform/search/src/services/GenericSearchProvider.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global setTimeout*/

 /**
 * Module defining GenericSearchProvider. Created by shale on 07/16/2015.
--- a/platform/search/src/services/GenericSearchWorker.js
+++ b/platform/search/src/services/GenericSearchWorker.js
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global self*/
-
 /**
 * Module defining GenericSearchWorker. Created by shale on 07/21/2015.
 */
--- a/platform/search/test/services/GenericSearchWorkerSpec.js
+++ b/platform/search/test/services/GenericSearchWorkerSpec.js
@@ -20,8 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global require*/
-
 /**
 *  SearchSpec. Created by shale on 07/31/2015.
 */
--- a/platform/search/test/services/SearchAggregatorSpec.js
+++ b/platform/search/test/services/SearchAggregatorSpec.js
@@ -91,18 +91,19 @@ define([
        });

        it('filters results with a function', function () {
-            var modelResults = {
-                    hits: [
-                        {model: {thing: 1}},
-                        {model: {thing: 2}},
-                        {model: {thing: 3}}
-                    ],
-                    total: 3
-                },
-                filterFunc = function (model) {
-                    return model.thing < 2;
-                },
-                filtered = aggregator.applyFilter(modelResults, filterFunc);
+            const modelResults = {
+                hits: [
+                    {model: {thing: 1}},
+                    {model: {thing: 2}},
+                    {model: {thing: 3}}
+                ],
+                total: 3
+            };
+            let filtered = aggregator.applyFilter(modelResults, filterFunc);
+
+            function filterFunc(model) {
+                return model.thing < 2;
+            }

            expect(filtered.hits).toEqual([
                {model: {thing: 1}}
--- a/platform/telemetry/src/TelemetryCapability.js
+++ b/platform/telemetry/src/TelemetryCapability.js
@@ -33,14 +33,11 @@ define(
        _
    ) {

-        var ZERO = function () {
-                return 0;
-            },
-            EMPTY_SERIES = {
-                getPointCount: ZERO,
-                getDomainValue: ZERO,
-                getRangeValue: ZERO
-            };
+        const EMPTY_SERIES = {
+            getPointCount: () => 0,
+            getDomainValue: () => 0,
+            getRangeValue: () => 0
+        };

        /**
         * Provides metadata about telemetry associated with a
--- a/src/BundleRegistry.js
+++ b/src/BundleRegistry.js
@@ -28,7 +28,7 @@ define(function () {
    }

    BundleRegistry.prototype.register = function (path, definition) {
-        if (this.knownBundles.hasOwnProperty(path)) {
+        if (Object.prototype.hasOwnProperty.call(this.knownBundles, path)) {
            throw new Error('Cannot register bundle with duplicate path', path);
        }

--- a/src/BundleRegistrySpec.js
+++ b/src/BundleRegistrySpec.js
@@ -23,8 +23,8 @@
 define(['./BundleRegistry'], function (BundleRegistry) {

    describe("BundleRegistry", function () {
-        var testPath,
-            bundleRegistry;
+        let testPath;
+        let bundleRegistry;

        beforeEach(function () {
            testPath = 'some/bundle';
@@ -46,7 +46,7 @@ define(['./BundleRegistry'], function (BundleRegistry) {
        });

        describe("when a bundle has been registered", function () {
-            var testBundleDef;
+            let testBundleDef;

            beforeEach(function () {
                testBundleDef = { someKey: "some value" };
@@ -83,7 +83,6 @@ define(['./BundleRegistry'], function (BundleRegistry) {
                });
            });
        });
-
    });

 });
--- a/src/MCT.js
+++ b/src/MCT.js
@@ -292,7 +292,7 @@ define([
        let capabilityService = this.$injector.get('capabilityService');

        function instantiate(model, keyString) {
-            var capabilities = capabilityService.getCapabilities(model, keyString);
+            const capabilities = capabilityService.getCapabilities(model, keyString);
            model.id = keyString;

            return new DomainObjectImpl(keyString, model, capabilities);
@@ -377,8 +377,8 @@ define([

        // TODO: remove with legacy types.
        this.types.listKeys().forEach(function (typeKey) {
-            var type = this.types.get(typeKey);
-            var legacyDefinition = type.toLegacyDefinition();
+            const type = this.types.get(typeKey);
+            const legacyDefinition = type.toLegacyDefinition();
            legacyDefinition.key = typeKey;
            this.legacyExtension('types', legacyDefinition);
        }.bind(this));
@@ -405,7 +405,7 @@ define([
                this.$injector.get('objectService');

                if (!isHeadlessMode) {
-                    var appLayout = new Vue({
+                    const appLayout = new Vue({
                        components: {
                            'Layout': Layout.default
                        },
--- a/src/MCTSpec.js
+++ b/src/MCTSpec.js
@@ -26,11 +26,11 @@ define([
    'utils/testing'
 ], function (plugins, legacyRegistry, testUtils) {
    describe("MCT", function () {
-        var openmct;
-        var mockPlugin;
-        var mockPlugin2;
-        var mockListener;
-        var oldBundles;
+        let openmct;
+        let mockPlugin;
+        let mockPlugin2;
+        let mockListener;
+        let oldBundles;

        beforeEach(function () {
            mockPlugin = jasmine.createSpy('plugin');
@@ -109,7 +109,7 @@ define([
        });

        describe("setAssetPath", function () {
-            var testAssetPath;
+            let testAssetPath;

            beforeEach(function () {
                openmct.legacyExtension = jasmine.createSpy('legacyExtension');
--- a/src/adapter/actions/ActionDialogDecorator.js
+++ b/src/adapter/actions/ActionDialogDecorator.js
@@ -29,15 +29,15 @@ define([
    }

    ActionDialogDecorator.prototype.getActions = function (context) {
-        var mct = this.mct;
+        const mct = this.mct;

        return this.actionService.getActions(context).map(function (action) {
            if (action.dialogService) {
-                var domainObject = objectUtils.toNewFormat(
+                const domainObject = objectUtils.toNewFormat(
                    context.domainObject.getModel(),
                    objectUtils.parseKeyString(context.domainObject.getId())
                );
-                var providers = mct.propertyEditors.get(domainObject);
+                const providers = mct.propertyEditors.get(domainObject);

                if (providers.length > 0) {
                    action.dialogService = Object.create(action.dialogService);
--- a/src/adapter/capabilities/APICapabilityDecorator.js
+++ b/src/adapter/capabilities/APICapabilityDecorator.js
@@ -43,7 +43,7 @@ define([
        model,
        id
    ) {
-        var capabilities = this.capabilityService.getCapabilities(model, id);
+        const capabilities = this.capabilityService.getCapabilities(model, id);
        if (capabilities.mutation) {
            capabilities.mutation =
                synchronizeMutationCapability(capabilities.mutation);
--- a/src/adapter/capabilities/AlternateCompositionCapability.js
+++ b/src/adapter/capabilities/AlternateCompositionCapability.js
@@ -46,7 +46,7 @@ define([
        }

        function addChildToComposition(model) {
-            var existingIndex = model.composition.indexOf(child.getId());
+            const existingIndex = model.composition.indexOf(child.getId());
            if (existingIndex === -1) {
                model.composition.push(child.getId());
            }
@@ -71,16 +71,16 @@ define([
            this.getDependencies();
        }

-        var keyString = objectUtils.makeKeyString(child.identifier);
-        var oldModel = objectUtils.toOldFormat(child);
-        var newDO = this.instantiate(oldModel, keyString);
+        const keyString = objectUtils.makeKeyString(child.identifier);
+        const oldModel = objectUtils.toOldFormat(child);
+        const newDO = this.instantiate(oldModel, keyString);

        return new ContextualDomainObject(newDO, this.domainObject);

    };

    AlternateCompositionCapability.prototype.invoke = function () {
-        var newFormatDO = objectUtils.toNewFormat(
+        const newFormatDO = objectUtils.toNewFormat(
            this.domainObject.getModel(),
            this.domainObject.getId()
        );
@@ -89,7 +89,7 @@ define([
            this.getDependencies();
        }

-        var collection = this.openmct.composition.get(newFormatDO);
+        const collection = this.openmct.composition.get(newFormatDO);

        return collection.load()
            .then(function (children) {
@@ -104,5 +104,4 @@ define([
    };

    return AlternateCompositionCapability;
-}
-);
+});
--- a/src/adapter/capabilities/patchViewCapability.js
+++ b/src/adapter/capabilities/patchViewCapability.js
@@ -28,18 +28,18 @@ define([

    function patchViewCapability(viewConstructor) {
        return function makeCapability(domainObject) {
-            var capability = viewConstructor(domainObject);
-            var oldInvoke = capability.invoke.bind(capability);
+            const capability = viewConstructor(domainObject);
+            const oldInvoke = capability.invoke.bind(capability);

            /* eslint-disable you-dont-need-lodash-underscore/map */
            capability.invoke = function () {
-                var availableViews = oldInvoke();
-                var newDomainObject = capability
+                const availableViews = oldInvoke();
+                const newDomainObject = capability
                    .domainObject
                    .useCapability('adapter');

                return _(availableViews).map(function (v, i) {
-                    var vd = {
+                    const vd = {
                        view: v,
                        priority: i + 100 // arbitrary to allow new views to
                        // be defaults by returning priority less than 100.
--- a/src/adapter/capabilities/synchronizeMutationCapability.js
+++ b/src/adapter/capabilities/synchronizeMutationCapability.js
@@ -32,8 +32,8 @@ define([
    function synchronizeMutationCapability(mutationConstructor) {

        return function makeCapability(domainObject) {
-            var capability = mutationConstructor(domainObject);
-            var oldListen = capability.listen.bind(capability);
+            const capability = mutationConstructor(domainObject);
+            const oldListen = capability.listen.bind(capability);
            capability.listen = function (listener) {
                return oldListen(function (newModel) {
                    capability.domainObject.model =
--- a/src/adapter/directives/MCTView.js
+++ b/src/adapter/directives/MCTView.js
@@ -27,9 +27,9 @@ define([
        return {
            restrict: 'E',
            link: function (scope, element, attrs) {
-                var provider = openmct.objectViews.getByProviderKey(attrs.mctProviderKey);
-                var view = new provider.view(scope.domainObject.useCapability('adapter'));
-                var domElement = element[0];
+                const provider = openmct.objectViews.getByProviderKey(attrs.mctProviderKey);
+                const view = new provider.view(scope.domainObject.useCapability('adapter'));
+                const domElement = element[0];

                view.show(domElement);

--- a/src/adapter/indicators/legacy-indicators-plugin.js
+++ b/src/adapter/indicators/legacy-indicators-plugin.js
@@ -20,7 +20,7 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
 define([], function () {
-    var LEGACY_INDICATOR_TEMPLATE =
+    const LEGACY_INDICATOR_TEMPLATE =
        '<mct-include '
        + '   ng-model="indicator" '
        + '   class="h-indicator" '
@@ -36,8 +36,8 @@ define([], function () {

            function addLegacyIndicators(legacyIndicators) {
                legacyIndicators.forEach(function (legacyIndicatorDef) {
-                    var legacyIndicator = initializeIfNeeded(legacyIndicatorDef);
-                    var legacyIndicatorElement = buildLegacyIndicator(legacyIndicator, legacyIndicatorDef.template);
+                    const legacyIndicator = initializeIfNeeded(legacyIndicatorDef);
+                    const legacyIndicatorElement = buildLegacyIndicator(legacyIndicator, legacyIndicatorDef.template);
                    openmct.indicators.add({
                        element: legacyIndicatorElement
                    });
@@ -45,7 +45,7 @@ define([], function () {
            }

            function initializeIfNeeded(LegacyIndicatorDef) {
-                var legacyIndicator;
+                let legacyIndicator;
                if (typeof LegacyIndicatorDef === 'function') {
                    legacyIndicator = new LegacyIndicatorDef();
                } else {
@@ -56,9 +56,9 @@ define([], function () {
            }

            function buildLegacyIndicator(legacyIndicator, template) {
-                var $compile = openmct.$injector.get('$compile');
-                var $rootScope = openmct.$injector.get('$rootScope');
-                var scope = $rootScope.$new(true);
+                const $compile = openmct.$injector.get('$compile');
+                const $rootScope = openmct.$injector.get('$rootScope');
+                const scope = $rootScope.$new(true);
                scope.indicator = legacyIndicator;
                scope.template = template || 'indicator';

--- a/src/adapter/indicators/legacy-indicators-pluginSpec.js
+++ b/src/adapter/indicators/legacy-indicators-pluginSpec.js
@@ -31,11 +31,11 @@ define(
        MCTIndicators,
        LegacyIndicatorsPlugin
    ) {
-        var openmct;
-        var directive;
-        var holderElement;
-        var legacyExtensionFunction = MCT.prototype.legacyExtension;
-        var legacyIndicatorsRunsFunction;
+        let openmct;
+        let directive;
+        let holderElement;
+        const legacyExtensionFunction = MCT.prototype.legacyExtension;
+        let legacyIndicatorsRunsFunction;

        xdescribe('The legacy indicators plugin', function () {
            beforeEach(function () {
@@ -63,10 +63,10 @@ define(
            }

            function mockAngularComponents() {
-                var mockInjector = jasmine.createSpyObj('$injector', ['get']);
-                var mockCompile = jasmine.createSpy('$compile');
-                var mockRootScope = jasmine.createSpyObj('rootScope', ['$new']);
-                var mockScope = {};
+                const mockInjector = jasmine.createSpyObj('$injector', ['get']);
+                const mockCompile = jasmine.createSpy('$compile');
+                const mockRootScope = jasmine.createSpyObj('rootScope', ['$new']);
+                const mockScope = {};

                mockRootScope.$new.and.returnValue(mockScope);
                mockInjector.get.and.callFake(function (service) {
@@ -85,7 +85,7 @@ define(
            }

            it("Displays any legacy indicators ", function () {
-                var legacyIndicators = [{}, {}, {}, {}];
+                const legacyIndicators = [{}, {}, {}, {}];

                legacyIndicatorsRunsFunction(legacyIndicators);
                renderIndicators();
@@ -95,8 +95,8 @@ define(
            });

            it("If legacy indicator is defined as a constructor function, executes function ", function () {
-                var mockConstructorFunction = jasmine.createSpy('mockIndicatorConstructor');
-                var legacyIndicators = [{}, mockConstructorFunction];
+                const mockConstructorFunction = jasmine.createSpy('mockIndicatorConstructor');
+                const legacyIndicators = [{}, mockConstructorFunction];

                mockConstructorFunction.and.returnValue({});
                legacyIndicatorsRunsFunction(legacyIndicators);
--- a/src/adapter/policies/AdaptedViewPolicy.js
+++ b/src/adapter/policies/AdaptedViewPolicy.js
@@ -29,8 +29,8 @@ define([], function () {
        view,
        legacyObject
    ) {
-        if (view.hasOwnProperty('provider')) {
-            var domainObject = legacyObject.useCapability('adapter');
+        if (Object.prototype.hasOwnProperty.call(view, 'provider')) {
+            const domainObject = legacyObject.useCapability('adapter');

            return view.provider.canView(domainObject);
        }
--- a/src/adapter/runs/LegacyTelemetryProvider.js
+++ b/src/adapter/runs/LegacyTelemetryProvider.js
@@ -50,7 +50,7 @@ define([
        LegacyTelemetryProvider.prototype.canProvideTelemetry;

    function createDatum(domainObject, metadata, legacySeries, i) {
-        var datum;
+        let datum;

        if (legacySeries.getDatum) {
            datum = legacySeries.getDatum(i);
@@ -77,9 +77,9 @@ define([
    }

    function adaptSeries(domainObject, metadata, legacySeries) {
-        var series = [];
+        const series = [];

-        for (var i = 0; i < legacySeries.getPointCount(); i++) {
+        for (let i = 0; i < legacySeries.getPointCount(); i++) {
            series.push(createDatum(domainObject, metadata, legacySeries, i));
        }

@@ -104,9 +104,9 @@ define([
     *          telemetry data.
     */
    LegacyTelemetryProvider.prototype.request = function (domainObject, request) {
-        var metadata = this.telemetryApi.getMetadata(domainObject);
-        var oldObject = this.instantiate(utils.toOldFormat(domainObject), utils.makeKeyString(domainObject.identifier));
-        var capability = oldObject.getCapability("telemetry");
+        const metadata = this.telemetryApi.getMetadata(domainObject);
+        const oldObject = this.instantiate(utils.toOldFormat(domainObject), utils.makeKeyString(domainObject.identifier));
+        const capability = oldObject.getCapability("telemetry");

        return capability.requestData(request).then(function (telemetrySeries) {
            return Promise.resolve(adaptSeries(domainObject, metadata, telemetrySeries));
@@ -130,9 +130,9 @@ define([
     * @returns {platform|telemetry.TelemetrySubscription|*}
     */
    LegacyTelemetryProvider.prototype.subscribe = function (domainObject, callback, request) {
-        var metadata = this.telemetryApi.getMetadata(domainObject);
-        var oldObject = this.instantiate(utils.toOldFormat(domainObject), utils.makeKeyString(domainObject.identifier));
-        var capability = oldObject.getCapability("telemetry");
+        const metadata = this.telemetryApi.getMetadata(domainObject);
+        const oldObject = this.instantiate(utils.toOldFormat(domainObject), utils.makeKeyString(domainObject.identifier));
+        const capability = oldObject.getCapability("telemetry");

        function callbackWrapper(series) {
            callback(createDatum(domainObject, metadata, series, series.getPointCount() - 1));
@@ -142,7 +142,7 @@ define([
    };

    LegacyTelemetryProvider.prototype.supportsLimits = function (domainObject) {
-        var oldObject = this.instantiate(
+        const oldObject = this.instantiate(
            utils.toOldFormat(domainObject),
            utils.makeKeyString(domainObject.identifier)
        );
@@ -151,11 +151,11 @@ define([
    };

    LegacyTelemetryProvider.prototype.getLimitEvaluator = function (domainObject) {
-        var oldObject = this.instantiate(
+        const oldObject = this.instantiate(
            utils.toOldFormat(domainObject),
            utils.makeKeyString(domainObject.identifier)
        );
-        var limitEvaluator = oldObject.getCapability("limit");
+        const limitEvaluator = oldObject.getCapability("limit");

        return {
            evaluate: function (datum, property) {
@@ -166,7 +166,7 @@ define([

    return function (openmct, instantiate) {
        // Legacy provider should always be the fallback.
-        var provider = new LegacyTelemetryProvider(openmct, instantiate);
+        const provider = new LegacyTelemetryProvider(openmct, instantiate);
        openmct.telemetry.legacyProvider = provider;
        openmct.telemetry.requestProviders.push(provider);
        openmct.telemetry.subscriptionProviders.push(provider);
--- a/src/adapter/runs/TypeDeprecationChecker.js
+++ b/src/adapter/runs/TypeDeprecationChecker.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open openmct, Copyright (c) 2014-2018, United States Government
+ * Open openmct, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -20,7 +20,6 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/* global console */
 define([

 ], function (
@@ -28,7 +27,7 @@ define([
 ) {

    function checkForDeprecatedFunctionality(typeDef) {
-        if (typeDef.hasOwnProperty('telemetry')) {
+        if (Object.prototype.hasOwnProperty.call(typeDef, 'telemetry')) {
            console.warn(
                'DEPRECATION WARNING: Telemetry data on type '
                + 'registrations will be deprecated in a future version, '
--- a/src/adapter/services/Instantiate.js
+++ b/src/adapter/services/Instantiate.js
@@ -35,9 +35,9 @@ define(
        ) {
            return function (model, id) {
                id = id || identifierService.generate();
-                var old_id = model.id;
+                const old_id = model.id;
                model.id = id;
-                var capabilities = capabilityService.getCapabilities(model, id);
+                const capabilities = capabilityService.getCapabilities(model, id);
                model.id = old_id;
                cacheService.put(id, model);

--- a/src/adapter/services/LegacyObjectAPIInterceptor.js
+++ b/src/adapter/services/LegacyObjectAPIInterceptor.js
@@ -40,12 +40,12 @@ define([
     * @private
     */
    ObjectServiceProvider.prototype.bridgeEventBuses = function () {
-        var removeGeneralTopicListener;
-        var handleLegacyMutation;
+        let removeGeneralTopicListener;
+        let handleLegacyMutation;

-        var handleMutation = function (newStyleObject) {
-            var keyString = utils.makeKeyString(newStyleObject.identifier);
-            var oldStyleObject = this.instantiate(utils.toOldFormat(newStyleObject), keyString);
+        const handleMutation = function (newStyleObject) {
+            const keyString = utils.makeKeyString(newStyleObject.identifier);
+            const oldStyleObject = this.instantiate(utils.toOldFormat(newStyleObject), keyString);

            // Don't trigger self
            removeGeneralTopicListener();
@@ -58,8 +58,8 @@ define([
        }.bind(this);

        handleLegacyMutation = function (legacyObject) {
-            var newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId()),
-                keystring = utils.makeKeyString(newStyleObject.identifier);
+            const newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId());
+            const keystring = utils.makeKeyString(newStyleObject.identifier);

            this.eventEmitter.emit(keystring + ":*", newStyleObject);
            this.eventEmitter.emit('mutation', newStyleObject);
@@ -72,21 +72,25 @@ define([
    ObjectServiceProvider.prototype.create = async function (object) {
        let model = utils.toOldFormat(object);

-        return this.getPersistenceService().createObject(
+        let result = await this.getPersistenceService().createObject(
            this.getSpace(utils.makeKeyString(object.identifier)),
            object.identifier.key,
            model
        );
+
+        return result;
    };

    ObjectServiceProvider.prototype.update = async function (object) {
        let model = utils.toOldFormat(object);

-        return this.getPersistenceService().updateObject(
+        let result = await this.getPersistenceService().updateObject(
            this.getSpace(utils.makeKeyString(object.identifier)),
            object.identifier.key,
            model
        );
+
+        return result;
    };

    /**
@@ -124,11 +128,11 @@ define([
    };

    ObjectServiceProvider.prototype.get = function (key) {
-        var keyString = utils.makeKeyString(key);
+        const keyString = utils.makeKeyString(key);

        return this.objectService.getObjects([keyString])
            .then(function (results) {
-                var model = results[keyString].getModel();
+                let model = results[keyString].getModel();

                return utils.toNewFormat(model, key);
            });
@@ -137,19 +141,20 @@ define([
    // Injects new object API as a decorator so that it hijacks all requests.
    // Object providers implemented on new API should just work, old API should just work, many things may break.
    function LegacyObjectAPIInterceptor(openmct, ROOTS, instantiate, topic, objectService) {
-        var eventEmitter = openmct.objects.eventEmitter;
+        const eventEmitter = openmct.objects.eventEmitter;

        this.getObjects = function (keys) {
-            var results = {},
-                promises = keys.map(function (keyString) {
-                    var key = utils.parseKeyString(keyString);
+            const results = {};

-                    return openmct.objects.get(key)
-                        .then(function (object) {
-                            object = utils.toOldFormat(object);
-                            results[keyString] = instantiate(object, keyString);
-                        });
-                });
+            const promises = keys.map(function (keyString) {
+                const key = utils.parseKeyString(keyString);
+
+                return openmct.objects.get(key)
+                    .then(function (object) {
+                        object = utils.toOldFormat(object);
+                        results[keyString] = instantiate(object, keyString);
+                    });
+            });

            return Promise.all(promises)
                .then(function () {
--- a/src/adapter/services/MissingModelCompatibilityDecorator.js
+++ b/src/adapter/services/MissingModelCompatibilityDecorator.js
@@ -46,19 +46,20 @@ define([
     * models.  If a model is requested twice, respond with a missing result.
     */
    MissingModelCompatibilityDecorator.prototype.apiFetch = function (ids) {
-        var results = {},
-            promises = ids.map(function (id) {
-                if (this.apiFetching[id]) {
-                    return Promise.resolve();
-                }
+        const results = {};

-                this.apiFetching[id] = true;
+        const promises = ids.map(function (id) {
+            if (this.apiFetching[id]) {
+                return Promise.resolve();
+            }

-                return this.api.objects.get(objectUtils.parseKeyString(id))
-                    .then(function (newDO) {
-                        results[id] = objectUtils.toOldFormat(newDO);
-                    });
-            }, this);
+            this.apiFetching[id] = true;
+
+            return this.api.objects.get(objectUtils.parseKeyString(id))
+                .then(function (newDO) {
+                    results[id] = objectUtils.toOldFormat(newDO);
+                });
+        }, this);

        return Promise.all(promises).then(function () {
            return results;
@@ -72,7 +73,7 @@ define([
    MissingModelCompatibilityDecorator.prototype.getModels = function (ids) {
        return this.modelService.getModels(ids)
            .then(function (models) {
-                var missingIds = ids.filter(function (id) {
+                const missingIds = ids.filter(function (id) {
                    return !models[id];
                });

--- a/src/adapter/views/installLegacyViews.js
+++ b/src/adapter/views/installLegacyViews.js
@@ -21,7 +21,7 @@ define([
        });

        let inspectorTypes = openmct.$injector.get('types[]')
-            .filter((t) => t.hasOwnProperty('inspector'));
+            .filter((t) => Object.prototype.hasOwnProperty.call(t, 'inspector'));

        inspectorTypes.forEach(function (typeDefinition) {
            openmct.inspectorViews.addProvider(new TypeInspectorViewProvider(typeDefinition, openmct, convertToLegacyObject));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
charlesh88	87d3442c72	Fixes for NIRVSS UI spectral plot view - Fixed Plotly axis label title font sizing; - Fixed Plotly axis vertical line color; - Removed styling that caused `c-button` within `h-local-controls--overlay-content` to be background on background color;	2020-08-19 17:52:26 -07:00
Shefali Joshi	f9d3af2724	Version 1.3.0 snapshot (#3307 ) * Updating version to 1.2.4 for end of sprint. * Update master to 1.3.0-SNAPSHOT sprint version	2020-08-18 12:19:49 -07:00
Shefali Joshi	37debefadc	Stop evaluation of conditions when one evaluates to true (#3276 ) * Stop evaluation of conditions when one evaluates to true * Fix broken test * Fixes broken tests * Addresses review comments - Rename getResult to updateResult * Rename condition getResult to updateResult * Renames condition getResult to updateResult	2020-08-14 10:09:35 -07:00
Shefali Joshi	891fe0a36b	Merge pull request #3154 from nasa/remove-action-tests Remove action tests	2020-08-13 13:31:08 -07:00
Shefali Joshi	4b6de59b03	Merge branch 'master' into remove-action-tests	2020-08-13 09:52:35 -07:00
Shefali Joshi	270f07ebd5	Compare the enum value to the input, not the index of the enumeration (#3277 )	2020-08-11 13:19:38 -07:00
Jamie Vigliotta	69a6cd20af	linting	2020-08-11 13:01:54 -07:00
Jamie Vigliotta	28eb268af1	Merge branch 'remove-action-tests' of https://github.com/nasa/openmct into remove-action-tests More merg'n	2020-08-11 12:57:26 -07:00
Jamie Vigliotta	045bb443cb	Merge branch 'master' into remove-action-tests Merg'n master	2020-08-11 12:57:02 -07:00
Joel McKinnon	c6ca912f2b	ESLint one-var, no-var rules (#3239 ) * fixed issues for eslint one-var and no-var rules Co-authored-by: Joshi <simplyrender@gmail.com> Co-authored-by: Andrew Henry <akhenry@gmail.com>	2020-08-10 12:13:23 -07:00
Shefali Joshi	78c7484d54	Merge branch 'master' into remove-action-tests	2020-08-10 11:57:06 -07:00
Joel McKinnon	4d560086dd	ESLint upgrade, implement additional rules (#3230 ) * upgrade to ESLintv7, added overrides for rules violated * removed overrides for spec files * fixed no-prototype-builtins issues * added rules for default-case-last, default-param-last, grouped-accessor-pairs, no-constructor-return, and added override for one violation Co-authored-by: Andrew Henry <akhenry@gmail.com> Co-authored-by: Shefali Joshi <simplyrender@gmail.com>	2020-08-10 11:23:35 -07:00
Joel McKinnon	ef965ebdfd	ESLint rules: array-callback-return, no-invalid-this, func-style (#3151 ) * satisfied array-callback-return rule * satisfying no-invalid-this rule * fixed invalid-this issues * changed isNotEqual to arrow function * added rule func-style * added return false to satisfy array-callback-return rule Co-authored-by: Joel McKinnon <jmckinnon@apple.com> Co-authored-by: Joshi <simplyrender@gmail.com> Co-authored-by: Andrew Henry <akhenry@gmail.com>	2020-08-10 10:59:18 -07:00
Joel McKinnon	0b4a843617	ESLint rules: rules requiring minor changes (#3139 ) * implemented trivial code changes necessary batch of rules Co-authored-by: Andrew Henry <akhenry@gmail.com>	2020-08-10 10:35:40 -07:00
Shefali Joshi	deb0511b43	Merge branch 'master' into remove-action-tests	2020-08-03 13:43:40 -07:00
Joshi	2198a4780b	Merge branch 'master' of https://github.com/nasa/openmct into remove-action-tests	2020-08-03 09:47:42 -07:00
Shefali Joshi	9ebb013f22	Merge branch 'master' into remove-action-tests	2020-07-31 14:30:14 -07:00
Jamie V	7c1550ced7	Merge branch 'master' into remove-action-tests	2020-07-31 12:46:40 -07:00
Jamie Vigliotta	79c4dc9272	typo fix! and using object assign where appropriate	2020-07-13 14:42:01 -07:00
Jamie Vigliotta	e1d0c22071	removing fdescribe	2020-07-06 15:27:38 -07:00
Jamie Vigliotta	7dee6344b0	updating spec statements to be more broad	2020-07-06 14:14:57 -07:00
Jamie Vigliotta	731ab89561	added some tests for remove action as well as another mock object "folder"	2020-07-06 14:05:32 -07:00
Jamie Vigliotta	6bd0246db6	Merge branch 'master' into remove-action-tests Merging master	2020-07-02 12:53:43 -07:00
Jamie Vigliotta	99aa5c7b7b	few more tests, not ready yet though	2020-07-02 10:14:14 -07:00