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

[Custom DC] Fix Disappearing Stat Var bug on Map and Scatter tool #4251

Merged
merged 16 commits into from
May 31, 2024
Merged

[Custom DC] Fix Disappearing Stat Var bug on Map and Scatter tool #4251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
41a1084
Set limit to 1 on custom dc
juliawu May 17, 2024
4d7e505
fix unobserve console error
juliawu May 17, 2024
99a2646
switch to app_env config and helper function
juliawu May 21, 2024
47b699c
Merge branch 'master' of https://github.com/datacommonsorg/website in…
juliawu May 28, 2024
82ee5d3
also add changes to new visualization tools
juliawu May 28, 2024
3ee3aaf
fix existence check bug
juliawu May 28, 2024
4f95629
don't include .run_cdc_dev.env changes
juliawu May 28, 2024
37c2d84
reset .run_dcd_dev.env
juliawu May 28, 2024
c3f0ddd
sync with master
juliawu May 28, 2024
b9f299d
lint and update docstrings
juliawu May 28, 2024
7d82bad
Update npm tests
juliawu May 28, 2024
b8d0b08
switch to using value in config
juliawu May 30, 2024
1c59587
Merge branch 'master' of https://github.com/datacommonsorg/website in…
juliawu May 30, 2024
ccb096d
update client tests
juliawu May 31, 2024
80d39e6
Merge branch 'master' of https://github.com/datacommonsorg/website in…
juliawu May 31, 2024
b6e69e1
fix typo
juliawu May 31, 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
3 changes: 3 additions & 0 deletions server/templates/custom_dc/custom/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
{% if OVERRIDE_CSS_PATH %}
<link href="{{ OVERRIDE_CSS_PATH }}" rel="stylesheet">
{% endif %}
<script>
globalThis.isCustomDC = {{ config['CUSTOM']|int }};
Copy link
Contributor

Choose a reason for hiding this comment

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

this approach will require existing custom DC users to add this line in order to see the fix. is there a way we can push the fix to them requiring them to change any code?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Instead of setting a value in base.html, switched to using a config variable in app_env/*.py files, and setting globalThis on the tools pages themselves, instead of the template which could be overridden.

</script>
</head>

<body>
Expand Down
9 changes: 5 additions & 4 deletions static/js/tools/map/stat_var_chooser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,11 @@ export function StatVarChooser(props: StatVarChooserProps): JSX.Element {
selectSV={(svDcid) =>
selectStatVar(dateCtx, statVar, display, placeInfo, svDcid)
}
numEntitiesExistence={Math.min(
NUM_ENTITIES_EXISTENCE,
samplePlaces.length
)}
numEntitiesExistence={
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you extract this logic to a function and add some comments explaining the isCustomDC vs NUM_ENTITIES_EXISTENCE check

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea. Extracted to a helper function and added an explaining comment.

globalThis.isCustomDC
? 1
: Math.min(NUM_ENTITIES_EXISTENCE, samplePlaces.length)
}
/>
);
}
Expand Down
10 changes: 7 additions & 3 deletions static/js/tools/scatter/chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,15 @@ export function Chart(props: ChartPropsType): JSX.Element {
}
}, DEBOUNCE_INTERVAL_MS);
const resizeObserver = new ResizeObserver(debouncedHandler);
if (chartContainerRef.current) {
resizeObserver.observe(chartContainerRef.current);
// The value of chartContainerRef.current may change between setting the
// observe and unobserving during cleanup, so we store the current value
// in a variable.
const currentChartContainerElement = chartContainerRef.current;
if (currentChartContainerElement) {
resizeObserver.observe(currentChartContainerElement);
}
return () => {
resizeObserver.unobserve(chartContainerRef.current);
resizeObserver.unobserve(currentChartContainerElement);
debouncedHandler.cancel();
};
}, [props, chartContainerRef, geoJsonFetched]);
Expand Down
9 changes: 5 additions & 4 deletions static/js/tools/scatter/statvar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,11 @@ export function StatVarChooser(props: StatVarChooserProps): JSX.Element {
}
selectedSVs={selectedSvs}
selectSV={(sv) => addStatVar(x, y, sv, setThirdStatVar, setModalOpen)}
numEntitiesExistence={Math.min(
NUM_ENTITIES_EXISTENCE,
samplePlaces.length
)}
numEntitiesExistence={
globalThis.isCustomDC
? 1
: Math.min(NUM_ENTITIES_EXISTENCE, samplePlaces.length)
}
/>
{/* Modal for selecting 2 stat vars when a third is selected */}
<Modal isOpen={modalOpen} backdrop="static" id="statvar-modal">
Expand Down
Loading