Skip to content

chore(dashboards): Clean up state updates in widget queries #29605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shruthilayaj merged 2 commits into from
Nov 1, 2021
Merged

chore(dashboards): Clean up state updates in widget queries #29605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd838a1
chore(dashboards): Clean up state updates in widget queries
shruthilayaj Oct 27, 2021
1ad7211
Merge branch 'master' into fix/qidget-queries-state-update-after-unmount
shruthilayaj Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions static/app/views/dashboardsV2/widgetQueries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ class WidgetQueries extends React.Component<Props, State> {
};

componentDidMount() {
this._isMounted = true;
this.fetchData();
}

Expand Down Expand Up @@ -192,6 +193,12 @@ class WidgetQueries extends React.Component<Props, State> {
}
}

componentWillUnmount() {
this._isMounted = false;
}

private _isMounted: boolean = false;

fetchEventData(queryFetchID: symbol) {
const {selection, api, organization, widget} = this.props;

Expand Down Expand Up @@ -242,6 +249,10 @@ class WidgetQueries extends React.Component<Props, State> {
// Overwrite the local var to work around state being stale in tests.
tableResults = [...tableResults, tableData];

if (!this._isMounted) {
return;
}

this.setState(prevState => {
if (prevState.queryFetchID !== queryFetchID) {
// invariant: a different request was initiated after this request
Expand All @@ -258,6 +269,9 @@ class WidgetQueries extends React.Component<Props, State> {
this.setState({errorMessage});
} finally {
completed++;
if (!this._isMounted) {
return;
}
this.setState(prevState => {
if (prevState.queryFetchID !== queryFetchID) {
// invariant: a different request was initiated after this request
Expand Down Expand Up @@ -330,6 +344,9 @@ class WidgetQueries extends React.Component<Props, State> {
promises.forEach(async (promise, i) => {
try {
const rawResults = await promise;
if (!this._isMounted) {
return;
}
this.setState(prevState => {
if (prevState.queryFetchID !== queryFetchID) {
// invariant: a different request was initiated after this request
Expand All @@ -354,6 +371,9 @@ class WidgetQueries extends React.Component<Props, State> {
this.setState({errorMessage});
} finally {
completed++;
if (!this._isMounted) {
return;
}
this.setState(prevState => {
if (prevState.queryFetchID !== queryFetchID) {
// invariant: a different request was initiated after this request
Expand Down