Adds a function to the Object API

Add automated security scanning to our repo (#4166 )
Add new icon for aggregate telemetry (#4163 )
2021-09-02 15:58:53 -07:00 · 2021-08-30 15:44:25 -07:00 · 2021-08-30 11:19:47 -07:00 · 2021-08-30 13:29:05 -04:00 · 2021-08-27 04:55:30 -07:00 · 2021-08-27 04:44:23 -07:00
24 changed files with 436 additions and 131 deletions
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,33 @@
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  schedule:
+    - cron: '28 21 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: javascript
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "openmct",
-  "version": "1.7.7",
+  "version": "1.7.8-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
--- a/src/api/objects/MutableDomainObject.js
+++ b/src/api/objects/MutableDomainObject.js
@@ -129,9 +129,7 @@ class MutableDomainObject {

        mutable.$observe('$_synchronize_model', (updatedObject) => {
            let clone = JSON.parse(JSON.stringify(updatedObject));
-            let deleted = _.difference(Object.keys(mutable), Object.keys(updatedObject));
-            deleted.forEach((propertyName) => delete mutable[propertyName]);
-            Object.assign(mutable, clone);
+            utils.refresh(mutable, clone);
        });

        return mutable;
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@@ -389,6 +389,23 @@ ObjectAPI.prototype.mutate = function (domainObject, path, value) {
    }
 };

+/**
+ * Updates a domain object based on its latest persisted state. Note that this will mutate the provided object.
+ * @param {module:openmct.DomainObject} domainObject an object to refresh from its persistence store
+ * @returns {Promise} the provided object, updated to reflect the latest persisted state of the object.
+ */
+ObjectAPI.prototype.refresh = async function (domainObject) {
+    const refreshedObject = await this.get(domainObject.identifier);
+
+    if (domainObject.isMutable) {
+        domainObject.$refresh(refreshedObject);
+    } else {
+        utils.refresh(domainObject, refreshedObject);
+    }
+
+    return domainObject;
+};
+
 /**
 * @private
 */
--- a/src/api/objects/ObjectAPISpec.js
+++ b/src/api/objects/ObjectAPISpec.js
@@ -223,6 +223,28 @@ describe("The Object API", () => {
            expect(testObject.name).toBe(MUTATED_NAME);
        });

+        it('Provides a way of refreshing an object from the persistence store', () => {
+            const modifiedTestObject = JSON.parse(JSON.stringify(testObject));
+            const OTHER_ATTRIBUTE_VALUE = 'Modified value';
+            const NEW_ATTRIBUTE_VALUE = 'A new attribute';
+            modifiedTestObject.otherAttribute = OTHER_ATTRIBUTE_VALUE;
+            modifiedTestObject.newAttribute = NEW_ATTRIBUTE_VALUE;
+            delete modifiedTestObject.objectAttribute;
+
+            spyOn(objectAPI, 'get');
+            objectAPI.get.and.returnValue(Promise.resolve(modifiedTestObject));
+
+            expect(objectAPI.get).not.toHaveBeenCalled();
+
+            return objectAPI.refresh(testObject).then(() => {
+                expect(objectAPI.get).toHaveBeenCalledWith(testObject.identifier);
+
+                expect(testObject.otherAttribute).toEqual(OTHER_ATTRIBUTE_VALUE);
+                expect(testObject.newAttribute).toEqual(NEW_ATTRIBUTE_VALUE);
+                expect(testObject.objectAttribute).not.toBeDefined();
+            });
+        });
+
        describe ('uses a MutableDomainObject', () => {
            it('and retains properties of original object ', function () {
                expect(hasOwnProperty(mutable, 'identifier')).toBe(true);
--- a/src/api/objects/object-utils.js
+++ b/src/api/objects/object-utils.js
@@ -165,12 +165,19 @@ define([
        return identifierEquals(a.identifier, b.identifier);
    }

+    function refresh(oldObject, newObject) {
+        let deleted = _.difference(Object.keys(oldObject), Object.keys(newObject));
+        deleted.forEach((propertyName) => delete oldObject[propertyName]);
+        Object.assign(oldObject, newObject);
+    }
+
    return {
        toOldFormat: toOldFormat,
        toNewFormat: toNewFormat,
        makeKeyString: makeKeyString,
        parseKeyString: parseKeyString,
        equals: objectEquals,
-        identifierEquals: identifierEquals
+        identifierEquals: identifierEquals,
+        refresh: refresh
    };
 });
--- a/src/plugins/condition/components/inspector/StylesView.vue
+++ b/src/plugins/condition/components/inspector/StylesView.vue
@@ -141,6 +141,7 @@ const NON_STYLEABLE_CONTAINER_TYPES = [
 const NON_STYLEABLE_LAYOUT_ITEM_TYPES = [
    'line-view',
    'box-view',
+    'ellipse-view',
    'image-view'
 ];

--- a/src/plugins/condition/pluginSpec.js
+++ b/src/plugins/condition/pluginSpec.js
@@ -230,7 +230,7 @@ describe('the plugin', function () {
        };
        const staticStyle = {
            "style": {
-                "backgroundColor": "#717171",
+                "backgroundColor": "#666666",
                "border": "1px solid #00ffff"
            }
        };
@@ -238,7 +238,7 @@ describe('the plugin', function () {
            "conditionId": "39584410-cbf9-499e-96dc-76f27e69885d",
            "style": {
                "isStyleInvisible": "",
-                "backgroundColor": "#717171",
+                "backgroundColor": "#666666",
                "border": "1px solid #ffff00"
            }
        };
@@ -250,7 +250,7 @@ describe('the plugin', function () {
                "configuration": {
                    "items": [
                        {
-                            "fill": "#717171",
+                            "fill": "#666666",
                            "stroke": "",
                            "x": 1,
                            "y": 1,
@@ -259,12 +259,22 @@ describe('the plugin', function () {
                            "type": "box-view",
                            "id": "89b88746-d325-487b-aec4-11b79afff9e8"
                        },
+                        {
+                            "fill": "#666666",
+                            "stroke": "",
+                            "x": 1,
+                            "y": 1,
+                            "width": 10,
+                            "height": 5,
+                            "type": "ellipse-view",
+                            "id": "19b88746-d325-487b-aec4-11b79afff9z8"
+                        },
                        {
                            "x": 18,
                            "y": 9,
                            "x2": 23,
                            "y2": 4,
-                            "stroke": "#717171",
+                            "stroke": "#666666",
                            "type": "line-view",
                            "id": "57d49a28-7863-43bd-9593-6570758916f0"
                        },
@@ -299,12 +309,12 @@ describe('the plugin', function () {
                "y": 9,
                "x2": 23,
                "y2": 4,
-                "stroke": "#717171",
+                "stroke": "#666666",
                "type": "line-view",
                "id": "57d49a28-7863-43bd-9593-6570758916f0"
            };
            boxLayoutItem = {
-                "fill": "#717171",
+                "fill": "#666666",
                "stroke": "",
                "x": 1,
                "y": 1,
--- a/src/plugins/condition/utils/styleUtils.js
+++ b/src/plugins/condition/utils/styleUtils.js
@@ -29,9 +29,10 @@ const styleProps = {
        noneValue: NONE_VALUE,
        applicableForType: type => {
            return !type ? true : (type === 'text-view'
-                                      || type === 'telemetry-view'
-                                      || type === 'box-view'
-                                      || type === 'subobject-view');
+                                            || type === 'telemetry-view'
+                                            || type === 'box-view'
+                                            || type === 'ellipse-view'
+                                            || type === 'subobject-view');
        }
    },
    border: {
@@ -41,6 +42,7 @@ const styleProps = {
            return !type ? true : (type === 'text-view'
                                            || type === 'telemetry-view'
                                            || type === 'box-view'
+                                            || type === 'ellipse-view'
                                            || type === 'image-view'
                                            || type === 'line-view'
                                            || type === 'subobject-view');
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@@ -149,6 +149,7 @@ define(['lodash'], function (_) {
                        return type === 'text-view'
                            || type === 'telemetry-view'
                            || type === 'box-view'
+                            || type === 'ellipse-view'
                            || type === 'image-view'
                            || type === 'line-view'
                            || type === 'subobject-view';
@@ -180,6 +181,10 @@ define(['lodash'], function (_) {
                                    "name": "Box",
                                    "class": "icon-box-round-corners"
                                },
+                                {
+                                    "name": "Ellipse",
+                                    "class": "icon-circle"
+                                },
                                {
                                    "name": "Line",
                                    "class": "icon-line-horz"
@@ -745,7 +750,7 @@ define(['lodash'], function (_) {
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
                        }
-                    } else if (layoutItem.type === 'box-view') {
+                    } else if (layoutItem.type === 'box-view' || layoutItem.type === 'ellipse-view') {
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
--- a/src/plugins/displayLayout/components/BoxView.vue
+++ b/src/plugins/displayLayout/components/BoxView.vue
@@ -43,7 +43,7 @@ import conditionalStylesMixin from '../mixins/objectStyles-mixin';
 export default {
    makeDefinition() {
        return {
-            fill: '#717171',
+            fill: '#666666',
            stroke: '',
            x: 1,
            y: 1,
--- a/src/plugins/displayLayout/components/DisplayLayout.vue
+++ b/src/plugins/displayLayout/components/DisplayLayout.vue
@@ -76,6 +76,7 @@ import uuid from 'uuid';
 import SubobjectView from './SubobjectView.vue';
 import TelemetryView from './TelemetryView.vue';
 import BoxView from './BoxView.vue';
+import EllipseView from './EllipseView.vue';
 import TextView from './TextView.vue';
 import LineView from './LineView.vue';
 import ImageView from './ImageView.vue';
@@ -112,6 +113,7 @@ const ITEM_TYPE_VIEW_MAP = {
    'subobject-view': SubobjectView,
    'telemetry-view': TelemetryView,
    'box-view': BoxView,
+    'ellipse-view': EllipseView,
    'line-view': LineView,
    'text-view': TextView,
    'image-view': ImageView
--- a/src/plugins/displayLayout/components/EditMarquee.vue
+++ b/src/plugins/displayLayout/components/EditMarquee.vue
@@ -28,19 +28,19 @@
 >
    <div
        class="c-frame-edit__handle c-frame-edit__handle--nw"
-        @mousedown="startResize([1,1], [-1,-1], $event)"
+        @mousedown.left="startResize([1,1], [-1,-1], $event)"
    ></div>
    <div
        class="c-frame-edit__handle c-frame-edit__handle--ne"
-        @mousedown="startResize([0,1], [1,-1], $event)"
+        @mousedown.left="startResize([0,1], [1,-1], $event)"
    ></div>
    <div
        class="c-frame-edit__handle c-frame-edit__handle--sw"
-        @mousedown="startResize([1,0], [-1,1], $event)"
+        @mousedown.left="startResize([1,0], [-1,1], $event)"
    ></div>
    <div
        class="c-frame-edit__handle c-frame-edit__handle--se"
-        @mousedown="startResize([0,0], [1,1], $event)"
+        @mousedown.left="startResize([0,0], [1,1], $event)"
    ></div>
 </div>
 </template>
--- a/src/plugins/displayLayout/components/EllipseView.vue
+++ b/src/plugins/displayLayout/components/EllipseView.vue
@@ -0,0 +1,122 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2021, 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.
+*****************************************************************************/
+
+<template>
+<layout-frame
+    :item="item"
+    :grid-size="gridSize"
+    :is-editing="isEditing"
+    @move="(gridDelta) => $emit('move', gridDelta)"
+    @endMove="() => $emit('endMove')"
+>
+    <div
+        class="c-ellipse-view u-style-receiver js-style-receiver"
+        :class="[styleClass]"
+        :style="style"
+    ></div>
+</layout-frame>
+</template>
+
+<script>
+import LayoutFrame from './LayoutFrame.vue';
+import conditionalStylesMixin from '../mixins/objectStyles-mixin';
+
+export default {
+    makeDefinition() {
+        return {
+            fill: '#666666',
+            stroke: '',
+            x: 1,
+            y: 1,
+            width: 10,
+            height: 10
+        };
+    },
+    components: {
+        LayoutFrame
+    },
+    mixins: [conditionalStylesMixin],
+    inject: ['openmct'],
+    props: {
+        item: {
+            type: Object,
+            required: true
+        },
+        gridSize: {
+            type: Array,
+            required: true,
+            validator: (arr) => arr && arr.length === 2
+                    && arr.every(el => typeof el === 'number')
+        },
+        index: {
+            type: Number,
+            required: true
+        },
+        initSelect: Boolean,
+        isEditing: {
+            type: Boolean,
+            required: true
+        }
+    },
+    computed: {
+        style() {
+            if (this.itemStyle) {
+                return this.itemStyle;
+            } else {
+                return {
+                    backgroundColor: this.item.fill,
+                    border: this.item.stroke ? '1px solid ' + this.item.stroke : ''
+                };
+            }
+        }
+    },
+    watch: {
+        index(newIndex) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.index = newIndex;
+        },
+        item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.layoutItem = newItem;
+        }
+    },
+    mounted() {
+        this.context = {
+            layoutItem: this.item,
+            index: this.index
+        };
+        this.removeSelectable = this.openmct.selection.selectable(
+            this.$el, this.context, this.initSelect);
+    },
+    destroyed() {
+        if (this.removeSelectable) {
+            this.removeSelectable();
+        }
+    }
+};
+</script>
--- a/src/plugins/displayLayout/components/LineView.vue
+++ b/src/plugins/displayLayout/components/LineView.vue
@@ -96,7 +96,7 @@ export default {
            y: 10,
            x2: 10,
            y2: 5,
-            stroke: '#717171'
+            stroke: '#666666'
        };
    },
    mixins: [conditionalStylesMixin],
--- a/src/plugins/displayLayout/components/box-and-line-views.scss
+++ b/src/plugins/displayLayout/components/box-and-line-views.scss
@@ -1,4 +1,5 @@
-.c-box-view {
+.c-box-view,
+.c-ellipse-view {
    border-width: $drawingObjBorderW !important;
    display: flex;
    align-items: stretch;
@@ -8,6 +9,10 @@
    }
 }

+.c-ellipse-view {
+    border-radius: 50%;
+}
+
 .c-line-view {
    &.c-frame {
        box-shadow: none !important;
--- a/src/plugins/displayLayout/pluginSpec.js
+++ b/src/plugins/displayLayout/pluginSpec.js
@@ -186,7 +186,7 @@ describe('the plugin', function () {
                'configuration': {
                    'items': [
                        {
-                            'fill': '#717171',
+                            'fill': '#666666',
                            'stroke': '',
                            'x': 1,
                            'y': 1,
@@ -195,12 +195,22 @@ describe('the plugin', function () {
                            'type': 'box-view',
                            'id': '89b88746-d325-487b-aec4-11b79afff9e8'
                        },
+                        {
+                            'fill': '#666666',
+                            'stroke': '',
+                            'x': 1,
+                            'y': 1,
+                            'width': 10,
+                            'height': 10,
+                            'type': 'ellipse-view',
+                            'id': '19b88746-d325-487b-aec4-11b79afff9z8'
+                        },
                        {
                            'x': 18,
                            'y': 9,
                            'x2': 23,
                            'y2': 4,
-                            'stroke': '#717171',
+                            'stroke': '#666666',
                            'type': 'line-view',
                            'id': '57d49a28-7863-43bd-9593-6570758916f0'
                        },
@@ -341,7 +351,7 @@ describe('the plugin', function () {
        it('provides controls including separators', () => {
            const displayLayoutToolbar = openmct.toolbars.get(selection);

-            expect(displayLayoutToolbar.length).toBe(9);
+            expect(displayLayoutToolbar.length).toBe(7);
        });
    });
 });
--- a/src/plugins/notebook/utils/notebook-storage.js
+++ b/src/plugins/notebook/utils/notebook-storage.js
@@ -103,10 +103,13 @@ export function validateNotebookStorageObject() {

    let valid = false;
    if (notebookStorage) {
-        Object.entries(notebookStorage).forEach(([key, value]) => {
+        const oldInvalidKeys = ['notebookMeta', 'page', 'section'];
+        valid = Object.entries(notebookStorage).every(([key, value]) => {
            const validKey = key !== undefined && key !== null;
            const validValue = value !== undefined && value !== null;
-            valid = validKey && validValue;
+            const hasOldInvalidKeys = oldInvalidKeys.includes(key);
+
+            return validKey && validValue && !hasOldInvalidKeys;
        });
    }

--- a/src/styles/_constants.scss
+++ b/src/styles/_constants.scss
@@ -154,6 +154,7 @@ $glyph-icon-flag: '\e92a';
 $glyph-icon-eye-disabled: '\e92b';
 $glyph-icon-notebook-page: '\e92c';
 $glyph-icon-unlocked: '\e92d';
+$glyph-icon-circle: '\e92e';
 $glyph-icon-arrows-right-left: '\ea00';
 $glyph-icon-arrows-up-down: '\ea01';
 $glyph-icon-bullet: '\ea02';
@@ -257,6 +258,7 @@ $glyph-icon-conditional: '\eb27';
 $glyph-icon-condition-widget: '\eb28';
 $glyph-icon-alphanumeric: '\eb29';
 $glyph-icon-image-telemetry: '\eb2a';
+$glyph-icon-telemetry-aggregate: '\eb2b';

 /************************** GLYPHS AS DATA URI */
 // Only objects have been converted, for use in Create menu and folder views
--- a/src/styles/_glyphs.scss
+++ b/src/styles/_glyphs.scss
@@ -85,6 +85,7 @@
 .icon-eye-disabled {  @include glyphBefore($glyph-icon-eye-disabled); }
 .icon-notebook-page {  @include glyphBefore($glyph-icon-notebook-page); }
 .icon-unlocked {  @include glyphBefore($glyph-icon-unlocked); }
+.icon-circle {  @include glyphBefore($glyph-icon-circle); }
 .icon-arrows-right-left {  @include glyphBefore($glyph-icon-arrows-right-left); }
 .icon-arrows-up-down {  @include glyphBefore($glyph-icon-arrows-up-down); }
 .icon-bullet {  @include glyphBefore($glyph-icon-bullet); }
@@ -188,6 +189,7 @@
 .icon-condition-widget {  @include glyphBefore($glyph-icon-condition-widget); }
 .icon-alphanumeric {  @include glyphBefore($glyph-icon-alphanumeric); }
 .icon-image-telemetry {  @include glyphBefore($glyph-icon-image-telemetry); }
+.icon-telemetry-aggregate {  @include glyphBefore($glyph-icon-telemetry-aggregate); }

 /************************** 12 PX CLASSES */
 // TODO: sync with 16px redo as of 10/25/18
--- a/src/styles/fonts/Open
+++ b/src/styles/fonts/Open
@@ -2,7 +2,7 @@
  "metadata": {
    "name": "Open MCT Symbols 16px",
    "lastOpened": 0,
-    "created": 1621648023886
+    "created": 1629996145999
  },
  "iconSets": [
    {
@@ -375,13 +375,21 @@
          "code": 59693,
          "tempChar": ""
        },
+        {
+          "order": 197,
+          "id": 169,
+          "name": "icon-circle",
+          "prevSize": 24,
+          "code": 59694,
+          "tempChar": ""
+        },
        {
          "order": 27,
          "id": 105,
          "name": "icon-arrows-right-left",
          "prevSize": 24,
          "code": 59904,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 26,
@@ -389,7 +397,7 @@
          "name": "icon-arrows-up-down",
          "prevSize": 24,
          "code": 59905,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 68,
@@ -397,7 +405,7 @@
          "name": "icon-bullet",
          "prevSize": 24,
          "code": 59906,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 150,
@@ -405,7 +413,7 @@
          "prevSize": 24,
          "code": 59907,
          "name": "icon-calendar",
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 45,
@@ -413,7 +421,7 @@
          "name": "icon-chain-links",
          "prevSize": 24,
          "code": 59908,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 73,
@@ -421,7 +429,7 @@
          "name": "icon-download",
          "prevSize": 24,
          "code": 59909,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 39,
@@ -429,7 +437,7 @@
          "name": "icon-duplicate",
          "prevSize": 24,
          "code": 59910,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 50,
@@ -437,7 +445,7 @@
          "name": "icon-folder-new",
          "prevSize": 24,
          "code": 59911,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 138,
@@ -445,7 +453,7 @@
          "name": "icon-fullscreen-collapse",
          "prevSize": 24,
          "code": 59912,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 139,
@@ -453,7 +461,7 @@
          "name": "icon-fullscreen-expand",
          "prevSize": 24,
          "code": 59913,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 122,
@@ -461,7 +469,7 @@
          "name": "icon-layers",
          "prevSize": 24,
          "code": 59914,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 151,
@@ -469,7 +477,7 @@
          "name": "icon-line-horz",
          "prevSize": 24,
          "code": 59915,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 100,
@@ -477,7 +485,7 @@
          "name": "icon-magnify",
          "prevSize": 24,
          "code": 59916,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 99,
@@ -485,7 +493,7 @@
          "name": "icon-magnify-in",
          "prevSize": 24,
          "code": 59917,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 101,
@@ -493,7 +501,7 @@
          "name": "icon-magnify-out-v2",
          "prevSize": 24,
          "code": 59918,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 103,
@@ -501,7 +509,7 @@
          "name": "icon-menu",
          "prevSize": 24,
          "code": 59919,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 124,
@@ -509,7 +517,7 @@
          "name": "icon-move",
          "prevSize": 24,
          "code": 59920,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 7,
@@ -517,7 +525,7 @@
          "name": "icon-new-window",
          "prevSize": 24,
          "code": 59921,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 63,
@@ -525,7 +533,7 @@
          "name": "icon-paint-bucket-v2",
          "prevSize": 24,
          "code": 59922,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 15,
@@ -533,7 +541,7 @@
          "name": "icon-pencil",
          "prevSize": 24,
          "code": 59923,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 54,
@@ -541,7 +549,7 @@
          "name": "icon-pencil-edit-in-place",
          "prevSize": 24,
          "code": 59924,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 40,
@@ -549,7 +557,7 @@
          "name": "icon-play",
          "prevSize": 24,
          "code": 59925,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 125,
@@ -557,7 +565,7 @@
          "name": "icon-pause",
          "prevSize": 24,
          "code": 59926,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 119,
@@ -565,7 +573,7 @@
          "name": "icon-plot-resource",
          "prevSize": 24,
          "code": 59927,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 48,
@@ -573,7 +581,7 @@
          "name": "icon-pointer-left",
          "prevSize": 24,
          "code": 59928,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 47,
@@ -581,7 +589,7 @@
          "name": "icon-pointer-right",
          "prevSize": 24,
          "code": 59929,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 85,
@@ -589,7 +597,7 @@
          "name": "icon-refresh",
          "prevSize": 24,
          "code": 59930,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 55,
@@ -597,7 +605,7 @@
          "name": "icon-save",
          "prevSize": 24,
          "code": 59931,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 56,
@@ -605,7 +613,7 @@
          "name": "icon-save-as",
          "prevSize": 24,
          "code": 59932,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 58,
@@ -613,7 +621,7 @@
          "name": "icon-sine",
          "prevSize": 24,
          "code": 59933,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 113,
@@ -621,7 +629,7 @@
          "name": "icon-font",
          "prevSize": 24,
          "code": 59934,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 41,
@@ -629,7 +637,7 @@
          "name": "icon-thumbs-strip",
          "prevSize": 24,
          "code": 59935,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 146,
@@ -637,7 +645,7 @@
          "name": "icon-two-parts-both",
          "prevSize": 24,
          "code": 59936,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 145,
@@ -645,7 +653,7 @@
          "name": "icon-two-parts-one-only",
          "prevSize": 24,
          "code": 59937,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 82,
@@ -653,7 +661,7 @@
          "name": "icon-resync",
          "prevSize": 24,
          "code": 59938,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 86,
@@ -661,7 +669,7 @@
          "name": "icon-reset",
          "prevSize": 24,
          "code": 59939,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 61,
@@ -669,7 +677,7 @@
          "name": "icon-x-in-circle",
          "prevSize": 24,
          "code": 59940,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 84,
@@ -677,7 +685,7 @@
          "name": "icon-brightness",
          "prevSize": 24,
          "code": 59941,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 83,
@@ -685,7 +693,7 @@
          "name": "icon-contrast",
          "prevSize": 24,
          "code": 59942,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 87,
@@ -693,7 +701,7 @@
          "name": "icon-expand",
          "prevSize": 24,
          "code": 59943,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 89,
@@ -701,7 +709,7 @@
          "name": "icon-list-view",
          "prevSize": 24,
          "code": 59944,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 133,
@@ -709,7 +717,7 @@
          "name": "icon-grid-snap-to",
          "prevSize": 24,
          "code": 59945,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 132,
@@ -717,7 +725,7 @@
          "name": "icon-grid-snap-no",
          "prevSize": 24,
          "code": 59946,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 94,
@@ -725,7 +733,7 @@
          "name": "icon-frame-show",
          "prevSize": 24,
          "code": 59947,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 95,
@@ -733,7 +741,7 @@
          "name": "icon-frame-hide",
          "prevSize": 24,
          "code": 59948,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 97,
@@ -741,7 +749,7 @@
          "name": "icon-import",
          "prevSize": 24,
          "code": 59949,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 96,
@@ -749,7 +757,7 @@
          "name": "icon-export",
          "prevSize": 24,
          "code": 59950,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 194,
@@ -757,7 +765,7 @@
          "name": "icon-font-size",
          "prevSize": 24,
          "code": 59951,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 163,
@@ -765,7 +773,7 @@
          "name": "icon-clear-data",
          "prevSize": 24,
          "code": 59952,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 173,
@@ -773,7 +781,7 @@
          "name": "icon-history",
          "prevSize": 24,
          "code": 59953,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 181,
@@ -781,7 +789,7 @@
          "name": "icon-arrow-up-to-parent",
          "prevSize": 24,
          "code": 59954,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 184,
@@ -789,7 +797,7 @@
          "name": "icon-crosshair-in-circle",
          "prevSize": 24,
          "code": 59955,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 185,
@@ -797,7 +805,7 @@
          "name": "icon-target",
          "prevSize": 24,
          "code": 59956,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 187,
@@ -805,7 +813,7 @@
          "name": "icon-items-collapse",
          "prevSize": 24,
          "code": 59957,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 188,
@@ -813,7 +821,7 @@
          "name": "icon-items-expand",
          "prevSize": 24,
          "code": 59958,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 190,
@@ -821,7 +829,7 @@
          "name": "icon-3-dots",
          "prevSize": 24,
          "code": 59959,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 193,
@@ -829,7 +837,7 @@
          "name": "icon-grid-on",
          "prevSize": 24,
          "code": 59960,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 192,
@@ -837,7 +845,7 @@
          "name": "icon-grid-off",
          "prevSize": 24,
          "code": 59961,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 191,
@@ -845,7 +853,7 @@
          "name": "icon-camera",
          "prevSize": 24,
          "code": 59962,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 196,
@@ -853,7 +861,7 @@
          "name": "icon-folders-collapse",
          "prevSize": 24,
          "code": 59963,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 144,
@@ -861,7 +869,7 @@
          "name": "icon-activity",
          "prevSize": 24,
          "code": 60160,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 104,
@@ -869,7 +877,7 @@
          "name": "icon-activity-mode",
          "prevSize": 24,
          "code": 60161,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 137,
@@ -877,7 +885,7 @@
          "name": "icon-autoflow-tabular",
          "prevSize": 24,
          "code": 60162,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 115,
@@ -885,7 +893,7 @@
          "name": "icon-clock",
          "prevSize": 24,
          "code": 60163,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 2,
@@ -893,7 +901,7 @@
          "name": "icon-database",
          "prevSize": 24,
          "code": 60164,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 3,
@@ -901,7 +909,7 @@
          "name": "icon-database-query",
          "prevSize": 24,
          "code": 60165,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 67,
@@ -909,7 +917,7 @@
          "name": "icon-dataset",
          "prevSize": 24,
          "code": 60166,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 59,
@@ -917,7 +925,7 @@
          "name": "icon-datatable",
          "prevSize": 24,
          "code": 60167,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 136,
@@ -925,7 +933,7 @@
          "name": "icon-dictionary",
          "prevSize": 24,
          "code": 60168,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 51,
@@ -933,7 +941,7 @@
          "name": "icon-folder",
          "prevSize": 24,
          "code": 60169,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 147,
@@ -941,7 +949,7 @@
          "name": "icon-image",
          "prevSize": 24,
          "code": 60170,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 4,
@@ -949,7 +957,7 @@
          "name": "icon-layout",
          "prevSize": 24,
          "code": 60171,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 24,
@@ -957,7 +965,7 @@
          "name": "icon-object",
          "prevSize": 24,
          "code": 60172,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 52,
@@ -965,7 +973,7 @@
          "name": "icon-object-unknown",
          "prevSize": 24,
          "code": 60173,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 105,
@@ -973,7 +981,7 @@
          "name": "icon-packet",
          "prevSize": 24,
          "code": 60174,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 126,
@@ -981,7 +989,7 @@
          "name": "icon-page",
          "prevSize": 24,
          "code": 60175,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 130,
@@ -989,7 +997,7 @@
          "name": "icon-plot-overlay",
          "prevSize": 24,
          "code": 60176,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 80,
@@ -997,7 +1005,7 @@
          "name": "icon-plot-stacked",
          "prevSize": 24,
          "code": 60177,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 134,
@@ -1005,7 +1013,7 @@
          "name": "icon-session",
          "prevSize": 24,
          "code": 60178,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 109,
@@ -1013,7 +1021,7 @@
          "name": "icon-tabular",
          "prevSize": 24,
          "code": 60179,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 107,
@@ -1021,7 +1029,7 @@
          "name": "icon-tabular-lad",
          "prevSize": 24,
          "code": 60180,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 106,
@@ -1029,7 +1037,7 @@
          "name": "icon-tabular-lad-set",
          "prevSize": 24,
          "code": 60181,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 70,
@@ -1037,7 +1045,7 @@
          "name": "icon-tabular-realtime",
          "prevSize": 24,
          "code": 60182,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 60,
@@ -1045,7 +1053,7 @@
          "name": "icon-tabular-scrolling",
          "prevSize": 24,
          "code": 60183,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 131,
@@ -1053,7 +1061,7 @@
          "name": "icon-telemetry",
          "prevSize": 24,
          "code": 60184,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 108,
@@ -1061,7 +1069,7 @@
          "name": "icon-timeline",
          "prevSize": 24,
          "code": 60185,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 81,
@@ -1069,7 +1077,7 @@
          "name": "icon-timer",
          "prevSize": 24,
          "code": 60186,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 69,
@@ -1077,7 +1085,7 @@
          "name": "icon-topic",
          "prevSize": 24,
          "code": 60187,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 79,
@@ -1085,7 +1093,7 @@
          "name": "icon-box-with-dashed-lines-v2",
          "prevSize": 24,
          "code": 60188,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 90,
@@ -1093,7 +1101,7 @@
          "name": "icon-summary-widget",
          "prevSize": 24,
          "code": 60189,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 92,
@@ -1101,7 +1109,7 @@
          "name": "icon-notebook",
          "prevSize": 24,
          "code": 60190,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 168,
@@ -1109,7 +1117,7 @@
          "name": "icon-tabs-view",
          "prevSize": 24,
          "code": 60191,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 117,
@@ -1117,7 +1125,7 @@
          "name": "icon-flexible-layout",
          "prevSize": 24,
          "code": 60192,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 166,
@@ -1125,7 +1133,7 @@
          "name": "icon-generator-sine",
          "prevSize": 24,
          "code": 60193,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 167,
@@ -1133,7 +1141,7 @@
          "name": "icon-generator-event",
          "prevSize": 24,
          "code": 60194,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 165,
@@ -1141,7 +1149,7 @@
          "name": "icon-gauge-v2",
          "prevSize": 24,
          "code": 60195,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 170,
@@ -1149,7 +1157,7 @@
          "name": "icon-spectra",
          "prevSize": 24,
          "code": 60196,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 171,
@@ -1157,7 +1165,7 @@
          "name": "icon-telemetry-spectra",
          "prevSize": 24,
          "code": 60197,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 172,
@@ -1165,7 +1173,7 @@
          "name": "icon-pushbutton",
          "prevSize": 24,
          "code": 60198,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 174,
@@ -1173,7 +1181,7 @@
          "name": "icon-conditional",
          "prevSize": 24,
          "code": 60199,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 178,
@@ -1181,7 +1189,7 @@
          "name": "icon-condition-widget",
          "prevSize": 24,
          "code": 60200,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 180,
@@ -1189,7 +1197,7 @@
          "name": "icon-alphanumeric",
          "prevSize": 24,
          "code": 60201,
-          "tempChar": ""
+          "tempChar": ""
        },
        {
          "order": 183,
@@ -1197,7 +1205,15 @@
          "name": "icon-image-telemetry",
          "prevSize": 24,
          "code": 60202,
-          "tempChar": ""
+          "tempChar": ""
+        },
+        {
+          "order": 198,
+          "id": 170,
+          "name": "icon-telemetry-aggregate",
+          "prevSize": 24,
+          "code": 60203,
+          "tempChar": ""
        }
      ],
      "id": 0,
@@ -2000,6 +2016,26 @@
            ]
          }
        },
+        {
+          "id": 169,
+          "paths": [
+            "M1024 512c0 282.77-229.23 512-512 512s-512-229.23-512-512c0-282.77 229.23-512 512-512s512 229.23 512 512z"
+          ],
+          "attrs": [
+            {}
+          ],
+          "isMulticolor": false,
+          "isMulticolor2": false,
+          "grid": 16,
+          "tags": [
+            "icon-circle"
+          ],
+          "colorPermutations": {
+            "12552552551": [
+              {}
+            ]
+          }
+        },
        {
          "id": 105,
          "paths": [
@@ -3784,6 +3820,32 @@
              {}
            ]
          }
+        },
+        {
+          "id": 170,
+          "paths": [
+            "M78 395.44c14-41.44 37.48-100.8 69.2-148.36 38.62-57.78 82.38-87.080 130.14-87.080s91.5 29.3 130 87.080c31.72 47.56 55.14 106.92 69.2 148.36 30.88 90.96 63.12 134.98 78 146.54 14.94-11.56 47.2-55.58 78-146.54 14-41.44 37.48-100.8 69.22-148.36q27.8-41.7 59.12-63.5c-75.7-111.377-201.81-183.58-344.783-183.58-0.034 0-0.068 0-0.103 0l0.006-0c-229.76 0-416 186.24-416 416-0 0.071-0 0.156-0 0.24 0 39.119 5.396 76.977 15.484 112.871l-0.704-2.931c16.78-21.74 40.4-63.34 63.22-130.74z",
+            "M754 436.56c-14 41.44-37.48 100.8-69.2 148.36-38.56 57.78-82.32 87.080-130 87.080s-91.5-29.3-130-87.080c-31.72-47.56-55.14-106.92-69.2-148.36-30.88-90.96-63.14-134.98-78-146.54-14.94 11.56-47.2 55.58-78 146.54-14.38 41.44-37.8 100.8-69.6 148.36q-27.8 41.7-59.12 63.5c75.7 111.378 201.81 183.58 344.783 183.58 0.119 0 0.237-0 0.356-0l-0.019 0c229.76 0 416-186.24 416-416 0-0.071 0-0.156 0-0.24 0-39.119-5.396-76.977-15.484-112.871l0.704 2.931c-16.78 21.74-40.4 63.34-63.22 130.74z",
+            "M921.56 334.62c4.098 24.449 6.44 52.617 6.44 81.332 0 0.017-0 0.034-0 0.051l0-0.003c0 0.095 0 0.208 0 0.32 0 282.593-229.087 511.68-511.68 511.68-0.113 0-0.225-0-0.338-0l0.018 0c-0.014 0-0.031 0-0.048 0-28.716 0-56.884-2.342-84.325-6.845l2.993 0.405c72.483 63.623 168.109 102.44 272.802 102.44 0.203 0 0.406-0 0.61-0l-0.031 0c229.76 0 416-186.24 416-416 0-0.172 0-0.375 0-0.578 0-104.692-38.817-200.319-102.844-273.271l0.404 0.47z"
+          ],
+          "attrs": [
+            {},
+            {},
+            {}
+          ],
+          "isMulticolor": false,
+          "isMulticolor2": false,
+          "grid": 16,
+          "tags": [
+            "icon-telemetry-aggregate"
+          ],
+          "colorPermutations": {
+            "12552552551": [
+              {},
+              {},
+              {}
+            ]
+          }
        }
      ],
      "invisible": false,
--- a/src/styles/fonts/Open-MCT-Symbols-16px.svg
+++ b/src/styles/fonts/Open-MCT-Symbols-16px.svg
@@ -53,6 +53,7 @@
 <glyph unicode="&#xe92b;" glyph-name="icon-eye-disabled" d="M209.46 223.32q-7.46 9.86-14.26 20.28c-14.737 21.984-27.741 47.184-37.759 73.847l-0.841 2.553c11.078 29.259 24.068 54.443 39.51 77.869l-0.91-1.469c23.221 34.963 50.705 64.8 82.207 89.793l0.793 0.607c57.663 45.719 130.179 75.053 209.311 79.947l1.069 0.053 114.48 140.88c-27.366 5.017-58.869 7.898-91.041 7.92h-0.019c-245.8 0-452.2-168-510.8-395.6 21.856-82.93 60.906-154.847 113.325-214.773l-0.525 0.613zM814.76 416.92q7.52-10 14.44-20.52c14.737-21.984 27.741-47.184 37.759-73.847l0.841-2.553c-10.859-29.216-23.863-54.416-39.447-77.748l0.847 1.348c-23.221-34.963-50.705-64.8-82.207-89.793l-0.793-0.607c-57.762-45.834-130.437-75.216-209.743-80.049l-1.057-0.051-114.46-140.86c27.346-4.988 58.817-7.84 90.955-7.84 0.037 0 0.074 0 0.111 0h-0.005c245.8 0 452.2 168 510.8 395.6-21.856 82.93-60.906 154.847-113.325 214.773l0.525-0.613zM832 832l-832-1024h192l832 1024h-192z" />
 <glyph unicode="&#xe92c;" glyph-name="icon-notebook-page" d="M830 770h-830l-4-702c0-106.6 87.4-194 194-194h640c106.6 0 194 87.4 194 194v508c0 106.8-87.4 194-194 194zM832 386l-384-384-192 192v256l192-192 384 384v-256z" />
 <glyph unicode="&#xe92d;" glyph-name="icon-unlocked" d="M768 832c-141.339-0.114-255.886-114.661-256-255.989v-128.011h-448c-35.301-0.113-63.887-28.699-64-63.989v-512.011c0.113-35.301 28.699-63.887 63.989-64h638.011c35.301 0.113 63.887 28.699 64 63.989v512.011c-0.113 35.301-28.699 63.887-63.989 64h-62.011v128c0 70.692 57.308 128 128 128s128-57.308 128-128v0-128h128v128c-0.114 141.339-114.661 255.886-255.989 256h-0.011z" />
+<glyph unicode="&#xe92e;" glyph-name="icon-circle" d="M1024 320c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 282.77 229.23 512 512 512s512-229.23 512-512z" />
 <glyph unicode="&#xea00;" glyph-name="icon-arrows-right-left" d="M1024 320l-448-512v1024zM448 832l-448-512 448-512z" />
 <glyph unicode="&#xea01;" glyph-name="icon-arrows-up-down" d="M512 832l512-448h-1024zM0 256l512-448 512 448z" />
 <glyph unicode="&#xea02;" glyph-name="icon-bullet" d="M832 80c0-44-36-80-80-80h-480c-44 0-80 36-80 80v480c0 44 36 80 80 80h480c44 0 80-36 80-80v-480z" />
@@ -156,4 +157,5 @@
 <glyph unicode="&#xeb28;" glyph-name="icon-condition-widget" d="M832 832h-640c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM512 64l-384 256 384 256 384-256z" />
 <glyph unicode="&#xeb29;" glyph-name="icon-alphanumeric" d="M535.6 301.4c-8.4-1.6-17.2-3-26.2-4s-18.2-2.4-27.2-4c-10.196-1.861-18.808-4.010-27.21-6.633l1.61 0.433c-8.609-2.674-16.105-6.348-22.89-10.987l0.29 0.187c-6.693-4.517-12.283-10.107-16.663-16.585l-0.137-0.215c-4.6-6.8-7.4-15.6-8.8-26s-0.4-18.4 2.4-25.2c2.746-6.688 7.224-12.195 12.881-16.122l0.119-0.078c5.967-4.053 13.057-6.94 20.704-8.161l0.296-0.039c7.592-1.527 16.319-2.4 25.25-2.4 0.123 0 0.246 0 0.369 0h-0.019c22.2 0 39.6 3.6 52.6 11s23.2 16.2 30.2 26.4c6.273 8.873 11.271 19.191 14.426 30.285l0.174 0.715c1.853 6.809 3.601 15.41 4.855 24.169l0.145 1.231 5.2 41.6c-5.4-4.217-11.723-7.564-18.583-9.689l-0.417-0.111c-6.489-2.241-14.362-4.255-22.444-5.662l-0.956-0.138zM1024 448v192h-152l24 192h-192l-24-192h-256l24 192h-192l-24-192h-232v-192h208l-32-256h-176v-192h152l-24-192h192l24 192h256l-24-192h192l24 192h232v192h-208l32 256zM702.8 420.2l-26.4-211.8c-2.231-15.809-3.537-34.122-3.6-52.727v-0.073c0-16.8 2.2-29.4 6.4-37.8h-113.4c-1.342 5.556-2.338 12.122-2.781 18.84l-0.019 0.36c-0.261 3.524-0.409 7.634-0.409 11.778 0 2.962 0.076 5.907 0.226 8.832l-0.017-0.41c-18.663-17.401-41.395-30.694-66.597-38.289l-1.203-0.311c-22.627-6.956-48.639-10.974-75.586-11h-0.014c-0.764-0.011-1.666-0.018-2.569-0.018-18.098 0-35.598 2.563-52.156 7.345l1.325-0.328c-15.991 4.512-29.851 12.090-41.545 22.122l0.145-0.122c-11.233 9.982-19.792 22.733-24.624 37.192l-0.176 0.608c-5.2 15.2-6.4 33.4-3.8 54.4s9.4 42.2 19.4 57.2c9.524 14.399 21.535 26.346 35.532 35.512l0.468 0.288c13.387 8.662 28.922 15.533 45.512 19.765l1.088 0.235c13.436 3.792 30.801 7.554 48.47 10.41l2.93 0.39c17 2.6 33.8 4.6 50.4 6.2 16.628 1.527 31.69 4.070 46.349 7.643l-2.149-0.443c13 3 23.6 7.6 31.6 13.6s12.6 15 13.6 26.4 0.8 21.8-2.4 28.8c-2.849 6.902-7.542 12.56-13.468 16.517l-0.132 0.083c-6.217 4.011-13.604 6.78-21.543 7.774l-0.257 0.026c-7.897 1.277-17 2.007-26.274 2.007-0.537 0-1.073-0.002-1.609-0.007l0.082 0.001c-22 0-40-4.6-53.8-14.2s-23-25.2-28-47.2h-111.8c4.8 26.2 14.2 48 27.8 65.4 13.475 16.978 29.89 30.968 48.574 41.377l0.826 0.423c18.192 10.038 39.297 17.806 61.619 22.175l1.381 0.225c20.488 4.162 44.053 6.563 68.171 6.6h0.029c21.8-0.005 43.239-1.532 64.222-4.479l-2.422 0.279c20.641-2.809 39.324-8.783 56.401-17.461l-1.001 0.461c15.909-8.108 28.858-20.031 37.967-34.601l0.233-0.399c9-15 12.2-34.8 9-59.6z" />
 <glyph unicode="&#xeb2a;" glyph-name="icon-image-telemetry" d="M512 832c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM783.6 48.4c-69.581-69.675-165.757-112.776-272-112.776-212.298 0-384.4 172.102-384.4 384.4s172.102 384.4 384.4 384.4c212.298 0 384.4-172.102 384.4-384.4 0-0.008 0-0.017 0-0.025v0.001c0.001-0.264 0.001-0.575 0.001-0.887 0-105.769-42.964-201.503-112.391-270.703l-0.010-0.010zM704 448l-128-128-192 192-192-192c0-176.731 143.269-320 320-320s320 143.269 320 320v0z" />
+<glyph unicode="&#xeb2b;" glyph-name="icon-telemetry-aggregate" d="M78 436.56c14 41.44 37.48 100.8 69.2 148.36 38.62 57.78 82.38 87.080 130.14 87.080s91.5-29.3 130-87.080c31.72-47.56 55.14-106.92 69.2-148.36 30.88-90.96 63.12-134.98 78-146.54 14.94 11.56 47.2 55.58 78 146.54 14 41.44 37.48 100.8 69.22 148.36q27.8 41.7 59.12 63.5c-75.7 111.377-201.81 183.58-344.783 183.58-0.034 0-0.068 0-0.103 0h0.006c-229.76 0-416-186.24-416-416 0-0.071 0-0.156 0-0.24 0-39.119 5.396-76.977 15.484-112.871l-0.704 2.931c16.78 21.74 40.4 63.34 63.22 130.74zM754 395.44c-14-41.44-37.48-100.8-69.2-148.36-38.56-57.78-82.32-87.080-130-87.080s-91.5 29.3-130 87.080c-31.72 47.56-55.14 106.92-69.2 148.36-30.88 90.96-63.14 134.98-78 146.54-14.94-11.56-47.2-55.58-78-146.54-14.38-41.44-37.8-100.8-69.6-148.36q-27.8-41.7-59.12-63.5c75.7-111.378 201.81-183.58 344.783-183.58 0.119 0 0.237 0 0.356 0h-0.019c229.76 0 416 186.24 416 416 0 0.071 0 0.156 0 0.24 0 39.119-5.396 76.977-15.484 112.871l0.704-2.931c-16.78-21.74-40.4-63.34-63.22-130.74zM921.56 497.38c4.098-24.449 6.44-52.617 6.44-81.332 0-0.017 0-0.034 0-0.051v0.003c0-0.095 0-0.208 0-0.32 0-282.593-229.087-511.68-511.68-511.68-0.113 0-0.225 0-0.338 0h0.018c-0.014 0-0.031 0-0.048 0-28.716 0-56.884 2.342-84.325 6.845l2.993-0.405c72.483-63.623 168.109-102.44 272.802-102.44 0.203 0 0.406 0 0.61 0h-0.031c229.76 0 416 186.24 416 416 0 0.172 0 0.375 0 0.578 0 104.692-38.817 200.319-102.844 273.271l0.404-0.47z" />
 </font></defs></svg>
--- a/src/styles/fonts/Open-MCT-Symbols-16px.ttf
+++ b/src/styles/fonts/Open-MCT-Symbols-16px.ttf
--- a/src/styles/fonts/Open-MCT-Symbols-16px.woff
+++ b/src/styles/fonts/Open-MCT-Symbols-16px.woff
Author	SHA1	Message	Date
Andrew Henry	6526f3d685	Adds a function to the Object API	2021-09-02 15:58:53 -07:00
John Hill	b1b4266ff3	Add automated security scanning to our repo (#4166 )	2021-08-30 15:44:25 -07:00
Charles Hacskaylo	42b0148f93	Add new icon for aggregate telemetry (#4163 )	2021-08-30 11:19:47 -07:00
Charles Hacskaylo	9461ad8edd	Add new Ellipse drawing object in Display Layouts (#4153 ) * Add new ellipse drawing object to Display Layouts - Fix test and linting issues; Co-authored-by: Shefali Joshi <simplyrender@gmail.com>	2021-08-30 13:29:05 -04:00
Shefali Joshi	40055ba955	Prepare for sprint 1.7.8 (#4156 )	2021-08-27 04:55:30 -07:00
Shefali Joshi	9cb85ad176	1.7.7 merge into master (#4155 ) * Merge 1.7.7 sprint branch into master Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov> Co-authored-by: Khalid Adil <khalidadil29@gmail.com>	2021-08-27 04:44:23 -07:00