Merge branch 'release/2.0.5' into 4258-handle-missing-objects-gracefully-in-open-mct

Add check for valueMetadata for setUnit
Add check for metadata for LadTableSet
2022-07-08 07:01:07 -07:00 · 2022-07-07 22:53:18 -04:00 · 2022-07-07 18:39:29 -05:00 · 2022-07-01 08:47:33 -05:00 · 2022-07-01 08:45:22 -05:00 · 2022-07-01 08:13:20 -05:00
4 changed files with 12 additions and 6 deletions
--- a/src/plugins/LADTable/components/LADRow.vue
+++ b/src/plugins/LADTable/components/LADRow.vue
@@ -197,7 +197,7 @@ export default {
            }
        },
        setUnit() {
-            this.unit = this.valueMetadata.unit || '';
+            this.unit = this.valueMetadata ? this.valueMetadata.unit : '';
        },
        firstNonDomainAttribute(metadata) {
            return metadata
--- a/src/plugins/LADTable/components/LadTableSet.vue
+++ b/src/plugins/LADTable/components/LadTableSet.vue
@@ -83,9 +83,12 @@ export default {
            for (let ladTable of ladTables) {
                for (let telemetryObject of ladTable) {
                    let metadata = this.openmct.telemetry.getMetadata(telemetryObject.domainObject);
-                    for (let metadatum of metadata.valueMetadatas) {
-                        if (metadatum.unit) {
-                            return true;
+
+                    if (metadata) {
+                        for (let metadatum of metadata.valueMetadatas) {
+                            if (metadatum.unit) {
+                                return true;
+                            }
                        }
                    }
                }
--- a/src/plugins/plot/MctPlot.vue
+++ b/src/plugins/plot/MctPlot.vue
@@ -87,7 +87,6 @@
                        :highlights="highlights"
                        :show-limit-line-labels="showLimitLineLabels"
                        @plotReinitializeCanvas="initCanvas"
-                        @chartLoaded="initialize"
                    />
                </div>

@@ -360,6 +359,11 @@ export default {
        this.setTimeContext();

        this.loaded = true;
+
+        //We're referencing the canvas elements from the mct-chart in the initialize method.
+        // So we need $nextTick to ensure the component is fully mounted before we can initialize stuff.
+        this.$nextTick(this.initialize);
+
    },
    beforeDestroy() {
        document.removeEventListener('keydown', this.handleKeyDown);
--- a/src/plugins/plot/chart/MctChart.vue
+++ b/src/plugins/plot/chart/MctChart.vue
@@ -115,7 +115,6 @@ export default {
        this.listenTo(this.config.yAxis, 'change', this.updateLimitsAndDraw);
        this.listenTo(this.config.xAxis, 'change', this.updateLimitsAndDraw);
        this.config.series.forEach(this.onSeriesAdd, this);
-        this.$emit('chartLoaded');
    },
    beforeDestroy() {
        this.destroy();
Author	SHA1	Message	Date
Andrew Henry	cdde589da2	Merge branch 'release/2.0.5' into 4258-handle-missing-objects-gracefully-in-open-mct	2022-07-08 07:01:07 -07:00
Alize Nguyen	539acd5757	Add check for valueMetadata for setUnit	2022-07-07 22:53:18 -04:00
Alize Nguyen	b2b56391a9	Add check for metadata for LadTableSet	2022-07-07 18:39:29 -05:00
Alize Nguyen	22e89770ac	Lint fix	2022-07-01 08:47:33 -05:00
Alize Nguyen	a0c1e0b22b	Redid checks for isMissing(object)	2022-07-01 08:45:22 -05:00
Alize Nguyen	5feb0168fe	Changed assignment and metadata check	2022-07-01 08:13:20 -05:00
Alize Nguyen	4ef01f7aa6	Fix typo	2022-07-01 08:08:50 -05:00
Alize Nguyen	2545511c86	Redid assignment and metadata check	2022-07-01 08:08:41 -05:00
Alize Nguyen	5b8f3a7f4d	Add reload check and @private, verify console.warn	2022-06-30 22:44:13 -05:00
Alize Nguyen	13ba79c946	Update comment text	2022-06-30 21:26:43 -05:00
Alize Nguyen	9e323acb4f	Add e2e test	2022-06-29 22:25:02 -05:00
Alize Nguyen	515ca6f3df	Merge branch 'release/2.0.5' into 4258-handle-missing-objects-gracefully-in-open-mct	2022-06-29 15:35:17 -05:00
Alize Nguyen	6fcad79486	Fix for this.metadata.value is undefined	2022-06-28 10:48:14 -05:00
Alize Nguyen	aba7fc297a	Lint fix	2022-06-27 21:24:52 -05:00
Alize Nguyen	d6306834bd	Merge branch 'release/2.0.5' into 4258-handle-missing-objects-gracefully-in-open-mct	2022-06-27 21:08:26 -05:00
Alize Nguyen	f319a1f59c	Changed console.error to console.warn	2022-06-27 21:08:07 -05:00
Alize Nguyen	edb6ed7051	Add try/catch statement & check if obj is missing	2022-06-27 21:06:50 -05:00
Alize Nguyen	230a3345be	Add check for this.config	2022-06-27 21:06:07 -05:00
Alize Nguyen	92026781ea	Handle missing object errors for Overlay Plots	2022-06-21 15:52:02 -05:00
Alize Nguyen	3188dff94f	Handle missing object errors for display layouts	2022-06-21 14:42:34 -05:00