rebenitez1802 commented on code in PR #37681:
URL: https://github.com/apache/superset/pull/37681#discussion_r2874628554
##########
superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:
##########
@@ -319,10 +334,38 @@ const FilterBar: FC<FiltersBarProps> = ({
}, [dashboardId, filters, previousDashboardId, setDataMaskSelected]);
const dataMaskAppliedText = JSON.stringify(dataMaskApplied);
+ const prevDataMaskAppliedRef = useRef(dataMaskApplied);
useEffect(() => {
- setDataMaskSelected(() => dataMaskApplied);
- }, [dataMaskAppliedText, setDataMaskSelected, dashboardId]);
+ const dashboardChanged = dashboardId !== previousDashboardId;
+
+ if (dashboardChanged) {
+ setDataMaskSelected(() => dataMaskApplied);
+ } else {
+ const prevApplied = prevDataMaskAppliedRef.current;
+
+ // Only sync filters whose applied state actually changed
+ setDataMaskSelected(prev => {
+ let hasChanges = false;
+ const updated = { ...prev };
+
+ Object.entries(dataMaskApplied).forEach(([filterId, appliedMask]) => {
+ const prevAppliedMask = prevApplied[filterId];
+ const appliedChanged = !isEqual(appliedMask, prevAppliedMask);
+ const notInitialized = !prev[filterId];
+
+ if (appliedChanged || notInitialized) {
+ updated[filterId] = appliedMask;
+ hasChanges = true;
+ }
+ });
+
+ return hasChanges ? updated : prev;
+ });
Review Comment:
consider Adding a cleanup step to the merge logic — after iterating
dataMaskApplied, remove any keys in prev that don't exist in dataMaskApplied
like
`Object.keys(prev).forEach(filterId => {
if (!(filterId in dataMaskApplied)) {
delete updated[filterId];
hasChanges = true;
}
});`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
