Cherry pick 8084 (#8121)

* All telemetry criteria bug (#8084)

* Reference telemetry map as a Map, not associative array

* Only normalize once

* Another cheeky createNormalizedDatum

* Fix unit tests that were broken by removal of createNormalizedDatum

* Fixed failing test

* Remove notes files accidentally committed

Author: akhenry

src/plugins/condition/ConditionSpec.js

@@ -69,7 +69,7 @@ describe('The condition', function () {
             }
           },
           {
-            key: 'testSource',
+            key: 'value',
             source: 'value',
             name: 'Test',
             format: 'string'
@@ -130,7 +130,7 @@ describe('The condition', function () {
             id: '1234-5678-9999-0000',
             operation: 'equalTo',
             input: ['0'],
-            metadata: 'testSource',
+            metadata: 'value',
             telemetry: testTelemetryObject.identifier
           }
         ]

src/plugins/condition/criterion/AllTelemetryCriterion.js

@@ -28,6 +28,7 @@ import { checkIfOld, getLatestTimestamp } from '../utils/time.js';
 import TelemetryCriterion from './TelemetryCriterion.js';
 
 export default class AllTelemetryCriterion extends TelemetryCriterion {
+  #emptyMap = new Map();
   /**
    * Subscribes/Unsubscribes to telemetry and emits the result
    * of operations performed on the telemetry data returned and a given input value.
@@ -176,23 +177,22 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
     return datum;
   }
 
-  updateResult(data, telemetryObjects) {
-    const validatedData = this.isValid() ? data : {};
+  updateResult(allTelemetryDataMap, telemetryObjects) {
+    const validatedData = this.isValid() ? allTelemetryDataMap : this.#emptyMap;
 
     if (validatedData && !this.isStalenessCheck()) {
       if (this.isOldCheck()) {
         Object.keys(this.telemetryDataCache).forEach((objectIdKeystring) => {
           if (this.ageCheck?.[objectIdKeystring]) {
-            this.ageCheck[objectIdKeystring].update(validatedData[objectIdKeystring]);
+            this.ageCheck[objectIdKeystring].update(validatedData.get(objectIdKeystring));
           }
 
           this.telemetryDataCache[objectIdKeystring] = false;
         });
       } else {
         Object.keys(this.telemetryDataCache).forEach((objectIdKeystring) => {
-          const telemetryObject = telemetryObjects[objectIdKeystring];
           this.telemetryDataCache[objectIdKeystring] = this.computeResult(
-            this.createNormalizedDatum(validatedData[objectIdKeystring], telemetryObject)
+            validatedData.get(objectIdKeystring)
           );
         });
       }

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -194,9 +194,7 @@ export default class TelemetryCriterion extends EventEmitter {
     return dataIsDefined && (hasTimeSystemChanged || isCacheStale);
   }
   updateResult(data, currentTimeSystemKey) {
-    const validatedData = this.isValid()
-      ? this.createNormalizedDatum(data, this.telemetryObject)
-      : {};
+    const validatedData = this.isValid() ? data : {};
 
     if (!this.isStalenessCheck()) {
       if (this.isOldCheck()) {

src/plugins/condition/criterion/TelemetryCriterionSpec.js

@@ -125,11 +125,14 @@ describe('The telemetry criterion', function () {
   });
 
   it('returns a result on new data from relevant telemetry providers', function () {
-    telemetryCriterion.updateResult({
-      value: 'Hello',
-      utc: 'Hi',
-      id: testTelemetryObject.identifier.key
-    });
+    telemetryCriterion.updateResult(
+      {
+        testSource: 'Hello',
+        utc: 'Hi',
+        id: testTelemetryObject.identifier.key
+      },
+      'utc'
+    );
     expect(telemetryCriterion.result).toBeTrue();
   });