started modifying staelenssUtils and stalenessMixin to observe clock changes, started on condition widget WIP

src/plugins/condition/components/ConditionCollection.vue

@@ -142,12 +142,8 @@ export default {
             this.stopObservingForChanges();
         }
 
-        if (this.stalenessSubscription) {
-            Object.values(this.stalenessSubscription).forEach(stalenessSubscription => {
-                stalenessSubscription.unsubscribe();
-                stalenessSubscription.stalenessUtils.destroy();
-            });
-        }
+        this.unsubscribeAllFromStaleness();
+        this.openmct.time.off('clock', this.resubscribeToStaleness, this);
     },
     mounted() {
         this.composition = this.openmct.composition.get(this.domainObject);
@@ -160,6 +156,7 @@ export default {
         this.conditionManager.on('conditionSetResultUpdated', this.handleConditionSetResultUpdated);
         this.updateDefaultCondition();
         this.stalenessSubscription = {};
+        this.openmct.time.on('clock', this.resubscribeToStaleness, this);
     },
     methods: {
         handleConditionSetResultUpdated(data) {
@@ -220,11 +217,36 @@ export default {
             return arr;
         },
         addTelemetryObject(domainObject) {
-            const keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
-
             this.telemetryObjs.push(domainObject);
             this.$emit('telemetryUpdated', this.telemetryObjs);
 
+            this.subscribeToStaleness(domainObject);
+        },
+        removeTelemetryObject(identifier) {
+            const keyString = this.openmct.objects.makeKeyString(identifier);
+            const index = this.telemetryObjs.findIndex(obj => {
+                let objId = this.openmct.objects.makeKeyString(obj.identifier);
+
+                return objId === keyString;
+            });
+
+            if (index > -1) {
+                this.telemetryObjs.splice(index, 1);
+            }
+
+            this.unsubscribeFromStaleness(keyString);
+        },
+        handleStaleness(keyString, stalenessResponse) {
+            if (this.stalenessSubscription[keyString].stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
+                this.emitStaleness({
+                    keyString,
+                    isStale: stalenessResponse.isStale
+                });
+            }
+        },
+        subscribeToStaleness(domainObject) {
+            const keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
+
             if (!this.stalenessSubscription[keyString]) {
                 this.stalenessSubscription[keyString] = {};
             }
@@ -242,18 +264,7 @@ export default {
 
             this.stalenessSubscription[keyString].unsubscribe = stalenessSubscription;
         },
-        removeTelemetryObject(identifier) {
-            const keyString = this.openmct.objects.makeKeyString(identifier);
-            const index = this.telemetryObjs.findIndex(obj => {
-                let objId = this.openmct.objects.makeKeyString(obj.identifier);
-
-                return objId === keyString;
-            });
-
-            if (index > -1) {
-                this.telemetryObjs.splice(index, 1);
-            }
-
+        unsubscribeFromStaleness(keyString) {
             if (this.stalenessSubscription[keyString]) {
                 this.stalenessSubscription[keyString].unsubscribe();
                 this.stalenessSubscription[keyString].stalenessUtils.destroy();
@@ -264,14 +275,21 @@ export default {
                 delete this.stalenessSubscription[keyString];
             }
         },
-        handleStaleness(keyString, stalenessResponse) {
-            if (this.stalenessSubscription[keyString].stalenessUtils.shouldUpdateStaleness(stalenessResponse)) {
-                this.emitStaleness({
-                    keyString,
-                    isStale: stalenessResponse.isStale
+        unsubscribeAllFromStaleness() {
+            if (this.stalenessSubscription) {
+                Object.values(this.stalenessSubscription).forEach(stalenessSubscription => {
+                    stalenessSubscription.unsubscribe();
+                    stalenessSubscription.stalenessUtils.destroy();
                 });
             }
         },
+        resubscribeToStaleness() {
+            this.unsubscribeAllFromStaleness();
+            this.telemetryObjs.forEach((domainObject) => {
+                this.subscribeToStaleness(domainObject);
+            });
+
+        },
         emitStaleness(stalenessObject) {
             this.$emit('telemetryStaleness', stalenessObject);
         },

src/ui/mixins/staleness-mixin.js

@@ -30,9 +30,19 @@ export default {
     },
     beforeDestroy() {
         this.triggerUnsubscribeFromStaleness();
+        this.unwatchClock();
+    },
+    mounted() {
+        this.watchClock();
     },
     methods: {
         subscribeToStaleness(domainObject, callback) {
+            if (!this.resubscribeToStaleness) {
+                this.resubscribeToStaleness = () => {
+                    this.subscribeToStaleness(domainObject, callback);
+                };
+            }
+
             if (!this.stalenessUtils) {
                 this.stalenessUtils = new StalenessUtils(this.openmct, domainObject);
             }
@@ -63,6 +73,18 @@ export default {
                 delete this.unsubscribeFromStaleness;
                 this.stalenessUtils.destroy();
             }
+        },
+        watchClock() {
+            this.openmct.time.on('clock', this.handleClockChange, this);
+        },
+        unwatchClock() {
+            this.openmct.time.off('clock', this.handleClockChange, this);
+        },
+        handleClockChange() {
+            if (this.resubscribeToStaleness) {
+                this.triggerUnsubscribeFromStaleness();
+                this.resubscribeToStaleness();
+            }
         }
     }
 };