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

Jump to bottom

[Lens] fixed equality check for visualization #172685

Merged
merged 1 commit into from
Dec 7, 2023
Merged

[Lens] fixed equality check for visualization #172685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 30 additions & 5 deletions x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ export function LensEditConfigurationFlyout({
const datasourceState = attributes.state.datasourceStates[datasourceId];
const activeVisualization = visualizationMap[attributes.visualizationType];
const activeDatasource = datasourceMap[datasourceId];
const { datasourceStates, visualization, isLoading } = useLensSelector((state) => state.lens);
const { datasourceStates, visualization, isLoading, annotationGroups } = useLensSelector(
(state) => state.lens
);
const framePublicAPI = useLensSelector((state) => selectFramePublicAPI(state, datasourceMap));
const suggestsLimitedColumns = activeDatasource?.suggestsLimitedColumns?.(datasourceState);

Expand Down Expand Up @@ -113,10 +115,33 @@ export function LensEditConfigurationFlyout({
: false;

const visualizationState = visualization.state;
return (
!isEqual(visualizationState, previousAttrs.state.visualization) || !datasourceStatesAreSame
);
}, [attributes.references, datasourceId, datasourceMap, datasourceStates, visualization.state]);
const customIsEqual = visualizationMap[previousAttrs.visualizationType]?.isEqual;
const visualizationStateIsEqual = customIsEqual
? (() => {
try {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why wrapping it in a try here?

Copy link
Contributor Author

@mbondyra mbondyra Dec 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

for xy_chart, the implementation of isEqual can throw an error when injecting references for annotations. If there's a problem with annotation from library, it can throw an error.

Screenshot 2023-12-06 at 16 50 11

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. It makes sense then.

return customIsEqual(
previousAttrs.state.visualization,
previousAttrs.references,
visualizationState,
attributes.references,
annotationGroups
);
} catch (err) {
return false;
}
})()
: isEqual(visualizationState, previousAttrs.state.visualization);

return !visualizationStateIsEqual || !datasourceStatesAreSame;
}, [
attributes.references,
datasourceId,
datasourceMap,
datasourceStates,
visualizationMap,
annotationGroups,
visualization.state,
]);

const onCancel = useCallback(() => {
const previousAttrs = previousAttributes.current;
Expand Down
Loading