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/11/24 18:46:39 UTC
[superset] 05/14: 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
commit fd7f7399b55f6a42fdfae49d535952c2fd05feea
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 -
.../components/ExploreChartHeader/index.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 58ba650..3dea0cc 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 f27c318..29f2a7c 100644
--- a/superset-frontend/src/dashboard/components/Header/Header.test.tsx
+++ b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
@@ -57,7 +57,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 67be4fd..e3e5894 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -75,7 +75,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/index.jsx b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
index 85f1654..7615e11 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
@@ -28,11 +28,7 @@ import {
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 'src/dashboard/util/propShapes';
import EditableTitle from 'src/components/EditableTitle';
@@ -303,7 +299,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 a46849e..16cc8cc 100644
--- a/superset-frontend/src/reports/actions/reports.js
+++ b/superset-frontend/src/reports/actions/reports.js
@@ -79,22 +79,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,
+ }),
);
}
};