merge with tcr

- More compact, better alignment, font sizing and padding;

src/adapter/actions/LegacyContextMenuAction.js

@@ -26,7 +26,6 @@ const OUTSIDE_EDIT_PATH_BLACKLIST = ["copy", "follow", "properties", "move", "li
 export default class LegacyContextMenuAction {
     constructor(openmct, LegacyAction) {
         this.openmct = openmct;
-        this.key = LegacyAction.definition.key;
         this.name = LegacyAction.definition.name;
         this.description = LegacyAction.definition.description;
         this.cssClass = LegacyAction.definition.cssClass;

src/api/contextMenu/ContextMenuAPI.js

@@ -49,9 +49,6 @@ class ContextMenuAPI {
      *           a single sentence or short paragraph) of this kind of view
      * @property {string} cssClass the CSS class to apply to labels for this
      *           view (to add icons, for instance)
-     * @property {string} key unique key to identify the context menu action
-     *           (used in custom context menu eg table rows, to identify which actions to include)
-     * @property {boolean} hideInDefaultMenu optional flag to hide action from showing in the default context menu (tree item)
      */
     /**
      * @method appliesTo
@@ -75,21 +72,12 @@ class ContextMenuAPI {
     /**
      * @private
      */
-    _showContextMenuForObjectPath(objectPath, x, y, actionsToBeIncluded) {
-
+    _showContextMenuForObjectPath(objectPath, x, y) {
         let applicableActions = this._allActions.filter((action) => {
-
-            if (actionsToBeIncluded) {
-                if (action.appliesTo === undefined && actionsToBeIncluded.includes(action.key)) {
-                    return true;
-                }
-                return action.appliesTo(objectPath, actionsToBeIncluded) && actionsToBeIncluded.includes(action.key);
-            } else {
-                if (action.appliesTo === undefined) {
-                    return true;
-                }
-                return action.appliesTo(objectPath) && !action.hideInDefaultMenu;
+            if (action.appliesTo === undefined) {
+                return true;
             }
+            return action.appliesTo(objectPath);
         });
 
         if (this._activeContextMenu) {

src/plugins/LADTable/LADTableSetViewProvider.js

@@ -38,7 +38,7 @@ define([
             canEdit: function (domainObject) {
                 return domainObject.type === 'LadTableSet';
             },
-            view: function (domainObject, isEditing, objectPath) {
+            view: function (domainObject) {
                 let component;
 
                 return {
@@ -49,8 +49,7 @@ define([
                             },
                             provide: {
                                 openmct,
-                                domainObject,
-                                objectPath
+                                domainObject
                             },
                             el: element,
                             template: '<lad-table-set></lad-table-set>'

src/plugins/LADTable/LADTableViewProvider.js

@@ -38,7 +38,7 @@ define([
             canEdit: function (domainObject) {
                 return domainObject.type === 'LadTable';
             },
-            view: function (domainObject, isEditing, objectPath) {
+            view: function (domainObject) {
                 let component;
 
                 return {
@@ -49,8 +49,7 @@ define([
                             },
                             provide: {
                                 openmct,
-                                domainObject,
-                                objectPath
+                                domainObject
                             },
                             el: element,
                             template: '<lad-table-component></lad-table-component>'

src/plugins/LADTable/components/LADRow.vue

@@ -1,4 +1,3 @@
-
 /*****************************************************************************
  * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
@@ -22,7 +21,7 @@
  *****************************************************************************/
 
 <template>
-    <tr @contextmenu.prevent="showContextMenu">
+    <tr>
         <td>{{name}}</td>
         <td>{{timestamp}}</td>
         <td :class="valueClass">
@@ -36,25 +35,15 @@
 </style>
 
 <script>
-
-const CONTEXT_MENU_ACTIONS = [
-    'viewHistoricalData',
-    'remove'
-];
-
 export default {
-    inject: ['openmct', 'objectPath'],
+    inject: ['openmct'],
     props: ['domainObject'],
     data() {
-        let currentObjectPath = this.objectPath.slice();
-        currentObjectPath.unshift(this.domainObject);
-
         return {
             name: this.domainObject.name,
             timestamp: '---',
             value: '---',
-            valueClass: '',
-            currentObjectPath
+            valueClass: ''
         }
     },
     methods: {
@@ -84,15 +73,11 @@ export default {
                 .request(this.domainObject, {strategy: 'latest'})
                 .then((array) => this.updateValues(array[array.length - 1]));
 
-        },
-        showContextMenu(event) {
-           this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
         }
     },
     mounted() {
         this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
         this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
-        this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
 
         this.limitEvaluator = openmct
             .telemetry

src/plugins/LADTable/components/LADTable.vue

@@ -44,7 +44,7 @@ import lodash from 'lodash';
 import LadRow from './LADRow.vue';
 
 export default {
-    inject: ['openmct', 'domainObject', 'objectPath'],
+    inject: ['openmct', 'domainObject'],
     components: {
         LadRow
     },

src/plugins/displayLayout/AlphanumericFormatViewProvider.js

@@ -46,14 +46,13 @@ define([
 
                 return selection.every(isTelemetryObject);
             },
-            view: function (domainObject, isEditing, objectPath) {
+            view: function (selection) {
                 let component;
                 return {
                     show: function (element) {
                         component = new Vue({
                             provide: {
-                                openmct,
-                                objectPath
+                                openmct
                             },
                             components: {
                                 AlphanumericFormatView: AlphanumericFormatView.default

src/plugins/displayLayout/components/DisplayLayout.vue

@@ -202,7 +202,7 @@
                 return selectionPath && selectionPath.length > 1 && !singleSelectedLine;
             }
         },
-        inject: ['openmct', 'options', 'objectPath'],
+        inject: ['openmct', 'options'],
         props: ['domainObject'],
         components: components,
         methods: {

src/plugins/displayLayout/components/SubobjectView.vue

@@ -27,7 +27,7 @@
                   @endMove="() => $emit('endMove')">
         <object-frame v-if="domainObject"
                       :domain-object="domainObject"
-                      :object-path="currentObjectPath"
+                      :object-path="objectPath"
                       :has-frame="item.hasFrame"
                       :show-edit-view="false"
                       ref="objectFrame">
@@ -71,7 +71,7 @@
                 hasFrame: hasFrameByDefault(domainObject.type)
             };
         },
-        inject: ['openmct', 'objectPath'],
+        inject: ['openmct'],
         props: {
             item: Object,
             gridSize: Array,
@@ -81,7 +81,7 @@
         data() {
             return {
                 domainObject: undefined,
-                currentObjectPath: []
+                objectPath: []
             }
         },
         components: {
@@ -100,7 +100,7 @@
         methods: {
             setObject(domainObject) {
                 this.domainObject = domainObject;
-                this.currentObjectPath = [this.domainObject].concat(this.objectPath.slice());
+                this.objectPath = [this.domainObject].concat(this.openmct.router.path);
                 this.$nextTick(function () {
                     let childContext = this.$refs.objectFrame.getSelectionContext();
                     childContext.item = domainObject;

src/plugins/displayLayout/components/TelemetryView.vue

@@ -27,8 +27,7 @@
                    @endMove="() => $emit('endMove')">
         <div class="c-telemetry-view"
              :style="styleObject"
-             v-if="domainObject"
-             @contextmenu.prevent="showContextMenu">
+             v-if="domainObject">
             <div v-if="showLabel"
                   class="c-telemetry-view__label">
                 <div class="c-telemetry-view__label-text">{{ domainObject.name }}</div>
@@ -83,8 +82,7 @@
     import printj from 'printj'
 
     const DEFAULT_TELEMETRY_DIMENSIONS = [10, 5],
-          DEFAULT_POSITION = [1, 1],
-          CONTEXT_MENU_ACTIONS = ['viewHistoricalData'];
+          DEFAULT_POSITION = [1, 1];
 
     export default {
         makeDefinition(openmct, gridSize, domainObject, position) {
@@ -105,7 +103,7 @@
                 size: "13px"
             };
         },
-        inject: ['openmct', 'objectPath'],
+        inject: ['openmct'],
         props: {
             item: Object,
             gridSize: Array,
@@ -165,8 +163,7 @@
             return {
                 datum: undefined,
                 formats: undefined,
-                domainObject: undefined,
-                currentObjectPath: undefined
+                domainObject: undefined
             }
         },
         watch: {
@@ -221,16 +218,12 @@
             },
             setObject(domainObject) {
                 this.domainObject = domainObject;
-                this.keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
                 this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
                 this.limitEvaluator = this.openmct.telemetry.limitEvaluator(this.domainObject);
                 this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
                 this.requestHistoricalData();
                 this.subscribeToObject();
 
-                this.currentObjectPath = this.objectPath.slice();
-                this.currentObjectPath.unshift(this.domainObject);
-
                 this.context = {
                     item: domainObject,
                     layoutItem: this.item,
@@ -242,9 +235,6 @@
             },
             updateTelemetryFormat(format) {
                 this.$emit('formatChanged', this.item, format);
-            },
-            showContextMenu(event) {
-                this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
             }
         },
         mounted() {

src/plugins/displayLayout/plugin.js

@@ -37,7 +37,7 @@ export default function DisplayLayoutPlugin(options) {
             canEdit: function (domainObject) {
                 return domainObject.type === 'layout';
             },
-            view: function (domainObject, isEditing, objectPath) {
+            view: function (domainObject) {
                 let component;
                 return {
                     show(container) {
@@ -49,14 +49,13 @@ export default function DisplayLayoutPlugin(options) {
                             provide: {
                                 openmct,
                                 objectUtils,
-                                options,
-                                objectPath
+                                options
                             },
                             el: container,
                             data () {
                                 return {
                                     domainObject: domainObject
-                                };
+                                }
                             }
                         });
                     },

src/plugins/goToOriginalAction/goToOriginalAction.js

@@ -23,7 +23,6 @@
 export default class GoToOriginalAction {
     constructor(openmct) {
         this.name = 'Go To Original';
-        this.key = 'goToOriginal';
         this.description = 'Go to the original unlinked instance of this object';
 
         this._openmct = openmct;

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

@@ -115,22 +115,10 @@
                  width: (tickWidth + 30) + 'px'
              }">
 
-            <div class="gl-plot-label gl-plot-y-label" ng-if="!yKeyOptions">
+            <div class="gl-plot-label gl-plot-y-label">
                 {{ yAxis.get('label') }}
             </div>
 
-            <div class="gl-plot-label gl-plot-y-label" ng-if="yKeyOptions.length > 1 && series.length === 1">
-                <select  class="gl-plot-y-label__select"
-                         ng-model="yAxisLabel" ng-change="plot.toggleYAxisLabel(yAxisLabel, yKeyOptions, series[0])">
-                    <option ng-repeat="option in yKeyOptions"
-                            value="{{option.name}}"
-                            ng-selected="option.name === yAxisLabel">
-                        {{option.name}}
-                    </option>
-                </select>
-            </div>
-            
-
             <mct-ticks axis="yAxis">
                 <div ng-repeat="tick in ticks track by tick.text"
                      class="gl-plot-tick gl-plot-y-tick-label"

src/plugins/plot/src/plot/MCTPlotController.js

@@ -93,8 +93,6 @@ define([
         this.$scope.series = this.config.series.models;
         this.$scope.legend = this.config.legend;
 
-        this.$scope.yAxisLabel = this.config.yAxis.get('label');
-
         this.cursorGuideVertical = this.$element[0].querySelector('.js-cursor-guide--v');
         this.cursorGuideHorizontal = this.$element[0].querySelector('.js-cursor-guide--h');
         this.cursorGuide = false;
@@ -105,35 +103,9 @@ define([
         this.listenTo(this.$scope, 'plot:tickWidth', this.onTickWidthChange, this);
         this.listenTo(this.$scope, 'plot:highlight:set', this.onPlotHighlightSet, this);
         this.listenTo(this.$scope, 'plot:reinitializeCanvas', this.initCanvas, this);
+
         this.listenTo(this.config.xAxis, 'change:displayRange', this.onXAxisChange, this);
         this.listenTo(this.config.yAxis, 'change:displayRange', this.onYAxisChange, this);
-
-        this.setUpYAxisOptions();
-    };
-
-    MCTPlotController.prototype.setUpYAxisOptions = function () {
-        if (this.$scope.series.length === 1) {
-            let metadata = this.$scope.series[0].metadata;
-
-            this.$scope.yKeyOptions = metadata
-                .valuesForHints(['range'])
-                .map(function (o) {
-                    return {
-                        name: o.name,
-                        key: o.key
-                    };
-                });
-
-            //  set yAxisLabel if none is set yet
-            if (this.$scope.yAxisLabel === 'none') {
-                let yKey = this.$scope.series[0].model.yKey,
-                    yKeyModel = this.$scope.yKeyOptions.filter(o => o.key === yKey)[0];
-
-                this.$scope.yAxisLabel = yKeyModel.name;
-            }
-        } else {
-            this.$scope.yKeyOptions = undefined;
-        }
     };
 
     MCTPlotController.prototype.onXAxisChange = function (displayBounds) {
@@ -521,13 +493,5 @@ define([
         this.cursorGuide = !this.cursorGuide;
     };
 
-    MCTPlotController.prototype.toggleYAxisLabel = function (label, options, series) {
-        let yAxisObject = options.filter(o => o.name === label)[0];
-
-        if (yAxisObject) {
-            series.emit('change:yKey', yAxisObject.key);
-        }
-    };
-
     return MCTPlotController;
 });

src/plugins/remove/RemoveAction.js

@@ -23,7 +23,6 @@
 export default class RemoveAction {
     constructor(openmct) {
         this.name = 'Remove';
-        this.key = 'remove';
         this.description = 'Remove this object from its containing object.';
         this.cssClass = "icon-trash";
 

src/plugins/telemetryTable/TelemetryTableRow.js

@@ -29,7 +29,7 @@ define([], function () {
             this.limitEvaluator = limitEvaluator;
             this.objectKeyString = objectKeyString;
         }
-
+        
         getFormattedDatum(headers) {
             return Object.keys(headers).reduce((formattedDatum, columnKey) => {
                 formattedDatum[columnKey] = this.getFormattedValue(columnKey);
@@ -62,16 +62,12 @@ define([], function () {
                 this.cellLimitClasses = Object.values(this.columns).reduce((alarmStateMap, column) => {
                     let limitEvaluation = this.limitEvaluator.evaluate(this.datum, column.getMetadatum());
                     alarmStateMap[column.getKey()] = limitEvaluation && limitEvaluation.cssClass;
-
+                    
                     return alarmStateMap;
                 }, {});
             }
             return this.cellLimitClasses;
         }
-
-        getContextMenuActions() {
-            return [];
-        }
     }
 
     /**
@@ -89,4 +85,4 @@ define([], function () {
     }
 
     return TelemetryTableRow;
-});
+});

src/plugins/telemetryTable/TelemetryTableViewProvider.js

@@ -48,7 +48,7 @@ define([
             canEdit(domainObject) {
                 return domainObject.type === 'table';
             },
-            view(domainObject, isEditing, objectPath) {
+            view(domainObject) {
                 let table = new TelemetryTable(domainObject, openmct);
                 let component;
                 return {
@@ -64,8 +64,7 @@ define([
                             },
                             provide: {
                                 openmct,
-                                table,
-                                objectPath
+                                table
                             },
                             el: element,
                             template: '<table-component :isEditing="isEditing" :enableMarking="true"></table-component>'

src/plugins/telemetryTable/components/table-cell.vue

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 <template>
-    <td @click="selectCell($event.currentTarget, columnKey)" :title="formattedValue">{{formattedValue}}</td>
+    <td>{{formattedValue}}</td>
 </template>
 <script>
 export default {
@@ -33,38 +33,11 @@ export default {
         columnKey: {
             type: String,
             require: true
-        },
-        objectPath: {
-            type: Array,
-            require: false
         }
     },
-    methods: {
-        selectCell(element, columnKey) {
-            if (this.isSelectable) {
-                this.openmct.selection.select([{
-                    element: element,
-                    context: {
-                        type: 'table-cell',
-                        row: this.row.objectKeyString,
-                        column: columnKey
-                    }
-                },{
-                    element: this.openmct.layout.$refs.browseObject.$el,
-                    context: {
-                        item: this.objectPath[0]
-                    }
-                }], false);
-                event.stopPropagation();
-            }
-        },
-    },
     computed: {
         formattedValue() {
             return this.row.getFormattedValue(this.columnKey);
-        },
-        isSelectable() {
-            return this.row.columns[this.columnKey].selectable;
         }
     }
 };

src/plugins/telemetryTable/components/table-row.vue

@@ -26,14 +26,15 @@
         rowClass,
         {'is-selected': marked}
     ]"
-    v-on="listeners">
+    @click="markRow">
     <component v-for="(title, key) in headers" 
         :key="key"
         :is="componentList[key]"
         :columnKey="key"
         :style="columnWidths[key] === undefined ? {} : { width: columnWidths[key] + 'px', 'max-width': columnWidths[key] + 'px'}"
+        :title="formattedRow[key]"
         :class="[cellLimitClasses[key], selectableColumns[key] ? 'is-selectable' : '']"
-        :objectPath="objectPath"
+        @click="selectCell($event.currentTarget, key)"
         :row="row">
     </component>
 </tr>
@@ -55,10 +56,10 @@
 import TableCell from './table-cell.vue';
 
 export default {
-    inject: ['openmct', 'objectPath'],
     data: function () {
         return {
             rowTop: (this.rowOffset + this.rowIndex) * this.rowHeight + 'px',
+            formattedRow: this.row.getFormattedDatum(this.headers),
             rowClass: this.row.getRowClass(),
             cellLimitClasses: this.row.getCellLimitClasses(),
             componentList: Object.keys(this.headers).reduce((components, header) => {
@@ -84,10 +85,6 @@ export default {
             type: Object,
             required: true
         },
-        objectPath: {
-            type: Array,
-            required: false
-        },
         rowIndex: {
             type: Number,
             required: false,
@@ -114,6 +111,7 @@ export default {
             this.rowTop = (rowOffset + this.rowIndex) * this.rowHeight + 'px';
         },
         formatRow: function (row) {
+            this.formattedRow = row.getFormattedDatum(this.headers);
             this.rowClass = row.getRowClass();
             this.cellLimitClasses = row.getCellLimitClasses();
         },
@@ -152,16 +150,6 @@ export default {
                 }], false);
                 event.stopPropagation();
             }
-        },
-         showContextMenu: function (event) {
-            event.preventDefault();
-
-            this.openmct.objects.get(this.row.objectKeyString).then((domainObject) => {
-                let contextualObjectPath = this.objectPath.slice();
-                contextualObjectPath.unshift(domainObject);
-
-                this.openmct.contextMenu._showContextMenuForObjectPath(contextualObjectPath, event.x, event.y, this.row.getContextMenuActions());
-            });
         }
     },
     // TODO: use computed properties
@@ -174,19 +162,6 @@ export default {
     },
     components: {
         TableCell
-    },
-    computed: {
-        listeners() {
-            let listenersObject = {
-                click: this.markRow
-            }
-
-            if (this.row.getContextMenuActions().length) {
-                listenersObject.contextmenu = this.showContextMenu;
-            }
-            
-            return listenersObject;
-        }
     }
 }
 </script>

src/plugins/telemetryTable/components/table.vue

@@ -120,7 +120,6 @@
                         :headers="headers"
                         :columnWidths="columnWidths"
                         :rowIndex="rowIndex"
-                        :objectPath="objectPath"
                         :rowOffset="rowOffset"
                         :rowHeight="rowHeight"
                         :row="row"
@@ -349,7 +348,7 @@ export default {
         search,
         TelemetryFilterIndicator
     },
-    inject: ['table', 'openmct', 'objectPath'],
+    inject: ['table', 'openmct'],
     props: {
         isEditing: {
             type: Boolean,

src/plugins/timeConductor/ConductorAxis.vue

@@ -167,7 +167,6 @@ export default {
             this.xAxis.scale(this.xScale);
             this.xAxis.tickFormat(utcMultiTimeFormat);
             this.axisElement.call(this.xAxis);
-            this.setScale();
         },
         getActiveFormatter() {
             let timeSystem = this.openmct.time.timeSystem();

src/plugins/timeConductor/ConductorTimeSystem.vue

@@ -60,6 +60,7 @@ export default {
                 .filter(menuOption => menuOption.clock === (clock && clock.key))
                 .map(menuOption => JSON.parse(JSON.stringify(this.openmct.time.timeSystems.get(menuOption.timeSystem))));
         },
+
         setTimeSystemFromView(timeSystem) {
             if (timeSystem.key !== this.selectedTimeSystem.key) {
                 let activeClock = this.openmct.time.clock();
@@ -68,15 +69,7 @@ export default {
                     timeSystem: timeSystem.key
                 });
                 if (activeClock === undefined) {
-                    let bounds;
-
-                    if (this.selectedTimeSystem.isUTCBased && timeSystem.isUTCBased) {
-                        bounds = this.openmct.time.bounds();
-                    } else {
-                        bounds = configuration.bounds;
-                    }
-
-                    this.openmct.time.timeSystem(timeSystem.key, bounds);
+                    this.openmct.time.timeSystem(timeSystem.key, configuration.bounds);
                 } else {
                     this.openmct.time.timeSystem(timeSystem.key);
                     this.openmct.time.clockOffsets(configuration.clockOffsets);

src/styles-new/_constants-espresso.scss

@@ -211,10 +211,6 @@ $btnStdH: 24px;
 $colorCursorGuide: rgba(white, 0.6);
 $shdwCursorGuide: rgba(black, 0.4) 0 0 2px;
 $colorLocalControlOvrBg: rgba($colorBodyBg, 0.8);
-$colorSelectBg: $colorBtnBg; // This must be a solid color, not a gradient, due to usage of SVG bg in selects
-$colorSelectFg: $colorBtnFg;
-$colorSelectArw: lighten($colorBtnBg, 20%);
-$shdwSelect: rgba(black, 0.5) 0 0.5px 3px;
 
 // Menus
 $colorMenuBg: pullForward($colorBodyBg, 15%);
@@ -429,3 +425,7 @@ $createBtnTextTransform: uppercase;
     background: linear-gradient(pullForward($c, 5%), $c);
     box-shadow: rgba(black, 0.5) 0 0.5px 2px;
 }
+
+@mixin themedSelect($bg: $colorBtnBg, $fg: $colorBtnFg) {
+    @include cSelect(linear-gradient(lighten($bg, 5%), $bg), $fg, lighten($bg, 20%), rgba(black, 0.5) 0 0.5px 3px);
+}

src/styles-new/_constants-maelstrom.scss

@@ -215,10 +215,6 @@ $btnStdH: 24px;
 $colorCursorGuide: rgba(white, 0.6);
 $shdwCursorGuide: rgba(black, 0.4) 0 0 2px;
 $colorLocalControlOvrBg: rgba($colorBodyBg, 0.8);
-$colorSelectBg: $colorBtnBg; // This must be a solid color, not a gradient, due to usage of SVG bg in selects
-$colorSelectFg: $colorBtnFg;
-$colorSelectArw: lighten($colorBtnBg, 20%);
-$shdwSelect: rgba(black, 0.5) 0 0.5px 3px;
 
 // Menus
 $colorMenuBg: pullForward($colorBodyBg, 15%);
@@ -434,6 +430,10 @@ $createBtnTextTransform: uppercase;
     box-shadow: rgba(black, 0.5) 0 0.5px 2px;
 }
 
+@mixin themedSelect($bg: $colorBtnBg, $fg: $colorBtnFg) {
+    @include cSelect(linear-gradient(lighten($bg, 5%), $bg), $fg, lighten($bg, 20%), rgba(black, 0.5) 0 0.5px 3px);
+}
+
 /**************************************************** OVERRIDES */
 .c-frame {
     &:not(.no-frame) {

src/styles-new/_constants-snow.scss

@@ -211,10 +211,6 @@ $btnStdH: 24px;
 $colorCursorGuide: rgba(black, 0.6);
 $shdwCursorGuide: rgba(white, 0.4) 0 0 2px;
 $colorLocalControlOvrBg: rgba($colorBodyFg, 0.8);
-$colorSelectBg: $colorBtnBg; // This must be a solid color, not a gradient, due to usage of SVG bg in selects
-$colorSelectFg: $colorBtnFg;
-$colorSelectArw: lighten($colorBtnBg, 20%);
-$shdwSelect: none;
 
 // Menus
 $colorMenuBg: pushBack($colorBodyBg, 10%);
@@ -428,3 +424,7 @@ $createBtnTextTransform: uppercase;
 @mixin themedButton($c: $colorBtnBg) {
     background: $c;
 }
+
+@mixin themedSelect($bg: $colorBtnBg, $fg: $colorBtnFg) {
+    @include cSelect($bg, $fg, lighten($bg, 20%), none);
+}

src/styles-new/_controls.scss

@@ -279,10 +279,7 @@ input[type=number]::-webkit-outer-spin-button {
 // SELECTS
 select {
     @include appearanceNone();
-    background-color: $colorSelectBg;
-    background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3e%3cpath fill='%23#{svgColorFromHex($colorSelectArw)}' d='M5 5l5-5H0z'/%3e%3c/svg%3e");
-    color: $colorSelectFg;
-    box-shadow: $shdwSelect;
+    @include themedSelect();
     background-repeat: no-repeat, no-repeat;
     background-position: right .4em top 80%, 0 0;
     border: none;

src/styles-new/_legacy-plots.scss

@@ -161,7 +161,8 @@ mct-plot {
             height: auto;
         }
 
-        &.gl-plot-y-label {
+        &.gl-plot-y-label,
+        &.l-plot-y-label {
             $x: -50%;
             $r: -90deg;
             transform-origin: 50% 0;
@@ -171,12 +172,6 @@ mct-plot {
             left: 0;
             top: 50%;
             white-space: nowrap;
-
-            select {
-                background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3e%3cpath fill='%23#{svgColorFromHex($colorSelectArw)}' d='M0 5l5 5V0L0 5z'/%3e%3c/svg%3e");
-                background-position: left .4em top 50%, 0 0;
-                padding: 1px $interiorMargin 1px 20px;
-            }
         }
     }
 

src/styles-new/_mixins.scss

@@ -585,11 +585,6 @@
     }
 }
 
-@function svgColorFromHex($hexColor) {
-    // Remove initial # in color value
-    @return str-slice(inspect($hexColor), 2, str-length(inspect($hexColor)));
-}
-
 @mixin test($c: deeppink, $a: 0.3) {
     background: rgba($c, $a) !important;
     background-color: rgba($c, $a) !important;

src/ui/components/ObjectFrame.vue

@@ -44,8 +44,7 @@
             class="c-so-view__object-view"
             ref="objectView"
             :object="domainObject"
-            :show-edit-view="showEditView"
-            :object-path="objectPath">
+            :show-edit-view="showEditView">
         </object-view>
     </div>
 </template>

src/ui/components/ObjectView.vue

@@ -9,8 +9,7 @@ export default {
     props: {
         view: String,
         object: Object,
-        showEditView: Boolean,
-        objectPath: Array
+        showEditView: Boolean
     },
     destroyed() {
         this.clear();
@@ -92,19 +91,17 @@ export default {
                 return;
             }
 
-            let objectPath = this.currentObjectPath || this.objectPath;
-
             if (provider.edit && this.showEditView) {
                 if (this.openmct.editor.isEditing()) {
-                    this.currentView = provider.edit(this.currentObject, true, objectPath);
+                    this.currentView = provider.edit(this.currentObject);
                 } else {
-                    this.currentView = provider.view(this.currentObject, false, objectPath);    
+                    this.currentView = provider.view(this.currentObject, false);    
                 }
 
                 this.openmct.editor.on('isEditing', this.toggleEditView);
                 this.releaseEditModeHandler = () => this.openmct.editor.off('isEditing', this.toggleEditView);
             } else {
-                this.currentView = provider.view(this.currentObject, this.openmct.editor.isEditing(), objectPath);
+                this.currentView = provider.view(this.currentObject, this.openmct.editor.isEditing());
 
                 if (this.currentView.onEditModeChange) {
                     this.openmct.editor.on('isEditing', this.invokeEditModeHandler);
@@ -120,7 +117,7 @@ export default {
 
             this.openmct.objectViews.on('clearData', this.clearData);
         },
-        show(object, viewKey, immediatelySelect, currentObjectPath) {
+        show(object, viewKey, immediatelySelect) {
             if (this.unlisten) {
                 this.unlisten();
             }
@@ -135,11 +132,6 @@ export default {
             }
 
             this.currentObject = object;
-
-            if (currentObjectPath) {
-                this.currentObjectPath = currentObjectPath;
-            }
-
             this.unlisten = this.openmct.objects.observe(this.currentObject, '*', (mutatedObject) => {
                 this.currentObject = mutatedObject;
             });

src/ui/layout/BrowseBar.vue

@@ -19,11 +19,28 @@
         </div>
 
         <div class="l-browse-bar__end">
-            <view-switcher
-                :currentView="currentView"
-                :views="views"
-                @setView="setView">
-            </view-switcher>
+            <div class="l-browse-bar__view-switcher c-ctrl-wrapper c-ctrl-wrapper--menus-left"
+                 v-if="views.length > 1">
+                <button class="c-button--menu"
+                     :class="currentView.cssClass"
+                     title="Switch view type"
+                     @click.stop="toggleViewMenu">
+                    <span class="c-button__label">
+                          {{ currentView.name }}
+                    </span>
+                </button>
+                <div class="c-menu" v-show="showViewMenu">
+                    <ul>
+                        <li v-for="(view, index) in views"
+                            @click="setView(view)"
+                            :key="index"
+                            :class="view.cssClass"
+                            :title="view.name">
+                            {{ view.name }}
+                        </li>
+                    </ul>
+                </div>
+            </div>
             <!-- Action buttons -->
             <div class="l-browse-bar__actions">
                 <button v-if="notebookEnabled" 
@@ -60,15 +77,14 @@
 
 <script>
 import NotebookSnapshot from '../utils/notebook-snapshot';
-import ViewSwitcher from './ViewSwitcher.vue';
 const PLACEHOLDER_OBJECT = {};
 
     export default {
         inject: ['openmct'],
-        components: {
-            ViewSwitcher
-        },
         methods: {
+            toggleViewMenu() {
+                this.showViewMenu = !this.showViewMenu;
+            },
             toggleSaveMenu() {
                 this.showSaveMenu = !this.showSaveMenu;
             },

src/ui/layout/ViewSwitcher.vue

@@ -1,55 +0,0 @@
-<template>
-    <div class="l-browse-bar__view-switcher c-ctrl-wrapper c-ctrl-wrapper--menus-left"
-            v-if="views.length > 1">
-        <button class="c-button--menu"
-                :class="currentView.cssClass"
-                title="Switch view type"
-                @click.stop="toggleViewMenu">
-            <span class="c-button__label">
-                    {{ currentView.name }}
-            </span>
-        </button>
-        <div class="c-menu" v-show="showViewMenu">
-            <ul>
-                <li v-for="(view, index) in views"
-                    @click="setView(view)"
-                    :key="index"
-                    :class="view.cssClass"
-                    :title="view.name">
-                    {{ view.name }}
-                </li>
-            </ul>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    props: [
-        'currentView',
-        'views'
-    ],
-    data() {
-        return {
-            showViewMenu: false
-        }
-    },
-    methods: {
-        setView(view) {
-            this.$emit('setView', view);
-        },
-        toggleViewMenu() {
-            this.showViewMenu = !this.showViewMenu;
-        },
-        hideViewMenu() {
-            this.showViewMenu = false;
-        }
-    },
-    mounted() {
-        document.addEventListener('click', this.hideViewMenu);
-    },
-    destroyed() {
-        document.removeEventListener('click', this.hideViewMenu);
-    }
-}
-</script>

src/ui/preview/Preview.vue

@@ -33,11 +33,6 @@
             </div>
             <div class="l-browse-bar__end">
                 <div class="l-browse-bar__actions">
-                    <view-switcher
-                        :views="views"
-                        :currentView="currentView"
-                        @setView="setView">
-                    </view-switcher>
                     <button v-if="notebookEnabled"
                         class="l-browse-bar__actions__edit c-button icon-notebook" 
                         title="New Notebook entry" 
@@ -85,52 +80,20 @@
 
  <script>
     import ContextMenuDropDown from '../../ui/components/contextMenuDropDown.vue';
-    import ViewSwitcher from '../../ui/layout/ViewSwitcher.vue';
     import NotebookSnapshot from '../utils/notebook-snapshot';
 
     export default {
         components: {
-            ContextMenuDropDown,
-            ViewSwitcher
+            ContextMenuDropDown
         },
         inject: [
             'openmct',
             'objectPath'
         ],
-        computed: {
-            views() {
-                return this
-                    .openmct
-                    .objectViews
-                    .get(this.domainObject);
-            },
-            currentView() {
-                return this.views.filter(v => v.key === this.viewKey)[0] || {};
-            }
-        },
         methods: {
             snapshot() {
                 let element = document.getElementsByClassName("l-preview-window__object-view")[0];
                 this.notebookSnapshot.capture(this.domainObject, element);
-            },
-            clear() {
-                if (this.view) {
-                    this.view.destroy();
-                    this.$refs.objectView.innerHTML = '';
-                }
-                delete this.view;
-                delete this.viewContainer;
-            },
-            setView(view) {
-                this.clear();
-            
-                this.viewKey = view.key;
-                this.viewContainer = document.createElement('div');
-                this.viewContainer.classList.add('c-object-view','u-contents');
-                this.$refs.objectView.append(this.viewContainer);
-
-                this.view = this.currentView.view(this.domainObject, false, this.objectPath);
-                this.view.show(this.viewContainer, false);
             }
         },
         data() {
@@ -140,13 +103,13 @@
             return {
                 domainObject: domainObject,
                 type: type,
-                notebookEnabled: false,
-                viewKey: undefined
+                notebookEnabled: false
             };
         },
         mounted() {
-            let view = this.openmct.objectViews.get(this.domainObject)[0];
-            this.setView(view);
+            let viewProvider = this.openmct.objectViews.get(this.domainObject)[0];
+            this.view = viewProvider.view(this.domainObject);
+            this.view.show(this.$refs.objectView, false);
 
             if (this.openmct.types.get('notebook')) {
                 this.notebookSnapshot = new NotebookSnapshot(this.openmct);

src/ui/preview/PreviewAction.js

@@ -28,7 +28,6 @@ export default class PreviewAction {
          * Metadata
          */
         this.name = 'Preview';
-        this.key = 'preview';
         this.description = 'Preview in large dialog';
         this.cssClass = 'icon-eye-open';
 

src/ui/preview/ViewHistoricalDataAction.js

@@ -1,35 +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.
- *****************************************************************************/
-
-import PreviewAction from './PreviewAction';
-
-export default class ViewHistoricalDataAction extends PreviewAction {
-    constructor(openmct) {
-        super(openmct);
-
-        this.name = 'View Historical Data';
-        this.key = 'viewHistoricalData';
-        this.description = 'View Historical Data in a Table or Plot';
-        this.cssClass = 'icon-eye-open';
-        this.hideInDefaultMenu = true;
-    }
-}

src/ui/preview/plugin.js

@@ -20,11 +20,9 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 import PreviewAction from './PreviewAction.js';
-import ViewHistoricalDataAction from './ViewHistoricalDataAction';
 
 export default function () {
     return function (openmct) {
         openmct.contextMenu.registerAction(new PreviewAction(openmct));
-        openmct.contextMenu.registerAction(new ViewHistoricalDataAction(openmct));
-    };
+    }
 }

src/ui/registries/ViewRegistry.js

@@ -223,11 +223,11 @@ define(['EventEmitter'], function (EventEmitter) {
     /**
      * Provide a view of this object.
      *
-     * When called by Open MCT, the following arguments will be passed to it:
-     * @param {object} domainObject - the domainObject that the view is provided for
-     * @param {boolean} isEditing - A boolean value indicating wether openmct is in a global edit mode
-     * @param {array} objectPath - The current contextual object path of the view object
-     *                             eg current domainObject is located under MyItems which is under Root
+     * When called by Open MCT, this may include additional arguments
+     * which are on the path to the object to be viewed; for instance,
+     * when viewing "A Folder" within "My Items", this method will be
+     * invoked with "A Folder" (as a domain object) as the first argument,
+     * and "My Items" as the second argument.
      *
      * @method view
      * @memberof module:openmct.ViewProvider#

src/ui/router/Browse.js

@@ -8,7 +8,6 @@ define([
         let navigateCall = 0;
         let browseObject;
         let unobserve = undefined;
-        let currentObjectPath;
 
         openmct.router.route(/^\/browse\/?$/, navigateToFirstChildOfRoot);
 
@@ -27,9 +26,7 @@ define([
         });
 
         function viewObject(object, viewProvider) {
-            currentObjectPath = openmct.router.path;
-
-            openmct.layout.$refs.browseObject.show(object, viewProvider.key, true, currentObjectPath);
+            openmct.layout.$refs.browseObject.show(object, viewProvider.key, true);
             openmct.layout.$refs.browseBar.domainObject = object;
             openmct.layout.$refs.browseBar.viewKey = viewProvider.key;
         }