pulled over changes that were made after copying whole repo in a dump

nasa · jvigliotta · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 16, 2024
commit 7702e8f3f7f5ff421d06bb78ef4045ecbc8c8362
diff --git a/src/plugins/condition/ConditionManager.js b/src/plugins/condition/ConditionManager.js
@@ -419,11 +419,14 @@ export default class ConditionManager extends EventEmitter {
      }
    }

+    let result = currentCondition?.isDefault ? false : conditionResults[currentCondition.id];
    const currentOutput = {
-      output: output,
-      id: this.conditionSetDomainObject.identifier,
      conditionId: currentCondition.id,
-      ...latestTimestamp
+      id: this.conditionSetDomainObject.identifier,
+      output: output,
+      ...latestTimestamp,
+      result,
+      isDefault: currentCondition?.isDefault
    };

    return [currentOutput];
@@ -477,19 +480,15 @@ export default class ConditionManager extends EventEmitter {
    return matchingCondition;
  }

-  emitConditionSetResult(currentCondition, timestamp, outputValue, result) {
-    this.emit(
-      'conditionSetResultUpdated',
-      Object.assign(
-        {
-          id: this.conditionSetDomainObject.identifier,
-          conditionId: currentCondition.id,
-          output: outputValue,
-          result
-        },
-        timestamp
-      )
-    );
+  emitConditionSetResult(currentCondition, timestamp, outputValue, result, isDefault) {
+    this.emit('conditionSetResultUpdated', {
+      conditionId: currentCondition.id,
+      id: this.conditionSetDomainObject.identifier,
+      output: outputValue,
+      ...timestamp,
+      result,
+      isDefault
+    });
  }

  updateCurrentCondition(timestamp, telemetryObject, telemetryData) {
@@ -547,7 +546,13 @@ export default class ConditionManager extends EventEmitter {
      }
    }

-    this.emitConditionSetResult(currentCondition, timestamp, telemetryValue, conditionResult);
+    this.emitConditionSetResult(
+      currentCondition,
+      timestamp,
+      telemetryValue,
+      conditionResult,
+      currentCondition?.isDefault
+    );
  }

  getTestData(metadatum, identifier) {

diff --git a/src/plugins/condition/historicalTelemetryWorker.js b/src/plugins/condition/historicalTelemetryWorker.js
@@ -1,37 +1,61 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2024, 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.
+ *****************************************************************************/
+
 import { makeKeyString } from '../../api/objects/object-utils.js';

-function sortTelemetriesByDate(historicalTelemetriesPool) {
-  const historicalTelemetryDateMap = new Map();
-  historicalTelemetriesPool.forEach((historicalTelemetryList) => {
-    const { historicalTelemetry, domainObject } = historicalTelemetryList;
-    const { identifier } = domainObject;
-    const telemetryIdentifier = makeKeyString(identifier);
-    historicalTelemetry.forEach((historicalTelemetryItem) => {
-      let telemetryTimestamp = historicalTelemetryItem.utc;
-      if (historicalTelemetryItem.timestamp) {
-        telemetryTimestamp = new Date(historicalTelemetryItem.timestamp)?.getTime();
-      }
-      if (!historicalTelemetryDateMap.get(telemetryTimestamp)) {
-        const telemetryMap = new Map();
-        telemetryMap.set(telemetryIdentifier, historicalTelemetryItem);
-        historicalTelemetryDateMap.set(telemetryTimestamp, telemetryMap);
-      } else {
-        const telemetryMap = historicalTelemetryDateMap.get(telemetryTimestamp);
-        telemetryMap.set(telemetryIdentifier, historicalTelemetryItem);
-        historicalTelemetryDateMap.set(telemetryTimestamp, telemetryMap);
-      }
+(function () {
+  function sortTelemetriesByDate(historicalTelemetriesPool) {
+    const historicalTelemetryDateMap = new Map();
+    historicalTelemetriesPool.forEach((historicalTelemetryList) => {
+      const { historicalTelemetry, domainObject } = historicalTelemetryList;
+      const { identifier } = domainObject;
+      const telemetryIdentifier = makeKeyString(identifier);
+      historicalTelemetry.forEach((historicalTelemetryItem) => {
+        let telemetryTimestamp = historicalTelemetryItem.utc;
+        if (historicalTelemetryItem.timestamp) {
+          telemetryTimestamp = new Date(historicalTelemetryItem.timestamp)?.getTime();
+        }
+        if (!historicalTelemetryDateMap.get(telemetryTimestamp)) {
+          const telemetryMap = new Map();
+          telemetryMap.set(telemetryIdentifier, historicalTelemetryItem);
+          historicalTelemetryDateMap.set(telemetryTimestamp, telemetryMap);
+        } else {
+          const telemetryMap = historicalTelemetryDateMap.get(telemetryTimestamp);
+          telemetryMap.set(telemetryIdentifier, historicalTelemetryItem);
+          historicalTelemetryDateMap.set(telemetryTimestamp, telemetryMap);
+        }
+      });
    });
-  });
-  return historicalTelemetryDateMap;
-}
+    return historicalTelemetryDateMap;
+  }

-self.onmessage = function (e) {
-  const { type, data } = e.data;
+  self.onmessage = function (e) {
+    const { type, data } = e.data;

-  if (type === 'sortTelemetries') {
-    const sortedTelemetries = sortTelemetriesByDate(data.historicalTelemetriesPool);
-    self.postMessage({ type: 'result', data: sortedTelemetries });
-  } else {
-    self.postMessage({ type: 'error', error: 'Unknown message type' });
-  }
-};
+    if (type === 'sortTelemetries') {
+      const sortedTelemetries = sortTelemetriesByDate(data.historicalTelemetriesPool);
+      self.postMessage({ type: 'result', data: sortedTelemetries });
+    } else {
+      self.postMessage({ type: 'error', error: 'Unknown message type' });
+    }
+  };
+})();