[superset] branch master updated: chore(ci): fix ci conflict (#15016)

[vi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new de1b140  chore(ci): fix ci conflict (#15016)
de1b140 is described below

commit de1b140617ea4a6256e671d31f3279d0c3becc40
Author: Ville Brofeldt <33...@users.noreply.github.com>
AuthorDate: Mon Jun 7 18:27:54 2021 +0300

    chore(ci): fix ci conflict (#15016)
---
 .../src/filters/components/Select/SelectFilterPlugin.test.tsx          | 3 +++
 superset-frontend/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 b29e642..e2ed21c 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 d10544a..305667c 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) {