[superset] 01/01: Merge

[di...@apache.org]

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

diegopucci pushed a commit to branch feat/cross-filters
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 9d1ee1d3e895259f8fe58fe69d92894c1c33dbeb
Merge: d84fdc25a0 83893f8ff2
Author: geido <di...@gmail.com>
AuthorDate: Fri Jan 20 18:02:49 2023 +0100

    Merge

 .../HeaderActionsDropdown.test.tsx                 |  1 +
 .../Header/HeaderActionsDropdown/index.jsx         |  3 +
 .../src/dashboard/components/Header/index.jsx      |  2 +
 .../components/SliceHeader/SliceHeader.test.tsx    |  1 +
 .../src/dashboard/components/SliceHeader/index.tsx |  2 +
 .../SliceHeaderControls.test.tsx                   |  1 +
 .../components/SliceHeaderControls/index.tsx       |  5 ++
 .../dashboard/components/gridComponents/Chart.jsx  |  2 +
 superset-frontend/src/logger/LogUtils.ts           |  5 ++
 .../data/database/DatabaseModal/SSHTunnelForm.tsx  |  6 +-
 .../data/database/DatabaseModal/index.test.tsx     | 35 ++++++++++
 .../CRUD/data/database/DatabaseModal/index.tsx     | 77 +++++++++++++---------
 12 files changed, 106 insertions(+), 34 deletions(-)

diff --cc superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
index 35efc207f0,082088f111..506fefd436
--- a/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
@@@ -409,7 -408,7 +409,8 @@@ class Chart extends React.Component 
        postTransformProps,
        datasetsStatus,
        isInView,
 +      emitCrossFilters,
+       logEvent,
      } = this.props;
  
      const { width } = this.state;