Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Derive viz settings sidebar error from useMemo instead of setState (#74136)

Andrei Chernykhcb5c94c00fdf
diff --git a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
index ab47ec4bce3..96bd5e0668e 100644
--- a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
+++ b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, useCallback, useMemo, useState } from "react";
+import { forwardRef, useCallback, useMemo } from "react";
import ErrorBoundary from "metabase/ErrorBoundary";
import { useDispatch, useSelector } from "metabase/redux";
@@ -22,8 +22,6 @@ export function VizSettingsSidebar({ className }: { className?: string }) {
const settings = useSelector(getVisualizerComputedSettings);
const dispatch = useDispatch();
- const [error, setError] = useState<Error | null>(null);
-
const handleChangeSettings = useCallback(
(settings: VisualizationSettings) => {
dispatch(updateSettings(settings));
@@ -31,27 +29,27 @@ export function VizSettingsSidebar({ className }: { className?: string }) {
[dispatch],
);
- const widgets = useMemo(() => {
+ const { widgets, error } = useMemo(() => {
if (transformedSeries.length === 0) {
- return [];
+ return { widgets: [], error: null };
}
try {
- setError(null);
const widgets = getSettingsWidgetsForSeries(
transformedSeries,
handleChangeSettings,
true,
);
- return widgets.filter((widget) => {
- return (
- typeof widget.id !== "string" ||
- !HIDDEN_SETTING_WIDGETS.includes(widget.id)
- );
- });
+ return {
+ widgets: widgets.filter(
+ (widget) =>
+ typeof widget.id !== "string" ||
+ !HIDDEN_SETTING_WIDGETS.includes(widget.id),
+ ),
+ error: null,
+ };
} catch (error) {
- setError(error as Error);
- return [];
+ return { widgets: [], error: error as Error };
}
}, [transformedSeries, handleChangeSettings]);