From e67c358c9b316ddade994994f9ab166581455e16 Mon Sep 17 00:00:00 2001
From: Matt Seddon <mattseddon@hotmail.com>
Date: Tue, 12 Jul 2022 09:01:55 +1000
Subject: [PATCH 1/2] fix race condition in manual plot refresh for M1 macs

---
 extension/src/plots/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/src/plots/index.ts b/extension/src/plots/index.ts
index a35453e9e1..5baa0d02ed 100644
--- a/extension/src/plots/index.ts
+++ b/extension/src/plots/index.ts
@@ -361,7 +361,7 @@ export class Plots extends BaseRepository<TPlotsData> {
   private attemptToRefreshRevData(revision: string) {
     Toast.infoWithOptions(`Attempting to refresh plots data for ${revision}.`)
     this.plots?.setupManualRefresh(revision)
-    this.data.managedUpdate()
+    this.data.update()
     sendTelemetryEvent(
       EventName.VIEWS_PLOTS_MANUAL_REFRESH,
       { revisions: 1 },
@@ -374,7 +374,7 @@ export class Plots extends BaseRepository<TPlotsData> {
     for (const revision of revisions) {
       this.plots?.setupManualRefresh(revision)
     }
-    this.data.managedUpdate()
+    this.data.update()
     sendTelemetryEvent(
       EventName.VIEWS_PLOTS_MANUAL_REFRESH,
       { revisions: revisions.length },

From 4b0383db661173f70925107059ae8ba6056f4ed7 Mon Sep 17 00:00:00 2001
From: Matt Seddon <mattseddon@hotmail.com>
Date: Tue, 12 Jul 2022 09:24:49 +1000
Subject: [PATCH 2/2] plots diff may be called twice

---
 extension/src/test/suite/plots/index.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/src/test/suite/plots/index.test.ts b/extension/src/test/suite/plots/index.test.ts
index ba024e9da2..fc0266a61a 100644
--- a/extension/src/test/suite/plots/index.test.ts
+++ b/extension/src/test/suite/plots/index.test.ts
@@ -619,7 +619,7 @@ suite('Plots Test Suite', () => {
         { revisions: 1 },
         undefined
       )
-      expect(mockPlotsDiff).to.be.calledOnce
+      expect(mockPlotsDiff).to.be.called
       expect(mockPlotsDiff).to.be.calledWithExactly(dvcDemoPath, '53c3851')
     }).timeout(WEBVIEW_TEST_TIMEOUT)
 
@@ -652,7 +652,7 @@ suite('Plots Test Suite', () => {
         { revisions: 5 },
         undefined
       )
-      expect(mockPlotsDiff).to.be.calledOnce
+      expect(mockPlotsDiff).to.be.called
       expect(mockPlotsDiff).to.be.calledWithExactly(
         dvcDemoPath,
         '1ba7bcd',