fix: duplicate measurements on hydration (#2047)

* chore: remove lingering debugger statements

* fix: order of arguments on `MeasurementService.remove` calls

* fix: ensure report is dirty when intial measurements are added

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.jsx

@@ -67,7 +67,7 @@ function TrackedMeasurementsContextProvider(
       const measurementIds = filteredMeasurements.map(fm => fm.id);
 
       for (let i = 0; i < measurementIds.length; i++) {
-        MeasurementService.remove('app-source', measurementIds[i]);
+        MeasurementService.remove(measurementIds[i], 'app-source');
       }
     },
     clearAllMeasurements: (ctx, evt) => {
@@ -76,7 +76,7 @@ function TrackedMeasurementsContextProvider(
       const measurementIds = measurements.map(fm => fm.id);
 
       for (let i = 0; i < measurementIds.length; i++) {
-        MeasurementService.remove('app-source', measurementIds[i]);
+        MeasurementService.remove(measurementIds[i], 'app-source');
       }
     },
   });

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js

@@ -32,6 +32,7 @@ const machineConfiguration = {
       entry: 'clearContext',
       on: {
         TRACK_SERIES: 'promptBeginTracking',
+        // Unused? We may only do PROMPT_HYDRATE_SR now?
         SET_TRACKED_SERIES: [
           {
             target: 'tracking',
@@ -47,7 +48,7 @@ const machineConfiguration = {
         onDone: [
           {
             target: 'tracking',
-            actions: ['setTrackedStudyAndSeries'],
+            actions: ['setTrackedStudyAndSeries', 'setIsDirty'],
             cond: 'shouldSetStudyAndSeries',
           },
           {
@@ -78,7 +79,7 @@ const machineConfiguration = {
         UNTRACK_SERIES: [
           {
             target: 'tracking',
-            actions: ['removeTrackedSeries'],
+            actions: ['removeTrackedSeries', 'setIsDirty'],
             cond: 'hasRemainingTrackedSeries',
           },
           {