From de1b140617ea4a6256e671d31f3279d0c3becc40 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Mon, 7 Jun 2021 18:27:54 +0300
Subject: [PATCH] chore(ci): fix ci conflict (#15016)

---
 .../src/filters/components/Select/SelectFilterPlugin.test.tsx  | 3 +++
 .../src/filters/components/Select/SelectFilterPlugin.tsx       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
index b29e64207b..e2ed21c90b 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
@@ -200,6 +200,9 @@ describe('SelectFilterPlugin', () => {
     userEvent.click(screen.getByRole('combobox'));
     userEvent.click(screen.getByTitle('girl'));
     expect(setDataMask).toHaveBeenCalledWith({
+      __cache: {
+        value: ['boy'],
+      },
       extraFormData: {
         filters: [
           {
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
index d10544a485..305667c294 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
@@ -51,7 +51,7 @@ type DataMaskAction =
     };
 
 function reducer(
-  draft: Required<DataMask> & { __cache?: JsonObject },
+  draft: DataMask & { __cache?: JsonObject },
   action: DataMaskAction,
 ) {
   switch (action.type) {