You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by el...@apache.org on 2021/08/20 17:52:18 UTC
[superset] branch refactorReports updated: Fetch bug fixed (#16376)
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to branch refactorReports
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/refactorReports by this push:
new 686f5eb Fetch bug fixed (#16376)
686f5eb is described below
commit 686f5eb7a459b599e3c06b68026c0e37a6b53522
Author: Lyndsi Kay Williams <55...@users.noreply.github.com>
AuthorDate: Fri Aug 20 12:51:29 2021 -0500
Fetch bug fixed (#16376)
---
.../HeaderReportActionsDropdown/index.tsx | 1 +
.../dashboard/components/Header/Header.test.tsx | 1 -
.../src/dashboard/components/Header/index.jsx | 1 -
.../src/explore/components/ExploreChartHeader.jsx | 8 ++------
superset-frontend/src/reports/actions/reports.js | 24 +++++++++++-----------
5 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx b/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx
index cf2ae7f..6e42b07 100644
--- a/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx
+++ b/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx
@@ -55,6 +55,7 @@ export default function HeaderReportActionsDropDown({
>(state => state.user || state.explore?.user);
const reportsIds = Object.keys(reports || []);
const report: AlertObject = reports?.[reportsIds[0]];
+ console.log(report);
const [
currentReportDeleting,
setCurrentReportDeleting,
diff --git a/superset-frontend/src/dashboard/components/Header/Header.test.tsx b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
index 1ff6e48..e59bfa9 100644
--- a/superset-frontend/src/dashboard/components/Header/Header.test.tsx
+++ b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
@@ -58,7 +58,6 @@ const createProps = () => ({
dashboardTitle: 'Dashboard Title',
charts: {},
layout: {},
- reports: {},
expandedSlices: {},
css: '',
customCss: '',
diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx b/superset-frontend/src/dashboard/components/Header/index.jsx
index f462b9c..e9198d6 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -73,7 +73,6 @@ const propTypes = {
onChange: PropTypes.func.isRequired,
fetchFaveStar: PropTypes.func.isRequired,
fetchCharts: PropTypes.func.isRequired,
- fetchUISpecificReport: PropTypes.func.isRequired,
saveFaveStar: PropTypes.func.isRequired,
savePublished: PropTypes.func.isRequired,
updateDashboardTitle: PropTypes.func.isRequired,
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader.jsx b/superset-frontend/src/explore/components/ExploreChartHeader.jsx
index 77bf6c3..6bb61c8 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader.jsx
@@ -22,11 +22,7 @@ import { bindActionCreators } from 'redux';
import PropTypes from 'prop-types';
import { styled, t } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import {
- fetchUISpecificReport,
- toggleActive,
- deleteActiveReport,
-} from 'src/reports/actions/reports';
+import { toggleActive, deleteActiveReport } from 'src/reports/actions/reports';
import HeaderReportActionsDropdown from 'src/components/ReportModal/HeaderReportActionsDropdown';
import { chartPropShape } from '../../dashboard/util/propShapes';
import ExploreActionButtons from './ExploreActionButtons';
@@ -243,7 +239,7 @@ ExploreChartHeader.propTypes = propTypes;
function mapDispatchToProps(dispatch) {
return bindActionCreators(
- { sliceUpdated, fetchUISpecificReport, toggleActive, deleteActiveReport },
+ { sliceUpdated, toggleActive, deleteActiveReport },
dispatch,
);
}
diff --git a/superset-frontend/src/reports/actions/reports.js b/superset-frontend/src/reports/actions/reports.js
index 03620ed..17f5e4a 100644
--- a/superset-frontend/src/reports/actions/reports.js
+++ b/superset-frontend/src/reports/actions/reports.js
@@ -76,22 +76,22 @@ const structureFetchAction = (dispatch, getState) => {
const { user, dashboardInfo, charts, explore } = state;
if (dashboardInfo) {
dispatch(
- fetchUISpecificReport(
- user.userId,
- 'dashboard_id',
- 'dashboards',
- dashboardInfo.id,
- ),
+ fetchUISpecificReport({
+ userId: user.userId,
+ filterField: 'dashboard_id',
+ creationMethod: 'dashboards',
+ resourceId: dashboardInfo.id,
+ }),
);
} else {
const [chartArr] = Object.keys(charts);
dispatch(
- fetchUISpecificReport(
- explore.user.userId,
- 'chart_id',
- 'charts',
- charts[chartArr].id,
- ),
+ fetchUISpecificReport({
+ userId: explore.user.userId,
+ filterField: 'chart_id',
+ creationMethod: 'charts',
+ resourceId: charts[chartArr].id,
+ }),
);
}
};