Skip to content
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

Clean up measurements Redux states/actions #1881

Merged
merged 12 commits into from
Nov 6, 2024
Merged

Clean up measurements Redux states/actions #1881

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9e679d
Remove excess whitespace
joverlee521 Oct 25, 2024
7599aa7
Fetch and load measurements sidecar JSON upfront
joverlee521 Oct 28, 2024
047de26
Remove unused `LOAD_MEASUREMENTS` action
joverlee521 Oct 28, 2024
a5bc80f
Remove unused `UPDATE_MEASUREMENTS_ERROR` action
joverlee521 Oct 29, 2024
0f67361
Remove `controls.measurementsCollectionKey` Redux state
joverlee521 Oct 29, 2024
0861269
parseMeasurementsJSON: deep clone `json.collections`
joverlee521 Oct 28, 2024
a2431ae
measurements: display error even if data not loaded
joverlee521 Oct 28, 2024
947eda6
Add `combineMeasurementsControlsAndQuery`
joverlee521 Oct 28, 2024
6c2308a
Hide measurements panel if loading failed
joverlee521 Oct 30, 2024
cab837e
Measurements: Switch conditionals for rendering
joverlee521 Nov 5, 2024
0069e09
loadMeasurements: fix bug for warning notifications
joverlee521 Nov 5, 2024
c03d336
Remove measurements query params if loading failed
joverlee521 Nov 5, 2024
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
5 changes: 5 additions & 0 deletions src/actions/recomputeReduxState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,11 @@ export const createStateFromQueryOrJSONs = ({
measurements.collectionToDisplay = collectionToDisplay;
controls = {...controls, ...collectionControls};
query = updatedQuery;
} else {
// Hide measurements panel if loading failed
controls.panelsToDisplay = controls.panelsToDisplay.filter((panel) => panel !== "measurements");
controls.canTogglePanelLayout = hasMultipleGridPanels(controls.panelsToDisplay);
controls.panelLayout = controls.canTogglePanelLayout ? controls.panelLayout : "full";
Comment on lines +926 to +930
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For completeness I'd also suggest removing any measurements queries. (There's no partial measurements state which is nice - it's either the loaded state or the default state.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good catch! Will do.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in c03d336

}

/* certain narrative slides prescribe the main panel to simply render narrative-provided markdown content */
Expand Down