Bump version to 2.1.4

CONTRIBUTING.md

@@ -10,7 +10,7 @@ accept changes from external contributors.
 
 The short version:
 
-1. Write your contribution or describe your idea in the form of a [GitHub issue](https://github.com/nasa/openmct/issues/new/choose) or [start a GitHub discussion](https://github.com/nasa/openmct/discussions).
+1. Write your contribution or describe your idea in the form of an [GitHub issue](https://github.com/nasa/openmct/issues/new/choose) or [Starting a GitHub Discussion](https://github.com/nasa/openmct/discussions)
 2. Make sure your contribution meets code, test, and commit message
    standards as described below.
 3. Submit a pull request from a topic branch back to `master`. Include a check

e2e/tests/functional/plugins/plot/plotRendering.e2e.spec.js

@@ -26,7 +26,7 @@
 */
 
 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults} = require('../../../../appActions');
+const { createDomainObjectWithDefaults } = require('../../../../appActions');
 
 test.describe('Plot Integrity Testing @unstable', () => {
     let sineWaveGeneratorObject;
@@ -40,6 +40,7 @@ test.describe('Plot Integrity Testing @unstable', () => {
     test('Plots do not re-request data when a plot is clicked', async ({ page }) => {
         //Navigate to Sine Wave Generator
         await page.goto(sineWaveGeneratorObject.url);
+        //Capture the number of plots points and store as const name numberOfPlotPoints
         //Click on the plot canvas
         await page.locator('canvas').nth(1).click();
         //No request was made to get historical data
@@ -50,90 +51,4 @@ test.describe('Plot Integrity Testing @unstable', () => {
         });
         expect(createMineFolderRequests.length).toEqual(0);
     });
-
-    test('Plot is rendered when infinity values exist', async ({ page }) => {
-        // Edit Plot
-        await editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject);
-
-        //Get pixel data from Canvas
-        const plotPixelSize = await getCanvasPixelsWithData(page);
-        expect(plotPixelSize).toBeGreaterThan(0);
-    });
 });
-
-/**
- * This function edits a sine wave generator with the default options and enables the infinity values option.
- *
- * @param {import('@playwright/test').Page} page
- * @param {import('../../../../appActions').CreateObjectInfo} sineWaveGeneratorObject
- * @returns {Promise<CreatedObjectInfo>} An object containing information about the edited domain object.
- */
-async function editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject) {
-    await page.goto(sineWaveGeneratorObject.url);
-    // Edit LAD table
-    await page.locator('[title="More options"]').click();
-    await page.locator('[title="Edit properties of this object."]').click();
-    // Modify the infinity option to true
-    const infinityInput = page.locator('[aria-label="Include Infinity Values"]');
-    await infinityInput.click();
-
-    // Click OK button and wait for Navigate event
-    await Promise.all([
-        page.waitForLoadState(),
-        page.click('[aria-label="Save"]'),
-        // Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
-
-    // FIXME: Changes to SWG properties should be reflected on save, but they're not?
-    // Thus, navigate away and back to the object.
-    await page.goto('./#/browse/mine');
-    await page.goto(sineWaveGeneratorObject.url);
-
-    await page.locator('c-progress-bar c-telemetry-table__progress-bar').waitFor({
-        state: 'hidden'
-    });
-
-    // FIXME: The progress bar disappears on series data load, not on plot render,
-    // so wait for a half a second before evaluating the canvas.
-    // eslint-disable-next-line playwright/no-wait-for-timeout
-    await page.waitForTimeout(500);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getCanvasPixelsWithData(page) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getCanvasValue', resolve));
-
-    await page.evaluate(() => {
-        // The document canvas is where the plot points and lines are drawn.
-        // The only way to access the canvas is using document (using page.evaluate)
-        let data;
-        let canvas;
-        let ctx;
-        canvas = document.querySelector('canvas');
-        ctx = canvas.getContext('2d');
-        data = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
-        const imageDataValues = Object.values(data);
-        let plotPixels = [];
-        // Each pixel consists of four values within the ImageData.data array. The for loop iterates by multiples of four.
-        // The values associated with each pixel are R (red), G (green), B (blue), and A (alpha), in that order.
-        for (let i = 0; i < imageDataValues.length;) {
-            if (imageDataValues[i] > 0) {
-                plotPixels.push({
-                    startIndex: i,
-                    endIndex: i + 3,
-                    value: `rgb(${imageDataValues[i]}, ${imageDataValues[i + 1]}, ${imageDataValues[i + 2]}, ${imageDataValues[i + 3]})`
-                });
-            }
-
-            i = i + 4;
-
-        }
-
-        window.getCanvasValue(plotPixels.length);
-    });
-
-    return getTelemValuePromise;
-}

example/generator/GeneratorProvider.js

@@ -33,8 +33,7 @@ define([
         dataRateInHz: 1,
         randomness: 0,
         phase: 0,
-        loadDelay: 0,
-        infinityValues: false
+        loadDelay: 0
     };
 
     function GeneratorProvider(openmct) {
@@ -57,8 +56,7 @@ define([
             'dataRateInHz',
             'randomness',
             'phase',
-            'loadDelay',
-            'infinityValues'
+            'loadDelay'
         ];
 
         request = request || {};

example/generator/generatorWorker.js

@@ -76,10 +76,10 @@
                             name: data.name,
                             utc: nextStep,
                             yesterday: nextStep - 60 * 60 * 24 * 1000,
-                            sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness, data.infinityValues),
+                            sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness),
                             wavelengths: wavelengths(),
                             intensities: intensities(),
-                            cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness, data.infinityValues)
+                            cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness)
                         }
                     });
                     nextStep += step;
@@ -117,7 +117,6 @@
         var phase = request.phase;
         var randomness = request.randomness;
         var loadDelay = Math.max(request.loadDelay, 0);
-        var infinityValues = request.infinityValues;
 
         var step = 1000 / dataRateInHz;
         var nextStep = start - (start % step) + step;
@@ -128,10 +127,10 @@
             data.push({
                 utc: nextStep,
                 yesterday: nextStep - 60 * 60 * 24 * 1000,
-                sin: sin(nextStep, period, amplitude, offset, phase, randomness, infinityValues),
+                sin: sin(nextStep, period, amplitude, offset, phase, randomness),
                 wavelengths: wavelengths(),
                 intensities: intensities(),
-                cos: cos(nextStep, period, amplitude, offset, phase, randomness, infinityValues)
+                cos: cos(nextStep, period, amplitude, offset, phase, randomness)
             });
         }
 
@@ -156,20 +155,12 @@
         });
     }
 
-    function cos(timestamp, period, amplitude, offset, phase, randomness, infinityValues) {
-        if (infinityValues && Math.random() > 0.5) {
-            return Number.POSITIVE_INFINITY;
-        }
-
+    function cos(timestamp, period, amplitude, offset, phase, randomness) {
         return amplitude
             * Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
-    function sin(timestamp, period, amplitude, offset, phase, randomness, infinityValues) {
-        if (infinityValues && Math.random() > 0.5) {
-            return Number.POSITIVE_INFINITY;
-        }
-
+    function sin(timestamp, period, amplitude, offset, phase, randomness) {
         return amplitude
             * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }

example/generator/plugin.js

@@ -143,16 +143,6 @@ define([
                         "telemetry",
                         "loadDelay"
                     ]
-                },
-                {
-                    name: "Include Infinity Values",
-                    control: "toggleSwitch",
-                    cssClass: "l-input",
-                    key: "infinityValues",
-                    property: [
-                        "telemetry",
-                        "infinityValues"
-                    ]
                 }
             ],
             initialize: function (object) {
@@ -163,8 +153,7 @@ define([
                     dataRateInHz: 1,
                     phase: 0,
                     randomness: 0,
-                    loadDelay: 0,
-                    infinityValues: false
+                    loadDelay: 0
                 };
             }
         });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "2.1.5-SNAPSHOT",
+  "version": "2.1.4",
   "description": "The Open MCT core platform",
   "devDependencies": {
     "@babel/eslint-parser": "7.18.9",
@@ -8,9 +8,9 @@
     "@percy/cli": "1.16.0",
     "@percy/playwright": "1.0.4",
     "@playwright/test": "1.25.2",
-    "@types/jasmine": "4.3.1",
+    "@types/jasmine": "4.3.0",
     "@types/lodash": "4.14.191",
-    "babel-loader": "9.1.0",
+    "babel-loader": "9.0.0",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
     "comma-separated-values": "3.6.4",
@@ -19,7 +19,7 @@
     "d3-axis": "3.0.0",
     "d3-scale": "3.3.0",
     "d3-selection": "3.0.0",
-    "eslint": "8.29.0",
+    "eslint": "8.28.0",
     "eslint-plugin-compat": "4.0.2",
     "eslint-plugin-playwright": "0.11.2",
     "eslint-plugin-vue": "9.8.0",
@@ -42,7 +42,7 @@
     "karma-webpack": "5.0.0",
     "location-bar": "3.0.1",
     "lodash": "4.17.21",
-    "mini-css-extract-plugin": "2.7.2",
+    "mini-css-extract-plugin": "2.6.1",
     "moment": "2.29.4",
     "moment-duration-format": "2.3.2",
     "moment-timezone": "0.5.38",
@@ -57,7 +57,7 @@
     "sass-loader": "13.0.2",
     "sinon": "14.0.1",
     "style-loader": "^3.3.1",
-    "typescript": "4.9.4",
+    "typescript": "4.9.3",
     "uuid": "9.0.0",
     "vue": "2.6.14",
     "vue-eslint-parser": "9.1.0",

src/api/forms/components/controls/ToggleSwitchField.vue

@@ -29,7 +29,6 @@
         <ToggleSwitch
             id="switchId"
             :checked="isChecked"
-            :name="model.name"
             @change="toggleCheckBox"
         />
     </span>

src/plugins/imagery/components/ImageryView.vue

@@ -25,7 +25,7 @@
     tabindex="0"
     class="c-imagery"
     @keyup="arrowUpHandler"
-    @keydown.prevent="arrowDownHandler"
+    @keydown="arrowDownHandler"
     @mouseover="focusElement"
 >
     <div
@@ -147,7 +147,7 @@
                     v-if="!isFixed"
                     class="c-button icon-pause pause-play"
                     :class="{'is-paused': isPaused}"
-                    @click="handlePauseButton(!isPaused)"
+                    @click="paused(!isPaused)"
                 ></button>
             </div>
         </div>
@@ -165,9 +165,6 @@
         <div
             ref="thumbsWrapper"
             class="c-imagery__thumbs-scroll-area"
-            :class="[{
-                'animate-scroll': animateThumbScroll
-            }]"
             @scroll="handleScroll"
         >
             <ImageThumbnail
@@ -185,7 +182,7 @@
         <button
             class="c-imagery__auto-scroll-resume-button c-icon-button icon-play"
             title="Resume automatic scrolling of image thumbnails"
-            @click="scrollToRight"
+            @click="scrollToRight('reset')"
         ></button>
     </div>
 </div>
@@ -195,7 +192,6 @@
 import eventHelpers from '../lib/eventHelpers';
 import _ from 'lodash';
 import moment from 'moment';
-import Vue from 'vue';
 
 import RelatedTelemetry from './RelatedTelemetry/RelatedTelemetry';
 import Compass from './Compass/Compass.vue';
@@ -293,8 +289,7 @@ export default {
             pan: undefined,
             animateZoom: true,
             imagePanned: false,
-            forceShowThumbnails: false,
-            animateThumbScroll: false
+            forceShowThumbnails: false
         };
     },
     computed: {
@@ -398,12 +393,6 @@ export default {
 
             return disabled;
         },
-        isComposedInLayout() {
-            return (
-                this.currentView?.objectPath
-                && !this.openmct.router.isNavigatedObject(this.currentView.objectPath)
-            );
-        },
         focusedImage() {
             return this.imageHistory[this.focusedImageIndex];
         },
@@ -581,10 +570,10 @@ export default {
 
                 if (!this.isPaused) {
                     this.setFocusedImage(imageIndex);
+                    this.scrollToRight();
+                } else {
+                    this.scrollToFocused();
                 }
-
-                this.scrollHandler();
-
             },
             deep: true
         },
@@ -595,7 +584,7 @@ export default {
             this.getImageNaturalDimensions();
         },
         bounds() {
-            this.scrollHandler();
+            this.scrollToFocused();
         },
         isFixed(newValue) {
             const isRealTime = !newValue;
@@ -653,8 +642,6 @@ export default {
 
         this.listenTo(this.focusedImageWrapper, 'wheel', this.wheelZoom, this);
         this.loadVisibleLayers();
-        // // set after render so initial scroll event is skipped
-        setTimeout(this.setScrollBehavior, 3 * 1000);
     },
     beforeDestroy() {
         this.persistVisibleLayers();
@@ -861,13 +848,6 @@ export default {
             const disableScroll = scrollWidth > Math.ceil(scrollLeft + clientWidth);
             this.autoScroll = !disableScroll;
         },
-        handlePauseButton(newState) {
-            this.paused(newState);
-            if (newState) {
-                // need to set the focused index or the paused focus will drift
-                this.thumbnailClicked(this.focusedImageIndex);
-            }
-        },
         paused(state) {
             this.isPaused = Boolean(state);
 
@@ -875,63 +855,38 @@ export default {
                 this.previousFocusedImage = null;
                 this.setFocusedImage(this.nextImageIndex);
                 this.autoScroll = true;
-                this.scrollHandler();
+                this.scrollToRight();
             }
         },
-        async scrollToFocused() {
+        scrollToFocused() {
             const thumbsWrapper = this.$refs.thumbsWrapper;
             if (!thumbsWrapper) {
                 return;
             }
 
             let domThumb = thumbsWrapper.children[this.focusedImageIndex];
-            if (!domThumb) {
-                return;
+
+            if (domThumb) {
+                domThumb.scrollIntoView({
+                    behavior: 'smooth',
+                    block: 'center',
+                    inline: 'center'
+                });
             }
-
-            // separate scrollTo function had to be implemented since scrollIntoView
-            // caused undesirable behavior in layouts
-            // and could not simply be scoped to the parent element
-            if (this.isComposedInLayout) {
-                await Vue.nextTick();
-                const wrapperWidth = this.$refs.thumbsWrapper.clientWidth ?? 0;
-                this.$refs.thumbsWrapper.scrollLeft = (
-                    domThumb.offsetLeft - (wrapperWidth - domThumb.clientWidth) / 2);
-
-                return;
-            }
-
-            domThumb.scrollIntoView({
-                behavior: 'smooth',
-                block: 'center',
-                inline: 'center'
-            });
         },
-        async scrollToRight() {
+        scrollToRight(type) {
+            if (type !== 'reset' && (this.isPaused || !this.$refs.thumbsWrapper || !this.autoScroll)) {
+                return;
+            }
 
-            const scrollWidth = this.$refs?.thumbsWrapper?.scrollWidth ?? 0;
+            const scrollWidth = this.$refs.thumbsWrapper.scrollWidth || 0;
             if (!scrollWidth) {
                 return;
             }
 
-            await Vue.nextTick();
-            this.$refs.thumbsWrapper.scrollLeft = scrollWidth;
-        },
-        async scrollHandler() {
-            if (this.isPaused) {
-                await this.scrollToFocused();
-
-                return;
-            }
-
-            if (this.autoScroll) {
-
-                this.scrollToRight();
-            }
-
-        },
-        setScrollBehavior(value = true) {
-            this.animateThumbScroll = value;
+            this.$nextTick(() => {
+                this.$refs.thumbsWrapper.scrollLeft = scrollWidth;
+            });
         },
         matchIndexOfPreviousImage(previous, imageHistory) {
             // match logic uses a composite of url and time to account
@@ -1132,7 +1087,7 @@ export default {
             this.setSizedImageDimensions();
             this.setImageViewport();
             this.calculateViewHeight();
-            this.scrollHandler();
+            this.scrollToFocused();
         },
         setSizedImageDimensions() {
             this.focusedImageNaturalAspectRatio = this.$refs.focusedImage.naturalWidth / this.$refs.focusedImage.naturalHeight;
@@ -1167,7 +1122,9 @@ export default {
             this.handleThumbWindowResizeEnded();
         },
         handleThumbWindowResizeEnded() {
-            this.scrollHandler();
+            if (!this.isPaused) {
+                this.scrollToRight('reset');
+            }
 
             this.calculateViewHeight();
 
@@ -1180,6 +1137,7 @@ export default {
         },
         wheelZoom(e) {
             e.preventDefault();
+
             this.$refs.imageControls.wheelZoom(e);
         },
         startPan(e) {

src/plugins/imagery/components/imagery-view.scss

@@ -194,9 +194,6 @@
         overflow-y: hidden;
         margin-bottom: 1px;
         padding-bottom: $interiorMarginSm;
-        &.animate-scroll {
-            scroll-behavior: smooth; 
-        }
     }
 
     &__auto-scroll-resume-button {

src/plugins/imagery/pluginSpec.js

@@ -481,16 +481,19 @@ describe("The Imagery View Layouts", () => {
                 });
             });
         });
-        it ('scrollToRight is called when clicking on auto scroll button', async () => {
-            await Vue.nextTick();
-            // use spyon to spy the scroll function
-            spyOn(imageryView._getInstance().$refs.ImageryContainer, 'scrollHandler');
-            imageryView._getInstance().$refs.ImageryContainer.autoScroll = false;
-            await Vue.nextTick();
-            parent.querySelector('.c-imagery__auto-scroll-resume-button').click();
-            expect(imageryView._getInstance().$refs.ImageryContainer.scrollHandler);
+        it ('scrollToRight is called when clicking on auto scroll button', (done) => {
+            Vue.nextTick(() => {
+                // use spyon to spy the scroll function
+                spyOn(imageryView._getInstance().$refs.ImageryContainer, 'scrollToRight');
+                imageryView._getInstance().$refs.ImageryContainer.autoScroll = false;
+                Vue.nextTick(() => {
+                    parent.querySelector('.c-imagery__auto-scroll-resume-button').click();
+                    expect(imageryView._getInstance().$refs.ImageryContainer.scrollToRight).toHaveBeenCalledWith('reset');
+                    done();
+                });
+            });
         });
-        xit('should change the image zoom factor when using the zoom buttons', async () => {
+        xit('should change the image zoom factor when using the zoom buttons', async (done) => {
             await Vue.nextTick();
             let imageSizeBefore;
             let imageSizeAfter;
@@ -509,6 +512,7 @@ describe("The Imagery View Layouts", () => {
             imageSizeAfter = parent.querySelector('.c-imagery_main-image_background-image').getBoundingClientRect();
             expect(imageSizeAfter.height).toBeLessThan(imageSizeBefore.height);
             expect(imageSizeAfter.width).toBeLessThan(imageSizeBefore.width);
+            done();
         });
         xit('should reset the zoom factor on the image when clicking the zoom button', async (done) => {
             await Vue.nextTick();

src/plugins/plot/configuration/PlotSeries.js

@@ -83,8 +83,6 @@ export default class PlotSeries extends Model {
         // Model.apply(this, arguments);
         this.onXKeyChange(this.get('xKey'));
         this.onYKeyChange(this.get('yKey'));
-
-        this.unPlottableValues = [undefined, Infinity, -Infinity];
     }
 
     /**
@@ -344,10 +342,6 @@ export default class PlotSeries extends Model {
         let stats = this.get('stats');
         let changed = false;
         if (!stats) {
-            if ([Infinity, -Infinity].includes(value)) {
-                return;
-            }
-
             stats = {
                 minValue: value,
                 minPoint: point,
@@ -356,13 +350,13 @@ export default class PlotSeries extends Model {
             };
             changed = true;
         } else {
-            if (stats.maxValue < value && value !== Infinity) {
+            if (stats.maxValue < value) {
                 stats.maxValue = value;
                 stats.maxPoint = point;
                 changed = true;
             }
 
-            if (stats.minValue > value && value !== -Infinity) {
+            if (stats.minValue > value) {
                 stats.minValue = value;
                 stats.minPoint = point;
                 changed = true;
@@ -425,7 +419,7 @@ export default class PlotSeries extends Model {
      * @private
      */
     isValueInvalid(val) {
-        return Number.isNaN(val) || this.unPlottableValues.includes(val);
+        return Number.isNaN(val) || val === undefined;
     }
 
     /**

src/ui/components/ToggleSwitch.vue

@@ -7,11 +7,7 @@
             :checked="checked"
             @change="onUserSelect($event)"
         >
-        <span
-            class="c-toggle-switch__slider"
-            role="switch"
-            :aria-label="name"
-        ></span>
+        <span class="c-toggle-switch__slider"></span>
     </label>
     <div
         v-if="label && label.length"
@@ -36,11 +32,6 @@ export default {
             required: false,
             default: ''
         },
-        name: {
-            type: String,
-            required: false,
-            default: ''
-        },
         checked: Boolean
     },
     methods: {